From owner-svn-doc-head@FreeBSD.ORG  Sun Oct 13 03:19:31 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 49F4F66E;
 Sun, 13 Oct 2013 03:19:31 +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 37DFE2E85;
 Sun, 13 Oct 2013 03:19:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9D3JVTW057105;
 Sun, 13 Oct 2013 03:19:31 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9D3JVtd057104;
 Sun, 13 Oct 2013 03:19:31 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201310130319.r9D3JVtd057104@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sun, 13 Oct 2013 03:19:31 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42947 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Oct 2013 03:19:31 -0000

Author: gjb
Date: Sun Oct 13 03:19:30 2013
New Revision: 42947
URL: http://svnweb.freebsd.org/changeset/doc/42947

Log:
  Update 10.0-BETA1 schedule.
  
  Approved by:	re (implicit)

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 12 14:03:37 2013	(r42946)
+++ head/en_US.ISO8859-1/htdocs/releases/10.0R/schedule.xml	Sun Oct 13 03:19:30 2013	(r42947)
@@ -111,7 +111,7 @@
     <tr>
       <td>BETA1 builds begin</td>
       <td>12&nbsp;October&nbsp;2013</td>
-      <td>-</td>
+      <td>12&nbsp;October&nbsp;2013</td>
       <td>First beta test snapshot.</td>
     </tr>
 

From owner-svn-doc-head@FreeBSD.ORG  Sun Oct 13 11:44:18 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [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 C15DA68C;
 Sun, 13 Oct 2013 11:44:18 +0000 (UTC)
 (envelope-from gavin@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 AED502F61;
 Sun, 13 Oct 2013 11:44:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9DBiIoZ015786;
 Sun, 13 Oct 2013 11:44:18 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9DBiIOI015785;
 Sun, 13 Oct 2013 11:44:18 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201310131144.r9DBiIOI015785@svn.freebsd.org>
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Sun, 13 Oct 2013 11:44:18 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42948 -
 head/en_US.ISO8859-1/books/handbook/network-servers
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Oct 2013 11:44:18 -0000

Author: gavin
Date: Sun Oct 13 11:44:18 2013
New Revision: 42948
URL: http://svnweb.freebsd.org/changeset/doc/42948

Log:
  Replace UTF-8 'RIGHT SINGLE QUOTATION MARK' (U+2019), encoded as
  0xE2 0x80 0x99, with a standard apostrophe.  It's not clear to me why
  this was brealing the build on the cluster and seemingly nowhere else, but
  this should at least allow the build there to complete.

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	Sun Oct 13 03:19:30 2013	(r42947)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Sun Oct 13 11:44:18 2013	(r42948)
@@ -6264,7 +6264,7 @@ target iqn.2012-06.com.example:target0 {
 	  allowed.</para>
 
 	<para>Second entry defines a single target.  Target has two
-	  meanings - it is a machine serving iSCSI, but it’s also
+	  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
 	  target name.  For testing purposes it might be left as it

From owner-svn-doc-head@FreeBSD.ORG  Sun Oct 13 14:47:39 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id BE084492;
 Sun, 13 Oct 2013 14:47:39 +0000 (UTC)
 (envelope-from wblock@wonkity.com)
Received: from wonkity.com (wonkity.com [67.158.26.137])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 580F12669;
 Sun, 13 Oct 2013 14:47:39 +0000 (UTC)
Received: from wonkity.com (localhost [127.0.0.1])
 by wonkity.com (8.14.7/8.14.7) with ESMTP id r9DElVPH078158;
 Sun, 13 Oct 2013 08:47:31 -0600 (MDT)
 (envelope-from wblock@wonkity.com)
Received: from localhost (wblock@localhost)
 by wonkity.com (8.14.7/8.14.7/Submit) with ESMTP id r9DElVQv078155;
 Sun, 13 Oct 2013 08:47:31 -0600 (MDT)
 (envelope-from wblock@wonkity.com)
Date: Sun, 13 Oct 2013 08:47:31 -0600 (MDT)
From: Warren Block <wblock@wonkity.com>
To: Gavin Atkinson <gavin@FreeBSD.org>
Subject: Re: svn commit: r42948 -
 head/en_US.ISO8859-1/books/handbook/network-servers
In-Reply-To: <201310131144.r9DBiIOI015785@svn.freebsd.org>
Message-ID: <alpine.BSF.2.00.1310130840190.78122@wonkity.com>
References: <201310131144.r9DBiIOI015785@svn.freebsd.org>
User-Agent: Alpine 2.00 (BSF 1167 2008-08-23)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3
 (wonkity.com [127.0.0.1]); Sun, 13 Oct 2013 08:47:31 -0600 (MDT)
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Oct 2013 14:47:39 -0000

On Sun, 13 Oct 2013, Gavin Atkinson wrote:

> Author: gavin
> Date: Sun Oct 13 11:44:18 2013
> New Revision: 42948
> URL: http://svnweb.freebsd.org/changeset/doc/42948
>
> Log:
>  Replace UTF-8 'RIGHT SINGLE QUOTATION MARK' (U+2019), encoded as
>  0xE2 0x80 0x99, with a standard apostrophe.  It's not clear to me why
>  this was brealing the build on the cluster and seemingly nowhere else, but
>  this should at least allow the build there to complete.
>
> 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	Sun Oct 13 03:19:30 2013	(r42947)
> +++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Sun Oct 13 11:44:18 2013	(r42948)
> @@ -6264,7 +6264,7 @@ target iqn.2012-06.com.example:target0 {
> 	  allowed.</para>
>
> 	<para>Second entry defines a single target.  Target has two
> -	  meanings - it is a machine serving iSCSI, but it?s also
> +	  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
> 	  target name.  For testing purposes it might be left as it

Contractions are a style guide problem anyway.  "it's" should be 
expanded or even removed.

Other notes:

"Second entry defines a single target." is missing an article, or 
possibly better rearranged as "A single target is defined by the second 
entry."

The word "target" in the second sentence could use <quote> or <emphasis> 
tags to point out that it is talking about the use of the word in the 
first sentence.

From owner-svn-doc-head@FreeBSD.ORG  Sun Oct 13 15:01:31 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 10B315A2;
 Sun, 13 Oct 2013 15:01:31 +0000 (UTC)
 (envelope-from gavin@FreeBSD.org)
Received: from mail-gw14.york.ac.uk (mail-gw14.york.ac.uk [144.32.129.164])
 (using TLSv1 with cipher AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id C9CAA2703;
 Sun, 13 Oct 2013 15:01:30 +0000 (UTC)
Received: from ury.york.ac.uk ([144.32.64.162]:39461)
 by mail-gw14.york.ac.uk with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
 (Exim 4.76) (envelope-from <gavin@FreeBSD.org>)
 id 1VVNAe-00041O-Ts; Sun, 13 Oct 2013 16:01:28 +0100
Date: Sun, 13 Oct 2013 16:01:28 +0100 (BST)
From: Gavin Atkinson <gavin@FreeBSD.org>
X-X-Sender: gavin@thunderhorn.york.ac.uk
To: Warren Block <wblock@wonkity.com>
Subject: Re: svn commit: r42948 -
 head/en_US.ISO8859-1/books/handbook/network-servers
In-Reply-To: <alpine.BSF.2.00.1310130840190.78122@wonkity.com>
Message-ID: <alpine.BSF.2.00.1310131557370.79845@thunderhorn.york.ac.uk>
References: <201310131144.r9DBiIOI015785@svn.freebsd.org>
 <alpine.BSF.2.00.1310130840190.78122@wonkity.com>
User-Agent: Alpine 2.00 (BSF 1167 2008-08-23)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Oct 2013 15:01:31 -0000

On Sun, 13 Oct 2013, Warren Block wrote:
> On Sun, 13 Oct 2013, Gavin Atkinson wrote:
> 
> > Author: gavin
> > Date: Sun Oct 13 11:44:18 2013
> > New Revision: 42948
> > URL: http://svnweb.freebsd.org/changeset/doc/42948
> > 
> > Log:
> >  Replace UTF-8 'RIGHT SINGLE QUOTATION MARK' (U+2019), encoded as
> >  0xE2 0x80 0x99, with a standard apostrophe.  It's not clear to me why
> >  this was brealing the build on the cluster and seemingly nowhere else, but
> >  this should at least allow the build there to complete.
> > 
> > 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	Sun
> > Oct 13 03:19:30 2013	(r42947)
> > +++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Sun
> > Oct 13 11:44:18 2013	(r42948)
> > @@ -6264,7 +6264,7 @@ target iqn.2012-06.com.example:target0 {
> > 	  allowed.</para>
> > 
> > 	<para>Second entry defines a single target.  Target has two
> > -	  meanings - it is a machine serving iSCSI, but it?s also
> > +	  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
> > 	  target name.  For testing purposes it might be left as it
> 
> Contractions are a style guide problem anyway.  "it's" should be expanded or
> even removed.

Absolutely - this commit was purely to get the docbuilds on the cluster 
working again.  I have no time to do more than that today.

Gavin

> "Second entry defines a single target." is missing an article, or possibly
> better rearranged as "A single target is defined by the second entry."
> 
> The word "target" in the second sentence could use <quote> or <emphasis> tags
> to point out that it is talking about the use of the word in the first
> sentence.
> 

From owner-svn-doc-head@FreeBSD.ORG  Sun Oct 13 19:40:11 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 2961366B;
 Sun, 13 Oct 2013 19:40:11 +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 15B6F23B5;
 Sun, 13 Oct 2013 19:40:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9DJeB1x061140;
 Sun, 13 Oct 2013 19:40:11 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9DJeBYq061139;
 Sun, 13 Oct 2013 19:40:11 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310131940.r9DJeBYq061139@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Sun, 13 Oct 2013 19:40:11 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42949 - head/en_US.ISO8859-1/books/handbook/multimedia
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Oct 2013 19:40:11 -0000

Author: dru
Date: Sun Oct 13 19:40:10 2013
New Revision: 42949
URL: http://svnweb.freebsd.org/changeset/doc/42949

Log:
  This patch does the following:
  - comments out some authors
  - tightens up some headings
  - some word-smithing
  - changes examples to more modern sound cards
  
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml	Sun Oct 13 11:44:18 2013	(r42948)
+++ head/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml	Sun Oct 13 19:40:10 2013	(r42949)
@@ -61,7 +61,7 @@
       </listitem>
 
       <listitem>
-	<para>Playback DVDs, <filename>.mpg</filename>, and
+	<para>Play DVDs, <filename>.mpg</filename>, and
 	  <filename>.avi</filename> files.</para>
       </listitem>
 
@@ -80,52 +80,38 @@
       <listitem>
 	<para>Configure an image scanner.</para>
       </listitem>
-
-      <listitem>
-	<para>How to configure an image scanner.</para>
-      </listitem>
     </itemizedlist>
 
     <para>Before reading this chapter, you should:</para>
 
     <itemizedlist>
-      <listitem><para>Know how to configure and install a new kernel
-	(<xref linkend="kernelconfig"/>).</para></listitem>
-    </itemizedlist>
-
-    <warning>
-      <para>Audio CDs have specialized encodings which differ from the
-	usual ISO-filesystem.  This means that they should not be
-	mounted using &man.mount.8;.</para>
-    </warning>
-
+      <listitem><para>Know how to install applications as described in
+	<xref linkend="ports"/>.</para></listitem>
+      </itemizedlist>
   </sect1>
 
   <sect1 id="sound-setup">
+    <!--
     <sect1info>
       <authorgroup>
 	<author>
 	  <firstname>Moses</firstname>
 	  <surname>Moore</surname>
-	  <contrib>Contributed by </contrib>
-	  <!-- 20 November 2000 -->
+	  <contrib>Contributed by in November 2000</contrib>
 	</author>
       </authorgroup>
       <authorgroup>
 	<author>
 	  <firstname>Marc</firstname>
 	  <surname>Fonvieille</surname>
-	  <contrib>Enhanced by </contrib>
-	  <!-- 13 September 2004 -->
+	  <contrib>Enhanced by in September 2004</contrib>
 	</author>
       </authorgroup>
     </sect1info>
+    -->
 
     <title>Setting Up the Sound Card</title>
 
-    <sect2 id="sound-device">
-      <title>Configuring the System</title>
-
       <indexterm><primary>PCI</primary></indexterm>
       <indexterm><primary>sound cards</primary></indexterm>
       <para>Before beginning the configuration, determine the model of
@@ -140,19 +126,19 @@
 	<secondary>configuration</secondary>
       </indexterm>
 
-      <para>In order to use the sound device, the proper device driver
-	must be loaded.  This may be accomplished in one of two ways.
+      <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
-	Creative &soundblaster; Live! sound card:</para>
+	built-in audio chipset based on the Intel specification:</para>
 
-    <screen>&prompt.root; <userinput>kldload snd_emu10k1</userinput></screen>
+    <screen>&prompt.root; <userinput>kldload snd_hda</userinput></screen>
 
     <para>To automate the loading of this driver at boot time, add the
       driver to <filename>/boot/loader.conf</filename>. The line for
       this driver is:</para>
 
-    <programlisting>snd_emu10k1_load="YES"</programlisting>
+    <programlisting>snd_hda_load="YES"</programlisting>
 
     <para>Other available sound modules are listed in
       <filename>/boot/defaults/loader.conf</filename>.  When unsure
@@ -171,32 +157,28 @@
       after loading the <filename>snd_driver</filename> metadriver,
       type <command>cat /dev/sndstat</command>.</para>
 
-    <para>Users who prefer to statically compile in support for the
-      sound card in a custom kernel should refer to the instructions
-      in the next section.  For more information about recompiling a
-      kernel, refer to <xref linkend="kernelconfig"/>.</para>
-
-  <sect3>
+  <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.  Therefore, you need
-      to know which driver supports the card.  To continue the example
-      of the Creative &soundblaster; Live! sound card from the
+    <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_emu10k1</programlisting>
+      <programlisting>device snd_hda</programlisting>
 
       <para>Be sure to read the manual page of the driver for the
-	syntax to use.  The explicit syntax for the kernel
-	configuration of every supported sound driver can also be
-	found in <filename>/usr/src/sys/conf/NOTES</filename>.</para>
+	device name to use for the driver.</para>
 
       <para>Non-PnP ISA sound cards may require the IRQ and I/O port
 	settings of the card to be added to
@@ -233,57 +215,62 @@ 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>
-    </sect3>
   </sect2>
 
   <sect2 id="sound-testing">
-    <title>Testing the Sound Card</title>
+    <title>Testing Sound</title>
 
-    <para>After rebooting into the custom kernel, or after loading
-      the required module, the sound card should appear in the system
-      message buffer.  Run &man.dmesg.8; and look for a message
-	like:</para>
-
-    <screen>pcm0: &lt;Intel ICH3 (82801CA)&gt; port 0xdc80-0xdcbf,0xd800-0xd8ff irq 5 at device 31.5 on pci0
-pcm0: [GIANT-LOCKED]
-pcm0: &lt;Cirrus Logic CS4205 AC97 Codec&gt;</screen>
+    <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
+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>
 
     <screen>&prompt.root; <userinput>cat /dev/sndstat</userinput>
-FreeBSD Audio Driver (newpcm)
+FreeBSD Audio Driver (newpcm: 64bit 2009061500/amd64)
 Installed devices:
-pcm0: &lt;Intel ICH3 (82801CA)&gt; at io 0xd800, 0xdc80 irq 5 bufsz 16384
-kld snd_ich (1p/2r/0v channels duplex default)</screen>
-
-    <para>The output may vary between systems.  If no
-      <devicename>pcm</devicename> devices are listed, go back and
-      review the kernel configuration file and make sure the correct
-      device driver was chosen.  Common problems are listed in <xref
-	linkend="troubleshooting"/>.</para>
+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 CD-ROM or DVD-ROM drive's audio-out pins are properly
+      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
+	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
-      <filename>/dev/dsp</filename>:</para>
+      <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 file.  This command should produce some noise, confirming
-      that the sound card is actually working.</para>
+      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
@@ -291,19 +278,21 @@ kld snd_ich (1p/2r/0v channels duplex de
 	do not exist and will not appear in the output of
 	&man.ls.1;.</para>
     </note>
+    </sect2>
 
-    <para>Sound card mixer levels can be changed using &man.mixer.8;.
-      More details can be found in &man.mixer.8;.</para>
-
-    <sect3 id="troubleshooting">
-      <title>Common Problems</title>
+    <sect2 id="troubleshooting">
+      <title>Troubleshooting Sound</title>
 
       <indexterm><primary>device nodes</primary></indexterm>
       <indexterm><primary>I/O port</primary></indexterm>
       <indexterm><primary>IRQ</primary></indexterm>
       <indexterm><primary>DSP</primary></indexterm>
 
-      <informaltable frame="none" pgwide="1">
+      <para>Table 8.1 lists some common error messages and their
+	solutions:</para>
+
+      <table frame="none" pgwide="1">
+      <title>Common Error Messages</title>
 	<tgroup cols="2">
 	  <thead>
 	    <row>
@@ -337,8 +326,8 @@ kld snd_ich (1p/2r/0v channels duplex de
 	    <row>
 	      <entry><errorname>xxx: can't open
 		  /dev/dsp!</errorname></entry>
-	      <entry><para>Check with <command>fstat | grep
-		  dsp</command> if another application is holding the
+	      <entry><para>Type <command>fstat | grep
+		  dsp</command> to check if another application is holding the
 		device open.  Noteworthy troublemakers are
 		<application>esound</application> and
 		<application>KDE</application>'s sound
@@ -346,13 +335,13 @@ kld snd_ich (1p/2r/0v channels duplex de
 	    </row>
 	  </tbody>
 	</tgroup>
-      </informaltable>
+      </table>
 
-      <para>Another issue is that modern graphics cards often come
-	with their own sound driver, for use with
-	<acronym>HDMI</acronym> and similar.  This sound device will
-	sometimes be enumerated before the sound card and the sound
-	card will subsequently 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
@@ -376,7 +365,7 @@ pcm6: &lt;HDA Realtek ALC889 PCM #2 Digi
 pcm7: &lt;HDA Realtek ALC889 PCM #3 Digital&gt; at cad 2 nid 1 on hdac1
 ...</programlisting>
 
-      <para>Here the graphics card (<literal>NVidia</literal>) has
+      <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>
@@ -384,17 +373,17 @@ pcm7: &lt;HDA Realtek ALC889 PCM #3 Digi
 
       <screen>&prompt.root; <userinput>sysctl hw.snd.default_unit=<replaceable>n</replaceable></userinput></screen>
 
-      <para>Here, <literal>n</literal> is the number of the sound
+      <para>where <literal>n</literal> is the number of the sound
 	device to use.  In this example, it should be
 	<literal>4</literal>.  Make this change permanent by adding
 	the following line to
 	<filename>/etc/sysctl.conf</filename>:</para>
 
       <programlisting>hw.snd.default_unit=<replaceable>4</replaceable></programlisting>
-    </sect3>
   </sect2>
 
   <sect2 id="sound-multiple-sources">
+    <!--
     <sect2info>
       <authorgroup>
 	<author>
@@ -404,34 +393,32 @@ pcm7: &lt;HDA Realtek ALC889 PCM #3 Digi
 	</author>
       </authorgroup>
     </sect2info>
+    -->
     <title>Utilizing Multiple Sound Sources</title>
 
     <para>It is often desirable to have multiple sources of sound that
-      are able to play simultaneously.  &os; uses <emphasis>Virtual
-	Sound Channels</emphasis>, which can be enabled using
-      &man.sysctl.8;.  Virtual channels allow one to multiplex the
+      are able to play simultaneously.  &os; uses <quote>Virtual
+	Sound Channels</quote> to multiplex the
       sound card's playback by mixing sound in the kernel.</para>
 
-    <para>To set the number of virtual channels, three
-      &man.sysctl.8; knobs are available:</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>The above example allocates four virtual channels, which
+    <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 the number of
+      <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, and are configurable after a device has been
-      attached.  <literal>hw.snd.maxautovchans</literal> is the number
-      of virtual channels a new audio device is given when it is
-      attached using &man.kldload.8;.  Since the
+      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 devices
-      when they are attached. Refer to &man.pcm.4; for more
+      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>
@@ -447,6 +434,7 @@ pcm7: &lt;HDA Realtek ALC889 PCM #3 Digi
   </sect2>
 
   <sect2>
+        <!--
     <sect2info>
       <authorgroup>
 	<author>
@@ -456,16 +444,17 @@ pcm7: &lt;HDA Realtek ALC889 PCM #3 Digi
 	</author>
       </authorgroup>
     </sect2info>
+    -->
 
     <title>Setting Default Values for Mixer Channels</title>
 
     <para>The default values for the different mixer channels are
-      hardcoded in the source code of the &man.pcm.4; driver.  There
-      are many different applications and daemons that allow values to
-      be set for the mixer that are remembered between invocations,
-      but this is not a clean solution.  It is possible to set default
-      mixer values at the driver level.  This is accomplished by
-      defining the appropriate values in
+      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
       <filename>/boot/device.hints</filename>, as seen in this
       example:</para>
 
@@ -478,16 +467,17 @@ pcm7: &lt;HDA Realtek ALC889 PCM #3 Digi
 </sect1>
 
 <sect1 id="sound-mp3">
+  <!--
   <sect1info>
     <authorgroup>
       <author>
 	<firstname>Chern</firstname>
 	<surname>Lee</surname>
-	<contrib>Contributed by </contrib>
+	<contrib>Contributed by in Sept 2001</contrib>
       </author>
     </authorgroup>
-    <!-- 11 Sept 2001 -->
   </sect1info>
+  -->
 
     <title>MP3 Audio</title>
 

From owner-svn-doc-head@FreeBSD.ORG  Sun Oct 13 19:43:34 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 9C63788D;
 Sun, 13 Oct 2013 19:43:34 +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 88E0423F9;
 Sun, 13 Oct 2013 19:43: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 r9DJhYdp062365;
 Sun, 13 Oct 2013 19:43:34 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9DJhYf5062364;
 Sun, 13 Oct 2013 19:43:34 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310131943.r9DJhYf5062364@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Sun, 13 Oct 2013 19:43:34 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42950 - head/en_US.ISO8859-1/books/handbook/linuxemu
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Oct 2013 19:43:34 -0000

Author: dru
Date: Sun Oct 13 19:43:34 2013
New Revision: 42950
URL: http://svnweb.freebsd.org/changeset/doc/42950

Log:
  This patch does the following:
  - comments out Mathematica chapter
  - adds a comment that the installer shell script works but the binaries don't as only 64-bit is available and to revisit if linuxemu adds 64-bit support
  - modernizes 11.3.1
  - 11.3.2 left untested as binary would not launch
  
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml	Sun Oct 13 19:40:10 2013	(r42949)
+++ head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml	Sun Oct 13 19:43:34 2013	(r42950)
@@ -326,6 +326,11 @@ multi on</programlisting>
     </sect2>
   </sect1>
 
+  <!--
+  While the installer works, the binaries do not. As of Oct 2013, Linux
+  emulation is 32-bit but the trial version of Mathematica is only
+  available as 64-bit. This section should be revisited if Linux
+  emulation gets 64-bit binary support.
   <sect1 id="linuxemu-mathematica">
     <sect1info>
       <authorgroup>
@@ -336,6 +341,7 @@ multi on</programlisting>
 	</author>
       </authorgroup>
     </sect1info>
+
     <title>Installing &mathematica;</title>
 
     <indexterm>
@@ -344,95 +350,49 @@ multi on</programlisting>
     </indexterm>
 
     <para>This section describes the process of installing the
-      &linux; version of <application>&mathematica; 5.X</application>
+      &linux; version of <application>&mathematica; 9.X</application>
       onto a &os; system.  <application>&mathematica;</application>
       is a commercial, computational software program used in
-      scientific, engineering, and mathematical fields.  It is
-      available from <ulink
-	url="http://www.wolfram.com/mathematica/">Wolfram
-	Research</ulink>.</para>
+      scientific, engineering, and mathematical fields.  A 30 day trial version is
+      available for download from <ulink
+	url="http://www.wolfram.com/mathematica/">wolfram.com/mathematica</ulink>.</para>
 
     <sect2>
       <title>Running the &mathematica; Installer</title>
 
-      <para>First, tell &os; that
-	<application>&mathematica;</application>'s &linux;
-	binaries use the &linux; Application Binary Interface
-	<acronym>ABI</acronym>.  The easiest way to do this is to
-	set the default ELF brand to &linux; for all unbranded
-	binaries with the command:</para>
-
+      <para>Before installing &mathematica;, make sure that the
+	<filename role="package">textproc/linux-f10-aspell</filename>
+	package or port is installed and that the &man.linprocfs.5;
+	file system is mounted.</para>
+	
       <screen>&prompt.root; <userinput>sysctl kern.fallback_elf_brand=3</userinput></screen>
 
       <para>&os; will now assume that unbranded ELF binaries
 	use the &linux; <acronym>ABI</acronym> which should allow the
 	installer to execute from the CDROM.</para>
 
-      <para>Copy the <filename>MathInstaller</filename> to the hard
-	drive:</para>
-
-      <screen>&prompt.root; <userinput>mount /cdrom</userinput>
-&prompt.root; <userinput>cp /cdrom/Unix/Installers/Linux/MathInstaller /localdir/</userinput></screen>
-
-      <para>In this file, replace <literal>/bin/sh</literal> in
-	the first line with <literal>/compat/linux/bin/sh</literal>.
-	This ensures that the installer is executed by the &linux;
-	version of &man.sh.1;.  Next, replace all occurrences of
-	<literal>Linux)</literal> with <literal>FreeBSD)</literal>
-	using a text editor or the script below in the next section.
-	This tells the <application>&mathematica;</application>
-	installer, to treat &os; as a &linux;-like operating
-	system.  Invoking <command>MathInstaller</command> should now
-	install <application>&mathematica;</application>.</para>
-    </sect2>
-
-    <sect2>
-      <title>Modifying the &mathematica; Executables</title>
-
-      <para>The shell scripts that
-	<application>&mathematica;</application> created during
-	installation have to be modified before use.  When using
-	<filename
-	  class="directory">/usr/local/bin</filename> as the directory
-	for the <application>&mathematica;</application>
-	executables, symlinks in this directory will point to files
-	called <filename>math</filename>,
-	<filename>mathematica</filename>,
-	<filename>Mathematica</filename>, and
-	<filename>MathKernel</filename>.  In each of these, replace
-	<literal>Linux)</literal> with <literal>FreeBSD)</literal>
-	using a text editor or the following shell script:</para>
-
-      <programlisting>#!/bin/sh
-cd /usr/local/bin
-for i in math mathematica Mathematica MathKernel
-  do sed 's/Linux)/FreeBSD)/g' $i &gt; $i.tmp
-  sed 's/\/bin\/sh/\/compat\/linux\/bin\/sh/g' $i.tmp &gt; $i
-  rm $i.tmp
-  chmod a+x $i
-done</programlisting>
-    </sect2>
-
-    <sect2>
-      <title>Obtaining a &mathematica; Password</title>
-
-      <indexterm>
-	<primary>Ethernet</primary>
-	<secondary>MAC address</secondary>
-      </indexterm>
+      <para>The downloaded file will be saved to
+	<filename>/tmp/Mathematica_9.0.1_LINUX.sh</filename>.  Become
+	the superuser and run this installer file:</para>
+
+      <programlisting>&prompt.root; <userinput>sh /tmp/Mathematica_9.0.1_LINUX.sh</userinput>
+Mathematica Secured 9.0.1 for LINUX Installer Archive
+
+Verifying archive integrity.
+Extracting installer. ...
+                               Wolfram Mathematica 9 Installer
+Copyright (c) 1988-2013 Wolfram Research, Inc. All rights reserved.
+
+WARNING: Wolfram Mathematica is protected by copyright law and international treaties. Unauthorized
+reproduction or distribution may result in severe civil and criminal
+penalties and will be prosecuted to the maximum extent possible under law.
+
+Enter the installation directory, or press ENTER to select /usr/local/Wolfram/Mathematica/9.0:
+>
+Now installing...
+***********************
+Installation complete.</programlisting>
 
-      <para>When <application>&mathematica;</application> is started
-	for the first time, it will ask for a password.  If a password
-	had not yet been obtained from Wolfram Research, run
-	<command>mathinfo</command> in the installation directory to
-	obtain the <quote>machine ID</quote>.  This machine ID is
-	based solely on the MAC address of the first Ethernet card,
-	as the copy of <application>&mathematica;</application> cannot
-	run on different machines.</para>
-
-      <para>When registering with Wolfram Research, provide the
-	<quote>machine ID</quote> and they will respond with a
-	corresponding password consisting of groups of numbers.</para>
     </sect2>
 
     <sect2>
@@ -495,6 +455,7 @@ done</programlisting>
 	  class="directory">Type1</filename>.</para>
     </sect2>
   </sect1>
+  -->
 
   <sect1 id="linuxemu-maple">
     <sect1info>

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

Author: gjb
Date: Mon Oct 14 13:12:45 2013
New Revision: 42951
URL: http://svnweb.freebsd.org/changeset/doc/42951

Log:
  Swtich 10.0 to BETA1.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/share/xml/release.ent

Modified: head/share/xml/release.ent
==============================================================================
--- head/share/xml/release.ent	Sun Oct 13 19:43:34 2013	(r42950)
+++ head/share/xml/release.ent	Mon Oct 14 13:12:45 2013	(r42951)
@@ -32,7 +32,7 @@
 <!ENTITY beta.testing "INCLUDE">
 <!ENTITY % beta.testing "INCLUDE">
 <!ENTITY betarel.current '10.0'>
-<!ENTITY betarel.vers 'ALPHA5'>
+<!ENTITY betarel.vers 'BETA1'>
 <!ENTITY u.betarel.schedule '&base;/releases/&betarel.current;R/schedule.html'>
 
 <!-- If we have a second release in the release cycle (e.g. 5.x and 6.y

From owner-svn-doc-head@FreeBSD.ORG  Mon Oct 14 16:44:16 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 3BCF4E3C;
 Mon, 14 Oct 2013 16:44:16 +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 279BA2611;
 Mon, 14 Oct 2013 16:44: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 r9EGiGXm017309;
 Mon, 14 Oct 2013 16:44:16 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9EGiFRE017295;
 Mon, 14 Oct 2013 16:44:15 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310141644.r9EGiFRE017295@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Mon, 14 Oct 2013 16:44:15 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42953 - in head/en_US.ISO8859-1/books/handbook: . basics
 bsdinstall preface users
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Oct 2013 16:44:16 -0000

Author: dru
Date: Mon Oct 14 16:44:15 2013
New Revision: 42953
URL: http://svnweb.freebsd.org/changeset/doc/42953

Log:
  This patch integrates the contents of users/chapter.xml
  into basics/chapter.xml.
  
  Approved by:	hrs (mentor)

Deleted:
  head/en_US.ISO8859-1/books/handbook/users/
Modified:
  head/en_US.ISO8859-1/books/handbook/Makefile
  head/en_US.ISO8859-1/books/handbook/basics/chapter.xml
  head/en_US.ISO8859-1/books/handbook/book.xml
  head/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
  head/en_US.ISO8859-1/books/handbook/chapters.ent
  head/en_US.ISO8859-1/books/handbook/preface/preface.xml

Modified: head/en_US.ISO8859-1/books/handbook/Makefile
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/Makefile	Mon Oct 14 15:58:30 2013	(r42952)
+++ head/en_US.ISO8859-1/books/handbook/Makefile	Mon Oct 14 16:44:15 2013	(r42953)
@@ -275,7 +275,6 @@ SRCS+= preface/preface.xml
 SRCS+= printing/chapter.xml
 SRCS+= security/chapter.xml
 SRCS+= serialcomms/chapter.xml
-SRCS+= users/chapter.xml
 SRCS+= virtualization/chapter.xml
 SRCS+= x11/chapter.xml
 

Modified: head/en_US.ISO8859-1/books/handbook/basics/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Mon Oct 14 15:58:30 2013	(r42952)
+++ head/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Mon Oct 14 16:44:15 2013	(r42953)
@@ -36,6 +36,11 @@
       </listitem>
 
       <listitem>
+	<para>How to create and manage users and groups on
+	  &os;.</para>
+      </listitem>
+
+      <listitem>
 	<para>How &unix; file permissions and &os; file flags
 	  work.</para>
       </listitem>
@@ -286,6 +291,996 @@ console none                            
     </sect2>
   </sect1>
 
+    <!--
+  <chapterinfo>
+    <authorgroup>
+      <author>
+	<firstname>Neil</firstname>
+	<surname>Blakey-Milner</surname>
+	<contrib>Contributed by in Feb 2000</contrib>
+      </author>
+    </authorgroup>
+  </chapterinfo>
+  -->
+
+  <sect1 id="users-synopsis">
+    <title>Users and Basic Account Management</title>
+
+    <para>&os; allows multiple users to use the computer at the same
+      time.  While only one user can sit in front of the screen and
+      use the keyboard at any one time, any number of users can log
+      in to the system through the network.  To use the system, each
+      user should have their own user account.</para>
+
+    <para>This chapter describes:</para>
+
+    <itemizedlist>
+      <listitem>
+	<para>The different types of user accounts on a
+	  &os; system.</para>
+      </listitem>
+
+      <listitem>
+	<para>How to add, remove, and modify user accounts.</para>
+      </listitem>
+
+      <listitem>
+	<para>How to set limits to control the
+	  resources that users and
+	  groups are allowed to access.</para>
+      </listitem>
+
+      <listitem>
+	<para>How to create groups and add users as members of a group.</para>
+      </listitem>
+    </itemizedlist>
+
+  <sect2 id="users-introduction">
+    <title>Account Types</title>
+
+    <para>Since all access to the &os; system is achieved using accounts
+      and all processes are run by users, user and account management
+      is important.</para>
+
+    <para>There are three main types of accounts:
+      system accounts,
+      user accounts, and the
+      superuser account.</para>
+
+    <sect3 id="users-system">
+      <title>System Accounts</title>
+
+      <indexterm>
+	<primary>accounts</primary>
+	<secondary>system</secondary>
+      </indexterm>
+
+      <para>System accounts are used to run services such as DNS,
+	mail, and web servers.  The reason for this is security; if
+	all services ran as the superuser, they could act without
+	restriction.</para>
+
+      <indexterm>
+	<primary>accounts</primary>
+	<secondary><username>daemon</username></secondary>
+      </indexterm>
+      <indexterm>
+	<primary>accounts</primary>
+	<secondary><username>operator</username></secondary>
+      </indexterm>
+
+      <para>Examples of system accounts are
+	<username>daemon</username>, <username>operator</username>,
+	<username>bind</username>, <username>news</username>, and
+	<username>www</username>.</para>
+
+      <indexterm>
+	<primary>accounts</primary>
+	<secondary><username>nobody</username></secondary>
+      </indexterm>
+
+      <para><username>nobody</username> is the generic unprivileged
+	system account.  However, the more services that use
+	<username>nobody</username>, the more files and processes that
+	user will become associated with, and hence the more
+	privileged that user becomes.</para>
+    </sect3>
+
+    <sect3 id="users-user">
+      <title>User Accounts</title>
+
+      <indexterm>
+	<primary>accounts</primary>
+	<secondary>user</secondary>
+      </indexterm>
+
+      <para>User accounts are
+	assigned to real people and are used to log in and use the
+	system.  Every person accessing the system should have a unique
+	user account.  This allows the administrator to find out who
+	is doing what and prevents users from clobbering the
+	settings of other users.</para>
+
+      <para>Each user can set up their own environment to accommodate
+	their use of the system, by configuring their default shell, editor,
+	key bindings, and language settings.</para>
+     <para>Every user account on a &os; system has certain information
+      associated with it:</para>
+
+    <variablelist>
+      <varlistentry>
+	<term>User name</term>
+
+	<listitem>
+	  <para>The user name is typed at the <prompt>login:</prompt>
+	    prompt.  User names must be unique on the system as no two
+	    users can have the same user name.  There are a number of
+	    rules for creating valid user names which are documented in
+	    &man.passwd.5;.  It is recommended to use user names that consist of eight or
+	    fewer, all lower case characters in order to maintain
+	    backwards compatibility with applications.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>Password</term>
+
+	<listitem>
+	  <para>Each user account should have an associated password.  While the
+	    password can be blank, this is highly discouraged.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>User ID (<acronym>UID</acronym>)</term>
+
+	<listitem>
+	  <para>The User ID (<acronym>UID</acronym>) is a number
+	    used to uniquely identify the user to the
+	    &os; system.  Commands that
+	    allow a user name to be specified will first convert it to
+	    the <acronym>UID</acronym>.  It is recommended to use a UID of
+	    65535 or lower as higher UIDs may cause compatibility
+	    issues with software that does not support integers larger
+	    than 32-bits.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>Group ID (<acronym>GID</acronym>)</term>
+
+	<listitem>
+	  <para>The Group ID (<acronym>GID</acronym>) is a number used to uniquely identify
+	    the primary group that the user belongs to.  Groups are a
+	    mechanism for controlling access to resources based on a
+	    user's <acronym>GID</acronym> rather than their
+	    <acronym>UID</acronym>.  This can significantly reduce the
+	    size of some configuration files and allows users to be
+	    members of more than one group.  It is recommended to use a GID of
+	    65535 or lower as higher GIDs may break some
+	    software.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>Login class</term>
+
+	<listitem>
+	  <para>Login classes are an extension to the group mechanism
+	    that provide additional flexibility when tailoring the
+	    system to different users.  Login classes are discussed
+	    further in <xref linkend="users-limiting"/></para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>Password change time</term>
+
+	<listitem>
+	  <para>By default, &os; does not force users to change their
+	    passwords periodically.  Password expiration can be
+	    enforced on a per-user basis using &man.pw.8;, forcing some or all users to
+	    change their passwords after a certain amount of time has
+	    elapsed.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>Account expiry time</term>
+
+	<listitem>
+	  <para>By default, &os; does not expire accounts.  When
+	    creating accounts that need a limited lifespan, such as
+	    student accounts in a school, specify the account expiry
+	    date using &man.pw.8;.  After the expiry time has elapsed, the account
+	    cannot be used to log in to the system, although the
+	    account's directories and files will remain.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>User's full name</term>
+
+	<listitem>
+	  <para>The user name uniquely identifies the account to &os;,
+	    but does not necessarily reflect the user's real name.
+	    Similar to a comment, this information
+	    can contain a space, uppercase characters, and be more
+	    than 8 characters long.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>Home directory</term>
+
+	<listitem>
+	  <para>The home directory is the full path to a directory on
+	    the system.  This is the user's starting directory when
+	    the user logs in.  A common convention is to put all user
+	    home directories under <filename
+	      class="directory">/home/<replaceable>username</replaceable></filename>
+	    or <filename
+	      class="directory">/usr/home/<replaceable>username</replaceable></filename>.
+	    Each user stores their personal files and subdirectories
+	    in their own home directory.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>User shell</term>
+
+	<listitem>
+	  <para>The shell provides the user's default environment for
+	    interacting with the system.  There are many different
+	    kinds of shells and experienced users will have their own
+	    preferences, which can be reflected in their account
+	    settings.</para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+    </sect3>
+
+      <sect3 id="users-superuser">
+      <title>The Superuser Account</title>
+
+      <indexterm>
+	<primary>accounts</primary>
+	<secondary>superuser (root)</secondary>
+      </indexterm>
+
+      <para>The superuser account, usually called
+	<username>root</username>, is used to
+	manage the system with no limitations on privileges.  For this
+	reason, it should not be used for day-to-day
+	tasks like sending and receiving mail, general exploration of
+	the system, or programming.</para>
+
+      <para>The superuser, unlike other user
+	accounts, can operate without limits, and misuse of the
+	superuser account may result in spectacular disasters.  User
+	accounts are unable to destroy the operating system by mistake, so it is
+	recommended to login as a user account and to only become the superuser
+	when a command requires extra privilege.</para>
+
+      <para>Always double and triple-check any commands issued as the
+	superuser, since an extra space or missing character can mean
+	irreparable data loss.</para>
+
+      <para>There are several ways to become gain superuser privilege.  While one
+      can log in as <username>root</username>, this is highly discouraged.</para>
+
+    <para>Instead, use &man.su.1; to become the superuser.  If
+      <literal>-</literal> is specified when running this command, the user will also inherit the root user's environment.
+      The user running this command must
+      be in the <groupname>wheel</groupname> group or else the command
+      will fail.  The user must also know the password for the
+      <username>root</username> user account.</para>
+
+      <para>In this example, the user only becomes superuser in order to run
+      <command>make install</command> as this step requires superuser privilege.
+      Once the command completes, the user types <command>exit</command>
+      to leave the superuser account and return to the privilege of
+      their user account.</para>
+
+    <example>
+      <title>Install a Program As The Superuser</title>
+
+      <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>The built-in &man.su.1; framework works well for single systems or small
+      networks with just one system administrator.  An alternative
+      is to install the
+      <filename role="package">security/sudo</filename> package or port.  This software
+      provides activity logging and allows the administrator to configure which users
+      can run which commands
+      as the superuser.</para>
+  </sect3>
+  </sect2>
+
+  <sect2 id="users-modifying">
+    <title>Managing Accounts</title>
+
+    <indexterm>
+      <primary>accounts</primary>
+      <secondary>modifying</secondary>
+    </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>
+
+    <informaltable frame="none" pgwide="1">
+      <tgroup cols="2">
+	<colspec colwidth="1*"/>
+	<colspec colwidth="2*"/>
+
+	<thead>
+	  <row>
+	    <entry>Command</entry>
+	    <entry>Summary</entry>
+	  </row>
+	</thead>
+	<tbody>
+	  <row>
+	    <entry>&man.adduser.8;</entry>
+	    <entry>The recommended command-line application for adding
+	      new users.</entry>
+	  </row>
+
+	  <row>
+	    <entry>&man.rmuser.8;</entry>
+	    <entry>The recommended command-line application for
+	      removing users.</entry>
+	  </row>
+
+	  <row>
+	    <entry>&man.chpass.1;</entry>
+	    <entry>A flexible tool for changing user database
+	      information.</entry>
+	  </row>
+
+	  <row>
+	    <entry>&man.passwd.1;</entry>
+	    <entry>The simple command-line tool to change user
+	      passwords.</entry>
+	  </row>
+
+	  <row>
+	    <entry>&man.pw.8;</entry>
+	    <entry>A powerful and flexible tool for modifying all
+	      aspects of user accounts.</entry>
+	  </row>
+	</tbody>
+      </tgroup>
+    </informaltable>
+
+    <sect3 id="users-adduser">
+      <title><command>adduser</command></title>
+
+      <indexterm>
+	<primary>accounts</primary>
+	<secondary>adding</secondary>
+      </indexterm>
+      <indexterm>
+	<primary><command>adduser</command></primary>
+      </indexterm>
+      <indexterm>
+	<primary><filename
+	  class="directory">/usr/share/skel</filename></primary>
+      </indexterm>
+      <indexterm><primary>skeleton directory</primary></indexterm>
+      <para>&man.adduser.8; is a simple program for adding new users
+	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>
+
+      <example>
+	<title>Adding a User on &os;</title>
+
+	<screen>&prompt.root; <userinput>adduser</userinput>
+Username: <userinput>jru</userinput>
+Full name: <userinput>J. Random User</userinput>
+Uid (Leave empty for default):
+Login group [jru]:
+Login group is jru. Invite jru into other groups? []: <userinput>wheel</userinput>
+Login class [default]:
+Shell (sh csh tcsh zsh nologin) [sh]: <userinput>zsh</userinput>
+Home directory [/home/jru]:
+Home directory permissions (Leave empty for default):
+Use password-based authentication? [yes]:
+Use an empty password? (yes/no) [no]:
+Use a random password? (yes/no) [no]:
+Enter password:
+Enter password again:
+Lock out the account after creation? [no]:
+Username   : jru
+Password   : ****
+Full Name  : J. Random User
+Uid        : 1001
+Class      :
+Groups     : jru wheel
+Home       : /home/jru
+Shell      : /usr/local/bin/zsh
+Locked     : no
+OK? (yes/no): <userinput>yes</userinput>
+adduser: INFO: Successfully added (jru) to the user database.
+Add another user? (yes/no): <userinput>no</userinput>
+Goodbye!
+&prompt.root;</screen>
+      </example>
+
+      <note>
+	<para>Since the password is not echoed when typed, be careful
+	  to not mistype the password when creating the user
+	  account.</para>
+      </note>
+    </sect3>
+
+    <sect3 id="users-rmuser">
+      <title><command>rmuser</command></title>
+
+      <indexterm><primary><command>rmuser</command></primary></indexterm>
+      <indexterm>
+	<primary>accounts</primary>
+	<secondary>removing</secondary>
+      </indexterm>
+
+      <para>To completely remove a user from the system use
+	&man.rmuser.8;.  This command performs the following
+	steps:</para>
+
+      <procedure>
+	<step>
+	  <para>Removes the user's &man.crontab.1; entry if one
+	    exists.</para>
+	</step>
+
+	<step>
+	  <para>Removes any &man.at.1; jobs belonging to the
+	    user.</para>
+	</step>
+
+	<step>
+	  <para>Kills all processes owned by the user.</para>
+	</step>
+
+	<step>
+	  <para>Removes the user from the system's local password
+	    file.</para>
+	</step>
+
+	<step>
+	  <para>Removes the user's home directory, if it is owned by
+	    the user.</para>
+	</step>
+
+	<step>
+	  <para>Removes the incoming mail files belonging to the user
+	    from <filename
+	      class="directory">/var/mail</filename>.</para>
+	</step>
+
+	<step>
+	  <para>Removes all files owned by the user from temporary
+	    file storage areas such as <filename
+	      class="directory">/tmp</filename>.</para>
+	</step>
+
+	<step>
+	  <para>Finally, removes the username from all groups to which
+	    it belongs in <filename>/etc/group</filename>.</para>
+
+	  <note>
+	    <para>If a group becomes empty and the group name is the
+	      same as the username, the group is removed.  This
+	      complements the per-user unique groups created by
+	      &man.adduser.8;.</para>
+	  </note>
+	</step>
+      </procedure>
+
+      <para>&man.rmuser.8; cannot be used to remove superuser
+	accounts since that is almost always an indication of massive
+	destruction.</para>
+
+      <para>By default, an interactive mode is used, as shown
+	in the following example.</para>
+
+      <example>
+	<title><command>rmuser</command> Interactive Account
+	  Removal</title>
+
+	<screen>&prompt.root; <userinput>rmuser jru</userinput>
+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.
+&prompt.root;</screen>
+      </example>
+    </sect3>
+
+    <sect3 id="users-chpass">
+      <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>When passed no options, aside from an optional username,
+	&man.chpass.1; displays an editor containing user information.
+	When the user exists from the editor, the user database is
+	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>
+      </note>
+
+      <example>
+	<title>Interactive <command>chpass</command> by
+	  Superuser</title>
+
+	<screen>#Changing user database information for jru.
+Login: jru
+Password: *
+Uid [#]: 1001
+Gid [# or name]: 1001
+Change [month day year]:
+Expire [month day year]:
+Class:
+Home directory: /home/jru
+Shell: /usr/local/bin/zsh
+Full Name: J. Random User
+Office Location:
+Office Phone:
+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
+	  User</title>
+
+	<screen>#Changing user database information for jru.
+Shell: /usr/local/bin/zsh
+Full Name: J. Random User
+Office Location:
+Office Phone:
+Home Phone:
+Other information:</screen>
+      </example>
+
+      <note>
+	<para>&man.chfn.1; and &man.chsh.1; are links to
+	  &man.chpass.1;, as are &man.ypchpass.1;, &man.ypchfn.1;, and
+	  &man.ypchsh.1;.  <acronym>NIS</acronym> support is
+	  automatic, so specifying the <literal>yp</literal> before
+	  the command is not necessary.  How to configure NIS is
+	  covered in <xref linkend="network-servers"/>.</para>
+      </note>
+    </sect3>
+    <sect3 id="users-passwd">
+      <title><command>passwd</command></title>
+
+      <indexterm><primary><command>passwd</command></primary></indexterm>
+      <indexterm>
+	<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>
+
+      <example>
+	<title>Changing Your Password</title>
+
+	<screen>&prompt.user; <userinput>passwd</userinput>
+Changing local password for jru.
+Old password:
+New password:
+Retype new password:
+passwd: updating the database...
+passwd: done</screen>
+      </example>
+
+      <example>
+	<title>Changing Another User's Password as the
+	  Superuser</title>
+
+        <screen>&prompt.root; <userinput>passwd jru</userinput>
+Changing local password for jru.
+New password:
+Retype new password:
+passwd: updating the database...
+passwd: done</screen>
+      </example>
+
+      <note>
+	<para>As with &man.chpass.1;, &man.yppasswd.1; is a link to
+	  &man.passwd.1;, so NIS works with either command.</para>
+      </note>
+    </sect3>
+
+
+    <sect3 id="users-pw">
+      <title><command>pw</command></title>
+
+      <indexterm><primary><command>pw</command></primary></indexterm>
+
+      <para>&man.pw.8; is a command line utility to create, remove,
+	modify, and display users and groups.  It functions as a front
+	end to the system user and group files.  &man.pw.8; has a very
+	powerful set of command line options that make it suitable for
+	use in shell scripts, but new users may find it more
+	complicated than the other commands presented in this
+	section.</para>
+    </sect3>
+  </sect2>
+
+  <sect2 id="users-limiting">
+    <title>Limiting Users</title>
+
+    <indexterm><primary>limiting users</primary></indexterm>
+    <indexterm>
+      <primary>accounts</primary>
+      <secondary>limiting</secondary>
+    </indexterm>
+    <para>&os; provides several methods for an administrator to limit
+      the amount of system resources an individual may use.  These
+      limits are discussed in two sections: disk quotas and other
+      resource limits.</para>
+
+    <indexterm><primary>quotas</primary></indexterm>
+    <indexterm>
+      <primary>limiting users</primary>
+      <secondary>quotas</secondary>
+    </indexterm>
+    <indexterm><primary>disk quotas</primary></indexterm>
+    <para>Disk quotas limit the amount of disk space available to
+      users and provide a way to quickly check that usage without
+      calculating it every time.  Quotas are discussed in <xref
+	linkend="quotas"/>.</para>
+
+    <para>The other resource limits include ways to limit the amount
+      of CPU, memory, and other resources a user may consume.  These
+      are defined using login classes and are discussed here.</para>
+
+    <indexterm>
+      <primary><filename>/etc/login.conf</filename></primary>
+    </indexterm>
+    <para>Login classes are defined in
+      <filename>/etc/login.conf</filename> and are described in detail
+      in &man.login.conf.5;.  Each user account is assigned to a login
+      class, <literal>default</literal> by default, and each login
+      class has a set of login capabilities associated with it.  A
+      login capability is a
+      <literal><replaceable>name</replaceable>=<replaceable>value</replaceable></literal>
+      pair, where <replaceable>name</replaceable> is a well-known
+      identifier and <replaceable>value</replaceable> is an arbitrary
+      string which is processed accordingly depending on the
+      <replaceable>name</replaceable>.  Setting up login classes and
+      capabilities is rather straightforward and is also described in
+      &man.login.conf.5;.</para>
+
+    <note>
+      <para>&os; does not normally read the configuration in
+	<filename>/etc/login.conf</filename> directly, but instead
+	reads the <filename>/etc/login.conf.db</filename> database
+	which provides faster lookups.  Whenever
+	<filename>/etc/login.conf</filename> is edited, the
+	<filename>/etc/login.conf.db</filename> must be updated by
+	executing the following command:</para>
+
+      <screen>&prompt.root; <userinput>cap_mkdb /etc/login.conf</userinput></screen>
+    </note>
+
+    <para>Resource limits differ from the default login capabilities
+      in two ways.  First, for every limit, there is a soft (current)
+      and hard limit.  A soft limit may be adjusted by the user or
+      application, but may not be set higher than the hard limit.  The
+      hard limit may be lowered by the user, but can only be raised
+      by the superuser.  Second, most resource limits apply per
+      process to a specific user, not to the user as a whole.  These
+      differences are mandated by the specific handling of the limits,
+      not by the implementation of the login capability
+      framework.</para>
+
+    <para>Below are the most commonly used resource limits.  The rest
+      of the limits, along with all the other login capabilities, can
+      be found in &man.login.conf.5;.</para>
+
+    <variablelist>
+      <varlistentry>
+	<term><literal>coredumpsize</literal></term>
+
+	<listitem>
+	  <para>The limit on the size of a core file<indexterm><primary>coredumpsize</primary></indexterm> generated by a
+	    program is subordinate to other limits<indexterm><primary>limiting users</primary><secondary>coredumpsize</secondary></indexterm> on disk usage, such
+	    as <literal>filesize</literal>, or disk quotas.
+	    This limit is often used as a less-severe method of
+	    controlling disk space consumption.  Since users do not
+	    generate core files themselves, and often do not delete
+	    them, setting this may save them from running out of disk
+	    space should a large program crash.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term><literal>cputime</literal></term>
+
+	<listitem>
+	  <para>The maximum amount of CPU<indexterm><primary>cputime</primary></indexterm><indexterm><primary>limiting users</primary><secondary>cputime</secondary></indexterm> time a user's process may
+	    consume.  Offending processes will be killed by the
+	    kernel.</para>
+
+	  <note>
+	    <para>This is a limit on CPU <emphasis>time</emphasis>
+	      consumed, not percentage of the CPU as displayed in
+	      some fields by &man.top.1; and &man.ps.1;.</para>
+	  </note>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term><literal>filesize</literal></term>
+
+	<listitem>
+	  <para>The maximum size of a file<indexterm><primary>filesize</primary></indexterm><indexterm><primary>limiting users</primary><secondary>filesize</secondary></indexterm> the user may own.  Unlike
+	    <link linkend="quotas">disk quotas</link>, this limit is
+	    enforced on individual files, not the set of all files a
+	    user owns.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term><literal>maxproc</literal></term>
+
+	<listitem>
+	  <para>The maximum number of processes<indexterm><primary>maxproc</primary></indexterm><indexterm><primary>limiting users</primary><secondary>maxproc</secondary></indexterm> a user can run.  This
+	    includes foreground and background processes.  This limit
+	    may not be larger than the system limit specified by the
+	    <varname>kern.maxproc</varname> &man.sysctl.8;.  Setting
+	    this limit too small may hinder a user's productivity as
+	    it is often useful to be logged in multiple times or to
+	    execute pipelines.  Some tasks, such as compiling a large
+	    program, spawn multiple processes and other intermediate
+	    preprocessors.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term><literal>memorylocked</literal></term>
+
+	<listitem>
+	  <para>The maximum amount of memory<indexterm><primary>memorylocked</primary></indexterm><indexterm><primary>limiting users</primary><secondary>memorylocked</secondary></indexterm> a process may request
+	    to be locked into main memory using &man.mlock.2;.  Some
+	    system-critical programs, such as &man.amd.8;, lock into
+	    main memory so that if the system begins to swap, they do
+	    not contribute to disk thrashing.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term><literal>memoryuse</literal></term>
+
+	<listitem>
+	  <para>The maximum amount of memory<indexterm><primary>memoryuse</primary></indexterm><indexterm><primary>limiting users</primary><secondary>memoryuse</secondary></indexterm> a process may consume at
+	    any given time.  It includes both core memory and swap
+	    usage.  This is not a catch-all limit for restricting
+	    memory consumption, but is a good start.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term><literal>openfiles</literal></term>
+
+	<listitem>
+	  <para>The maximum number of files a process may have open<indexterm><primary>openfiles</primary></indexterm><indexterm><primary>limiting users</primary><secondary>openfiles</secondary></indexterm>.
+	    In &os;, files are used to represent sockets and IPC
+	    channels, so be careful not to set this too low.  The
+	    system-wide limit for this is defined by the
+	    <varname>kern.maxfiles</varname> &man.sysctl.8;.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term><literal>sbsize</literal></term>
+
+	<listitem>
+	  <para>The limit on the amount of network memory, and
+	    thus mbufs<indexterm><primary>sbsize</primary></indexterm><indexterm><primary>limiting users</primary><secondary>sbsize</secondary></indexterm>, a user may consume in order to limit network
+	    communications.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term><literal>stacksize</literal></term>
+
+	<listitem>
+	  <para>The maximum size of a process stack<indexterm><primary>stacksize</primary></indexterm><indexterm><primary>limiting users</primary><secondary>stacksize</secondary></indexterm>.  This alone is
+	    not sufficient to limit the amount of memory a program
+	    may use so it should be used in conjunction with other
+	    limits.</para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+
+    <para>There are a few other things to remember when setting
+      resource limits.  Following are some general tips, suggestions,
+      and miscellaneous comments.</para>
+
+    <itemizedlist>
+      <listitem>
+	<para>Processes started at system startup by
+	  <filename>/etc/rc</filename> are assigned to the
+	  <literal>daemon</literal> login class.</para>
+      </listitem>
+
+      <listitem>
+	<para>Although the <filename>/etc/login.conf</filename> that
+	  comes with the system is a good source of reasonable values
+	  for most limits, they may not be appropriate for every
+	  system.  Setting a limit too high may open the system up to
+	  abuse, while setting it too low may put a strain on
+	  productivity.</para>
+      </listitem>
+
+      <listitem>
+	<para>Users of <application>&xorg;</application> should
+	  probably be granted more resources than other users.
+	  <application>&xorg;</application> by itself takes a lot of
+	  resources, but it also encourages users to run more programs
+	  simultaneously.</para>
+      </listitem>
+
+      <listitem>
+	<para>Many limits apply to individual processes, not the user
+	  as a whole.  For example, setting
+	  <varname>openfiles</varname> to 50 means that each process
+	  the user runs may open up to 50 files.  The total amount
+	  of files a user may open is the value of
+	  <literal>openfiles</literal> multiplied by the value of
+	  <literal>maxproc</literal>.  This also applies to memory
+	  consumption.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>For further information on resource limits and login classes
+      and capabilities in general, refer to &man.cap.mkdb.1;,
+      &man.getrlimit.2;, and &man.login.conf.5;.</para>
+  </sect2>
+
+  <sect2 id="users-groups">
+    <title>Managing Groups</title>
+
+    <indexterm><primary>groups</primary></indexterm>
+    <indexterm>
+      <primary><filename>/etc/groups</filename></primary>
+    </indexterm>
+    <indexterm>
+      <primary>accounts</primary>
+      <secondary>groups</secondary>
+    </indexterm>
+    <para>A group is a list of users.  A group is identified by its
+      group name and <acronym>GID</acronym>.  In &os;, the
+      kernel uses the <acronym>UID</acronym> of a process, and the
+      list of groups it belongs to, to determine what the process is
+      allowed to do.  Most of the time, the <acronym>GID</acronym> of
+      a user or process usually means the first group in the
+      list.</para>
+
+    <para>The group name to <acronym>GID</acronym> mapping is listed
+      in <filename>/etc/group</filename>.  This is a plain text file
+      with four colon-delimited fields.  The first field is the group
+      name, the second is the encrypted password, the third the
+      <acronym>GID</acronym>, and the fourth the comma-delimited list
+      of members.  For a more complete description of the syntax,
+      refer to &man.group.5;.</para>
+
+    <para>The superuser can modify <filename>/etc/group</filename>
+      using a text editor.  Alternatively, &man.pw.8; can be used to
+      add and edit groups.  For example, to add a group called
+      <groupname>teamtwo</groupname> and then confirm that it
+      exists:</para>
+
+    <example>
+      <title>Adding a Group Using &man.pw.8;</title>
+
+      <screen>&prompt.root; <userinput>pw groupadd teamtwo</userinput>
+&prompt.root; <userinput>pw groupshow teamtwo</userinput>
+teamtwo:*:1100:</screen>
+    </example>
+
+    <para>In this example, <literal>1100</literal> is the
+      <acronym>GID</acronym> of <groupname>teamtwo</groupname>.  Right
+      now, <groupname>teamtwo</groupname> has no members.  This
+      command will add <username>jru</username> as a member of
+      <groupname>teamtwo</groupname>.</para>
+
+    <example>
+      <title>Adding User Accounts to a New Group Using
+	&man.pw.8;</title>
+
+      <screen>&prompt.root; <userinput>pw groupmod teamtwo -M jru</userinput>
+&prompt.root; <userinput>pw groupshow teamtwo</userinput>
+teamtwo:*:1100:jru</screen>
+    </example>
+
+    <para>The argument to <option>-M</option> is a comma-delimited
+      list of users to be added to a new (empty) group or to replace
+      the members of an existing group.  To the user, this group
+      membership is different from (and in addition to) the user's
+      primary group listed in the password file.  This means that
+      the user will not show up as a member when using
+      <option>groupshow</option> with &man.pw.8;, but will show up
+      when the information is queried via &man.id.1; or a similar
+      tool.  When &man.pw.8; is used to add a user to a group, it only
+      manipulates <filename>/etc/group</filename> and does not attempt
+      to read additional data from
+      <filename>/etc/passwd</filename>.</para>
+
+    <example>
+      <title>Adding a New Member to a Group Using &man.pw.8;</title>
+
+      <screen>&prompt.root; <userinput>pw groupmod teamtwo -m db</userinput>
+&prompt.root; <userinput>pw groupshow teamtwo</userinput>
+teamtwo:*:1100:jru,db</screen>
+    </example>
+
+    <para>In this example, the argument to <option>-m</option> is a
+      comma-delimited list of users who are to be added to the group.
+      Unlike the previous example, these users are appended to the
+      group list and do not replace the list of existing users in the
+      group.</para>

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

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

Author: gjb
Date: Mon Oct 14 17:02:29 2013
New Revision: 42954
URL: http://svnweb.freebsd.org/changeset/doc/42954

Log:
  Announce 10.0-BETA1.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/share/xml/news.xml

Modified: head/share/xml/news.xml
==============================================================================
--- head/share/xml/news.xml	Mon Oct 14 16:44:15 2013	(r42953)
+++ head/share/xml/news.xml	Mon Oct 14 17:02:29 2013	(r42954)
@@ -34,6 +34,22 @@
       <name>10</name>
 
       <day>
+	<name>14</name>
+
+	<event>
+	  <title>&os;&nbsp;10.0-BETA1 Available</title>
+
+	  <p>The first BETA build for the &os;-10.0 release cycle is
+	    now available.  ISO images for the amd64, i386, ia64,
+	    powerpc, powerpc64 and sparc64 architectures are <a
+	      href="&lists.current;/2013-October/075504.html">available</a>
+	    on most of our <a
+	      href="&url.doc.base-en;/books/handbook/mirrors-ftp.html">&os;
+	    mirror sites</a>.</p>
+	</event>
+      </day>
+
+      <day>
 	<name>9</name>
 	<event>
 	  <p>New committer:

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

Author: ryusuke
Date: Mon Oct 14 17:26:03 2013
New Revision: 42955
URL: http://svnweb.freebsd.org/changeset/doc/42955

Log:
  - Merge the following from the English version:
  
  	r42929 -> r42954	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	Mon Oct 14 17:02:29 2013	(r42954)
+++ head/ja_JP.eucJP/share/xml/news.xml	Mon Oct 14 17:26:03 2013	(r42955)
@@ -20,7 +20,7 @@
      the contents of <title> will be preferred over <p>.
 
      $FreeBSD$
-     Original revision: r42929
+     Original revision: r42954
 -->
 <news>
     <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
@@ -34,6 +34,21 @@
       <name>10</name>
 
       <day>
+	<name>14</name>
+
+	<event>
+	  <title>&os;&nbsp;10.0-BETA1 ¸ø³«</title>
+
+	  <p>&os;-10.0 ¥ê¥ê¡¼¥¹¥µ¥¤¥¯¥ë¤«¤éºÇ½é¤Î¥Ù¡¼¥¿ÈǤ¬¸ø³«¤µ¤́¤̃¤·¤¿ (<a
+	      href="&lists.current;/2013-October/075504.html">¥¢¥Ê¥¦¥ó¥¹</a>)¡£
+	    <a
+	      href="&url.doc.base;/books/handbook/mirrors-ftp.html">&os;
+	    ¥ß¥é¡¼¥µ¥¤¥È</a> ¤«¤é amd64, i386, ia64, powerpc, powerpc64 ¤ª¤è¤Ó
+	    sparc64 ¥¢¡¼¥­¥Æ¥¯¥Á¥ă¤Î ISO ¥¤¥á¡¼¥¸¤̣Æ₫¼ê¤Ç¤­¤̃¤¹¡£</p>
+	</event>
+      </day>
+
+      <day>
 	<name>9</name>
 	<event>
 	  <p>¿·¥³¥ß¥Ă¥¿½¢Ç¤:

From owner-svn-doc-head@FreeBSD.ORG  Mon Oct 14 17:45:56 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id ECC1C56A;
 Mon, 14 Oct 2013 17:45: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 D8F432A54;
 Mon, 14 Oct 2013 17:45:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9EHjtrh048643;
 Mon, 14 Oct 2013 17:45:55 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9EHjt4e048642;
 Mon, 14 Oct 2013 17:45:55 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310141745.r9EHjt4e048642@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Mon, 14 Oct 2013 17:45:55 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42956 - head/en_US.ISO8859-1/books/handbook/basics
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Oct 2013 17:45:56 -0000

Author: dru
Date: Mon Oct 14 17:45:55 2013
New Revision: 42956
URL: http://svnweb.freebsd.org/changeset/doc/42956

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	Mon Oct 14 17:26:03 2013	(r42955)
+++ head/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Mon Oct 14 17:45:55 2013	(r42956)
@@ -85,46 +85,48 @@
 
     <indexterm><primary>virtual consoles</primary></indexterm>
     <indexterm><primary>terminals</primary></indexterm>
-      <indexterm><primary>console</primary></indexterm>
+    <indexterm><primary>console</primary></indexterm>
 
-      <para>Unless &os; has been configured to automatically start a
-	graphical environment during startup, the system will boot
-	into a command line login prompt, as seen in this
-	example:</para>
+    <para>Unless &os; has been configured to automatically start a
+      graphical environment during startup, the system will boot
+      into a command line login prompt, as seen in this
+      example:</para>
 
-      <screen>FreeBSD/amd64 (pc3.example.org) (ttyv0)
+    <screen>FreeBSD/amd64 (pc3.example.org) (ttyv0)
 
 login:</screen>
 
-      <para>The first line contains some information about the system.
-	The <literal>amd64</literal> indicates that the system in this
-	example is running a 64-bit version of &os;.  The hostname is
-	<hostid>pc3.example.org</hostid>, and
-	<devicename>ttyv0</devicename> indicates that this is the
-	<quote>system console</quote>.  The second line is the login prompt.</para>
-
-      <para>Since &os; is a multiuser system, it needs some way to distinguish
-	between different users.  This is accomplished by
-	requiring every user to log into the
-	system before gaining access to the programs on the system.  Every user has a
-	unique name <quote>username</quote> and a personal
-	<quote>password</quote>.</para>
-
-      <para>To log into the system console, type the username that was configured during system
-	installation, as described in
-	<xref linkend="bsdinstall-addusers"/>, and press
-	<keycap>Enter</keycap>.  Then enter the password associated
-	with the username and press <keycap>Enter</keycap>.  The
-	password is <emphasis>not echoed</emphasis> for security
-	reasons.</para>
-
-      <para>Once the correct password is input, the message of the
-	day (<acronym>MOTD</acronym>) will be displayed followed
-	by a command prompt.  Depending upon the shell that was selected
-	when the user was created, this prompt will be a <literal>#</literal>,
-	<literal>$</literal>, or <literal>%</literal> character.  The
-	prompt indicates that the user is now logged into the &os; system console and ready to try the
-	available commands.</para>
+    <para>The first line contains some information about the system.
+      The <literal>amd64</literal> indicates that the system in this
+      example is running a 64-bit version of &os;.  The hostname is
+      <hostid>pc3.example.org</hostid>, and
+      <devicename>ttyv0</devicename> indicates that this is the
+      <quote>system console</quote>.  The second line is the login
+      prompt.</para>
+
+    <para>Since &os; is a multiuser system, it needs some way to
+      distinguish between different users.  This is accomplished by
+      requiring every user to log into the system before gaining
+      access to the programs on the system.  Every user has a
+      unique name <quote>username</quote> and a personal
+      <quote>password</quote>.</para>
+
+    <para>To log into the system console, type the username that
+      was configured during system installation, as described in
+      <xref linkend="bsdinstall-addusers"/>, and press
+      <keycap>Enter</keycap>.  Then enter the password associated
+      with the username and press <keycap>Enter</keycap>.  The
+      password is <emphasis>not echoed</emphasis> for security
+      reasons.</para>
+
+    <para>Once the correct password is input, the message of the
+      day (<acronym>MOTD</acronym>) will be displayed followed
+      by a command prompt.  Depending upon the shell that was
+      selected when the user was created, this prompt will be a
+      <literal>#</literal>, <literal>$</literal>, or
+      <literal>%</literal> character.  The prompt indicates that
+      the user is now logged into the &os; system console and ready
+      to try the available commands.</para>
 
     <sect2 id="consoles-virtual">
       <title>Virtual Consoles</title>
@@ -138,19 +140,22 @@ login:</screen>
 	user is working on, making it difficult to concentrate on
 	the work at hand.</para>
 
-      <para>By default, &os; is configured to provide several virtual consoles
-	for inputting commands.  Each virtual console has its own
-	login prompt and shell and it is easy to switch between
-	virtual consoles.  This essentially provides the command line
-	equivalent of having several windows open at the same time
-	in a graphical environment.</para>
+      <para>By default, &os; is configured to provide several virtual
+	consoles for inputting commands.  Each virtual console has
+	its own login prompt and shell and it is easy to switch
+	between virtual consoles.  This essentially provides the
+	command line equivalent of having several windows open at the
+	same time in a graphical environment.</para>
 
-      <para>The key combinations <keycombo><keycap>Alt</keycap><keycap>F1</keycap></keycombo>
+      <para>The key combinations
+	<keycombo><keycap>Alt</keycap><keycap>F1</keycap></keycombo>
 	through
-	<keycombo><keycap>Alt</keycap><keycap>F8</keycap></keycombo> have been reserved by &os; for
-	switching between virtual consoles.  Use
+	<keycombo><keycap>Alt</keycap><keycap>F8</keycap></keycombo>
+	have been reserved by &os; for switching between virtual
+	consoles.  Use
 	<keycombo><keycap>Alt</keycap><keycap>F1</keycap></keycombo>
-	to switch to the system console (<devicename>ttyv0</devicename>),
+	to switch to the system console
+	(<devicename>ttyv0</devicename>),
 	<keycombo><keycap>Alt</keycap><keycap>F2</keycap></keycombo>
 	to access the first virtual console
 	(<devicename>ttyv1</devicename>),
@@ -159,22 +164,19 @@ login:</screen>
 	(<devicename>ttyv2</devicename>), and so on.</para>
 
       <para>When switching from one console to the next, &os; takes
-	manages the screen output.  The result is
-	an illusion of having multiple
-	virtual screens and keyboards that can be used
+	manages the screen output.  The result is an illusion of
+	having multiple virtual screens and keyboards that can be used
 	to type commands for &os; to run.  The programs that are
 	launched in one virtual console do not stop running when
-	the user switches to a
-	different virtual console.</para>
+	the user switches to a different virtual console.</para>
 
       <para>Refer to &man.syscons.4;, &man.atkbd.4;,
 	&man.vidcontrol.1; and &man.kbdcontrol.1; for a more
 	technical description of the &os; console and its keyboard
 	drivers.</para>
 
-      <para>In &os;, the number of available virtual
-	consoles is configured in this
-	section of
+      <para>In &os;, the number of available virtual consoles is
+	configured in this section of
 	<filename>/etc/ttys</filename>:</para>
 
       <programlisting># name    getty                         type  status comments
@@ -191,11 +193,12 @@ ttyv7   "/usr/libexec/getty Pc"         
 ttyv8   "/usr/X11R6/bin/xdm -nodaemon"  xterm   off secure</programlisting>
 
 
-      <para>To disable a virtual console, put a comment symbol (<literal>#</literal>)
-	at the beginning of the line representing that virtual console.
-	For example, to reduce the number of available virtual consoles
-	from eight to four, put a <literal>#</literal> in front of
-	the last four lines representing virtual consoles
+      <para>To disable a virtual console, put a comment symbol
+	(<literal>#</literal>) at the beginning of the line
+	representing that virtual console.  For example, to reduce
+	the number of available virtual consoles from eight to four,
+	put a <literal>#</literal> in front of the last four lines
+	representing virtual consoles
 	<devicename>ttyv5</devicename> through
 	<devicename>ttyv8</devicename>.  <emphasis>Do not</emphasis>
 	comment out the line for the system console
@@ -204,7 +207,7 @@ ttyv8   "/usr/X11R6/bin/xdm -nodaemon"  
 	the graphical environment if <application>&xorg;</application>
 	has been installed and configured as described in <xref
 	  linkend="x11"/>.</para>
-	
+
       <para>For a detailed description of every column in this file
 	and the available options for the virtual consoles, refer to
 	&man.ttys.5;.</para>
@@ -216,40 +219,38 @@ ttyv8   "/usr/X11R6/bin/xdm -nodaemon"  
       <para>The &os; boot menu provides an option labelled as
 	<quote>Boot Single User</quote>.  If this option is selected,
 	the system will boot into a special mode known as
-	<quote>single user mode</quote>.  This mode is typically used to
-	repair a system that will not boot or to reset the
+	<quote>single user mode</quote>.  This mode is typically used
+	to repair a system that will not boot or to reset the
 	<username>root</username> password when it is not known.
-	While in single user mode, networking and other
-	virtual consoles are not available.  However, full
+	While in single user mode, networking and other virtual
+	consoles are not available.  However, full
 	<username>root</username> access to the system is available,
 	and by default, the <username>root</username> password is not
 	needed.  For these reasons, physical access to the keyboard
-	is needed to boot into this mode and determining who has physical
-	access to the keyboard is something to consider when securing
-	a &os; system.</para>
+	is needed to boot into this mode and determining who has
+	physical access to the keyboard is something to consider when
+	securing a &os; system.</para>
 
-      <para>The settings which control
-	single user mode are found in this section of
-	<filename>/etc/ttys</filename>:</para>
+      <para>The settings which control single user mode are found in
+	this section of <filename>/etc/ttys</filename>:</para>
 
       <programlisting># name  getty                           type  status  comments
 #
 # If console is marked "insecure", then init will ask for the root password
 # when going to single-user mode.
 console none                            unknown  off  secure</programlisting>
-	
-      <para>By default, the status is set to <literal>secure</literal>.
-	  This assumes that who has physical access to the keyboard
-	  is either not important or it is controlled by a physical
-	  security policy.  If this setting is changed to
-	  <literal>insecure</literal>, the assumption is that the
-	  environment itself is insecure because anyone can access
-	  the keyboard.  When this line is changed to
-	  <literal>insecure</literal>, &os; will prompt for the
-	  <username>root</username> password when a user selects to boot into single
-	  user mode.
-	  </para>
-	  
+
+      <para>By default, the status is set to
+	<literal>secure</literal>.  This assumes that who has
+	physical access to the keyboard is either not important or it
+	is controlled by a physical security policy.  If this setting
+	is changed to <literal>insecure</literal>, the assumption is
+	that the environment itself is insecure because anyone can
+	access the keyboard.  When this line is changed to
+	<literal>insecure</literal>, &os; will prompt for the
+	<username>root</username> password when a user selects to
+	boot into single user mode.</para>
+
       <note>
 	<para><emphasis>Be careful when changing this setting to
 	    <literal>insecure</literal></emphasis>!  If the
@@ -331,94 +332,95 @@ console none                            
       </listitem>
 
       <listitem>
-	<para>How to create groups and add users as members of a group.</para>
+	<para>How to create groups and add users as members of a
+	  group.</para>
       </listitem>
     </itemizedlist>
 
-  <sect2 id="users-introduction">
-    <title>Account Types</title>
-
-    <para>Since all access to the &os; system is achieved using accounts
-      and all processes are run by users, user and account management
-      is important.</para>
-
-    <para>There are three main types of accounts:
-      system accounts,
-      user accounts, and the
-      superuser account.</para>
-
-    <sect3 id="users-system">
-      <title>System Accounts</title>
-
-      <indexterm>
-	<primary>accounts</primary>
-	<secondary>system</secondary>
-      </indexterm>
-
-      <para>System accounts are used to run services such as DNS,
-	mail, and web servers.  The reason for this is security; if
-	all services ran as the superuser, they could act without
-	restriction.</para>
-
-      <indexterm>
-	<primary>accounts</primary>
-	<secondary><username>daemon</username></secondary>
-      </indexterm>
-      <indexterm>
-	<primary>accounts</primary>
-	<secondary><username>operator</username></secondary>
-      </indexterm>
-
-      <para>Examples of system accounts are
-	<username>daemon</username>, <username>operator</username>,
-	<username>bind</username>, <username>news</username>, and
-	<username>www</username>.</para>
+    <sect2 id="users-introduction">
+      <title>Account Types</title>
 
-      <indexterm>
-	<primary>accounts</primary>
-	<secondary><username>nobody</username></secondary>
-      </indexterm>
-
-      <para><username>nobody</username> is the generic unprivileged
-	system account.  However, the more services that use
-	<username>nobody</username>, the more files and processes that
-	user will become associated with, and hence the more
-	privileged that user becomes.</para>
-    </sect3>
-
-    <sect3 id="users-user">
-      <title>User Accounts</title>
-
-      <indexterm>
-	<primary>accounts</primary>
-	<secondary>user</secondary>
-      </indexterm>
-
-      <para>User accounts are
-	assigned to real people and are used to log in and use the
-	system.  Every person accessing the system should have a unique
-	user account.  This allows the administrator to find out who
-	is doing what and prevents users from clobbering the
-	settings of other users.</para>
-
-      <para>Each user can set up their own environment to accommodate
-	their use of the system, by configuring their default shell, editor,
-	key bindings, and language settings.</para>
-     <para>Every user account on a &os; system has certain information
-      associated with it:</para>
-
-    <variablelist>
-      <varlistentry>
-	<term>User name</term>
+      <para>Since all access to the &os; system is achieved using
+	accounts and all processes are run by users, user and account
+	management is important.</para>
+
+      <para>There are three main types of accounts: system accounts,
+	user accounts, and the superuser account.</para>
+
+      <sect3 id="users-system">
+	<title>System Accounts</title>
+
+	<indexterm>
+	  <primary>accounts</primary>
+	  <secondary>system</secondary>
+	</indexterm>
+
+	<para>System accounts are used to run services such as DNS,
+	  mail, and web servers.  The reason for this is security; if
+	  all services ran as the superuser, they could act without
+	  restriction.</para>
+
+	<indexterm>
+	  <primary>accounts</primary>
+	  <secondary><username>daemon</username></secondary>
+	</indexterm>
+	<indexterm>
+	  <primary>accounts</primary>
+	  <secondary><username>operator</username></secondary>
+	</indexterm>
+
+	<para>Examples of system accounts are
+	  <username>daemon</username>, <username>operator</username>,
+	  <username>bind</username>, <username>news</username>, and
+	  <username>www</username>.</para>
+
+	<indexterm>
+	  <primary>accounts</primary>
+	  <secondary><username>nobody</username></secondary>
+	</indexterm>
+
+	<para><username>nobody</username> is the generic unprivileged
+	  system account.  However, the more services that use
+	  <username>nobody</username>, the more files and processes
+	  that user will become associated with, and hence the more
+	  privileged that user becomes.</para>
+      </sect3>
+
+      <sect3 id="users-user">
+	<title>User Accounts</title>
+
+	<indexterm>
+	  <primary>accounts</primary>
+	  <secondary>user</secondary>
+	</indexterm>
+
+	<para>User accounts are assigned to real people and are used
+	  to log in and use the system.  Every person accessing the
+	  system should have a unique user account.  This allows the
+	  administrator to find out who is doing what and prevents
+	  users from clobbering the settings of other users.</para>
+
+	<para>Each user can set up their own environment to
+	  accommodate their use of the system, by configuring their
+	  default shell, editor, key bindings, and language
+	  settings.</para>
+
+	<para>Every user account on a &os; system has certain
+	  information associated with it:</para>
+
+	<variablelist>
+	  <varlistentry>
+	    <term>User name</term>
 
 	<listitem>
 	  <para>The user name is typed at the <prompt>login:</prompt>
 	    prompt.  User names must be unique on the system as no two
 	    users can have the same user name.  There are a number of
-	    rules for creating valid user names which are documented in
-	    &man.passwd.5;.  It is recommended to use user names that consist of eight or
-	    fewer, all lower case characters in order to maintain
-	    backwards compatibility with applications.</para>
+	    rules for creating valid user names which are documented
+	    in &man.passwd.5;.  It is recommended to use user names
+	    that consist of eight or fewer, all lower case characters
+	    in order to maintain backwards compatibility with
+	    applications.</para>
 	</listitem>
       </varlistentry>
 
@@ -426,8 +428,9 @@ console none                            
 	<term>Password</term>
 
 	<listitem>
-	  <para>Each user account should have an associated password.  While the
-	    password can be blank, this is highly discouraged.</para>
+	  <para>Each user account should have an associated password.
+	    While the password can be blank, this is highly
+	    discouraged.</para>
 	</listitem>
       </varlistentry>
 
@@ -435,14 +438,13 @@ console none                            
 	<term>User ID (<acronym>UID</acronym>)</term>
 
 	<listitem>
-	  <para>The User ID (<acronym>UID</acronym>) is a number
-	    used to uniquely identify the user to the
-	    &os; system.  Commands that
-	    allow a user name to be specified will first convert it to
-	    the <acronym>UID</acronym>.  It is recommended to use a UID of
-	    65535 or lower as higher UIDs may cause compatibility
-	    issues with software that does not support integers larger
-	    than 32-bits.</para>
+	  <para>The User ID (<acronym>UID</acronym>) is a number used
+	    to uniquely identify the user to the &os; system.
+	    Commands that allow a user name to be specified will
+	    first convert it to the <acronym>UID</acronym>.  It is
+	    recommended to use a UID of 65535 or lower as higher UIDs
+	    may cause compatibility issues with software that does
+	    not support integers larger than 32-bits.</para>
 	</listitem>
       </varlistentry>
 
@@ -450,14 +452,15 @@ console none                            
 	<term>Group ID (<acronym>GID</acronym>)</term>
 
 	<listitem>
-	  <para>The Group ID (<acronym>GID</acronym>) is a number used to uniquely identify
-	    the primary group that the user belongs to.  Groups are a
-	    mechanism for controlling access to resources based on a
-	    user's <acronym>GID</acronym> rather than their
+	  <para>The Group ID (<acronym>GID</acronym>) is a number
+	    used to uniquely identify the primary group that the user
+	    belongs to.  Groups are a mechanism for controlling
+	    access to resources based on a user's
+	    <acronym>GID</acronym> rather than their
 	    <acronym>UID</acronym>.  This can significantly reduce the
 	    size of some configuration files and allows users to be
-	    members of more than one group.  It is recommended to use a GID of
-	    65535 or lower as higher GIDs may break some
+	    members of more than one group.  It is recommended to use
+	    a GID of 65535 or lower as higher GIDs may break some
 	    software.</para>
 	</listitem>
       </varlistentry>
@@ -479,9 +482,9 @@ console none                            
 	<listitem>
 	  <para>By default, &os; does not force users to change their
 	    passwords periodically.  Password expiration can be
-	    enforced on a per-user basis using &man.pw.8;, forcing some or all users to
-	    change their passwords after a certain amount of time has
-	    elapsed.</para>
+	    enforced on a per-user basis using &man.pw.8;, forcing
+	    some or all users to change their passwords after a
+	    certain amount of time has elapsed.</para>
 	</listitem>
       </varlistentry>
 
@@ -492,9 +495,10 @@ console none                            
 	  <para>By default, &os; does not expire accounts.  When
 	    creating accounts that need a limited lifespan, such as
 	    student accounts in a school, specify the account expiry
-	    date using &man.pw.8;.  After the expiry time has elapsed, the account
-	    cannot be used to log in to the system, although the
-	    account's directories and files will remain.</para>
+	    date using &man.pw.8;.  After the expiry time has
+	    elapsed, the account cannot be used to log in to the
+	    system, although the account's directories and files will
+	    remain.</para>
 	</listitem>
       </varlistentry>
 
@@ -504,9 +508,9 @@ console none                            
 	<listitem>
 	  <para>The user name uniquely identifies the account to &os;,
 	    but does not necessarily reflect the user's real name.
-	    Similar to a comment, this information
-	    can contain a space, uppercase characters, and be more
-	    than 8 characters long.</para>
+	    Similar to a comment, this information can contain a
+	    space, uppercase characters, and be more than 8
+	    characters long.</para>
 	</listitem>
       </varlistentry>
 
@@ -538,9 +542,9 @@ console none                            
 	</listitem>
       </varlistentry>
     </variablelist>
-    </sect3>
+  </sect3>
 
-      <sect3 id="users-superuser">
+    <sect3 id="users-superuser">
       <title>The Superuser Account</title>
 
       <indexterm>
@@ -558,50 +562,53 @@ console none                            
       <para>The superuser, unlike other user
 	accounts, can operate without limits, and misuse of the
 	superuser account may result in spectacular disasters.  User
-	accounts are unable to destroy the operating system by mistake, so it is
-	recommended to login as a user account and to only become the superuser
-	when a command requires extra privilege.</para>
+	accounts are unable to destroy the operating system by
+	mistake, so it is recommended to login as a user account and
+	to only become the superuser when a command requires extra
+	privilege.</para>
 
       <para>Always double and triple-check any commands issued as the
 	superuser, since an extra space or missing character can mean
 	irreparable data loss.</para>
 
-      <para>There are several ways to become gain superuser privilege.  While one
-      can log in as <username>root</username>, this is highly discouraged.</para>
-
-    <para>Instead, use &man.su.1; to become the superuser.  If
-      <literal>-</literal> is specified when running this command, the user will also inherit the root user's environment.
-      The user running this command must
-      be in the <groupname>wheel</groupname> group or else the command
-      will fail.  The user must also know the password for the
-      <username>root</username> user account.</para>
-
-      <para>In this example, the user only becomes superuser in order to run
-      <command>make install</command> as this step requires superuser privilege.
-      Once the command completes, the user types <command>exit</command>
-      to leave the superuser account and return to the privilege of
-      their user account.</para>
+      <para>There are several ways to become gain superuser privilege.
+	While one can log in as <username>root</username>, this is
+	highly discouraged.</para>
+
+      <para>Instead, use &man.su.1; to become the superuser.  If
+	<literal>-</literal> is specified when running this command,
+	the user will also inherit the root user's environment.  The
+	user running this command must be in the
+	<groupname>wheel</groupname> group or else the command will
+	fail.  The user must also know the password for the
+	<username>root</username> user account.</para>
+
+      <para>In this example, the user only becomes superuser in order
+	to run <command>make install</command> as this step requires
+	superuser privilege.  Once the command completes, the user
+	types <command>exit</command> to leave the superuser account
+	and return to the privilege of their user account.</para>
 
-    <example>
-      <title>Install a Program As The Superuser</title>
+      <example>
+	<title>Install a Program As The Superuser</title>
 
-      <screen>&prompt.user; <userinput>configure</userinput>
+	<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>
+      </example>
 
-    <para>The built-in &man.su.1; framework works well for single systems or small
-      networks with just one system administrator.  An alternative
-      is to install the
-      <filename role="package">security/sudo</filename> package or port.  This software
-      provides activity logging and allows the administrator to configure which users
-      can run which commands
-      as the superuser.</para>
-  </sect3>
+      <para>The built-in &man.su.1; framework works well for single
+	systems or small networks with just one system administrator.
+	An alternative is to install the <filename
+	  role="package">security/sudo</filename> package or port.
+	This software provides activity logging and allows the
+	administrator to configure which users can run which commands
+	as the superuser.</para>
+    </sect3>
   </sect2>
 
   <sect2 id="users-modifying">
@@ -918,7 +925,7 @@ passwd: done</screen>
 	<title>Changing Another User's Password as the
 	  Superuser</title>
 
-        <screen>&prompt.root; <userinput>passwd jru</userinput>
+	<screen>&prompt.root; <userinput>passwd jru</userinput>
 Changing local password for jru.
 New password:
 Retype new password:
@@ -1025,14 +1032,17 @@ passwd: done</screen>
 	<term><literal>coredumpsize</literal></term>
 
 	<listitem>
-	  <para>The limit on the size of a core file<indexterm><primary>coredumpsize</primary></indexterm> generated by a
-	    program is subordinate to other limits<indexterm><primary>limiting users</primary><secondary>coredumpsize</secondary></indexterm> on disk usage, such
-	    as <literal>filesize</literal>, or disk quotas.
-	    This limit is often used as a less-severe method of
-	    controlling disk space consumption.  Since users do not
-	    generate core files themselves, and often do not delete
-	    them, setting this may save them from running out of disk
-	    space should a large program crash.</para>
+	  <para>The limit on the size of a core file
+	    <indexterm><primary>coredumpsize</primary></indexterm>
+	    generated by a program is subordinate to other
+	    limits <indexterm><primary>limiting users
+	      </primary><secondary>coredumpsize</secondary></indexterm>
+	    on disk usage, such as <literal>filesize</literal>, or
+	    disk quotas.  This limit is often used as a less-severe
+	    method of controlling disk space consumption.  Since
+	    users do not generate core files themselves, and often do
+	    not delete them, setting this may save them from running
+	    out of disk space should a large program crash.</para>
 	</listitem>
       </varlistentry>
 
@@ -1040,9 +1050,12 @@ passwd: done</screen>
 	<term><literal>cputime</literal></term>
 
 	<listitem>
-	  <para>The maximum amount of CPU<indexterm><primary>cputime</primary></indexterm><indexterm><primary>limiting users</primary><secondary>cputime</secondary></indexterm> time a user's process may
-	    consume.  Offending processes will be killed by the
-	    kernel.</para>
+	  <para>The maximum amount of CPU
+	    <indexterm><primary>cputime</primary></indexterm><indexterm><primary>
+	      limiting users
+	      </primary><secondary>cputime</secondary></indexterm>
+	    time a user's process may consume.  Offending processes
+	    will be killed by the kernel.</para>
 
 	  <note>
 	    <para>This is a limit on CPU <emphasis>time</emphasis>
@@ -1056,10 +1069,13 @@ passwd: done</screen>
 	<term><literal>filesize</literal></term>
 
 	<listitem>
-	  <para>The maximum size of a file<indexterm><primary>filesize</primary></indexterm><indexterm><primary>limiting users</primary><secondary>filesize</secondary></indexterm> the user may own.  Unlike
-	    <link linkend="quotas">disk quotas</link>, this limit is
-	    enforced on individual files, not the set of all files a
-	    user owns.</para>
+	  <para>The maximum size of a file
+	    <indexterm><primary>filesize</primary></indexterm><indexterm><primary>
+		limiting users
+		</primary><secondary>filesize</secondary></indexterm>
+	    the user may own.  Unlike <link linkend="quotas">disk
+	      quotas</link>, this limit is enforced on individual
+	    files, not the set of all files a user owns.</para>
 	</listitem>
       </varlistentry>
 
@@ -1067,9 +1083,13 @@ passwd: done</screen>
 	<term><literal>maxproc</literal></term>
 
 	<listitem>
-	  <para>The maximum number of processes<indexterm><primary>maxproc</primary></indexterm><indexterm><primary>limiting users</primary><secondary>maxproc</secondary></indexterm> a user can run.  This
-	    includes foreground and background processes.  This limit
-	    may not be larger than the system limit specified by the
+	  <para>The maximum number of processes
+	    <indexterm><primary>maxproc</primary></indexterm><indexterm><primary>
+	      limiting users
+	      </primary><secondary>maxproc</secondary></indexterm> a
+	    user can run.  This includes foreground and background
+	    processes.  This limit may not be larger than the system
+	    limit specified by the
 	    <varname>kern.maxproc</varname> &man.sysctl.8;.  Setting
 	    this limit too small may hinder a user's productivity as
 	    it is often useful to be logged in multiple times or to
@@ -1083,11 +1103,15 @@ passwd: done</screen>
 	<term><literal>memorylocked</literal></term>
 
 	<listitem>
-	  <para>The maximum amount of memory<indexterm><primary>memorylocked</primary></indexterm><indexterm><primary>limiting users</primary><secondary>memorylocked</secondary></indexterm> a process may request
-	    to be locked into main memory using &man.mlock.2;.  Some
-	    system-critical programs, such as &man.amd.8;, lock into
-	    main memory so that if the system begins to swap, they do
-	    not contribute to disk thrashing.</para>
+	  <para>The maximum amount of memory
+	    <indexterm><primary>memorylocked</primary></indexterm><indexterm><primary>
+		limiting users
+		</primary><secondary>memorylocked</secondary></indexterm>
+	    a process may request to be locked into main memory using
+	    &man.mlock.2;.  Some system-critical programs, such as
+	    &man.amd.8;, lock into main memory so that if the system
+	    begins to swap, they do not contribute to disk
+	    thrashing.</para>
 	</listitem>
       </varlistentry>
 
@@ -1095,10 +1119,14 @@ passwd: done</screen>
 	<term><literal>memoryuse</literal></term>
 
 	<listitem>
-	  <para>The maximum amount of memory<indexterm><primary>memoryuse</primary></indexterm><indexterm><primary>limiting users</primary><secondary>memoryuse</secondary></indexterm> a process may consume at
-	    any given time.  It includes both core memory and swap
-	    usage.  This is not a catch-all limit for restricting
-	    memory consumption, but is a good start.</para>
+	  <para>The maximum amount of memory
+	    <indexterm><primary>memoryuse</primary></indexterm><indexterm><primary>
+		limiting
+		users</primary><secondary>memoryuse</secondary></indexterm>
+	    a process may consume at any given time.  It includes both
+	    core memory and swap usage.  This is not a catch-all limit
+	    for restricting memory consumption, but is a good
+	    start.</para>
 	</listitem>
       </varlistentry>
 
@@ -1106,7 +1134,10 @@ passwd: done</screen>
 	<term><literal>openfiles</literal></term>
 
 	<listitem>
-	  <para>The maximum number of files a process may have open<indexterm><primary>openfiles</primary></indexterm><indexterm><primary>limiting users</primary><secondary>openfiles</secondary></indexterm>.
+	  <para>The maximum number of files a process may have open
+	    <indexterm><primary>openfiles</primary></indexterm><indexterm><primary>
+		limiting
+		users</primary><secondary>openfiles</secondary></indexterm>.
 	    In &os;, files are used to represent sockets and IPC
 	    channels, so be careful not to set this too low.  The
 	    system-wide limit for this is defined by the
@@ -1119,7 +1150,10 @@ passwd: done</screen>
 
 	<listitem>
 	  <para>The limit on the amount of network memory, and
-	    thus mbufs<indexterm><primary>sbsize</primary></indexterm><indexterm><primary>limiting users</primary><secondary>sbsize</secondary></indexterm>, a user may consume in order to limit network
+	    thus mbufs
+	    <indexterm><primary>sbsize</primary></indexterm><indexterm><primary>limiting
+	      users</primary><secondary>sbsize</secondary></indexterm>,
+	    a user may consume in order to limit network
 	    communications.</para>
 	</listitem>
       </varlistentry>
@@ -1128,10 +1162,12 @@ passwd: done</screen>
 	<term><literal>stacksize</literal></term>
 
 	<listitem>
-	  <para>The maximum size of a process stack<indexterm><primary>stacksize</primary></indexterm><indexterm><primary>limiting users</primary><secondary>stacksize</secondary></indexterm>.  This alone is
-	    not sufficient to limit the amount of memory a program
-	    may use so it should be used in conjunction with other
-	    limits.</para>
+	  <para>The maximum size of a process stack
+	    <indexterm><primary>stacksize</primary></indexterm><indexterm><primary>limiting
+	      users</primary><secondary>stacksize</secondary></indexterm>.
+	    This alone is not sufficient to limit the amount of memory
+	    a program may use so it should be used in conjunction with
+	    other limits.</para>
 	</listitem>
       </varlistentry>
     </variablelist>
@@ -1271,13 +1307,13 @@ teamtwo:*:1100:jru,db</screen>
 uid=1001(jru) gid=1001(jru) groups=1001(jru), 1100(teamtwo)</screen>
     </example>
 
-    <para>In this example, <username>jru</username> is a member of the
-      groups <groupname>jru</groupname> and
-      <groupname>teamtwo</groupname>.</para>
-
-    <para>For more information about this command and the format of
-      <filename>/etc/group</filename>, refer to &man.pw.8; and
-      &man.group.5;.</para>
+      <para>In this example, <username>jru</username> is a member of
+	the groups <groupname>jru</groupname> and
+	<groupname>teamtwo</groupname>.</para>
+
+      <para>For more information about this command and the format of
+	<filename>/etc/group</filename>, refer to &man.pw.8; and
+	&man.group.5;.</para>
     </sect2>
   </sect1>
 
@@ -1294,15 +1330,14 @@ uid=1001(jru) gid=1001(jru) groups=1001(
       the files used by the operating system or owned by other
       users.</para>
 
-    <para>This section discusses the traditional &unix;
-	permissions used in &os;.  For finer grained file system access control,
-	refer to
-	<xref linkend="fs-acl"/>.</para>
+    <para>This section discusses the traditional &unix; permissions
+      used in &os;.  For finer grained file system access control,
+      refer to <xref linkend="fs-acl"/>.</para>
 
     <para>In &unix;, basic permissions are assigned using
       three types of access: read, write, and execute.  These access
       types are used to determine file access to the file's owner,
-      group, and others (everyone else). The read, write, and execute
+      group, and others (everyone else).  The read, write, and execute
       permissions can be represented as the letters
       <literal>r</literal>, <literal>w</literal>, and
       <literal>x</literal>.  They can also be represented as binary
@@ -1315,10 +1350,10 @@ uid=1001(jru) gid=1001(jru) groups=1001(
       <literal>1</literal>.</para>
 
     <para>Table 4.1 summarizes the possible numeric and alphabetic
-      possibilities.  When reading the <quote>Directory Listing</quote>
-      column, a <literal>-</literal> is used to represent a permission
-      that is set to off.</para>
-	
+      possibilities.  When reading the <quote>Directory
+	Listing</quote> column, a <literal>-</literal> is used to
+      represent a permission that is set to off.</para>
+
     <indexterm><primary>permissions</primary></indexterm>
     <indexterm>
       <primary>file permissions</primary>

From owner-svn-doc-head@FreeBSD.ORG  Mon Oct 14 18:58:05 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [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 7F90F206;
 Mon, 14 Oct 2013 18:58:05 +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 6D9292F0B;
 Mon, 14 Oct 2013 18:58: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 r9EIw5fl089139;
 Mon, 14 Oct 2013 18:58:05 GMT (envelope-from pgj@svn.freebsd.org)
Received: (from pgj@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9EIw5gr089138;
 Mon, 14 Oct 2013 18:58:05 GMT (envelope-from pgj@svn.freebsd.org)
Message-Id: <201310141858.r9EIw5gr089138@svn.freebsd.org>
From: Gabor Pali <pgj@FreeBSD.org>
Date: Mon, 14 Oct 2013 18:58:05 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42957 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Oct 2013 18:58:05 -0000

Author: pgj
Date: Mon Oct 14 18:58:04 2013
New Revision: 42957
URL: http://svnweb.freebsd.org/changeset/doc/42957

Log:
  - Set date for the next, 2013Q4 report

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 14 17:45:55 2013	(r42956)
+++ head/en_US.ISO8859-1/htdocs/news/status/report-2013-07-2013-09.xml	Mon Oct 14 18:58:04 2013	(r42957)
@@ -17,13 +17,11 @@
 
     <!-- XXX: introduction goes here -->
 
-    <!-- XXX: keep updating the number of entries -->
     <p>Thanks to all the reporters for the excellent work!  This report
       contains 30 entries and we hope you enjoy reading it.</p>
 
-    <!-- XXX: set date for the next set of submissions -->
     <p>The deadline for submissions covering between October and
-      December 2013 is not yet decided.</p>
+      December 2013 is January 14th, 2014.</p>
   </section>
 
   <category>

From owner-svn-doc-head@FreeBSD.ORG  Mon Oct 14 19:20:04 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id AB7BF878;
 Mon, 14 Oct 2013 19:20: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 9931B2097;
 Mon, 14 Oct 2013 19:20: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 r9EJK4vF001010;
 Mon, 14 Oct 2013 19:20:04 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9EJK4jL001009;
 Mon, 14 Oct 2013 19:20:04 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310141920.r9EJK4jL001009@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Mon, 14 Oct 2013 19:20:04 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42958 - head/en_US.ISO8859-1/books/handbook/linuxemu
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Oct 2013 19:20:04 -0000

Author: dru
Date: Mon Oct 14 19:20:04 2013
New Revision: 42958
URL: http://svnweb.freebsd.org/changeset/doc/42958

Log:
  Comment out Matlab section for now as it is only available as 64-bit binary.
  
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml	Mon Oct 14 18:58:04 2013	(r42957)
+++ head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml	Mon Oct 14 19:20:04 2013	(r42958)
@@ -624,6 +624,8 @@ FEATURE Maple maplelmg 2000.0831 permane
       </sect2>
     </sect1>
 
+      <!--
+      As of October, 2013, the Linux version of Matlab is only available for 64-bit.
     <sect1 id="linuxemu-matlab">
       <sect1info>
 	<authorgroup>
@@ -632,7 +634,6 @@ FEATURE Maple maplelmg 2000.0831 permane
 	    <surname>Pelleg</surname>
 	    <contrib>Contributed by </contrib>
 	  </author>
-	<!-- daniel+handbook@pelleg.org -->
 	</authorgroup>
       </sect1info>
     <title>Installing &matlab;</title>
@@ -867,6 +868,7 @@ exit 0</programlisting>
 	use.</para>
     </sect2>
   </sect1>
+  -->
 
   <sect1 id="linuxemu-oracle">
     <sect1info>

From owner-svn-doc-head@FreeBSD.ORG  Mon Oct 14 19:54:31 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [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 06AA3350;
 Mon, 14 Oct 2013 19:54:31 +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 E645E22C4;
 Mon, 14 Oct 2013 19:54:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9EJsUL2019780;
 Mon, 14 Oct 2013 19:54:30 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9EJsUeT019777;
 Mon, 14 Oct 2013 19:54:30 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310141954.r9EJsUeT019777@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Mon, 14 Oct 2013 19:54:30 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42959 - head/en_US.ISO8859-1/books/handbook/linuxemu
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Oct 2013 19:54:31 -0000

Author: dru
Date: Mon Oct 14 19:54:30 2013
New Revision: 42959
URL: http://svnweb.freebsd.org/changeset/doc/42959

Log:
  Comment out the Maple section for now.
  
  Approved by:	bcr (mentor)

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

Modified: head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml	Mon Oct 14 19:20:04 2013	(r42958)
+++ head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml	Mon Oct 14 19:54:30 2013	(r42959)
@@ -457,13 +457,17 @@ Installation complete.</programlisting>
   </sect1>
   -->
 
+  <!--
+  As of October 2013, the trial version is only available in the 
+  Professional and Academic editions (not the Student or Personal 
+  editions) and requires a contact with a product specialist before 
+  the evaluation download link is made available.
   <sect1 id="linuxemu-maple">
     <sect1info>
       <authorgroup>
 	<author>
 	  <firstname>Aaron</firstname>
 	  <surname>Kaplan</surname>
-<!--	  <address><email>aaron@lo-res.org</email></address>-->
 	  <contrib>Contributed by </contrib>
 	</author>
       </authorgroup>
@@ -471,7 +475,6 @@ Installation complete.</programlisting>
 	<author>
 	  <firstname>Robert</firstname>
 	  <surname>Getschmann</surname>
-<!--	  <address><email>rob@getschmann.org</email></address>-->
 	  <contrib>Thanks to </contrib>
 	</author>
       </authorgroup>

From owner-svn-doc-head@FreeBSD.ORG  Mon Oct 14 20:30:57 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [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 722392DB;
 Mon, 14 Oct 2013 20:30:57 +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 457AB2538;
 Mon, 14 Oct 2013 20:30:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9EKUvYO040479;
 Mon, 14 Oct 2013 20:30:57 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9EKUvXg040478;
 Mon, 14 Oct 2013 20:30:57 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201310142030.r9EKUvXg040478@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 14 Oct 2013 20:30:57 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42960 - head/en_US.ISO8859-1/books/handbook/linuxemu
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Oct 2013 20:30:57 -0000

Author: gjb
Date: Mon Oct 14 20:30:56 2013
New Revision: 42960
URL: http://svnweb.freebsd.org/changeset/doc/42960

Log:
  s/--/&dash;&dash;/ to avoid double-hyphens within commented blocks.

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

Modified: head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml	Mon Oct 14 19:54:30 2013	(r42959)
+++ head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml	Mon Oct 14 20:30:56 2013	(r42960)
@@ -521,12 +521,12 @@ Installation complete.</programlisting>
 	  <filename>/usr/local/maple/bin/maple.system.type</filename>
 	  with the following:</para>
 
-	<programlisting>   ----- snip ------------------
+	<programlisting>   &dash;&dash;&dash;&dash;- snip &dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;
 *** maple.system.type.orig      Sun Jul  8 16:35:33 2001
---- maple.system.type   Sun Jul  8 16:35:51 2001
+&dash;&dash;- maple.system.type   Sun Jul  8 16:35:51 2001
 ***************
 *** 72,77 ****
---- 72,78 ----
+&dash;&dash;- 72,78 &dash;&dash;&dash;&dash;
           # the IBM RS/6000 AIX case
           MAPLE_BIN="bin.IBM_RISC_UNIX"
           ;;
@@ -534,7 +534,7 @@ Installation complete.</programlisting>
       "Linux")
           # the Linux/x86 case
         # We have two Linux implementations, one for Red Hat and
-   ----- snip end of patch -----</programlisting>
+   &dash;&dash;&dash;&dash;- snip end of patch &dash;&dash;&dash;&dash;-</programlisting>
 
 	<para>Note that no whitespace should be present after
 	  <literal>"FreeBSD"|\</literal>.</para>
@@ -553,7 +553,7 @@ Installation complete.</programlisting>
 	  <filename>/usr/local/rtc/rc.d/lmgrd</filename> is a
 	  convenient way to start up <command>lmgrd</command>:</para>
 
-	<programlisting>   ----- snip ------------
+	<programlisting>   &dash;&dash;&dash;&dash;- snip &dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;
 
 #! /bin/sh
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
@@ -578,7 +578,7 @@ stop)
 esac
 
 exit 0
-   ----- snip ------------</programlisting></step>
+   &dash;&dash;&dash;&dash;- snip &dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;</programlisting></step>
 
 
       <step><para>Test that
@@ -626,7 +626,7 @@ FEATURE Maple maplelmg 2000.0831 permane
 	</itemizedlist>
       </sect2>
     </sect1>
-
+    -->
       <!--
       As of October, 2013, the Linux version of Matlab is only available for 64-bit.
     <sect1 id="linuxemu-matlab">

From owner-svn-doc-head@FreeBSD.ORG  Tue Oct 15 00:37:18 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 0EB1624D;
 Tue, 15 Oct 2013 00:37:18 +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 F03C62356;
 Tue, 15 Oct 2013 00:37:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9F0bH4o067433;
 Tue, 15 Oct 2013 00:37:17 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9F0bH72067432;
 Tue, 15 Oct 2013 00:37:17 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310150037.r9F0bH72067432@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 15 Oct 2013 00:37:17 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42961 - head/en_US.ISO8859-1/books/handbook/linuxemu
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Oct 2013 00:37:18 -0000

Author: dru
Date: Tue Oct 15 00:37:17 2013
New Revision: 42961
URL: http://svnweb.freebsd.org/changeset/doc/42961

Log:
  Comment out Oracle for now as it too is only 64-bit.
  Use ignore instead of dashes and comments as this is a cleaner way to accomplish this.
  
  Approved by:	hrs (mentor)

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

Modified: head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml	Mon Oct 14 20:30:56 2013	(r42960)
+++ head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml	Tue Oct 15 00:37:17 2013	(r42961)
@@ -326,7 +326,7 @@ multi on</programlisting>
     </sect2>
   </sect1>
 
-  <!--
+<?ignore
   While the installer works, the binaries do not. As of Oct 2013, Linux
   emulation is 32-bit but the trial version of Mathematica is only
   available as 64-bit. This section should be revisited if Linux
@@ -521,12 +521,13 @@ Installation complete.</programlisting>
 	  <filename>/usr/local/maple/bin/maple.system.type</filename>
 	  with the following:</para>
 
-	<programlisting>   &dash;&dash;&dash;&dash;- snip &dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;
+  
+	<programlisting>   ----- snip ------------------
 *** maple.system.type.orig      Sun Jul  8 16:35:33 2001
-&dash;&dash;- maple.system.type   Sun Jul  8 16:35:51 2001
+-- - maple.system.type   Sun Jul  8 16:35:51 2001
 ***************
 *** 72,77 ****
-&dash;&dash;- 72,78 &dash;&dash;&dash;&dash;
+-- - 72,78 ----
           # the IBM RS/6000 AIX case
           MAPLE_BIN="bin.IBM_RISC_UNIX"
           ;;
@@ -534,7 +535,7 @@ Installation complete.</programlisting>
       "Linux")
           # the Linux/x86 case
         # We have two Linux implementations, one for Red Hat and
-   &dash;&dash;&dash;&dash;- snip end of patch &dash;&dash;&dash;&dash;-</programlisting>
+   ----- snip end of patch -----</programlisting>
 
 	<para>Note that no whitespace should be present after
 	  <literal>"FreeBSD"|\</literal>.</para>
@@ -553,7 +554,7 @@ Installation complete.</programlisting>
 	  <filename>/usr/local/rtc/rc.d/lmgrd</filename> is a
 	  convenient way to start up <command>lmgrd</command>:</para>
 
-	<programlisting>   &dash;&dash;&dash;&dash;- snip &dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;
+	<programlisting>   ----- snip ------------
 
 #! /bin/sh
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
@@ -578,7 +579,7 @@ stop)
 esac
 
 exit 0
-   &dash;&dash;&dash;&dash;- snip &dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;&dash;</programlisting></step>
+   ----- snip ------------</programlisting></step>
 
 
       <step><para>Test that
@@ -871,9 +872,11 @@ exit 0</programlisting>
 	use.</para>
     </sect2>
   </sect1>
-  -->
 
   <sect1 id="linuxemu-oracle">
+    While the Oracle website is unclear, the installation script is: You
+    are attempting to install 64-bit Oracle on a 32-bit operating system.
+    This is not supported and will not work.
     <sect1info>
       <authorgroup>
 	<author>
@@ -881,7 +884,6 @@ exit 0</programlisting>
 	  <surname>Moolenaar</surname>
 	  <contrib>Contributed by </contrib>
 	</author>
-	<!-- marcel@cup.hp.com -->
       </authorgroup>
     </sect1info>
     <title>Installing &oracle;</title>
@@ -1084,7 +1086,7 @@ export PATH</programlisting>
 ! CHOWN=/bin/chown
 #
 # Define variables to be used in this script
---- 31,37 ----
+ --- 31,37 ----
 # This is the default value for CHOWN
 # It will redefined later in this script for those ports
 # which have it conditionally defined in ss_install.h
@@ -1135,6 +1137,7 @@ export PATH</programlisting>
 	running on &linux;.</para>
     </sect2>
   </sect1>
+?>
 
   <sect1 id="linuxemu-advanced">
     <title>Advanced Topics</title>

From owner-svn-doc-head@FreeBSD.ORG  Tue Oct 15 08:41:47 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 75178D11;
 Tue, 15 Oct 2013 08:41:47 +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 62A6E2D1D;
 Tue, 15 Oct 2013 08:41:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9F8flpQ037799;
 Tue, 15 Oct 2013 08:41:47 GMT (envelope-from pgj@svn.freebsd.org)
Received: (from pgj@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9F8flOM037796;
 Tue, 15 Oct 2013 08:41:47 GMT (envelope-from pgj@svn.freebsd.org)
Message-Id: <201310150841.r9F8flOM037796@svn.freebsd.org>
From: Gabor Pali <pgj@FreeBSD.org>
Date: Tue, 15 Oct 2013 08:41:47 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42962 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Oct 2013 08:41:47 -0000

Author: pgj
Date: Tue Oct 15 08:41:46 2013
New Revision: 42962
URL: http://svnweb.freebsd.org/changeset/doc/42962

Log:
  - Update the random(4) 2013Q3 entry
  
  Submitted by:	markm

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	Tue Oct 15 00:37:17 2013	(r42961)
+++ head/en_US.ISO8859-1/htdocs/news/status/report-2013-07-2013-09.xml	Tue Oct 15 08:41:46 2013	(r42962)
@@ -949,7 +949,7 @@
   </project>
 
   <project cat='kern'>
-    <title>Updating <tt>random(4)</tt></title>
+    <title>Reworking <tt>random(4)</tt></title>
 
     <contact>
       <person>
@@ -978,16 +978,55 @@
     </contact>
 
     <body>
-      <p>Update of <tt>random(4)</tt> to account for recent revelations,
-	and make more extensible, is in progress.</p>
+      <p>Random numbers require a lot more thought and preparation that
+	would naively appear to be the case.  For simulations, number
+	sequences that are repeatable but sufficiently disordered are
+	often what is required to achieve required experimental
+	duplication ability, and many programmers are familiar with
+	these.  For cryptography, it is essential that an attacker not
+	be able to predict or guess the output sequence, thus giving a
+	source of security-critical secret material for uses such as
+	passwords or "key material".</p>
+
+      <p>&os;'s random number generator, available as the pseudo-file
+	<tt>/dev/random</tt> produces unpredictable numbers intended for
+	cryptographic use, and is thus a Cryptograpically-Secured
+	Pseudo-Random Number Generator, or CSPRNG.  The security is
+	given by careful design of the output generator (based on a
+	block cipher) and input entropy accumulation queues.  The latter
+	uses hashes to accumulate stochastic information harvested from
+	various places in the kernel to provide highly unpredictable
+	input to the generator.  The algorithm for doing this, Yarrow,
+	by Schneier et al, may be found by web search.</p>
+
+      <p>&os;'s CSPRNG also allowed for certain stochastic sources,
+	deemed to be "high-quality", to directly supply the
+	<tt>random(4)</tt> device without going through Yarrow.  With
+	recent revelations over possible government surveillance and
+	involvement in the selection of these "high-quality" sources, it
+	is felt that they can no longer be trusted, and must therefore
+	also be processed though Yarrow.</p>
+
+      <p>The matter was discussed at various levels of formality at the
+	Cambridge Developer Summit in August, and at EuroBSDcon 2013 in
+	September.</p>
+
+      <p>This work is now done, and the <tt>random(4)</tt> CSPRNG is now
+	brought to a more paranoid, modern standard of distrust with
+	regard to its entropy sources.  Infrastructure work was also
+	done to facilitate certain entropy-source choices for the
+	convenience of the system administrators.</p>
+
+      <p>Future work is now going ahead with the implementation of the
+	Fortuna algorithm by Ferguson and Schneier as an upgrade or
+	alternative to Yarrow.  Initially a choice will be presented,
+	and decisions on the future of the CSPRNG processing algorithms
+	in use will be made in the future as needs arise.</p>
     </body>
 
     <help>
-      <task>Fortuna is to be an alternative for Yarrow in FreeBSD&nbsp;11.x.</task>
-      <task>Yarrow may be deprecated in a couple of years.</task>
-      <task>FIPS 800-90b support is planned.</task>
-      <task>A full, in-depth review of entropy is going to be done with
-	external help.</task>
+      <task>Implement FIPS 800-90b support.</task>
+      <task>A full, in-depth review of entropy.</task>
     </help>
   </project>
 

From owner-svn-doc-head@FreeBSD.ORG  Tue Oct 15 10:34:26 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [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 2F1C9539;
 Tue, 15 Oct 2013 10:34:26 +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 1C94523A6;
 Tue, 15 Oct 2013 10:34:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9FAYP1O009331;
 Tue, 15 Oct 2013 10:34:25 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9FAYPNd009330;
 Tue, 15 Oct 2013 10:34:25 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201310151034.r9FAYPNd009330@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 15 Oct 2013 10:34:25 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42963 - head/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Oct 2013 10:34:26 -0000

Author: gjb
Date: Tue Oct 15 10:34:25 2013
New Revision: 42963
URL: http://svnweb.freebsd.org/changeset/doc/42963

Log:
  Fix link to 10.0-BETA1 announcement.
  
  Submitted by:	ryusuke
  Pointyhat:	gjb

Modified:
  head/share/xml/news.xml

Modified: head/share/xml/news.xml
==============================================================================
--- head/share/xml/news.xml	Tue Oct 15 08:41:46 2013	(r42962)
+++ head/share/xml/news.xml	Tue Oct 15 10:34:25 2013	(r42963)
@@ -42,7 +42,7 @@
 	  <p>The first BETA build for the &os;-10.0 release cycle is
 	    now available.  ISO images for the amd64, i386, ia64,
 	    powerpc, powerpc64 and sparc64 architectures are <a
-	      href="&lists.current;/2013-October/075504.html">available</a>
+	      href="&lists.stable;/2013-October/075504.html">available</a>
 	    on most of our <a
 	      href="&url.doc.base-en;/books/handbook/mirrors-ftp.html">&os;
 	    mirror sites</a>.</p>

From owner-svn-doc-head@FreeBSD.ORG  Tue Oct 15 14:44:56 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [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 79933D74;
 Tue, 15 Oct 2013 14:44:56 +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 66A282A85;
 Tue, 15 Oct 2013 14:44: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 r9FEiuFp073154;
 Tue, 15 Oct 2013 14:44:56 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9FEiuwN073153;
 Tue, 15 Oct 2013 14:44:56 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310151444.r9FEiuwN073153@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 15 Oct 2013 14:44:56 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42965 -
 head/en_US.ISO8859-1/books/handbook/network-servers
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Oct 2013 14:44:56 -0000

Author: dru
Date: Tue Oct 15 14:44:55 2013
New Revision: 42965
URL: http://svnweb.freebsd.org/changeset/doc/42965

Log:
  This is a very large chapter that needs a lot of work, many more patches to come.
  This patch does the following to mostly the NIS section:
  - comments out authors
  - fixes some (not all) acronym tags and &os; entities
  - tightens up some headings
  - some word-smithing to make things clearer
  - adds title to Table
  
  This will be followed by a white-space fix, then more content patches to be followed by a more thorough technical review.

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 15 13:08:26 2013	(r42964)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Tue Oct 15 14:44:55 2013	(r42965)
@@ -6,16 +6,17 @@
 -->
 
 <chapter id="network-servers">
+  <!--
   <chapterinfo>
     <authorgroup>
       <author>
 	<firstname>Murray</firstname>
 	<surname>Stokely</surname>
-	<contrib>Reorganized by </contrib>
+	<contrib>Reorganized by in July 2004</contrib>
       </author>
     </authorgroup>
-    <!-- 23 July 2004 -->
   </chapterinfo>
+  -->
 
   <title>Network Servers</title>
 
@@ -113,6 +114,7 @@
   </sect1>
 
   <sect1 id="network-inetd">
+    <!--
     <sect1info>
       <authorgroup>
 	<author>
@@ -128,6 +130,7 @@
 	</author>
       </authorgroup>
     </sect1info>
+    -->
 
     <title>The <application>inetd</application>
       <quote>Super-Server</quote></title>
@@ -539,6 +542,7 @@ server-program-arguments</programlisting
   </sect1>
 
   <sect1 id="network-nfs">
+    <!--
     <sect1info>
       <authorgroup>
 	<author>
@@ -555,6 +559,7 @@ server-program-arguments</programlisting
 	</author>
       </authorgroup>
     </sect1info>
+    -->
     <title>Network File System (NFS)</title>
 
     <indexterm><primary>NFS</primary></indexterm>
@@ -595,9 +600,6 @@ server-program-arguments</programlisting
       </listitem>
     </itemizedlist>
 
-    <sect2>
-      <title>How <acronym>NFS</acronym> Works</title>
-
       <para><acronym>NFS</acronym> consists of at least two main
 	parts: a server and one or more clients.  The client remotely
 	accesses the data that is stored on the server machine.  In
@@ -663,7 +665,6 @@ server-program-arguments</programlisting
 
       <para>Running &man.nfsiod.8; can improve performance on the
 	client, but is not required.</para>
-    </sect2>
 
     <sect2 id="network-configuring-nfs">
       <title>Configuring <acronym>NFS</acronym></title>
@@ -910,6 +911,7 @@ rpc_statd_enable="YES"</programlisting>
     </sect2>
 
     <sect2 id="network-amd">
+      <!--
       <sect2info>
 	<authorgroup>
 	  <author>
@@ -926,6 +928,7 @@ rpc_statd_enable="YES"</programlisting>
 	  </author>
 	</authorgroup>
       </sect2info>
+      -->
       <title>Automatic Mounts with
 	<application>amd</application></title>
 
@@ -1012,6 +1015,7 @@ Exports list on foobar:
   </sect1>
 
   <sect1 id="network-nis">
+    <!--
     <sect1info>
       <authorgroup>
 	<author>
@@ -1032,11 +1036,8 @@ Exports list on foobar:
 	</author>
       </authorgroup>
     </sect1info>
+    -->
     <title>Network Information System (NIS/YP)</title>
-
-    <sect2>
-      <title>What Is It?</title>
-
       <indexterm><primary>NIS</primary></indexterm>
       <indexterm><primary>Solaris</primary></indexterm>
       <indexterm><primary>HP-UX</primary></indexterm>
@@ -1044,52 +1045,39 @@ Exports list on foobar:
       <indexterm><primary>Linux</primary></indexterm>
       <indexterm><primary>NetBSD</primary></indexterm>
       <indexterm><primary>OpenBSD</primary></indexterm>
-
-      <para><acronym role="Network Information System">NIS</acronym>,
-	which stands for Network Information Services, was developed
-	by Sun Microsystems to centralize administration of &unix;
-	(originally &sunos;) systems.  It has now essentially become
-	an industry standard; all major &unix; like systems
-	(&solaris;, HP-UX, &aix;, Linux, NetBSD, OpenBSD, FreeBSD,
-	etc) support <acronym
-	  role="Network Information System">NIS</acronym>.</para>
-
       <indexterm>
 	<primary>yellow pages</primary>
 	<see>NIS</see>
       </indexterm>
 
-      <para><acronym role="Network Information System">NIS</acronym>
-	was formerly known as Yellow Pages, but because of trademark
-	issues, Sun changed the name.  The old term (and yp) is still
-	often seen and used.</para>
+      <para>Network Information System (<acronym>NIS</acronym>)
+	is designed
+	to centralize administration of &unix;-like
+	systems such as
+	&solaris;, HP-UX, &aix;, Linux, NetBSD, OpenBSD, and &os;.
+	<acronym>NIS</acronym>
+	was originally known as Yellow Pages but the name was changed due to trademark
+	issues.  This is the reason why <acronym>NIS</acronym>
+	commands begin with <literal>yp</literal>.</para>
 
       <indexterm>
 	<primary>NIS</primary>
 	<secondary>domains</secondary>
       </indexterm>
 
-      <para>It is a RPC-based client/server system that allows a group
-	of machines within an NIS domain to share a common set of
+      <para><acronym>NIS</acronym> is a Remote Procedure Call
+	(<acronym>RPC</acronym>)-based client/server system that allows a group
+	of machines within an <acronym>NIS</acronym> domain to share a common set of
 	configuration files.  This permits a system administrator to
-	set up NIS client systems with only minimal configuration data
+	set up <acronym>NIS</acronym> client systems with only minimal configuration data
 	and add, remove or modify configuration data from a single
 	location.</para>
 
-      <indexterm><primary>Windows NT</primary></indexterm>
-
-      <para>It is similar to the &windowsnt; domain system; although
-	the internal implementation of the two are not at all similar,
-	the basic functionality can be compared.</para>
-    </sect2>
-
     <sect2>
-      <title><acronym>NIS</acronym>Terms and Processes</title>
+      <title><acronym>NIS</acronym> Terms and Processes</title>
 
-      <para>There are several terms and important user processes that
-	will be explained while attempting to implement NIS on
-	FreeBSD, regardless if the system is a NIS server or a NIS
-	client:</para>
+      <para>Table 28.1 summarizes the terms and important processes used
+	by <acronym>NIS</acronym>:</para>
 
       <indexterm>
 	<primary><application>rpcbind</application></primary>
@@ -1098,7 +1086,8 @@ Exports list on foobar:
 	<primary><application>portmap</application></primary>
       </indexterm>
 
-      <informaltable frame="none" pgwide="1">
+      <table frame="none" pgwide="1">
+	<title><acronym>NIS</acronym> Terminology</title>
 	<tgroup cols="2">
 	  <colspec colwidth="1*"/>
 	  <colspec colwidth="3*"/>
@@ -1112,163 +1101,141 @@ Exports list on foobar:
 
 	  <tbody>
 	    <row>
-	      <entry>NIS domainname</entry>
+	      <entry><acronym>NIS</acronym> domain name</entry>
 
-	      <entry>An NIS master server and all of its clients
-		(including its slave servers) have a NIS domainname.
-		Similar to an &windowsnt; domain name, the NIS
-		domainname does not have anything to do with
+	      <entry>An <acronym>NIS</acronym> master server and all of its clients,
+		including its slave servers, share a <acronym>NIS</acronym> domain name
+		which
+		does not have anything to do with
 		<acronym>DNS</acronym>.</entry>
 	    </row>
 
 	    <row>
-	      <entry><application>rpcbind</application></entry>
+	      <entry>&man.rpcbind.8;</entry>
 
-	      <entry>Must be running in order to enable
-		<acronym>RPC</acronym> (Remote Procedure Call, a
-		network protocol used by NIS).  If
-		<application>rpcbind</application> is not running, it
-		will be impossible to run an NIS server, or to act as
-		an NIS client.</entry>
+	      <entry>This service enables <acronym>RPC</acronym> and
+		must be running
+		in order to run an <acronym>NIS</acronym> server or act as
+		an <acronym>NIS</acronym> client.</entry>
 	    </row>
 
 	    <row>
-	      <entry><application>ypbind</application></entry>
-	      <entry><quote>Binds</quote> an NIS client to its NIS
-		server.  It will take the NIS domainname from the
-		system, and using <acronym>RPC</acronym>, connect to
-		the server.  <application>ypbind</application> is the
-		core of client-server communication in an NIS
-		environment; if <application>ypbind</application> dies
+	      <entry>&man.ypbind.8;</entry>
+	      <entry>This service binds an <acronym>NIS</acronym> client to its <acronym>NIS</acronym>
+		server.  It will take the <acronym>NIS</acronym> domain name
+		and use <acronym>RPC</acronym> to connect to
+		the server.  It is the
+		core of client/server communication in an <acronym>NIS</acronym>
+		environment.  If this service is not running
 		on a client machine, it will not be able to access the
-		NIS server.</entry>
+		<acronym>NIS</acronym> server.</entry>
 	    </row>
 
 	    <row>
-	      <entry><application>ypserv</application></entry>
-	      <entry>Should only be running on NIS servers; this is
-		the NIS server process itself.  If &man.ypserv.8;
-		dies, then the server will no longer be able to
-		respond to NIS requests (hopefully, there is a slave
-		server to take over for it).  There are some
-		implementations of NIS (but not the FreeBSD one), that
-		do not try to reconnect to another server if the
-		server it used before dies.  Often, the only thing
-		that helps in this case is to restart the server
-		process (or even the whole server) or the
-		<application>ypbind</application> process on the
-		client.</entry>
+	      <entry>&man.ypserv.8;</entry>
+	      <entry>This is the process for
+		the <acronym>NIS</acronym> server.  If this service stops running,
+		the server will no longer be able to
+		respond to <acronym>NIS</acronym> requests so hopefully, there is a slave
+		server to take over.  Some
+		non-&os; clients
+		will not try to reconnect using a slave server and the
+		<application>ypbind</application> process may need to
+		be restarted on these
+		clients.</entry>
 	    </row>
 
 	    <row>
-	      <entry><application>rpc.yppasswdd</application></entry>
-	      <entry>Another process that should only be running on
-		NIS master servers; this is a daemon that will allow
-		NIS clients to change their NIS passwords.  If this
+	      <entry>&man.rpc.yppasswdd.8;</entry>
+	      <entry>This process only runs on
+		<acronym>NIS</acronym> master servers.  This daemon allows
+		<acronym>NIS</acronym> clients to change their <acronym>NIS</acronym> passwords.  If this
 		daemon is not running, users will have to login to the
-		NIS master server and change their passwords
+		<acronym>NIS</acronym> master server and change their passwords
 		there.</entry>
 	    </row>
 	  </tbody>
 	</tgroup>
-      </informaltable>
+      </table>
       <!-- XXX Missing: rpc.ypxfrd (not important, though) May only run
       on the master -->
     </sect2>
 
     <sect2>
-      <title>How Does It Work?</title>
-
-      <para>There are three types of hosts in an NIS environment:
-	master servers, slave servers, and clients.  Servers act as a
-	central repository for host configuration information.  Master
-	servers hold the authoritative copy of this information, while
-	slave servers mirror this information for redundancy.  Clients
-	rely on the servers to provide this information to
-	them.</para>
-
-      <para>Information in many files can be shared in this manner.
-	The <filename>master.passwd</filename>,
-	<filename>group</filename>, and <filename>hosts</filename>
-	files are commonly shared via NIS.  Whenever a process on a
-	client needs information that would normally be found in these
-	files locally, it makes a query to the NIS server that it is
-	bound to instead.</para>
+      <title>Machine Types</title>
+      <indexterm><primary>NIS</primary>
+		<secondary>master server</secondary>
+	      </indexterm>
+	      <indexterm>
+		<primary>NIS</primary>
+		<secondary>slave server</secondary>
+	      </indexterm>
+	      <indexterm>
+		<primary>NIS</primary>
+		<secondary>client</secondary>
+	      </indexterm>
 
-      <sect3>
-	<title>Machine Types</title>
+      <para>There are three types of hosts in an <acronym>NIS</acronym> environment:</para>
 
 	<itemizedlist>
 	  <listitem>
-	    <para>A <emphasis>NIS master server</emphasis><indexterm>
-		<primary>NIS</primary>
-		<secondary>master server</secondary>
-	      </indexterm>.
-	      This server, analogous to a &windowsnt; primary domain
-	      controller, maintains the files used by all of the NIS
+	    <para><acronym>NIS</acronym> master server</para>
+	    
+	    <para>This server acts as a
+	      central repository for host configuration information and
+	      maintains the authoritative copy of the files used by all of the <acronym>NIS</acronym>
 	      clients.  The <filename>passwd</filename>,
 	      <filename>group</filename>, and other various files used
-	      by the NIS clients live on the master server.</para>
-
-	    <note>
-	      <para>It is possible for one machine to be an NIS master
-		server for more than one NIS domain.  However, this
-		will not be covered in this introduction, which
-		assumes a relatively small-scale NIS
-		environment.</para>
-	    </note>
+	      by <acronym>NIS</acronym> clients are stored on the master server.  While
+	      it is possible for one machine to be an <acronym>NIS</acronym> master
+	      server for more than one <acronym>NIS</acronym> domain, this
+	      will not be covered in chapter as it
+	      assumes a relatively small-scale <acronym>NIS</acronym>
+	      environment.</para>
 	  </listitem>
 
 	  <listitem>
-	    <para><emphasis>NIS slave servers</emphasis><indexterm>
-		<primary>NIS</primary>
-		<secondary>slave server</secondary>
-	      </indexterm>.  Similar to the &windowsnt; backup domain
-	      controllers, NIS slave servers maintain copies of the
-	      NIS master's data files.  NIS slave servers provide the
-	      redundancy, which is needed in important environments.
-	      They also help to balance the load of the master server:
-	      NIS Clients always attach to the NIS server whose
-	      response they get first, and this includes
-	      slave-server-replies.</para>
+	    <para><acronym>NIS</acronym> slave servers</para>
+
+	    <para><acronym>NIS</acronym> slave servers maintain copies of the
+	      <acronym>NIS</acronym> master's data files in order to provide
+	      redundancy.
+	      Slave servers also help to balance the load of the master server as
+	      <acronym>NIS</acronym> clients always attach to the <acronym>NIS</acronym> server which
+	      responds first.</para>
 	  </listitem>
 
 	  <listitem>
-	    <para><emphasis>NIS clients</emphasis><indexterm>
-		<primary>NIS</primary>
-		<secondary>client</secondary>
-	      </indexterm>.
-	      NIS clients, like most &windowsnt; workstations,
-	      authenticate against the NIS server (or the &windowsnt;
-	      domain controller in the &windowsnt; workstations case)
-	      to log on.</para>
+	    <para><acronym>NIS</acronym> clients</para>
+
+	      <para><acronym>NIS</acronym> clients
+	      authenticate against the <acronym>NIS</acronym> server
+	      during log on.</para>
 	  </listitem>
 	</itemizedlist>
-      </sect3>
+
+      <para>Information in many files can be shared using <acronym>NIS</acronym>.
+	The <filename>master.passwd</filename>,
+	<filename>group</filename>, and <filename>hosts</filename>
+	files are commonly shared via <acronym>NIS</acronym>.  Whenever a process on a
+	client needs information that would normally be found in these
+	files locally, it makes a query to the <acronym>NIS</acronym> server that it is
+	bound to instead.</para>
     </sect2>
 
     <sect2>
-      <title>Using NIS/YP</title>
-
-      <para>This section will deal with setting up a sample NIS
-	environment.</para>
-
-      <sect3>
-	<title>Planning</title>
+      <title>Planning Considerations</title>
 
-	<para>Let us assume that an administrator of a small
-	  university lab, which consists of 15 FreeBSD machines,
+      <para>This section describes a sample <acronym>NIS</acronym>
+	environment which consists of 15 &os; machines and which
 	  currently has no centralized point of administration.  Each
 	  machine has its own <filename>/etc/passwd</filename> and
 	  <filename>/etc/master.passwd</filename>.  These files are
 	  kept in sync with each other only through manual
-	  intervention; currently, a user is added to the lab, the
-	  process must be ran on all 15 machines.  The lab would
-	  clearly benefit from the addition of two
-	  <acronym>NIS</acronym> servers.</para>
+	  intervention.  Currently, when a user is added to the lab, the
+	  process must be repeated on all 15 machines..</para>
 
-	<para>Therefore, the configuration of the lab now looks
-	  something like:</para>
+	<para>The configuration of the lab will be as follows:</para>
 
 	<informaltable frame="none" pgwide="1">
 	  <tgroup cols="3">
@@ -1284,13 +1251,13 @@ Exports list on foobar:
 	      <row>
 		<entry><hostid>ellington</hostid></entry>
 		<entry><hostid role="ipaddr">10.0.0.2</hostid></entry>
-		<entry>NIS master</entry>
+		<entry><acronym>NIS</acronym> master</entry>
 	      </row>
 
 	      <row>
 		<entry><hostid>coltrane</hostid></entry>
 		<entry><hostid role="ipaddr">10.0.0.3</hostid></entry>
-		<entry>NIS slave</entry>
+		<entry><acronym>NIS</acronym> slave</entry>
 	      </row>
 
 	      <row>
@@ -1321,96 +1288,88 @@ Exports list on foobar:
 	  decisions need to be made as part of the planning
 	  process.</para>
 
-	<sect4>
-	  <title>Choosing a NIS Domain Name</title>
+	<sect3>
+	  <title>Choosing a <acronym>NIS</acronym> Domain Name</title>
 
 	  <indexterm>
 	    <primary>NIS</primary>
-	    <secondary>domainname</secondary>
+	    <secondary>domain name</secondary>
 	  </indexterm>
-	  <para>This might not be the normal <quote>domainname</quote>
-	    for the network.  It is more accurately called the
-	    <quote>NIS domainname</quote>.  When a client broadcasts
-	    its requests for info, it includes the name of the NIS
+	  <para>When a client broadcasts
+	    its requests for info, it includes the name of the <acronym>NIS</acronym>
 	    domain that it is part of.  This is how multiple servers
 	    on one network can tell which server should answer which
-	    request.  Think of the NIS domainname as the name for a
-	    group of hosts that are related in some way.</para>
+	    request.  Think of the <acronym>NIS</acronym> domain name as the name for a
+	    group of hosts.</para>
 
 	  <para>Some organizations choose to use their Internet
-	    domainname for their NIS domainname.  This is not
+	    domain name for their <acronym>NIS</acronym> domain name.  This is not
 	    recommended as it can cause confusion when trying to debug
-	    network problems.  The NIS domainname should be unique
+	    network problems.  The <acronym>NIS</acronym> domain name should be unique
 	    within the network and it is helpful if it describes the
 	    group of machines it represents.  For example, the Art
 	    department at Acme Inc. might be in the
-	    <quote>acme-art</quote> NIS domain.  For this example,
-	    assume the chosen name will be
+	    <quote>acme-art</quote> <acronym>NIS</acronym> domain.  This example
+	    will use the domain name
 	    <literal>test-domain</literal>.</para>
 
-	  <indexterm><primary>SunOS</primary></indexterm>
-	  <para>However, some operating systems (notably &sunos;) use
-	    their NIS domain name as their Internet domain name.  If
+	  <para>However, some non-&os; operating systems require
+	    the <acronym>NIS</acronym> domain name to be the same as the Internet domain name.  If
 	    one or more machines on the network have this
-	    restriction, it <emphasis>must</emphasis> be used as the
-	    Internet domain name for the NIS domain name.</para>
-	</sect4>
+	    restriction, the Internet domain name <emphasis>must</emphasis> be used as the
+	    <acronym>NIS</acronym> domain name.</para>
+	</sect3>
 
-	<sect4>
+	<sect3>
 	  <title>Physical Server Requirements</title>
 
 	  <para>There are several things to keep in mind when choosing
-	    a machine to use as a NIS server.  One of the unfortunate
-	    things about NIS is the level of dependency the clients
-	    have on the server.  If a client cannot contact the server
-	    for its NIS domain, very often the machine becomes
-	    unusable.  The lack of user and group information causes
-	    most systems to temporarily freeze up.  With this in mind
-	    be sure to choose a machine that will not be prone to
-	    being rebooted frequently, or one that might be used for
-	    development.  The NIS server should ideally be a stand
-	    alone machine whose sole purpose in life is to be an NIS
-	    server.  If the network is not very heavily used, it is
-	    acceptable to put the NIS server on a machine running
-	    other services, however; if the NIS server becomes
+	    a machine to use as a <acronym>NIS</acronym> server.  Since
+	    <acronym>NIS</acronym> clients depend upon the availability
+	    of the server, choose a machine that is
+	    not rebooted frequently.  The <acronym>NIS</acronym> server should ideally be a stand
+	    alone machine whose sole purpose is to be an <acronym>NIS</acronym>
+	    server.  If the network is not heavily used, it is
+	    acceptable to put the <acronym>NIS</acronym> server on a machine running
+	    other services.  However, if the <acronym>NIS</acronym> server becomes
 	    unavailable, it will adversely affect
-	    <emphasis>all</emphasis> NIS clients.</para>
-	</sect4>
+	    all <acronym>NIS</acronym> clients.</para>
       </sect3>
+    </sect2>
 
-      <sect3>
-	<title>NIS Servers</title>
+      <sect2>
+	<title>Configuring the <acronym>NIS</acronym> Servers</title>
 
-	<para> The canonical copies of all NIS information are stored
-	  on a single machine called the NIS master server.  The
-	  databases used to store the information are called NIS maps.
-	  In FreeBSD, these maps are stored in
-	  <filename>/var/yp/[domainname]</filename> where
-	  <filename>[domainname]</filename> is the name of the NIS
-	  domain being served.  A single NIS server can support
-	  several domains at once, therefore it is possible to have
-	  several such directories, one for each supported domain.
+	<para> The canonical copies of all <acronym>NIS</acronym> files are stored
+	  on the master server.  The
+	  databases used to store the information are called <acronym>NIS</acronym> maps.
+	  In &os;, these maps are stored in
+	  <filename>/var/yp/[domain name]</filename> where
+	  <filename>[domain name]</filename> is the name of the <acronym>NIS</acronym>
+	  domain.  Since multiple
+	  domains are supported, it is possible to have
+	  several directories, one for each domain.
 	  Each domain will have its own independent set of
 	  maps.</para>
 
-	<para>NIS master and slave servers handle all NIS requests
-	  with the <command>ypserv</command> daemon.
-	  <command>ypserv</command> is responsible for receiving
-	  incoming requests from NIS clients, translating the
+	<para><acronym>NIS</acronym> master and slave servers handle all <acronym>NIS</acronym> requests
+	  through &man.ypserv.8;.  This daemon
+	  is responsible for receiving
+	  incoming requests from <acronym>NIS</acronym> clients, translating the
 	  requested domain and map name to a path to the corresponding
-	  database file and transmitting data from the database back
+	  database file, and transmitting data from the database back
 	  to the client.</para>
 
-	<sect4>
-	  <title>Setting Up a NIS Master Server</title>
+	<sect3>
+	  <title>Setting Up a <acronym>NIS</acronym> Master Server</title>
 
 	  <indexterm>
 	    <primary>NIS</primary>
 	    <secondary>server configuration</secondary>
 	  </indexterm>
-	  <para>Setting up a master NIS server can be relatively
-	    straight forward, depending on environmental needs.  &os;
-	    comes with support for NIS out-of-the-box.  It only needs
+	  <para>Setting up a master <acronym>NIS</acronym> server can be relatively
+	    straight forward, depending on environmental needs.  Since &os;
+	    provides built-in <acronym>NIS</acronym> support, it only needs
 	    to be enabled by adding the following lines to
 	    <filename>/etc/rc.conf</filename>:</para>
 
@@ -1418,96 +1377,78 @@ Exports list on foobar:
 	    <step>
 	      <programlisting>nisdomainname="test-domain"</programlisting>
 
-	      <para>This line will set the NIS domainname to
-		<literal>test-domain</literal>
-		upon network setup (e.g., after reboot).</para>
+	      <para>This line sets the <acronym>NIS</acronym> domain name to
+		<literal>test-domain</literal>.</para>
 	    </step>
 
 	    <step>
 	      <programlisting>nis_server_enable="YES"</programlisting>
 
-	      <para>This will tell FreeBSD to start up the NIS server
-		processes when the networking is next brought
-		up.</para>
+	      <para>This automates the start up of the <acronym>NIS</acronym> server
+		processes when the system
+		boots.</para>
 	    </step>
 
 	    <step>
 	      <programlisting>nis_yppasswdd_enable="YES"</programlisting>
 
-	      <para>This will enable the
-		<command>rpc.yppasswdd</command> daemon which, as
-		mentioned above, will allow users to change their NIS
+	      <para>This enables the
+		&man.rpc.yppasswdd.8; daemon so that
+		users can change their <acronym>NIS</acronym>
 		password from a client machine.</para>
 	    </step>
 	  </procedure>
 
-	  <note>
-	    <para>Depending on the NIS setup, additional entries may
-	      be required.  See the
-	      <link linkend="network-nis-server-is-client">section
-		about NIS servers that are also NIS clients</link>,
-	      below, for details.</para>
-	  </note>
-
-	  <para>After setting up the above entries, run the command
-	    <command>/etc/netstart</command> as superuser.  It will
-	    set up everything, using the values defined in
-	    <filename>/etc/rc.conf</filename>.  As a last step, before
-	    initializing the NIS maps, start the
-	    <application>ypserv</application> daemon manually:</para>
+	    <para>Depending on the <acronym>NIS</acronym> setup, additional entries may
+	      be required.  Refer to
+	      <xref linkend="network-nis-server-is-client"/> if
+		the <acronym>NIS</acronym> server is also an <acronym>NIS</acronym> clients.</para>
+
+	  <para>After saving the edits, type
+	    <command>/etc/netstart</command> to restart the network and
+	    apply the values defined in
+	    <filename>/etc/rc.conf</filename>.  Before
+	    initializing the <acronym>NIS</acronym> maps, start
+	    &man.ypserv.8;:</para>
 
 	  <screen>&prompt.root; <userinput>service ypserv start</userinput></screen>
-	</sect4>
+	</sect3>
 
-	<sect4>
-	  <title>Initializing the NIS Maps</title>
+	<sect3>
+	  <title>Initializing the <acronym>NIS</acronym> Maps</title>
 
 	  <indexterm>
 	    <primary>NIS</primary>
 	    <secondary>maps</secondary>
 	  </indexterm>
-	  <para>The <emphasis>NIS maps</emphasis> are database files,
-	    that are kept in the <filename>/var/yp</filename>
-	    directory.  They are generated from configuration files in
-	    the <filename>/etc</filename> directory of the NIS master,
+	  <para><acronym>NIS</acronym> maps are database files
+	    stored in <filename class="directory">/var/yp</filename>.
+	    They are generated from configuration files in
+	    <filename class="directory">/etc</filename> on the <acronym>NIS</acronym> master,
 	    with one exception:
-	    <filename>/etc/master.passwd</filename>.  This is for a
-	    good reason, never propagate passwords for
-	    <username>root</username> and other administrative
-	    accounts to all the servers in the NIS domain.  Therefore,
-	    before the NIS maps are initialized, configure the primary
+	    <filename>/etc/master.passwd</filename>.  This is to prevent the
+	    propagation passwords to all the servers in the <acronym>NIS</acronym> domain.  Therefore,
+	    before the <acronym>NIS</acronym> maps are initialized, configure the primary
 	    password files:</para>
 
 	  <screen>&prompt.root; <userinput>cp /etc/master.passwd /var/yp/master.passwd</userinput>
 &prompt.root; <userinput>cd /var/yp</userinput>
 &prompt.root; <userinput>vi master.passwd</userinput></screen>
 
-	  <para>It is advisable to remove all entries regarding system
-	    accounts (<username>bin</username>,
-	    <username>tty</username>, <username>kmem</username>,
-	    <username>games</username>, etc), as well as any accounts
-	    that do not need to be propagated to the NIS clients
-	    (for example <username>root</username> and any other UID 0
-	    (superuser) accounts).</para>
+	  <para>It is advisable to remove all entries for system
+	    accounts as well as any user accounts
+	    that do not need to be propagated to the <acronym>NIS</acronym> clients, such as
+	    the <username>root</username> accounts.</para>
 
-	  <note><para>Ensure the
+	  <note><para>Ensure that the
 	    <filename>/var/yp/master.passwd</filename> is neither
-	    group or world readable (mode 600)!  Use the
-	    <command>chmod</command> command, as
-	    appropriate.</para></note>
-
-	  <indexterm><primary>Tru64 UNIX</primary></indexterm>
+	      group or world readable by setting its permissions to <literal>600</literal>.</para></note>
 
 	  <para>When this task has been completed, it is time to
-	    initialize the NIS maps.  FreeBSD includes a script named
-	    <command>ypinit</command> to do this (see its
-	    manual page for more information).  Note that this script
-	    is available on most &unix; Operating Systems, but not on
-	    all.  On Digital UNIX/Compaq Tru64 UNIX it is called
-	    <command>ypsetup</command>.  Because we are generating
-	    maps for an NIS master, we are going to pass the
-	    <option>-m</option> option to <command>ypinit</command>.
-	    To generate the NIS maps run:</para>
+	    initialize the <acronym>NIS</acronym> maps.  &os; includes the
+	    &man.ypinit.8; script to do this.  When generating
+	    maps for the master server, include
+	    <option>-m</option> and specify the <acronym>NIS</acronym> domain name:</para>
 
 	  <screen>ellington&prompt.root; <userinput>ypinit -m test-domain</userinput>
 Server Type: MASTER Domain: test-domain
@@ -1537,7 +1478,7 @@ ellington has been setup as an YP master
 	    created <filename>/var/yp/Makefile</filename> from
 	    <filename>/var/yp/Makefile.dist</filename>.  When created,
 	    this file assumes that the operating environment is a
-	    single server NIS system with only &os; machines.  Since
+	    single server <acronym>NIS</acronym> system with only &os; machines.  Since
 	    <literal>test-domain</literal> has a slave server as well,
 	    edit <filename>/var/yp/Makefile</filename> as well:</para>
 
@@ -1548,22 +1489,22 @@ ellington has been setup as an YP master
 	  <programlisting>NOPUSH = "True"</programlisting>
 
 	  <para>(if it is not commented out already).</para>
-	</sect4>
+	</sect3>
 
-	<sect4>
-	  <title>Setting up a NIS Slave Server</title>
+	<sect3>
+	  <title>Setting up a <acronym>NIS</acronym> Slave Server</title>
 
 	  <indexterm>
 	    <primary>NIS</primary>
 	    <secondary>slave server</secondary>
 	  </indexterm>
-	  <para>Setting up an NIS slave server is even more simple
+	  <para>Setting up an <acronym>NIS</acronym> slave server is even more simple
 	    than setting up the master.  Log on to the slave server
 	    and edit the file <filename>/etc/rc.conf</filename> as you
 	    did before.  The only difference is that we now must use
 	    the <option>-s</option> option when running
 	    <command>ypinit</command>.  The <option>-s</option> option
-	    requires the name of the NIS master be passed to it as
+	    requires the name of the <acronym>NIS</acronym> master be passed to it as
 	    well, so our command line looks like:</para>
 
 	  <screen>coltrane&prompt.root; <userinput>ypinit -s ellington test-domain</userinput>
@@ -1625,7 +1566,7 @@ Remember to update map ypservers on elli
 
 	  <para>There should be a directory called
 	    <filename>/var/yp/test-domain</filename>.  Copies of the
-	    NIS master server's maps should be in this directory.
+	    <acronym>NIS</acronym> master server's maps should be in this directory.
 	    These files must always be up to date.  The following
 	    <filename>/etc/crontab</filename> entries on the slave
 	    servers should do the job:</para>
@@ -1646,14 +1587,13 @@ Remember to update map ypservers on elli
 	  <para>Now, run the command <command>/etc/netstart</command>
 	    on the slave server as well, which again starts the NIS
 	    server.</para>
-	</sect4>
       </sect3>
 
       <sect3>
-	<title>NIS Clients</title>
+	<title>Setting Up a <acronym>NIS</acronym> Client</title>
 
-	<para>An NIS client establishes what is called a binding to a
-	  particular NIS server using the <command>ypbind</command>
+	<para>An <acronym>NIS</acronym> client establishes what is called a binding to a
+	  particular <acronym>NIS</acronym> server using the <command>ypbind</command>
 	  daemon.  The <command>ypbind</command> command checks the
 	  system's default domain (as set by the
 	  <command>domainname</command> command), and begins
@@ -1667,7 +1607,7 @@ Remember to update map ypservers on elli
 	  master and several slaves, for example),
 	  <command>ypbind</command> will use the address of the first
 	  one to respond.  From that point on, the client system will
-	  direct all of its NIS requests to that server.
+	  direct all of its <acronym>NIS</acronym> requests to that server.
 	  <command>ypbind</command> will occasionally
 	  <quote>ping</quote> the server to make sure it is still up
 	  and running.  If it fails to receive a reply to one of its
@@ -1676,20 +1616,17 @@ Remember to update map ypservers on elli
 	  and begin broadcasting again in the hopes of locating
 	  another server.</para>
 
-	<sect4>
-	  <title>Setting Up a NIS Client</title>
-
 	  <indexterm>
 	    <primary>NIS</primary>
 	    <secondary>client configuration</secondary>
 	  </indexterm>
-	  <para>Setting up a FreeBSD machine to be a NIS client is
+	  <para>Setting up a FreeBSD machine to be a <acronym>NIS</acronym> client is
 	    fairly straightforward.</para>
 
 	  <procedure>
 	    <step>
 	      <para>Edit <filename>/etc/rc.conf</filename> and add the
-		following lines in order to set the NIS domainname and
+		following lines in order to set the <acronym>NIS</acronym> domain name and
 		start <command>ypbind</command> during network
 		startup:</para>
 
@@ -1699,7 +1636,7 @@ nis_client_enable="YES"</programlisting>
 
 	    <step>
 	      <para>To import all possible password entries from the
-		NIS server, remove all user accounts from the
+		<acronym>NIS</acronym> server, remove all user accounts from the
 		<filename>/etc/master.passwd</filename> file and use
 		<command>vipw</command> to add the following line to
 		the end of the file:</para>
@@ -1708,7 +1645,7 @@ nis_client_enable="YES"</programlisting>
 
 	      <note>
 		<para>This line will afford anyone with a valid
-		  account in the NIS server's password maps an
+		  account in the <acronym>NIS</acronym> server's password maps an
 		  account.  There are many ways to configure the NIS
 		  client by changing this line.  See the
 		  <link linkend="network-netgroups">netgroups
@@ -1738,7 +1675,7 @@ nis_client_enable="YES"</programlisting>
 	    </step>
 	  </procedure>
 
-	  <para>To start the NIS client immediately, execute the
+	  <para>To start the <acronym>NIS</acronym> client immediately, execute the
 	    following commands as the superuser:</para>
 
 	  <screen>&prompt.root; <userinput>/etc/netstart</userinput>
@@ -1747,16 +1684,15 @@ nis_client_enable="YES"</programlisting>
 	  <para>After completing these steps, the command,
 	    <command>ypcat passwd</command>, should show the
 	    server's passwd map.</para>
-	</sect4>
       </sect3>
     </sect2>
 
     <sect2>
-      <title>NIS Security</title>
+      <title><acronym>NIS</acronym> Security</title>
 
       <para>In general, any remote user may issue an RPC to
-	&man.ypserv.8; and retrieve the contents of the NIS maps,
-	provided the remote user knows the domainname.  To prevent
+	&man.ypserv.8; and retrieve the contents of the <acronym>NIS</acronym> maps,
+	provided the remote user knows the domain name.  To prevent
 	such unauthorized transactions, &man.ypserv.8; supports a
 	feature called <quote>securenets</quote> which can be used to
 	restrict access to a given set of hosts.  At startup,
@@ -1806,7 +1742,7 @@ nis_client_enable="YES"</programlisting>
 	  firewall.</para>
 
 	<para>Servers using <filename>/var/yp/securenets</filename>
-	  may fail to serve legitimate NIS clients with archaic TCP/IP
+	  may fail to serve legitimate <acronym>NIS</acronym> clients with archaic TCP/IP
 	  implementations.  Some of these implementations set all host
 	  bits to zero when doing broadcasts and/or fail to observe
 	  the subnet mask when calculating the broadcast address.
@@ -1818,17 +1754,17 @@ nis_client_enable="YES"</programlisting>
 
 	<para>Using <filename>/var/yp/securenets</filename> on a
 	  server with such an archaic implementation of TCP/IP is a
-	  really bad idea and will lead to loss of NIS functionality
+	  really bad idea and will lead to loss of <acronym>NIS</acronym> functionality
 	  for large parts of the network.</para>
 
 	<indexterm><primary>TCP Wrappers</primary></indexterm>
 	<para>The use of <application>TCP Wrapper</application>
-	  increases the latency of the NIS server.  The additional
+	  increases the latency of the <acronym>NIS</acronym> server.  The additional
 	  delay may be long enough to cause timeouts in client
 	  programs, especially in busy networks or with slow NIS
 	  servers.  If one or more of the client systems suffers from
 	  these symptoms, convert the client systems in question into
-	  NIS slave servers and force them to bind to
+	  <acronym>NIS</acronym> slave servers and force them to bind to
 	  themselves.</para>
       </note>
     </sect2>
@@ -1838,13 +1774,13 @@ nis_client_enable="YES"</programlisting>
 
       <para>In our lab, there is a machine <hostid>basie</hostid> that
 	is supposed to be a faculty only workstation.  We do not want
-	to take this machine out of the NIS domain, yet the
-	<filename>passwd</filename> file on the master NIS server
+	to take this machine out of the <acronym>NIS</acronym> domain, yet the
+	<filename>passwd</filename> file on the master <acronym>NIS</acronym> server
 	contains accounts for both faculty and students.  What can we
 	do?</para>
 
       <para>There is a way to bar specific users from logging on to a
-	machine, even if they are present in the NIS database.  To do
+	machine, even if they are present in the <acronym>NIS</acronym> database.  To do
 	this, add
 	<literal>-<replaceable>username</replaceable></literal> with
 	the correct number of colons like other entries to the end of
@@ -1852,7 +1788,7 @@ nis_client_enable="YES"</programlisting>
 	machine, where <replaceable>username</replaceable> is the
 	username of the user to bar from logging in.  The line with
 	the blocked user must be before the <literal>+</literal> line
-	for allowing NIS users.  This should preferably be done using
+	for allowing <acronym>NIS</acronym> users.  This should preferably be done using
 	<command>vipw</command>, since <command>vipw</command> will
 	sanity check the changes to
 	<filename>/etc/master.passwd</filename>, as well as
@@ -1889,6 +1825,7 @@ basie&prompt.root;</screen>
     </sect2>
 
     <sect2 id="network-netgroups">
+      <!--
       <sect2info>
 	<authorgroup>
 	  <author>
@@ -1898,6 +1835,7 @@ basie&prompt.root;</screen>
 	  </author>
 	</authorgroup>
       </sect2info>
+      -->
 
       <title>Using Netgroups</title>
 
@@ -1911,7 +1849,7 @@ basie&prompt.root;</screen>
 	each machine separately, thus losing the main benefit of NIS:
 	<emphasis>centralized</emphasis> administration.</para>
 
-      <para>The NIS developers' solution for this problem is called
+      <para>The <acronym>NIS</acronym> developers' solution for this problem is called
 	<emphasis>netgroups</emphasis>.  Their purpose and semantics
 	can be compared to the normal groups used by &unix; file
 	systems.  The main differences are the lack of a numeric ID
@@ -1925,9 +1863,9 @@ basie&prompt.root;</screen>
 	with really simple examples.  The example used in the
 	remainder of this section demonstrates this problem.</para>
 
-      <para>Let us assume that the successful introduction of NIS in
+      <para>Let us assume that the successful introduction of <acronym>NIS</acronym> in
 	the laboratory caught a superiors' interest.  The next task is
-	to extend the NIS domain to cover some of the other machines
+	to extend the <acronym>NIS</acronym> domain to cover some of the other machines
 	on campus.  The two tables contain the names of the new users
 	and new machines as well as brief descriptions of them.</para>
 
@@ -2037,13 +1975,13 @@ basie&prompt.root;</screen>
 	one or more netgroups.  Those changes are independent of each
 	other: no more
 	<quote>for each combination of user and machine do...</quote>
-	If the NIS setup is planned carefully, only one central
+	If the <acronym>NIS</acronym> setup is planned carefully, only one central
 	configuration file needs modification to grant or deny access
 	to machines.</para>
 
-      <para>The first step is the initialization of the NIS map
+      <para>The first step is the initialization of the <acronym>NIS</acronym> map
 	netgroup.  &os;'s &man.ypinit.8; does not create this map by
-	default, but its NIS implementation will support it after
+	default, but its <acronym>NIS</acronym> implementation will support it after
 	creation.  To create an empty map, simply type</para>
 
       <screen>ellington&prompt.root; <userinput>vi /var/yp/netgroup</userinput></screen>
@@ -2077,8 +2015,8 @@ INTERNS (,able,test-domain)     (,baker,
 	</listitem>
 
 	<listitem>
-	  <para>The NIS domain for the account.  Accounts may be
-	    imported from other NIS domains into a netgroup.</para>
+	  <para>The <acronym>NIS</acronym> domain for the account.  Accounts may be
+	    imported from other <acronym>NIS</acronym> domains into a netgroup.</para>
 	</listitem>
       </orderedlist>
 
@@ -2089,12 +2027,12 @@ INTERNS (,able,test-domain)     (,baker,

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

From owner-svn-doc-head@FreeBSD.ORG  Tue Oct 15 16:52:16 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [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 8B665A74;
 Tue, 15 Oct 2013 16:52: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 79B9F2672;
 Tue, 15 Oct 2013 16:52: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 r9FGqGTN053298;
 Tue, 15 Oct 2013 16:52:16 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9FGqG8Z053297;
 Tue, 15 Oct 2013 16:52:16 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201310151652.r9FGqG8Z053297@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Tue, 15 Oct 2013 16:52:16 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42966 - head/ja_JP.eucJP/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Oct 2013 16:52:16 -0000

Author: ryusuke
Date: Tue Oct 15 16:52:15 2013
New Revision: 42966
URL: http://svnweb.freebsd.org/changeset/doc/42966

Log:
  - Merge the following from the English version:
  
  	r42954 -> r42963	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	Tue Oct 15 14:44:55 2013	(r42965)
+++ head/ja_JP.eucJP/share/xml/news.xml	Tue Oct 15 16:52:15 2013	(r42966)
@@ -20,7 +20,7 @@
      the contents of <title> will be preferred over <p>.
 
      $FreeBSD$
-     Original revision: r42954
+     Original revision: r42963
 -->
 <news>
     <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
@@ -40,7 +40,7 @@
 	  <title>&os;&nbsp;10.0-BETA1 ¸ø³«</title>
 
 	  <p>&os;-10.0 ¥ê¥ê¡¼¥¹¥µ¥¤¥¯¥ë¤«¤éºÇ½é¤Î¥Ù¡¼¥¿ÈǤ¬¸ø³«¤µ¤́¤̃¤·¤¿ (<a
-	      href="&lists.current;/2013-October/075504.html">¥¢¥Ê¥¦¥ó¥¹</a>)¡£
+	      href="&lists.stable;/2013-October/075504.html">¥¢¥Ê¥¦¥ó¥¹</a>)¡£
 	    <a
 	      href="&url.doc.base;/books/handbook/mirrors-ftp.html">&os;
 	    ¥ß¥é¡¼¥µ¥¤¥È</a> ¤«¤é amd64, i386, ia64, powerpc, powerpc64 ¤ª¤è¤Ó

From owner-svn-doc-head@FreeBSD.ORG  Tue Oct 15 16:57:04 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 140FEC87;
 Tue, 15 Oct 2013 16:57: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 00E1426BC;
 Tue, 15 Oct 2013 16:57: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 r9FGv3wj054773;
 Tue, 15 Oct 2013 16:57:03 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9FGv3UV054772;
 Tue, 15 Oct 2013 16:57:03 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310151657.r9FGv3UV054772@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 15 Oct 2013 16:57:03 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42967 -
 head/en_US.ISO8859-1/books/handbook/network-servers
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Oct 2013 16:57:04 -0000

Author: dru
Date: Tue Oct 15 16:57:03 2013
New Revision: 42967
URL: http://svnweb.freebsd.org/changeset/doc/42967

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	Tue Oct 15 16:52:15 2013	(r42966)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Tue Oct 15 16:57:03 2013	(r42967)
@@ -600,19 +600,19 @@ server-program-arguments</programlisting
       </listitem>
     </itemizedlist>
 
-      <para><acronym>NFS</acronym> consists of at least two main
-	parts: a server and one or more clients.  The client remotely
-	accesses the data that is stored on the server machine.  In
-	order for this to function properly a few processes have to be
-	configured and running.</para>
+    <para><acronym>NFS</acronym> consists of at least two main
+      parts: a server and one or more clients.  The client
+      remotely accesses the data that is stored on the server
+      machine.  In order for this to function properly a few
+      processes have to be configured and running.</para>
 
-      <para>These daemons must be running on the server:</para>
-      <indexterm>
-	<primary>NFS</primary>
+    <para>These daemons must be running on the server:</para>
+    <indexterm>
+      <primary>NFS</primary>
 	<secondary>server</secondary>
-      </indexterm>
-      <indexterm>
-	<primary>file server</primary>
+     </indexterm>
+     <indexterm>
+       <primary>file server</primary>
 	<secondary>UNIX clients</secondary>
       </indexterm>
 
@@ -666,21 +666,21 @@ server-program-arguments</programlisting
       <para>Running &man.nfsiod.8; can improve performance on the
 	client, but is not required.</para>
 
-    <sect2 id="network-configuring-nfs">
-      <title>Configuring <acronym>NFS</acronym></title>
+      <sect2 id="network-configuring-nfs">
+	<title>Configuring <acronym>NFS</acronym></title>
 
-      <indexterm>
-	<primary>NFS</primary>
-	<secondary>configuration</secondary>
-      </indexterm>
+	<indexterm>
+	  <primary>NFS</primary>
+	  <secondary>configuration</secondary>
+	</indexterm>
 
-      <para>Enabling the <acronym>NFS</acronym> server
-	is straightforward.  The required processes
-	can be set to start at boot time by adding
-	these options to
-	<filename>/etc/rc.conf</filename>:</para>
+	<para>Enabling the <acronym>NFS</acronym> server
+	  is straightforward.  The required processes
+	  can be set to start at boot time by adding
+	  these options to
+	  <filename>/etc/rc.conf</filename>:</para>
 
-      <programlisting>rpcbind_enable="YES"
+	<programlisting>rpcbind_enable="YES"
 nfs_server_enable="YES"
 mountd_flags="-r"</programlisting>
 
@@ -1037,7 +1037,8 @@ Exports list on foobar:
       </authorgroup>
     </sect1info>
     -->
-    <title>Network Information System (NIS/YP)</title>
+      <title>Network Information System (NIS/YP)</title>
+
       <indexterm><primary>NIS</primary></indexterm>
       <indexterm><primary>Solaris</primary></indexterm>
       <indexterm><primary>HP-UX</primary></indexterm>
@@ -1051,14 +1052,13 @@ Exports list on foobar:
       </indexterm>
 
       <para>Network Information System (<acronym>NIS</acronym>)
-	is designed
-	to centralize administration of &unix;-like
-	systems such as
-	&solaris;, HP-UX, &aix;, Linux, NetBSD, OpenBSD, and &os;.
-	<acronym>NIS</acronym>
-	was originally known as Yellow Pages but the name was changed due to trademark
-	issues.  This is the reason why <acronym>NIS</acronym>
-	commands begin with <literal>yp</literal>.</para>
+	is designed to centralize administration of &unix;-like
+	systems such as &solaris;, HP-UX, &aix;, Linux, NetBSD,
+	OpenBSD, and &os;.  <acronym>NIS</acronym> was originally
+	known as Yellow Pages but the name was changed due to
+	trademark issues.   This is the reason why
+	<acronym>NIS</acronym> commands begin with
+	<literal>yp</literal>.</para>
 
       <indexterm>
 	<primary>NIS</primary>
@@ -1066,18 +1066,19 @@ Exports list on foobar:
       </indexterm>
 
       <para><acronym>NIS</acronym> is a Remote Procedure Call
-	(<acronym>RPC</acronym>)-based client/server system that allows a group
-	of machines within an <acronym>NIS</acronym> domain to share a common set of
-	configuration files.  This permits a system administrator to
-	set up <acronym>NIS</acronym> client systems with only minimal configuration data
-	and add, remove or modify configuration data from a single
-	location.</para>
+	(<acronym>RPC</acronym>)-based client/server system that
+	allows a group of machines within an <acronym>NIS</acronym>
+	domain to share a common set of configuration files.  This
+	permits a system administrator to set up
+	<acronym>NIS</acronym> client systems with only minimal
+	configuration data and add, remove or modify configuration
+	data from a single location.</para>
 
     <sect2>
       <title><acronym>NIS</acronym> Terms and Processes</title>
 
-      <para>Table 28.1 summarizes the terms and important processes used
-	by <acronym>NIS</acronym>:</para>
+      <para>Table 28.1 summarizes the terms and important processes
+	used by <acronym>NIS</acronym>:</para>
 
       <indexterm>
 	<primary><application>rpcbind</application></primary>
@@ -1088,6 +1089,7 @@ Exports list on foobar:
 
       <table frame="none" pgwide="1">
 	<title><acronym>NIS</acronym> Terminology</title>
+
 	<tgroup cols="2">
 	  <colspec colwidth="1*"/>
 	  <colspec colwidth="3*"/>
@@ -1103,42 +1105,41 @@ Exports list on foobar:
 	    <row>
 	      <entry><acronym>NIS</acronym> domain name</entry>
 
-	      <entry>An <acronym>NIS</acronym> master server and all of its clients,
-		including its slave servers, share a <acronym>NIS</acronym> domain name
-		which
-		does not have anything to do with
-		<acronym>DNS</acronym>.</entry>
+	      <entry>An <acronym>NIS</acronym> master server and all
+		of its clients, including its slave servers, share a
+		<acronym>NIS</acronym> domain name which does not have
+		anything to do with <acronym>DNS</acronym>.</entry>
 	    </row>
 
 	    <row>
 	      <entry>&man.rpcbind.8;</entry>
 
 	      <entry>This service enables <acronym>RPC</acronym> and
-		must be running
-		in order to run an <acronym>NIS</acronym> server or act as
-		an <acronym>NIS</acronym> client.</entry>
+		must be running in order to run an
+		<acronym>NIS</acronym> server or act as an
+		<acronym>NIS</acronym> client.</entry>
 	    </row>
 
 	    <row>
 	      <entry>&man.ypbind.8;</entry>
-	      <entry>This service binds an <acronym>NIS</acronym> client to its <acronym>NIS</acronym>
-		server.  It will take the <acronym>NIS</acronym> domain name
-		and use <acronym>RPC</acronym> to connect to
-		the server.  It is the
-		core of client/server communication in an <acronym>NIS</acronym>
-		environment.  If this service is not running
-		on a client machine, it will not be able to access the
-		<acronym>NIS</acronym> server.</entry>
+	      <entry>This service binds an <acronym>NIS</acronym>
+		client to its <acronym>NIS</acronym> server.  It will
+		take the <acronym>NIS</acronym> domain name and use
+		<acronym>RPC</acronym> to connect to the server.  It
+		is the core of client/server communication in an
+		<acronym>NIS</acronym> environment.  If this service
+		is not running on a client machine, it will not be
+		able to access the <acronym>NIS</acronym>
+		server.</entry>
 	    </row>
 
 	    <row>
 	      <entry>&man.ypserv.8;</entry>
-	      <entry>This is the process for
-		the <acronym>NIS</acronym> server.  If this service stops running,
-		the server will no longer be able to
-		respond to <acronym>NIS</acronym> requests so hopefully, there is a slave
-		server to take over.  Some
-		non-&os; clients
+	      <entry>This is the process for the
+		<acronym>NIS</acronym> server.  If this service stops
+		running, the server will no longer be able to respond
+		to <acronym>NIS</acronym> requests so hopefully, there
+		is a slave server to take over.  Some non-&os; clients
 		will not try to reconnect using a slave server and the
 		<application>ypbind</application> process may need to
 		be restarted on these
@@ -1148,11 +1149,12 @@ Exports list on foobar:
 	    <row>
 	      <entry>&man.rpc.yppasswdd.8;</entry>
 	      <entry>This process only runs on
-		<acronym>NIS</acronym> master servers.  This daemon allows
-		<acronym>NIS</acronym> clients to change their <acronym>NIS</acronym> passwords.  If this
-		daemon is not running, users will have to login to the
-		<acronym>NIS</acronym> master server and change their passwords
-		there.</entry>
+		<acronym>NIS</acronym> master servers.  This daemon
+		allows <acronym>NIS</acronym> clients to change their
+		<acronym>NIS</acronym> passwords.  If this daemon is
+		not running, users will have to login to the
+		<acronym>NIS</acronym> master server and change their
+		passwords there.</entry>
 	    </row>
 	  </tbody>
 	</tgroup>
@@ -1163,64 +1165,68 @@ Exports list on foobar:
 
     <sect2>
       <title>Machine Types</title>
+
+      <indexterm><primary>NIS</primary>
+	<secondary>master server</secondary>
+      </indexterm>
+      <indexterm><primary>NIS</primary>
+	<secondary>slave server</secondary>
+      </indexterm>
       <indexterm><primary>NIS</primary>
-		<secondary>master server</secondary>
-	      </indexterm>
-	      <indexterm>
-		<primary>NIS</primary>
-		<secondary>slave server</secondary>
-	      </indexterm>
-	      <indexterm>
-		<primary>NIS</primary>
-		<secondary>client</secondary>
-	      </indexterm>
+	<secondary>client</secondary>
+      </indexterm>
 
-      <para>There are three types of hosts in an <acronym>NIS</acronym> environment:</para>
+      <para>There are three types of hosts in an
+	<acronym>NIS</acronym> environment:</para>
 
-	<itemizedlist>
-	  <listitem>
-	    <para><acronym>NIS</acronym> master server</para>
-	    
-	    <para>This server acts as a
-	      central repository for host configuration information and
-	      maintains the authoritative copy of the files used by all of the <acronym>NIS</acronym>
-	      clients.  The <filename>passwd</filename>,
-	      <filename>group</filename>, and other various files used
-	      by <acronym>NIS</acronym> clients are stored on the master server.  While
-	      it is possible for one machine to be an <acronym>NIS</acronym> master
-	      server for more than one <acronym>NIS</acronym> domain, this
-	      will not be covered in chapter as it
-	      assumes a relatively small-scale <acronym>NIS</acronym>
-	      environment.</para>
-	  </listitem>
+      <itemizedlist>
+	<listitem>
+	  <para><acronym>NIS</acronym> master server</para>
 
-	  <listitem>
-	    <para><acronym>NIS</acronym> slave servers</para>
+	  <para>This server acts as a central repository for host
+	    configuration information and maintains the
+	    authoritative copy of the files used by all of the
+	    <acronym>NIS</acronym> clients.  The
+	    <filename>passwd</filename>, <filename>group</filename>,
+	    and other various files used by <acronym>NIS</acronym>
+	    clients are stored on the master server.  While it is
+	    possible for one machine to be an <acronym>NIS</acronym>
+	    master server for more than one <acronym>NIS</acronym>
+	    domain, this will not be covered in chapter as it
+	    assumes a relatively small-scale <acronym>NIS</acronym>
+	    environment.</para>
+	</listitem>
 
-	    <para><acronym>NIS</acronym> slave servers maintain copies of the
-	      <acronym>NIS</acronym> master's data files in order to provide
-	      redundancy.
-	      Slave servers also help to balance the load of the master server as
-	      <acronym>NIS</acronym> clients always attach to the <acronym>NIS</acronym> server which
-	      responds first.</para>
-	  </listitem>
+	<listitem>
+	  <para><acronym>NIS</acronym> slave servers</para>
 
-	  <listitem>
-	    <para><acronym>NIS</acronym> clients</para>
+	  <para><acronym>NIS</acronym> slave servers maintain copies
+	    of the <acronym>NIS</acronym> master's data files in
+	    order to provide redundancy.  Slave servers also help to
+	    balance the load of the master server as
+	    <acronym>NIS</acronym> clients always attach to the
+	    <acronym>NIS</acronym> server which responds
+	    first.</para>
+	</listitem>
 
-	      <para><acronym>NIS</acronym> clients
-	      authenticate against the <acronym>NIS</acronym> server
-	      during log on.</para>
-	  </listitem>
-	</itemizedlist>
+	<listitem>
+	  <para><acronym>NIS</acronym> clients</para>
+
+	  <para><acronym>NIS</acronym> clients authenticate
+	    against the <acronym>NIS</acronym> server during log
+	    on.</para>
+	</listitem>
+      </itemizedlist>
 
-      <para>Information in many files can be shared using <acronym>NIS</acronym>.
-	The <filename>master.passwd</filename>,
+      <para>Information in many files can be shared using
+	<acronym>NIS</acronym>.  The
+	<filename>master.passwd</filename>,
 	<filename>group</filename>, and <filename>hosts</filename>
-	files are commonly shared via <acronym>NIS</acronym>.  Whenever a process on a
-	client needs information that would normally be found in these
-	files locally, it makes a query to the <acronym>NIS</acronym> server that it is
-	bound to instead.</para>
+	files are commonly shared via <acronym>NIS</acronym>.
+	Whenever a process on a client needs information that would
+	normally be found in these files locally, it makes a query to
+	the <acronym>NIS</acronym> server that it is bound to
+	instead.</para>
     </sect2>
 
     <sect2>
@@ -1232,8 +1238,8 @@ Exports list on foobar:
 	  machine has its own <filename>/etc/passwd</filename> and
 	  <filename>/etc/master.passwd</filename>.  These files are
 	  kept in sync with each other only through manual
-	  intervention.  Currently, when a user is added to the lab, the
-	  process must be repeated on all 15 machines..</para>
+	  intervention.  Currently, when a user is added to the lab,
+	  the process must be repeated on all 15 machines..</para>
 
 	<para>The configuration of the lab will be as follows:</para>
 
@@ -1295,28 +1301,29 @@ Exports list on foobar:
 	    <primary>NIS</primary>
 	    <secondary>domain name</secondary>
 	  </indexterm>
-	  <para>When a client broadcasts
-	    its requests for info, it includes the name of the <acronym>NIS</acronym>
-	    domain that it is part of.  This is how multiple servers
-	    on one network can tell which server should answer which
-	    request.  Think of the <acronym>NIS</acronym> domain name as the name for a
-	    group of hosts.</para>
-
-	  <para>Some organizations choose to use their Internet
-	    domain name for their <acronym>NIS</acronym> domain name.  This is not
-	    recommended as it can cause confusion when trying to debug
-	    network problems.  The <acronym>NIS</acronym> domain name should be unique
-	    within the network and it is helpful if it describes the
-	    group of machines it represents.  For example, the Art
-	    department at Acme Inc. might be in the
-	    <quote>acme-art</quote> <acronym>NIS</acronym> domain.  This example
-	    will use the domain name
-	    <literal>test-domain</literal>.</para>
-
-	  <para>However, some non-&os; operating systems require
-	    the <acronym>NIS</acronym> domain name to be the same as the Internet domain name.  If
-	    one or more machines on the network have this
-	    restriction, the Internet domain name <emphasis>must</emphasis> be used as the
+	  <para>When a client broadcasts its requests for info, it
+	    includes the name of the <acronym>NIS</acronym> domain
+	    that it is part of.  This is how multiple servers on one
+	    network can tell which server should answer which request.
+	    Think of the <acronym>NIS</acronym> domain name as the
+	    name for a group of hosts.</para>
+
+	  <para>Some organizations choose to use their Internet domain
+	    name for their <acronym>NIS</acronym> domain name.  This
+	    is not recommended as it can cause confusion when trying
+	    to debug network problems.  The <acronym>NIS</acronym>
+	    domain name should be unique within the network and it is
+	    helpful if it describes the group of machines it
+	    represents.  For example, the Art department at Acme Inc.
+	    might be in the <quote>acme-art</quote>
+	    <acronym>NIS</acronym> domain.  This example will use the
+	    domain name <literal>test-domain</literal>.</para>
+
+	  <para>However, some non-&os; operating systems require the
+	    <acronym>NIS</acronym> domain name to be the same as the
+	    Internet domain name.  If one or more machines on the
+	    network have this restriction, the Internet domain name
+	    <emphasis>must</emphasis> be used as the
 	    <acronym>NIS</acronym> domain name.</para>
 	</sect3>
 
@@ -1324,69 +1331,71 @@ Exports list on foobar:
 	  <title>Physical Server Requirements</title>
 
 	  <para>There are several things to keep in mind when choosing
-	    a machine to use as a <acronym>NIS</acronym> server.  Since
-	    <acronym>NIS</acronym> clients depend upon the availability
-	    of the server, choose a machine that is
-	    not rebooted frequently.  The <acronym>NIS</acronym> server should ideally be a stand
-	    alone machine whose sole purpose is to be an <acronym>NIS</acronym>
-	    server.  If the network is not heavily used, it is
-	    acceptable to put the <acronym>NIS</acronym> server on a machine running
-	    other services.  However, if the <acronym>NIS</acronym> server becomes
-	    unavailable, it will adversely affect
-	    all <acronym>NIS</acronym> clients.</para>
-      </sect3>
-    </sect2>
+	    a machine to use as a <acronym>NIS</acronym> server.
+	    Since <acronym>NIS</acronym> clients depend upon the
+	    availability of the server, choose a machine that is not
+	    rebooted frequently.  The <acronym>NIS</acronym> server
+	    should ideally be a stand alone machine whose sole purpose
+	    is to be an <acronym>NIS</acronym> server.  If the network
+	    is not heavily used, it is acceptable to put the
+	    <acronym>NIS</acronym> server on a machine running other
+	    services.  However, if the <acronym>NIS</acronym> server
+	    becomes unavailable, it will adversely affect all
+	    <acronym>NIS</acronym> clients.</para>
+	</sect3>
+      </sect2>
 
       <sect2>
 	<title>Configuring the <acronym>NIS</acronym> Servers</title>
 
-	<para> The canonical copies of all <acronym>NIS</acronym> files are stored
-	  on the master server.  The
-	  databases used to store the information are called <acronym>NIS</acronym> maps.
-	  In &os;, these maps are stored in
+	<para> The canonical copies of all <acronym>NIS</acronym>
+	  files are stored on the master server.  The databases used
+	  to store the information are called <acronym>NIS</acronym>
+	  maps.  In &os;, these maps are stored in
 	  <filename>/var/yp/[domain name]</filename> where
-	  <filename>[domain name]</filename> is the name of the <acronym>NIS</acronym>
-	  domain.  Since multiple
-	  domains are supported, it is possible to have
-	  several directories, one for each domain.
-	  Each domain will have its own independent set of
-	  maps.</para>
-
-	<para><acronym>NIS</acronym> master and slave servers handle all <acronym>NIS</acronym> requests
-	  through &man.ypserv.8;.  This daemon
-	  is responsible for receiving
-	  incoming requests from <acronym>NIS</acronym> clients, translating the
+	  <filename>[domain name]</filename> is the name of the
+	  <acronym>NIS</acronym> domain.  Since multiple domains are
+	  supported, it is possible to have several directories, one
+	  for each domain.  Each domain will have its own independent
+	  set of maps.</para>
+
+	<para><acronym>NIS</acronym> master and slave servers handle
+	  all <acronym>NIS</acronym> requests through &man.ypserv.8;.
+	  This daemon is responsible for receiving incoming requests
+	  from <acronym>NIS</acronym> clients, translating the
 	  requested domain and map name to a path to the corresponding
 	  database file, and transmitting data from the database back
 	  to the client.</para>
 
 	<sect3>
-	  <title>Setting Up a <acronym>NIS</acronym> Master Server</title>
+	  <title>Setting Up a <acronym>NIS</acronym> Master
+	    Server</title>
 
 	  <indexterm>
 	    <primary>NIS</primary>
 	    <secondary>server configuration</secondary>
 	  </indexterm>
-	  <para>Setting up a master <acronym>NIS</acronym> server can be relatively
-	    straight forward, depending on environmental needs.  Since &os;
-	    provides built-in <acronym>NIS</acronym> support, it only needs
-	    to be enabled by adding the following lines to
+	  <para>Setting up a master <acronym>NIS</acronym> server can
+	    be relatively straight forward, depending on environmental
+	    needs.  Since &os; provides built-in
+	    <acronym>NIS</acronym> support, it only needs to be
+	    enabled by adding the following lines to
 	    <filename>/etc/rc.conf</filename>:</para>
 
 	  <procedure>
 	    <step>
 	      <programlisting>nisdomainname="test-domain"</programlisting>
 
-	      <para>This line sets the <acronym>NIS</acronym> domain name to
-		<literal>test-domain</literal>.</para>
+	      <para>This line sets the <acronym>NIS</acronym> domain
+		name to <literal>test-domain</literal>.</para>
 	    </step>
 
 	    <step>
 	      <programlisting>nis_server_enable="YES"</programlisting>
 
-	      <para>This automates the start up of the <acronym>NIS</acronym> server
-		processes when the system
-		boots.</para>
+	      <para>This automates the start up of the
+		<acronym>NIS</acronym> server processes when the
+		system boots.</para>
 	    </step>
 
 	    <step>
@@ -1399,56 +1408,61 @@ Exports list on foobar:
 	    </step>
 	  </procedure>
 
-	    <para>Depending on the <acronym>NIS</acronym> setup, additional entries may
-	      be required.  Refer to
-	      <xref linkend="network-nis-server-is-client"/> if
-		the <acronym>NIS</acronym> server is also an <acronym>NIS</acronym> clients.</para>
+	  <para>Depending on the <acronym>NIS</acronym> setup,
+	    additional entries may be required.  Refer to <xref
+	      linkend="network-nis-server-is-client"/> if the
+	    <acronym>NIS</acronym> server is also an
+	    <acronym>NIS</acronym> clients.</para>
 
 	  <para>After saving the edits, type
-	    <command>/etc/netstart</command> to restart the network and
-	    apply the values defined in
-	    <filename>/etc/rc.conf</filename>.  Before
-	    initializing the <acronym>NIS</acronym> maps, start
+	    <command>/etc/netstart</command> to restart the network
+	    and apply the values defined in
+	    <filename>/etc/rc.conf</filename>.  Before initializing
+	    the <acronym>NIS</acronym> maps, start
 	    &man.ypserv.8;:</para>
 
 	  <screen>&prompt.root; <userinput>service ypserv start</userinput></screen>
 	</sect3>
 
 	<sect3>
-	  <title>Initializing the <acronym>NIS</acronym> Maps</title>
+	  <title>Initializing the <acronym>NIS</acronym>
+	    Maps</title>
 
 	  <indexterm>
 	    <primary>NIS</primary>
 	    <secondary>maps</secondary>
 	  </indexterm>
-	  <para><acronym>NIS</acronym> maps are database files
-	    stored in <filename class="directory">/var/yp</filename>.
-	    They are generated from configuration files in
-	    <filename class="directory">/etc</filename> on the <acronym>NIS</acronym> master,
-	    with one exception:
-	    <filename>/etc/master.passwd</filename>.  This is to prevent the
-	    propagation passwords to all the servers in the <acronym>NIS</acronym> domain.  Therefore,
-	    before the <acronym>NIS</acronym> maps are initialized, configure the primary
-	    password files:</para>
+	  <para><acronym>NIS</acronym> maps are database files stored
+	    in <filename class="directory">/var/yp</filename>.  They
+	    are generated from configuration files in <filename
+	      class="directory">/etc</filename> on the
+	    <acronym>NIS</acronym> master, with one exception:
+	    <filename>/etc/master.passwd</filename>.  This is to
+	    prevent the propagation passwords to all the servers in
+	    the <acronym>NIS</acronym> domain.  Therefore, before the
+	    <acronym>NIS</acronym> maps are initialized, configure the
+	    primary password files:</para>
 
 	  <screen>&prompt.root; <userinput>cp /etc/master.passwd /var/yp/master.passwd</userinput>
 &prompt.root; <userinput>cd /var/yp</userinput>
 &prompt.root; <userinput>vi master.passwd</userinput></screen>
 
 	  <para>It is advisable to remove all entries for system
-	    accounts as well as any user accounts
-	    that do not need to be propagated to the <acronym>NIS</acronym> clients, such as
-	    the <username>root</username> accounts.</para>
+	    accounts as well as any user accounts that do not need to
+	    be propagated to the <acronym>NIS</acronym> clients, such
+	    as the <username>root</username> accounts.</para>
 
 	  <note><para>Ensure that the
 	    <filename>/var/yp/master.passwd</filename> is neither
-	      group or world readable by setting its permissions to <literal>600</literal>.</para></note>
+	      group or world readable by setting its permissions to
+	      <literal>600</literal>.</para></note>
 
 	  <para>When this task has been completed, it is time to
-	    initialize the <acronym>NIS</acronym> maps.  &os; includes the
-	    &man.ypinit.8; script to do this.  When generating
+	    initialize the <acronym>NIS</acronym> maps.  &os; includes
+	    the &man.ypinit.8; script to do this.  When generating
 	    maps for the master server, include
-	    <option>-m</option> and specify the <acronym>NIS</acronym> domain name:</para>
+	    <option>-m</option> and specify the <acronym>NIS</acronym>
+	    domain name:</para>
 
 	  <screen>ellington&prompt.root; <userinput>ypinit -m test-domain</userinput>
 Server Type: MASTER Domain: test-domain
@@ -1478,9 +1492,10 @@ ellington has been setup as an YP master
 	    created <filename>/var/yp/Makefile</filename> from
 	    <filename>/var/yp/Makefile.dist</filename>.  When created,
 	    this file assumes that the operating environment is a
-	    single server <acronym>NIS</acronym> system with only &os; machines.  Since
-	    <literal>test-domain</literal> has a slave server as well,
-	    edit <filename>/var/yp/Makefile</filename> as well:</para>
+	    single server <acronym>NIS</acronym> system with only &os;
+	    machines.  Since <literal>test-domain</literal> has a
+	    slave server as well, edit
+	    <filename>/var/yp/Makefile</filename> as well:</para>
 
 	  <screen>ellington&prompt.root; <userinput>vi /var/yp/Makefile</userinput></screen>
 
@@ -1492,20 +1507,23 @@ ellington has been setup as an YP master
 	</sect3>
 
 	<sect3>
-	  <title>Setting up a <acronym>NIS</acronym> Slave Server</title>
+	  <title>Setting up a <acronym>NIS</acronym> Slave
+	    Server</title>
 
 	  <indexterm>
 	    <primary>NIS</primary>
 	    <secondary>slave server</secondary>
 	  </indexterm>
-	  <para>Setting up an <acronym>NIS</acronym> slave server is even more simple
-	    than setting up the master.  Log on to the slave server
-	    and edit the file <filename>/etc/rc.conf</filename> as you
-	    did before.  The only difference is that we now must use
-	    the <option>-s</option> option when running
+	  <para>Setting up an <acronym>NIS</acronym> slave server is
+	    even more simple than setting up the master.  Log on to
+	    the slave server and edit the file
+	    <filename>/etc/rc.conf</filename> as you did before.  The
+	    only difference is that we now must use the
+	    <option>-s</option> option when running
 	    <command>ypinit</command>.  The <option>-s</option> option
-	    requires the name of the <acronym>NIS</acronym> master be passed to it as
-	    well, so our command line looks like:</para>
+	    requires the name of the <acronym>NIS</acronym> master be
+	    passed to it as well, so our command line looks
+	    like:</para>
 
 	  <screen>coltrane&prompt.root; <userinput>ypinit -s ellington test-domain</userinput>
 
@@ -1564,38 +1582,39 @@ ypxfr: Exiting: Map successfully transfe
 coltrane has been setup as an YP slave server without any errors.
 Remember to update map ypservers on ellington.</screen>
 
-	  <para>There should be a directory called
-	    <filename>/var/yp/test-domain</filename>.  Copies of the
-	    <acronym>NIS</acronym> master server's maps should be in this directory.
-	    These files must always be up to date.  The following
-	    <filename>/etc/crontab</filename> entries on the slave
-	    servers should do the job:</para>
+	<para>There should be a directory called
+	  <filename>/var/yp/test-domain</filename>.  Copies of the
+	  <acronym>NIS</acronym> master server's maps should be in
+	  this directory.  These files must always be up to date.
+	  The following <filename>/etc/crontab</filename> entries on
+	  the slave servers should do the job:</para>
 
-	  <programlisting>20      *       *       *       *       root   /usr/libexec/ypxfr passwd.byname
+	<programlisting>20      *       *       *       *       root   /usr/libexec/ypxfr passwd.byname
 21      *       *       *       *       root   /usr/libexec/ypxfr passwd.byuid</programlisting>
 
-	  <para>These two lines force the slave to sync its maps with
-	    the maps on the master server.  These entries are not
-	    mandatory because the master server automatically attempts
-	    to push any map changes to its slaves; however, due to
-	    the importance of correct password information on other
-	    clients depending on the slave server, it is recommended
-	    to specifically force the password map updates frequently.
-	    This is especially important on busy networks where map
-	    updates might not always complete.</para>
+	<para>These two lines force the slave to sync its maps with
+	  the maps on the master server.  These entries are not
+	  mandatory because the master server automatically attempts
+	  to push any map changes to its slaves; however, due to
+	  the importance of correct password information on other
+	  clients depending on the slave server, it is recommended
+	  to specifically force the password map updates frequently.
+	  This is especially important on busy networks where map
+	  updates might not always complete.</para>
 
-	  <para>Now, run the command <command>/etc/netstart</command>
-	    on the slave server as well, which again starts the NIS
-	    server.</para>
+	<para>Now, run the command <command>/etc/netstart</command>
+	  on the slave server as well, which again starts the NIS
+	  server.</para>
       </sect3>
 
       <sect3>
 	<title>Setting Up a <acronym>NIS</acronym> Client</title>
 
-	<para>An <acronym>NIS</acronym> client establishes what is called a binding to a
-	  particular <acronym>NIS</acronym> server using the <command>ypbind</command>
-	  daemon.  The <command>ypbind</command> command checks the
-	  system's default domain (as set by the
+	<para>An <acronym>NIS</acronym> client establishes what is
+	  called a binding to a particular <acronym>NIS</acronym>
+	  server using the <command>ypbind</command> daemon.  The
+	  <command>ypbind</command> command checks the system's
+	  default domain (as set by the
 	  <command>domainname</command> command), and begins
 	  broadcasting RPC requests on the local network.  These
 	  requests specify the name of the domain for which
@@ -1607,8 +1626,8 @@ Remember to update map ypservers on elli
 	  master and several slaves, for example),
 	  <command>ypbind</command> will use the address of the first
 	  one to respond.  From that point on, the client system will
-	  direct all of its <acronym>NIS</acronym> requests to that server.
-	  <command>ypbind</command> will occasionally
+	  direct all of its <acronym>NIS</acronym> requests to that
+	  server.  <command>ypbind</command> will occasionally
 	  <quote>ping</quote> the server to make sure it is still up
 	  and running.  If it fails to receive a reply to one of its
 	  pings within a reasonable amount of time,
@@ -1616,18 +1635,20 @@ Remember to update map ypservers on elli
 	  and begin broadcasting again in the hopes of locating
 	  another server.</para>
 
-	  <indexterm>
-	    <primary>NIS</primary>
-	    <secondary>client configuration</secondary>
-	  </indexterm>
-	  <para>Setting up a FreeBSD machine to be a <acronym>NIS</acronym> client is
-	    fairly straightforward.</para>
+	<indexterm><primary>NIS</primary>
+	  <secondary>client configuration</secondary>
+	</indexterm>
+
+	<para>Setting up a FreeBSD machine to be a
+	  <acronym>NIS</acronym> client is fairly
+	  straightforward.</para>
 
 	  <procedure>
 	    <step>
 	      <para>Edit <filename>/etc/rc.conf</filename> and add the
-		following lines in order to set the <acronym>NIS</acronym> domain name and
-		start <command>ypbind</command> during network
+		following lines in order to set the
+		<acronym>NIS</acronym> domain name and start
+		<command>ypbind</command> during network
 		startup:</para>
 
 	      <programlisting>nisdomainname="test-domain"
@@ -1636,7 +1657,8 @@ nis_client_enable="YES"</programlisting>
 
 	    <step>
 	      <para>To import all possible password entries from the
-		<acronym>NIS</acronym> server, remove all user accounts from the
+		<acronym>NIS</acronym> server, remove all user
+		accounts from the
 		<filename>/etc/master.passwd</filename> file and use
 		<command>vipw</command> to add the following line to
 		the end of the file:</para>
@@ -1645,8 +1667,9 @@ nis_client_enable="YES"</programlisting>
 
 	      <note>
 		<para>This line will afford anyone with a valid
-		  account in the <acronym>NIS</acronym> server's password maps an
-		  account.  There are many ways to configure the NIS
+		  account in the <acronym>NIS</acronym> server's
+		  password maps an account.  There are many ways to
+		  configure the NIS
 		  client by changing this line.  See the
 		  <link linkend="network-netgroups">netgroups
 		    section</link> below for more information.  For
@@ -1675,15 +1698,16 @@ nis_client_enable="YES"</programlisting>
 	    </step>
 	  </procedure>
 
-	  <para>To start the <acronym>NIS</acronym> client immediately, execute the
-	    following commands as the superuser:</para>
+	  <para>To start the <acronym>NIS</acronym> client
+	    immediately, execute the following commands as the
+	    superuser:</para>
 
 	  <screen>&prompt.root; <userinput>/etc/netstart</userinput>
 &prompt.root; <userinput>service ypbind start</userinput></screen>
 
-	  <para>After completing these steps, the command,
-	    <command>ypcat passwd</command>, should show the
-	    server's passwd map.</para>
+	<para>After completing these steps, the command,
+	  <command>ypcat passwd</command>, should show the
+	  server's passwd map.</para>
       </sect3>
     </sect2>
 
@@ -1691,13 +1715,13 @@ nis_client_enable="YES"</programlisting>
       <title><acronym>NIS</acronym> Security</title>
 
       <para>In general, any remote user may issue an RPC to
-	&man.ypserv.8; and retrieve the contents of the <acronym>NIS</acronym> maps,
-	provided the remote user knows the domain name.  To prevent
-	such unauthorized transactions, &man.ypserv.8; supports a
-	feature called <quote>securenets</quote> which can be used to
-	restrict access to a given set of hosts.  At startup,
-	&man.ypserv.8; will attempt to load the securenets information
-	from a file called
+	&man.ypserv.8; and retrieve the contents of the
+	<acronym>NIS</acronym> maps, provided the remote user knows
+	the domain name.  To prevent such unauthorized transactions,
+	&man.ypserv.8; supports a feature called
+	<quote>securenets</quote> which can be used to restrict access
+	to a given set of hosts.  At startup, &man.ypserv.8; will
+	attempt to load the securenets information from a file called
 	<filename>/var/yp/securenets</filename>.</para>
 
       <note>
@@ -1742,30 +1766,31 @@ nis_client_enable="YES"</programlisting>
 	  firewall.</para>
 
 	<para>Servers using <filename>/var/yp/securenets</filename>
-	  may fail to serve legitimate <acronym>NIS</acronym> clients with archaic TCP/IP
-	  implementations.  Some of these implementations set all host
-	  bits to zero when doing broadcasts and/or fail to observe
-	  the subnet mask when calculating the broadcast address.
-	  While some of these problems can be fixed by changing the
-	  client configuration, other problems may force
-	  the retirement of the client systems in question or the
-	  abandonment of
+	  may fail to serve legitimate <acronym>NIS</acronym> clients
+	  with archaic TCP/IP implementations.  Some of these
+	  implementations set all host bits to zero when doing
+	  broadcasts and/or fail to observe the subnet mask when
+	  calculating the broadcast address.  While some of these
+	  problems can be fixed by changing the client configuration,
+	  other problems may force the retirement of the client
+	  systems in question or the abandonment of
 	  <filename>/var/yp/securenets</filename>.</para>
 
 	<para>Using <filename>/var/yp/securenets</filename> on a
 	  server with such an archaic implementation of TCP/IP is a
-	  really bad idea and will lead to loss of <acronym>NIS</acronym> functionality
-	  for large parts of the network.</para>
+	  really bad idea and will lead to loss of
+	  <acronym>NIS</acronym> functionality for large parts of the
+	  network.</para>
 
 	<indexterm><primary>TCP Wrappers</primary></indexterm>
 	<para>The use of <application>TCP Wrapper</application>
-	  increases the latency of the <acronym>NIS</acronym> server.  The additional
-	  delay may be long enough to cause timeouts in client
-	  programs, especially in busy networks or with slow NIS
-	  servers.  If one or more of the client systems suffers from
-	  these symptoms, convert the client systems in question into
-	  <acronym>NIS</acronym> slave servers and force them to bind to
-	  themselves.</para>
+	  increases the latency of the <acronym>NIS</acronym> server.
+	  The additional delay may be long enough to cause timeouts in
+	  client programs, especially in busy networks or with slow
+	  NIS servers.  If one or more of the client systems suffers
+	  from these symptoms, convert the client systems in question
+	  into <acronym>NIS</acronym> slave servers and force them to
+	  bind to themselves.</para>
       </note>
     </sect2>
 
@@ -1774,21 +1799,23 @@ nis_client_enable="YES"</programlisting>
 
       <para>In our lab, there is a machine <hostid>basie</hostid> that
 	is supposed to be a faculty only workstation.  We do not want
-	to take this machine out of the <acronym>NIS</acronym> domain, yet the
-	<filename>passwd</filename> file on the master <acronym>NIS</acronym> server
-	contains accounts for both faculty and students.  What can we
+	to take this machine out of the <acronym>NIS</acronym> domain,
+	yet the <filename>passwd</filename> file on the master
+	<acronym>NIS</acronym> server contains accounts for both
+	faculty and students.  What can we
 	do?</para>
 
       <para>There is a way to bar specific users from logging on to a
-	machine, even if they are present in the <acronym>NIS</acronym> database.  To do
-	this, add
+	machine, even if they are present in the
+	<acronym>NIS</acronym> database.  To do this, add
 	<literal>-<replaceable>username</replaceable></literal> with
 	the correct number of colons like other entries to the end of
 	the <filename>/etc/master.passwd</filename> file on the client
 	machine, where <replaceable>username</replaceable> is the
 	username of the user to bar from logging in.  The line with
 	the blocked user must be before the <literal>+</literal> line
-	for allowing <acronym>NIS</acronym> users.  This should preferably be done using
+	for allowing <acronym>NIS</acronym> users.  This should
+	preferably be done using
 	<command>vipw</command>, since <command>vipw</command> will
 	sanity check the changes to
 	<filename>/etc/master.passwd</filename>, as well as
@@ -1849,12 +1876,12 @@ basie&prompt.root;</screen>
 	each machine separately, thus losing the main benefit of NIS:
 	<emphasis>centralized</emphasis> administration.</para>
 
-      <para>The <acronym>NIS</acronym> developers' solution for this problem is called
-	<emphasis>netgroups</emphasis>.  Their purpose and semantics
-	can be compared to the normal groups used by &unix; file
-	systems.  The main differences are the lack of a numeric ID
-	and the ability to define a netgroup by including both user
-	accounts and other netgroups.</para>
+      <para>The <acronym>NIS</acronym> developers' solution for this
+	problem is called <emphasis>netgroups</emphasis>.  Their
+	purpose and semantics can be compared to the normal groups
+	used by &unix; file systems.  The main differences are the
+	lack of a numeric ID and the ability to define a netgroup by
+	including both user accounts and other netgroups.</para>
 
       <para>Netgroups were developed to handle large, complex networks
 	with hundreds of users and machines.  On one hand, this is a
@@ -1863,11 +1890,13 @@ basie&prompt.root;</screen>
 	with really simple examples.  The example used in the
 	remainder of this section demonstrates this problem.</para>
 
-      <para>Let us assume that the successful introduction of <acronym>NIS</acronym> in
-	the laboratory caught a superiors' interest.  The next task is
-	to extend the <acronym>NIS</acronym> domain to cover some of the other machines
-	on campus.  The two tables contain the names of the new users
-	and new machines as well as brief descriptions of them.</para>
+      <para>Let us assume that the successful introduction of
+	<acronym>NIS</acronym> in the laboratory caught a superiors'
+	interest.  The next task is to extend the
+	<acronym>NIS</acronym> domain to cover some of the other
+	machines on campus.  The two tables contain the names of the
+	new users and new machines as well as brief descriptions of
+	them.</para>
 
       <informaltable frame="none" pgwide="1">
 	<tgroup cols="2">
@@ -1973,15 +2002,15 @@ basie&prompt.root;</screen>
 	adding a new machine, login restrictions must be defined for
 	all netgroups.  If a new user is added, they must be added to
 	one or more netgroups.  Those changes are independent of each
-	other: no more
-	<quote>for each combination of user and machine do...</quote>
-	If the <acronym>NIS</acronym> setup is planned carefully, only one central
-	configuration file needs modification to grant or deny access
-	to machines.</para>
-
-      <para>The first step is the initialization of the <acronym>NIS</acronym> map
-	netgroup.  &os;'s &man.ypinit.8; does not create this map by
-	default, but its <acronym>NIS</acronym> implementation will support it after
+	other: no more <quote>for each combination of user and machine
+	  do...</quote>  If the <acronym>NIS</acronym> setup is
+	planned carefully, only one central configuration file needs
+	modification to grant or deny access to machines.</para>
+
+      <para>The first step is the initialization of the
+	<acronym>NIS</acronym> map netgroup.  &os;'s &man.ypinit.8;
+	does not create this map by default, but its
+	<acronym>NIS</acronym> implementation will support it after
 	creation.  To create an empty map, simply type</para>
 
       <screen>ellington&prompt.root; <userinput>vi /var/yp/netgroup</userinput></screen>
@@ -2015,8 +2044,9 @@ INTERNS (,able,test-domain)     (,baker,
 	</listitem>
 
 	<listitem>
-	  <para>The <acronym>NIS</acronym> domain for the account.  Accounts may be
-	    imported from other <acronym>NIS</acronym> domains into a netgroup.</para>
+	  <para>The <acronym>NIS</acronym> domain for the account.
+	    Accounts may be imported from other <acronym>NIS</acronym>
+	    domains into a netgroup.</para>
 	</listitem>
       </orderedlist>
 
@@ -2027,18 +2057,19 @@ INTERNS (,able,test-domain)     (,baker,
 	<indexterm><primary>netgroups</primary></indexterm>
 	<para>Netgroup names longer than 8 characters should not be
 	  used, especially with machines running other operating
-	  systems within the <acronym>NIS</acronym> domain.  The names are case
-	  sensitive; using capital letters for netgroup names is an
-	  easy way to distinguish between user, machine and netgroup
-	  names.</para>
-
-	<para>Some <acronym>NIS</acronym> clients (other than &os;) cannot handle
-	  netgroups with a large number of entries.  For example, some
-	  older versions of &sunos; start to cause trouble if a
-	  netgroup contains more than 15 <emphasis>entries</emphasis>.
-	  This limit may be circumvented by creating several
-	  sub-netgroups with 15 users or fewer and a real netgroup
-	  consisting of the sub-netgroups:</para>
+	  systems within the <acronym>NIS</acronym> domain.  The names
+	  are case sensitive; using capital letters for netgroup names
+	  is an easy way to distinguish between user, machine and
+	  netgroup names.</para>
+
+	<para>Some <acronym>NIS</acronym> clients (other than &os;)
+	  cannot handle netgroups with a large number of entries.  For
+	  example, some older versions of &sunos; start to cause
+	  trouble if a netgroup contains more than 15
+	  <emphasis>entries</emphasis>.  This limit may be
+	  circumvented by creating several sub-netgroups with 15 users
+	  or fewer and a real netgroup consisting of the
+	  sub-netgroups:</para>
 
 	<programlisting>BIGGRP1  (,joe1,domain)  (,joe2,domain)  (,joe3,domain) [...]
 BIGGRP2  (,joe16,domain)  (,joe17,domain) [...]
@@ -2049,8 +2080,8 @@ BIGGROUP  BIGGRP1 BIGGRP2 BIGGRP3</progr
 	  within a single netgroup.</para>
       </note>
 
-      <para>Activating and distributing the new <acronym>NIS</acronym> map is
-	easy:</para>

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

From owner-svn-doc-head@FreeBSD.ORG  Tue Oct 15 18:39:12 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 9EE4AB52;
 Tue, 15 Oct 2013 18:39:12 +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 7E9D42E7C;
 Tue, 15 Oct 2013 18:39:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9FIdCsw020799;
 Tue, 15 Oct 2013 18:39:12 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9FIdCBu020798;
 Tue, 15 Oct 2013 18:39:12 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310151839.r9FIdCBu020798@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 15 Oct 2013 18:39:12 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42968 -
 head/en_US.ISO8859-1/books/handbook/network-servers
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Oct 2013 18:39:12 -0000

Author: dru
Date: Tue Oct 15 18:39:12 2013
New Revision: 42968
URL: http://svnweb.freebsd.org/changeset/doc/42968

Log:
  Another dent in this very large chapter. This patch does the following:
  - fixes &os; and most instances of "you"
  - fixes manual page repitition
  - some word-smithing
  - some heading tightening in the NIS section
  - some clarification in the NIS server section

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 15 16:57:03 2013	(r42967)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Tue Oct 15 18:39:12 2013	(r42968)
@@ -156,7 +156,7 @@
 	<application>auth</application>, and
 	<application>daytime</application>.</para>
 
-      <para>This section will cover the basics in configuring
+      <para>This section covers the basics in configuring
 	<application>inetd</application> through its command-line
 	options and its configuration file,
 	<filename>/etc/inetd.conf</filename>.</para>
@@ -191,7 +191,7 @@
 
       <para>Like most server daemons, <application>inetd</application>
 	has a number of options that it can be passed in order to
-	modify its behaviour.  See the &man.inetd.8; manual page for
+	modify its behaviour.  Refer to &man.inetd.8; for
 	the full list of options.</para>
 
       <para>Options can be passed to <application>inetd</application>
@@ -207,8 +207,8 @@
 	users may be pleased to note that these parameters usually do
 	not need to be modified.  These options may be useful if
 	an excessive amount of connections are being established.
-	A full list of options can be found in the
-	&man.inetd.8; manual.</para>
+	A full list of options can be found in
+	&man.inetd.8;.</para>
 
       <variablelist>
 	<varlistentry>
@@ -264,7 +264,7 @@
       <title><filename>inetd.conf</filename></title>
 
       <para>Configuration of <application>inetd</application> is
-	done via the file <filename>/etc/inetd.conf</filename>.</para>
+	done by editing <filename>/etc/inetd.conf</filename>.</para>
 
       <para>When a modification is made to
 	<filename>/etc/inetd.conf</filename>,
@@ -515,8 +515,8 @@ server-program-arguments</programlisting
 	<literal>max-child-per-ip</literal> can be used to limit such
 	attacks.</para>
 
-      <para>By default, TCP wrapping is turned on.  Consult the
-	&man.hosts.access.5; manual page for more information on
+      <para>By default, TCP wrapping is turned on.  Consult
+	&man.hosts.access.5; for more information on
 	placing TCP restrictions on various
 	<application>inetd</application> invoked daemons.</para>
     </sect2>
@@ -536,7 +536,7 @@ server-program-arguments</programlisting
 	identity network services, and is configurable to a certain
 	degree, whilst the others are simply on or off.</para>
 
-      <para>Consult the &man.inetd.8; manual page for more in-depth
+      <para>Consult &man.inetd.8; for more in-depth
 	information.</para>
     </sect2>
   </sect1>
@@ -592,8 +592,7 @@ server-program-arguments</programlisting
       </listitem>
 
       <listitem>
-	<para>Removable media storage devices, such as floppy disks
-	  or <acronym>CD-ROM</acronym> drives, can be used by other
+	<para>Removable media storage devices can be used by other
 	  machines on the network.  This reduces the number of devices
 	  throughout the network and provides a centralized location
 	  to manage their security.</para>
@@ -840,7 +839,7 @@ mountd_flags="-r"</programlisting>
 
       <programlisting>server:/home	/mnt	nfs	rw	0	0</programlisting>
 
-      <para>The &man.fstab.5; manual page lists all the available
+      <para>Refer to &man.fstab.5; for a description of all available
 	options.</para>
     </sect2>
 
@@ -870,7 +869,7 @@ rpc_statd_enable="YES"</programlisting>
       <para>If locking is not required on the server, the
 	<acronym>NFS</acronym> client can be configured to lock
 	locally by passing <option>-L</option> to &man.mount.nfs.8;.
-	Refer to the &man.mount.nfs.8; manual page for further
+	Refer to &man.mount.nfs.8; for further
 	details.</para>
     </sect2>
 
@@ -1009,7 +1008,7 @@ Exports list on foobar:
 	<filename>/etc/amd.conf</filename> defines some of the more
 	advanced features of <application>amd</application>.</para>
 
-      <para>Consult the &man.amd.8; and &man.amd.conf.5; manual pages
+      <para>Consult &man.amd.8; and &man.amd.conf.5;
 	for more information.</para>
     </sect2>
   </sect1>
@@ -1037,7 +1036,7 @@ Exports list on foobar:
       </authorgroup>
     </sect1info>
     -->
-      <title>Network Information System (NIS/YP)</title>
+      <title>Network Information System (<acronym>NIS</acronym>)</title>
 
       <indexterm><primary>NIS</primary></indexterm>
       <indexterm><primary>Solaris</primary></indexterm>
@@ -1071,7 +1070,7 @@ Exports list on foobar:
 	domain to share a common set of configuration files.  This
 	permits a system administrator to set up
 	<acronym>NIS</acronym> client systems with only minimal
-	configuration data and add, remove or modify configuration
+	configuration data and to add, remove, or modify configuration
 	data from a single location.</para>
 
     <sect2>
@@ -1105,9 +1104,9 @@ Exports list on foobar:
 	    <row>
 	      <entry><acronym>NIS</acronym> domain name</entry>
 
-	      <entry>An <acronym>NIS</acronym> master server and all
-		of its clients, including its slave servers, share a
-		<acronym>NIS</acronym> domain name which does not have
+	      <entry><acronym>NIS</acronym> servers and
+		clients share an
+		<acronym>NIS</acronym> domain name.  Typically, this name does not have
 		anything to do with <acronym>DNS</acronym>.</entry>
 	    </row>
 
@@ -1192,7 +1191,7 @@ Exports list on foobar:
 	    clients are stored on the master server.  While it is
 	    possible for one machine to be an <acronym>NIS</acronym>
 	    master server for more than one <acronym>NIS</acronym>
-	    domain, this will not be covered in chapter as it
+	    domain, this type of configuration will not be covered in this chapter as it
 	    assumes a relatively small-scale <acronym>NIS</acronym>
 	    environment.</para>
 	</listitem>
@@ -1233,13 +1232,13 @@ Exports list on foobar:
       <title>Planning Considerations</title>
 
       <para>This section describes a sample <acronym>NIS</acronym>
-	environment which consists of 15 &os; machines and which
-	  currently has no centralized point of administration.  Each
+	environment which consists of 15 &os; machines with
+	  no centralized point of administration.  Each
 	  machine has its own <filename>/etc/passwd</filename> and
 	  <filename>/etc/master.passwd</filename>.  These files are
 	  kept in sync with each other only through manual
 	  intervention.  Currently, when a user is added to the lab,
-	  the process must be repeated on all 15 machines..</para>
+	  the process must be repeated on all 15 machines.</para>
 
 	<para>The configuration of the lab will be as follows:</para>
 
@@ -1288,7 +1287,7 @@ Exports list on foobar:
 	  </tgroup>
 	</informaltable>
 
-	<para>If this is the first time a <acronym>NIS</acronym>
+	<para>If this is the first time an <acronym>NIS</acronym>
 	  scheme is being developed, it should be thoroughly planned
 	  ahead of time.  Regardless of network size, several
 	  decisions need to be made as part of the planning
@@ -1346,14 +1345,14 @@ Exports list on foobar:
       </sect2>
 
       <sect2>
-	<title>Configuring the <acronym>NIS</acronym> Servers</title>
+	<title>Configuring the <acronym>NIS</acronym> Master Server</title>
 
 	<para> The canonical copies of all <acronym>NIS</acronym>
 	  files are stored on the master server.  The databases used
 	  to store the information are called <acronym>NIS</acronym>
 	  maps.  In &os;, these maps are stored in
-	  <filename>/var/yp/[domain name]</filename> where
-	  <filename>[domain name]</filename> is the name of the
+	  <filename>/var/yp/[domainname]</filename> where
+	  <filename>[domainname]</filename> is the name of the
 	  <acronym>NIS</acronym> domain.  Since multiple domains are
 	  supported, it is possible to have several directories, one
 	  for each domain.  Each domain will have its own independent
@@ -1367,10 +1366,6 @@ Exports list on foobar:
 	  database file, and transmitting data from the database back
 	  to the client.</para>
 
-	<sect3>
-	  <title>Setting Up a <acronym>NIS</acronym> Master
-	    Server</title>
-
 	  <indexterm>
 	    <primary>NIS</primary>
 	    <secondary>server configuration</secondary>
@@ -1408,11 +1403,25 @@ Exports list on foobar:
 	    </step>
 	  </procedure>
 
-	  <para>Depending on the <acronym>NIS</acronym> setup,
-	    additional entries may be required.  Refer to <xref
-	      linkend="network-nis-server-is-client"/> if the
-	    <acronym>NIS</acronym> server is also an
-	    <acronym>NIS</acronym> clients.</para>
+      <para>Care must be taken
+	in a multi-server domain
+	where the server machines are also <acronym>NIS</acronym>
+	clients.  It is generally a good idea to force the servers to
+	bind to themselves rather than allowing them to broadcast bind
+	requests and possibly become bound to each other.  Strange
+	failure modes can result if one server goes down and others
+	are dependent upon it.  Eventually, all the clients will time
+	out and attempt to bind to other servers, but the delay
+	involved can be considerable and the failure mode is still
+	present since the servers might bind to each other all over
+	again.</para>
+
+      <para>A server that is also a client can be forced to bind to a particular server by
+	adding these additional lines to
+	<filename>/etc/rc.conf</filename>:</para>
+
+      <programlisting>nis_client_enable="YES" # run client stuff as well
+nis_client_flags="-S <replaceable>NIS domain</replaceable>,<replaceable>server</replaceable>"</programlisting>
 
 	  <para>After saving the edits, type
 	    <command>/etc/netstart</command> to restart the network
@@ -1422,7 +1431,6 @@ Exports list on foobar:
 	    &man.ypserv.8;:</para>
 
 	  <screen>&prompt.root; <userinput>service ypserv start</userinput></screen>
-	</sect3>
 
 	<sect3>
 	  <title>Initializing the <acronym>NIS</acronym>
@@ -1432,13 +1440,12 @@ Exports list on foobar:
 	    <primary>NIS</primary>
 	    <secondary>maps</secondary>
 	  </indexterm>
-	  <para><acronym>NIS</acronym> maps are database files stored
-	    in <filename class="directory">/var/yp</filename>.  They
-	    are generated from configuration files in <filename
+	  <para><acronym>NIS</acronym> maps
+	    are generated from the configuration files in <filename
 	      class="directory">/etc</filename> on the
 	    <acronym>NIS</acronym> master, with one exception:
 	    <filename>/etc/master.passwd</filename>.  This is to
-	    prevent the propagation passwords to all the servers in
+	    prevent the propagation of passwords to all the servers in
 	    the <acronym>NIS</acronym> domain.  Therefore, before the
 	    <acronym>NIS</acronym> maps are initialized, configure the
 	    primary password files:</para>
@@ -1457,7 +1464,7 @@ Exports list on foobar:
 	      group or world readable by setting its permissions to
 	      <literal>600</literal>.</para></note>
 
-	  <para>When this task has been completed, it is time to
+	  <para>After completing this task,
 	    initialize the <acronym>NIS</acronym> maps.  &os; includes
 	    the &man.ypinit.8; script to do this.  When generating
 	    maps for the master server, include
@@ -1488,25 +1495,21 @@ Is this correct?  [y/n: y] <userinput>y<
 NIS Map update completed.
 ellington has been setup as an YP master server without any errors.</screen>
 
-	  <para>At this point, <command>ypinit</command> should have
-	    created <filename>/var/yp/Makefile</filename> from
-	    <filename>/var/yp/Makefile.dist</filename>.  When created,
-	    this file assumes that the operating environment is a
-	    single server <acronym>NIS</acronym> system with only &os;
-	    machines.  Since <literal>test-domain</literal> has a
-	    slave server as well, edit
-	    <filename>/var/yp/Makefile</filename> as well:</para>
-
-	  <screen>ellington&prompt.root; <userinput>vi /var/yp/Makefile</userinput></screen>
-
-	  <para>You should comment out the line that says</para>
+	  <para>This will
+	    create <filename>/var/yp/Makefile</filename> from
+	    <filename>/var/yp/Makefile.dist</filename>.  By default,
+	    this file assumes that the environment has a
+	    single <acronym>NIS</acronym> server with only &os;
+	    clients.  Since <literal>test-domain</literal> has a
+	    slave server, edit this line in
+	    <filename>/var/yp/Makefile</filename> so that it begins with a 
+	    comment (<literal>#</literal>):</para>
 
 	  <programlisting>NOPUSH = "True"</programlisting>
-
-	  <para>(if it is not commented out already).</para>
 	</sect3>
+      </sect2>
 
-	<sect3>
+	<sect2>
 	  <title>Setting up a <acronym>NIS</acronym> Slave
 	    Server</title>
 
@@ -1515,15 +1518,14 @@ ellington has been setup as an YP master
 	    <secondary>slave server</secondary>
 	  </indexterm>
 	  <para>Setting up an <acronym>NIS</acronym> slave server is
-	    even more simple than setting up the master.  Log on to
-	    the slave server and edit the file
-	    <filename>/etc/rc.conf</filename> as you did before.  The
-	    only difference is that we now must use the
-	    <option>-s</option> option when running
-	    <command>ypinit</command>.  The <option>-s</option> option
-	    requires the name of the <acronym>NIS</acronym> master be
-	    passed to it as well, so our command line looks
-	    like:</para>
+	    simpler than setting up the master.  Log on to
+	    the slave server and edit
+	    <filename>/etc/rc.conf</filename> as before.  This
+	    time, include
+	    <option>-s</option> when running
+	    <command>ypinit</command>.  This option
+	    requires the name of the <acronym>NIS</acronym> master, as 
+	    seen in this example:</para>
 
 	  <screen>coltrane&prompt.root; <userinput>ypinit -s ellington test-domain</userinput>
 
@@ -1605,9 +1607,9 @@ Remember to update map ypservers on elli
 	<para>Now, run the command <command>/etc/netstart</command>
 	  on the slave server as well, which again starts the NIS
 	  server.</para>
-      </sect3>
+      </sect2>
 
-      <sect3>
+      <sect2>
 	<title>Setting Up a <acronym>NIS</acronym> Client</title>
 
 	<para>An <acronym>NIS</acronym> client establishes what is
@@ -1639,7 +1641,7 @@ Remember to update map ypservers on elli
 	  <secondary>client configuration</secondary>
 	</indexterm>
 
-	<para>Setting up a FreeBSD machine to be a
+	<para>Setting up a &os; machine to be a
 	  <acronym>NIS</acronym> client is fairly
 	  straightforward.</para>
 
@@ -1708,7 +1710,6 @@ nis_client_enable="YES"</programlisting>
 	<para>After completing these steps, the command,
 	  <command>ypcat passwd</command>, should show the
 	  server's passwd map.</para>
-      </sect3>
     </sect2>
 
     <sect2>
@@ -2350,35 +2351,6 @@ TWO       (,hotel,test-domain)
 	servers still in use today.</para>
     </sect2>
 
-    <sect2 id="network-nis-server-is-client">
-      <title><acronym>NIS</acronym> Servers That Are Also
-	<acronym>NIS</acronym> Clients</title>
-
-      <para>Care must be taken when running
-	<application>ypserv</application> in a multi-server domain
-	where the server machines are also <acronym>NIS</acronym>
-	clients.  It is generally a good idea to force the servers to
-	bind to themselves rather than allowing them to broadcast bind
-	requests and possibly become bound to each other.  Strange
-	failure modes can result if one server goes down and others
-	are dependent upon it.  Eventually all the clients will time
-	out and attempt to bind to other servers, but the delay
-	involved can be considerable and the failure mode is still
-	present since the servers might bind to each other all over
-	again.</para>
-
-      <para>A host may be forced to bind to a particular server by
-	running <command>ypbind</command> with the <option>-S</option>
-	flag.  Add the following lines to
-	<filename>/etc/rc.conf</filename> to enable this feature
-	during every system boot:</para>
-
-      <programlisting>nis_client_enable="YES" # run client stuff as well
-nis_client_flags="-S <replaceable>NIS domain</replaceable>,<replaceable>server</replaceable>"</programlisting>
-
-      <para>See &man.ypbind.8; for further information.</para>
-    </sect2>
-
     <sect2>
       <title>Password Formats</title>
 
@@ -2663,9 +2635,9 @@ TLS_CIPHER_SUITE HIGH:MEDIUM:+SSLv3</pro
 
       <para>There will be a prompt for entering the password and,
 	if the process does not fail, a password hash will be added
-	to the end of <filename>slapd.conf</filename>.  The
+	to the end of <filename>slapd.conf</filename>.
 	<command>slappasswd</command> understands several hashing
-	formats, refer to the manual page for more information.</para>
+	formats, refer to its manual page for more information.</para>
 
       <para>Edit
 	<filename>/usr/local/etc/openldap/slapd.conf</filename> and
@@ -2831,7 +2803,7 @@ result: 0 Success
     <para>DHCP, the Dynamic Host Configuration Protocol, describes
       the means by which a system can connect to a network and
       obtain the necessary information for communication upon that
-      network.  FreeBSD uses the OpenBSD <command>dhclient</command>
+      network.  &os; uses the OpenBSD <command>dhclient</command>
       taken from OpenBSD&nbsp;3.7.  All information here regarding
       <command>dhclient</command> is for use with either of the ISC
       or OpenBSD DHCP clients.  The DHCP server is the one included
@@ -2840,12 +2812,12 @@ result: 0 Success
     <para>This section describes both the client-side components of
       the ISC and OpenBSD DHCP client and server-side components of
       the ISC DHCP system.  The client-side program,
-      <command>dhclient</command>, comes integrated within FreeBSD,
+      <command>dhclient</command>, comes integrated within &os;,
       and the server-side portion is available from the <filename
-      role="package">net/isc-dhcp42-server</filename> port.  The
+      role="package">net/isc-dhcp42-server</filename> port.  Refer to
       &man.dhclient.8;, &man.dhcp-options.5;, and
-      &man.dhclient.conf.5; manual pages, in addition to the
-      references below, are useful resources.</para>
+      &man.dhclient.conf.5;, in addition to the
+      references below, for more information.</para>
 
     <sect2>
       <title>How It Works</title>
@@ -2869,7 +2841,7 @@ result: 0 Success
     </sect2>
 
     <sect2>
-      <title>FreeBSD Integration</title>
+      <title>&os; Integration</title>
 
       <para>&os; fully integrates the OpenBSD DHCP client,
 	<command>dhclient</command>.  DHCP client support is provided
@@ -2998,24 +2970,23 @@ dhclient_flags=""</programlisting>
 	  <para><command>dhclient</command> requires a configuration
 	    file, <filename>/etc/dhclient.conf</filename>.  Typically
 	    the file contains only comments, the defaults being
-	    reasonably sane.  This configuration file is described by
-	    the &man.dhclient.conf.5; manual page.</para>
+	    reasonably sane.  This configuration file is described in
+	    &man.dhclient.conf.5;.</para>
 	</listitem>
 
 	<listitem>
 	  <para><filename>/sbin/dhclient</filename></para>
 
-	  <para><command>dhclient</command> is statically linked and
-	    resides in <filename>/sbin</filename>.  The
-	    &man.dhclient.8; manual page gives more information about
-	    <command>dhclient</command>.</para>
+	  <para>More information
+	    about
+	    <command>dhclient</command> can be found in &man.dhclient.8;.</para>
 	</listitem>
 
 	<listitem>
 	  <para><filename>/sbin/dhclient-script</filename></para>
 
 	  <para><command>dhclient-script</command> is the
-	    FreeBSD-specific DHCP client configuration script.  It
+	    &os;-specific DHCP client configuration script.  It
 	    is described in &man.dhclient-script.8;, but should not
 	    need any user modification to function properly.</para>
 	</listitem>
@@ -3047,7 +3018,7 @@ dhclient_flags=""</programlisting>
 	<title>What This Section Covers</title>
 
 	<para>This section provides information on how to configure a
-	  FreeBSD system to act as a DHCP server using the ISC
+	  &os; system to act as a DHCP server using the ISC
 	  (Internet Systems Consortium) implementation of the DHCP
 	  server.</para>
 
@@ -3235,10 +3206,9 @@ dhcpd_ifaces="dc0"</programlisting>
 
 	    <para><application>dhcpd</application> is statically
 	      linked and resides in
-	      <filename>/usr/local/sbin</filename>.  The &man.dhcpd.8;
-	      manual page installed with the port gives more
+	      <filename>/usr/local/sbin</filename>.   More
 	      information about
-	      <application>dhcpd</application>.</para>
+	      <application>dhcpd</application> can be found in &man.dhcpd.8;.</para>
 	  </listitem>
 
 	  <listitem>
@@ -3251,8 +3221,8 @@ dhcpd_ifaces="dc0"</programlisting>
 	      needs to contain all the information that should be
 	      provided to clients that are being serviced, along with
 	      information regarding the operation of the server.  This
-	      configuration file is described by the
-	      &man.dhcpd.conf.5; manual page installed by the
+	      configuration file is described in
+	      &man.dhcpd.conf.5;, which is installed by the
 	      port.</para>
 	  </listitem>
 
@@ -3260,9 +3230,9 @@ dhcpd_ifaces="dc0"</programlisting>
 	    <para><filename>/var/db/dhcpd.leases</filename></para>
 
 	    <para>The DHCP server keeps a database of leases it has
-	      issued in this file, which is written as a log.  The
-	      manual page &man.dhcpd.leases.5;, installed by the
-	      port gives a slightly longer description.</para>
+	      issued in this file, which is written as a log.  The port installs
+	      &man.dhcpd.leases.5;, which
+	      gives a slightly longer description.</para>
 	  </listitem>
 
 	  <listitem>
@@ -3274,8 +3244,8 @@ dhcpd_ifaces="dc0"</programlisting>
 	      separate network.  If this functionality is required,
 	      then install the
 	      <filename role="package">net/isc-dhcp42-relay</filename>
-	      port.  The &man.dhcrelay.8; manual page provided with
-	      the port contains more detail.</para>
+	      port.  The port installs &man.dhcrelay.8;, which provides
+	      more detail.</para>
 	  </listitem>
 	</itemizedlist>
       </sect3>
@@ -3592,13 +3562,13 @@ dhcpd_ifaces="dc0"</programlisting>
 
       <programlisting>named_enable="YES"</programlisting>
 
-      <para>There are obviously many configuration options for
+      <para>There are many configuration options for
 	<filename>/etc/namedb/named.conf</filename> that are beyond
-	the scope of this document.  There are other startup options
-	for <application>named</application> on &os;, take a look at
+	the scope of this document.  Other startup options
+	for <application>named</application> on &os; can be found in
 	the <literal>named_<replaceable>*</replaceable></literal>
-	flags in <filename>/etc/defaults/rc.conf</filename> and
-	consult the &man.rc.conf.5; manual page.  The
+	flags in <filename>/etc/defaults/rc.conf</filename> and in
+	&man.rc.conf.5;.  The
 	<xref linkend="configtuning-rcd"/> section is also a good
 	read.</para>
     </sect2>
@@ -4931,7 +4901,7 @@ DocumentRoot /www/someotherdomain.tld
 
       <para>There are many different <application>Apache</application>
 	modules available to add functionality to the basic server.
-	The FreeBSD Ports Collection provides an easy way to install
+	The &os; Ports Collection provides an easy way to install
 	<application>Apache</application> together with some of the
 	more popular add-on modules.</para>
 
@@ -5220,7 +5190,7 @@ DocumentRoot /www/someotherdomain.tld
       software, <application>ftpd</application>, in the base system.
       This makes setting up and administering an
       <acronym role="File Transfer Protocol">FTP</acronym> server on
-      FreeBSD very straightforward.</para>
+      &os; very straightforward.</para>
 
     <sect2>
       <title>Configuration</title>
@@ -5239,9 +5209,8 @@ DocumentRoot /www/someotherdomain.tld
 	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.  The
-	&man.ftpchroot.5; manual page has all of the details so it
-	will not be described in detail here.</para>
+	users and groups subject to FTP access restrictions.  Refer to
+	&man.ftpchroot.5; for more details.</para>
 
       <indexterm>
 	<primary>FTP</primary>
@@ -5297,7 +5266,7 @@ DocumentRoot /www/someotherdomain.tld
 
       <screen>&prompt.root; <userinput>service ftpd start</userinput></screen>
 
-      <para>You can now log on to the FTP server by typing:</para>
+      <para>Log on to the FTP server by typing:</para>
 
       <screen>&prompt.user; <userinput>ftp localhost</userinput></screen>
     </sect2>
@@ -5772,8 +5741,8 @@ driftfile /var/db/ntp.drift</programlist
 	  <para>This will also prevent access from the server to any
 	    servers listed in the local configuration.  If there is a
 	    need to synchronise the NTP server with an external NTP
-	    server, allow only that specific server.  See the
-	    &man.ntp.conf.5; manual for more information.</para>
+	    server, allow only that specific server.  Refer to
+	    &man.ntp.conf.5; for more information.</para>
 	</note>
 
 	<para>To allow machines within the network to synchronize
@@ -5937,8 +5906,8 @@ driftfile /var/db/ntp.drift</programlist
 
       <note>
 	<para>More information on various supported and available
-	  <emphasis>facilities</emphasis> may be found in the
-	  &man.syslog.conf.5; manual page.</para>
+	  <emphasis>facilities</emphasis> may be found in
+	  &man.syslog.conf.5;.</para>
       </note>
 
       <para>Once added, all <literal>facility</literal> messages will
@@ -5962,8 +5931,8 @@ syslogd_flags="-a logclient.example.com 
 
       <para>Multiple <option>-a</option> options may be specified to
 	allow logging from multiple clients.  <acronym>IP</acronym>
-	addresses and whole netblocks may also be specified, see the
-	&man.syslog.3; manual page for a full list of possible
+	addresses and whole netblocks may also be specified.  Refer to
+	&man.syslog.3; for a full list of possible
 	options.</para>
 
       <para>Finally, the log file should be created.  The method used
@@ -6037,8 +6006,8 @@ syslogd_flags="-s -v -v"</programlisting
 	Facilities are accompanied with a priority or level, which
 	is used to mark how important a log message is.  The most
 	common will be the <literal>warning</literal> and
-	<literal>info</literal>.  Please refer to the &man.syslog.3;
-	manual page for a full list of available facilities and
+	<literal>info</literal>.  Refer to &man.syslog.3;
+	for a full list of available facilities and
 	priorities.</para>
 
       <para>The logging server must be defined in the client's
@@ -6350,9 +6319,9 @@ 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
-	  older versions, refer to the <ulink
-	    url="http://www.freebsd.org/cgi/man.cgi?query=iscontrol&amp;sektion=8&amp;manpath=FreeBSD+10-current">iscontrol(8)</ulink>
-	  manual page.  This chapter only applies to the new
+	  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
 	  initiator.</para>
       </note>
 
@@ -6393,8 +6362,8 @@ target iqn.2012-06.com.example:target0 {
 iqn.2012-06.com.example:target0                 10.10.10.10     Connected: da0</programlisting>
 
 	<para>This means the iSCSI session was successfully
-	  established, and you have <filename>/dev/da0</filename>
-	  representing the attached LUN.  Should the target
+	  established, where <filename>/dev/da0</filename>
+	  represents the attached LUN.  Should the target
 	  ("iqn.2012-06.com.example:target0") export more than one
 	  LUN, there will be multiple device nodes in the <ulink
 	    url="http://www.freebsd.org/cgi/man.cgi?query=iscsictl&amp;sektion=8&amp;manpath=FreeBSD+10-current">iscictl(8)</ulink>
@@ -6452,7 +6421,7 @@ iqn.2012-06.com.example:target0         
 
 	<para>The first line ("t0") specifies a nickname for the
 	  configuration file section, used at the initiator side to
-	  specify which configuration you want to use.  The following
+	  specify which configuration to use.  The following
 	  lines specify various parameters used during connection
 	  - target address and name are mandatory; others are
 	  optional; in this case they specify CHAP username and

From owner-svn-doc-head@FreeBSD.ORG  Tue Oct 15 21:03:05 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [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 92418757;
 Tue, 15 Oct 2013 21:03:05 +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 7F87B2879;
 Tue, 15 Oct 2013 21:03: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 r9FL3577099097;
 Tue, 15 Oct 2013 21:03:05 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9FL35Pr099095;
 Tue, 15 Oct 2013 21:03:05 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201310152103.r9FL35Pr099095@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 15 Oct 2013 21:03:05 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42969 - in head/en_US.ISO8859-1/htdocs/releases: 8.4R
 9.2R
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Oct 2013 21:03:05 -0000

Author: delphij
Date: Tue Oct 15 21:03:04 2013
New Revision: 42969
URL: http://svnweb.freebsd.org/changeset/doc/42969

Log:
  Document dates 8.4-RELEASE and 9.2-RELEASE were turned over to secteam.

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

Modified: head/en_US.ISO8859-1/htdocs/releases/8.4R/schedule.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/8.4R/schedule.xml	Tue Oct 15 18:39:12 2013	(r42968)
+++ head/en_US.ISO8859-1/htdocs/releases/8.4R/schedule.xml	Tue Oct 15 21:03:04 2013	(r42969)
@@ -134,7 +134,7 @@
     <tr>
       <td>Turn over to the secteam</td>
       <td>-</td>
-      <td>-</td>
+      <td>16&nbsp;June&nbsp;2013</td>
       <td>releng/&local.rel; branch is handed over to
 	the FreeBSD Security Officer Team in one or two weeks after the
 	announcement.</td>

Modified: head/en_US.ISO8859-1/htdocs/releases/9.2R/schedule.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/releases/9.2R/schedule.xml	Tue Oct 15 18:39:12 2013	(r42968)
+++ head/en_US.ISO8859-1/htdocs/releases/9.2R/schedule.xml	Tue Oct 15 21:03:04 2013	(r42969)
@@ -145,7 +145,7 @@
     <tr>
       <td>Turn over to the secteam</td>
       <td>-</td>
-      <td>-</td>
+      <td>15&nbsp;October&nbsp;2013</td>
       <td>&local.branch.releng; branch is handed over to the FreeBSD
 	Security Officer Team in one or two weeks after the
 	announcement.</td>

From owner-svn-doc-head@FreeBSD.ORG  Tue Oct 15 22:03:05 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [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 79B36CBB;
 Tue, 15 Oct 2013 22:03:05 +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 59CEF2BAD;
 Tue, 15 Oct 2013 22:03: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 r9FM356g046648;
 Tue, 15 Oct 2013 22:03:05 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9FM359V046645;
 Tue, 15 Oct 2013 22:03:05 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310152203.r9FM359V046645@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 15 Oct 2013 22:03:05 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42970 -
 head/en_US.ISO8859-1/books/handbook/network-servers
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Oct 2013 22:03:05 -0000

Author: dru
Date: Tue Oct 15 22:03:04 2013
New Revision: 42970
URL: http://svnweb.freebsd.org/changeset/doc/42970

Log:
  This patch provides general tightening and clarification of the sections NIS Slave Servers through NIS Security.

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 15 21:03:04 2013	(r42969)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Tue Oct 15 22:03:04 2013	(r42970)
@@ -1517,14 +1517,16 @@ ellington has been setup as an YP master
 	    <primary>NIS</primary>
 	    <secondary>slave server</secondary>
 	  </indexterm>
-	  <para>Setting up an <acronym>NIS</acronym> slave server is
-	    simpler than setting up the master.  Log on to
+	  <para>To set up an <acronym>NIS</acronym> slave server, log on to
 	    the slave server and edit
-	    <filename>/etc/rc.conf</filename> as before.  This
-	    time, include
-	    <option>-s</option> when running
-	    <command>ypinit</command>.  This option
-	    requires the name of the <acronym>NIS</acronym> master, as 
+	    <filename>/etc/rc.conf</filename> as for the master server.  
+	    Do not generate any <acronym>NIS</acronym> maps, as these
+	    already exist on the master server.  When running
+	    <command>ypinit</command> on the slave server, use
+	    <option>-s</option> (for slave) instead of 
+	    <option>-m</option> (for master).  This option
+	    requires the name of the <acronym>NIS</acronym> master in
+	    addition to the domain name, as 
 	    seen in this example:</para>
 
 	  <screen>coltrane&prompt.root; <userinput>ypinit -s ellington test-domain</userinput>
@@ -1584,56 +1586,51 @@ ypxfr: Exiting: Map successfully transfe
 coltrane has been setup as an YP slave server without any errors.
 Remember to update map ypservers on ellington.</screen>
 
-	<para>There should be a directory called
-	  <filename>/var/yp/test-domain</filename>.  Copies of the
-	  <acronym>NIS</acronym> master server's maps should be in
-	  this directory.  These files must always be up to date.
-	  The following <filename>/etc/crontab</filename> entries on
-	  the slave servers should do the job:</para>
+	<para>This will generate a directory on the slave server called
+	  <filename class="directory">/var/yp/test-domain</filename> which contains copies of the
+	  <acronym>NIS</acronym> master server's maps.
+	  Adding these <filename>/etc/crontab</filename> entries on each
+	  slave server will force the slaves to sync their maps with
+	  the maps on the master server:</para>
 
 	<programlisting>20      *       *       *       *       root   /usr/libexec/ypxfr passwd.byname
 21      *       *       *       *       root   /usr/libexec/ypxfr passwd.byuid</programlisting>
 
-	<para>These two lines force the slave to sync its maps with
-	  the maps on the master server.  These entries are not
+	<para>These entries are not
 	  mandatory because the master server automatically attempts
-	  to push any map changes to its slaves; however, due to
-	  the importance of correct password information on other
-	  clients depending on the slave server, it is recommended
-	  to specifically force the password map updates frequently.
+	  to push any map changes to its slaves.  However, since clients may
+	  depend upon the slave server to provide correct password information,
+	  it is recommended
+	  to force frequent password map updates.
 	  This is especially important on busy networks where map
 	  updates might not always complete.</para>
 
-	<para>Now, run the command <command>/etc/netstart</command>
-	  on the slave server as well, which again starts the NIS
-	  server.</para>
+	<para>To finish the configuration, run <command>/etc/netstart</command>
+	  on the slave server in order to start the <acronym>NIS</acronym>
+	  services.</para>
       </sect2>
 
       <sect2>
-	<title>Setting Up a <acronym>NIS</acronym> Client</title>
+	<title>Setting Up an <acronym>NIS</acronym> Client</title>
 
-	<para>An <acronym>NIS</acronym> client establishes what is
-	  called a binding to a particular <acronym>NIS</acronym>
-	  server using the <command>ypbind</command> daemon.  The
-	  <command>ypbind</command> command checks the system's
-	  default domain (as set by the
-	  <command>domainname</command> command), and begins
-	  broadcasting RPC requests on the local network.  These
-	  requests specify the name of the domain for which
-	  <command>ypbind</command> is attempting to establish a
-	  binding.  If a server that has been configured to serve the
-	  requested domain receives one of the broadcasts, it will
-	  respond to <command>ypbind</command>, which will record the
-	  server's address.  If there are several servers available (a
-	  master and several slaves, for example),
-	  <command>ypbind</command> will use the address of the first
-	  one to respond.  From that point on, the client system will
+	<para>An <acronym>NIS</acronym> client binds
+	  to an <acronym>NIS</acronym>
+	  server using &man.ypbind.8;.  This
+	  daemon
+	  broadcasts RPC requests on the local network.  These
+	  requests specify the domain name configured on the client.
+	  If an <acronym>NIS</acronym> server in the same domain
+	  receives one of the broadcasts, it will
+	  respond to <application>ypbind</application>, which will record the
+	  server's address.  If there are several servers available,
+	  the client will use the address of the first
+	  server to respond and will
 	  direct all of its <acronym>NIS</acronym> requests to that
-	  server.  <command>ypbind</command> will occasionally
-	  <quote>ping</quote> the server to make sure it is still up
-	  and running.  If it fails to receive a reply to one of its
-	  pings within a reasonable amount of time,
-	  <command>ypbind</command> will mark the domain as unbound
+	  server.  The client will automatically
+	  <application>ping</application> the server on a regular basis to make sure it is still
+	  available.  If it fails to receive a reply
+	  within a reasonable amount of time,
+	  <application>ypbind</application> will mark the domain as unbound
 	  and begin broadcasting again in the hopes of locating
 	  another server.</para>
 
@@ -1641,16 +1638,15 @@ Remember to update map ypservers on elli
 	  <secondary>client configuration</secondary>
 	</indexterm>
 
-	<para>Setting up a &os; machine to be a
-	  <acronym>NIS</acronym> client is fairly
-	  straightforward.</para>
+	<para>To configure a &os; machine to be an
+	  <acronym>NIS</acronym> client:</para>
 
 	  <procedure>
 	    <step>
 	      <para>Edit <filename>/etc/rc.conf</filename> and add the
 		following lines in order to set the
 		<acronym>NIS</acronym> domain name and start
-		<command>ypbind</command> during network
+		&man.ypbind.8; during network
 		startup:</para>
 
 	      <programlisting>nisdomainname="test-domain"
@@ -1659,40 +1655,34 @@ nis_client_enable="YES"</programlisting>
 
 	    <step>
 	      <para>To import all possible password entries from the
-		<acronym>NIS</acronym> server, remove all user
-		accounts from the
-		<filename>/etc/master.passwd</filename> file and use
-		<command>vipw</command> to add the following line to
+		<acronym>NIS</acronym> server, use
+		<command>vipw</command> to remove all user
+		accounts except one from
+		<filename>/etc/master.passwd</filename>.  When removing 
+		the accounts, keep in mind that at least one local account
+		should remain and this
+		account should be a member of
+		<groupname>wheel</groupname>.  If there is a problem
+		with <acronym>NIS</acronym>, this local account can be used to log in
+		remotely, become the superuser, and fix
+		the problem.  Before saving the edits, add the following line to
 		the end of the file:</para>
 
 	      <programlisting>+:::::::::</programlisting>
 
-	      <note>
-		<para>This line will afford anyone with a valid
+		<para>This line configures the client to provide anyone with a valid
 		  account in the <acronym>NIS</acronym> server's
-		  password maps an account.  There are many ways to
-		  configure the NIS
-		  client by changing this line.  See the
-		  <link linkend="network-netgroups">netgroups
-		    section</link> below for more information.  For
-		  more detailed reading see O'Reilly's book on
-		  <literal>Managing NFS and NIS</literal>.</para>
-	      </note>
-
-	      <note>
-		<para>Keep in mind that at least one local account
-		  (i.e. not imported via NIS) must exist in
-		  <filename>/etc/master.passwd</filename> and this
-		  account should also be a member of the group
-		  <groupname>wheel</groupname>.  If there is something
-		  wrong with NIS, this account can be used to log in
-		  remotely, become <username>root</username>, and fix
-		  things.</para>
-	      </note>
+		  password maps an account on the client.  There are many ways to
+		  configure the <acronym>NIS</acronym>
+		  client by modifying this line.  One method is described in
+		  <xref linkend="network-netgroups"/>.  For
+		  more detailed reading, refer to the book
+		  <literal>Managing NFS and NIS</literal>, published by
+		  O'Reilly Media.</para>
 	    </step>
 
 	    <step>
-	      <para>To import all possible group entries from the NIS
+	      <para>To import all possible group entries from the <acronym>NIS</acronym>
 		server, add this line to
 		<filename>/etc/group</filename>:</para>
 
@@ -1707,32 +1697,27 @@ nis_client_enable="YES"</programlisting>
 	  <screen>&prompt.root; <userinput>/etc/netstart</userinput>
 &prompt.root; <userinput>service ypbind start</userinput></screen>
 
-	<para>After completing these steps, the command,
-	  <command>ypcat passwd</command>, should show the
-	  server's passwd map.</para>
+	<para>After completing these steps, running
+	  <command>ypcat passwd</command> on the client should show the
+	  server's <filename>passwd</filename> map.</para>
     </sect2>
 
     <sect2>
       <title><acronym>NIS</acronym> Security</title>
 
-      <para>In general, any remote user may issue an RPC to
-	&man.ypserv.8; and retrieve the contents of the
-	<acronym>NIS</acronym> maps, provided the remote user knows
-	the domain name.  To prevent such unauthorized transactions,
+      <para>Since <acronym>RPC</acronym> is a broadcast-based service, 
+	any system running <application>ypbind</application> within the same domain
+	can retrieve the contents of the
+	<acronym>NIS</acronym> maps.  To prevent unauthorized transactions,
 	&man.ypserv.8; supports a feature called
 	<quote>securenets</quote> which can be used to restrict access
-	to a given set of hosts.  At startup, &man.ypserv.8; will
-	attempt to load the securenets information from a file called
-	<filename>/var/yp/securenets</filename>.</para>
-
-      <note>
-	<para>This path varies depending on the path specified with
-	  the <option>-p</option> option.  This file contains entries
-	  that consist of a network specification and a network mask
-	  separated by white space.  Lines starting with
-	  <quote>#</quote> are considered to be comments.  A sample
-	  securenets file might look like this:</para>
-      </note>
+	to a given set of hosts.  By default, this information is stored in
+	<filename>/var/yp/securenets</filename>, unless &man.ypserv.8; is started with
+	<option>-p</option> and an alternate path.  This file contains entries
+	that consist of a network specification and a network mask
+	separated by white space.  Lines starting with
+	<literal>#</literal> are considered to be comments.  A sample
+	<filename>securenets</filename> might look like this:</para>
 
       <programlisting># allow connections from local host -- mandatory
 127.0.0.1     255.255.255.255
@@ -1748,89 +1733,64 @@ nis_client_enable="YES"</programlisting>
 	matches one of these rules, it will process the request
 	normally.  If the address fails to match a rule, the request
 	will be ignored and a warning message will be logged.  If the
-	<filename>/var/yp/securenets</filename> file does not exist,
+	<filename>securenets</filename> does not exist,
 	<command>ypserv</command> will allow connections from any
 	host.</para>
 
-      <para>The <command>ypserv</command> program also has support for
-	Wietse Venema's <application>TCP Wrapper</application>
-	package.  This allows the administrator to use the
-	<application>TCP Wrapper</application> configuration files for
+      <para><xref linkend="tcpwrappers"/> is
+	an alternate mechanism for providing
 	access control instead of
-	<filename>/var/yp/securenets</filename>.</para>
-
-      <note>
-	<para>While both of these access control mechanisms provide
-	  some security, they, like the privileged port test, are
+	<filename>securenets</filename>.  While either access control mechanism adds
+	  some security, they are both
 	  vulnerable to <quote>IP spoofing</quote> attacks.  All
-	  NIS-related traffic should be blocked at the
+	  <acronym>NIS</acronym>-related traffic should be blocked at the
 	  firewall.</para>
 
-	<para>Servers using <filename>/var/yp/securenets</filename>
+	<para>Servers using <filename>securenets</filename>
 	  may fail to serve legitimate <acronym>NIS</acronym> clients
 	  with archaic TCP/IP implementations.  Some of these
 	  implementations set all host bits to zero when doing
-	  broadcasts and/or fail to observe the subnet mask when
+	  broadcasts or fail to observe the subnet mask when
 	  calculating the broadcast address.  While some of these
 	  problems can be fixed by changing the client configuration,
-	  other problems may force the retirement of the client
-	  systems in question or the abandonment of
-	  <filename>/var/yp/securenets</filename>.</para>
-
-	<para>Using <filename>/var/yp/securenets</filename> on a
-	  server with such an archaic implementation of TCP/IP is a
-	  really bad idea and will lead to loss of
-	  <acronym>NIS</acronym> functionality for large parts of the
-	  network.</para>
+	  other problems may force the retirement of these client
+	  systems or the abandonment of
+	  <filename>securenets</filename>.</para>
 
-	<indexterm><primary>TCP Wrappers</primary></indexterm>
+	<indexterm><primary>TCP Wrapper</primary></indexterm>
 	<para>The use of <application>TCP Wrapper</application>
 	  increases the latency of the <acronym>NIS</acronym> server.
 	  The additional delay may be long enough to cause timeouts in
-	  client programs, especially in busy networks or with slow
-	  NIS servers.  If one or more of the client systems suffers
-	  from these symptoms, convert the client systems in question
+	  client programs, especially in busy networks with slow
+	  <acronym>NIS</acronym> servers.  If one or more clients suffer
+	  from latency, convert those clients
 	  into <acronym>NIS</acronym> slave servers and force them to
 	  bind to themselves.</para>
-      </note>
-    </sect2>
 
-    <sect2>
-      <title>Barring Some Users from Logging On</title>
+    <sect3>
+      <title>Barring Some Users</title>
 
-      <para>In our lab, there is a machine <hostid>basie</hostid> that
-	is supposed to be a faculty only workstation.  We do not want
-	to take this machine out of the <acronym>NIS</acronym> domain,
-	yet the <filename>passwd</filename> file on the master
+      <para>In this example, the <hostid>basie</hostid> system
+	is a faculty workstation within the <acronym>NIS</acronym> domain.
+	The <filename>passwd</filename> map on the master
 	<acronym>NIS</acronym> server contains accounts for both
-	faculty and students.  What can we
-	do?</para>
+	faculty and students.  This section demonstrates how to allow
+	faculty logins on this system while refusing student logins.</para>
 
-      <para>There is a way to bar specific users from logging on to a
-	machine, even if they are present in the
-	<acronym>NIS</acronym> database.  To do this, add
+      <para>To prevent specified users from logging on to a
+	system, even if they are present in the
+	<acronym>NIS</acronym> database, use <command>vipw</command> to add
 	<literal>-<replaceable>username</replaceable></literal> with
-	the correct number of colons like other entries to the end of
-	the <filename>/etc/master.passwd</filename> file on the client
-	machine, where <replaceable>username</replaceable> is the
-	username of the user to bar from logging in.  The line with
+	the correct number of colons towards the end of
+	<filename>/etc/master.passwd</filename> on the client,
+	where <replaceable>username</replaceable> is the
+	username of a user to bar from logging in.  The line with
 	the blocked user must be before the <literal>+</literal> line
-	for allowing <acronym>NIS</acronym> users.  This should
-	preferably be done using
-	<command>vipw</command>, since <command>vipw</command> will
-	sanity check the changes to
-	<filename>/etc/master.passwd</filename>, as well as
-	automatically rebuild the password database after editing.
-	For example, to bar user <username>bill</username> from
+	that allows <acronym>NIS</acronym> users.
+	In this example, <username>bill</username> is barred from
 	logging on to <hostid>basie</hostid>:</para>
 
-      <screen>basie&prompt.root; <userinput>vipw</userinput>
-<userinput>[add -bill::::::::: to the end, exit]</userinput>
-vipw: rebuilding the database...
-vipw: done
-
-basie&prompt.root; <userinput>cat /etc/master.passwd</userinput>
-
+      <screen>basie&prompt.root; <userinput>cat /etc/master.passwd</userinput>
 root:[password]:0:0::0:0:The super-user:/root:/bin/csh
 toor:[password]:0:0::0:0:The other super-user:/root:/bin/sh
 daemon:*:1:1::0:0:Owner of many system processes:/root:/sbin/nologin
@@ -1850,6 +1810,7 @@ nobody:*:65534:65534::0:0:Unprivileged u
 +:::::::::
 
 basie&prompt.root;</screen>
+      </sect3>
     </sect2>
 
     <sect2 id="network-netgroups">

From owner-svn-doc-head@FreeBSD.ORG  Tue Oct 15 22:42:10 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 87464685;
 Tue, 15 Oct 2013 22:42:10 +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 66ADA2D94;
 Tue, 15 Oct 2013 22:42:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9FMgAo0066770;
 Tue, 15 Oct 2013 22:42:10 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9FMgAQ7066769;
 Tue, 15 Oct 2013 22:42:10 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310152242.r9FMgAQ7066769@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Tue, 15 Oct 2013 22:42:10 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42971 -
 head/en_US.ISO8859-1/books/handbook/network-servers
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Oct 2013 22:42:10 -0000

Author: dru
Date: Tue Oct 15 22:42:10 2013
New Revision: 42971
URL: http://svnweb.freebsd.org/changeset/doc/42971

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	Tue Oct 15 22:03:04 2013	(r42970)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Tue Oct 15 22:42:10 2013	(r42971)
@@ -1036,7 +1036,8 @@ Exports list on foobar:
       </authorgroup>
     </sect1info>
     -->
-      <title>Network Information System (<acronym>NIS</acronym>)</title>
+      <title>Network Information System
+	(<acronym>NIS</acronym>)</title>
 
       <indexterm><primary>NIS</primary></indexterm>
       <indexterm><primary>Solaris</primary></indexterm>
@@ -1104,10 +1105,10 @@ Exports list on foobar:
 	    <row>
 	      <entry><acronym>NIS</acronym> domain name</entry>
 
-	      <entry><acronym>NIS</acronym> servers and
-		clients share an
-		<acronym>NIS</acronym> domain name.  Typically, this name does not have
-		anything to do with <acronym>DNS</acronym>.</entry>
+	      <entry><acronym>NIS</acronym> servers and clients share
+		an <acronym>NIS</acronym> domain name.  Typically,
+		this name does not have anything to do with
+		<acronym>DNS</acronym>.</entry>
 	    </row>
 
 	    <row>
@@ -1191,9 +1192,9 @@ Exports list on foobar:
 	    clients are stored on the master server.  While it is
 	    possible for one machine to be an <acronym>NIS</acronym>
 	    master server for more than one <acronym>NIS</acronym>
-	    domain, this type of configuration will not be covered in this chapter as it
-	    assumes a relatively small-scale <acronym>NIS</acronym>
-	    environment.</para>
+	    domain, this type of configuration will not be covered in
+	    this chapter as it assumes a relatively small-scale
+	    <acronym>NIS</acronym> environment.</para>
 	</listitem>
 
 	<listitem>
@@ -1345,7 +1346,8 @@ Exports list on foobar:
       </sect2>
 
       <sect2>
-	<title>Configuring the <acronym>NIS</acronym> Master Server</title>
+	<title>Configuring the <acronym>NIS</acronym> Master
+	  Server</title>
 
 	<para> The canonical copies of all <acronym>NIS</acronym>
 	  files are stored on the master server.  The databases used
@@ -1366,61 +1368,58 @@ Exports list on foobar:
 	  database file, and transmitting data from the database back
 	  to the client.</para>
 
-	  <indexterm>
-	    <primary>NIS</primary>
-	    <secondary>server configuration</secondary>
-	  </indexterm>
-	  <para>Setting up a master <acronym>NIS</acronym> server can
-	    be relatively straight forward, depending on environmental
-	    needs.  Since &os; provides built-in
-	    <acronym>NIS</acronym> support, it only needs to be
-	    enabled by adding the following lines to
-	    <filename>/etc/rc.conf</filename>:</para>
-
-	  <procedure>
-	    <step>
-	      <programlisting>nisdomainname="test-domain"</programlisting>
-
-	      <para>This line sets the <acronym>NIS</acronym> domain
-		name to <literal>test-domain</literal>.</para>
-	    </step>
-
-	    <step>
-	      <programlisting>nis_server_enable="YES"</programlisting>
-
-	      <para>This automates the start up of the
-		<acronym>NIS</acronym> server processes when the
-		system boots.</para>
-	    </step>
-
-	    <step>
-	      <programlisting>nis_yppasswdd_enable="YES"</programlisting>
-
-	      <para>This enables the
-		&man.rpc.yppasswdd.8; daemon so that
-		users can change their <acronym>NIS</acronym>
-		password from a client machine.</para>
-	    </step>
-	  </procedure>
-
-      <para>Care must be taken
-	in a multi-server domain
-	where the server machines are also <acronym>NIS</acronym>
-	clients.  It is generally a good idea to force the servers to
-	bind to themselves rather than allowing them to broadcast bind
-	requests and possibly become bound to each other.  Strange
-	failure modes can result if one server goes down and others
-	are dependent upon it.  Eventually, all the clients will time
-	out and attempt to bind to other servers, but the delay
-	involved can be considerable and the failure mode is still
-	present since the servers might bind to each other all over
-	again.</para>
-
-      <para>A server that is also a client can be forced to bind to a particular server by
-	adding these additional lines to
-	<filename>/etc/rc.conf</filename>:</para>
+	<indexterm><primary>NIS</primary>
+	  <secondary>server configuration</secondary>
+	</indexterm>
+	<para>Setting up a master <acronym>NIS</acronym> server can
+	  be relatively straight forward, depending on environmental
+	  needs.  Since &os; provides built-in
+	  <acronym>NIS</acronym> support, it only needs to be
+	  enabled by adding the following lines to
+	  <filename>/etc/rc.conf</filename>:</para>
+
+	<procedure>
+	  <step>
+	    <programlisting>nisdomainname="test-domain"</programlisting>
+
+	    <para>This line sets the <acronym>NIS</acronym> domain
+	      name to <literal>test-domain</literal>.</para>
+	  </step>
+
+	  <step>
+	    <programlisting>nis_server_enable="YES"</programlisting>
+
+	    <para>This automates the start up of the
+	      <acronym>NIS</acronym> server processes when the
+	      system boots.</para>
+	  </step>
+
+	  <step>
+	    <programlisting>nis_yppasswdd_enable="YES"</programlisting>
+
+	    <para>This enables the &man.rpc.yppasswdd.8; daemon so
+	      that users can change their <acronym>NIS</acronym>
+	      password from a client machine.</para>
+	  </step>
+	</procedure>
+
+	<para>Care must be taken in a multi-server domain where the
+	  server machines are also <acronym>NIS</acronym> clients.  It
+	  is generally a good idea to force the servers to bind to
+	  themselves rather than allowing them to broadcast bind
+	  requests and possibly become bound to each other.  Strange
+	  failure modes can result if one server goes down and others
+	  are dependent upon it.  Eventually, all the clients will
+	  time out and attempt to bind to other servers, but the delay
+	  involved can be considerable and the failure mode is still
+	  present since the servers might bind to each other all over
+	  again.</para>
+
+	<para>A server that is also a client can be forced to bind to
+	  a particular server by adding these additional lines to
+	  <filename>/etc/rc.conf</filename>:</para>
 
-      <programlisting>nis_client_enable="YES" # run client stuff as well
+	<programlisting>nis_client_enable="YES" # run client stuff as well
 nis_client_flags="-S <replaceable>NIS domain</replaceable>,<replaceable>server</replaceable>"</programlisting>
 
 	  <para>After saving the edits, type
@@ -1495,19 +1494,19 @@ Is this correct?  [y/n: y] <userinput>y<
 NIS Map update completed.
 ellington has been setup as an YP master server without any errors.</screen>
 
-	  <para>This will
-	    create <filename>/var/yp/Makefile</filename> from
-	    <filename>/var/yp/Makefile.dist</filename>.  By default,
-	    this file assumes that the environment has a
-	    single <acronym>NIS</acronym> server with only &os;
-	    clients.  Since <literal>test-domain</literal> has a
-	    slave server, edit this line in
-	    <filename>/var/yp/Makefile</filename> so that it begins with a 
-	    comment (<literal>#</literal>):</para>
-
-	  <programlisting>NOPUSH = "True"</programlisting>
-	</sect3>
-      </sect2>
+	    <para>This will create
+	      <filename>/var/yp/Makefile</filename> from
+	      <filename>/var/yp/Makefile.dist</filename>.  By
+	      default, this file assumes that the environment has a
+	      single <acronym>NIS</acronym> server with only &os;
+	      clients.  Since <literal>test-domain</literal> has a
+	      slave server, edit this line in
+	      <filename>/var/yp/Makefile</filename> so that it begins
+	      with a  comment (<literal>#</literal>):</para>
+
+	    <programlisting>NOPUSH = "True"</programlisting>
+	  </sect3>
+	</sect2>
 
 	<sect2>
 	  <title>Setting up a <acronym>NIS</acronym> Slave
@@ -1517,17 +1516,17 @@ ellington has been setup as an YP master
 	    <primary>NIS</primary>
 	    <secondary>slave server</secondary>
 	  </indexterm>
-	  <para>To set up an <acronym>NIS</acronym> slave server, log on to
-	    the slave server and edit
-	    <filename>/etc/rc.conf</filename> as for the master server.  
-	    Do not generate any <acronym>NIS</acronym> maps, as these
-	    already exist on the master server.  When running
+	  <para>To set up an <acronym>NIS</acronym> slave server, log
+	    on to the slave server and edit
+	    <filename>/etc/rc.conf</filename> as for the master
+	    server.  Do not generate any <acronym>NIS</acronym> maps,
+	    as these already exist on the master server.  When running
 	    <command>ypinit</command> on the slave server, use
-	    <option>-s</option> (for slave) instead of 
-	    <option>-m</option> (for master).  This option
-	    requires the name of the <acronym>NIS</acronym> master in
-	    addition to the domain name, as 
-	    seen in this example:</para>
+	    <option>-s</option> (for slave) instead of
+	    <option>-m</option> (for master).  This option requires
+	    the name of the <acronym>NIS</acronym> master in
+	    addition to the domain name, as  seen in this
+	    example:</para>
 
 	  <screen>coltrane&prompt.root; <userinput>ypinit -s ellington test-domain</userinput>
 
@@ -1586,53 +1585,52 @@ ypxfr: Exiting: Map successfully transfe
 coltrane has been setup as an YP slave server without any errors.
 Remember to update map ypservers on ellington.</screen>
 
-	<para>This will generate a directory on the slave server called
-	  <filename class="directory">/var/yp/test-domain</filename> which contains copies of the
-	  <acronym>NIS</acronym> master server's maps.
-	  Adding these <filename>/etc/crontab</filename> entries on each
-	  slave server will force the slaves to sync their maps with
-	  the maps on the master server:</para>
+	<para>This will generate a directory on the slave server
+	  called <filename
+	    class="directory">/var/yp/test-domain</filename> which
+	  contains copies of the <acronym>NIS</acronym> master
+	  server's maps.  Adding these
+	  <filename>/etc/crontab</filename> entries on each slave
+	  server will force the slaves to sync their maps with the
+	  maps on the master server:</para>
 
 	<programlisting>20      *       *       *       *       root   /usr/libexec/ypxfr passwd.byname
 21      *       *       *       *       root   /usr/libexec/ypxfr passwd.byuid</programlisting>
 
 	<para>These entries are not
 	  mandatory because the master server automatically attempts
-	  to push any map changes to its slaves.  However, since clients may
-	  depend upon the slave server to provide correct password information,
-	  it is recommended
-	  to force frequent password map updates.
-	  This is especially important on busy networks where map
-	  updates might not always complete.</para>
-
-	<para>To finish the configuration, run <command>/etc/netstart</command>
-	  on the slave server in order to start the <acronym>NIS</acronym>
+	  to push any map changes to its slaves.  However, since
+	  clients may depend upon the slave server to provide correct
+	  password information, it is recommended to force frequent
+	  password map updates.  This is especially important on busy
+	  networks where map updates might not always complete.</para>
+
+	<para>To finish the configuration, run
+	  <command>/etc/netstart</command> on the slave server in
+	  order to start the <acronym>NIS</acronym>
 	  services.</para>
       </sect2>
 
       <sect2>
 	<title>Setting Up an <acronym>NIS</acronym> Client</title>
 
-	<para>An <acronym>NIS</acronym> client binds
-	  to an <acronym>NIS</acronym>
-	  server using &man.ypbind.8;.  This
-	  daemon
-	  broadcasts RPC requests on the local network.  These
+	<para>An <acronym>NIS</acronym> client binds to an
+	  <acronym>NIS</acronym> server using &man.ypbind.8;.  This
+	  daemon broadcasts RPC requests on the local network.  These
 	  requests specify the domain name configured on the client.
 	  If an <acronym>NIS</acronym> server in the same domain
-	  receives one of the broadcasts, it will
-	  respond to <application>ypbind</application>, which will record the
+	  receives one of the broadcasts, it will respond to
+	  <application>ypbind</application>, which will record the
 	  server's address.  If there are several servers available,
-	  the client will use the address of the first
-	  server to respond and will
-	  direct all of its <acronym>NIS</acronym> requests to that
-	  server.  The client will automatically
-	  <application>ping</application> the server on a regular basis to make sure it is still
-	  available.  If it fails to receive a reply
-	  within a reasonable amount of time,
-	  <application>ypbind</application> will mark the domain as unbound
-	  and begin broadcasting again in the hopes of locating
-	  another server.</para>
+	  the client will use the address of the first server to
+	  respond and will direct all of its <acronym>NIS</acronym>
+	  requests to that server.  The client will automatically
+	  <application>ping</application> the server on a regular
+	  basis to make sure it is still available.  If it fails to
+	  receive a reply within a reasonable amount of time,
+	  <application>ypbind</application> will mark the domain as
+	  unbound and begin broadcasting again in the hopes of
+	  locating another server.</para>
 
 	<indexterm><primary>NIS</primary>
 	  <secondary>client configuration</secondary>
@@ -1641,49 +1639,50 @@ Remember to update map ypservers on elli
 	<para>To configure a &os; machine to be an
 	  <acronym>NIS</acronym> client:</para>
 
-	  <procedure>
-	    <step>
-	      <para>Edit <filename>/etc/rc.conf</filename> and add the
-		following lines in order to set the
-		<acronym>NIS</acronym> domain name and start
-		&man.ypbind.8; during network
-		startup:</para>
+	<procedure>
+	  <step>
+	    <para>Edit <filename>/etc/rc.conf</filename> and add the
+	      following lines in order to set the
+	      <acronym>NIS</acronym> domain name and start
+	      &man.ypbind.8; during network
+	      startup:</para>
 
-	      <programlisting>nisdomainname="test-domain"
+	    <programlisting>nisdomainname="test-domain"
 nis_client_enable="YES"</programlisting>
 	    </step>
 
 	    <step>
 	      <para>To import all possible password entries from the
 		<acronym>NIS</acronym> server, use
-		<command>vipw</command> to remove all user
-		accounts except one from
-		<filename>/etc/master.passwd</filename>.  When removing 
-		the accounts, keep in mind that at least one local account
-		should remain and this
-		account should be a member of
-		<groupname>wheel</groupname>.  If there is a problem
-		with <acronym>NIS</acronym>, this local account can be used to log in
-		remotely, become the superuser, and fix
-		the problem.  Before saving the edits, add the following line to
-		the end of the file:</para>
+		<command>vipw</command> to remove all user accounts
+		except one from
+		<filename>/etc/master.passwd</filename>.  When
+		removing the accounts, keep in mind that at least one
+		local account should remain and this account should be
+		a member of <groupname>wheel</groupname>.  If there is
+		a problem with <acronym>NIS</acronym>, this local
+		account can be used to log in remotely, become the
+		superuser, and fix the problem.  Before saving the
+		edits, add the following line to the end of the
+		file:</para>
 
 	      <programlisting>+:::::::::</programlisting>
 
-		<para>This line configures the client to provide anyone with a valid
-		  account in the <acronym>NIS</acronym> server's
-		  password maps an account on the client.  There are many ways to
-		  configure the <acronym>NIS</acronym>
-		  client by modifying this line.  One method is described in
-		  <xref linkend="network-netgroups"/>.  For
-		  more detailed reading, refer to the book
-		  <literal>Managing NFS and NIS</literal>, published by
-		  O'Reilly Media.</para>
+	    <para>This line configures the client to provide
+	      anyone with a valid account in the
+	      <acronym>NIS</acronym> server's password maps an
+	      account on the client.  There are many ways to
+	      configure the <acronym>NIS</acronym> client by
+	      modifying this line.  One method is described in
+	      <xref linkend="network-netgroups"/>.  For
+	      more detailed reading, refer to the book
+	      <literal>Managing NFS and NIS</literal>, published
+	      by O'Reilly Media.</para>
 	    </step>
 
 	    <step>
-	      <para>To import all possible group entries from the <acronym>NIS</acronym>
-		server, add this line to
+	      <para>To import all possible group entries from the
+		<acronym>NIS</acronym> server, add this line to
 		<filename>/etc/group</filename>:</para>
 
 	      <programlisting>+:*::</programlisting>
@@ -1697,26 +1696,27 @@ nis_client_enable="YES"</programlisting>
 	  <screen>&prompt.root; <userinput>/etc/netstart</userinput>
 &prompt.root; <userinput>service ypbind start</userinput></screen>
 
-	<para>After completing these steps, running
-	  <command>ypcat passwd</command> on the client should show the
-	  server's <filename>passwd</filename> map.</para>
+      <para>After completing these steps, running
+	<command>ypcat passwd</command> on the client should show
+	the server's <filename>passwd</filename> map.</para>
     </sect2>
 
     <sect2>
       <title><acronym>NIS</acronym> Security</title>
 
-      <para>Since <acronym>RPC</acronym> is a broadcast-based service, 
-	any system running <application>ypbind</application> within the same domain
-	can retrieve the contents of the
-	<acronym>NIS</acronym> maps.  To prevent unauthorized transactions,
-	&man.ypserv.8; supports a feature called
+      <para>Since <acronym>RPC</acronym> is a broadcast-based service,
+	any system running <application>ypbind</application> within
+	the same domain can retrieve the contents of the
+	<acronym>NIS</acronym> maps.  To prevent unauthorized
+	transactions, &man.ypserv.8; supports a feature called
 	<quote>securenets</quote> which can be used to restrict access
-	to a given set of hosts.  By default, this information is stored in
-	<filename>/var/yp/securenets</filename>, unless &man.ypserv.8; is started with
-	<option>-p</option> and an alternate path.  This file contains entries
-	that consist of a network specification and a network mask
-	separated by white space.  Lines starting with
-	<literal>#</literal> are considered to be comments.  A sample
+	to a given set of hosts.  By default, this information is
+	stored in <filename>/var/yp/securenets</filename>, unless
+	&man.ypserv.8; is started with <option>-p</option> and an
+	alternate path.  This file contains entries that consist of a
+	network specification and a network mask separated by white
+	space.  Lines starting with <literal>#</literal> are
+	considered to be comments.  A sample
 	<filename>securenets</filename> might look like this:</para>
 
       <programlisting># allow connections from local host -- mandatory
@@ -1737,60 +1737,61 @@ nis_client_enable="YES"</programlisting>
 	<command>ypserv</command> will allow connections from any
 	host.</para>
 
-      <para><xref linkend="tcpwrappers"/> is
-	an alternate mechanism for providing
-	access control instead of
-	<filename>securenets</filename>.  While either access control mechanism adds
-	  some security, they are both
-	  vulnerable to <quote>IP spoofing</quote> attacks.  All
-	  <acronym>NIS</acronym>-related traffic should be blocked at the
-	  firewall.</para>
-
-	<para>Servers using <filename>securenets</filename>
-	  may fail to serve legitimate <acronym>NIS</acronym> clients
-	  with archaic TCP/IP implementations.  Some of these
-	  implementations set all host bits to zero when doing
-	  broadcasts or fail to observe the subnet mask when
-	  calculating the broadcast address.  While some of these
-	  problems can be fixed by changing the client configuration,
-	  other problems may force the retirement of these client
-	  systems or the abandonment of
-	  <filename>securenets</filename>.</para>
-
-	<indexterm><primary>TCP Wrapper</primary></indexterm>
-	<para>The use of <application>TCP Wrapper</application>
-	  increases the latency of the <acronym>NIS</acronym> server.
-	  The additional delay may be long enough to cause timeouts in
-	  client programs, especially in busy networks with slow
-	  <acronym>NIS</acronym> servers.  If one or more clients suffer
-	  from latency, convert those clients
-	  into <acronym>NIS</acronym> slave servers and force them to
-	  bind to themselves.</para>
-
-    <sect3>
-      <title>Barring Some Users</title>
-
-      <para>In this example, the <hostid>basie</hostid> system
-	is a faculty workstation within the <acronym>NIS</acronym> domain.
-	The <filename>passwd</filename> map on the master
-	<acronym>NIS</acronym> server contains accounts for both
-	faculty and students.  This section demonstrates how to allow
-	faculty logins on this system while refusing student logins.</para>
-
-      <para>To prevent specified users from logging on to a
-	system, even if they are present in the
-	<acronym>NIS</acronym> database, use <command>vipw</command> to add
-	<literal>-<replaceable>username</replaceable></literal> with
-	the correct number of colons towards the end of
-	<filename>/etc/master.passwd</filename> on the client,
-	where <replaceable>username</replaceable> is the
-	username of a user to bar from logging in.  The line with
-	the blocked user must be before the <literal>+</literal> line
-	that allows <acronym>NIS</acronym> users.
-	In this example, <username>bill</username> is barred from
-	logging on to <hostid>basie</hostid>:</para>
+      <para><xref linkend="tcpwrappers"/> is an alternate mechanism
+	for providing access control instead of
+	<filename>securenets</filename>.  While either access control
+	mechanism adds some security, they are both vulnerable to
+	<quote>IP spoofing</quote> attacks.  All
+	<acronym>NIS</acronym>-related traffic should be blocked at
+	the firewall.</para>
+
+      <para>Servers using <filename>securenets</filename>
+	may fail to serve legitimate <acronym>NIS</acronym> clients
+	with archaic TCP/IP implementations.  Some of these
+	implementations set all host bits to zero when doing
+	broadcasts or fail to observe the subnet mask when
+	calculating the broadcast address.  While some of these
+	problems can be fixed by changing the client configuration,
+	other problems may force the retirement of these client
+	systems or the abandonment of
+	<filename>securenets</filename>.</para>
+
+      <indexterm><primary>TCP Wrapper</primary></indexterm>
+      <para>The use of <application>TCP Wrapper</application>
+	increases the latency of the <acronym>NIS</acronym> server.
+	The additional delay may be long enough to cause timeouts in
+	client programs, especially in busy networks with slow
+	<acronym>NIS</acronym> servers.  If one or more clients suffer
+	from latency, convert those clients into
+	<acronym>NIS</acronym> slave servers and force them to bind to
+	themselves.</para>
+
+      <sect3>
+	<title>Barring Some Users</title>
+
+	<para>In this example, the <hostid>basie</hostid> system
+	  is a faculty workstation within the <acronym>NIS</acronym>
+	  domain.  The <filename>passwd</filename> map on the master
+	  <acronym>NIS</acronym> server contains accounts for both
+	  faculty and students.  This section demonstrates how to
+	  allow faculty logins on this system while refusing student
+	  logins.</para>
+
+	<para>To prevent specified users from logging on to a
+	  system, even if they are present in the
+	  <acronym>NIS</acronym> database, use <command>vipw</command>
+	  to add
+	  <literal>-<replaceable>username</replaceable></literal> with
+	  the correct number of colons towards the end of
+	  <filename>/etc/master.passwd</filename> on the client,
+	  where <replaceable>username</replaceable> is the username of
+	  a user to bar from logging in.  The line with the blocked
+	  user must be before the <literal>+</literal> line that
+	  allows <acronym>NIS</acronym> users.  In this example,
+	  <username>bill</username> is barred from logging on to
+	  <hostid>basie</hostid>:</para>
 
-      <screen>basie&prompt.root; <userinput>cat /etc/master.passwd</userinput>
+	<screen>basie&prompt.root; <userinput>cat /etc/master.passwd</userinput>
 root:[password]:0:0::0:0:The super-user:/root:/bin/csh
 toor:[password]:0:0::0:0:The other super-user:/root:/bin/sh
 daemon:*:1:1::0:0:Owner of many system processes:/root:/sbin/nologin
@@ -2938,9 +2939,8 @@ dhclient_flags=""</programlisting>
 	<listitem>
 	  <para><filename>/sbin/dhclient</filename></para>
 
-	  <para>More information
-	    about
-	    <command>dhclient</command> can be found in &man.dhclient.8;.</para>
+	  <para>More information about <command>dhclient</command> can
+	    be found in &man.dhclient.8;.</para>
 	</listitem>
 
 	<listitem>
@@ -3169,7 +3169,8 @@ dhcpd_ifaces="dc0"</programlisting>
 	      linked and resides in
 	      <filename>/usr/local/sbin</filename>.   More
 	      information about
-	      <application>dhcpd</application> can be found in &man.dhcpd.8;.</para>
+	      <application>dhcpd</application> can be found in
+	      &man.dhcpd.8;.</para>
 	  </listitem>
 
 	  <listitem>
@@ -3191,9 +3192,9 @@ dhcpd_ifaces="dc0"</programlisting>
 	    <para><filename>/var/db/dhcpd.leases</filename></para>
 
 	    <para>The DHCP server keeps a database of leases it has
-	      issued in this file, which is written as a log.  The port installs
-	      &man.dhcpd.leases.5;, which
-	      gives a slightly longer description.</para>
+	      issued in this file, which is written as a log.  The
+	      port installs &man.dhcpd.leases.5;, which gives a
+	      slightly longer description.</para>
 	  </listitem>
 
 	  <listitem>
@@ -3205,8 +3206,8 @@ dhcpd_ifaces="dc0"</programlisting>
 	      separate network.  If this functionality is required,
 	      then install the
 	      <filename role="package">net/isc-dhcp42-relay</filename>
-	      port.  The port installs &man.dhcrelay.8;, which provides
-	      more detail.</para>
+	      port.  The port installs &man.dhcrelay.8;, which 
+	      provides more detail.</para>
 	  </listitem>
 	</itemizedlist>
       </sect3>

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

Author: gjb
Date: Wed Oct 16 13:19:44 2013
New Revision: 42972
URL: http://svnweb.freebsd.org/changeset/doc/42972

Log:
  Remove gnn entry from secteam.

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

Modified: head/en_US.ISO8859-1/htdocs/administration.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/administration.xml	Tue Oct 15 22:42:10 2013	(r42971)
+++ head/en_US.ISO8859-1/htdocs/administration.xml	Wed Oct 16 13:19:44 2013	(r42972)
@@ -245,7 +245,6 @@
     <li>&a.delphij.email; (Officer Deputy)</li>
     <li>&a.des.email; (Officer)</li>
     <li>&a.gavin.email; (Core Team Liaison)</li>
-    <li>&a.gnn.email;</li>
     <li>&a.jonathan.email;</li>
     <li>&a.philip.email;</li>
     <li>&a.qingli.email;</li>

From owner-svn-doc-head@FreeBSD.ORG  Wed Oct 16 16:32:58 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id CD877DC3;
 Wed, 16 Oct 2013 16:32:58 +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 B87082A83;
 Wed, 16 Oct 2013 16:32:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9GGWwt3031216;
 Wed, 16 Oct 2013 16:32:58 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9GGWwUX031215;
 Wed, 16 Oct 2013 16:32:58 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310161632.r9GGWwUX031215@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Wed, 16 Oct 2013 16:32:58 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42973 -
 head/en_US.ISO8859-1/books/handbook/network-servers
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Oct 2013 16:32:58 -0000

Author: dru
Date: Wed Oct 16 16:32:58 2013
New Revision: 42973
URL: http://svnweb.freebsd.org/changeset/doc/42973

Log:
  This patch finishes up the NIS section of this chapter. It does the following:
  - replaces NISv1 Compatibility section with a note that FreeBSD uses v2
  - renames Important Things to Remember to Adding New Users and places it as a subsection of Configuring the NIS Master Server
  - removes the reference to auth.log which is now obsolete
  - general tightening and clarification
  
  A subsequent white-space patch will follow.

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	Wed Oct 16 13:19:44 2013	(r42972)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Wed Oct 16 16:32:58 2013	(r42973)
@@ -1074,6 +1074,9 @@ Exports list on foobar:
 	configuration data and to add, remove, or modify configuration
 	data from a single location.</para>
 
+     <para>&os; uses version 2 of the <acronym>NIS</acronym> 
+	protocol.</para>
+
     <sect2>
       <title><acronym>NIS</acronym> Terms and Processes</title>
 
@@ -1456,7 +1459,7 @@ nis_client_flags="-S <replaceable>NIS do
 	  <para>It is advisable to remove all entries for system
 	    accounts as well as any user accounts that do not need to
 	    be propagated to the <acronym>NIS</acronym> clients, such
-	    as the <username>root</username> accounts.</para>
+	    as the <username>root</username> and any other administrative accounts.</para>
 
 	  <note><para>Ensure that the
 	    <filename>/var/yp/master.passwd</filename> is neither
@@ -1506,6 +1509,28 @@ ellington has been setup as an YP master
 
 	    <programlisting>NOPUSH = "True"</programlisting>
 	  </sect3>
+	  
+	  <sect3>
+      <title>Adding New Users</title>
+
+	  <para>Every time a new user is created, the user account must
+	    be added to the master <acronym>NIS</acronym> server and
+	    the <acronym>NIS</acronym> maps rebuilt.  Until this occurs,
+	    the new user will not be able to
+	    login anywhere except on the <acronym>NIS</acronym>
+	    master.  For example, to add the new user
+	    <username>jsmith</username> to the 
+	    <literal>test-domain</literal> domain, run these commands on the
+	    master server:</para>
+
+	  <screen>&prompt.root; <userinput>pw useradd jsmith</userinput>
+&prompt.root; <userinput>cd /var/yp</userinput>
+&prompt.root; <userinput>make test-domain</userinput></screen>
+
+	  <para>The user could also be added using
+	    <command>adduser jsmith</command>
+	    instead of <command>pw useradd jsmith</command>.</para>
+	  </sect3>
 	</sect2>
 
 	<sect2>
@@ -1831,37 +1856,24 @@ basie&prompt.root;</screen>
 
       <indexterm><primary>netgroups</primary></indexterm>
 
-      <para>The method shown in the previous section works reasonably
-	well for special rules in an environment with small numbers of
-	users and/or machines.  On larger networks, administrators
-	<emphasis>will</emphasis> likely forget to bar some users from
-	logging onto sensitive machines, or may even have to modify
-	each machine separately, thus losing the main benefit of NIS:
+      <para>Barring specified users from logging on to individual systems
+	becomes unscaleable on
+	larger networks and quickly loses the main benefit of <acronym>NIS</acronym>:
 	<emphasis>centralized</emphasis> administration.</para>
 
-      <para>The <acronym>NIS</acronym> developers' solution for this
-	problem is called <emphasis>netgroups</emphasis>.  Their
-	purpose and semantics can be compared to the normal groups
-	used by &unix; file systems.  The main differences are the
+      <para>Netgroups were developed to handle large, complex networks
+	with hundreds of users and machines.  Their use is comparable
+	to &unix; groups, where the main difference is the
 	lack of a numeric ID and the ability to define a netgroup by
 	including both user accounts and other netgroups.</para>
 
-      <para>Netgroups were developed to handle large, complex networks
-	with hundreds of users and machines.  On one hand, this is a
-	Good Thing in such a situation.  On the other hand, this
-	complexity makes it almost impossible to explain netgroups
-	with really simple examples.  The example used in the
-	remainder of this section demonstrates this problem.</para>
-
-      <para>Let us assume that the successful introduction of
-	<acronym>NIS</acronym> in the laboratory caught a superiors'
-	interest.  The next task is to extend the
-	<acronym>NIS</acronym> domain to cover some of the other
-	machines on campus.  The two tables contain the names of the
-	new users and new machines as well as brief descriptions of
-	them.</para>
+      <para>To expand on the example used in this chapter, the
+	<acronym>NIS</acronym> domain will be extended to add the users
+	and systems shown in Tables 28.2 and 28.3:</para>
+
+      <table frame="none" pgwide="1">
+	<title>Additional Users</title>
 
-      <informaltable frame="none" pgwide="1">
 	<tgroup cols="2">
 	  <thead>
 	    <row>
@@ -1874,32 +1886,34 @@ basie&prompt.root;</screen>
 	    <row>
 	      <entry><username>alpha</username>,
 		<username>beta</username></entry>
-	      <entry>Normal employees of the IT department</entry>
+	      <entry>IT department employees</entry>
 	    </row>
 
 	    <row>
 	      <entry><username>charlie</username>,
 		<username>delta</username></entry>
-	      <entry>The new apprentices of the IT department</entry>
+	      <entry>IT department apprentices</entry>
 	    </row>
 
 	    <row>
 	      <entry><username>echo</username>,
 		<username>foxtrott</username>,
 		<username>golf</username>, ...</entry>
-	      <entry>Ordinary employees</entry>
+	      <entry>employees</entry>
 	    </row>
 
 	    <row>
 	      <entry><username>able</username>,
 		<username>baker</username>, ...</entry>
-	      <entry>The current interns</entry>
+	      <entry>interns</entry>
 	    </row>
 	  </tbody>
 	</tgroup>
-      </informaltable>
+      </table>
+
+      <table frame="none" pgwide="1">
+	<title>Additional Systems</title>
 
-      <informaltable frame="none" pgwide="1">
 	<tgroup cols="2">
 	  <thead>
 	    <row>
@@ -1915,9 +1929,8 @@ basie&prompt.root;</screen>
 	      <entry><hostid>war</hostid>,
 		<hostid>death</hostid>, <hostid>famine</hostid>,
 		<hostid>pollution</hostid></entry>
-	      <entry>The most important servers deployed.  Only the IT
-		employees are allowed to log onto these
-		machines.</entry>
+	      <entry>Only IT
+		employees are allowed to log onto these servers.</entry>
 	    </row>
 
 	    <row>
@@ -1925,62 +1938,47 @@ basie&prompt.root;</screen>
 	      <entry><hostid>pride</hostid>, <hostid>greed</hostid>,
 		<hostid>envy</hostid>, <hostid>wrath</hostid>,
 		<hostid>lust</hostid>, <hostid>sloth</hostid></entry>
-	      <entry>Less important servers.  All members of the IT
+	      <entry>All members of the IT
 		department are allowed to login onto these
-		machines.</entry>
+		servers.</entry>
 	    </row>
 
 	    <row>
 	      <entry><hostid>one</hostid>, <hostid>two</hostid>,
 		<hostid>three</hostid>, <hostid>four</hostid>,
 		...</entry>
-	      <entry>Ordinary workstations.  Only the
-		<emphasis>real</emphasis> employees are allowed to use
-		these machines.</entry>
+	      <entry>Ordinary workstations used by
+		employees.</entry>
 	    </row>
 
 	    <row>
 	      <entry><hostid>trashcan</hostid></entry>
 	      <entry>A very old machine without any critical data.
-		Even the intern is allowed to use this box.</entry>
+		Even interns are allowed to use this system.</entry>
 	    </row>
 	  </tbody>
 	</tgroup>
-      </informaltable>
+      </table>
 
-      <para>An attempt to implement these restrictions by separately
-	blocking each user, would require the addition of the
-	<literal>-<replaceable>user</replaceable></literal> line to
-	each system's <filename>passwd</filename>.  One line for each
-	user who is not allowed to login onto that system.  Forgetting
-	just one entry could cause significant trouble.  It may be
-	feasible to do this correctly during the initial setup;
-	however, eventually someone will forget to add these lines for
-	new users.</para>
-
-      <para>Handling this situation with netgroups offers several
-	advantages.  Each user need not be handled separately; they
-	would be assigned to one or more netgroups and logins would be
-	allowed or forbidden for all members of the netgroup.  While
+      <para>When using netgroups to configure this scenario,
+	each user is
+	assigned to one or more netgroups and logins are then
+	allowed or forbidden for all members of the netgroup.  When
 	adding a new machine, login restrictions must be defined for
-	all netgroups.  If a new user is added, they must be added to
-	one or more netgroups.  Those changes are independent of each
-	other: no more <quote>for each combination of user and machine
-	  do...</quote>  If the <acronym>NIS</acronym> setup is
+	all netgroups.  When a new user is added, the account must be added to
+	one or more netgroups.  If the <acronym>NIS</acronym> setup is
 	planned carefully, only one central configuration file needs
 	modification to grant or deny access to machines.</para>
 
       <para>The first step is the initialization of the
-	<acronym>NIS</acronym> map netgroup.  &os;'s &man.ypinit.8;
-	does not create this map by default, but its
-	<acronym>NIS</acronym> implementation will support it after
-	creation.  To create an empty map, simply type</para>
-
-      <screen>ellington&prompt.root; <userinput>vi /var/yp/netgroup</userinput></screen>
-
-      <para>and begin adding content.  For our example, we need at
-	least four netgroups: IT employees, IT apprentices, normal
-	employees and interns.</para>
+	<acronym>NIS</acronym> <literal>netgroup</literal> map.  In &os;,
+	this map is not created by default.  On the 
+	<acronym>NIS</acronym> master server, use an editor to create 
+	a map named <filename>/var/yp/netgroup</filename>.</para>
+
+      <para>This example creates
+	four netgroups to represent IT employees, IT apprentices,
+	employees, and interns:</para>
 
       <programlisting>IT_EMP  (,alpha,test-domain)    (,beta,test-domain)
 IT_APP  (,charlie,test-domain)  (,delta,test-domain)
@@ -1988,17 +1986,17 @@ USERS   (,echo,test-domain)     (,foxtro
         (,golf,test-domain)
 INTERNS (,able,test-domain)     (,baker,test-domain)</programlisting>
 
-      <para><literal>IT_EMP</literal>, <literal>IT_APP</literal> etc.
-	are the names of the netgroups.  Each bracketed group adds
-	one or more user accounts to it.  The three fields inside a
-	group are:</para>
+      <para>Each entry configures a netgroup. The first column in an entry
+	is the name of the netgroup.  Each set of brackets represents 
+	either a group of one or more users or the name of another netgroup.
+	When specifying a user, the three comma-delimited fields inside each
+	group represent:</para>
 
       <orderedlist>
 	<listitem>
-	  <para>The name of the host(s) where the following items are
+	  <para>The name of the host(s) where the other fields representing the user are
 	    valid.  If a hostname is not specified, the entry is valid
-	    on all hosts.  If a hostname is specified, it will need to
-	    be micro-managed within this configuration.</para>
+	    on all hosts.</para>
 	</listitem>
 
 	<listitem>
@@ -2013,38 +2011,34 @@ INTERNS (,able,test-domain)     (,baker,
 	</listitem>
       </orderedlist>
 
-      <para>Each of these fields may contain wildcards.  See
+      <para>If a group contains multiple users, separate each user with 
+	whitespace.  Additionally, each field may contain wildcards.  See
 	&man.netgroup.5; for details.</para>
 
-      <note>
 	<indexterm><primary>netgroups</primary></indexterm>
 	<para>Netgroup names longer than 8 characters should not be
-	  used, especially with machines running other operating
-	  systems within the <acronym>NIS</acronym> domain.  The names
-	  are case sensitive; using capital letters for netgroup names
+	  used.  The names
+	  are case sensitive and using capital letters for netgroup names
 	  is an easy way to distinguish between user, machine and
 	  netgroup names.</para>
 
-	<para>Some <acronym>NIS</acronym> clients (other than &os;)
-	  cannot handle netgroups with a large number of entries.  For
-	  example, some older versions of &sunos; start to cause
-	  trouble if a netgroup contains more than 15
-	  <emphasis>entries</emphasis>.  This limit may be
+	<para>Some non-&os; <acronym>NIS</acronym> clients
+	  cannot handle netgroups containing more than 15
+	  entries.  This limit may be
 	  circumvented by creating several sub-netgroups with 15 users
 	  or fewer and a real netgroup consisting of the
-	  sub-netgroups:</para>
+	  sub-netgroups, as seen in this example:</para>
 
 	<programlisting>BIGGRP1  (,joe1,domain)  (,joe2,domain)  (,joe3,domain) [...]
 BIGGRP2  (,joe16,domain)  (,joe17,domain) [...]
 BIGGRP3  (,joe31,domain)  (,joe32,domain)
 BIGGROUP  BIGGRP1 BIGGRP2 BIGGRP3</programlisting>
 
-	<para>Repeat this process if more than 225 users will exist
+	<para>Repeat this process if more than 225 (15 times 15) users exist
 	  within a single netgroup.</para>
-      </note>
 
-      <para>Activating and distributing the new
-	<acronym>NIS</acronym> map is easy:</para>
+      <para>To activate and distribute the new
+	<acronym>NIS</acronym> map:</para>
 
       <screen>ellington&prompt.root; <userinput>cd /var/yp</userinput>
 ellington&prompt.root; <userinput>make</userinput></screen>
@@ -2052,7 +2046,7 @@ ellington&prompt.root; <userinput>make</
       <para>This will generate the three <acronym>NIS</acronym> maps
 	<filename>netgroup</filename>,
 	<filename>netgroup.byhost</filename> and
-	<filename>netgroup.byuser</filename>.  Use &man.ypcat.1; to
+	<filename>netgroup.byuser</filename>.  Use the map key option of &man.ypcat.1; to
 	check if the new <acronym>NIS</acronym> maps are
 	available:</para>
 
@@ -2062,13 +2056,14 @@ ellington&prompt.user; <userinput>ypcat 
 
       <para>The output of the first command should resemble the
 	contents of <filename>/var/yp/netgroup</filename>.  The second
-	command will not produce output without specified
-	host-specific netgroups.  The third command may be used to get
+	command only produces output if
+	host-specific netgroups were created.  The third command is used to get
 	the list of netgroups for a user.</para>
 
-      <para>The client setup is quite simple.  To configure the server
-	<hostid>war</hostid>, use &man.vipw.8; to replace the
-	line</para>
+      <para>To configure a client, use &man.vipw.8; to specify the name 
+	of the netgroup.  For example, on the server named
+	<hostid>war</hostid>,  replace this
+	line:</para>
 
       <programlisting>+:::::::::</programlisting>
 
@@ -2076,85 +2071,63 @@ ellington&prompt.user; <userinput>ypcat 
 
       <programlisting>+@IT_EMP:::::::::</programlisting>
 
-      <para>Now, only the data for the users defined in the netgroup
-	<literal>IT_EMP</literal> is imported into
-	<hostid>war</hostid>'s password database and only these users
-	are allowed to login.</para>
-
-      <para>Unfortunately, this limitation also applies to the
-	<literal>~</literal> function of the shell and all routines
-	converting between user names and numerical user IDs.  In
+      <para>This specifies that only the users defined in the netgroup
+	<literal>IT_EMP</literal> will be imported into this system's
+	password database and only those users
+	are allowed to login to this system.</para>
+
+      <para>This configuration also applies to the
+	<literal>~</literal> function of the shell and all routines which
+	convert between user names and numerical user IDs.  In
 	other words,
 	<command>cd ~<replaceable>user</replaceable></command> will
 	not work, <command>ls -l</command> will show the numerical ID
-	instead of the username and
-	<command>find . -user joe -print</command> will fail with
+	instead of the username, and
+	<command>find . -user joe -print</command> will fail with the message
 	<errorname>No such user</errorname>.  To fix this, import all
-	user entries <emphasis>without allowing them to login into the
-	  servers</emphasis>.</para>
-
-      <para>This can be achieved by adding another line to
-	<filename>/etc/master.passwd</filename>.  This line should
-	contain:</para>
-
-      <para><literal>+:::::::::/sbin/nologin</literal>, meaning
-	<quote>Import all entries but replace the shell with
-	<filename>/sbin/nologin</filename> in the imported
-	entries</quote>.  It is possible to replace any field in the
-	<literal>passwd</literal> entry by placing a default value in
-	<filename>/etc/master.passwd</filename>.</para>
+	user entries without allowing them to login into the
+	servers.  This can be achieved by adding an extra line:</para>
+      
+      <programlisting>+:::::::::/sbin/nologin</programlisting>
+
+      <para>This line configures the client to
+	import all entries but to replace the shell in those entries with
+	<filename>/sbin/nologin</filename>.</para>
 
       <!-- Been there, done that, got the scars to prove it - ue -->
-      <warning>
-	<para>Make sure that the line
-	  <literal>+:::::::::/sbin/nologin</literal> is placed after
+	<para>Make sure that extra line
+	  is placed <emphasis>after</emphasis>
 	  <literal>+@IT_EMP:::::::::</literal>.  Otherwise, all user
 	  accounts imported from <acronym>NIS</acronym> will have
 	  <filename>/sbin/nologin</filename> as their login
-	  shell.</para>
-      </warning>
+	  shell and noone will be able to login to the system.</para>
 
-      <para>After this change, the <acronym>NIS</acronym> map will
-	only need modification when a new employee joins the IT
-	department.  A similar approach for the less important servers
-	may be used by replacing the old <literal>+:::::::::</literal>
-	in their local version of
-	<filename>/etc/master.passwd</filename> with something like
-	this:</para>
+      <para>To configure the less important servers,
+	replace the old <literal>+:::::::::</literal>
+	on the servers with these lines:</para>
 
       <programlisting>+@IT_EMP:::::::::
 +@IT_APP:::::::::
 +:::::::::/sbin/nologin</programlisting>
 
-      <para>The corresponding lines for the normal workstations
-	could be:</para>
+      <para>The corresponding lines for the workstations
+	would be:</para>
 
       <programlisting>+@IT_EMP:::::::::
 +@USERS:::::::::
 +:::::::::/sbin/nologin</programlisting>
 
-      <para>And everything would be fine until there is a policy
-	change a few weeks later: The IT department starts hiring
-	interns.  The IT interns are allowed to use the normal
-	workstations and the less important servers; and the IT
-	apprentices are allowed to login onto the main servers.  Add a
-	new netgroup <literal>IT_INTERN</literal>, then add the new IT
-	interns to this netgroup and start to change the configuration
-	on each and every machine.  As the old saying goes:
-	<quote>Errors in centralized planning lead to global
-	  mess</quote>.</para>
-
-      <para>NIS' ability to create netgroups from other netgroups can
-	be used to prevent situations like these.  One possibility is
+      <para>NIS supports the creation of netgroups from other netgroups which
+	can be useful if the policy regarding user access changes.  One possibility is
 	the creation of role-based netgroups.  For example, one might
 	create a netgroup called <literal>BIGSRV</literal> to define
 	the login restrictions for the important servers, another
 	netgroup called <literal>SMALLSRV</literal> for the less
-	important servers and a third netgroup called
-	<literal>USERBOX</literal> for the normal workstations.  Each
+	important servers, and a third netgroup called
+	<literal>USERBOX</literal> for the workstations.  Each
 	of these netgroups contains the netgroups that are allowed to
 	login onto these machines.  The new entries for the
-	<acronym>NIS</acronym> map netgroup should look like
+	<acronym>NIS</acronym> <literal>netgroup</literal> map would look like
 	this:</para>
 
       <programlisting>BIGSRV    IT_EMP  IT_APP
@@ -2168,16 +2141,15 @@ USERBOX   IT_EMP  ITINTERN USERS</progra
 	to define login restrictions on a per-machine basis is
 	required.</para>
 
-      <para>Machine-specific netgroup definitions are the other
-	possibility to deal with the policy change outlined above.  In
+      <para>Machine-specific netgroup definitions are another
+	possibility to deal with the policy changes.  In
 	this scenario, the <filename>/etc/master.passwd</filename> of
-	each box contains two lines starting with <quote>+</quote>.
-	The first of them adds a netgroup with the accounts allowed to
-	login onto this machine, the second one adds all other
+	each system contains two lines starting with <quote>+</quote>.
+	The first line adds a netgroup with the accounts allowed to
+	login onto this machine and the second line adds all other
 	accounts with <filename>/sbin/nologin</filename> as shell.  It
-	is a good idea to use the <quote>ALL-CAPS</quote> version of
-	the machine name as the name of the netgroup.  In other words,
-	the lines should look like this:</para>
+	is recommended to use the <quote>ALL-CAPS</quote> version of
+	the hostname as the name of the netgroup:</para>
 
       <programlisting>+@<replaceable>BOXNAME</replaceable>:::::::::
 +:::::::::/sbin/nologin</programlisting>
@@ -2187,8 +2159,7 @@ USERBOX   IT_EMP  ITINTERN USERS</progra
 	<filename>/etc/master.passwd</filename> ever again.  All
 	further changes can be handled by modifying the
 	<acronym>NIS</acronym> map.  Here is an example of a possible
-	netgroup map for this scenario with some additional
-	goodies:</para>
+	<literal>netgroup</literal> map for this scenario:</para>
 
       <programlisting># Define groups of users first
 IT_EMP    (,alpha,test-domain)    (,beta,test-domain)
@@ -2226,159 +2197,55 @@ ONE       SECURITY
 TWO       (,hotel,test-domain)
 # [...more groups to follow]</programlisting>
 
-      <para>If some kind of database is used to manage the user
-	accounts, it may be possible to create the first part of the
-	map using the database's reporting tools.  This way, new users
-	will automatically have access to the boxes.</para>
-
-      <para>One last word of caution: It may not always be advisable
+      <para>It may not always be advisable
 	to use machine-based netgroups.  When deploying a couple of
-	dozen or even hundreds of identical machines for student labs,
+	dozen or hundreds of systems,
 	role-based netgroups instead of machine-based netgroups may be
 	used to keep the size of the <acronym>NIS</acronym> map within
 	reasonable limits.</para>
     </sect2>
 
     <sect2>
-      <title>Important Things to Remember</title>
-
-      <para>There are still a couple of things administrators need to
-	do differently now that machines are in an NIS
-	environment.</para>
-
-      <itemizedlist>
-	<listitem>
-	  <para>Every time a new user is added to the lab, they must
-	    be added to the master <acronym>NIS</acronym> server and
-	    the <acronym>NIS</acronym> maps will need rebuilt.  If
-	    this step is omitted, the new user will not be able to
-	    login anywhere except on the <acronym>NIS</acronym>
-	    master.  For example, if we needed to add a new user
-	    <username>jsmith</username> to the lab, we would:</para>
-
-	  <screen>&prompt.root; <userinput>pw useradd jsmith</userinput>
-&prompt.root; <userinput>cd /var/yp</userinput>
-&prompt.root; <userinput>make test-domain</userinput></screen>
-
-	  <para>The user may also be added using
-	    <command>adduser jsmith</command>
-	    instead of <command>pw useradd jsmith</command>.</para>
-	</listitem>
-
-	<listitem>
-	  <para><emphasis>Keep the administration accounts out of the
-	      <acronym>NIS</acronym> maps</emphasis>.  This is
-	    undesirable as it will create a security risk.  These
-	    users and passwords should not be propagated to all
-	    machines.  Especially if these machines will have users
-	    whom should not have access to those accounts.</para>
-	</listitem>
-
-	<listitem>
-	  <para><emphasis>Keep the <acronym>NIS</acronym> master and
-	      slave secure, and minimize their downtime</emphasis>.
-	    If somebody either hacks or simply turns off these
-	    machines, they have effectively rendered many people
-	    without the ability to login to the lab.</para>
-
-	  <para>This is the chief weakness of any centralized
-	    administration system.  If the <acronym>NIS</acronym>
-	    servers are not protected, there will be a lot of angry
-	    users and unhappy management!</para>
-	</listitem>
-      </itemizedlist>
-    </sect2>
-
-    <sect2>
-      <title><acronym>NIS</acronym> v1 Compatibility</title>
-
-      <para>&os;'s <application>ypserv</application> has some support
-	for serving <acronym>NIS</acronym> v1 clients.  &os;'s
-	<acronym>NIS</acronym> implementation only uses the
-	<acronym>NIS</acronym> v2 protocol; however, other
-	implementations include support for the v1 protocol for
-	backwards compatibility with older systems.  The
-	<application>ypbind</application> daemons supplied with these
-	systems will attempt to establish a binding to an
-	<acronym>NIS</acronym>v1 server even though they may never
-	actually need it (and they may persist in broadcasting in
-	search of one even after they receive a response from a v2
-	server).  Note that while support for normal client calls is
-	provided, this version of
-	<application>ypserv</application> does not handle v1 map
-	transfer requests.  Additionally, it cannot be used as a
-	master or slave in conjunction with older
-	<acronym>NIS</acronym> servers that only support the v1
-	protocol.  Fortunately, there probably are not any such
-	servers still in use today.</para>
-    </sect2>
-
-    <sect2>
       <title>Password Formats</title>
 
       <indexterm>
 	<primary>NIS</primary>
 	<secondary>password formats</secondary>
       </indexterm>
-      <para>One of the most common issues that people run into when
-	trying to implement <acronym>NIS</acronym> is password format
-	compatibility.  If the <acronym>NIS</acronym> server is using
-	DES encrypted passwords, it will only support clients that are
-	also using DES.  For example, if any &solaris;
-	<acronym>NIS</acronym> clients exist on the network, there is
-	a highly likelihood DES must be used for encrypted
-	passwords.</para>
-
-      <para>To check which format the servers and clients are using,
-	look at <filename>/etc/login.conf</filename>.  If the host is
-	configured to use DES encrypted passwords, then the
-	<literal>default</literal> class will contain an entry like
-	this:</para>
+      <para><acronym>NIS</acronym> requires that all hosts within an
+	<acronym>NIS</acronym> domain use the same format for encrypting passwords.
+	If users have trouble authenticating on an
+	<acronym>NIS</acronym> client, it may be due to a differing password format.
+	In a heterogeneous network, the format must be supported by all operating systems, where
+	<acronym>DES</acronym>
+	is the lowest common standard.</para>
+	
+	<para>To check which format a server or client is using,
+	look at this section of <filename>/etc/login.conf</filename>:</para>
 
       <programlisting>default:\
 	:passwd_format=des:\
 	:copyright=/etc/COPYRIGHT:\
 	[Further entries elided]</programlisting>
 
-      <para>Other possible values for the
-	<literal>passwd_format</literal> capability include
-	<literal>blf</literal> and <literal>md5</literal> (for
-	Blowfish and MD5 encrypted passwords, respectively).</para>
-
-      <para>If any changes were made to
-	<filename>/etc/login.conf</filename>, the login capability
-	database must be rebuilt by running the following command as
-	<username>root</username>:</para>
+      <para>In this example, the system is using the <acronym>DES</acronym>
+	format.  Other possible values are
+	<literal>blf</literal> for Blowfish and <literal>md5</literal> for
+	MD5 encrypted passwords.</para>
+
+      <para>If the format on a host needs to be edited to match the one 
+	being used in the <acronym>NIS</acronym> domain,
+	the login capability
+	database must be rebuilt after saving the change:</para>
 
       <screen>&prompt.root; <userinput>cap_mkdb /etc/login.conf</userinput></screen>
 
       <note>
-	<para>The format of passwords already in
-	  <filename>/etc/master.passwd</filename> will not be updated
-	  until a user changes his password for the first time
+	<para>The format of passwords for existing user accounts will not be updated
+	  until each user changes their password
 	  <emphasis>after</emphasis> the login capability database is
 	  rebuilt.</para>
       </note>
-
-      <para>Next, in order to ensure that passwords are encrypted with
-	the chosen format, check that the
-	<literal>crypt_default</literal> in
-	<filename>/etc/auth.conf</filename> gives precedence to the
-	chosen password format.  To do this, place the chosen format
-	first in the list.  For example, when using DES encrypted
-	passwords, the entry would be:</para>
-
-      <programlisting>crypt_default	=	des blf md5</programlisting>
-
-      <para>Having followed the above steps on each of the &os; based
-	<acronym>NIS</acronym> servers and clients, verify that they
-	all agree on which password format is used within the network.
-	If users have trouble authenticating on an
-	<acronym>NIS</acronym> client, this is a pretty good place to
-	start looking for possible problems.  Remember: to deploy an
-	<acronym>NIS</acronym> server for a heterogeneous network,
-	they will probably have to use DES on all systems because it
-	is the lowest common standard.</para>
     </sect2>
   </sect1>
 

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

Author: gjb
Date: Wed Oct 16 16:57:38 2013
New Revision: 42974
URL: http://svnweb.freebsd.org/changeset/doc/42974

Log:
  It's not 10, it's 1 louder.
  
  Submitted by:	ryusuke

Modified:
  head/share/xml/release.ent

Modified: head/share/xml/release.ent
==============================================================================
--- head/share/xml/release.ent	Wed Oct 16 16:32:58 2013	(r42973)
+++ head/share/xml/release.ent	Wed Oct 16 16:57:38 2013	(r42974)
@@ -22,7 +22,7 @@
      rel2.* and u.rel2.* for the "conservative users" version.
 -->
 
-<!ENTITY rel.head.major '10'>
+<!ENTITY rel.head.major '11'>
 <!ENTITY rel.head '&rel.head.major;.0'>
 
 <!-- If there is no release currently in the release cycle (i.e. we

From owner-svn-doc-head@FreeBSD.ORG  Wed Oct 16 18:17:34 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id E1FCEF16;
 Wed, 16 Oct 2013 18:17:33 +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 CCB25216D;
 Wed, 16 Oct 2013 18:17: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 r9GIHX0N085261;
 Wed, 16 Oct 2013 18:17:33 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9GIHX0F085260;
 Wed, 16 Oct 2013 18:17:33 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310161817.r9GIHX0F085260@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Wed, 16 Oct 2013 18:17:33 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42975 -
 head/en_US.ISO8859-1/books/handbook/network-servers
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Oct 2013 18:17:34 -0000

Author: dru
Date: Wed Oct 16 18:17:33 2013
New Revision: 42975
URL: http://svnweb.freebsd.org/changeset/doc/42975

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	Wed Oct 16 16:57:38 2013	(r42974)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Wed Oct 16 18:17:33 2013	(r42975)
@@ -1074,7 +1074,7 @@ Exports list on foobar:
 	configuration data and to add, remove, or modify configuration
 	data from a single location.</para>
 
-     <para>&os; uses version 2 of the <acronym>NIS</acronym> 
+      <para>&os; uses version 2 of the <acronym>NIS</acronym>
 	protocol.</para>
 
     <sect2>
@@ -1459,17 +1459,19 @@ nis_client_flags="-S <replaceable>NIS do
 	  <para>It is advisable to remove all entries for system
 	    accounts as well as any user accounts that do not need to
 	    be propagated to the <acronym>NIS</acronym> clients, such
-	    as the <username>root</username> and any other administrative accounts.</para>
+	    as the <username>root</username> and any other
+	    administrative accounts.</para>
 
 	  <note><para>Ensure that the
 	    <filename>/var/yp/master.passwd</filename> is neither
 	      group or world readable by setting its permissions to
-	      <literal>600</literal>.</para></note>
+	      <literal>600</literal>.</para>
+	  </note>
 
-	  <para>After completing this task,
-	    initialize the <acronym>NIS</acronym> maps.  &os; includes
-	    the &man.ypinit.8; script to do this.  When generating
-	    maps for the master server, include
+	  <para>After completing this task, initialize the
+	    <acronym>NIS</acronym> maps.  &os; includes the
+	    &man.ypinit.8; script to do this.  When generating maps
+	    for the master server, include
 	    <option>-m</option> and specify the <acronym>NIS</acronym>
 	    domain name:</para>
 
@@ -1509,27 +1511,27 @@ ellington has been setup as an YP master
 
 	    <programlisting>NOPUSH = "True"</programlisting>
 	  </sect3>
-	  
+
 	  <sect3>
-      <title>Adding New Users</title>
+	    <title>Adding New Users</title>
 
-	  <para>Every time a new user is created, the user account must
-	    be added to the master <acronym>NIS</acronym> server and
-	    the <acronym>NIS</acronym> maps rebuilt.  Until this occurs,
-	    the new user will not be able to
-	    login anywhere except on the <acronym>NIS</acronym>
-	    master.  For example, to add the new user
-	    <username>jsmith</username> to the 
-	    <literal>test-domain</literal> domain, run these commands on the
-	    master server:</para>
+	    <para>Every time a new user is created, the user account
+	      must be added to the master <acronym>NIS</acronym>
+	      server and the <acronym>NIS</acronym> maps rebuilt.
+	      Until this occurs, the new user will not be able to
+	      login anywhere except on the <acronym>NIS</acronym>
+	      master.  For example, to add the new user
+	      <username>jsmith</username> to the
+	      <literal>test-domain</literal> domain, run these
+	      commands on the master server:</para>
 
-	  <screen>&prompt.root; <userinput>pw useradd jsmith</userinput>
+	    <screen>&prompt.root; <userinput>pw useradd jsmith</userinput>
 &prompt.root; <userinput>cd /var/yp</userinput>
 &prompt.root; <userinput>make test-domain</userinput></screen>
 
-	  <para>The user could also be added using
-	    <command>adduser jsmith</command>
-	    instead of <command>pw useradd jsmith</command>.</para>
+	    <para>The user could also be added using <command>adduser
+		jsmith</command> instead of <command>pw useradd
+		jsmith</command>.</para>
 	  </sect3>
 	</sect2>
 
@@ -1693,16 +1695,16 @@ nis_client_enable="YES"</programlisting>
 
 	      <programlisting>+:::::::::</programlisting>
 
-	    <para>This line configures the client to provide
-	      anyone with a valid account in the
-	      <acronym>NIS</acronym> server's password maps an
-	      account on the client.  There are many ways to
-	      configure the <acronym>NIS</acronym> client by
-	      modifying this line.  One method is described in
-	      <xref linkend="network-netgroups"/>.  For
-	      more detailed reading, refer to the book
-	      <literal>Managing NFS and NIS</literal>, published
-	      by O'Reilly Media.</para>
+	      <para>This line configures the client to provide
+		anyone with a valid account in the
+		<acronym>NIS</acronym> server's password maps an
+		account on the client.  There are many ways to
+		configure the <acronym>NIS</acronym> client by
+		modifying this line.  One method is described in
+		<xref linkend="network-netgroups"/>.  For
+		more detailed reading, refer to the book
+		<literal>Managing NFS and NIS</literal>, published
+		by O'Reilly Media.</para>
 	    </step>
 
 	    <step>
@@ -1856,20 +1858,20 @@ basie&prompt.root;</screen>
 
       <indexterm><primary>netgroups</primary></indexterm>
 
-      <para>Barring specified users from logging on to individual systems
-	becomes unscaleable on
-	larger networks and quickly loses the main benefit of <acronym>NIS</acronym>:
+      <para>Barring specified users from logging on to individual
+	systems becomes unscaleable on larger networks and quickly
+	loses the main benefit of <acronym>NIS</acronym>:
 	<emphasis>centralized</emphasis> administration.</para>
 
       <para>Netgroups were developed to handle large, complex networks
 	with hundreds of users and machines.  Their use is comparable
-	to &unix; groups, where the main difference is the
-	lack of a numeric ID and the ability to define a netgroup by
-	including both user accounts and other netgroups.</para>
+	to &unix; groups, where the main difference is the lack of a
+	numeric ID and the ability to define a netgroup by including
+	both user accounts and other netgroups.</para>
 
       <para>To expand on the example used in this chapter, the
-	<acronym>NIS</acronym> domain will be extended to add the users
-	and systems shown in Tables 28.2 and 28.3:</para>
+	<acronym>NIS</acronym> domain will be extended to add the
+	users and systems shown in Tables 28.2 and 28.3:</para>
 
       <table frame="none" pgwide="1">
 	<title>Additional Users</title>
@@ -1929,8 +1931,8 @@ basie&prompt.root;</screen>
 	      <entry><hostid>war</hostid>,
 		<hostid>death</hostid>, <hostid>famine</hostid>,
 		<hostid>pollution</hostid></entry>
-	      <entry>Only IT
-		employees are allowed to log onto these servers.</entry>
+	      <entry>Only IT employees are allowed to log onto these
+		servers.</entry>
 	    </row>
 
 	    <row>
@@ -1938,9 +1940,8 @@ basie&prompt.root;</screen>
 	      <entry><hostid>pride</hostid>, <hostid>greed</hostid>,
 		<hostid>envy</hostid>, <hostid>wrath</hostid>,
 		<hostid>lust</hostid>, <hostid>sloth</hostid></entry>
-	      <entry>All members of the IT
-		department are allowed to login onto these
-		servers.</entry>
+	      <entry>All members of the IT department are allowed to
+		login onto these servers.</entry>
 	    </row>
 
 	    <row>
@@ -1960,25 +1961,24 @@ basie&prompt.root;</screen>
 	</tgroup>
       </table>
 
-      <para>When using netgroups to configure this scenario,
-	each user is
-	assigned to one or more netgroups and logins are then
+      <para>When using netgroups to configure this scenario, each user
+	is assigned to one or more netgroups and logins are then
 	allowed or forbidden for all members of the netgroup.  When
 	adding a new machine, login restrictions must be defined for
-	all netgroups.  When a new user is added, the account must be added to
-	one or more netgroups.  If the <acronym>NIS</acronym> setup is
-	planned carefully, only one central configuration file needs
-	modification to grant or deny access to machines.</para>
+	all netgroups.  When a new user is added, the account must be
+	added to one or more netgroups.  If the
+	<acronym>NIS</acronym> setup is planned carefully, only one
+	central configuration file needs modification to grant or deny
+	access to machines.</para>
 
       <para>The first step is the initialization of the
-	<acronym>NIS</acronym> <literal>netgroup</literal> map.  In &os;,
-	this map is not created by default.  On the 
-	<acronym>NIS</acronym> master server, use an editor to create 
+	<acronym>NIS</acronym> <literal>netgroup</literal> map.  In
+	&os;, this map is not created by default.  On the
+	<acronym>NIS</acronym> master server, use an editor to create
 	a map named <filename>/var/yp/netgroup</filename>.</para>
 
-      <para>This example creates
-	four netgroups to represent IT employees, IT apprentices,
-	employees, and interns:</para>
+      <para>This example creates four netgroups to represent IT
+	employees, IT apprentices, employees, and interns:</para>
 
       <programlisting>IT_EMP  (,alpha,test-domain)    (,beta,test-domain)
 IT_APP  (,charlie,test-domain)  (,delta,test-domain)
@@ -1986,17 +1986,17 @@ USERS   (,echo,test-domain)     (,foxtro
         (,golf,test-domain)
 INTERNS (,able,test-domain)     (,baker,test-domain)</programlisting>
 
-      <para>Each entry configures a netgroup. The first column in an entry
-	is the name of the netgroup.  Each set of brackets represents 
-	either a group of one or more users or the name of another netgroup.
-	When specifying a user, the three comma-delimited fields inside each
-	group represent:</para>
+      <para>Each entry configures a netgroup.  The first column in an
+	entry is the name of the netgroup.  Each set of brackets
+	represents  either a group of one or more users or the name of
+	another netgroup.  When specifying a user, the three
+	comma-delimited fields inside each group represent:</para>
 
       <orderedlist>
 	<listitem>
-	  <para>The name of the host(s) where the other fields representing the user are
-	    valid.  If a hostname is not specified, the entry is valid
-	    on all hosts.</para>
+	  <para>The name of the host(s) where the other fields
+	    representing the user are valid.  If a hostname is not
+	    specified, the entry is valid on all hosts.</para>
 	</listitem>
 
 	<listitem>
@@ -2011,31 +2011,29 @@ INTERNS (,able,test-domain)     (,baker,
 	</listitem>
       </orderedlist>
 
-      <para>If a group contains multiple users, separate each user with 
-	whitespace.  Additionally, each field may contain wildcards.  See
-	&man.netgroup.5; for details.</para>
-
-	<indexterm><primary>netgroups</primary></indexterm>
-	<para>Netgroup names longer than 8 characters should not be
-	  used.  The names
-	  are case sensitive and using capital letters for netgroup names
-	  is an easy way to distinguish between user, machine and
-	  netgroup names.</para>
-
-	<para>Some non-&os; <acronym>NIS</acronym> clients
-	  cannot handle netgroups containing more than 15
-	  entries.  This limit may be
-	  circumvented by creating several sub-netgroups with 15 users
-	  or fewer and a real netgroup consisting of the
-	  sub-netgroups, as seen in this example:</para>
+      <para>If a group contains multiple users, separate each user
+	with  whitespace.  Additionally, each field may contain
+	wildcards.  See &man.netgroup.5; for details.</para>
 
-	<programlisting>BIGGRP1  (,joe1,domain)  (,joe2,domain)  (,joe3,domain) [...]
+      <indexterm><primary>netgroups</primary></indexterm>
+      <para>Netgroup names longer than 8 characters should not be
+	The names are case sensitive and using capital letters
+	letters for netgroup names is an easy way to distinguish
+	between user, machine and netgroup names.</para>
+
+      <para>Some non-&os; <acronym>NIS</acronym> clients cannot
+	handle netgroups containing more than 15 entries.  This
+	limit may be circumvented by creating several sub-netgroups
+	with 15 users or fewer and a real netgroup consisting of the
+	sub-netgroups, as seen in this example:</para>
+
+      <programlisting>BIGGRP1  (,joe1,domain)  (,joe2,domain)  (,joe3,domain) [...]
 BIGGRP2  (,joe16,domain)  (,joe17,domain) [...]
 BIGGRP3  (,joe31,domain)  (,joe32,domain)
 BIGGROUP  BIGGRP1 BIGGRP2 BIGGRP3</programlisting>
 
-	<para>Repeat this process if more than 225 (15 times 15) users exist
-	  within a single netgroup.</para>
+      <para>Repeat this process if more than 225 (15 times 15) users
+	exist within a single netgroup.</para>
 
       <para>To activate and distribute the new
 	<acronym>NIS</acronym> map:</para>
@@ -2046,9 +2044,9 @@ ellington&prompt.root; <userinput>make</
       <para>This will generate the three <acronym>NIS</acronym> maps
 	<filename>netgroup</filename>,
 	<filename>netgroup.byhost</filename> and
-	<filename>netgroup.byuser</filename>.  Use the map key option of &man.ypcat.1; to
-	check if the new <acronym>NIS</acronym> maps are
-	available:</para>
+	<filename>netgroup.byuser</filename>.  Use the map key option
+	of &man.ypcat.1; to check if the new <acronym>NIS</acronym>
+	maps are available:</para>
 
       <screen>ellington&prompt.user; <userinput>ypcat -k netgroup</userinput>
 ellington&prompt.user; <userinput>ypcat -k netgroup.byhost</userinput>
@@ -2056,14 +2054,13 @@ ellington&prompt.user; <userinput>ypcat 
 
       <para>The output of the first command should resemble the
 	contents of <filename>/var/yp/netgroup</filename>.  The second
-	command only produces output if
-	host-specific netgroups were created.  The third command is used to get
-	the list of netgroups for a user.</para>
-
-      <para>To configure a client, use &man.vipw.8; to specify the name 
-	of the netgroup.  For example, on the server named
-	<hostid>war</hostid>,  replace this
-	line:</para>
+	command only produces output if host-specific netgroups were
+	created.  The third command is used to get the list of
+	netgroups for a user.</para>
+
+      <para>To configure a client, use &man.vipw.8; to specify the
+	name  of the netgroup.  For example, on the server named
+	<hostid>war</hostid>,  replace this line:</para>
 
       <programlisting>+:::::::::</programlisting>
 
@@ -2073,38 +2070,38 @@ ellington&prompt.user; <userinput>ypcat 
 
       <para>This specifies that only the users defined in the netgroup
 	<literal>IT_EMP</literal> will be imported into this system's
-	password database and only those users
-	are allowed to login to this system.</para>
+	password database and only those users are allowed to login to
+	this system.</para>
 
       <para>This configuration also applies to the
-	<literal>~</literal> function of the shell and all routines which
-	convert between user names and numerical user IDs.  In
+	<literal>~</literal> function of the shell and all routines
+	which convert between user names and numerical user IDs.  In
 	other words,
 	<command>cd ~<replaceable>user</replaceable></command> will
 	not work, <command>ls -l</command> will show the numerical ID
-	instead of the username, and
-	<command>find . -user joe -print</command> will fail with the message
+	instead of the username, and <command>find . -user joe
+	  -print</command> will fail with the message
 	<errorname>No such user</errorname>.  To fix this, import all
-	user entries without allowing them to login into the
-	servers.  This can be achieved by adding an extra line:</para>
-      
+	user entries without allowing them to login into the servers.
+	This can be achieved by adding an extra line:</para>
+
       <programlisting>+:::::::::/sbin/nologin</programlisting>
 
-      <para>This line configures the client to
-	import all entries but to replace the shell in those entries with
+      <para>This line configures the client to import all entries but
+	to replace the shell in those entries with
 	<filename>/sbin/nologin</filename>.</para>
 
       <!-- Been there, done that, got the scars to prove it - ue -->
-	<para>Make sure that extra line
-	  is placed <emphasis>after</emphasis>
-	  <literal>+@IT_EMP:::::::::</literal>.  Otherwise, all user
-	  accounts imported from <acronym>NIS</acronym> will have
-	  <filename>/sbin/nologin</filename> as their login
-	  shell and noone will be able to login to the system.</para>
-
-      <para>To configure the less important servers,
-	replace the old <literal>+:::::::::</literal>
-	on the servers with these lines:</para>
+      <para>Make sure that extra line is placed
+	<emphasis>after</emphasis>
+	<literal>+@IT_EMP:::::::::</literal>.  Otherwise, all user
+	accounts imported from <acronym>NIS</acronym> will have
+	<filename>/sbin/nologin</filename> as their login
+	shell and noone will be able to login to the system.</para>
+
+      <para>To configure the less important servers, replace the old
+	<literal>+:::::::::</literal> on the servers with these
+	lines:</para>
 
       <programlisting>+@IT_EMP:::::::::
 +@IT_APP:::::::::
@@ -2117,18 +2114,18 @@ ellington&prompt.user; <userinput>ypcat 
 +@USERS:::::::::
 +:::::::::/sbin/nologin</programlisting>
 
-      <para>NIS supports the creation of netgroups from other netgroups which
-	can be useful if the policy regarding user access changes.  One possibility is
-	the creation of role-based netgroups.  For example, one might
-	create a netgroup called <literal>BIGSRV</literal> to define
-	the login restrictions for the important servers, another
-	netgroup called <literal>SMALLSRV</literal> for the less
-	important servers, and a third netgroup called
-	<literal>USERBOX</literal> for the workstations.  Each
-	of these netgroups contains the netgroups that are allowed to
-	login onto these machines.  The new entries for the
-	<acronym>NIS</acronym> <literal>netgroup</literal> map would look like
-	this:</para>
+      <para>NIS supports the creation of netgroups from other
+	netgroups which can be useful if the policy regarding user
+	access changes.  One possibility is the creation of role-based
+	netgroups.  For example, one might create a netgroup called
+	<literal>BIGSRV</literal> to define the login restrictions for
+	the important servers, another netgroup called
+	<literal>SMALLSRV</literal> for the less important servers,
+	and a third netgroup called <literal>USERBOX</literal> for the
+	workstations.  Each of these netgroups contains the netgroups
+	that are allowed to login onto these machines.  The new
+	entries for the <acronym>NIS</acronym>
+	<literal>netgroup</literal> map would look like this:</para>
 
       <programlisting>BIGSRV    IT_EMP  IT_APP
 SMALLSRV  IT_EMP  IT_APP  ITINTERN
@@ -2142,9 +2139,9 @@ USERBOX   IT_EMP  ITINTERN USERS</progra
 	required.</para>
 
       <para>Machine-specific netgroup definitions are another
-	possibility to deal with the policy changes.  In
-	this scenario, the <filename>/etc/master.passwd</filename> of
-	each system contains two lines starting with <quote>+</quote>.
+	possibility to deal with the policy changes.  In this
+	scenario, the <filename>/etc/master.passwd</filename> of each
+	system contains two lines starting with <quote>+</quote>.
 	The first line adds a netgroup with the accounts allowed to
 	login onto this machine and the second line adds all other
 	accounts with <filename>/sbin/nologin</filename> as shell.  It
@@ -2210,39 +2207,40 @@ TWO       (,hotel,test-domain)
 
       <indexterm>
 	<primary>NIS</primary>
-	<secondary>password formats</secondary>
+	  <secondary>password formats</secondary>
       </indexterm>
       <para><acronym>NIS</acronym> requires that all hosts within an
-	<acronym>NIS</acronym> domain use the same format for encrypting passwords.
-	If users have trouble authenticating on an
-	<acronym>NIS</acronym> client, it may be due to a differing password format.
-	In a heterogeneous network, the format must be supported by all operating systems, where
-	<acronym>DES</acronym>
-	is the lowest common standard.</para>
-	
-	<para>To check which format a server or client is using,
-	look at this section of <filename>/etc/login.conf</filename>:</para>
+	<acronym>NIS</acronym> domain use the same format for
+	encrypting passwords.  If users have trouble authenticating on
+	an <acronym>NIS</acronym> client, it may be due to a differing
+	password format.  In a heterogeneous network, the format must
+	be supported by all operating systems, where
+	<acronym>DES</acronym> is the lowest common standard.</para>
+
+      <para>To check which format a server or client is using, look
+	at this section of
+	<filename>/etc/login.conf</filename>:</para>
 
       <programlisting>default:\
 	:passwd_format=des:\
 	:copyright=/etc/COPYRIGHT:\
 	[Further entries elided]</programlisting>
 
-      <para>In this example, the system is using the <acronym>DES</acronym>
-	format.  Other possible values are
-	<literal>blf</literal> for Blowfish and <literal>md5</literal> for
-	MD5 encrypted passwords.</para>
-
-      <para>If the format on a host needs to be edited to match the one 
-	being used in the <acronym>NIS</acronym> domain,
-	the login capability
-	database must be rebuilt after saving the change:</para>
+      <para>In this example, the system is using the
+	<acronym>DES</acronym> format.  Other possible values are
+	<literal>blf</literal> for Blowfish and <literal>md5</literal>
+	for MD5 encrypted passwords.</para>
+
+      <para>If the format on a host needs to be edited to match the
+	one  being used in the <acronym>NIS</acronym> domain, the
+	login capability database must be rebuilt after saving the
+	change:</para>
 
       <screen>&prompt.root; <userinput>cap_mkdb /etc/login.conf</userinput></screen>
 
       <note>
-	<para>The format of passwords for existing user accounts will not be updated
-	  until each user changes their password
+	<para>The format of passwords for existing user accounts will
+	  not be updated until each user changes their password
 	  <emphasis>after</emphasis> the login capability database is
 	  rebuilt.</para>
       </note>
@@ -3073,7 +3071,7 @@ dhcpd_ifaces="dc0"</programlisting>
 	      separate network.  If this functionality is required,
 	      then install the
 	      <filename role="package">net/isc-dhcp42-relay</filename>
-	      port.  The port installs &man.dhcrelay.8;, which 
+	      port.  The port installs &man.dhcrelay.8;, which
 	      provides more detail.</para>
 	  </listitem>
 	</itemizedlist>

From owner-svn-doc-head@FreeBSD.ORG  Wed Oct 16 19:40:27 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [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 CEA277EC;
 Wed, 16 Oct 2013 19:40:27 +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 BAFBE25E8;
 Wed, 16 Oct 2013 19:40:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9GJeR30028424;
 Wed, 16 Oct 2013 19:40:27 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9GJeRNv028423;
 Wed, 16 Oct 2013 19:40:27 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310161940.r9GJeRNv028423@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Wed, 16 Oct 2013 19:40:27 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42976 -
 head/en_US.ISO8859-1/books/handbook/network-servers
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Oct 2013 19:40:27 -0000

Author: dru
Date: Wed Oct 16 19:40:27 2013
New Revision: 42976
URL: http://svnweb.freebsd.org/changeset/doc/42976

Log:
  Initial shuffle of the DHCP section. This patch does the following:
  - fixes acronym tags for DHCP, IP, and UDP
  - removes superfluous headings
  - shuffles existing content to organize it into a client section and a server section
  - replaces deprecated dhcp.org address
  
  Subsequent patches will clean up the white space and then move on to review and clarify the content in this section.

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	Wed Oct 16 18:17:33 2013	(r42975)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Wed Oct 16 19:40:27 2013	(r42976)
@@ -200,7 +200,7 @@
 	<literal>inetd_flags</literal> is set to
 	<literal>-wW -C 60</literal>, which turns on TCP wrapping for
 	<application>inetd</application>'s services, and prevents any
-	single IP address from requesting any service more than 60
+	single <acronym>IP</acronym> address from requesting any service more than 60
 	times in any given minute.</para>
 
       <para>Although we mention rate-limiting options below, novice
@@ -227,7 +227,7 @@
 
 	  <listitem>
 	    <para>Specify the default maximum number of times a
-	      service can be invoked from a single IP address in one
+	      service can be invoked from a single <acronym>IP</acronym> address in one
 	      minute; the default is unlimited.  May be overridden on
 	      a per-service basis with the
 	      <option>max-connections-per-ip-per-minute</option>
@@ -250,7 +250,7 @@
 
 	  <listitem>
 	    <para>Specify the maximum number of times a service can be
-	      invoked from a single IP address at any one time; the
+	      invoked from a single <acronym>IP</acronym> address at any one time; the
 	      default is unlimited.  May be overridden on a
 	      per-service basis with the
 	      <option>max-child-per-ip</option> parameter.</para>
@@ -347,7 +347,7 @@ server-program-arguments</programlisting
 
 		  <row>
 		    <entry>udp, udp4</entry>
-		    <entry>UDP IPv4</entry>
+		    <entry><acronym>UDP</acronym> IPv4</entry>
 		  </row>
 
 		  <row>
@@ -357,7 +357,7 @@ server-program-arguments</programlisting
 
 		  <row>
 		    <entry>udp6</entry>
-		    <entry>UDP IPv6</entry>
+		    <entry><acronym>UDP</acronym> IPv6</entry>
 		  </row>
 
 		  <row>
@@ -367,7 +367,7 @@ server-program-arguments</programlisting
 
 		  <row>
 		    <entry>udp46</entry>
-		    <entry>Both UDP IPv4 and v6</entry>
+		    <entry>Both <acronym>UDP</acronym> IPv4 and v6</entry>
 		  </row>
 		</tbody>
 	      </tgroup>
@@ -403,12 +403,12 @@ server-program-arguments</programlisting
 	      options which limit the maximum connections from a
 	      single place to a particular daemon can be enabled.
 	      <option>max-connections-per-ip-per-minute</option>
-	      limits the number of connections from any particular IP
+	      limits the number of connections from any particular <acronym>IP</acronym>
 	      address per minutes, e.g., a value of ten would limit
-	      any particular IP address connecting to a particular
+	      any particular <acronym>IP</acronym> address connecting to a particular
 	      service to ten attempts per minute.
 	      <option>max-child-per-ip</option> limits the number of
-	      children that can be started on behalf on any single IP
+	      children that can be started on behalf on any single <acronym>IP</acronym>
 	      address at any moment.  These options are useful to
 	      prevent intentional or unintentional excessive resource
 	      consumption and Denial of Service (DoS) attacks to a
@@ -430,7 +430,7 @@ server-program-arguments</programlisting
 	      would read: <literal>nowait/10</literal>.</para>
 
 	    <para>The same setup with a limit of twenty connections
-	      per IP address per minute and a maximum total limit of
+	      per <acronym>IP</acronym> address per minute and a maximum total limit of
 	      ten child daemons would read:
 	      <literal>nowait/10/20</literal>.</para>
 
@@ -442,7 +442,7 @@ server-program-arguments</programlisting
 
 	    <para>Finally, an example of this field with a maximum of
 	      100 children in total, with a maximum of 5 for any one
-	      IP address would read:
+	      <acronym>IP</acronym> address would read:
 	      <literal>nowait/100/0/5</literal>.</para>
 	  </listitem>
 	</varlistentry>
@@ -723,7 +723,7 @@ mountd_flags="-r"</programlisting>
 
       <para>The next example exports
 	<filename class="directory">/home</filename> to three clients
-	by IP address.  This can be useful for networks without
+	by <acronym>IP</acronym> address.  This can be useful for networks without
 	<acronym>DNS</acronym>.  Optionally,
 	<filename>/etc/hosts</filename> could be configured for
 	internal hostnames; please review &man.hosts.5; for more
@@ -953,7 +953,7 @@ rpc_statd_enable="YES"</programlisting>
 	<application>amd</application> looks up the corresponding
 	remote mount and automatically mounts it.
 	<filename class="directory">/net</filename> is used to mount
-	an exported file system from an IP address, while
+	an exported file system from an <acronym>IP</acronym> address, while
 	<filename class="directory">/host</filename> is used to mount
 	an export from a remote hostname.</para>
 
@@ -1251,7 +1251,7 @@ Exports list on foobar:
 	    <thead>
 	      <row>
 		<entry>Machine name</entry>
-		<entry>IP address</entry>
+		<entry><acronym>IP</acronym> address</entry>
 		<entry>Machine role</entry>
 	      </row>
 	    </thead>
@@ -1768,7 +1768,7 @@ nis_client_enable="YES"</programlisting>
 	for providing access control instead of
 	<filename>securenets</filename>.  While either access control
 	mechanism adds some security, they are both vulnerable to
-	<quote>IP spoofing</quote> attacks.  All
+	<quote><acronym>IP</acronym> spoofing</quote> attacks.  All
 	<acronym>NIS</acronym>-related traffic should be blocked at
 	the firewall.</para>
 
@@ -2617,92 +2617,55 @@ result: 0 Success
       </authorgroup>
     </sect1info>
     -->
-    <title>Automatic Network Configuration (DHCP)</title>
+    <title>Dynamic Host Configuration Protocol (<acronym>DHCP</acronym>)</title>
 
     <indexterm>
       <primary>Dynamic Host Configuration Protocol</primary>
-      <see>DHCP</see>
+      <see><acronym>DHCP</acronym></see>
     </indexterm>
     <indexterm>
       <primary>Internet Systems Consortium (ISC)</primary>
     </indexterm>
 
-    <para>DHCP, the Dynamic Host Configuration Protocol, describes
-      the means by which a system can connect to a network and
-      obtain the necessary information for communication upon that
-      network.  &os; uses the OpenBSD <command>dhclient</command>
-      taken from OpenBSD&nbsp;3.7.  All information here regarding
-      <command>dhclient</command> is for use with either of the ISC
-      or OpenBSD DHCP clients.  The DHCP server is the one included
-      in the ISC distribution.</para>
-
-    <para>This section describes both the client-side components of
-      the ISC and OpenBSD DHCP client and server-side components of
-      the ISC DHCP system.  The client-side program,
-      <command>dhclient</command>, comes integrated within &os;,
-      and the server-side portion is available from the <filename
-      role="package">net/isc-dhcp42-server</filename> port.  Refer to
-      &man.dhclient.8;, &man.dhcp-options.5;, and
-      &man.dhclient.conf.5;, in addition to the
-      references below, for more information.</para>
-
-    <sect2>
-      <title>How It Works</title>
-
-      <indexterm><primary>UDP</primary></indexterm>
-      <para>When <command>dhclient</command>, the DHCP client, is
-	executed on the client machine, it begins broadcasting
-	requests for configuration information.  By default, these
-	requests are on UDP port 68.  The server replies on UDP 67,
-	giving the client an IP address and other relevant network
-	information such as netmask, router, and DNS servers.  All of
-	this information comes in the form of a DHCP
-	<quote>lease</quote> and is only valid for a certain time
-	(configured by the DHCP server maintainer).  In this manner,
-	stale IP addresses for clients no longer connected to the
-	network can be automatically reclaimed.</para>
-
-      <para>DHCP clients can obtain a great deal of information from
-	the server.  An exhaustive list may be found in
-	&man.dhcp-options.5;.</para>
-    </sect2>
-
-    <sect2>
-      <title>&os; Integration</title>
-
-      <para>&os; fully integrates the OpenBSD DHCP client,
-	<command>dhclient</command>.  DHCP client support is provided
-	within both the installer and the base system, obviating the
-	need for detailed knowledge of network configurations on any
-	network that runs a DHCP server.</para>
-
-      <indexterm>
-	<primary><application>sysinstall</application></primary>
-      </indexterm>
+    <para>The Dynamic Host Configuration Protocol (<acronym>DHCP</acronym>) allows
+      a system to connect to a network in order to be assigned
+      the necessary addressing information for communication on that
+      network.  &os; includes the OpenBSD version of <command>dhclient</command>
+      which is used by the client to obtain the addressing information.
+      &os; does not install a <acronym>DHCP</acronym> server, but several
+      servers are available in the &os; Ports Collection.
+      The <acronym>DHCP</acronym> protocol is fully described in
+      <ulink url="http://www.freesoft.org/CIE/RFC/2131/">RFC
+	2131</ulink>.  Informational resources are also available at
+      <ulink url="http://www.isc.org/downloads/dhcp/">isc.org/downloads/dhcp/</ulink>.</para>
+
+    <para>This section describes how to use the built-in <acronym>DHCP</acronym> client.
+      It then describes how to install and configure a
+      <acronym>DHCP</acronym> server.</para>
 
-      <para>DHCP is supported by
-	<application>sysinstall</application>.  When configuring a
-	network interface within
-	<application>sysinstall</application>, the second question
-	asked is: <quote>Do you want to try DHCP configuration of the
-	interface?</quote>.  Answering affirmatively will execute
-	<command>dhclient</command>, and if successful, will fill in
-	the network configuration information automatically.</para>
+      <sect2>
+	<title>Configuring a <acronym>DHCP</acronym> Client</title>
 
-      <para>There are two things required to have the system use
-	DHCP upon startup:</para>
-      <indexterm>
-	<primary>DHCP</primary>
-	<secondary>requirements</secondary>
-      </indexterm>
-      <itemizedlist>
-	<listitem>
-	  <para>Make sure that the <devicename>bpf</devicename> device
-	    is compiled into the kernel.  To do this, add
-	    <literal>device bpf</literal> to the kernel configuration
-	    file, and rebuild the kernel.  For more information about
-	    building kernels, see
-	    <xref linkend="kernelconfig"/>.</para>
+	<para><acronym>DHCP</acronym> client support is included in the &os;
+	  installer, making it easy to configure a system to automatically
+	  receive its networking addressing information from an existing
+	  <acronym>DHCP</acronym> server.</para>
+	
+	<indexterm><primary><acronym>UDP</acronym></primary></indexterm>
+	<para>When <command>dhclient</command> is
+	  executed on the client machine, it begins broadcasting
+      requests for configuration information.  By default, these
+      requests use <acronym>UDP</acronym> port 68.  The server replies on <acronym>UDP</acronym> port 67,
+      giving the client an <acronym>IP</acronym> address and other relevant network
+      information such as a subnet mask, default gateway, and <acronym>DNS</acronym> server addresses.
+      This information is in the form of a <acronym>DHCP</acronym>
+      <quote>lease</quote> and is valid for a configurable time.  This allows
+      stale <acronym>IP</acronym> addresses for clients no longer connected to the
+      network to automatically be reused.</para>
+
+    <para><acronym>DHCP</acronym> clients can obtain a great deal of information from
+      the server.  An exhaustive list may be found in
+      &man.dhcp-options.5;.</para>	
 
 	  <para>The <devicename>bpf</devicename> device is already
 	    part of the <filename>GENERIC</filename> kernel that is
@@ -2719,37 +2682,35 @@ result: 0 Success
 	      (although they still have to be run as
 	      <username>root</username>).
 	      <devicename>bpf</devicename> <emphasis>is</emphasis>
-	      required to use DHCP; however, the security sensitive
+	      required to use <acronym>DHCP</acronym>; however, the security sensitive
 	      types should probably not add
 	      <devicename>bpf</devicename> to the kernel in the
 	      expectation that at some point in the future the system
-	      will be using DHCP.</para>
+	      will be using <acronym>DHCP</acronym>.</para>
 	  </note>
-	</listitem>
 
-	<listitem>
-	  <para>By default, DHCP configuration on &os; runs in the
+	  <para>By default, <acronym>DHCP</acronym> configuration on &os; runs in the
 	    background, or <firstterm>asynchronously</firstterm>.
-	    Other startup scripts continue to run while DHCP
+	    Other startup scripts continue to run while <acronym>DHCP</acronym>
 	    completes, speeding up system startup.</para>
 
-	  <para>Background DHCP works well when the DHCP server
-	    responds quickly to requests and the DHCP configuration
-	    process goes quickly.  However, DHCP may take a long time
+	  <para>Background <acronym>DHCP</acronym> works well when the <acronym>DHCP</acronym> server
+	    responds quickly to requests and the <acronym>DHCP</acronym> configuration
+	    process goes quickly.  However, <acronym>DHCP</acronym> may take a long time
 	    to complete on some systems.  If network services attempt
-	    to run before DHCP has completed, they will fail.  Using
-	    DHCP in <firstterm>synchronous</firstterm> mode prevents
-	    the problem, pausing startup until DHCP configuration has
+	    to run before <acronym>DHCP</acronym> has completed, they will fail.  Using
+	    <acronym>DHCP</acronym> in <firstterm>synchronous</firstterm> mode prevents
+	    the problem, pausing startup until <acronym>DHCP</acronym> configuration has
 	    completed.</para>
 
-	  <para>To connect to a DHCP server in the background while
+	  <para>To connect to a <acronym>DHCP</acronym> server in the background while
 	    other startup continues (asynchronous mode), use the
 	    <quote><literal>DHCP</literal></quote> value in
 	    <filename>/etc/rc.conf</filename>:</para>
 
 	  <programlisting>ifconfig_<replaceable>fxp0</replaceable>="DHCP"</programlisting>
 
-	  <para>To pause startup while DHCP completes, use
+	  <para>To pause startup while <acronym>DHCP</acronym> completes, use
 	    synchronous mode with the
 	    <quote><literal>SYNCDHCP</literal></quote> value:</para>
 
@@ -2769,27 +2730,14 @@ result: 0 Success
 
 	  <programlisting>dhclient_program="/sbin/dhclient"
 dhclient_flags=""</programlisting>
-	</listitem>
-      </itemizedlist>
 
       <indexterm>
-	<primary>DHCP</primary>
-	<secondary>server</secondary>
+	<primary><acronym>DHCP</acronym></primary>
+	<secondary>configuration files</secondary>
       </indexterm>
-      <para>The DHCP server, <application>dhcpd</application>, is
-	included as part of the
-	<filename role="package">net/isc-dhcp42-server</filename> port
-	in the ports collection.  This port contains the ISC DHCP
-	server and documentation.</para>
-    </sect2>
 
-    <sect2>
-      <title>Files</title>
+      <para>The <acronym>DHCP</acronym> client uses the following files:</para>
 
-      <indexterm>
-	<primary>DHCP</primary>
-	<secondary>configuration files</secondary>
-      </indexterm>
       <itemizedlist>
 	<listitem>
 	  <para><filename>/etc/dhclient.conf</filename></para>
@@ -2812,7 +2760,7 @@ dhclient_flags=""</programlisting>
 	  <para><filename>/sbin/dhclient-script</filename></para>
 
 	  <para><command>dhclient-script</command> is the
-	    &os;-specific DHCP client configuration script.  It
+	    &os;-specific <acronym>DHCP</acronym> client configuration script.  It
 	    is described in &man.dhclient-script.8;, but should not
 	    need any user modification to function properly.</para>
 	</listitem>
@@ -2820,50 +2768,47 @@ dhclient_flags=""</programlisting>
 	<listitem>
 	  <para><filename>/var/db/dhclient.leases.<replaceable>interface</replaceable></filename></para>
 
-	  <para>The DHCP client keeps a database of valid leases in
+	  <para>The <acronym>DHCP</acronym> client keeps a database of valid leases in
 	    this file, which is written as a log.
 	    &man.dhclient.leases.5; gives a slightly longer
-	    description.</para>
+	    description.  Refer to
+      &man.dhclient.8;, &man.dhcp-options.5;, and
+      &man.dhclient.conf.5;, in addition to the
+      references below, for more information.</para>
 	</listitem>
       </itemizedlist>
     </sect2>
 
-    <sect2>
-      <title>Further Reading</title>
-
-      <para>The DHCP protocol is fully described in
-	<ulink url="http://www.freesoft.org/CIE/RFC/2131/">RFC
-	  2131</ulink>.  An informational resource has also been set
-	up at <ulink url="http://www.dhcp.org/"></ulink>.</para>
-    </sect2>
-
     <sect2 id="network-dhcp-server">
-      <title>Installing and Configuring a DHCP Server</title>
-
-      <sect3>
-	<title>What This Section Covers</title>
+      <title>Installing and Configuring a <acronym>DHCP</acronym> Server</title>
 
 	<para>This section provides information on how to configure a
-	  &os; system to act as a DHCP server using the ISC
-	  (Internet Systems Consortium) implementation of the DHCP
+	  &os; system to act as a <acronym>DHCP</acronym> server using the ISC
+	  (Internet Systems Consortium) implementation of the <acronym>DHCP</acronym>
 	  server.</para>
 
+      <indexterm>
+	<primary><acronym>DHCP</acronym></primary>
+	<secondary>server</secondary>
+      </indexterm>
+
+      <para>The <acronym>DHCP</acronym> server, <application>dhcpd</application>, is
+	included as part of the
+	<filename role="package">net/isc-dhcp42-server</filename> port
+	in the ports collection.  This port contains the ISC <acronym>DHCP</acronym>
+	server and documentation.</para>
 	<para>The server is not provided as part of &os;, and so the
 	  <filename role="package">net/isc-dhcp42-server</filename>
 	  port must be installed to provide this service.  See
 	  <xref linkend="ports"/> for more information on using the
 	  Ports Collection.</para>
-      </sect3>
-
-      <sect3>
-	<title>DHCP Server Installation</title>
 
 	<indexterm>
-	  <primary>DHCP</primary>
+	  <primary><acronym>DHCP</acronym></primary>
 	  <secondary>installation</secondary>
 	</indexterm>
 
-	<para>In order to configure the &os; system as a DHCP server,
+	<para>In order to configure the &os; system as a <acronym>DHCP</acronym> server,
 	  first ensure that the &man.bpf.4; device is compiled into
 	  the kernel.  To do this, add <literal>device bpf</literal>
 	  to the kernel configuration file, and rebuild the kernel.
@@ -2881,7 +2826,7 @@ dhclient_flags=""</programlisting>
 	    that allows packet sniffers to function correctly
 	    (although such programs still need privileged access).
 	    The <devicename>bpf</devicename> device
-	    <emphasis>is</emphasis> required to use DHCP, but if the
+	    <emphasis>is</emphasis> required to use <acronym>DHCP</acronym>, but if the
 	    sensitivity of the system's security is high, this device
 	    should not be included in the kernel purely because the
 	    use of <acronym>DHCP</acronym> may, at some point in the
@@ -2895,13 +2840,12 @@ dhclient_flags=""</programlisting>
 	  to the actual configuration file,
 	  <filename>/usr/local/etc/dhcpd.conf</filename>.  Edits
 	  will be made to this new file.</para>
-      </sect3>
 
       <sect3>
-	<title>Configuring the DHCP Server</title>
+	<title>Configuring the <acronym>DHCP</acronym> Server</title>
 
 	<indexterm>
-	  <primary>DHCP</primary>
+	  <primary><acronym>DHCP</acronym></primary>
 	  <secondary>dhcpd.conf</secondary>
 	</indexterm>
 	<para><filename>dhcpd.conf</filename> is comprised of
@@ -2936,7 +2880,7 @@ host mailhost {
 
 	  <callout arearefs="domain-name-servers">
 	    <para>This option specifies a comma separated list of
-	      DNS servers that the client should use.</para>
+	      <acronym>DNS</acronym> servers that the client should use.</para>
 	  </callout>
 
 	  <callout arearefs="subnet-mask">
@@ -2960,15 +2904,15 @@ host mailhost {
 	  </callout>
 
 	  <callout arearefs="ddns-update-style">
-	    <para>This option specifies whether the DHCP server
-	      should attempt to update DNS when a lease is accepted
+	    <para>This option specifies whether the <acronym>DHCP</acronym> server
+	      should attempt to update <acronym>DNS</acronym> when a lease is accepted
 	      or released.  In the ISC implementation, this option
 	      is <emphasis>required</emphasis>.</para>
 	  </callout>
 
 	  <callout arearefs="range">
-	    <para>This denotes which IP addresses should be used in
-	      the pool reserved for allocating to clients.  IP
+	    <para>This denotes which <acronym>IP</acronym> addresses should be used in
+	      the pool reserved for allocating to clients.  <acronym>IP</acronym>
 	      addresses between, and including, the ones stated are
 	      handed out to clients.</para>
 	  </callout>
@@ -2980,14 +2924,14 @@ host mailhost {
 
 	  <callout arearefs="hardware">
 	    <para>The hardware MAC address of a host (so that the
-	      DHCP server can recognize a host when it makes a
+	      <acronym>DHCP</acronym> server can recognize a host when it makes a
 	      request).</para>
 	  </callout>
 
 	  <callout arearefs="fixed-address">
 	    <para>Specifies that the host should always be given the
-	      same IP address.  Note that using a hostname is
-	      correct here, since the DHCP server will resolve the
+	      same <acronym>IP</acronym> address.  Note that using a hostname is
+	      correct here, since the <acronym>DHCP</acronym> server will resolve the
 	      hostname itself before returning the lease
 	      information.</para>
 	  </callout>
@@ -2995,7 +2939,7 @@ host mailhost {
 
 	<para>Once the configuration of
 	  <filename>dhcpd.conf</filename> has been completed,
-	  enable the DHCP server in
+	  enable the <acronym>DHCP</acronym> server in
 	  <filename>/etc/rc.conf</filename>, i.e., by adding:</para>
 
 	<programlisting>dhcpd_enable="YES"
@@ -3003,7 +2947,7 @@ dhcpd_ifaces="dc0"</programlisting>
 
 	<para>Replace the <literal>dc0</literal> interface name with
 	  the interface (or interfaces, separated by whitespace)
-	  that the DHCP server should listen on for DHCP client
+	  that the <acronym>DHCP</acronym> server should listen on for <acronym>DHCP</acronym> client
 	  requests.</para>
 
 	<para>Proceed to start the server by issuing
@@ -3023,7 +2967,7 @@ dhcpd_ifaces="dc0"</programlisting>
 	<title>Files</title>
 
 	<indexterm>
-	  <primary>DHCP</primary>
+	  <primary><acronym>DHCP</acronym></primary>
 	  <secondary>configuration files</secondary>
 	</indexterm>
 	<itemizedlist>
@@ -3056,7 +3000,7 @@ dhcpd_ifaces="dc0"</programlisting>
 	  <listitem>
 	    <para><filename>/var/db/dhcpd.leases</filename></para>
 
-	    <para>The DHCP server keeps a database of leases it has
+	    <para>The <acronym>DHCP</acronym> server keeps a database of leases it has
 	      issued in this file, which is written as a log.  The
 	      port installs &man.dhcpd.leases.5;, which gives a
 	      slightly longer description.</para>
@@ -3066,8 +3010,8 @@ dhcpd_ifaces="dc0"</programlisting>
 	    <para><filename>/usr/local/sbin/dhcrelay</filename></para>
 
 	    <para><application>dhcrelay</application> is used in
-	      advanced environments where one DHCP server forwards a
-	      request from a client to another DHCP server on a
+	      advanced environments where one <acronym>DHCP</acronym> server forwards a
+	      request from a client to another <acronym>DHCP</acronym> server on a
 	      separate network.  If this functionality is required,
 	      then install the
 	      <filename role="package">net/isc-dhcp42-relay</filename>
@@ -3150,7 +3094,7 @@ dhcpd_ifaces="dc0"</programlisting>
 	<acronym>DNS</acronym> must be understood.</para>
 
       <indexterm><primary>resolver</primary></indexterm>
-      <indexterm><primary>reverse DNS</primary></indexterm>
+      <indexterm><primary>reverse <acronym>DNS</acronym></primary></indexterm>
       <indexterm><primary>root zone</primary></indexterm>
 
       <informaltable frame="none" pgwide="1">
@@ -3168,7 +3112,7 @@ dhcpd_ifaces="dc0"</programlisting>
 	  <tbody>
 	    <row>
 	      <entry>Forward <acronym>DNS</acronym></entry>
-	      <entry>Mapping of hostnames to IP addresses.</entry>
+	      <entry>Mapping of hostnames to <acronym>IP</acronym> addresses.</entry>
 	    </row>
 
 	    <row>
@@ -3492,7 +3436,7 @@ options {
 	</warning>
 
 	<programlisting>	/*
-	   Modern versions of BIND use a random UDP port for each outgoing
+	   Modern versions of BIND use a random <acronym>UDP</acronym> port for each outgoing
 	   query by default in order to dramatically reduce the possibility
 	   of cache poisoning.  All users are strongly encouraged to utilize
 	   this feature, and to configure their firewalls to accommodate it.
@@ -3817,11 +3761,11 @@ www             IN      CNAME   example.
 	<programlisting>recordname      IN recordtype   value</programlisting>
 
 	<indexterm>
-	  <primary>DNS</primary>
+	  <primary><acronym>DNS</acronym></primary>
 	  <secondary>records</secondary>
 	</indexterm>
 
-	<para>The most commonly used DNS records:</para>
+	<para>The most commonly used <acronym>DNS</acronym> records:</para>
 
 	<variablelist>
 	  <varlistentry>
@@ -3861,7 +3805,7 @@ www             IN      CNAME   example.
 
 	    <listitem>
 	      <para>a domain name pointer (used in reverse
-		DNS)</para>
+		<acronym>DNS</acronym>)</para>
 	    </listitem>
 	  </varlistentry>
 	</variablelist>
@@ -3940,7 +3884,7 @@ mail            IN      A       192.168.
 
 	<programlisting>                IN      A       192.168.1.1</programlisting>
 
-	<para>This line assigns IP address
+	<para>This line assigns <acronym>IP</acronym> address
 	  <hostid role="ipaddr">192.168.1.1</hostid> to the current
 	  origin, in this case
 	  <hostid role="domainname">example.org</hostid>.</para>
@@ -3975,7 +3919,7 @@ mail            IN      A       192.168.
 	  priority number), then the second highest, etc, until the
 	  mail can be properly delivered.</para>
 
-	<para>For in-addr.arpa zone files (reverse DNS), the same
+	<para>For in-addr.arpa zone files (reverse <acronym>DNS</acronym>), the same
 	  format is used, except with PTR entries instead of A or
 	  CNAME.</para>
 
@@ -3997,7 +3941,7 @@ mail            IN      A       192.168.
 4       IN      PTR     mx.example.org.
 5       IN      PTR     mail.example.org.</programlisting>
 
-	<para>This file gives the proper IP address to hostname
+	<para>This file gives the proper <acronym>IP</acronym> address to hostname
 	  mappings for the above fictitious domain.</para>
 
 	<para>It is worth noting that all names on the right side
@@ -4026,7 +3970,7 @@ mail            IN      A       192.168.
 
       <indexterm>
 	<primary>BIND</primary>
-	<secondary>DNS security extensions</secondary>
+	<secondary><acronym>DNS</acronym> security extensions</secondary>
       </indexterm>
 
       <para>Domain Name System Security Extensions, or <acronym
@@ -4391,7 +4335,7 @@ $include Kexample.com.+005+nnnnn.ZSK.key
     <sect2>
       <title>Security</title>
 
-      <para>Although BIND is the most common implementation of DNS,
+      <para>Although BIND is the most common implementation of <acronym>DNS</acronym>,
 	there is always the issue of security.  Possible and
 	exploitable security holes are sometimes found.</para>
 
@@ -4437,7 +4381,7 @@ $include Kexample.com.+005+nnnnn.ZSK.key
 	<listitem>
 	  <para><ulink
 	      url="http://www.oreilly.com/catalog/dns5/">O'Reilly
-	      DNS and BIND 5th Edition</ulink></para>
+	      <acronym>DNS</acronym> and BIND 5th Edition</ulink></para>
 	</listitem>
 
 	<listitem>
@@ -4469,21 +4413,21 @@ $include Kexample.com.+005+nnnnn.ZSK.key
 	<listitem>
 	  <para><ulink
 	      url="http://tools.ietf.org/html/rfc4033">RFC4033
-	      - DNS Security Introduction and
+	      - <acronym>DNS</acronym> Security Introduction and
 	      Requirements</ulink></para>
 	</listitem>
 
 	<listitem>
 	  <para><ulink
 	      url="http://tools.ietf.org/html/rfc4034">RFC4034
-	      - Resource Records for the DNS Security
+	      - Resource Records for the <acronym>DNS</acronym> Security
 	      Extensions</ulink></para>
 	</listitem>
 
 	<listitem>
 	  <para><ulink
 	      url="http://tools.ietf.org/html/rfc4035">RFC4035
-	      - Protocol Modifications for the DNS Security
+	      - Protocol Modifications for the <acronym>DNS</acronym> Security
 	      Extensions</ulink></para>
 	</listitem>
 
@@ -4496,7 +4440,7 @@ $include Kexample.com.+005+nnnnn.ZSK.key
 	<listitem>
 	  <para><ulink
 	      url="http://tools.ietf.org/html/rfc5011">RFC 5011
-	      - Automated Updates of DNS Security
+	      - Automated Updates of <acronym>DNS</acronym> Security
 	      (<acronym>DNSSEC</acronym>
 	      Trust Anchors</ulink></para>
 	</listitem>
@@ -4686,7 +4630,7 @@ $include Kexample.com.+005+nnnnn.ZSK.key
 	types of Virtual Hosting.  The first method is Name-based
 	Virtual Hosting.  Name-based virtual hosting uses the clients
 	HTTP/1.1 headers to figure out the hostname.  This allows many
-	different domains to share the same IP address.</para>
+	different domains to share the same <acronym>IP</acronym> address.</para>
 
       <para>To setup <application>Apache</application> to use
 	Name-based Virtual Hosting add an entry like the following to
@@ -5252,7 +5196,7 @@ DocumentRoot /www/someotherdomain.tld
 	      <para>This sets the NetBIOS name by which a
 		<application>Samba</application> server is known.
 		By default it is the same as the first component of
-		the host's DNS name.</para>
+		the host's <acronym>DNS</acronym> name.</para>
 	    </listitem>
 	  </varlistentry>
 
@@ -5580,7 +5524,7 @@ driftfile /var/db/ntp.drift</programlist
 	<programlisting>restrict 192.168.1.0 mask 255.255.255.0 nomodify notrap</programlisting>
 
 	<para>instead, where
-	  <hostid role="ipaddr">192.168.1.0</hostid> is an IP address
+	  <hostid role="ipaddr">192.168.1.0</hostid> is an <acronym>IP</acronym> address
 	  on the network and
 	  <hostid role="netmask">255.255.255.0</hostid> is the
 	  network's netmask.</para>
@@ -6207,7 +6151,7 @@ iqn.2012-06.com.example:target0         
 iqn.2012-06.com.example:target0                 10.10.10.10     Waiting for iscsid(8)</programlisting>
 
 	<para>The following suggests network-level problem, such as
-	  wrong IP address or port:</para>
+	  wrong <acronym>IP</acronym> address or port:</para>
 
 	<programlisting>Target name                                     Target addr     State
 iqn.2012-06.com.example:target0                 10.10.10.11     Connection refused</programlisting>

From owner-svn-doc-head@FreeBSD.ORG  Wed Oct 16 20:19:56 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [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 E409D8F5;
 Wed, 16 Oct 2013 20:19:56 +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 CD8B22824;
 Wed, 16 Oct 2013 20:19: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 r9GKJu24049617;
 Wed, 16 Oct 2013 20:19:56 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9GKJuMq049616;
 Wed, 16 Oct 2013 20:19:56 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310162019.r9GKJuMq049616@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Wed, 16 Oct 2013 20:19:56 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42977 -
 head/en_US.ISO8859-1/books/handbook/network-servers
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Oct 2013 20:19:57 -0000

Author: dru
Date: Wed Oct 16 20:19:56 2013
New Revision: 42977
URL: http://svnweb.freebsd.org/changeset/doc/42977

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	Wed Oct 16 19:40:27 2013	(r42976)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Wed Oct 16 20:19:56 2013	(r42977)
@@ -200,8 +200,8 @@
 	<literal>inetd_flags</literal> is set to
 	<literal>-wW -C 60</literal>, which turns on TCP wrapping for
 	<application>inetd</application>'s services, and prevents any
-	single <acronym>IP</acronym> address from requesting any service more than 60
-	times in any given minute.</para>
+	single <acronym>IP</acronym> address from requesting any
+	service more than 60 times in any given minute.</para>
 
       <para>Although we mention rate-limiting options below, novice
 	users may be pleased to note that these parameters usually do
@@ -227,9 +227,10 @@
 
 	  <listitem>
 	    <para>Specify the default maximum number of times a
-	      service can be invoked from a single <acronym>IP</acronym> address in one
-	      minute; the default is unlimited.  May be overridden on
-	      a per-service basis with the
+	      service can be invoked from a single
+	      <acronym>IP</acronym> address in one minute; the default
+	      is unlimited.  May be overridden on a per-service basis
+	      with the
 	      <option>max-connections-per-ip-per-minute</option>
 	      parameter.</para>
 	  </listitem>
@@ -250,9 +251,9 @@
 
 	  <listitem>
 	    <para>Specify the maximum number of times a service can be
-	      invoked from a single <acronym>IP</acronym> address at any one time; the
-	      default is unlimited.  May be overridden on a
-	      per-service basis with the
+	      invoked from a single <acronym>IP</acronym> address at
+	      any one time; the default is unlimited.  May be
+	      overridden on a per-service basis with the
 	      <option>max-child-per-ip</option> parameter.</para>
 	  </listitem>
 	</varlistentry>
@@ -403,14 +404,15 @@ server-program-arguments</programlisting
 	      options which limit the maximum connections from a
 	      single place to a particular daemon can be enabled.
 	      <option>max-connections-per-ip-per-minute</option>
-	      limits the number of connections from any particular <acronym>IP</acronym>
-	      address per minutes, e.g., a value of ten would limit
-	      any particular <acronym>IP</acronym> address connecting to a particular
-	      service to ten attempts per minute.
-	      <option>max-child-per-ip</option> limits the number of
-	      children that can be started on behalf on any single <acronym>IP</acronym>
-	      address at any moment.  These options are useful to
-	      prevent intentional or unintentional excessive resource
+	      limits the number of connections from any particular
+	      <acronym>IP</acronym> address per minutes, e.g., a value
+	      of ten would limit any particular <acronym>IP</acronym>
+	      address connecting to a particular service to ten
+	      attempts per minute.  <option>max-child-per-ip</option>
+	      limits the number of children that can be started on
+	      behalf on any single <acronym>IP</acronym> address at
+	      any moment.  These options are useful to prevent
+	      intentional or unintentional excessive resource
 	      consumption and Denial of Service (DoS) attacks to a
 	      machine.</para>
 
@@ -430,8 +432,8 @@ server-program-arguments</programlisting
 	      would read: <literal>nowait/10</literal>.</para>
 
 	    <para>The same setup with a limit of twenty connections
-	      per <acronym>IP</acronym> address per minute and a maximum total limit of
-	      ten child daemons would read:
+	      per <acronym>IP</acronym> address per minute and a
+	      maximum total limit of ten child daemons would read:
 	      <literal>nowait/10/20</literal>.</para>
 
 	    <para>These options are utilized by the default
@@ -723,8 +725,8 @@ mountd_flags="-r"</programlisting>
 
       <para>The next example exports
 	<filename class="directory">/home</filename> to three clients
-	by <acronym>IP</acronym> address.  This can be useful for networks without
-	<acronym>DNS</acronym>.  Optionally,
+	by <acronym>IP</acronym> address.  This can be useful for
+	networks without <acronym>DNS</acronym>.  Optionally,
 	<filename>/etc/hosts</filename> could be configured for
 	internal hostnames; please review &man.hosts.5; for more
 	information.  The <literal>-alldirs</literal> flag allows
@@ -951,11 +953,11 @@ rpc_statd_enable="YES"</programlisting>
 	<filename class="directory">/net</filename> directories.  When
 	a file is accessed within one of these directories,
 	<application>amd</application> looks up the corresponding
-	remote mount and automatically mounts it.
-	<filename class="directory">/net</filename> is used to mount
-	an exported file system from an <acronym>IP</acronym> address, while
-	<filename class="directory">/host</filename> is used to mount
-	an export from a remote hostname.</para>
+	remote mount and automatically mounts it.  <filename
+	  class="directory">/net</filename> is used to mount an
+	exported file system from an <acronym>IP</acronym> address,
+	while <filename class="directory">/host</filename> is used to
+	mount an export from a remote hostname.</para>
 
       <para>For instance, an attempt to access a file within
 	<filename class="directory">/host/foobar/usr</filename> would
@@ -2617,7 +2619,8 @@ result: 0 Success
       </authorgroup>
     </sect1info>
     -->
-    <title>Dynamic Host Configuration Protocol (<acronym>DHCP</acronym>)</title>
+    <title>Dynamic Host Configuration Protocol
+      (<acronym>DHCP</acronym>)</title>
 
     <indexterm>
       <primary>Dynamic Host Configuration Protocol</primary>
@@ -2627,108 +2630,115 @@ result: 0 Success
       <primary>Internet Systems Consortium (ISC)</primary>
     </indexterm>
 
-    <para>The Dynamic Host Configuration Protocol (<acronym>DHCP</acronym>) allows
-      a system to connect to a network in order to be assigned
-      the necessary addressing information for communication on that
-      network.  &os; includes the OpenBSD version of <command>dhclient</command>
-      which is used by the client to obtain the addressing information.
-      &os; does not install a <acronym>DHCP</acronym> server, but several
-      servers are available in the &os; Ports Collection.
-      The <acronym>DHCP</acronym> protocol is fully described in
-      <ulink url="http://www.freesoft.org/CIE/RFC/2131/">RFC
-	2131</ulink>.  Informational resources are also available at
-      <ulink url="http://www.isc.org/downloads/dhcp/">isc.org/downloads/dhcp/</ulink>.</para>
-
-    <para>This section describes how to use the built-in <acronym>DHCP</acronym> client.
-      It then describes how to install and configure a
-      <acronym>DHCP</acronym> server.</para>
+    <para>The Dynamic Host Configuration Protocol
+      (<acronym>DHCP</acronym>) allows a system to connect to a
+      network in order to be assigned the necessary addressing
+      information for communication on that network.  &os; includes
+      the OpenBSD version of <command>dhclient</command> which is used
+      by the client to obtain the addressing information.  &os; does
+      not install a <acronym>DHCP</acronym> server, but several
+      servers are available in the &os; Ports Collection.  The
+      <acronym>DHCP</acronym> protocol is fully described in <ulink
+	url="http://www.freesoft.org/CIE/RFC/2131/">RFC 2131</ulink>.
+      Informational resources are also available at <ulink
+	url="http://www.isc.org/downloads/dhcp/">isc.org/downloads/dhcp/</ulink>.</para>
+
+    <para>This section describes how to use the built-in
+      <acronym>DHCP</acronym> client.  It then describes how to
+      install and configure a <acronym>DHCP</acronym> server.</para>
 
-      <sect2>
-	<title>Configuring a <acronym>DHCP</acronym> Client</title>
+    <sect2>
+      <title>Configuring a <acronym>DHCP</acronym> Client</title>
 
-	<para><acronym>DHCP</acronym> client support is included in the &os;
-	  installer, making it easy to configure a system to automatically
-	  receive its networking addressing information from an existing
-	  <acronym>DHCP</acronym> server.</para>
-	
-	<indexterm><primary><acronym>UDP</acronym></primary></indexterm>
-	<para>When <command>dhclient</command> is
-	  executed on the client machine, it begins broadcasting
-      requests for configuration information.  By default, these
-      requests use <acronym>UDP</acronym> port 68.  The server replies on <acronym>UDP</acronym> port 67,
-      giving the client an <acronym>IP</acronym> address and other relevant network
-      information such as a subnet mask, default gateway, and <acronym>DNS</acronym> server addresses.
-      This information is in the form of a <acronym>DHCP</acronym>
-      <quote>lease</quote> and is valid for a configurable time.  This allows
-      stale <acronym>IP</acronym> addresses for clients no longer connected to the
-      network to automatically be reused.</para>
-
-    <para><acronym>DHCP</acronym> clients can obtain a great deal of information from
-      the server.  An exhaustive list may be found in
-      &man.dhcp-options.5;.</para>	
-
-	  <para>The <devicename>bpf</devicename> device is already
-	    part of the <filename>GENERIC</filename> kernel that is
-	    supplied with &os;, thus there is no need to build a
-	    custom kernel for <acronym>DHCP</acronym>.  In the case of
-	    a custom kernel configuration file, this device must be
-	    present for <acronym>DHCP</acronym> to function
-	    properly.</para>
+      <para><acronym>DHCP</acronym> client support is included in the
+	&os; installer, making it easy to configure a system to
+	automatically receive its networking addressing information
+	from an existing <acronym>DHCP</acronym> server.</para>
+
+      <indexterm><primary><acronym>UDP</acronym></primary></indexterm>
+      <para>When <command>dhclient</command> is executed on the client
+	machine, it begins broadcasting requests for configuration
+	information.  By default, these requests use
+	<acronym>UDP</acronym> port 68.  The server replies on
+	<acronym>UDP</acronym> port 67, giving the client an
+	<acronym>IP</acronym> address and other relevant network
+	information such as a subnet mask, default gateway, and
+	<acronym>DNS</acronym> server addresses.  This information is
+	in the form of a <acronym>DHCP</acronym>
+	<quote>lease</quote> and is valid for a configurable time.
+	This allows stale <acronym>IP</acronym> addresses for clients
+	no longer connected to the network to automatically be
+	reused.</para>
+
+      <para><acronym>DHCP</acronym> clients can obtain a great deal of
+	information from the server.  An exhaustive list may be found
+	in &man.dhcp-options.5;.</para>
+
+      <para>The <devicename>bpf</devicename> device is already
+	part of the <filename>GENERIC</filename> kernel that is
+	supplied with &os;, thus there is no need to build a
+	custom kernel for <acronym>DHCP</acronym>.  In the case of
+	a custom kernel configuration file, this device must be
+	present for <acronym>DHCP</acronym> to function
+	properly.</para>
 
-	  <note>
-	    <para>For those who are particularly security conscious,
-	      take note that <devicename>bpf</devicename> is also the
-	      device that allows packet sniffers to work correctly
-	      (although they still have to be run as
-	      <username>root</username>).
-	      <devicename>bpf</devicename> <emphasis>is</emphasis>
-	      required to use <acronym>DHCP</acronym>; however, the security sensitive
-	      types should probably not add
-	      <devicename>bpf</devicename> to the kernel in the
-	      expectation that at some point in the future the system
-	      will be using <acronym>DHCP</acronym>.</para>
-	  </note>
+      <note>
+	<para>For those who are particularly security conscious,
+	  take note that <devicename>bpf</devicename> is also the
+	  device that allows packet sniffers to work correctly
+	  (although they still have to be run as
+	  <username>root</username>).
+	  <devicename>bpf</devicename> <emphasis>is</emphasis>
+	  required to use <acronym>DHCP</acronym>; however, the
+	  security sensitive types should probably not add
+	  <devicename>bpf</devicename> to the kernel in the
+	  expectation that at some point in the future the system
+	  will be using <acronym>DHCP</acronym>.</para>
+      </note>
 
-	  <para>By default, <acronym>DHCP</acronym> configuration on &os; runs in the
-	    background, or <firstterm>asynchronously</firstterm>.
-	    Other startup scripts continue to run while <acronym>DHCP</acronym>
-	    completes, speeding up system startup.</para>
-
-	  <para>Background <acronym>DHCP</acronym> works well when the <acronym>DHCP</acronym> server
-	    responds quickly to requests and the <acronym>DHCP</acronym> configuration
-	    process goes quickly.  However, <acronym>DHCP</acronym> may take a long time
-	    to complete on some systems.  If network services attempt
-	    to run before <acronym>DHCP</acronym> has completed, they will fail.  Using
-	    <acronym>DHCP</acronym> in <firstterm>synchronous</firstterm> mode prevents
-	    the problem, pausing startup until <acronym>DHCP</acronym> configuration has
-	    completed.</para>
-
-	  <para>To connect to a <acronym>DHCP</acronym> server in the background while
-	    other startup continues (asynchronous mode), use the
-	    <quote><literal>DHCP</literal></quote> value in
-	    <filename>/etc/rc.conf</filename>:</para>
-
-	  <programlisting>ifconfig_<replaceable>fxp0</replaceable>="DHCP"</programlisting>
-
-	  <para>To pause startup while <acronym>DHCP</acronym> completes, use
-	    synchronous mode with the
-	    <quote><literal>SYNCDHCP</literal></quote> value:</para>
-
-	  <programlisting>ifconfig_<replaceable>fxp0</replaceable>="SYNCDHCP"</programlisting>
-
-	  <note>
-	    <para>Replace the <replaceable>fxp0</replaceable> shown
-	      in these examples with the name of the interface to be
-	      dynamically configured, as described in
-	      <xref linkend="config-network-setup"/>.</para>
-	  </note>
+      <para>By default, <acronym>DHCP</acronym> configuration on &os;
+	runs in the background, or
+	<firstterm>asynchronously</firstterm>.  Other startup scripts
+	continue to run while <acronym>DHCP</acronym> completes,
+	speeding up system startup.</para>
+
+      <para>Background <acronym>DHCP</acronym> works well when the
+	<acronym>DHCP</acronym> server responds quickly to requests
+	and the <acronym>DHCP</acronym> configuration process goes
+	quickly.  However, <acronym>DHCP</acronym> may take a long
+	time to complete on some systems.  If network services attempt
+	to run before <acronym>DHCP</acronym> has completed, they will
+	fail.  Using <acronym>DHCP</acronym> in
+	<firstterm>synchronous</firstterm> mode prevents the problem,
+	pausing startup until <acronym>DHCP</acronym> configuration
+	has completed.</para>
+
+      <para>To connect to a <acronym>DHCP</acronym> server in the
+	background while other startup continues (asynchronous mode),
+	use the <quote><literal>DHCP</literal></quote> value in
+	<filename>/etc/rc.conf</filename>:</para>
+
+      <programlisting>ifconfig_<replaceable>fxp0</replaceable>="DHCP"</programlisting>
+
+      <para>To pause startup while <acronym>DHCP</acronym> completes,
+	use synchronous mode with the
+	<quote><literal>SYNCDHCP</literal></quote> value:</para>
+
+      <programlisting>ifconfig_<replaceable>fxp0</replaceable>="SYNCDHCP"</programlisting>
+
+      <note>
+	<para>Replace the <replaceable>fxp0</replaceable> shown
+	  in these examples with the name of the interface to be
+	  dynamically configured, as described in
+	  <xref linkend="config-network-setup"/>.</para>
+      </note>
 
-	  <para>When using a different file system location for
-	    <command>dhclient</command>, or if additional flags must
-	    be passed to <command>dhclient</command>, include (editing
-	    as necessary):</para>
+      <para>When using a different file system location for
+	<command>dhclient</command>, or if additional flags must
+	be passed to <command>dhclient</command>, include (editing
+	as necessary):</para>
 
-	  <programlisting>dhclient_program="/sbin/dhclient"
+      <programlisting>dhclient_program="/sbin/dhclient"
 dhclient_flags=""</programlisting>
 
       <indexterm>
@@ -2736,7 +2746,8 @@ dhclient_flags=""</programlisting>
 	<secondary>configuration files</secondary>
       </indexterm>
 
-      <para>The <acronym>DHCP</acronym> client uses the following files:</para>
+      <para>The <acronym>DHCP</acronym> client uses the following
+	files:</para>
 
       <itemizedlist>
 	<listitem>
@@ -2760,86 +2771,90 @@ dhclient_flags=""</programlisting>
 	  <para><filename>/sbin/dhclient-script</filename></para>
 
 	  <para><command>dhclient-script</command> is the
-	    &os;-specific <acronym>DHCP</acronym> client configuration script.  It
-	    is described in &man.dhclient-script.8;, but should not
-	    need any user modification to function properly.</para>
+	    &os;-specific <acronym>DHCP</acronym> client configuration
+	    script.  It is described in &man.dhclient-script.8;, but
+	    should not need any user modification to function
+	    properly.</para>
 	</listitem>
 
 	<listitem>
 	  <para><filename>/var/db/dhclient.leases.<replaceable>interface</replaceable></filename></para>
 
-	  <para>The <acronym>DHCP</acronym> client keeps a database of valid leases in
-	    this file, which is written as a log.
+	  <para>The <acronym>DHCP</acronym> client keeps a database of
+	    valid leases in this file, which is written as a log.
 	    &man.dhclient.leases.5; gives a slightly longer
-	    description.  Refer to
-      &man.dhclient.8;, &man.dhcp-options.5;, and
-      &man.dhclient.conf.5;, in addition to the
-      references below, for more information.</para>
+	    description.  Refer to &man.dhclient.8;,
+	    &man.dhcp-options.5;, and &man.dhclient.conf.5;, in
+	    addition to the references below, for more
+	    information.</para>
 	</listitem>
       </itemizedlist>
     </sect2>
 
     <sect2 id="network-dhcp-server">
-      <title>Installing and Configuring a <acronym>DHCP</acronym> Server</title>
+      <title>Installing and Configuring a <acronym>DHCP</acronym>
+	Server</title>
 
-	<para>This section provides information on how to configure a
-	  &os; system to act as a <acronym>DHCP</acronym> server using the ISC
-	  (Internet Systems Consortium) implementation of the <acronym>DHCP</acronym>
-	  server.</para>
+      <para>This section provides information on how to configure a
+	&os; system to act as a <acronym>DHCP</acronym> server using
+	the ISC (Internet Systems Consortium) implementation of the
+	<acronym>DHCP</acronym> server.</para>
 
       <indexterm>
 	<primary><acronym>DHCP</acronym></primary>
 	<secondary>server</secondary>
       </indexterm>
 
-      <para>The <acronym>DHCP</acronym> server, <application>dhcpd</application>, is
-	included as part of the
+      <para>The <acronym>DHCP</acronym> server,
+	<application>dhcpd</application>, is included as part of the
 	<filename role="package">net/isc-dhcp42-server</filename> port
-	in the ports collection.  This port contains the ISC <acronym>DHCP</acronym>
-	server and documentation.</para>
-	<para>The server is not provided as part of &os;, and so the
-	  <filename role="package">net/isc-dhcp42-server</filename>
-	  port must be installed to provide this service.  See
-	  <xref linkend="ports"/> for more information on using the
-	  Ports Collection.</para>
+	in the ports collection.  This port contains the ISC
+	<acronym>DHCP</acronym> server and documentation.</para>
 
-	<indexterm>
-	  <primary><acronym>DHCP</acronym></primary>
+      <para>The server is not provided as part of &os;, and so the
+	<filename role="package">net/isc-dhcp42-server</filename>
+	port must be installed to provide this service.  See
+	<xref linkend="ports"/> for more information on using the
+	Ports Collection.</para>
+
+      <indexterm>
+	<primary><acronym>DHCP</acronym></primary>
 	  <secondary>installation</secondary>
-	</indexterm>
+      </indexterm>
 
-	<para>In order to configure the &os; system as a <acronym>DHCP</acronym> server,
-	  first ensure that the &man.bpf.4; device is compiled into
-	  the kernel.  To do this, add <literal>device bpf</literal>
-	  to the kernel configuration file, and rebuild the kernel.
-	  For more information about building kernels, see
-	  <xref linkend="kernelconfig"/>.</para>
-
-	<para>The <devicename>bpf</devicename> device is already part
-	  of the <filename>GENERIC</filename> kernel that is supplied
-	  with &os;, so there is no need to create a custom kernel in
-	  order to get <acronym>DHCP</acronym> working.</para>
+      <para>In order to configure the &os; system as a
+	<acronym>DHCP</acronym> server, first ensure that the
+	&man.bpf.4; device is compiled into the kernel.  To do this,
+	add <literal>device bpf</literal> to the kernel configuration
+	file, and rebuild the kernel.  For more information about
+	building kernels, see <xref linkend="kernelconfig"/>.</para>
+
+      <para>The <devicename>bpf</devicename> device is already part
+	of the <filename>GENERIC</filename> kernel that is supplied
+	with &os;, so there is no need to create a custom kernel in
+	order to get <acronym>DHCP</acronym> working.</para>
 
-	<note>
-	  <para>Those who are particularly security conscious should
-	    note that <devicename>bpf</devicename> is also the device
-	    that allows packet sniffers to function correctly
-	    (although such programs still need privileged access).
-	    The <devicename>bpf</devicename> device
-	    <emphasis>is</emphasis> required to use <acronym>DHCP</acronym>, but if the
-	    sensitivity of the system's security is high, this device
-	    should not be included in the kernel purely because the
-	    use of <acronym>DHCP</acronym> may, at some point in the
-	    future, be desired.</para>
-	</note>
+      <note>
+	<para>Those who are particularly security conscious should
+	  note that <devicename>bpf</devicename> is also the device
+	  that allows packet sniffers to function correctly
+	  (although such programs still need privileged access).
+	  The <devicename>bpf</devicename> device
+	  <emphasis>is</emphasis> required to use
+	  <acronym>DHCP</acronym>, but if the sensitivity of the
+	  system's security is high, this device should not be
+	  included in the kernel purely because the use of
+	  <acronym>DHCP</acronym> may, at some point in the future, be
+	  desired.</para>
+      </note>
 
-	<para>An example configuration file is installed by the
-	  <filename role="package">net/isc-dhcp42-server</filename>
-	  port.  Copy the example
-	  <filename>/usr/local/etc/dhcpd.conf.example</filename>
-	  to the actual configuration file,
-	  <filename>/usr/local/etc/dhcpd.conf</filename>.  Edits
-	  will be made to this new file.</para>
+      <para>An example configuration file is installed by the
+	<filename role="package">net/isc-dhcp42-server</filename>
+	port.  Copy the example
+	<filename>/usr/local/etc/dhcpd.conf.example</filename>
+	to the actual configuration file,
+	<filename>/usr/local/etc/dhcpd.conf</filename>.  Edits
+	will be made to this new file.</para>
 
       <sect3>
 	<title>Configuring the <acronym>DHCP</acronym> Server</title>
@@ -2880,7 +2895,8 @@ host mailhost {
 
 	  <callout arearefs="domain-name-servers">
 	    <para>This option specifies a comma separated list of
-	      <acronym>DNS</acronym> servers that the client should use.</para>
+	      <acronym>DNS</acronym> servers that the client should
+	      use.</para>
 	  </callout>
 
 	  <callout arearefs="subnet-mask">
@@ -2904,17 +2920,19 @@ host mailhost {
 	  </callout>
 
 	  <callout arearefs="ddns-update-style">
-	    <para>This option specifies whether the <acronym>DHCP</acronym> server
-	      should attempt to update <acronym>DNS</acronym> when a lease is accepted
-	      or released.  In the ISC implementation, this option
-	      is <emphasis>required</emphasis>.</para>
+	    <para>This option specifies whether the
+	      <acronym>DHCP</acronym> server should attempt to update
+	      <acronym>DNS</acronym> when a lease is accepted or
+	      released.  In the ISC implementation, this option is
+	      <emphasis>required</emphasis>.</para>
 	  </callout>
 
 	  <callout arearefs="range">
-	    <para>This denotes which <acronym>IP</acronym> addresses should be used in
-	      the pool reserved for allocating to clients.  <acronym>IP</acronym>
-	      addresses between, and including, the ones stated are
-	      handed out to clients.</para>
+	    <para>This denotes which <acronym>IP</acronym> addresses
+	      should be used in the pool reserved for allocating to
+	      clients.  <acronym>IP</acronym> addresses between, and
+	      including, the ones stated are handed out to
+	      clients.</para>
 	  </callout>
 
 	  <callout arearefs="routers">
@@ -2924,14 +2942,15 @@ host mailhost {
 
 	  <callout arearefs="hardware">
 	    <para>The hardware MAC address of a host (so that the
-	      <acronym>DHCP</acronym> server can recognize a host when it makes a
-	      request).</para>
+	      <acronym>DHCP</acronym> server can recognize a host when
+	      it makes a request).</para>
 	  </callout>
 
 	  <callout arearefs="fixed-address">
 	    <para>Specifies that the host should always be given the
-	      same <acronym>IP</acronym> address.  Note that using a hostname is
-	      correct here, since the <acronym>DHCP</acronym> server will resolve the
+	      same <acronym>IP</acronym> address.  Note that using a
+	      hostname is correct here, since the
+	      <acronym>DHCP</acronym> server will resolve the
 	      hostname itself before returning the lease
 	      information.</para>
 	  </callout>
@@ -2947,8 +2966,8 @@ dhcpd_ifaces="dc0"</programlisting>
 
 	<para>Replace the <literal>dc0</literal> interface name with
 	  the interface (or interfaces, separated by whitespace)
-	  that the <acronym>DHCP</acronym> server should listen on for <acronym>DHCP</acronym> client
-	  requests.</para>
+	  that the <acronym>DHCP</acronym> server should listen on for
+	  <acronym>DHCP</acronym> client requests.</para>
 
 	<para>Proceed to start the server by issuing
 	  the following command:</para>
@@ -3000,20 +3019,20 @@ dhcpd_ifaces="dc0"</programlisting>
 	  <listitem>
 	    <para><filename>/var/db/dhcpd.leases</filename></para>
 
-	    <para>The <acronym>DHCP</acronym> server keeps a database of leases it has
-	      issued in this file, which is written as a log.  The
-	      port installs &man.dhcpd.leases.5;, which gives a
-	      slightly longer description.</para>
+	    <para>The <acronym>DHCP</acronym> server keeps a database
+	      of leases it has issued in this file, which is written
+	      as a log.  The port installs &man.dhcpd.leases.5;, which
+	      gives a slightly longer description.</para>
 	  </listitem>
 
 	  <listitem>
 	    <para><filename>/usr/local/sbin/dhcrelay</filename></para>
 
 	    <para><application>dhcrelay</application> is used in
-	      advanced environments where one <acronym>DHCP</acronym> server forwards a
-	      request from a client to another <acronym>DHCP</acronym> server on a
-	      separate network.  If this functionality is required,
-	      then install the
+	      advanced environments where one <acronym>DHCP</acronym>
+	      server forwards a request from a client to another
+	      <acronym>DHCP</acronym> server on a separate network.
+	      If this functionality is required, then install the
 	      <filename role="package">net/isc-dhcp42-relay</filename>
 	      port.  The port installs &man.dhcrelay.8;, which
 	      provides more detail.</para>
@@ -3094,7 +3113,8 @@ dhcpd_ifaces="dc0"</programlisting>
 	<acronym>DNS</acronym> must be understood.</para>
 
       <indexterm><primary>resolver</primary></indexterm>
-      <indexterm><primary>reverse <acronym>DNS</acronym></primary></indexterm>
+      <indexterm><primary>reverse
+	  <acronym>DNS</acronym></primary></indexterm>
       <indexterm><primary>root zone</primary></indexterm>
 
       <informaltable frame="none" pgwide="1">
@@ -3112,7 +3132,8 @@ dhcpd_ifaces="dc0"</programlisting>
 	  <tbody>
 	    <row>
 	      <entry>Forward <acronym>DNS</acronym></entry>
-	      <entry>Mapping of hostnames to <acronym>IP</acronym> addresses.</entry>
+	      <entry>Mapping of hostnames to <acronym>IP</acronym>
+		addresses.</entry>
 	    </row>
 
 	    <row>
@@ -3765,7 +3786,8 @@ www             IN      CNAME   example.
 	  <secondary>records</secondary>
 	</indexterm>
 
-	<para>The most commonly used <acronym>DNS</acronym> records:</para>
+	<para>The most commonly used <acronym>DNS</acronym>
+	  records:</para>
 
 	<variablelist>
 	  <varlistentry>
@@ -3919,9 +3941,9 @@ mail            IN      A       192.168.
 	  priority number), then the second highest, etc, until the
 	  mail can be properly delivered.</para>
 
-	<para>For in-addr.arpa zone files (reverse <acronym>DNS</acronym>), the same
-	  format is used, except with PTR entries instead of A or
-	  CNAME.</para>
+	<para>For in-addr.arpa zone files (reverse
+	  <acronym>DNS</acronym>), the same format is used, except
+	  with PTR entries instead of A or CNAME.</para>
 
 	<programlisting>$TTL 3600
 
@@ -3941,8 +3963,8 @@ mail            IN      A       192.168.
 4       IN      PTR     mx.example.org.
 5       IN      PTR     mail.example.org.</programlisting>
 
-	<para>This file gives the proper <acronym>IP</acronym> address to hostname
-	  mappings for the above fictitious domain.</para>
+	<para>This file gives the proper <acronym>IP</acronym> address
+	  to hostname mappings for the above fictitious domain.</para>
 
 	<para>It is worth noting that all names on the right side
 	  of a PTR record need to be fully qualified (i.e., end in
@@ -3970,7 +3992,8 @@ mail            IN      A       192.168.
 
       <indexterm>
 	<primary>BIND</primary>
-	<secondary><acronym>DNS</acronym> security extensions</secondary>
+	<secondary><acronym>DNS</acronym> security
+	    extensions</secondary>
       </indexterm>
 
       <para>Domain Name System Security Extensions, or <acronym
@@ -4335,9 +4358,10 @@ $include Kexample.com.+005+nnnnn.ZSK.key
     <sect2>
       <title>Security</title>
 
-      <para>Although BIND is the most common implementation of <acronym>DNS</acronym>,
-	there is always the issue of security.  Possible and
-	exploitable security holes are sometimes found.</para>
+      <para>Although BIND is the most common implementation of
+	<acronym>DNS</acronym>, there is always the issue of security.
+	Possible and exploitable security holes are sometimes
+	found.</para>
 
       <para>While &os; automatically drops
 	<application>named</application> into a &man.chroot.8;
@@ -4381,7 +4405,8 @@ $include Kexample.com.+005+nnnnn.ZSK.key
 	<listitem>
 	  <para><ulink
 	      url="http://www.oreilly.com/catalog/dns5/">O'Reilly
-	      <acronym>DNS</acronym> and BIND 5th Edition</ulink></para>
+	      <acronym>DNS</acronym> and BIND 5th
+	      Edition</ulink></para>
 	</listitem>
 
 	<listitem>
@@ -4420,15 +4445,15 @@ $include Kexample.com.+005+nnnnn.ZSK.key
 	<listitem>
 	  <para><ulink
 	      url="http://tools.ietf.org/html/rfc4034">RFC4034
-	      - Resource Records for the <acronym>DNS</acronym> Security
-	      Extensions</ulink></para>
+	      - Resource Records for the <acronym>DNS</acronym>
+	      Security Extensions</ulink></para>
 	</listitem>
 
 	<listitem>
 	  <para><ulink
 	      url="http://tools.ietf.org/html/rfc4035">RFC4035
-	      - Protocol Modifications for the <acronym>DNS</acronym> Security
-	      Extensions</ulink></para>
+	      - Protocol Modifications for the <acronym>DNS</acronym>
+	      Security Extensions</ulink></para>
 	</listitem>
 
 	<listitem>
@@ -4630,7 +4655,8 @@ $include Kexample.com.+005+nnnnn.ZSK.key
 	types of Virtual Hosting.  The first method is Name-based
 	Virtual Hosting.  Name-based virtual hosting uses the clients
 	HTTP/1.1 headers to figure out the hostname.  This allows many
-	different domains to share the same <acronym>IP</acronym> address.</para>
+	different domains to share the same <acronym>IP</acronym>
+	address.</para>
 
       <para>To setup <application>Apache</application> to use
 	Name-based Virtual Hosting add an entry like the following to
@@ -5524,8 +5550,8 @@ driftfile /var/db/ntp.drift</programlist
 	<programlisting>restrict 192.168.1.0 mask 255.255.255.0 nomodify notrap</programlisting>
 
 	<para>instead, where
-	  <hostid role="ipaddr">192.168.1.0</hostid> is an <acronym>IP</acronym> address
-	  on the network and
+	  <hostid role="ipaddr">192.168.1.0</hostid> is an
+	  <acronym>IP</acronym> address on the network and
 	  <hostid role="netmask">255.255.255.0</hostid> is the
 	  network's netmask.</para>
 

From owner-svn-doc-head@FreeBSD.ORG  Wed Oct 16 23:41:27 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 4F44F845;
 Wed, 16 Oct 2013 23:41:27 +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 2DE2D22EA;
 Wed, 16 Oct 2013 23:41:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9GNfR1U059458;
 Wed, 16 Oct 2013 23:41:27 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9GNfREq059457;
 Wed, 16 Oct 2013 23:41:27 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310162341.r9GNfREq059457@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Wed, 16 Oct 2013 23:41:27 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42978 -
 head/en_US.ISO8859-1/books/handbook/network-servers
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Oct 2013 23:41:27 -0000

Author: dru
Date: Wed Oct 16 23:41:26 2013
New Revision: 42978
URL: http://svnweb.freebsd.org/changeset/doc/42978

Log:
  This chapter finishes up the DHCP section. It does the following:
  - moves the bpf warning higher as it applies to both
  - reduces some headings
  - removes redundancy and does general tightening
  - clarifies some sections
  - modernizes the server config file and expands on the descriptions
  
  This chapter would benefit from extra callouts describing declarations and multiple subnets.
  
  A subsequent patch will fix the white space.

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	Wed Oct 16 20:19:56 2013	(r42977)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Wed Oct 16 23:41:26 2013	(r42978)
@@ -2646,14 +2646,29 @@ result: 0 Success
     <para>This section describes how to use the built-in
       <acronym>DHCP</acronym> client.  It then describes how to
       install and configure a <acronym>DHCP</acronym> server.</para>
+ 
+    <note>     
+     <para>In &os;, the &man.bpf.4; device is needed by both the 
+       <acronym>DHCP</acronym> server and <acronym>DHCP</acronym> client.
+	This device is included in the <filename>GENERIC</filename> 
+	kernel that is installed with &os;.  Users who prefer to create
+	a custom kernel need to keep this device if 
+	<acronym>DHCP</acronym> is used.</para>
+
+	<para>Those who are security conscious should
+	  note that <devicename>bpf</devicename> also
+	  allows packet sniffers to function correctly.</para>
+      </note>
 
     <sect2>
       <title>Configuring a <acronym>DHCP</acronym> Client</title>
 
       <para><acronym>DHCP</acronym> client support is included in the
-	&os; installer, making it easy to configure a system to
+	&os; installer, making it easy to configure a newly installed system to
 	automatically receive its networking addressing information
-	from an existing <acronym>DHCP</acronym> server.</para>
+	from an existing <acronym>DHCP</acronym> server.  Refer to
+	<xref linkend="bsdinstall-post"/> for examples of network
+	configuration.</para>
 
       <indexterm><primary><acronym>UDP</acronym></primary></indexterm>
       <para>When <command>dhclient</command> is executed on the client
@@ -2668,78 +2683,48 @@ result: 0 Success
 	<quote>lease</quote> and is valid for a configurable time.
 	This allows stale <acronym>IP</acronym> addresses for clients
 	no longer connected to the network to automatically be
-	reused.</para>
-
-      <para><acronym>DHCP</acronym> clients can obtain a great deal of
+	reused.  <acronym>DHCP</acronym> clients can obtain a great deal of
 	information from the server.  An exhaustive list may be found
 	in &man.dhcp-options.5;.</para>
 
-      <para>The <devicename>bpf</devicename> device is already
-	part of the <filename>GENERIC</filename> kernel that is
-	supplied with &os;, thus there is no need to build a
-	custom kernel for <acronym>DHCP</acronym>.  In the case of
-	a custom kernel configuration file, this device must be
-	present for <acronym>DHCP</acronym> to function
-	properly.</para>
-
-      <note>
-	<para>For those who are particularly security conscious,
-	  take note that <devicename>bpf</devicename> is also the
-	  device that allows packet sniffers to work correctly
-	  (although they still have to be run as
-	  <username>root</username>).
-	  <devicename>bpf</devicename> <emphasis>is</emphasis>
-	  required to use <acronym>DHCP</acronym>; however, the
-	  security sensitive types should probably not add
-	  <devicename>bpf</devicename> to the kernel in the
-	  expectation that at some point in the future the system
-	  will be using <acronym>DHCP</acronym>.</para>
-      </note>
-
-      <para>By default, <acronym>DHCP</acronym> configuration on &os;
+      <para>By default, when a &os; system boots, its <acronym>DHCP</acronym> client
 	runs in the background, or
 	<firstterm>asynchronously</firstterm>.  Other startup scripts
-	continue to run while <acronym>DHCP</acronym> completes,
-	speeding up system startup.</para>
+	continue to run while the <acronym>DHCP</acronym> process completes,
+	which speeds up system startup.</para>
 
       <para>Background <acronym>DHCP</acronym> works well when the
-	<acronym>DHCP</acronym> server responds quickly to requests
-	and the <acronym>DHCP</acronym> configuration process goes
-	quickly.  However, <acronym>DHCP</acronym> may take a long
+	<acronym>DHCP</acronym> server responds quickly to the client's requests.
+	However, <acronym>DHCP</acronym> may take a long
 	time to complete on some systems.  If network services attempt
-	to run before <acronym>DHCP</acronym> has completed, they will
+	to run before <acronym>DHCP</acronym> has assigned the network addressing information, they will
 	fail.  Using <acronym>DHCP</acronym> in
-	<firstterm>synchronous</firstterm> mode prevents the problem,
-	pausing startup until <acronym>DHCP</acronym> configuration
+	<firstterm>synchronous</firstterm> mode prevents this problem as it
+	pauses startup until the <acronym>DHCP</acronym> configuration
 	has completed.</para>
 
-      <para>To connect to a <acronym>DHCP</acronym> server in the
-	background while other startup continues (asynchronous mode),
-	use the <quote><literal>DHCP</literal></quote> value in
-	<filename>/etc/rc.conf</filename>:</para>
+      <para>This line in <filename>/etc/rc.conf</filename> is used to
+	configure
+	background or asynchronous mode:</para>
 
       <programlisting>ifconfig_<replaceable>fxp0</replaceable>="DHCP"</programlisting>
 
-      <para>To pause startup while <acronym>DHCP</acronym> completes,
-	use synchronous mode with the
-	<quote><literal>SYNCDHCP</literal></quote> value:</para>
+      <para>This line may already exist if the system was configured 
+	to use <acronym>DHCP</acronym> during installation.  Replace 
+	the <replaceable>fxp0</replaceable> shown
+	in these examples with the name of the interface to be
+	dynamically configured, as described in
+	<xref linkend="config-network-setup"/>.</para>      
+      
+      <para>To instead configure the system to use synchronous mode, 
+	and to pause during startup while <acronym>DHCP</acronym> completes,
+	use
+	<quote><literal>SYNCDHCP</literal></quote>:</para>
 
       <programlisting>ifconfig_<replaceable>fxp0</replaceable>="SYNCDHCP"</programlisting>
 
-      <note>
-	<para>Replace the <replaceable>fxp0</replaceable> shown
-	  in these examples with the name of the interface to be
-	  dynamically configured, as described in
-	  <xref linkend="config-network-setup"/>.</para>
-      </note>
-
-      <para>When using a different file system location for
-	<command>dhclient</command>, or if additional flags must
-	be passed to <command>dhclient</command>, include (editing
-	as necessary):</para>
-
-      <programlisting>dhclient_program="/sbin/dhclient"
-dhclient_flags=""</programlisting>
+      <para>Additional client options are available.  Search for
+	<literal>dhclient</literal> in &man.rc.conf.5; for details.</para>
 
       <indexterm>
 	<primary><acronym>DHCP</acronym></primary>
@@ -2753,24 +2738,23 @@ dhclient_flags=""</programlisting>
 	<listitem>
 	  <para><filename>/etc/dhclient.conf</filename></para>
 
-	  <para><command>dhclient</command> requires a configuration
-	    file, <filename>/etc/dhclient.conf</filename>.  Typically
-	    the file contains only comments, the defaults being
-	    reasonably sane.  This configuration file is described in
+	  <para>The configuration file used by <command>dhclient</command>.  Typically,
+	    this file contains only comments as the defaults are suitable for most clients.
+	    This configuration file is described in
 	    &man.dhclient.conf.5;.</para>
 	</listitem>
 
 	<listitem>
 	  <para><filename>/sbin/dhclient</filename></para>
 
-	  <para>More information about <command>dhclient</command> can
+	  <para>More information about the command itself can
 	    be found in &man.dhclient.8;.</para>
 	</listitem>
 
 	<listitem>
 	  <para><filename>/sbin/dhclient-script</filename></para>
 
-	  <para><command>dhclient-script</command> is the
+	  <para>The
 	    &os;-specific <acronym>DHCP</acronym> client configuration
 	    script.  It is described in &man.dhclient-script.8;, but
 	    should not need any user modification to function
@@ -2781,12 +2765,8 @@ dhclient_flags=""</programlisting>
 	  <para><filename>/var/db/dhclient.leases.<replaceable>interface</replaceable></filename></para>
 
 	  <para>The <acronym>DHCP</acronym> client keeps a database of
-	    valid leases in this file, which is written as a log.
-	    &man.dhclient.leases.5; gives a slightly longer
-	    description.  Refer to &man.dhclient.8;,
-	    &man.dhcp-options.5;, and &man.dhclient.conf.5;, in
-	    addition to the references below, for more
-	    information.</para>
+	    valid leases in this file, which is written as a log and is described in
+	    &man.dhclient.leases.5;.</para>
 	</listitem>
       </itemizedlist>
     </sect2>
@@ -2795,195 +2775,166 @@ dhclient_flags=""</programlisting>
       <title>Installing and Configuring a <acronym>DHCP</acronym>
 	Server</title>
 
-      <para>This section provides information on how to configure a
+      <para>This section demonstrates how to configure a
 	&os; system to act as a <acronym>DHCP</acronym> server using
-	the ISC (Internet Systems Consortium) implementation of the
-	<acronym>DHCP</acronym> server.</para>
+	the Internet Systems Consortium (<acronym>ISC</acronym>) implementation of the
+	<acronym>DHCP</acronym> server.  This implementation and its documentation can be
+	installed using the <filename 
+	  role="package">net/isc-dhcp42-server</filename> package or 
+	port.</para>
 
       <indexterm>
 	<primary><acronym>DHCP</acronym></primary>
 	<secondary>server</secondary>
       </indexterm>
 
-      <para>The <acronym>DHCP</acronym> server,
-	<application>dhcpd</application>, is included as part of the
-	<filename role="package">net/isc-dhcp42-server</filename> port
-	in the ports collection.  This port contains the ISC
-	<acronym>DHCP</acronym> server and documentation.</para>
-
-      <para>The server is not provided as part of &os;, and so the
-	<filename role="package">net/isc-dhcp42-server</filename>
-	port must be installed to provide this service.  See
-	<xref linkend="ports"/> for more information on using the
-	Ports Collection.</para>
-
       <indexterm>
 	<primary><acronym>DHCP</acronym></primary>
 	  <secondary>installation</secondary>
       </indexterm>
 
-      <para>In order to configure the &os; system as a
-	<acronym>DHCP</acronym> server, first ensure that the
-	&man.bpf.4; device is compiled into the kernel.  To do this,
-	add <literal>device bpf</literal> to the kernel configuration
-	file, and rebuild the kernel.  For more information about
-	building kernels, see <xref linkend="kernelconfig"/>.</para>
-
-      <para>The <devicename>bpf</devicename> device is already part
-	of the <filename>GENERIC</filename> kernel that is supplied
-	with &os;, so there is no need to create a custom kernel in
-	order to get <acronym>DHCP</acronym> working.</para>
-
-      <note>
-	<para>Those who are particularly security conscious should
-	  note that <devicename>bpf</devicename> is also the device
-	  that allows packet sniffers to function correctly
-	  (although such programs still need privileged access).
-	  The <devicename>bpf</devicename> device
-	  <emphasis>is</emphasis> required to use
-	  <acronym>DHCP</acronym>, but if the sensitivity of the
-	  system's security is high, this device should not be
-	  included in the kernel purely because the use of
-	  <acronym>DHCP</acronym> may, at some point in the future, be
-	  desired.</para>
-      </note>
-
-      <para>An example configuration file is installed by the
+      <para>The installation of
 	<filename role="package">net/isc-dhcp42-server</filename>
-	port.  Copy the example
+	installs a sample configuration file.  Copy
 	<filename>/usr/local/etc/dhcpd.conf.example</filename>
-	to the actual configuration file,
-	<filename>/usr/local/etc/dhcpd.conf</filename>.  Edits
-	will be made to this new file.</para>
-
-      <sect3>
-	<title>Configuring the <acronym>DHCP</acronym> Server</title>
+	to
+	<filename>/usr/local/etc/dhcpd.conf</filename> and make any edits
+	to this new file.</para>
 
 	<indexterm>
 	  <primary><acronym>DHCP</acronym></primary>
 	  <secondary>dhcpd.conf</secondary>
 	</indexterm>
-	<para><filename>dhcpd.conf</filename> is comprised of
-	  declarations regarding subnets and hosts, and is perhaps
-	  most easily explained using an example :</para>
+	<para>The configuration file is comprised of
+	  declarations for subnets and hosts which define the 
+	  information that is provided to <acronym>DHCP</acronym> 
+	  clients.  For example, these 
+	  lines configure the following:</para>
 
-	<programlisting>option domain-name "example.com";<co id="domain-name"/>
-option domain-name-servers 192.168.4.100;<co id="domain-name-servers"/>
+	<programlisting>option domain-name "example.org";<co id="domain-name"/>
+option domain-name-servers ns1.example.org;<co id="domain-name-servers"/>
 option subnet-mask 255.255.255.0;<co id="subnet-mask"/>
 
-default-lease-time 3600;<co id="default-lease-time"/>
-max-lease-time 86400;<co id="max-lease-time"/>
+default-lease-time 600;<co id="default-lease-time"/>
+max-lease-time 72400;<co id="max-lease-time"/>
 ddns-update-style none;<co id="ddns-update-style"/>
 
-subnet 192.168.4.0 netmask 255.255.255.0 {
-  range 192.168.4.129 192.168.4.254;<co id="range"/>
-  option routers 192.168.4.1;<co id="routers"/>
+subnet 10.254.239.0 netmask 255.255.255.224 {
+  range 10.254.239.10 10.254.239.20;<co id="range"/>
+  option routers rtr-239-0-1.example.org, rtr-239-0-2.example.org;<co id="routers"/>
 }
 
-host mailhost {
-  hardware ethernet 02:03:04:05:06:07;<co id="hardware"/>
-  fixed-address mailhost.example.com;<co id="fixed-address"/>
+host fantasia {
+  hardware ethernet 08:00:07:26:c0:a5;<co id="hardware"/>
+  fixed-address fantasia.fugue.com;<co id="fixed-address"/>
 }</programlisting>
 
 	<calloutlist>
 	  <callout arearefs="domain-name">
-	    <para>This option specifies the domain that will be
-	      provided to clients as the default search domain.  See
-	      &man.resolv.conf.5; for more information on what this
-	      means.</para>
+	    <para>This option specifies the default search domain that will be
+	      provided to clients.  Refer to
+	      &man.resolv.conf.5; for more information.</para>
 	  </callout>
 
 	  <callout arearefs="domain-name-servers">
 	    <para>This option specifies a comma separated list of
 	      <acronym>DNS</acronym> servers that the client should
-	      use.</para>
+	      use.  They can be listed by their Fully Qualified Domain 
+	      Names (<acronym>FQDN</acronym>), as seen in the example,  
+	      or by their <acronym>IP</acronym> addresses.</para>
 	  </callout>
 
 	  <callout arearefs="subnet-mask">
-	    <para>The netmask that will be provided to
+	    <para>The subnet mask that will be provided to
 	      clients.</para>
 	  </callout>
 
 	  <callout arearefs="default-lease-time">
-	    <para>A client may request a specific length of time
-	      that a lease will be valid.  Otherwise the server will
-	      assign a lease with this expiry value (in
-	      seconds).</para>
+	    <para>The default
+	      lease expiry time in
+	      seconds.  A client can be configured to override this
+	      value.  </para>
 	  </callout>
 
 	  <callout arearefs="max-lease-time">
-	    <para>This is the maximum length of time that the server
-	      will lease for.  Should a client request a longer
-	      lease, a lease will be issued, although it will only
-	      be valid for <literal>max-lease-time</literal>
-	      seconds.</para>
+	    <para>The maximum allowed length of time, in seconds, for a
+	      lease.  Should a client request a longer
+	      lease, a lease will still be issued, but it will only
+	      be valid for <literal>max-lease-time</literal>.</para>
 	  </callout>
 
 	  <callout arearefs="ddns-update-style">
-	    <para>This option specifies whether the
-	      <acronym>DHCP</acronym> server should attempt to update
-	      <acronym>DNS</acronym> when a lease is accepted or
-	      released.  In the ISC implementation, this option is
-	      <emphasis>required</emphasis>.</para>
+	    <para>The default of <option>none</option> disables dynamic DNS updates.
+	      Changing this to <option>interim</option> configures the 
+	      <acronym>DHCP</acronym> server to update a 
+	      <acronym>DNS</acronym> server whenever it hands out a 
+	      lease so that the <acronym>DNS</acronym> server knows 
+	      which <acronym>IP</acronym> addresses are associated 
+	      with which computers in the network. Do not change the default
+	      setting unless the <acronym>DNS</acronym> server has 
+	      been configured to support dynamic 
+	      <acronym>DNS</acronym>.</para>
 	  </callout>
 
 	  <callout arearefs="range">
-	    <para>This denotes which <acronym>IP</acronym> addresses
-	      should be used in the pool reserved for allocating to
-	      clients.  <acronym>IP</acronym> addresses between, and
-	      including, the ones stated are handed out to
-	      clients.</para>
+	    <para>This line creates a pool of available <acronym>IP</acronym> addresses
+	      which are reserved for allocation to <acronym>DHCP</acronym>
+	      clients.  The range of addresses must be valid for the
+	      network or subnet specified in the previous line.</para>
 	  </callout>
 
 	  <callout arearefs="routers">
-	    <para>Declares the default gateway that will be provided
-	      to clients.</para>
+	    <para>Declares the default gateway that is valid for the
+	      network or subnet specified before the opening 
+	      <literal>{</literal> bracket.</para>
 	  </callout>
 
 	  <callout arearefs="hardware">
-	    <para>The hardware MAC address of a host (so that the
-	      <acronym>DHCP</acronym> server can recognize a host when
-	      it makes a request).</para>
+	    <para>Specifies the hardware <acronym>MAC</acronym> address of a client so that the
+	      <acronym>DHCP</acronym> server can recognize the client when
+	      it makes a request.</para>
 	  </callout>
 
 	  <callout arearefs="fixed-address">
-	    <para>Specifies that the host should always be given the
-	      same <acronym>IP</acronym> address.  Note that using a
-	      hostname is correct here, since the
+	    <para>Specifies that this host should always be given the
+	      same <acronym>IP</acronym> address.  Using the
+	      hostname is correct, since the
 	      <acronym>DHCP</acronym> server will resolve the
-	      hostname itself before returning the lease
+	      hostname before returning the lease
 	      information.</para>
 	  </callout>
 	</calloutlist>
 
+        <para>This configuration file supports many more options.  Refer 
+	  to dhcpd.conf(5), installed with the server, for details and
+	  examples.</para>
+
 	<para>Once the configuration of
-	  <filename>dhcpd.conf</filename> has been completed,
+	  <filename>dhcpd.conf</filename> is complete,
 	  enable the <acronym>DHCP</acronym> server in
-	  <filename>/etc/rc.conf</filename>, i.e., by adding:</para>
+	  <filename>/etc/rc.conf</filename>:</para>
 
 	<programlisting>dhcpd_enable="YES"
 dhcpd_ifaces="dc0"</programlisting>
 
-	<para>Replace the <literal>dc0</literal> interface name with
+	<para>Replace the <literal>dc0</literal> with
 	  the interface (or interfaces, separated by whitespace)
 	  that the <acronym>DHCP</acronym> server should listen on for
 	  <acronym>DHCP</acronym> client requests.</para>
 
-	<para>Proceed to start the server by issuing
+	<para>Start the server by issuing
 	  the following command:</para>
 
 	<screen>&prompt.root; <userinput>service isc-dhcpd start</userinput></screen>
 
 	<para>Any future changes to the configuration of the server
-	  will require the sending of a <literal>SIGTERM</literal>
-	  signal to <application>dhcpd</application> rather than a
-	  <literal>SIGHUP</literal>.  It is definitely more simple to
-	  use &man.service.8; to completely restart the
-	  service.</para>
-      </sect3>
-
-      <sect3>
-	<title>Files</title>
+	  will require the
+	  <application>dhcpd</application> service to be stopped and then started using
+	  &man.service.8;.</para>
+
+      <para>The <acronym>DHCP</acronym> server uses the following
+	files.  Note that the manual pages are installed with the 
+	server software.</para>
 
 	<indexterm>
 	  <primary><acronym>DHCP</acronym></primary>
@@ -2993,27 +2944,21 @@ dhcpd_ifaces="dc0"</programlisting>
 	  <listitem>
 	    <para><filename>/usr/local/sbin/dhcpd</filename></para>
 
-	    <para><application>dhcpd</application> is statically
-	      linked and resides in
-	      <filename>/usr/local/sbin</filename>.   More
-	      information about
-	      <application>dhcpd</application> can be found in
-	      &man.dhcpd.8;.</para>
+	    <para>More
+	      information about the
+	      <application>dhcpd</application> server can be found in
+	      dhcpd(8).</para>
 	  </listitem>
 
 	  <listitem>
 	    <para><filename>/usr/local/etc/dhcpd.conf</filename></para>
 
-	    <para><application>dhcpd</application> requires a
-	      configuration file,
-	      <filename>/usr/local/etc/dhcpd.conf</filename> before it
-	      will start providing service to clients.  This file
+	    <para>The server configuration file
 	      needs to contain all the information that should be
-	      provided to clients that are being serviced, along with
+	      provided to clients, along with
 	      information regarding the operation of the server.  This
 	      configuration file is described in
-	      &man.dhcpd.conf.5;, which is installed by the
-	      port.</para>
+	      dhcpd.conf(5).</para>
 	  </listitem>
 
 	  <listitem>
@@ -3021,24 +2966,23 @@ dhcpd_ifaces="dc0"</programlisting>
 
 	    <para>The <acronym>DHCP</acronym> server keeps a database
 	      of leases it has issued in this file, which is written
-	      as a log.  The port installs &man.dhcpd.leases.5;, which
+	      as a log.  Refer to dhcpd.leases(5), which
 	      gives a slightly longer description.</para>
 	  </listitem>
 
 	  <listitem>
 	    <para><filename>/usr/local/sbin/dhcrelay</filename></para>
 
-	    <para><application>dhcrelay</application> is used in
+	    <para>This daemon is used in
 	      advanced environments where one <acronym>DHCP</acronym>
 	      server forwards a request from a client to another
 	      <acronym>DHCP</acronym> server on a separate network.
-	      If this functionality is required, then install the
+	      If this functionality is required, install the
 	      <filename role="package">net/isc-dhcp42-relay</filename>
-	      port.  The port installs &man.dhcrelay.8;, which
+	      package or port.  The installation includes dhcrelay(8) which
 	      provides more detail.</para>
 	  </listitem>
 	</itemizedlist>
-      </sect3>
     </sect2>
   </sect1>
 

From owner-svn-doc-head@FreeBSD.ORG  Thu Oct 17 01:53:44 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 1CC2FDD7;
 Thu, 17 Oct 2013 01:53:44 +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 09A8F2910;
 Thu, 17 Oct 2013 01:53:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9H1rhY9031577;
 Thu, 17 Oct 2013 01:53:43 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9H1rhT3031576;
 Thu, 17 Oct 2013 01:53:43 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310170153.r9H1rhT3031576@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 17 Oct 2013 01:53:43 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42979 -
 head/en_US.ISO8859-1/books/handbook/network-servers
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Oct 2013 01:53:44 -0000

Author: dru
Date: Thu Oct 17 01:53:43 2013
New Revision: 42979
URL: http://svnweb.freebsd.org/changeset/doc/42979

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	Wed Oct 16 23:41:26 2013	(r42978)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Thu Oct 17 01:53:43 2013	(r42979)
@@ -2646,29 +2646,29 @@ result: 0 Success
     <para>This section describes how to use the built-in
       <acronym>DHCP</acronym> client.  It then describes how to
       install and configure a <acronym>DHCP</acronym> server.</para>
- 
-    <note>     
-     <para>In &os;, the &man.bpf.4; device is needed by both the 
-       <acronym>DHCP</acronym> server and <acronym>DHCP</acronym> client.
-	This device is included in the <filename>GENERIC</filename> 
-	kernel that is installed with &os;.  Users who prefer to create
-	a custom kernel need to keep this device if 
-	<acronym>DHCP</acronym> is used.</para>
-
-	<para>Those who are security conscious should
-	  note that <devicename>bpf</devicename> also
-	  allows packet sniffers to function correctly.</para>
-      </note>
+
+    <note>
+      <para>In &os;, the &man.bpf.4; device is needed by both the
+	<acronym>DHCP</acronym> server and <acronym>DHCP</acronym>
+	client.  This device is included in the
+	<filename>GENERIC</filename>  kernel that is installed with
+	&os;.  Users who prefer to create a custom kernel need to keep
+	this device if  <acronym>DHCP</acronym> is used.</para>
+
+      <para>Those who are security conscious should note that
+	<devicename>bpf</devicename> also allows packet sniffers to
+	function correctly.</para>
+    </note>
 
     <sect2>
       <title>Configuring a <acronym>DHCP</acronym> Client</title>
 
       <para><acronym>DHCP</acronym> client support is included in the
-	&os; installer, making it easy to configure a newly installed system to
-	automatically receive its networking addressing information
-	from an existing <acronym>DHCP</acronym> server.  Refer to
-	<xref linkend="bsdinstall-post"/> for examples of network
-	configuration.</para>
+	&os; installer, making it easy to configure a newly installed
+	system to automatically receive its networking addressing
+	information from an existing <acronym>DHCP</acronym> server.
+	Refer to <xref linkend="bsdinstall-post"/> for examples of
+	network configuration.</para>
 
       <indexterm><primary><acronym>UDP</acronym></primary></indexterm>
       <para>When <command>dhclient</command> is executed on the client
@@ -2682,49 +2682,48 @@ result: 0 Success
 	in the form of a <acronym>DHCP</acronym>
 	<quote>lease</quote> and is valid for a configurable time.
 	This allows stale <acronym>IP</acronym> addresses for clients
-	no longer connected to the network to automatically be
-	reused.  <acronym>DHCP</acronym> clients can obtain a great deal of
+	no longer connected to the network to automatically be reused.
+	<acronym>DHCP</acronym> clients can obtain a great deal of
 	information from the server.  An exhaustive list may be found
 	in &man.dhcp-options.5;.</para>
 
-      <para>By default, when a &os; system boots, its <acronym>DHCP</acronym> client
-	runs in the background, or
+      <para>By default, when a &os; system boots, its
+	<acronym>DHCP</acronym> client runs in the background, or
 	<firstterm>asynchronously</firstterm>.  Other startup scripts
-	continue to run while the <acronym>DHCP</acronym> process completes,
-	which speeds up system startup.</para>
+	continue to run while the <acronym>DHCP</acronym> process
+	completes, which speeds up system startup.</para>
 
       <para>Background <acronym>DHCP</acronym> works well when the
-	<acronym>DHCP</acronym> server responds quickly to the client's requests.
-	However, <acronym>DHCP</acronym> may take a long
-	time to complete on some systems.  If network services attempt
-	to run before <acronym>DHCP</acronym> has assigned the network addressing information, they will
-	fail.  Using <acronym>DHCP</acronym> in
-	<firstterm>synchronous</firstterm> mode prevents this problem as it
-	pauses startup until the <acronym>DHCP</acronym> configuration
-	has completed.</para>
+	<acronym>DHCP</acronym> server responds quickly to the
+	client's requests.  However, <acronym>DHCP</acronym> may take
+	a long time to complete on some systems.  If network services
+	attempt to run before <acronym>DHCP</acronym> has assigned the
+	network addressing information, they will fail.  Using
+	<acronym>DHCP</acronym> in <firstterm>synchronous</firstterm>
+	mode prevents this problem as it pauses startup until the
+	<acronym>DHCP</acronym> configuration has completed.</para>
 
       <para>This line in <filename>/etc/rc.conf</filename> is used to
-	configure
-	background or asynchronous mode:</para>
+	configure background or asynchronous mode:</para>
 
       <programlisting>ifconfig_<replaceable>fxp0</replaceable>="DHCP"</programlisting>
 
-      <para>This line may already exist if the system was configured 
-	to use <acronym>DHCP</acronym> during installation.  Replace 
-	the <replaceable>fxp0</replaceable> shown
-	in these examples with the name of the interface to be
-	dynamically configured, as described in
-	<xref linkend="config-network-setup"/>.</para>      
-      
-      <para>To instead configure the system to use synchronous mode, 
-	and to pause during startup while <acronym>DHCP</acronym> completes,
-	use
+      <para>This line may already exist if the system was configured
+	to use <acronym>DHCP</acronym> during installation.  Replace
+	the <replaceable>fxp0</replaceable> shown in these examples
+	with the name of the interface to be dynamically configured,
+	as described in <xref linkend="config-network-setup"/>.</para>
+
+      <para>To instead configure the system to use synchronous mode,
+	and to pause during startup while <acronym>DHCP</acronym>
+	completes, use
 	<quote><literal>SYNCDHCP</literal></quote>:</para>
 
       <programlisting>ifconfig_<replaceable>fxp0</replaceable>="SYNCDHCP"</programlisting>
 
       <para>Additional client options are available.  Search for
-	<literal>dhclient</literal> in &man.rc.conf.5; for details.</para>
+	<literal>dhclient</literal> in &man.rc.conf.5; for
+	details.</para>
 
       <indexterm>
 	<primary><acronym>DHCP</acronym></primary>
@@ -2738,9 +2737,10 @@ result: 0 Success
 	<listitem>
 	  <para><filename>/etc/dhclient.conf</filename></para>
 
-	  <para>The configuration file used by <command>dhclient</command>.  Typically,
-	    this file contains only comments as the defaults are suitable for most clients.
-	    This configuration file is described in
+	  <para>The configuration file used by
+	    <command>dhclient</command>.  Typically, this file
+	    contains only comments as the defaults are suitable for
+	    most clients.  This configuration file is described in
 	    &man.dhclient.conf.5;.</para>
 	</listitem>
 
@@ -2765,8 +2765,8 @@ result: 0 Success
 	  <para><filename>/var/db/dhclient.leases.<replaceable>interface</replaceable></filename></para>
 
 	  <para>The <acronym>DHCP</acronym> client keeps a database of
-	    valid leases in this file, which is written as a log and is described in
-	    &man.dhclient.leases.5;.</para>
+	    valid leases in this file, which is written as a log and
+	    is described in &man.dhclient.leases.5;.</para>
 	</listitem>
       </itemizedlist>
     </sect2>
@@ -2775,12 +2775,12 @@ result: 0 Success
       <title>Installing and Configuring a <acronym>DHCP</acronym>
 	Server</title>
 
-      <para>This section demonstrates how to configure a
-	&os; system to act as a <acronym>DHCP</acronym> server using
-	the Internet Systems Consortium (<acronym>ISC</acronym>) implementation of the
-	<acronym>DHCP</acronym> server.  This implementation and its documentation can be
-	installed using the <filename 
-	  role="package">net/isc-dhcp42-server</filename> package or 
+      <para>This section demonstrates how to configure a &os; system
+	to act as a <acronym>DHCP</acronym> server using the Internet
+	Systems Consortium (<acronym>ISC</acronym>) implementation of
+	the <acronym>DHCP</acronym> server.  This implementation and
+	its documentation can be installed using the <filename
+	  role="package">net/isc-dhcp42-server</filename> package or
 	port.</para>
 
       <indexterm>
@@ -2793,25 +2793,23 @@ result: 0 Success
 	  <secondary>installation</secondary>
       </indexterm>
 
-      <para>The installation of
-	<filename role="package">net/isc-dhcp42-server</filename>
-	installs a sample configuration file.  Copy
-	<filename>/usr/local/etc/dhcpd.conf.example</filename>
-	to
-	<filename>/usr/local/etc/dhcpd.conf</filename> and make any edits
-	to this new file.</para>
+      <para>The installation of <filename
+	  role="package">net/isc-dhcp42-server</filename> installs a
+	sample configuration file.  Copy
+	<filename>/usr/local/etc/dhcpd.conf.example</filename> to
+	<filename>/usr/local/etc/dhcpd.conf</filename> and make any
+	edits to this new file.</para>
 
-	<indexterm>
-	  <primary><acronym>DHCP</acronym></primary>
+      <indexterm>
+	<primary><acronym>DHCP</acronym></primary>
 	  <secondary>dhcpd.conf</secondary>
-	</indexterm>
-	<para>The configuration file is comprised of
-	  declarations for subnets and hosts which define the 
-	  information that is provided to <acronym>DHCP</acronym> 
-	  clients.  For example, these 
-	  lines configure the following:</para>
+      </indexterm>
+      <para>The configuration file is comprised of declarations for
+	subnets and hosts which define the  information that is
+	provided to <acronym>DHCP</acronym>  clients.  For example,
+	these  lines configure the following:</para>
 
-	<programlisting>option domain-name "example.org";<co id="domain-name"/>
+      <programlisting>option domain-name "example.org";<co id="domain-name"/>
 option domain-name-servers ns1.example.org;<co id="domain-name-servers"/>
 option subnet-mask 255.255.255.0;<co id="subnet-mask"/>
 
@@ -2831,16 +2829,16 @@ host fantasia {
 
 	<calloutlist>
 	  <callout arearefs="domain-name">
-	    <para>This option specifies the default search domain that will be
-	      provided to clients.  Refer to
+	    <para>This option specifies the default search domain that
+	      will be provided to clients.  Refer to
 	      &man.resolv.conf.5; for more information.</para>
 	  </callout>
 
 	  <callout arearefs="domain-name-servers">
 	    <para>This option specifies a comma separated list of
 	      <acronym>DNS</acronym> servers that the client should
-	      use.  They can be listed by their Fully Qualified Domain 
-	      Names (<acronym>FQDN</acronym>), as seen in the example,  
+	      use.  They can be listed by their Fully Qualified Domain
+	      Names (<acronym>FQDN</acronym>), as seen in the example,
 	      or by their <acronym>IP</acronym> addresses.</para>
 	  </callout>
 
@@ -2850,68 +2848,68 @@ host fantasia {
 	  </callout>
 
 	  <callout arearefs="default-lease-time">
-	    <para>The default
-	      lease expiry time in
-	      seconds.  A client can be configured to override this
-	      value.  </para>
+	    <para>The default lease expiry time in seconds.  A client
+	      can be configured to override this value.  </para>
 	  </callout>
 
 	  <callout arearefs="max-lease-time">
-	    <para>The maximum allowed length of time, in seconds, for a
-	      lease.  Should a client request a longer
-	      lease, a lease will still be issued, but it will only
-	      be valid for <literal>max-lease-time</literal>.</para>
+	    <para>The maximum allowed length of time, in seconds, for
+	      a lease.  Should a client request a longer lease, a
+	      lease will still be issued, but it will only be valid
+	      for <literal>max-lease-time</literal>.</para>
 	  </callout>
 
 	  <callout arearefs="ddns-update-style">
-	    <para>The default of <option>none</option> disables dynamic DNS updates.
-	      Changing this to <option>interim</option> configures the 
-	      <acronym>DHCP</acronym> server to update a 
-	      <acronym>DNS</acronym> server whenever it hands out a 
-	      lease so that the <acronym>DNS</acronym> server knows 
-	      which <acronym>IP</acronym> addresses are associated 
-	      with which computers in the network. Do not change the default
-	      setting unless the <acronym>DNS</acronym> server has 
-	      been configured to support dynamic 
+	    <para>The default of <option>none</option> disables
+	      dynamic DNS updates.  Changing this to
+	      <option>interim</option> configures the
+	      <acronym>DHCP</acronym> server to update a
+	      <acronym>DNS</acronym> server whenever it hands out a
+	      lease so that the <acronym>DNS</acronym> server knows
+	      which <acronym>IP</acronym> addresses are associated
+	      with which computers in the network.  Do not change the
+	      default setting unless the <acronym>DNS</acronym> server
+	      has  been configured to support dynamic
 	      <acronym>DNS</acronym>.</para>
 	  </callout>
 
 	  <callout arearefs="range">
-	    <para>This line creates a pool of available <acronym>IP</acronym> addresses
-	      which are reserved for allocation to <acronym>DHCP</acronym>
-	      clients.  The range of addresses must be valid for the
-	      network or subnet specified in the previous line.</para>
+	    <para>This line creates a pool of available
+	      <acronym>IP</acronym> addresses which are reserved for
+	      allocation to <acronym>DHCP</acronym> clients.  The
+	      range of addresses must be valid for the network or
+	      subnet specified in the previous line.</para>
 	  </callout>
 
 	  <callout arearefs="routers">
 	    <para>Declares the default gateway that is valid for the
-	      network or subnet specified before the opening 
+	      network or subnet specified before the opening
 	      <literal>{</literal> bracket.</para>
 	  </callout>
 
 	  <callout arearefs="hardware">
-	    <para>Specifies the hardware <acronym>MAC</acronym> address of a client so that the
-	      <acronym>DHCP</acronym> server can recognize the client when
-	      it makes a request.</para>
+	    <para>Specifies the hardware <acronym>MAC</acronym>
+	      address of a client so that the
+	      <acronym>DHCP</acronym> server can recognize the client
+	      when it makes a request.</para>
 	  </callout>
 
 	  <callout arearefs="fixed-address">
 	    <para>Specifies that this host should always be given the
-	      same <acronym>IP</acronym> address.  Using the
-	      hostname is correct, since the
-	      <acronym>DHCP</acronym> server will resolve the
-	      hostname before returning the lease
+	      same <acronym>IP</acronym> address.  Using the hostname
+	      is correct, since the <acronym>DHCP</acronym> server
+	      will resolve the hostname before returning the lease
 	      information.</para>
 	  </callout>
 	</calloutlist>
 
-        <para>This configuration file supports many more options.  Refer 
-	  to dhcpd.conf(5), installed with the server, for details and
-	  examples.</para>
+	<para>This configuration file supports many more options.
+	  Refer  to dhcpd.conf(5), installed with the server, for
+	  details and examples.</para>
 
 	<para>Once the configuration of
-	  <filename>dhcpd.conf</filename> is complete,
-	  enable the <acronym>DHCP</acronym> server in
+	  <filename>dhcpd.conf</filename> is complete, enable the
+	  <acronym>DHCP</acronym> server in
 	  <filename>/etc/rc.conf</filename>:</para>
 
 	<programlisting>dhcpd_enable="YES"
@@ -2928,13 +2926,12 @@ dhcpd_ifaces="dc0"</programlisting>
 	<screen>&prompt.root; <userinput>service isc-dhcpd start</userinput></screen>
 
 	<para>Any future changes to the configuration of the server
-	  will require the
-	  <application>dhcpd</application> service to be stopped and then started using
-	  &man.service.8;.</para>
-
-      <para>The <acronym>DHCP</acronym> server uses the following
-	files.  Note that the manual pages are installed with the 
-	server software.</para>
+	  will require the <application>dhcpd</application> service to
+	  be stopped and then started using &man.service.8;.</para>
+
+	<para>The <acronym>DHCP</acronym> server uses the following
+	  files.  Note that the manual pages are installed with the
+	  server software.</para>
 
 	<indexterm>
 	  <primary><acronym>DHCP</acronym></primary>
@@ -2953,11 +2950,10 @@ dhcpd_ifaces="dc0"</programlisting>
 	  <listitem>
 	    <para><filename>/usr/local/etc/dhcpd.conf</filename></para>
 
-	    <para>The server configuration file
-	      needs to contain all the information that should be
-	      provided to clients, along with
-	      information regarding the operation of the server.  This
-	      configuration file is described in
+	    <para>The server configuration file needs to contain all
+	      the information that should be provided to clients,
+	      along with information regarding the operation of the
+	      server.  This configuration file is described in
 	      dhcpd.conf(5).</para>
 	  </listitem>
 
@@ -2966,21 +2962,21 @@ dhcpd_ifaces="dc0"</programlisting>
 
 	    <para>The <acronym>DHCP</acronym> server keeps a database
 	      of leases it has issued in this file, which is written
-	      as a log.  Refer to dhcpd.leases(5), which
-	      gives a slightly longer description.</para>
+	      as a log.  Refer to dhcpd.leases(5), which gives a
+	      slightly longer description.</para>
 	  </listitem>
 
 	  <listitem>
 	    <para><filename>/usr/local/sbin/dhcrelay</filename></para>
 
-	    <para>This daemon is used in
-	      advanced environments where one <acronym>DHCP</acronym>
-	      server forwards a request from a client to another
-	      <acronym>DHCP</acronym> server on a separate network.
-	      If this functionality is required, install the
-	      <filename role="package">net/isc-dhcp42-relay</filename>
-	      package or port.  The installation includes dhcrelay(8) which
-	      provides more detail.</para>
+	    <para>This daemon is used in advanced environments where
+	      one <acronym>DHCP</acronym> server forwards a request
+	      from a client to another <acronym>DHCP</acronym> server
+	      on a separate network.  If this functionality is
+	      required, install the <filename
+		role="package">net/isc-dhcp42-relay</filename>
+	      package or port.  The installation includes dhcrelay(8)
+	      which provides more detail.</para>
 	  </listitem>
 	</itemizedlist>
     </sect2>

From owner-svn-doc-head@FreeBSD.ORG  Thu Oct 17 04:33:23 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 2B61AB7D;
 Thu, 17 Oct 2013 04:33:23 +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 1714E2082;
 Thu, 17 Oct 2013 04:33:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9H4XMQE015890;
 Thu, 17 Oct 2013 04:33:22 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9H4XMNi015887;
 Thu, 17 Oct 2013 04:33:22 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201310170433.r9H4XMNi015887@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Thu, 17 Oct 2013 04:33:22 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42980 - in head: en_US.ISO8859-1/htdocs
 en_US.ISO8859-1/htdocs/community share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Oct 2013 04:33:23 -0000

Author: eadler
Date: Thu Oct 17 04:33:22 2013
New Revision: 42980
URL: http://svnweb.freebsd.org/changeset/doc/42980

Log:
  - The "social" page was kind of lonely so combine it with the "community" page.
  - While here remove an old (circa 2009) twitter account.
  
  Further work needs to be done on the community, support, and events pages.
  
  Discussed with:	bjk
  Reviewed by:	Allan Jude <freebsd@allanjude.com>

Deleted:
  head/en_US.ISO8859-1/htdocs/community/social.xml
Modified:
  head/en_US.ISO8859-1/htdocs/community.xsl
  head/en_US.ISO8859-1/htdocs/community/Makefile
  head/share/xml/navibar.ent

Modified: head/en_US.ISO8859-1/htdocs/community.xsl
==============================================================================
--- head/en_US.ISO8859-1/htdocs/community.xsl	Thu Oct 17 01:53:43 2013	(r42979)
+++ head/en_US.ISO8859-1/htdocs/community.xsl	Thu Oct 17 04:33:22 2013	(r42980)
@@ -27,9 +27,6 @@
   </xsl:template>
 
   <xsl:template name="process.contentwrap">
-	      <p>&os; is well supported by its active
-		community.</p>
-
 	      <p>There are more than one hundred <a
 		href="&base;/community/mailinglists.html">mailing
 		lists</a>, dozens of web-based <a
@@ -130,5 +127,37 @@
     GSearch.setOnLoadCallback(LoadVideoBar);
   </script>
               </div> <!-- Latest Videos -->
+	      <h2>Social Networking</h2>
+	      <p>&os; is represented on a number of different social
+	        networks.</p>
+
+	      <ul>
+
+	        <li>Thousands of users have tagged nearly 30,000
+	        unique web pages with the '<a
+	        href="http://del.icio.us/tag/freebsd">freebsd</a>' tag
+	        on <a href="http://del.icio.us">del.icio.us</a>.</li>
+
+		<li>There are thousands of photos from user group
+		meetings, conferences, and hackathons tagged as '<a
+		href="http://flickr.com/search/?z=t&amp;ss=2&amp;w=all&amp;q=freebsd&amp;m=text">freebsd</a>'
+		on <a href="http://www.flickr.com">flickr</a>.</li>
+
+		<li>There are hundreds of videos from conferences,
+		screencasts, and demonstrations relating to <a
+		href="http://www.youtube.com/results?search_query=freebsd&amp;search_type=&amp;aq=f">FreeBSD</a>
+		on <a href="http://www.youtube.com">YouTube</a>.  In particular, there is a new <a href="http://www.youtube.com/bsdconferences">BSD Conferences</a> channel with full length 1 hour taped presentations from FreeBSD technical conferences.</li>
+
+		<li>There is a <a
+		href="http://www.facebook.com/home.php#/group.php?gid=2204657214">FreeBSD
+		Users Group</a> on <a
+		href="http://www.facebook.com">Facebook</a> and a <a href="http://www.linkedin.com/groups?gid=47628">FreeBSD Group</a> on <a href="http://www.linkedin.com">LinkedIn</a>.</li>
+
+		<li>You can follow
+		<a href="http://twitter.com/freebsdblogs">@freebsdblogs</a>,
+		<a href="http://twitter.com/freebsd">@freebsd</a>, or
+		<a href="http://twitter.com/bsdevents">@bsdevents</a>
+		on <a href="http://twitter.com">Twitter</a>.</li>
+	      </ul>
   </xsl:template>
 </xsl:stylesheet>

Modified: head/en_US.ISO8859-1/htdocs/community/Makefile
==============================================================================
--- head/en_US.ISO8859-1/htdocs/community/Makefile	Thu Oct 17 01:53:43 2013	(r42979)
+++ head/en_US.ISO8859-1/htdocs/community/Makefile	Thu Oct 17 04:33:22 2013	(r42980)
@@ -7,6 +7,6 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=   irc.xml mailinglists.xml newsgroups.xml social.xml webresources.xml
+DOCS=   irc.xml mailinglists.xml newsgroups.xml webresources.xml
 
 .include "${DOC_PREFIX}/share/mk/web.site.mk"

Modified: head/share/xml/navibar.ent
==============================================================================
--- head/share/xml/navibar.ent	Thu Oct 17 01:53:43 2013	(r42979)
+++ head/share/xml/navibar.ent	Thu Oct 17 04:33:22 2013	(r42980)
@@ -37,7 +37,6 @@
     <li><a href="&base;/usergroups.html">User Groups</a></li>
     <li><a href="&base;/events/events.html">Events</a></li>
     <li><a href="&base;/community/webresources.html">Web Resources</a></li>
-    <li><a href="&base;/community/social.html">Social Networks</a></li>
     <li><a href="http://serverfault.com/questions/tagged/freebsd">Q&amp;A (external)</a></li>
   </ul>
 </div> <!-- SIDENAV -->'>

From owner-svn-doc-head@FreeBSD.ORG  Thu Oct 17 04:36:52 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id C2C3AC10;
 Thu, 17 Oct 2013 04:36:52 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from mail0.glenbarber.us (mail0.glenbarber.us
 [IPv6:2607:fc50:1:2300:1001:1001:1001:face])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7CD41209D;
 Thu, 17 Oct 2013 04:36:52 +0000 (UTC)
Received: from glenbarber.us (c-71-224-221-174.hsd1.nj.comcast.net
 [71.224.221.174])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate) (Authenticated sender: gjb)
 by mail0.glenbarber.us (Postfix) with ESMTPSA id 62D92C45E;
 Thu, 17 Oct 2013 04:36:50 +0000 (UTC)
DKIM-Filter: OpenDKIM Filter v2.8.3 mail0.glenbarber.us 62D92C45E
Authentication-Results: mail0.glenbarber.us; dkim=none
 reason="no signature"; dkim-adsp=none
Date: Thu, 17 Oct 2013 00:36:48 -0400
From: Glen Barber <gjb@FreeBSD.org>
To: Eitan Adler <eadler@FreeBSD.org>
Subject: Re: svn commit: r42980 - in head: en_US.ISO8859-1/htdocs
 en_US.ISO8859-1/htdocs/community share/xml
Message-ID: <20131017043648.GB73462@glenbarber.us>
References: <201310170433.r9H4XMNi015887@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature"; boundary="Fba/0zbH8Xs+Fj9o"
Content-Disposition: inline
In-Reply-To: <201310170433.r9H4XMNi015887@svn.freebsd.org>
X-Operating-System: FreeBSD 11.0-CURRENT amd64
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Oct 2013 04:36:52 -0000


--Fba/0zbH8Xs+Fj9o
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Oct 17, 2013 at 04:33:22AM +0000, Eitan Adler wrote:
> Author: eadler
> Date: Thu Oct 17 04:33:22 2013
> New Revision: 42980
> URL: http://svnweb.freebsd.org/changeset/doc/42980
>=20

> @@ -130,5 +127,37 @@
>      GSearch.setOnLoadCallback(LoadVideoBar);
>    </script>
>                </div> <!-- Latest Videos -->
> +	      <h2>Social Networking</h2>
> +	      <p>&os; is represented on a number of different social
> +	        networks.</p>
> +
> +	      <ul>
> +
> +	        <li>Thousands of users have tagged nearly 30,000
> +	        unique web pages with the '<a
> +	        href=3D"http://del.icio.us/tag/freebsd">freebsd</a>' tag
> +	        on <a href=3D"http://del.icio.us">del.icio.us</a>.</li>
> +
> +		<li>There are thousands of photos from user group
> +		meetings, conferences, and hackathons tagged as '<a
> +		href=3D"http://flickr.com/search/?z=3Dt&amp;ss=3D2&amp;w=3Dall&amp;q=
=3Dfreebsd&amp;m=3Dtext">freebsd</a>'
> +		on <a href=3D"http://www.flickr.com">flickr</a>.</li>
> +
> +		<li>There are hundreds of videos from conferences,
> +		screencasts, and demonstrations relating to <a
> +		href=3D"http://www.youtube.com/results?search_query=3Dfreebsd&amp;sear=
ch_type=3D&amp;aq=3Df">FreeBSD</a>
> +		on <a href=3D"http://www.youtube.com">YouTube</a>.  In particular, the=
re is a new <a href=3D"http://www.youtube.com/bsdconferences">BSD Conferenc=
es</a> channel with full length 1 hour taped presentations from FreeBSD tec=
hnical conferences.</li>
> +
> +		<li>There is a <a
> +		href=3D"http://www.facebook.com/home.php#/group.php?gid=3D2204657214">=
FreeBSD
> +		Users Group</a> on <a
> +		href=3D"http://www.facebook.com">Facebook</a> and a <a href=3D"http://=
www.linkedin.com/groups?gid=3D47628">FreeBSD Group</a> on <a href=3D"http:/=
/www.linkedin.com">LinkedIn</a>.</li>
> +
> +		<li>You can follow
> +		<a href=3D"http://twitter.com/freebsdblogs">@freebsdblogs</a>,
> +		<a href=3D"http://twitter.com/freebsd">@freebsd</a>, or
> +		<a href=3D"http://twitter.com/bsdevents">@bsdevents</a>
> +		on <a href=3D"http://twitter.com">Twitter</a>.</li>
> +	      </ul>

Some of these lines seem a bit long, and indentation with lines 137-139
should replace spaces with tabs.

Glen


--Fba/0zbH8Xs+Fj9o
Content-Type: application/pgp-signature

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

iQIcBAEBCAAGBQJSX2lgAAoJELls3eqvi17Q50AP/R8sO04Zafeo0pThUIiScN+p
ET4UkNXhtqIQrRLC39z5fPJXF9NfMuK8/ovhTWiadpcOqIUVzjh2lC9r1HVQBQMq
ks7vzQppWzcF/NzLvbMoIo4Xee993VPVSuZV3iuPfqbOp4xZFOJ8wEdj2JOsnpIc
1Lj41frhUzXIMdzQkA+rmrVEdlgY9TMxWXdhW4BT9uhU1GDJH3t2y/zUp/Y15ILr
/yJ2tKymbyS7jE/VMSjIQZfoLYB8Amf6Ao+fic6ACHk3Va8yswkHIWuUNVA23tPT
iW+bM1rT5yeT/SfkCVEo7Z2Mf/9bPFPnmw6T+XrtMckBlw4r1bDvVofOOq0huaWn
WBVPBJcecetdrX3I97Lv7YZdh9HKfKIPyufHb9m3VFv/BzIXG0AElBeAvPkL6oS/
7IVBXtzV/QE5pyizKekM8uVX4V2WJpYJSrJrTHULomwPcKcjch5baeNCk7G3biT1
5AW4pbXM6DMfLgJxW9J9x68Ag2hdpiXP5233wHLpr32JtrWtmLl/qVtd7ioEWsr+
AszNiAg6DlJgOa9EPI8RCCFdqg+MVGgufoE1HsrYESlYz+wa82Ki7BKupOO9R01Q
X7t/g9Uu1cXmfAnAXJwlAjLqh6DQhvhV4jhaTWEdE7PM6xkI43MqFYpRz5u9y4Hj
MBCVpMtz5T5j72UxmYxq
=uB4l
-----END PGP SIGNATURE-----

--Fba/0zbH8Xs+Fj9o--

From owner-svn-doc-head@FreeBSD.ORG  Thu Oct 17 04:43:55 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 1B935CA2
 for <svn-doc-head@freebsd.org>; Thu, 17 Oct 2013 04:43:55 +0000 (UTC)
 (envelope-from lists@eitanadler.com)
Received: from mail-pb0-x22d.google.com (mail-pb0-x22d.google.com
 [IPv6:2607:f8b0:400e:c01::22d])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E1EA320D7
 for <svn-doc-head@freebsd.org>; Thu, 17 Oct 2013 04:43:54 +0000 (UTC)
Received: by mail-pb0-f45.google.com with SMTP id mc17so1791050pbc.4
 for <svn-doc-head@freebsd.org>; Wed, 16 Oct 2013 21:43:54 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=eitanadler.com; s=0xdeadbeef;
 h=mime-version:sender:in-reply-to:references:from:date:message-id
 :subject:to:cc:content-type:content-transfer-encoding;
 bh=8zak2GD5sl0am7cbSRDOwN2gSBHyaP3hJ0aGkZOWG0U=;
 b=tdG3V/kh680Ekx9cg9Iv6iJYi3uLuBXY5Q6mI91xCpmZmJ3jl4wJXngu8pS9AIfeaK
 ufYj/8swqJm/Tkx2b09GweSr5t4jeQ7EIueAYgGu+ZC/VQDBS976VZbNp8NR7r2dUZjB
 6mDMVHoVH65sTJeCttkBk3X+bZGRKViWAHEhM=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20130820;
 h=x-gm-message-state:mime-version:sender:in-reply-to:references:from
 :date:message-id:subject:to:cc:content-type
 :content-transfer-encoding;
 bh=8zak2GD5sl0am7cbSRDOwN2gSBHyaP3hJ0aGkZOWG0U=;
 b=OMgRtown1xLLvPQeFe4kYGVB7/8O2FWpeBI+NzZYs9+waxUjuI4nK7aCmiaHKw1QzG
 0EJFAq1kIe9Ank+ta9GFf1mc4G1Uu4XlrJKEpM40pHSdBTbwPys9QaZGV/4euqZ19p2M
 wNHDSDMEjKGRISdFCHz1pXjmsZw9KMGQQAhO2kimEkrbu6pfo05F4optTDDa5puPI1TN
 xQenKHumCeJpRuIFCVzZC0+2rTf9mhnA25D0dRm6/cWb1V2pzX6oalygDYlcEtBGreft
 DBAIObGlTrVDZiWtsRnDkjL9bhilYSFNJFG7NGv8wOyeGgNH+xv5QGrbXCUWxAZCIRXJ
 JHsA==
X-Gm-Message-State: ALoCoQnBlEvB8Aq3d1kVSCQV6C1JYne9A2Ywbg/Nr4aAfK8DvgdeqIpLwa5L83z5Pn1xQ7HQWctf
X-Received: by 10.66.241.71 with SMTP id wg7mr6925521pac.141.1381985034342;
 Wed, 16 Oct 2013 21:43:54 -0700 (PDT)
MIME-Version: 1.0
Sender: lists@eitanadler.com
Received: by 10.70.6.3 with HTTP; Wed, 16 Oct 2013 21:43:24 -0700 (PDT)
In-Reply-To: <20131017043648.GB73462@glenbarber.us>
References: <201310170433.r9H4XMNi015887@svn.freebsd.org>
 <20131017043648.GB73462@glenbarber.us>
From: Eitan Adler <eadler@freebsd.org>
Date: Thu, 17 Oct 2013 00:43:24 -0400
X-Google-Sender-Auth: 6E8wvqnqalJL-rWnU-4FO5sJY_Y
Message-ID: <CAF6rxgne-0jt3DdNKW=_CPX0j2B_vUngZW5JzRs=hzqKL2ttwQ@mail.gmail.com>
Subject: Re: svn commit: r42980 - in head: en_US.ISO8859-1/htdocs
 en_US.ISO8859-1/htdocs/community share/xml
To: Glen Barber <gjb@freebsd.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Cc: svn-doc-head@freebsd.org, svn-doc-all@freebsd.org,
 doc-committers@freebsd.org
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Oct 2013 04:43:55 -0000

On Thu, Oct 17, 2013 at 12:36 AM, Glen Barber <gjb@freebsd.org> wrote:
> On Thu, Oct 17, 2013 at 04:33:22AM +0000, Eitan Adler wrote:
>> Author: eadler
>> Date: Thu Oct 17 04:33:22 2013
>> New Revision: 42980
>> URL: http://svnweb.freebsd.org/changeset/doc/42980
>>
>
>> @@ -130,5 +127,37 @@
>>      GSearch.setOnLoadCallback(LoadVideoBar);
>>    </script>
>>                </div> <!-- Latest Videos -->
>> +           <h2>Social Networking</h2>
>> +           <p>&os; is represented on a number of different social
>> +             networks.</p>
>> +
>> +           <ul>
>> +
>> +             <li>Thousands of users have tagged nearly 30,000
>> +             unique web pages with the '<a
>> +             href=3D"http://del.icio.us/tag/freebsd">freebsd</a>' tag
>> +             on <a href=3D"http://del.icio.us">del.icio.us</a>.</li>
>> +
>> +             <li>There are thousands of photos from user group
>> +             meetings, conferences, and hackathons tagged as '<a
>> +             href=3D"http://flickr.com/search/?z=3Dt&amp;ss=3D2&amp;w=
=3Dall&amp;q=3Dfreebsd&amp;m=3Dtext">freebsd</a>'
>> +             on <a href=3D"http://www.flickr.com">flickr</a>.</li>
>> +
>> +             <li>There are hundreds of videos from conferences,
>> +             screencasts, and demonstrations relating to <a
>> +             href=3D"http://www.youtube.com/results?search_query=3Dfree=
bsd&amp;search_type=3D&amp;aq=3Df">FreeBSD</a>
>> +             on <a href=3D"http://www.youtube.com">YouTube</a>.  In par=
ticular, there is a new <a href=3D"http://www.youtube.com/bsdconferences">B=
SD Conferences</a> channel with full length 1 hour taped presentations from=
 FreeBSD technical conferences.</li>
>> +
>> +             <li>There is a <a
>> +             href=3D"http://www.facebook.com/home.php#/group.php?gid=3D=
2204657214">FreeBSD
>> +             Users Group</a> on <a
>> +             href=3D"http://www.facebook.com">Facebook</a> and a <a hre=
f=3D"http://www.linkedin.com/groups?gid=3D47628">FreeBSD Group</a> on <a hr=
ef=3D"http://www.linkedin.com">LinkedIn</a>.</li>
>> +
>> +             <li>You can follow
>> +             <a href=3D"http://twitter.com/freebsdblogs">@freebsdblogs<=
/a>,
>> +             <a href=3D"http://twitter.com/freebsd">@freebsd</a>, or
>> +             <a href=3D"http://twitter.com/bsdevents">@bsdevents</a>
>> +             on <a href=3D"http://twitter.com">Twitter</a>.</li>
>> +           </ul>
>
> Some of these lines seem a bit long, and indentation with lines 137-139
> should replace spaces with tabs.

The whitespace on all of these pages are a bit messed up. This was a
copy & paste from social.xml.  Once I've edited these pages a bit more
I will also fix up the whitespace.



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

From owner-svn-doc-head@FreeBSD.ORG  Thu Oct 17 12:03:38 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id EF4439A9;
 Thu, 17 Oct 2013 12:03:38 +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 DCEA629C3;
 Thu, 17 Oct 2013 12: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 r9HC3cJl054197;
 Thu, 17 Oct 2013 12:03:38 GMT (envelope-from jkois@svn.freebsd.org)
Received: (from jkois@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9HC3cVl054196;
 Thu, 17 Oct 2013 12:03:38 GMT (envelope-from jkois@svn.freebsd.org)
Message-Id: <201310171203.r9HC3cVl054196@svn.freebsd.org>
From: Johann Kois <jkois@FreeBSD.org>
Date: Thu, 17 Oct 2013 12:03:38 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42981 - head/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Oct 2013 12:03:39 -0000

Author: jkois
Date: Thu Oct 17 12:03:38 2013
New Revision: 42981
URL: http://svnweb.freebsd.org/changeset/doc/42981

Log:
  PR:     www/180622
  
  Add HermeTek Network Solutions to the list of consultants with FreeBSD support.
  
  Requested by:   James Shupe <jshupe@hermetek.com>

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

Modified: head/share/xml/commercial.consult.xml
==============================================================================
--- head/share/xml/commercial.consult.xml	Thu Oct 17 04:33:22 2013	(r42980)
+++ head/share/xml/commercial.consult.xml	Thu Oct 17 12:03:38 2013	(r42981)
@@ -517,6 +517,18 @@
     </description>
   </entry>
 
+  <entry id="Hermetek" category="namerica">
+    <name>HermeTek Network Solutions</name>
+    <url>https://www.hermetek.com/</url>
+    <description>
+      HermeTek Network Solutions is a comprehensive network solutions
+      provider with a strong focus on FreeBSD.  HermeTek also offers
+      support for other BSD and Linux operating systems, as well as
+      fully managed hosting packages.  Please visit <a
+      href="https://www.hermetek.com/">our web site</a> for more information.
+    </description>
+  </entry>
+
   <entry id="HerrinSoftware" category="namerica">
     <name>Herrin Software Development</name>
     <url>http://www.hsdi.com/</url>

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

Author: jkois
Date: Thu Oct 17 12:28:08 2013
New Revision: 42982
URL: http://svnweb.freebsd.org/changeset/doc/42982

Log:
  r42929 -> r42963
  
  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	Thu Oct 17 12:03:38 2013	(r42981)
+++ head/de_DE.ISO8859-1/share/xml/news.xml	Thu Oct 17 12:28:08 2013	(r42982)
@@ -4,7 +4,7 @@
 <!--
      $FreeBSD$
      $FreeBSDde$
-     basiert auf: r42929
+     basiert auf: r42963
 -->
 
 <!-- Simple schema for FreeBSD Project news.
@@ -42,6 +42,21 @@
       <name>10</name>
 
       <day>
+	<name>14</name>
+
+	<event>
+	  <title>&os;&nbsp;10.0-BETA1 verfügbar</title>
+
+	  <p>Die erste BETA-Version aus dem &os;-10.0-Releasezyklus ist nun
+	    <a href="&lists.stable;/2013-October/075504.html">verfügbar</a>. 
+	    ISO-Images für die Architekturen amd64, i386, ia64, powerpc,
+	    powerpc64 sowie sparc64 sind inzwischen auf den meisten <a
+	    href="&enbase;/doc/de_DE.ISO8859-1/books/handbook/mirrors-ftp.html">&os;
+	    Spiegelservern</a> vorhanden.</p>
+	</event>
+      </day>
+      
+      <day>
 	<name>9</name>
 
 	<event>

From owner-svn-doc-head@FreeBSD.ORG  Thu Oct 17 15:15:59 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [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 73132199;
 Thu, 17 Oct 2013 15:15: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 51699291E;
 Thu, 17 Oct 2013 15:15: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 r9HFFxnA056559;
 Thu, 17 Oct 2013 15:15:59 GMT (envelope-from pgj@svn.freebsd.org)
Received: (from pgj@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9HFFxcM056558;
 Thu, 17 Oct 2013 15:15:59 GMT (envelope-from pgj@svn.freebsd.org)
Message-Id: <201310171515.r9HFFxcM056558@svn.freebsd.org>
From: Gabor Pali <pgj@FreeBSD.org>
Date: Thu, 17 Oct 2013 15:15:59 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42983 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Oct 2013 15:15:59 -0000

Author: pgj
Date: Thu Oct 17 15:15:58 2013
New Revision: 42983
URL: http://svnweb.freebsd.org/changeset/doc/42983

Log:
  - Fixes to the 2013Q3 report
  
  Submitted by:	wblock, bjk

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	Thu Oct 17 12:28:08 2013	(r42982)
+++ head/en_US.ISO8859-1/htdocs/news/status/report-2013-07-2013-09.xml	Thu Oct 17 15:15:58 2013	(r42983)
@@ -175,46 +175,46 @@
     </links>
 
     <body>
-      <p>Last year's high-performance storage vendors reported a
+      <p>Last year's high-performance storage vendor summit reported a
 	performance bottleneck in the &os; block storage subsystem,
-	limiting peak performance around 300-500K IOPS.  While that is
-	still more than enough for average systems, detailed
+	limiting peak performance to around 300-500K IOPS.  While that
+	is still more than enough for average systems, detailed
 	investigation has shown a number of places that require radical
-	improvement.  Unmapped I/O support implemented early this year
-	already improved I/O performance by about 30% and moved more
-	accents toward GEOM and CAM subsystems scalability.  Fixing
+	improvement.  The unmapped I/O support implemented early this
+	year has already improved I/O performance by about 30% and moved
+	more focus toward GEOM and CAM subsystems scalability.  Fixing
 	these issues was the goal of this project.</p>
 
-      <p>The existing GEOM design assumed most I/O handling to be done
-	by only two kernel threads (<tt>g_up()</tt> and
+      <p>The existing GEOM design assumed most I/O handling was to be
+	done by only two kernel threads (<tt>g_up()</tt> and
 	<tt>g_down()</tt>).  That simplified locking in some cases, but
 	limited potential SMP scalability and created additional
 	scheduler overhead.  This project introduces the concept of
 	direct I/O dispatch into GEOM for cases where it is known to be
 	safe and efficient.  That implies marking some GEOM consumers
 	and providers with one or two new flags, declaring situations
-	when a direct function call can be used instead of normal request
-	queuing.  That allows avoiding any context switches inside GEOM
-	for the most widely used topologies, simultaneously processing
-	multiple I/Os from multiple calling threads.</p>
-
-      <p>Having GEOM passing through multiple concurrent calls down to
-	the underlying layers exposed major lock congestion in CAM.  In
-	the existing CAM design all devices connected to the same ATA/SCSI
-	controller are sharing a single lock, which can be quite busy due
-	to multiple controller hardware accesses and/or code logic.
+	when a direct function call can be used instead of normal
+	request queuing.  That permits avoiding any context switches
+	inside GEOM for the most widely used topologies, simultaneously
+	processing multiple I/Os from multiple calling threads.</p>
+
+      <p>Having GEOM pass through multiple concurrent calls down to the
+	underlying layers exposed major lock congestion in CAM.  In the
+	existing CAM design, all devices connected to the same ATA/SCSI
+	controller share a single lock, which can be quite busy due to
+	multiple controller hardware accesses and/or code logic.
 	Experiments have shown that applying only the above GEOM direct
 	dispatch changes burns up to 60% of system CPU time or even more
 	in attempts to obtain these locks by multiple callers, killing
-	any benefits of GEOM direct dispatch.  To overcome that, new
+	any benefits of GEOM direct dispatch.  To overcome that, a new
 	fine-grained CAM locking design was implemented.  It implies
-	splitting big per-SIM locks into several smaller ones: per-LUN
-	locks, per-bus locks, queue locks, etc.  After these changes,
-	the remaining per-SIM lock protects only the controller driver
-	internals, reducing lock congestion down to an acceptable level
-	and keeping keep compatibility with existing drivers.</p>
+	splitting the big per-SIM locks into several smaller ones:
+	per-LUN locks, per-bus locks, queue locks, etc.  After these
+	changes, the remaining per-SIM lock protects only the controller
+	driver internals, reducing lock congestion down to an acceptable
+	level and keeping compatibility with existing drivers.</p>
 
-      <p>Together, GEOM and CAM changes double the peak I/O rate,
+      <p>Together, the GEOM and CAM changes double the peak I/O rate,
 	reaching up to 1,000,000 IOPS on contemporary hardware.</p>
 
       <p>The changes were tested by a number of people and will be
@@ -249,10 +249,11 @@
     </links>
 
     <body>
-      <p>A port of the OpenBSD <tt>vmx(4)</tt> ethernet driver has been
-	committed.  The driver can be used in place of the VMware Tools
-	<tt>vmxnet3</tt> driver, which currently does not support
-	10.0-RELEASE (or anything past 9.0-RELEASE).</p>
+      <p>A port of the OpenBSD <tt>vmx(4)</tt> ethernet driver for
+	VMware virtual machines has been committed.  The driver can be
+	used in place of the VMware Tools <tt>vmxnet3</tt> driver, which
+	currently does not support 10.0-RELEASE (or anything past
+	9.0-RELEASE).</p>
     </body>
 
     <help>
@@ -305,35 +306,35 @@
 
     <body>
       <p>We are currently working on cleaning up the
-	<tt>lang/python*</tt> ports to improve the compatibility with
-	the original upstream build behaviour and to lower the need for
+	<tt>lang/python*</tt> ports to improve their compatibility with
+	the original upstream build behaviour and to reduce the need for
 	&os;-specific build patches.  A first step was made in September
 	by reducing the flags injected into the different Python
 	interpreter versions.</p>
 
-      <p>The first tasks for supporting the installation of packages for
-	different Python ports have been done.  A new metaport structure
-	has replaced the original Python port behaviour and will be
+      <p>The first tasks have been completed to support the installation
+	of packages for different Python ports.  A new metaport structure
+	has replaced the original Python port behaviour, and will be
 	enhanced over the next months to enable improved installation
 	support of packages for different Python versions at the same
 	time.</p>
 
-      <p>The Python ports framework was enhanced by automated packaging
-	list creation and replacement macros, which improve the
+      <p>The Python ports framework was enhanced with automated
+	packaging list creation and replacement macros, which improve the
 	compatibility with multiple Python versions and reduce the
 	packaging list sizes.</p>
 
       <p>PyPy was heavily enhanced over the last couple of months.
-	Major updates of the port solved integration issues and a new
+	Major updates to the port solved integration issues and a new
 	<tt>pypy-devel</tt> port for snapshots and previews was added.
 	Since the PyPy&nbsp;3 release, there is a new
 	<tt>pypy3-devel</tt> port available to provide not only
 	compatibility for Python&nbsp;2.x specific scripts, but also for
 	those using the 3.x language specification.</p>
 
-      <p>IronPython found its way into the &os; ports tree, which
-	provides an implementation of the Python language based on .NET
-	and Mono.</p>
+      <p>IronPython found its way into the &os; ports tree, providing an
+	implementation of the Python language based on .NET and
+	Mono.</p>
     </body>
 
     <help>
@@ -373,14 +374,14 @@
     </links>
 
     <body>
-      <p>The <tt>entities</tt> project branch has been succesfully
+      <p>The <tt>entities</tt> project branch has been successfully
 	merged into the main documentation branch per revision 42226 of
 	the <tt>doc</tt> repository (see link).  The purpose of this
 	branch was to remove the duplicated definitions of authors in
 	both <tt>authors.ent</tt> and <tt>developers.ent</tt>.  The
 	latter file has been removed after migrating its contents to the
 	former file.  While most changes are not visible to end users,
-	the Committers Guide was changed to accomodate for changes
+	the Committer's Guide was changed to accomodate for changes
 	related to adding a new committer.  Translators were also
 	informed of the update.  The largest hurdle mentioned in the
 	last report, processing the <tt>&lt;email&gt;</tt> element, was
@@ -498,9 +499,9 @@
 
     <body>
       <p>A few years ago, Ada-based ports almost completely disappeared
-	from the Ports Collection.  This was not surprising as
+	from the Ports Collection.  This was not surprising, as
 	FSF&nbsp;GNAT, the only open-source Ada compiler, ceased to
-	build correctly on any BSD flavor and previously built bootstrap
+	build correctly on any BSD flavor.  Previously-built bootstrap
 	compilers would not run on modern &os;, and certainly not on
 	amd64.  The first step, see the link for details, was to patch
 	GCC in order to fix GNAT not only on &os;, but DragonFly,
@@ -508,28 +509,28 @@
 	amd64 platforms were produced during this effort.  Ada compilers
 	on &os; now pass 100% of the ACATS and GCC testsuites.</p>
 
-      <p>With the first new Ada compiler port was introduced, the
+      <p>With the introduction of the first new Ada compiler port, the
 	GCC&nbsp;4.6-based <tt>lang/gnat-aux</tt>, the GNAT Programming
-	Studio (multilanguage integrated development environment),
-	XML/Ada, and GTkAda were among the first Ada ports
+	Studio (a multilanguage integrated development environment),
+	XML/Ada, and GtkAda were among the first Ada ports
 	resurrected.</p>
 
       <p>With the latest compiler, <tt>lang/gcc-aux</tt> based on GCC
 	4.7, a cohesive Ada framework was created with the new
-	<tt>USES=</tt> capability.  Currently around 20 ports are part
-	of this framework including Florist, ASIS, GPRbuild, QtAda,
+	<tt>USES=</tt> framework.  Currently around 20 ports are part of
+	this framework including Florist, ASIS, GPRbuild, QtAda,
 	AdaControl, AdaBrowse, PolyOrb, and AWS (Ada Web Server).</p>
 
       <p>The GNAT AUX compiler is also still in use to serve as a basis
 	for the GNATDroid ports which are &os;-to-Android Ada+C cross-compilers.
-	However, these will soon be integrated in the Ada Framework.</p>
+	However, these will soon be integrated into the Ada Framework.</p>
 
-      <p>At this point, it looks like that &os; (shared with DragonFly
-	via DPorts) has taken the crown from Debian as the recognized best
+      <p>At this point, it looks like &os; (shared with DragonFly via
+	DPorts) has taken the crown from Debian as the recognized best
 	Ada development platform.  The &os; versions of the software are
 	more recent and the Ports Collection has ports not available on
-	Debian, such as LibSparkCrypto, Matreshka library, and the Ahven
-	unit tester.</p>
+	Debian, such as LibSparkCrypto, the Matreshka library, and the
+	Ahven unit tester.</p>
 
       <p>Future work potentially includes converting GCC AUX to
 	GCC&nbsp;4.8 to acquire better Ada&nbsp;2012 support, importing
@@ -557,9 +558,9 @@
 
     <body>
       <p>Initial support of Allwinner A20 SoC is committed to
-	<tt>head</tt>.  A20 SoC on Cubieboard2 is pin-to-pin compatible
-	with A10 in Cubieboard1 and &os; supports the following
-	peripherals:</p>
+	<tt>head</tt>.  The A20 SoC on Cubieboard2 is pin-to-pin
+	compatible with the A10 in Cubieboard1 and &os; supports the
+	following peripherals:</p>
 
       <ul>
 	<li>USB EHCI</li>
@@ -715,20 +716,20 @@
 
     <body>
       <p>The ARM architecture is becoming more and more prevalent, with
-	increasing usage beyond the mobile and embedded space.  Among the
-	more interesting industry trends emerging in the recent months,
-	there has been the concept of "ARM server".  Some top-tier
-	companies, e.g. Dell and HP, have already started to develop
-	such systems.</p>
+	increasing usage beyond the mobile and embedded space.  Among
+	the more interesting industry trends emerging in the recent
+	months, there has been the concept of "ARM server".  Top-tier
+	companies like Dell and HP have already started to develop such
+	systems.</p>
 
-      <p>Key to success of &os; in these new areas is dealing with the
-	sophisticated features of the platform, for example adding
+      <p>Key to the success of &os; in these new areas is dealing with
+	the sophisticated features of the platform, for example adding
 	support for superpages.</p>
 
       <p>The objective of this project is to enable &os;/arm to utilize
-	superpages which would allow efficient use of TLB translations
-	(by enlarging TLB coverage), leading to improved performance in
-	many applications and scalability.  This is intended to work on
+	superpages, allowing efficient use of TLB translations (by
+	enlarging TLB coverage), leading to improved performance in many
+	applications and scalability.  This is intended to work on
 	ARMv7-based processors, however compatibility with ARMv6 will be
 	preserved.</p>
 
@@ -832,16 +833,15 @@
       <p>Due to the quickly approaching time of 10.0-RELEASE, the
 	priorities for the native iSCSI stack shifted somewhat, from
 	performance optimizations to making sure the new stack is
-	reliable, feature-complete and is able to interoperate correctly
+	reliable, feature-complete, and is able to interoperate correctly
 	with various implementations.  Plenty of time was invested into
 	testing and debugging, mostly on the initiator side, to make
 	sure it works correctly with other targets, such as Solaris
-	COMSTAR, and behaves properly in edge conditions, e.g.  in case
-	of connection problems.  Nevertheless, some fundamental
-	optimizations, such as Immediate Data support, were implemented.
-	Also, the documentation has improved, and there is going to be a
-	new section added to the &os; Handbook that describes the use of
-	the new stack.</p>
+	COMSTAR, and behaves properly in edge conditions like connection
+	problems.  Nevertheless, some fundamental optimizations, such as
+	Immediate Data support, were implemented.  The documentation has
+	improved, and there will be a new section added to the &os;
+	Handbook describing the use of the new stack.</p>
 
       <p>The new stack was committed to <tt>head</tt> and will ship as
 	part of 10.0-RELEASE.  There is ongoing work on fixing issues
@@ -875,21 +875,22 @@
     </links>
 
     <body>
-      <p>SDIO is an interface designed as an extension for the existing
+      <p>SDIO is an interface designed as an extension of the existing
 	SD card standard, to allow connecting different peripherals to
 	the host with the standard SD controller.  Peripherals currently
 	sold at the general market include WLAN/BT modules, cameras,
-	fingerprint readers, barcode scanners.  The driver is
+	fingerprint readers, and barcode scanners.  The driver is
 	implemented as an extension to the existing MMC bus, adding a
 	lot of new SDIO-specific bus methods.  A prototype of the driver
-	for Marvell SDIO WLAN/BT (Avastar 88W8787) module is also being
-	developed, using the existing Linux driver as the reference.</p>
+	for the Marvell SDIO WLAN/BT (Avastar 88W8787) module is also
+	being developed, using the existing Linux driver as the
+	reference.</p>
 
       <p>SDIO card detection and initialization already work, most
 	needed bus methods are implemented and tested.  There is an
-	ongoing work to design a good locking model for the stack.  WiFi
-	driver is able to load a firmware onto the card and initialize
-	it.</p>
+	ongoing work to design a good locking model for the stack.  The
+	WiFi driver is able to load firmware onto the card and
+	initialize it.</p>
     </body>
 
     <help>
@@ -902,8 +903,8 @@
 	receiving data, network scanning, and so on).</task>
 
       <task>Implement detach path.  It cannot be tested on the DreamPlug
-	used for development, because it does not have an external
-	SDIO-capable slot.</task>
+	used for development, because the DreamPlug does not have an
+	external SDIO-capable slot.</task>
     </help>
   </project>
 
@@ -928,7 +929,7 @@
       <p>If threads or signal handlers call <tt>fork()</tt> and
 	<tt>exec()</tt>, file descriptors may be passed undesirably to
 	child processes, which may lead to hangs (if a pipe is not
-	closed), exceeding the file descriptor limit and security
+	closed), exceeding the file descriptor limit, and security
 	problems (if the child process has lower privilege).  One
 	solution is various new APIs that set the "close-on-exec" flag
 	atomically with allocating a file descriptor.  Some existing
@@ -978,15 +979,15 @@
     </contact>
 
     <body>
-      <p>Random numbers require a lot more thought and preparation that
+      <p>Random numbers require a lot more thought and preparation than
 	would naively appear to be the case.  For simulations, number
 	sequences that are repeatable but sufficiently disordered are
-	often what is required to achieve required experimental
-	duplication ability, and many programmers are familiar with
-	these.  For cryptography, it is essential that an attacker not
-	be able to predict or guess the output sequence, thus giving a
-	source of security-critical secret material for uses such as
-	passwords or "key material".</p>
+	often needed to achieve required experimental duplication
+	ability, and many programmers are familiar with these.  For
+	cryptography, it is essential that an attacker not be able to
+	predict or guess the output sequence, thus giving a source of
+	security-critical secret material for uses such as passwords or
+	"key material".</p>
 
       <p>&os;'s random number generator, available as the pseudo-file
 	<tt>/dev/random</tt> produces unpredictable numbers intended for
@@ -1046,7 +1047,7 @@
     <body>
       <p>GNUstep is the open source implementation of the Objective-C
 	APIs based on the OpenStep specification that Apple brands as
-	Cocoa.  The similarities between &os; and OS&nbsp;X
+	Cocoa.  The similarities between the &os; and OS&nbsp;X
 	<tt>libc</tt> make &os; an attractive target platform for
 	porting OS&nbsp;X applications, with the addition of
 	GNUstep.</p>
@@ -1089,8 +1090,8 @@
     </links>
 
     <body>
-      <p>LLDB is the the debugger project in the LLVM family.  It
-	supports the Mac OS X, Linux, and &os; platforms.</p>
+      <p>LLDB is the debugger project in the LLVM family.  It supports
+	the Mac OS X, Linux, and &os; platforms.</p>
 
       <p>A number of improvements have been made to the port since the
 	previous status update.  Unit test failures have been triaged
@@ -1243,7 +1244,7 @@
 	10.0.</p>
 
       <p><tt>libnv</tt>, used for communication between Casper services
-	and consumers, but hopefully will be used more widely, is
+	and consumers, but which will hopefully be used more widely, is
 	finalized and comes with a nice set of regression tests.</p>
 
       <p>The number of applications sandboxed using the Capsicum
@@ -1261,11 +1262,12 @@
       <task>Finish documentation for <tt>libnv</tt>.</task>
 
       <task>Start making <tt>libc</tt> more sandbox-friendly, that is,
-	functions such as <tt>strerror(3)</tt>, <tt>strsignal(3)</tt>,
-	<tt>localtime(3)</tt>, <tt>login_get*()</tt>,
-	<tt>getservent(3)</tt>, <tt>getprotent(3)</tt>,
-	<tt>getrpcent(3)</tt> open files on first use, which might be
-	too late if we are already in a capability-mode sandbox.</task>
+	modifying functions such as <tt>strerror(3)</tt>,
+	<tt>strsignal(3)</tt>, <tt>localtime(3)</tt>,
+	<tt>login_get*()</tt>, <tt>getservent(3)</tt>,
+	<tt>getprotent(3)</tt>, and <tt>getrpcent(3)</tt> which
+	currently open files on first use, which might be too late if we
+	are already in a capability-mode sandbox.</task>
 
       <task>Rethink the <tt>system.filesystem</tt> Casper service to
 	allow for easy compartmentalization of various command-line
@@ -1339,7 +1341,7 @@
     <body>
       <p>The &os; Documentation Project Primer had not changed at the
 	same rate as the documents themselves.  Some sections were
-	outdated, others were wordy and confusing, while information on
+	outdated and others were wordy and confusing, while information on
 	new changes to the documentation were not described at all.  In
 	July, Warren gave the entire FDP Primer a fairly intense edit
 	for simplicity and clarity.  Chapters and sections were moved
@@ -1371,25 +1373,25 @@
     </contact>
 
     <body>
-      <p>There are some things going on with &os;/sparc64 port behind
-	the scenes.</p>
+      <p>There are some things going on with the &os;/sparc64 port
+	behind the scenes.</p>
 
       <p>For one, after having fixed all remaining problems and starting
 	with 9.2-RELEASE, release bits for this architecture are
 	cross-built on the &os; Project cluster.  As one might already
 	have noticed, this means that from now on, sparc64 install sets
 	and images including those for ALPHA, BETA, and RC builds, are
-	already available along with those for the other platforms
+	already available alongside those for the other platforms
 	supported by &os;.  It also means that since August 2013,
 	automatically cross-built monthly &os;/sparc64 snapshots are
 	distributed via the official project mirrors.  Hopefully, this
-	can be soon extended further with <tt>freebsd-update(8)</tt>
+	can soon be extended further with <tt>freebsd-update(8)</tt>
 	support for sparc64.</p>
 
       <p>Second, the X.Org ports have been fixed to work on sparc64 when
-	built with <tt>WITH_NEW_XORG</tt> knob.  However, it still needs
-	to be evaluated whether the recently committed update to Mesa
-	9.1.6 has introduced any breakage.</p>
+	built with the <tt>WITH_NEW_XORG</tt> knob.  However, it still
+	needs to be evaluated whether the recently committed update to
+	Mesa 9.1.6 has introduced any breakage.</p>
     </body>
   </project>
 
@@ -1416,14 +1418,14 @@
 
     <body>
       <p>The ports tree contains approximately 24,400 ports, while the
-	PR count exceeds 1,900.  In third quarter, we added four new
-	committers and took in six commit bits for safe keeping.</p>
+	PR count exceeds 1,900.  In the third quarter, we added four new
+	committers and took in six commit bits for safekeeping.</p>
 
       <p>A significant amount of effort has gone into tweaking and
-	manipulating the infrastructure to modernise, and update it, in
-	preperation for <tt>pkg(8)</tt> replacing the old <tt>pkg_*</tt>
-	infrastructure, as well as preparing for &os; and Clang as
-	default compiler.</p>
+	manipulating the infrastructure to modernize and update it, in
+	preperation for <tt>pkg(8)</tt> replacing the old
+	<tt>pkg_add(1)</tt> infrastructure, as well as preparing for
+	&os; with Clang as default compiler.</p>
 
       <p>Automated procedures for Quality Assurance have been
 	implemented, notably <tt>pkg-fallout</tt>.  All porters are
@@ -1431,8 +1433,8 @@
 	links), and do their part to fix ports for <tt>pkg(8)</tt> and
 	Clang readiness.</p>
 
-      <p>Many iterations of tests were run to ensure the maximum amount
-	of packages would be available for the 9.2 release.</p>
+      <p>Many iterations of tests were run to ensure that as many
+	packages as possible would be available for the 9.2 release.</p>
     </body>
 
     <help>
@@ -1457,12 +1459,12 @@
 	official <tt>pkg(8)</tt> repository, in cooperation with the
 	Port Management Team, the Security Team, and the Cluster
 	Administration Team.  At the same time, there are plans to
-	gradually deprecate the use of the old pkg_tools, allowing
-	<tt>pkg(8)</tt> to be the default binary package management
-	solution for &os;, arriving with 10.0-RELEASE.  Thomas Abthorpe
-	has been appointed to the role of liaison between the Core Team
-	and the Ports Management Team, in order to make the
-	collaboration more effective.</p>
+	gradually deprecate the use of the old <tt>pkg_add(1)</tt>,
+	allowing <tt>pkg(8)</tt> to be the default binary package
+	management solution for &os;, arriving with 10.0-RELEASE.
+	Thomas Abthorpe has been appointed to the role of liaison
+	between the Core Team and the Ports Management Team, in order to
+	make the collaboration more effective.</p>
 
       <p>David Chisnall has joined the group that publishes the
 	Quarterly Status reports and compiled a special status report on
@@ -1474,7 +1476,7 @@
 
       <p>There were src commit bits issued for 5 new developers and most
 	of the src commits being idle more than 12 months have been
-	taken into safekeeping as result of a major cleanup in the
+	taken into safekeeping as result of a major cleanup to the
 	repository access file in July, performed by Gavin Atkinson.</p>
     </body>
   </project>
@@ -1506,9 +1508,9 @@
       <p>The <tt>radeonkms</tt> driver was committed to &os;
 	<tt>head</tt> in the end of August and will be part of
 	10.0-RELEASE.  It received several fixes since the initial
-	commit and now it seems quite stable.  However, one missing
-	major feature is support for suspend/resume: the GPU almost
-	always locks up during resume on the test computer.</p>
+	commit and now seems quite stable.  However, one missing major
+	feature is support for suspend/resume: the GPU almost always
+	locks up during resume on the test computer.</p>
 
       <p>Thanks to the update of Mesa and the update of
 	<tt>x11-drivers/xf86-video-ati</tt> to 7.2.0
@@ -1530,8 +1532,8 @@
 	<li>Fixes in the framebuffer code, which would help the future
 	  deployment of Newcons.</li>
 
-	<li>Preliminary support for minor devices (that is, control vs.
-	  render nodes).</li>
+	<li>Preliminary support for minor devices (that is, control
+	  versus render nodes).</li>
 
 	<li>Support for <tt>setmaster</tt> and <tt>dropmaster</tt>,
 	  which allows to run multiple X sessions.</li>
@@ -1604,7 +1606,8 @@
 	BIOS services.</p>
 
       <p>This project was originally started by Ed Schouten, and it
-	already featured the following (among many others) in 2013:</p>
+	already featured the following features (among many others) in
+	2013:</p>
 
       <ul>
 	<li>Unicode fonts with Latin, Cyrillic and some more simple
@@ -1623,12 +1626,13 @@
 	  history.  The old, separate history buffer has been
 	  removed.</li>
 
-	<li>The history is implemented by a circular buffer, that is, no buffer
-	  overflows, scrolling is "unlimited".</li>
+	<li>The history is implemented by a circular buffer which has no
+	  risk of overflow, and scrolling appears "unlimited".</li>
 
-	<li><tt>VT_PROCESS</tt> mode, a way to hold the terminal.  For
-	  example, X.Org uses this feature to prevent the user from
-	  switching terminals.</li>
+	<li><tt>VT_PROCESS</tt> mode, a way to hold the terminal and
+	  prevent terminal switching.  For example, X.Org uses this
+	  feature to prevent the user from switching to a non-X
+	  terminal.</li>
 
 	<li><tt>drm2/fb_helper</tt>, the KMS driver.  This binds Newcons
 	  to framebuffers created the DRM-enabled video drivers in the

From owner-svn-doc-head@FreeBSD.ORG  Thu Oct 17 15:42:26 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [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 781AB38D;
 Thu, 17 Oct 2013 15:42:26 +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 54B722B7E;
 Thu, 17 Oct 2013 15:42:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9HFgQLV070679;
 Thu, 17 Oct 2013 15:42:26 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9HFgQEI070678;
 Thu, 17 Oct 2013 15:42:26 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310171542.r9HFgQEI070678@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 17 Oct 2013 15:42:26 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42984 - head/en_US.ISO8859-1/books/handbook/serialcomms
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Oct 2013 15:42:26 -0000

Author: dru
Date: Thu Oct 17 15:42:25 2013
New Revision: 42984
URL: http://svnweb.freebsd.org/changeset/doc/42984

Log:
  Initial header tightening pass through this chapter, in prep for further work.
  
  Made sure not to create any orphaned links. Some headings were better suited as tables which were created.
  
  This is to be followed by a much needed white space fix.

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

Modified: head/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml	Thu Oct 17 15:15:58 2013	(r42983)
+++ head/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml	Thu Oct 17 15:42:25 2013	(r42984)
@@ -57,13 +57,9 @@
   </sect1>
 
   <sect1 id="serial">
-    <title>Introduction</title>
-
-    <!-- XXX Write me! -->
-
-    <sect2 id="serial-terminology">
-      <title>Terminology</title>
+    <title>Serial Terminology and Hardware</title>
 
+    <para>The following terms are often used in serial commnications:</para>
       <variablelist>
 	<varlistentry>
 	  <term><acronym>bps</acronym></term>
@@ -76,16 +72,18 @@
 	<varlistentry>
 	  <term><acronym>DTE</acronym></term>
 	  <listitem>
-	    <para>An example of a Data Terminal Equipment<indexterm><primary>DTE</primary></indexterm>
-	      (<acronym>DTE</acronym>) is a computer.</para>
+	    <para>Data Terminal Equipment<indexterm><primary>DTE</primary></indexterm>
+	      (<acronym>DTE</acronym>) is one of two endpoints in a 
+	      serial communication.  An example would be a computer.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term><acronym>DCE</acronym></term>
 	  <listitem>
-	    <para>An example of a Data Communications Equipment<indexterm><primary>DCE</primary></indexterm>
-	      (<acronym>DTE</acronym>) is a modem.</para>
+	    <para>Data Communications Equipment<indexterm><primary>DCE</primary></indexterm>
+	      (<acronym>DTE</acronym>) is the other endpoint in a 
+	      serial communication.  Typically, it is a modem.</para>
 	  </listitem>
 	</varlistentry>
 
@@ -93,8 +91,8 @@
 	  <term>RS-232</term>
 
 	  <listitem>
-	    <para>The original standard for hardware serial
-	      communications.  It is now usually referred to as
+	    <para>The original standard which defined hardware serial
+	      communications.  It has since been renamed to 
 	      <acronym>TIA</acronym>-232<indexterm><primary>RS-232C cables</primary></indexterm>.</para>
 	  </listitem>
 	</varlistentry>
@@ -105,10 +103,7 @@
 	number of electrical state transitions that may be made in a
 	period of time, while <acronym>bps</acronym> is the
 	<emphasis>correct</emphasis> term to use.</para>
-    </sect2>
 
-    <sect2 id="serial-cables-ports">
-      <title>Cables and Ports</title>
 
       <para>To connect a modem or serial terminal to a &os; system, a
 	serial port on the computer and the proper cable to connect to
@@ -116,17 +111,14 @@
 	with serial hardware and cabling can safely skip this
 	section.</para>
 
-      <sect3 id="term-cables">
-	<title>Cables</title>
+      <sect2 id="term-cables-null">
+	<title>Serial Cables and Ports</title>
 
 	<para>There are several different kinds of serial cables.  The
 	  two most common types are null-modem cables and standard
 	  RS-232 cables.  The documentation for the hardware should
 	  describe the type of cable required.</para>
 
-	<sect4 id="term-cables-null">
-	  <title>Null-modem Cables</title>
-
 	  <indexterm>
 	    <primary>null-modem cable</primary>
 	  </indexterm>
@@ -431,10 +423,6 @@
 	    another variation, SG connects to SG, TD connects to RD,
 	    RTS and CTS connect to DCD, DTR connects to DSR, and
 	    vice-versa.</para>
-	</sect4>
-
-	<sect4 id="term-cables-std">
-	  <title>Standard RS-232C Cables</title>
 
 	  <indexterm><primary>RS-232C cables</primary></indexterm>
 
@@ -445,20 +433,12 @@
 	    This is the type of cable used to connect a modem to
 	    the &os; system, and is also appropriate for some
 	    terminals.</para>
-	</sect4>
-      </sect3>
-
-      <sect3 id="term-ports">
-	<title>Ports</title>
 
 	<para>Serial ports are the devices through which data is
 	  transferred between the &os; host computer and the
 	  terminal.  This section describes the kinds of ports that
 	  exist and how they are addressed in &os;.</para>
 
-	<sect4 id="term-portkinds">
-	  <title>Kinds of Ports</title>
-
 	  <para>Several kinds of serial ports exist.  Before
 	    purchasing or constructing a cable, make sure it will
 	    fit the ports on the terminal and on the &os;
@@ -471,10 +451,6 @@
 	  <para>See the documentation that accompanied the hardware
 	    for specifications on the kind of port or visually verify
 	    the type of port.</para>
-	</sect4>
-
-	<sect4 id="term-portnames">
-	  <title>Port Names</title>
 
 	  <para>In &os;, each serial port is accessed through an
 	    entry in <filename class="directory">/dev</filename>.
@@ -508,9 +484,6 @@
 	    terminal.  If the terminal is on the second serial port
 	    (<devicename>COM2</devicename>), use
 	    <filename>/dev/ttyu1</filename>, and so forth.</para>
-
-	</sect4>
-      </sect3>
     </sect2>
 
     <sect2>
@@ -642,16 +615,17 @@
   </sect1>
 
   <sect1 id="term">
+    <!--
     <sect1info>
       <authorgroup>
 	<author>
 	  <firstname>Sean</firstname>
 	  <surname>Kelly</surname>
-	  <contrib>Contributed by </contrib>
+	  <contrib>Contributed by in July 1996</contrib>
 	</author>
-	<!-- 28 July 1996 -->
       </authorgroup>
     </sect1info>
+    -->
     <title>Terminals</title>
 
     <indexterm><primary>terminals</primary></indexterm>
@@ -661,9 +635,6 @@
       connected network.  This section describes how to use terminals
       with &os;.</para>
 
-    <sect2 id="term-uses">
-      <title>Uses and Types of Terminals</title>
-
       <para>The original &unix; systems did not have consoles.
 	Instead, users logged in and ran programs through terminals
 	that were connected to the computer's serial ports.</para>
@@ -681,13 +652,12 @@
 	otherwise be a single-user computer into a powerful multiple
 	user system.</para>
 
-      <para>This section describes three kinds of terminals supported
-	by &os;: dumb terminals, computers acting as terminals, and X
-	terminals.</para>
-
-      <sect3 id="term-dumb">
-	<title>Dumb Terminals</title>
+      <para>&os; supports three types of terminals:</para>
 
+            <variablelist>
+	<varlistentry>
+	  <term><acronym>Dumb terminals</acronym></term>
+	  <listitem>
 	<para>Dumb terminals are specialized hardware that connect to
 	  computers over serial lines.  They are called
 	  <quote>dumb</quote> because they have only enough
@@ -704,12 +674,13 @@
 
 	<para>Dumb terminals are popular in work environments where
 	  workers do not need access to graphical applications.</para>
-      </sect3>
+      </listitem>
+    </varlistentry>
 
-      <sect3 id="term-pcs">
-	<title>Computers Acting as Terminals</title>
-
-	<para>If a <link linkend="term-dumb">dumb terminal</link> has
+      <varlistentry>
+	<term>Computers Acting as Terminals</term>
+	<listitem>
+	<para>If a dumb terminal has
 	  just enough ability to display, send, and receive text,
 	  any spare computer can be a dumb terminal.  All that is
 	  needed is the proper cable and some <emphasis>terminal
@@ -750,11 +721,12 @@
 	    through the Ports Collection, such as <filename
 	      role="package">comms/minicom</filename>.</para>
 	</note>
-      </sect3>
-
-      <sect3 id="term-x">
-	<title>X Terminals</title>
+      </listitem>
+    </varlistentry>
 
+      <varlistentry>
+	<term>X Terminals</term>
+	<listitem>
 	<para>X terminals are the most sophisticated kind of terminal
 	  available.  Instead of connecting to a serial port, they
 	  usually connect to a network like Ethernet.  Instead of
@@ -763,8 +735,9 @@
 
 	<para>This chapter does <emphasis>not</emphasis> cover the
 	  setup, configuration, or use of X terminals.</para>
-      </sect3>
-    </sect2>
+      </listitem>
+    </varlistentry>
+  </variablelist>
 
     <sect2 id="term-config">
       <title>Configuration</title>
@@ -995,10 +968,7 @@ ttyu5   "/usr/libexec/getty std.19200"  
 	Here is a list of common symptoms and some suggested
 	fixes.</para>
 
-      <sect3>
-	<title>No Login Prompt Appears</title>
-
-	<para>Make sure the terminal is plugged in and powered up.  If
+	<para>If no login prompt appears, make sure the terminal is plugged in and powered up.  If
 	  it is a personal computer acting as a terminal, make sure it
 	  is running terminal emulation software on the correct serial
 	  port.</para>
@@ -1050,33 +1020,22 @@ ttyu5   "/usr/libexec/getty std.19200"  
 	  software flow control enabled when using
 	  <literal>3wire</literal> to prevent buffer overflows.</para>
 
-      </sect3>
-
-      <sect3>
-	<title>If Garbage Appears Instead of a Login Prompt</title>
-
-	<para>Make sure the terminal and &os; agree on the
+	<para>If garbage appears instead of a login prompt, make sure the terminal and &os; agree on the
 	  <acronym>bps</acronym> rate and parity settings.  Check the
 	  <command>getty</command> processes to make sure the correct
 	  <replaceable>getty</replaceable> type is in use.  If not,
 	  edit <filename>/etc/ttys</filename> and run <command>kill
 	    -HUP 1</command>.</para>
 
-      </sect3>
-
-      <sect3>
-	<title>Characters Appear Doubled and the Password Appears When
-	  Typed</title>
-
-	<para>Switch the terminal, or the terminal emulation software,
+	<para>If characters appear doubled and the password appears when
+	  typed, switch the terminal, or the terminal emulation software,
 	  from <quote>half duplex</quote> or <quote>local echo</quote>
 	  to <quote>full duplex.</quote></para>
-
-      </sect3>
     </sect2>
   </sect1>
 
   <sect1 id="dialup">
+    <!--
     <sect1info>
       <authorgroup>
 	<author>
@@ -1093,16 +1052,14 @@ ttyu5   "/usr/libexec/getty std.19200"  
 	</author>
       </authorgroup>
     </sect1info>
+    -->
     <title>Dial-in Service</title>
 
     <indexterm><primary>dial-in service</primary></indexterm>
 
     <para>Configuring a &os; system for dial-in service is similar
       to connecting terminals except that modems are used instead of
-      terminal devices.</para>
-
-    <sect2>
-      <title>External Versus Internal Modems</title>
+      terminal devices.  &os; supports both external and internal modems.</para>
 
       <para>External modems are more convenient for dial-up because
 	they often can be semi-permanently configured via parameters
@@ -1115,9 +1072,6 @@ ttyu5   "/usr/libexec/getty std.19200"  
 	internal modem has any signal indicator lights, they are
 	difficult to view when the system's cover is in place.</para>
 
-      <sect3>
-	<title>Modems and Cables</title>
-
 	<indexterm><primary>modem</primary></indexterm>
 
 	<para>When using an external modem, a proper cable is needed.
@@ -1196,8 +1150,6 @@ ttyu5   "/usr/libexec/getty std.19200"  
 	  the modem after a call.  &os; avoids sending commands to
 	  the modem or watching for status reports from the
 	  modem.</para>
-      </sect3>
-    </sect2>
 
     <sect2>
       <title>Serial Interface Considerations</title>
@@ -1316,19 +1268,12 @@ ttyu5   "/usr/libexec/getty std.19200"  
 	  information on the format of the file and the list of
 	  capabilities.</para>
 
-	<sect4>
-	  <title>Locked-speed Config</title>
-
 	  <para>When locking a modem's data communications rate at a
 	    particular speed, no changes to
 	    <filename>/etc/gettytab</filename> should be
 	    needed.</para>
-	</sect4>
 
-	<sect4>
-	  <title>Matching-speed Config</title>
-
-	  <para>Set up an entry in
+	  <para>However, a change is needed to create a matching-speed configuration.  Create an entry in
 	    <filename>/etc/gettytab</filename> to give
 	    <command>getty</command> information about the speeds to
 	    use for the modem.  For a 2400&nbsp;bps modem, use the
@@ -1402,7 +1347,6 @@ vq|VH57600|Very High Speed Modem at 5760
 	    16550A-based serial ports, there may be
 	    <errorname>sio</errorname>
 	    <quote>silo</quote> errors at 57.6&nbsp;Kbps.</para>
-	</sect4>
       </sect3>
 
       <sect3 id="dialup-ttys">
@@ -1456,9 +1400,6 @@ vq|VH57600|Very High Speed Modem at 5760
 	<para>Wait until the modem is properly configured and
 	  connected before signaling <command>init</command>.</para>
 
-	<sect4>
-	  <title>Locked-speed Config</title>
-
 	  <para>For a locked-speed configuration, the
 	    <filename>ttys</filename> entry needs to have a
 	    fixed-speed entry provided to <command>getty</command>.
@@ -1474,10 +1415,6 @@ vq|VH57600|Very High Speed Modem at 5760
 	    instead of <literal>std.19200</literal>.  Make sure to use
 	    a valid type listed in
 	    <filename>/etc/gettytab</filename>.</para>
-	</sect4>
-
-	<sect4>
-	  <title>Matching-speed Config</title>
 
 	  <para>In a matching-speed configuration, the
 	    <filename>ttys</filename> entry needs to reference the
@@ -1489,7 +1426,6 @@ vq|VH57600|Very High Speed Modem at 5760
 	    this:</para>
 
 	  <programlisting>ttyu0   "/usr/libexec/getty V19200"   dialup on</programlisting>
-	</sect4>
       </sect3>
 
       <sect3>
@@ -1627,9 +1563,6 @@ AT&amp;C1&amp;D2&amp;H1&amp;I0&amp;R2&am
 	conversation between <command>getty</command> and the
 	modem.</para>
 
-      <sect3>
-	<title>Locked-speed Config</title>
-
 	<para>For a locked-speed configuration, configure the modem to
 	  maintain a constant modem-to-computer data rate independent
 	  of the communications rate.  On a &usrobotics; &sportster;
@@ -1639,10 +1572,6 @@ AT&amp;C1&amp;D2&amp;H1&amp;I0&amp;R2&am
 
 	<programlisting>ATZ
 AT&amp;B1&amp;W</programlisting>
-      </sect3>
-
-      <sect3>
-	<title>Matching-speed Config</title>
 
 	<para>For a variable-speed configuration, configure the modem
 	  to adjust its serial port data rate to match the incoming
@@ -1654,7 +1583,6 @@ AT&amp;B1&amp;W</programlisting>
 
 	<programlisting>ATZ
 AT&amp;B2&amp;W</programlisting>
-      </sect3>
 
       <sect3>
 	<title>Checking the Modem's Configuration</title>
@@ -1680,9 +1608,6 @@ AT&amp;B2&amp;W</programlisting>
       <para>Here are a few steps for troubleshooting a dial-up modem
 	on a &os; system.</para>
 
-      <sect3>
-	<title>Checking Out the &os; System</title>
-
 	<para>Hook up the modem to the &os; system, boot the
 	  system, and, if the modem has status indication lights,
 	  watch to see whether the modem's <acronym>DTR</acronym>
@@ -1728,12 +1653,8 @@ AT&amp;B2&amp;W</programlisting>
 	  appropriate device special files,
 	  <filename>/dev/ttyuN</filename>, for any mistakes, missing
 	  entries, or missing device special files.</para>
-      </sect3>
-
-      <sect3>
-	<title>Try Dialing In</title>
 
-	<para>Try dialing into the system.  Be sure to use 8 bits, no
+	<para>Next, try dialing into the system.  Be sure to use 8 bits, no
 	  parity, and 1 stop bit on the remote system.  If a prompt
 	  does not appear right away, or the prompt shows garbage, try
 	  pressing <keycap>Enter</keycap> about once per second.  If
@@ -1776,9 +1697,7 @@ AT&amp;B2&amp;W</programlisting>
 	  it later.  If it still does not work, try sending an
 	  email message to the &a.questions; describing the modem
 	  and the problem.</para>
-      </sect3>
     </sect2>
-
   </sect1>
 
   <sect1 id="dialout">
@@ -2066,6 +1985,7 @@ raisechar=^^</programlisting>
   </sect1>
 
   <sect1 id="serialconsole-setup">
+    <!--
     <sect1info>
       <authorgroup>
 	<author>
@@ -2082,13 +2002,11 @@ raisechar=^^</programlisting>
 	</author>
       </authorgroup>
     </sect1info>
+    -->
     <title>Setting Up the Serial Console</title>
 
     <indexterm><primary>serial console</primary></indexterm>
 
-    <sect2 id="serialconsole-intro">
-      <title>Introduction</title>
-
       <para>&os; has the ability to boot a system with a dumb
 	terminal on a serial port as a console.  This configuration is
 	useful for system administrators who wish to install &os; on
@@ -2106,8 +2024,6 @@ raisechar=^^</programlisting>
 	boot block code, the boot loader code, and the kernel need to
 	be configured.</para>
 
-    </sect2>
-
     <sect2 id="serialconsole-howto-fast">
       <title>Quick Serial Console Configuration</title>
 
@@ -2160,7 +2076,7 @@ raisechar=^^</programlisting>
 
 	  <para>Use either a null-modem cable or a standard serial
 	    cable and a null-modem adapter.  See <xref
-	      linkend="serial-cables-ports"/> for a discussion
+	      linkend="term-cables-null"/> for a discussion
 	    on serial cables.</para>
 	</step>
 
@@ -2482,16 +2398,12 @@ boot:</screen>
     <sect2 id="serialconsole-summary">
       <title>Summary</title>
 
-      <para>Here is the summary of the various settings discussed in
-	this section:</para>
+      <para>The following tables provide a summary of the various settings discussed in
+	this section.</para>
 
-      <sect3>
-	<title>Case 1: Set the Flags to 0x10 for
+	<table frame="none" pgwide="1">
+	  <title>Case 1: Set the Flags to 0x10 for
 	  <devicename>sio0</devicename></title>
-
-	<programlisting>device sio0 flags 0x10</programlisting>
-
-	<informaltable frame="none" pgwide="1">
 	  <tgroup cols="4">
 	    <thead>
 	      <row>
@@ -2546,16 +2458,11 @@ boot:</screen>
 	      </row>
 	    </tbody>
 	  </tgroup>
-	</informaltable>
-      </sect3>
+	</table>
 
-      <sect3>
-	<title>Case 2: Set the Flags to 0x30 for
+	<table frame="none" pgwide="1">
+	  <title>Case 2: Set the Flags to 0x30 for
 	  <devicename>sio0</devicename></title>
-
-	<programlisting>device sio0 flags 0x30</programlisting>
-
-	<informaltable frame="none" pgwide="1">
 	  <tgroup cols="4">
 	    <thead>
 	      <row>
@@ -2610,8 +2517,7 @@ boot:</screen>
 	      </row>
 	    </tbody>
 	  </tgroup>
-	</informaltable>
-      </sect3>
+	</table>
     </sect2>
 
     <sect2 id="serialconsole-tips">

From owner-svn-doc-head@FreeBSD.ORG  Thu Oct 17 17:08:29 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 908AC4EA;
 Thu, 17 Oct 2013 17:08: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 7CBE121F6;
 Thu, 17 Oct 2013 17:08: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 r9HH8TBM015224;
 Thu, 17 Oct 2013 17:08:29 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9HH8TWk015223;
 Thu, 17 Oct 2013 17:08:29 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310171708.r9HH8TWk015223@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 17 Oct 2013 17:08:29 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42985 - head/en_US.ISO8859-1/books/handbook/serialcomms
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Oct 2013 17:08:29 -0000

Author: dru
Date: Thu Oct 17 17:08:29 2013
New Revision: 42985
URL: http://svnweb.freebsd.org/changeset/doc/42985

Log:
  White space fix only. Translators can ignore.
  
  To be followed by a quick typo fix.

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

Modified: head/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml	Thu Oct 17 15:42:25 2013	(r42984)
+++ head/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml	Thu Oct 17 17:08:29 2013	(r42985)
@@ -59,30 +59,36 @@
   <sect1 id="serial">
     <title>Serial Terminology and Hardware</title>
 
-    <para>The following terms are often used in serial commnications:</para>
-      <variablelist>
-	<varlistentry>
-	  <term><acronym>bps</acronym></term>
+    <para>The following terms are often used in serial
+      commnications:</para>
+    <variablelist>
+      <varlistentry>
+	<term><acronym>bps</acronym></term>
 	  <listitem>
-	    <para>Bits per Second<indexterm><primary>bits-per-second</primary></indexterm> (<acronym>bps</acronym>) is the rate
-	      at which data is transmitted.</para>
+	    <para>Bits per
+	      Second<indexterm><primary>bits-per-second</primary></indexterm>
+	      (<acronym>bps</acronym>) is the rate at which data is
+	      transmitted.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term><acronym>DTE</acronym></term>
 	  <listitem>
-	    <para>Data Terminal Equipment<indexterm><primary>DTE</primary></indexterm>
-	      (<acronym>DTE</acronym>) is one of two endpoints in a 
-	      serial communication.  An example would be a computer.</para>
+	    <para>Data Terminal
+	      Equipment<indexterm><primary>DTE</primary></indexterm>
+	      (<acronym>DTE</acronym>) is one of two endpoints in a
+	      serial communication.  An example would be a
+	      computer.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term><acronym>DCE</acronym></term>
 	  <listitem>
-	    <para>Data Communications Equipment<indexterm><primary>DCE</primary></indexterm>
-	      (<acronym>DTE</acronym>) is the other endpoint in a 
+	    <para>Data Communications
+	      Equipment<indexterm><primary>DCE</primary></indexterm>
+	      (<acronym>DTE</acronym>) is the other endpoint in a
 	      serial communication.  Typically, it is a modem.</para>
 	  </listitem>
 	</varlistentry>
@@ -92,8 +98,9 @@
 
 	  <listitem>
 	    <para>The original standard which defined hardware serial
-	      communications.  It has since been renamed to 
-	      <acronym>TIA</acronym>-232<indexterm><primary>RS-232C cables</primary></indexterm>.</para>
+	      communications.  It has since been renamed to
+	      <acronym>TIA</acronym>-232<indexterm><primary>RS-232C
+		cables</primary></indexterm>.</para>
 	  </listitem>
 	</varlistentry>
       </variablelist>
@@ -104,7 +111,6 @@
 	period of time, while <acronym>bps</acronym> is the
 	<emphasis>correct</emphasis> term to use.</para>
 
-
       <para>To connect a modem or serial terminal to a &os; system, a
 	serial port on the computer and the proper cable to connect to
 	the serial device are needed.  Users who are already familiar
@@ -119,372 +125,372 @@
 	  RS-232 cables.  The documentation for the hardware should
 	  describe the type of cable required.</para>
 
-	  <indexterm>
-	    <primary>null-modem cable</primary>
-	  </indexterm>
-
-	  <para>A null-modem cable passes some signals, such as
-	    <quote>Signal Ground</quote>, straight through, but
-	    switches other signals.  For example, the
-	    <quote>Transmitted Data</quote> pin on one end goes to the
-	    <quote>Received Data</quote> pin on the other end.</para>
-
-	  <para>A null-modem cable can be constructed for use with
-	    terminals.  The following table shows the RS-232C <link
-	      linkend="serialcomms-signal-names">signal names</link>
-	    and the pin numbers on a DB-25 connector.  While the
-	    standard calls for a straight-through pin 1 to pin 1
-	    <emphasis>Protective Ground</emphasis> line, it is often
-	    omitted.  Some terminals work using only pins 2, 3, and
-	    7, while others require different configurations than
-	    the examples shown below.</para>
+	<indexterm>
+	  <primary>null-modem cable</primary>
+	</indexterm>
 
-	  <table frame="none" pgwide="1">
-	    <title>DB-25 to DB-25 Null-Modem Cable</title>
+	<para>A null-modem cable passes some signals, such as
+	  <quote>Signal Ground</quote>, straight through, but
+	  switches other signals.  For example, the
+	  <quote>Transmitted Data</quote> pin on one end goes to the
+	  <quote>Received Data</quote> pin on the other end.</para>
+
+	<para>A null-modem cable can be constructed for use with
+	  terminals.  The following table shows the RS-232C <link
+	    linkend="serialcomms-signal-names">signal names</link>
+	  and the pin numbers on a DB-25 connector.  While the
+	  standard calls for a straight-through pin 1 to pin 1
+	  <emphasis>Protective Ground</emphasis> line, it is often
+	  omitted.  Some terminals work using only pins 2, 3, and
+	  7, while others require different configurations than
+	  the examples shown below.</para>
 
-	    <tgroup cols="5">
-	      <thead>
-		<row>
-		  <entry align="left">Signal</entry>
-		  <entry align="left">Pin #</entry>
-		  <entry></entry>
-		  <entry align="left">Pin #</entry>
-		  <entry align="left">Signal</entry>
-		</row>
-	      </thead>
+	<table frame="none" pgwide="1">
+	  <title>DB-25 to DB-25 Null-Modem Cable</title>
 
-	      <tbody>
-		<row>
-		  <entry>SG</entry>
-		  <entry>7</entry>
-		  <entry>connects to</entry>
-		  <entry>7</entry>
-		  <entry>SG</entry>
-		</row>
+	  <tgroup cols="5">
+	    <thead>
+	      <row>
+		<entry align="left">Signal</entry>
+		<entry align="left">Pin #</entry>
+		<entry></entry>
+		<entry align="left">Pin #</entry>
+		<entry align="left">Signal</entry>
+	      </row>
+	    </thead>
 
-		<row>
-		  <entry>TD</entry>
-		  <entry>2</entry>
-		  <entry>connects to</entry>
-		  <entry>3</entry>
-		  <entry>RD</entry>
-		</row>
+	    <tbody>
+	      <row>
+		<entry>SG</entry>
+		<entry>7</entry>
+		<entry>connects to</entry>
+		<entry>7</entry>
+		<entry>SG</entry>
+	      </row>
 
-		<row>
-		  <entry>RD</entry>
-		  <entry>3</entry>
-		  <entry>connects to</entry>
-		  <entry>2</entry>
-		  <entry>TD</entry>
-		</row>
+	      <row>
+		<entry>TD</entry>
+		<entry>2</entry>
+		<entry>connects to</entry>
+		<entry>3</entry>
+		<entry>RD</entry>
+	      </row>
 
-		<row>
-		  <entry>RTS</entry>
-		  <entry>4</entry>
-		  <entry>connects to</entry>
-		  <entry>5</entry>
-		  <entry>CTS</entry>
-		</row>
+	      <row>
+		<entry>RD</entry>
+		<entry>3</entry>
+		<entry>connects to</entry>
+		<entry>2</entry>
+		<entry>TD</entry>
+	      </row>
 
-		<row>
-		  <entry>CTS</entry>
-		  <entry>5</entry>
-		  <entry>connects to</entry>
-		  <entry>4</entry>
-		  <entry>RTS</entry>
-		</row>
+	      <row>
+		<entry>RTS</entry>
+		<entry>4</entry>
+		<entry>connects to</entry>
+		<entry>5</entry>
+		<entry>CTS</entry>
+	      </row>
 
-		<row>
-		  <entry>DTR</entry>
-		  <entry>20</entry>
-		  <entry>connects to</entry>
-		  <entry>6</entry>
-		  <entry>DSR</entry>
-		</row>
+	      <row>
+		<entry>CTS</entry>
+		<entry>5</entry>
+		<entry>connects to</entry>
+		<entry>4</entry>
+		<entry>RTS</entry>
+	      </row>
 
-		<row>
-		  <entry>DTR</entry>
-		  <entry>20</entry>
-		  <entry>connects to</entry>
-		  <entry>8</entry>
-		  <entry>DCD</entry>
-		</row>
+	      <row>
+		<entry>DTR</entry>
+		<entry>20</entry>
+		<entry>connects to</entry>
+		<entry>6</entry>
+		<entry>DSR</entry>
+	      </row>
 
-		<row>
-		  <entry>DSR</entry>
-		  <entry>6</entry>
-		  <entry>connects to</entry>
-		  <entry>20</entry>
-		  <entry>DTR</entry>
-		</row>
+	      <row>
+		<entry>DTR</entry>
+		<entry>20</entry>
+		<entry>connects to</entry>
+		<entry>8</entry>
+		<entry>DCD</entry>
+	      </row>
 
-		<row>
-		  <entry>DCD</entry>
-		  <entry>8</entry>
-		  <entry>connects to</entry>
-		  <entry>20</entry>
-		  <entry>DTR</entry>
-		</row>
-	      </tbody>
-	    </tgroup>
-	  </table>
+	      <row>
+		<entry>DSR</entry>
+		<entry>6</entry>
+		<entry>connects to</entry>
+		<entry>20</entry>
+		<entry>DTR</entry>
+	      </row>
 
-	  <para>The next two tables show two other common
-	    schemes.</para>
+	      <row>
+		<entry>DCD</entry>
+		<entry>8</entry>
+		<entry>connects to</entry>
+		<entry>20</entry>
+		<entry>DTR</entry>
+	      </row>
+	    </tbody>
+	  </tgroup>
+	</table>
 
-	  <table frame="none" pgwide="1">
-	    <title>DB-9 to DB-9 Null-Modem Cable</title>
+	<para>The next two tables show two other common
+	  schemes.</para>
 
-	    <tgroup cols="5">
-	      <thead>
-		<row>
-		  <entry align="left">Signal</entry>
-		  <entry align="left">Pin #</entry>
-		  <entry></entry>
-		  <entry align="left">Pin #</entry>
-		  <entry align="left">Signal</entry>
-		</row>
-	      </thead>
+	<table frame="none" pgwide="1">
+	  <title>DB-9 to DB-9 Null-Modem Cable</title>
 
-	      <tbody>
-		<row>
-		  <entry>RD</entry>
-		  <entry>2</entry>
-		  <entry>connects to</entry>
-		  <entry>3</entry>
-		  <entry>TD</entry>
-		</row>
+	  <tgroup cols="5">
+	    <thead>
+	      <row>
+		<entry align="left">Signal</entry>
+		<entry align="left">Pin #</entry>
+		<entry></entry>
+		<entry align="left">Pin #</entry>
+		<entry align="left">Signal</entry>
+	      </row>
+	    </thead>
 
-		<row>
-		  <entry>TD</entry>
-		  <entry>3</entry>
-		  <entry>connects to</entry>
-		  <entry>2</entry>
-		  <entry>RD</entry>
-		</row>
+	    <tbody>
+	      <row>
+		<entry>RD</entry>
+		<entry>2</entry>
+		<entry>connects to</entry>
+		<entry>3</entry>
+		<entry>TD</entry>
+	      </row>
 
-		<row>
-		  <entry>DTR</entry>
-		  <entry>4</entry>
-		  <entry>connects to</entry>
-		  <entry>6</entry>
-		  <entry>DSR</entry>
-		</row>
+	      <row>
+		<entry>TD</entry>
+		<entry>3</entry>
+		<entry>connects to</entry>
+		<entry>2</entry>
+		<entry>RD</entry>
+	      </row>
 
-		<row>
-		  <entry>DTR</entry>
-		  <entry>4</entry>
-		  <entry>connects to</entry>
-		  <entry>1</entry>
-		  <entry>DCD</entry>
-		</row>
+	      <row>
+		<entry>DTR</entry>
+		<entry>4</entry>
+		<entry>connects to</entry>
+		<entry>6</entry>
+		<entry>DSR</entry>
+	      </row>
 
-		<row>
-		  <entry>SG</entry>
-		  <entry>5</entry>
-		  <entry>connects to</entry>
-		  <entry>5</entry>
-		  <entry>SG</entry>
-		</row>
+	      <row>
+		<entry>DTR</entry>
+		<entry>4</entry>
+		<entry>connects to</entry>
+		<entry>1</entry>
+		<entry>DCD</entry>
+	      </row>
 
-		<row>
-		  <entry>DSR</entry>
-		  <entry>6</entry>
-		  <entry>connects to</entry>
-		  <entry>4</entry>
-		  <entry>DTR</entry>
-		</row>
+	      <row>
+		<entry>SG</entry>
+		<entry>5</entry>
+		<entry>connects to</entry>
+		<entry>5</entry>
+		<entry>SG</entry>
+	      </row>
 
-		<row>
-		  <entry>DCD</entry>
-		  <entry>1</entry>
-		  <entry>connects to</entry>
-		  <entry>4</entry>
-		  <entry>DTR</entry>
-		</row>
+	      <row>
+		<entry>DSR</entry>
+		<entry>6</entry>
+		<entry>connects to</entry>
+		<entry>4</entry>
+		<entry>DTR</entry>
+	      </row>
 
-		<row>
-		  <entry>RTS</entry>
-		  <entry>7</entry>
-		  <entry>connects to</entry>
-		  <entry>8</entry>
-		  <entry>CTS</entry>
-		</row>
+	      <row>
+		<entry>DCD</entry>
+		<entry>1</entry>
+		<entry>connects to</entry>
+		<entry>4</entry>
+		<entry>DTR</entry>
+	      </row>
 
-		<row>
-		  <entry>CTS</entry>
-		  <entry>8</entry>
-		  <entry>connects to</entry>
-		  <entry>7</entry>
-		  <entry>RTS</entry>
-		</row>
-	      </tbody>
-	    </tgroup>
-	  </table>
+	      <row>
+		<entry>RTS</entry>
+		<entry>7</entry>
+		<entry>connects to</entry>
+		<entry>8</entry>
+		<entry>CTS</entry>
+	      </row>
 
-	  <table frame="none" pgwide="1">
-	    <title>DB-9 to DB-25 Null-Modem Cable</title>
+	      <row>
+		<entry>CTS</entry>
+		<entry>8</entry>
+		<entry>connects to</entry>
+		<entry>7</entry>
+		<entry>RTS</entry>
+	      </row>
+	    </tbody>
+	  </tgroup>
+	</table>
 
-	    <tgroup cols="5">
-	      <thead>
-		<row>
-		  <entry align="left">Signal</entry>
-		  <entry align="left">Pin #</entry>
-		  <entry></entry>
-		  <entry align="left">Pin #</entry>
-		  <entry align="left">Signal</entry>
-		</row>
-	      </thead>
+	<table frame="none" pgwide="1">
+	  <title>DB-9 to DB-25 Null-Modem Cable</title>
 
-	      <tbody>
-		<row>
-		  <entry>RD</entry>
-		  <entry>2</entry>
-		  <entry>connects to</entry>
-		  <entry>2</entry>
-		  <entry>TD</entry>
-		</row>
+	  <tgroup cols="5">
+	    <thead>
+	      <row>
+		<entry align="left">Signal</entry>
+		<entry align="left">Pin #</entry>
+		<entry></entry>
+		<entry align="left">Pin #</entry>
+		<entry align="left">Signal</entry>
+	      </row>
+	    </thead>
 
-		<row>
-		  <entry>TD</entry>
-		  <entry>3</entry>
-		  <entry>connects to</entry>
-		  <entry>3</entry>
-		  <entry>RD</entry>
-		</row>
+	    <tbody>
+	      <row>
+		<entry>RD</entry>
+		<entry>2</entry>
+		<entry>connects to</entry>
+		<entry>2</entry>
+		<entry>TD</entry>
+	      </row>
 
-		<row>
-		  <entry>DTR</entry>
-		  <entry>4</entry>
-		  <entry>connects to</entry>
-		  <entry>6</entry>
-		  <entry>DSR</entry>
-		</row>
+	      <row>
+		<entry>TD</entry>
+		<entry>3</entry>
+		<entry>connects to</entry>
+		<entry>3</entry>
+		<entry>RD</entry>
+	      </row>
 
-		<row>
-		  <entry>DTR</entry>
-		  <entry>4</entry>
-		  <entry>connects to</entry>
-		  <entry>8</entry>
-		  <entry>DCD</entry>
-		</row>
+	      <row>
+		<entry>DTR</entry>
+		<entry>4</entry>
+		<entry>connects to</entry>
+		<entry>6</entry>
+		<entry>DSR</entry>
+	      </row>
 
-		<row>
-		  <entry>SG</entry>
-		  <entry>5</entry>
-		  <entry>connects to</entry>
-		  <entry>7</entry>
-		  <entry>SG</entry>
-		</row>
+	      <row>
+		<entry>DTR</entry>
+		<entry>4</entry>
+		<entry>connects to</entry>
+		<entry>8</entry>
+		<entry>DCD</entry>
+	      </row>
 
-		<row>
-		  <entry>DSR</entry>
-		  <entry>6</entry>
-		  <entry>connects to</entry>
-		  <entry>20</entry>
-		  <entry>DTR</entry>
-		</row>
+	      <row>
+		<entry>SG</entry>
+		<entry>5</entry>
+		<entry>connects to</entry>
+		<entry>7</entry>
+		<entry>SG</entry>
+	      </row>
 
-		<row>
-		  <entry>DCD</entry>
-		  <entry>1</entry>
-		  <entry>connects to</entry>
-		  <entry>20</entry>
-		  <entry>DTR</entry>
-		</row>
+	      <row>
+		<entry>DSR</entry>
+		<entry>6</entry>
+		<entry>connects to</entry>
+		<entry>20</entry>
+		<entry>DTR</entry>
+	      </row>
 
-		<row>
-		  <entry>RTS</entry>
-		  <entry>7</entry>
-		  <entry>connects to</entry>
-		  <entry>5</entry>
-		  <entry>CTS</entry>
-		</row>
+	      <row>
+		<entry>DCD</entry>
+		<entry>1</entry>
+		<entry>connects to</entry>
+		<entry>20</entry>
+		<entry>DTR</entry>
+	      </row>
 
-		<row>
-		  <entry>CTS</entry>
-		  <entry>8</entry>
-		  <entry>connects to</entry>
-		  <entry>4</entry>
-		  <entry>RTS</entry>
-		</row>
-	      </tbody>
-	    </tgroup>
-	  </table>
+	      <row>
+		<entry>RTS</entry>
+		<entry>7</entry>
+		<entry>connects to</entry>
+		<entry>5</entry>
+		<entry>CTS</entry>
+	      </row>
 
-	  <note>
-	    <para>When one pin at one end connects to a pair of pins
-	      at the other end, it is usually implemented with one
-	      short wire between the pair of pins in their connector
-	      and a long wire to the other single pin.</para>
-	  </note>
+	      <row>
+		<entry>CTS</entry>
+		<entry>8</entry>
+		<entry>connects to</entry>
+		<entry>4</entry>
+		<entry>RTS</entry>
+	      </row>
+	    </tbody>
+	  </tgroup>
+	</table>
+
+	<note>
+	  <para>When one pin at one end connects to a pair of pins
+	    at the other end, it is usually implemented with one
+	    short wire between the pair of pins in their connector
+	    and a long wire to the other single pin.</para>
+	</note>
 
-	  <para>The above designs seem to be the most popular.  In
-	    another variation, SG connects to SG, TD connects to RD,
-	    RTS and CTS connect to DCD, DTR connects to DSR, and
-	    vice-versa.</para>
-
-	  <indexterm><primary>RS-232C cables</primary></indexterm>
-
-	  <para>A standard serial cable passes all of the RS-232C
-	    signals straight through.  The <quote>Transmitted
-	      Data</quote> pin on one end of the cable goes to the
-	    <quote>Transmitted Data</quote> pin on the other end.
-	    This is the type of cable used to connect a modem to
-	    the &os; system, and is also appropriate for some
-	    terminals.</para>
+	<para>The above designs seem to be the most popular.  In
+	  another variation, SG connects to SG, TD connects to RD,
+	  RTS and CTS connect to DCD, DTR connects to DSR, and
+	  vice-versa.</para>
+
+	<indexterm><primary>RS-232C cables</primary></indexterm>
+
+	<para>A standard serial cable passes all of the RS-232C
+	  signals straight through.  The <quote>Transmitted
+	    Data</quote> pin on one end of the cable goes to the
+	  <quote>Transmitted Data</quote> pin on the other end.
+	  This is the type of cable used to connect a modem to
+	  the &os; system, and is also appropriate for some
+	  terminals.</para>
 
 	<para>Serial ports are the devices through which data is
 	  transferred between the &os; host computer and the
 	  terminal.  This section describes the kinds of ports that
 	  exist and how they are addressed in &os;.</para>
 
-	  <para>Several kinds of serial ports exist.  Before
-	    purchasing or constructing a cable, make sure it will
-	    fit the ports on the terminal and on the &os;
-	    system.</para>
-
-	  <para>Most terminals have DB-25 ports.  Personal computers
-	    may have DB-25 or DB-9 ports.  A multiport serial card may
-	    have RJ-12 or RJ-45 ports.</para>
-
-	  <para>See the documentation that accompanied the hardware
-	    for specifications on the kind of port or visually verify
-	    the type of port.</para>
-
-	  <para>In &os;, each serial port is accessed through an
-	    entry in <filename class="directory">/dev</filename>.
-	    There are two different kinds of entries:</para>
-
-	  <itemizedlist>
-	    <listitem>
-	      <para>Call-in ports are named
-		<filename>/dev/ttyu<replaceable>N</replaceable></filename>
-		where <replaceable>N</replaceable> is the port number,
-		starting from zero.  Generally, the call-in port is
-		used for terminals.  Call-in ports require that the
-		serial line assert the Data Carrier Detect
-		(<acronym>DCD</acronym>) signal to work
-		correctly.</para>
-	    </listitem>
-
-	    <listitem>
-	      <para>Call-out ports are named
-		<filename>/dev/cuau<replaceable>N</replaceable></filename>.
-		Call-out ports are usually not used for terminals, but
-		are used for modems.  The call-out port can be used if
-		the serial cable or the terminal does not support the
-		carrier detect signal.</para>
-	    </listitem>
-	  </itemizedlist>
-
-	  <para>If a terminal is connected to the first serial
-	    port(<devicename>COM1</devicename>), use
-	    <filename>/dev/ttyu0</filename> to refer to the
-	    terminal.  If the terminal is on the second serial port
-	    (<devicename>COM2</devicename>), use
-	    <filename>/dev/ttyu1</filename>, and so forth.</para>
-    </sect2>
+	<para>Several kinds of serial ports exist.  Before
+	  purchasing or constructing a cable, make sure it will
+	  fit the ports on the terminal and on the &os;
+	  system.</para>
+
+	<para>Most terminals have DB-25 ports.  Personal computers
+	  may have DB-25 or DB-9 ports.  A multiport serial card may
+	  have RJ-12 or RJ-45 ports.</para>
+
+	<para>See the documentation that accompanied the hardware
+	  for specifications on the kind of port or visually verify
+	  the type of port.</para>
+
+	<para>In &os;, each serial port is accessed through an
+	  entry in <filename class="directory">/dev</filename>.
+	  There are two different kinds of entries:</para>
+
+	<itemizedlist>
+	  <listitem>
+	    <para>Call-in ports are named
+	      <filename>/dev/ttyu<replaceable>N</replaceable></filename>
+	      where <replaceable>N</replaceable> is the port number,
+	      starting from zero.  Generally, the call-in port is
+	      used for terminals.  Call-in ports require that the
+	      serial line assert the Data Carrier Detect
+	      (<acronym>DCD</acronym>) signal to work
+	      correctly.</para>
+	  </listitem>
+
+	  <listitem>
+	    <para>Call-out ports are named
+	      <filename>/dev/cuau<replaceable>N</replaceable></filename>.
+	      Call-out ports are usually not used for terminals, but
+	      are used for modems.  The call-out port can be used if
+	      the serial cable or the terminal does not support the
+	      carrier detect signal.</para>
+	  </listitem>
+	</itemizedlist>
+
+	<para>If a terminal is connected to the first serial
+	  port(<devicename>COM1</devicename>), use
+	  <filename>/dev/ttyu0</filename> to refer to the
+	  terminal.  If the terminal is on the second serial port
+	  (<devicename>COM2</devicename>), use
+	  <filename>/dev/ttyu1</filename>, and so forth.</para>
+      </sect2>
 
     <sect2>
       <title>Kernel Configuration</title>
@@ -635,109 +641,110 @@
       connected network.  This section describes how to use terminals
       with &os;.</para>
 
-      <para>The original &unix; systems did not have consoles.
-	Instead, users logged in and ran programs through terminals
-	that were connected to the computer's serial ports.</para>
-
-      <para>The ability to establish a login session on a serial port
-	still exists in nearly every &unix;-like operating system
-	today, including &os;.  By using a terminal attached to an
-	unused serial port, a user can log in and run any text program
-	that can normally be run on the console or in an
-	<command>xterm</command> window.</para>
-
-      <para>Many terminals can be attached to a &os; system.  An older
-	spare computer can be used as a terminal wired into a more
-	powerful computer running &os;.  This can turn what might
-	otherwise be a single-user computer into a powerful multiple
-	user system.</para>
-
-      <para>&os; supports three types of terminals:</para>
+    <para>The original &unix; systems did not have consoles.
+      Instead, users logged in and ran programs through terminals
+      that were connected to the computer's serial ports.</para>
+
+    <para>The ability to establish a login session on a serial port
+      still exists in nearly every &unix;-like operating system
+      today, including &os;.  By using a terminal attached to an
+      unused serial port, a user can log in and run any text program
+      that can normally be run on the console or in an
+      <command>xterm</command> window.</para>
+
+    <para>Many terminals can be attached to a &os; system.  An older
+      spare computer can be used as a terminal wired into a more
+      powerful computer running &os;.  This can turn what might
+      otherwise be a single-user computer into a powerful multiple
+      user system.</para>
+
+    <para>&os; supports three types of terminals:</para>
+    <term><acronym>Dumb terminals</acronym></term>
+    <term>Computers Acting as Terminals</term>
 
-            <variablelist>
-	<varlistentry>
-	  <term><acronym>Dumb terminals</acronym></term>
-	  <listitem>
-	<para>Dumb terminals are specialized hardware that connect to
-	  computers over serial lines.  They are called
-	  <quote>dumb</quote> because they have only enough
-	  computational power to display, send, and receive text.  No
-	  programs can be run on these devices.  Dumb terminals
-	  connect to a computer that has all the power to run text
-	  editors, compilers, email, games, and so forth.</para>
-
-	<para>There are hundreds of kinds of dumb terminals made by
-	  many manufacturers, and just about any kind will work with
-	  &os;.  Some high-end terminals can even display graphics,
-	  but only certain software packages can take advantage of
-	  these advanced features.</para>
-
-	<para>Dumb terminals are popular in work environments where
-	  workers do not need access to graphical applications.</para>
-      </listitem>
-    </varlistentry>
+    <variablelist>
+      <varlistentry>
+	<listitem>
+	  <para>Dumb terminals are specialized hardware that connect
+	    to computers over serial lines.  They are called
+	    <quote>dumb</quote> because they have only enough
+	    computational power to display, send, and receive text.
+	    No programs can be run on these devices.  Dumb terminals
+	    connect to a computer that has all the power to run text
+	    editors, compilers, email, games, and so forth.</para>
+
+	  <para>There are hundreds of kinds of dumb terminals made
+	    by many manufacturers, and just about any kind will work
+	    with &os;.  Some high-end terminals can even display
+	    graphics, but only certain software packages can take
+	    advantage of these advanced features.</para>
+
+	  <para>Dumb terminals are popular in work environments
+	    where workers do not need access to graphical
+	    applications.</para>
+	</listitem>
+      </varlistentry>
 
       <varlistentry>
-	<term>Computers Acting as Terminals</term>
 	<listitem>
-	<para>If a dumb terminal has
-	  just enough ability to display, send, and receive text,
-	  any spare computer can be a dumb terminal.  All that is
-	  needed is the proper cable and some <emphasis>terminal
+	  <para>If a dumb terminal has just enough ability to
+	    display, send, and receive text, any spare computer can
+	    be a dumb terminal.  All that is needed is the proper
+	    cable and some <emphasis>terminal
 	    emulation</emphasis> software to run on the
-	  computer.</para>
+	    computer.</para>
 
-	<para>This configuration can be useful.  For example, if one
-	  user is busy working at the &os; system's console, another
-	  user can do some text-only work at the same time from a
-	  less powerful personal computer hooked up as a terminal to
-	  the &os; system.</para>
-
-	<para>There are at least two utilities in the base-system of
-	  &os; that can be used to work through a serial connection:
-	  &man.cu.1; and &man.tip.1;.</para>
-
-	<para>To connect from a client system that runs &os; to the
-	  serial connection of another system, use:</para>
-
-	<screen>&prompt.root; <userinput>cu -l <replaceable>serial-port-device</replaceable></userinput></screen>
-
-	<para>Where <quote>serial-port-device</quote> is the name of a
-	  special device file denoting a serial port on the system.
-	  These device files are called
-	  <devicename>/dev/cuau<replaceable>N</replaceable></devicename>.</para>
+	  <para>This configuration can be useful.  For example, if one
+	    user is busy working at the &os; system's console, another
+	    user can do some text-only work at the same time from a
+	    less powerful personal computer hooked up as a terminal to
+	    the &os; system.</para>
+
+	  <para>There are at least two utilities in the base-system of
+	    &os; that can be used to work through a serial connection:
+	    &man.cu.1; and &man.tip.1;.</para>
+
+	  <para>To connect from a client system that runs &os; to the
+	    serial connection of another system, use:</para>
+
+	  <screen>&prompt.root; <userinput>cu -l <replaceable>serial-port-device</replaceable></userinput></screen>
+
+	  <para>Where <quote>serial-port-device</quote> is the name of
+	    a special device file denoting a serial port on the
+	    system.  These device files are called
+	    <devicename>/dev/cuau<replaceable>N</replaceable></devicename>.</para>
 
-	<para>The <quote>N</quote>-part of a device name is the serial
-	  port number.</para>
+	  <para>The <quote>N</quote>-part of a device name is the
+	    serial port number.</para>
 
-	<note>
-	  <para>Note that device numbers in &os; start from zero and
-	    not one.  This means that <devicename>COM1</devicename> is
-	    <filename>/dev/cuau0</filename> in &os;.</para>
-	</note>
+	  <note>
+	    <para>Note that device numbers in &os; start from zero and
+	      not one.  This means that <devicename>COM1</devicename>
+	      is <filename>/dev/cuau0</filename> in &os;.</para>
+	  </note>
 
-	<note>
-	  <para>Some people prefer to use other programs available
-	    through the Ports Collection, such as <filename
-	      role="package">comms/minicom</filename>.</para>
-	</note>
-      </listitem>
-    </varlistentry>
+	  <note>
+	    <para>Some people prefer to use other programs available
+	      through the Ports Collection, such as <filename
+		role="package">comms/minicom</filename>.</para>
+	  </note>
+	</listitem>
+      </varlistentry>
 
       <varlistentry>
 	<term>X Terminals</term>
 	<listitem>
-	<para>X terminals are the most sophisticated kind of terminal
-	  available.  Instead of connecting to a serial port, they
-	  usually connect to a network like Ethernet.  Instead of
-	  being relegated to text-only applications, they can display
-	  any X application.</para>
-
-	<para>This chapter does <emphasis>not</emphasis> cover the
-	  setup, configuration, or use of X terminals.</para>
-      </listitem>
-    </varlistentry>
-  </variablelist>
+	  <para>X terminals are the most sophisticated kind of
+	    terminal available.  Instead of connecting to a serial
+	    port, they usually connect to a network like Ethernet.
+	    Instead of being relegated to text-only applications, they
+	    can display any X application.</para>
+
+	  <para>This chapter does <emphasis>not</emphasis> cover the
+	    setup, configuration, or use of X terminals.</para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
 
     <sect2 id="term-config">
       <title>Configuration</title>
@@ -968,69 +975,70 @@ ttyu5   "/usr/libexec/getty std.19200"  
 	Here is a list of common symptoms and some suggested
 	fixes.</para>
 
-	<para>If no login prompt appears, make sure the terminal is plugged in and powered up.  If
-	  it is a personal computer acting as a terminal, make sure it
-	  is running terminal emulation software on the correct serial
-	  port.</para>
-
-	<para>Make sure the cable is connected firmly to both the
-	  terminal and the &os; computer.  Make sure it is the
-	  right kind of cable.</para>
-
-	<para>Make sure the terminal and &os; agree on the
-	  <acronym>bps</acronym> rate and parity settings.  For a
-	  video display terminal, make sure the contrast and
-	  brightness controls are turned up.  If it is a printing
-	  terminal, make sure paper and ink are in good supply.</para>
-
-	<para>Make sure that a <command>getty</command> process is
-	  running and serving the terminal.  For example, to get a
-	  list of running <command>getty</command> processes with
-	  <command>ps</command>, type:</para>
-
-	<screen>&prompt.root; <userinput>ps -axww|grep getty</userinput></screen>
-
-	<para>There should be an entry for the terminal.  For example,
-	  the following display shows that a
-	  <command>getty</command> is running on the second serial
-	  port, <devicename>ttyu1</devicename>, and is using the
-	  <literal>std.38400</literal> entry in
-	  <filename>/etc/gettytab</filename>:</para>

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

From owner-svn-doc-head@FreeBSD.ORG  Thu Oct 17 17:09:15 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id CCB29580;
 Thu, 17 Oct 2013 17:09:15 +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 BACDC21FD;
 Thu, 17 Oct 2013 17:09: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 r9HH9FA1015620;
 Thu, 17 Oct 2013 17:09:15 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9HH9FAt015619;
 Thu, 17 Oct 2013 17:09:15 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310171709.r9HH9FAt015619@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 17 Oct 2013 17:09:15 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42986 - head/en_US.ISO8859-1/books/handbook/serialcomms
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Oct 2013 17:09:15 -0000

Author: dru
Date: Thu Oct 17 17:09:15 2013
New Revision: 42986
URL: http://svnweb.freebsd.org/changeset/doc/42986

Log:
  Typo fix.

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

Modified: head/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml	Thu Oct 17 17:08:29 2013	(r42985)
+++ head/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml	Thu Oct 17 17:09:15 2013	(r42986)
@@ -60,7 +60,7 @@
     <title>Serial Terminology and Hardware</title>
 
     <para>The following terms are often used in serial
-      commnications:</para>
+      communications:</para>
     <variablelist>
       <varlistentry>
 	<term><acronym>bps</acronym></term>

From owner-svn-doc-head@FreeBSD.ORG  Thu Oct 17 18:49:26 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id DD0EB4FA;
 Thu, 17 Oct 2013 18:49:26 +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 CB1592986;
 Thu, 17 Oct 2013 18:49:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9HInQq1068141;
 Thu, 17 Oct 2013 18:49:26 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9HInQ57068140;
 Thu, 17 Oct 2013 18:49:26 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310171849.r9HInQ57068140@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 17 Oct 2013 18:49:26 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42987 - head/en_US.ISO8859-1/books/handbook/serialcomms
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Oct 2013 18:49:26 -0000

Author: dru
Date: Thu Oct 17 18:49:26 2013
New Revision: 42987
URL: http://svnweb.freebsd.org/changeset/doc/42987

Log:
  Make the validator happy.

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

Modified: head/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml	Thu Oct 17 17:09:15 2013	(r42986)
+++ head/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml	Thu Oct 17 18:49:26 2013	(r42987)
@@ -659,11 +659,10 @@
       user system.</para>
 
     <para>&os; supports three types of terminals:</para>
-    <term><acronym>Dumb terminals</acronym></term>
-    <term>Computers Acting as Terminals</term>
 
     <variablelist>
       <varlistentry>
+	<term>Dumb terminals</term>
 	<listitem>
 	  <para>Dumb terminals are specialized hardware that connect
 	    to computers over serial lines.  They are called
@@ -686,6 +685,7 @@
       </varlistentry>
 
       <varlistentry>
+	<term>Computers Acting as Terminals</term>
 	<listitem>
 	  <para>If a dumb terminal has just enough ability to
 	    display, send, and receive text, any spare computer can

From owner-svn-doc-head@FreeBSD.ORG  Thu Oct 17 19:25:29 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id BC5FB38C;
 Thu, 17 Oct 2013 19:25: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 A930F2BDC;
 Thu, 17 Oct 2013 19:25: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 r9HJPTu4088770;
 Thu, 17 Oct 2013 19:25:29 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9HJPTX9088768;
 Thu, 17 Oct 2013 19:25:29 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310171925.r9HJPTX9088768@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 17 Oct 2013 19:25:29 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42988 - in head/en_US.ISO8859-1/books/handbook:
 ppp-and-slip preface
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Oct 2013 19:25:29 -0000

Author: dru
Date: Thu Oct 17 19:25:29 2013
New Revision: 42988
URL: http://svnweb.freebsd.org/changeset/doc/42988

Log:
  Rename PPP and SLIP chapter to PPP.
  
  While in preface.xml, fix xref tags and incorrect link to the GEOM chapter.
  
  This is to be followed by a whitespace fix.

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

Modified: head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Thu Oct 17 18:49:26 2013	(r42987)
+++ head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Thu Oct 17 19:25:29 2013	(r42988)
@@ -17,7 +17,7 @@
     </authorgroup>
   </chapterinfo>
 
-  <title>PPP and SLIP</title>
+  <title>PPP</title>
 
   <sect1 id="ppp-and-slip-synopsis">
     <title>Synopsis</title>

Modified: head/en_US.ISO8859-1/books/handbook/preface/preface.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/preface/preface.xml	Thu Oct 17 18:49:26 2013	(r42987)
+++ head/en_US.ISO8859-1/books/handbook/preface/preface.xml	Thu Oct 17 19:25:29 2013	(r42988)
@@ -36,32 +36,31 @@
 
   <itemizedlist>
     <listitem>
-      <para><xref linkend="dtrace"/>, &dtrace;, has been added with
+      <para><xref linkend="dtrace"/> has been added with
 	information about the powerful &dtrace; performance analysis
 	tool.</para>
     </listitem>
 
     <listitem>
-      <para><xref linkend="filesystems"/>, File Systems Support, has
+      <para><xref linkend="filesystems"/> has
 	been added with information about non-native file systems in
 	&os;, such as ZFS from &sun;.</para>
     </listitem>
 
     <listitem>
-      <para><xref linkend="audit"/>, Security Event Auditing, has
+      <para><xref linkend="audit"/> has
 	been added to cover the new auditing capabilities in &os;
 	and explain its use.</para>
     </listitem>
 
     <listitem>
-      <para><xref linkend="virtualization"/>, Virtualization, has
+      <para><xref linkend="virtualization"/> has
 	been added with information about installing &os; on
 	virtualization software.</para>
     </listitem>
 
     <listitem>
-      <para><xref linkend="bsdinstall"/>, Installing
-	&os;&nbsp;9.<replaceable>x</replaceable> and Later, has been
+      <para><xref linkend="bsdinstall"/> has been
 	added to cover installation of &os; using the new
 	installation utility,
 	<application>bsdinstall</application>.</para>
@@ -79,29 +78,29 @@
 
   <itemizedlist>
     <listitem>
-      <para><xref linkend="config-tuning"/>, Configuration and
-	Tuning, has been expanded with new information about the
+      <para><xref linkend="config-tuning"/>
+	has been expanded with new information about the
 	ACPI power and resource management, the
 	<command>cron</command> system utility, and more kernel
 	tuning options.</para>
     </listitem>
 
     <listitem>
-      <para><xref linkend="security"/>, Security, has been expanded
+      <para><xref linkend="security"/> has been expanded
 	with new information about virtual private networks (VPNs),
 	file system access control lists (ACLs), and security
 	advisories.</para>
     </listitem>
 
     <listitem>
-      <para><xref linkend="mac"/>, Mandatory Access Control (MAC),
+      <para><xref linkend="mac"/>
 	is a new chapter with this edition.  It explains what MAC is
 	and how this mechanism can be used to secure a &os;
 	system.</para>
     </listitem>
 
     <listitem>
-      <para><xref linkend="disks"/>, Storage, has been expanded with
+      <para><xref linkend="disks"/> has been expanded with
 	new information about USB storage devices, file system
 	snapshots, file system quotas, file and network backed
 	filesystems, and encrypted disk partitions.</para>
@@ -109,11 +108,11 @@
 
     <listitem>
       <para>A troubleshooting section has been added to <xref
-	  linkend="ppp-and-slip"/>, PPP and SLIP.</para>
+	  linkend="ppp-and-slip"/>.</para>
     </listitem>
 
     <listitem>
-      <para><xref linkend="mail"/>, Electronic Mail, has been
+      <para><xref linkend="mail"/> has been
 	expanded with new information about using alternative
 	transport agents, SMTP authentication, UUCP,
 	<application>fetchmail</application>,
@@ -122,19 +121,19 @@
     </listitem>
 
     <listitem>
-      <para><xref linkend="network-servers"/>, Network Servers, is
+      <para><xref linkend="network-servers"/> is
 	all new with this edition.  This chapter includes
 	information about setting up the <application>Apache HTTP
 	Server</application>, <application>ftpd</application>,
 	and setting up a server for &microsoft; &windows; clients
 	with <application>Samba</application>.  Some sections from
-	<xref linkend="advanced-networking"/>, Advanced Networking,
+	<xref linkend="advanced-networking"/>
 	were moved here to improve the presentation.</para>
     </listitem>
 
     <listitem>
-      <para><xref linkend="advanced-networking"/>, Advanced
-	Networking, has been expanded with new information about
+      <para><xref linkend="advanced-networking"/>
+	has been expanded with new information about
 	using &bluetooth; devices with &os;, setting up wireless
 	networks, and Asynchronous Transfer Mode (ATM)
 	networking.</para>
@@ -182,35 +181,35 @@
 	  <quote>Appendices</quote>.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="install"/> (<quote>Installing
-	    &os;</quote>) was completely rewritten with many
+	<para><xref linkend="install"/>
+	  was completely rewritten with many
 	  screenshots to make it much easier for new users to grasp
 	  the text.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="basics"/> (<quote>&unix; Basics</quote>)
+	<para><xref linkend="basics"/>
 	  has been expanded to contain additional information about
 	  processes, daemons, and signals.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="ports"/> (<quote>Installing
-	    Applications</quote>) has been expanded to contain
+	<para><xref linkend="ports"/>
+	  has been expanded to contain
 	  additional information about binary package
 	  management.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="x11"/> (<quote>The X Window
-	    System</quote>) has been completely rewritten with an
+	<para><xref linkend="x11"/>
+	  has been completely rewritten with an
 	  emphasis on using modern desktop technologies such as
 	  <application>KDE</application> and
 	  <application>GNOME</application> on &xfree86; 4.X.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="boot"/> (<quote>The &os; Booting
-	    Process</quote>) has been expanded.</para>
+	<para><xref linkend="boot"/>
+	  has been expanded.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="disks"/> (<quote>Storage</quote>) has
+	<para><xref linkend="disks"/> has
 	  been written from what used to be two separate chapters on
 	  <quote>Disks</quote> and <quote>Backups</quote>.  We feel
 	  that the topics are easier to comprehend when presented as
@@ -218,27 +217,26 @@
 	  software) has also been added.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="serialcomms"/> (<quote>Serial
-	    Communications</quote>) has been completely
+	<para><xref linkend="serialcomms"/>
+	  has been completely
 	  reorganized and updated for &os; 4.X/5.X.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="ppp-and-slip"/> (<quote>PPP and
-	    SLIP</quote>) has been substantially updated.</para>
+	<para><xref linkend="ppp-and-slip"/> has
+	  been substantially updated.</para>
       </listitem>
       <listitem>
 	<para>Many new sections have been added to
-	  <xref linkend="advanced-networking"/>
-	  (<quote>Advanced Networking</quote>).</para>
+	  <xref linkend="advanced-networking"/>.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="mail"/> (<quote>Electronic Mail</quote>)
+	<para><xref linkend="mail"/>
 	  has been expanded to include more information about
 	  configuring <application>sendmail</application>.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="linuxemu"/> (<quote>&linux;
-	    Compatibility</quote>) has been expanded to include
+	<para><xref linkend="linuxemu"/>
+	  has been expanded to include
 	  information about installing
 	  <application>&oracle;</application> and
 	  <application>&sap.r3;</application>.</para>
@@ -248,11 +246,11 @@
 	  edition:</para>
 	<itemizedlist>
 	  <listitem>
-	    <para>Configuration and Tuning (<xref
-		linkend="config-tuning"/>).</para>
+	    <para><xref
+		linkend="config-tuning"/>.</para>
 	  </listitem>
 	  <listitem>
-	    <para>Multimedia (<xref linkend="multimedia"/>)</para>
+	    <para><xref linkend="multimedia"/>.</para>
 	  </listitem>
 	</itemizedlist>
       </listitem>
@@ -284,8 +282,7 @@
 <!-- Part I - Introduction -->
 
     <varlistentry>
-      <term><emphasis><xref linkend="introduction"/>,
-	Introduction</emphasis></term>
+      <term><emphasis><xref linkend="introduction"/></emphasis></term>
       <listitem>
 	<para>Introduces &os; to a new user.  It describes the
 	  history of the &os; Project, its goals and development
@@ -293,9 +290,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="bsdinstall"/>, Installation of
-	&os;&nbsp;9.<replaceable>x</replaceable> and
-	Later</emphasis></term>
+      <term><emphasis><xref linkend="bsdinstall"/></emphasis></term>
       <listitem>
 	<para>Walks a user through the entire installation process of
 	  &os;&nbsp;9.<replaceable>x</replaceable> and later using
@@ -303,9 +298,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="install"/>, Installation of
-	&os;&nbsp;8.<replaceable>x</replaceable> and
-	Earlier</emphasis></term>
+      <term><emphasis><xref linkend="install"/></emphasis></term>
       <listitem>
 	<para>Walks a user through the entire installation process of
 	  &os;&nbsp;8.<replaceable>x</replaceable> and earlier using
@@ -315,8 +308,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="basics"/>, &unix;
-	Basics</emphasis></term>
+      <term><emphasis><xref linkend="basics"/></emphasis></term>
       <listitem>
 	<para>Covers the basic commands and functionality of the
 	  &os; operating system.  If you are familiar with &linux;
@@ -325,8 +317,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="ports"/>, Installing
-	Applications</emphasis></term>
+      <term><emphasis><xref linkend="ports"/></emphasis></term>
       <listitem>
 	<para>Covers the installation of third-party software with
 	  both &os;'s innovative <quote>Ports Collection</quote> and
@@ -334,8 +325,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="x11"/>, The X Window
-	System</emphasis></term>
+      <term><emphasis><xref linkend="x11"/></emphasis></term>
       <listitem>
 	<para>Describes the X Window System in general and using
 	  X11 on &os; in particular.  Also describes common
@@ -347,8 +337,7 @@
 <!-- Part II Common Tasks -->
 
     <varlistentry>
-      <term><emphasis><xref linkend="desktop"/>, Desktop
-	Applications</emphasis></term>
+      <term><emphasis><xref linkend="desktop"/></emphasis></term>
       <listitem>
 	<para>Lists some common desktop applications, such as web
 	  browsers and productivity suites, and describes how to
@@ -356,8 +345,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="multimedia"/>,
-	Multimedia</emphasis></term>
+      <term><emphasis><xref linkend="multimedia"/></emphasis></term>
       <listitem>
 	<para>Shows how to set up sound and video playback support
 	  for your system.  Also describes some sample audio and video
@@ -365,8 +353,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="kernelconfig"/>, Configuring
-	the &os; Kernel</emphasis></term>
+      <term><emphasis><xref linkend="kernelconfig"/></emphasis></term>
       <listitem>
 	<para>Explains why you might need to configure a new kernel
 	  and provides detailed instructions for configuring,
@@ -374,8 +361,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="printing"/>,
-	Printing</emphasis></term>
+      <term><emphasis><xref linkend="printing"/></emphasis></term>
       <listitem>
 	<para>Describes managing printers on &os;, including
 	  information about banner pages, printer accounting, and
@@ -383,8 +369,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="linuxemu"/>, &linux; Binary
-	Compatibility</emphasis></term>
+      <term><emphasis><xref linkend="linuxemu"/></emphasis></term>
       <listitem>
 	<para>Describes the &linux; compatibility features of &os;.
 	  Also provides detailed installation instructions for many
@@ -397,8 +382,7 @@
 <!-- Part III - System Administration -->
 
     <varlistentry>
-      <term><emphasis><xref linkend="config-tuning"/>, Configuration
-	and Tuning</emphasis></term>
+      <term><emphasis><xref linkend="config-tuning"/></emphasis></term>
       <listitem>
 	<para>Describes the parameters available for system
 	  administrators to tune a &os; system for optimum
@@ -407,8 +391,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="boot"/>, Booting
-	Process</emphasis></term>
+      <term><emphasis><xref linkend="boot"/></emphasis></term>
       <listitem>
 	<para>Describes the &os; boot process and explains
 	  how to control this process with configuration
@@ -416,8 +399,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="security"/>,
-	Security</emphasis></term>
+      <term><emphasis><xref linkend="security"/></emphasis></term>
       <listitem>
 	<para>Describes many different tools available to help keep
 	  your &os; system secure, including Kerberos, IPsec and
@@ -425,15 +407,14 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="jails"/>, Jails</emphasis></term>
+      <term><emphasis><xref linkend="jails"/></emphasis></term>
       <listitem>
 	<para>Describes the jails framework, and the improvements of
 	  jails over the traditional chroot support of &os;.</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="mac"/>, Mandatory Access
-	Control</emphasis></term>
+      <term><emphasis><xref linkend="mac"/></emphasis></term>
       <listitem>
 	<para>Explains what Mandatory Access Control (MAC) is and
 	  how this mechanism can be used to secure a &os;
@@ -441,8 +422,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="audit"/>, Security Event
-	Auditing</emphasis></term>
+      <term><emphasis><xref linkend="audit"/></emphasis></term>
       <listitem>
 	<para>Describes what &os; Event Auditing is, how it can be
 	  installed, configured, and how audit trails can be inspected
@@ -451,8 +431,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term><emphasis><xref linkend="disks"/>,
-	Storage</emphasis></term>
+      <term><emphasis><xref linkend="disks"/></emphasis></term>
       <listitem>
 	<para>Describes how to manage storage media and filesystems
 	  with &os;.  This includes physical disks, RAID arrays,
@@ -461,32 +440,28 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="geom-synopsis"/>,
-	GEOM</emphasis></term>
+      <term><emphasis><xref linkend="geom"/></emphasis></term>
       <listitem>
 	<para>Describes what the GEOM framework in &os; is and how
 	  to configure various supported RAID levels.</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="filesystems"/>, File Systems
-	Support</emphasis></term>
+      <term><emphasis><xref linkend="filesystems"/></emphasis></term>
       <listitem>
 	<para>Examines support of non-native file systems in &os;,
 	  like the Z File System from &sun;.</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="virtualization"/>,
-	Virtualization</emphasis></term>
+      <term><emphasis><xref linkend="virtualization"/></emphasis></term>
       <listitem>
 	<para>Describes what virtualization systems offer, and how
 	  they can be used with &os;.</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="l10n"/>,
-	Localization</emphasis></term>
+      <term><emphasis><xref linkend="l10n"/></emphasis></term>
       <listitem>
 	<para>Describes how to use &os; in languages other than
 	  English.  Covers both system and application level
@@ -494,8 +469,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="updating-upgrading"/>, Updating
-	and Upgrading &os;</emphasis></term>
+      <term><emphasis><xref linkend="updating-upgrading"/></emphasis></term>
       <listitem>
 	<para>Explains the differences between &os;-STABLE,
 	  &os;-CURRENT, and &os; releases.  Describes which users
@@ -506,8 +480,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="dtrace"/>,
-	  &dtrace;</emphasis></term>
+      <term><emphasis><xref linkend="dtrace"/></emphasis></term>
       <listitem>
 	<para>Describes how to configure and use the &dtrace; tool
 	  from &sun; in &os;.  Dynamic tracing can help locate
@@ -519,8 +492,7 @@
 <!-- Part IV - Network Communications -->
 
     <varlistentry>
-      <term><emphasis><xref linkend="serialcomms"/>, Serial
-	Communications</emphasis></term>
+      <term><emphasis><xref linkend="serialcomms"/></emphasis></term>
       <listitem>
 	<para>Explains how to connect terminals and modems to your
 	  &os; system for both dial in and dial out
@@ -528,16 +500,14 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="ppp-and-slip"/>, PPP and
-	SLIP</emphasis></term>
+      <term><emphasis><xref linkend="ppp-and-slip"/></emphasis></term>
       <listitem>
-	<para>Describes how to use PPP, SLIP, or PPP over Ethernet to
+	<para>Describes how to use PPP to
 	  connect to remote systems with &os;.</para>
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="mail"/>, Electronic
-	Mail</emphasis></term>
+      <term><emphasis><xref linkend="mail"/></emphasis></term>
       <listitem>
 	<para>Explains the different components of an email server
 	  and dives into simple configuration topics for the most
@@ -546,8 +516,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="network-servers"/>, Network
-	Servers</emphasis></term>
+      <term><emphasis><xref linkend="network-servers"/></emphasis></term>
       <listitem>
 	<para>Provides detailed instructions and example configuration
 	  files to set up your &os; machine as a network filesystem
@@ -556,8 +525,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="firewalls"/>,
-	Firewalls</emphasis></term>
+      <term><emphasis><xref linkend="firewalls"/></emphasis></term>
       <listitem>
 	<para>Explains the philosophy behind software-based firewalls
 	  and provides detailed information about the configuration
@@ -565,8 +533,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="advanced-networking"/>, Advanced
-	Networking</emphasis></term>
+      <term><emphasis><xref linkend="advanced-networking"/></emphasis></term>
       <listitem>
 	<para>Describes many networking topics, including sharing an
 	  Internet connection with other computers on your LAN,
@@ -578,8 +545,7 @@
 <!-- Part V - Appendices -->
 
     <varlistentry>
-      <term><emphasis><xref linkend="mirrors"/>, Obtaining &os;
-	</emphasis></term>
+      <term><emphasis><xref linkend="mirrors"/></emphasis></term>
       <listitem>
 	<para>Lists different sources for obtaining &os; media on
 	  CDROM or DVD as well as different sites on the Internet
@@ -587,8 +553,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="bibliography"/>,
-	  Bibliography</emphasis></term>
+      <term><emphasis><xref linkend="bibliography"/></emphasis></term>
       <listitem>
 	<para>This book touches on many different subjects that may
 	  leave you hungry for a more detailed explanation.  The
@@ -597,8 +562,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="eresources"/>, Resources on the
-	Internet</emphasis></term>
+      <term><emphasis><xref linkend="eresources"/></emphasis></term>
       <listitem>
 	<para>Describes the many forums available for &os; users to
 	  post questions and engage in technical conversations about
@@ -606,8 +570,7 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="pgpkeys"/>, PGP
-	Keys</emphasis></term>
+      <term><emphasis><xref linkend="pgpkeys"/></emphasis></term>
       <listitem>
 	<para>Lists the PGP fingerprints of several &os;
 	  Developers.</para>

From owner-svn-doc-head@FreeBSD.ORG  Thu Oct 17 19:38:31 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [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 0F3CC946;
 Thu, 17 Oct 2013 19:38:31 +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 D684C2C93;
 Thu, 17 Oct 2013 19:38:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9HJcUr6095177;
 Thu, 17 Oct 2013 19:38:30 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9HJcU6m095176;
 Thu, 17 Oct 2013 19:38:30 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310171938.r9HJcU6m095176@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 17 Oct 2013 19:38:30 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42989 - head/en_US.ISO8859-1/books/handbook/preface
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Oct 2013 19:38:31 -0000

Author: dru
Date: Thu Oct 17 19:38:30 2013
New Revision: 42989
URL: http://svnweb.freebsd.org/changeset/doc/42989

Log:
  White space fix only. Translators can ignore.

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

Modified: head/en_US.ISO8859-1/books/handbook/preface/preface.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/preface/preface.xml	Thu Oct 17 19:25:29 2013	(r42988)
+++ head/en_US.ISO8859-1/books/handbook/preface/preface.xml	Thu Oct 17 19:38:30 2013	(r42989)
@@ -36,33 +36,30 @@
 
   <itemizedlist>
     <listitem>
-      <para><xref linkend="dtrace"/> has been added with
-	information about the powerful &dtrace; performance analysis
-	tool.</para>
+      <para><xref linkend="dtrace"/> has been added with information
+	about the powerful &dtrace; performance analysis tool.</para>
     </listitem>
 
     <listitem>
-      <para><xref linkend="filesystems"/> has
-	been added with information about non-native file systems in
-	&os;, such as ZFS from &sun;.</para>
+      <para><xref linkend="filesystems"/> has been added with
+	information about non-native file systems in &os;, such as ZFS
+	from &sun;.</para>
     </listitem>
 
     <listitem>
-      <para><xref linkend="audit"/> has
-	been added to cover the new auditing capabilities in &os;
-	and explain its use.</para>
+      <para><xref linkend="audit"/> has been added to cover the new
+	auditing capabilities in &os; and explain its use.</para>
     </listitem>
 
     <listitem>
-      <para><xref linkend="virtualization"/> has
-	been added with information about installing &os; on
-	virtualization software.</para>
+      <para><xref linkend="virtualization"/> has been added with
+	information about installing &os; on virtualization
+	software.</para>
     </listitem>
 
     <listitem>
-      <para><xref linkend="bsdinstall"/> has been
-	added to cover installation of &os; using the new
-	installation utility,
+      <para><xref linkend="bsdinstall"/> has been added to cover
+	installation of &os; using the new installation utility,
 	<application>bsdinstall</application>.</para>
     </listitem>
   </itemizedlist>
@@ -78,32 +75,29 @@
 
   <itemizedlist>
     <listitem>
-      <para><xref linkend="config-tuning"/>
-	has been expanded with new information about the
-	ACPI power and resource management, the
-	<command>cron</command> system utility, and more kernel
-	tuning options.</para>
+      <para><xref linkend="config-tuning"/> has been expanded with new
+	information about the ACPI power and resource management, the
+	<command>cron</command> system utility, and more kernel tuning
+	options.</para>
     </listitem>
 
     <listitem>
-      <para><xref linkend="security"/> has been expanded
-	with new information about virtual private networks (VPNs),
-	file system access control lists (ACLs), and security
-	advisories.</para>
+      <para><xref linkend="security"/> has been expanded with new
+	information about virtual private networks (VPNs), file system
+	access control lists (ACLs), and security advisories.</para>
     </listitem>
 
     <listitem>
-      <para><xref linkend="mac"/>
-	is a new chapter with this edition.  It explains what MAC is
-	and how this mechanism can be used to secure a &os;
-	system.</para>
+      <para><xref linkend="mac"/> is a new chapter with this edition.
+	It explains what MAC is and how this mechanism can be used to
+	secure a &os; system.</para>
     </listitem>
 
     <listitem>
-      <para><xref linkend="disks"/> has been expanded with
-	new information about USB storage devices, file system
-	snapshots, file system quotas, file and network backed
-	filesystems, and encrypted disk partitions.</para>
+      <para><xref linkend="disks"/> has been expanded with new
+	information about USB storage devices, file system snapshots,
+	file system quotas, file and network backed filesystems, and
+	encrypted disk partitions.</para>
     </listitem>
 
     <listitem>
@@ -112,31 +106,29 @@
     </listitem>
 
     <listitem>
-      <para><xref linkend="mail"/> has been
-	expanded with new information about using alternative
-	transport agents, SMTP authentication, UUCP,
-	<application>fetchmail</application>,
+      <para><xref linkend="mail"/> has been expanded with new
+	information about using alternative transport agents, SMTP
+	authentication, UUCP, <application>fetchmail</application>,
 	<application>procmail</application>, and other advanced
 	topics.</para>
     </listitem>
 
     <listitem>
-      <para><xref linkend="network-servers"/> is
-	all new with this edition.  This chapter includes
-	information about setting up the <application>Apache HTTP
-	Server</application>, <application>ftpd</application>,
-	and setting up a server for &microsoft; &windows; clients
-	with <application>Samba</application>.  Some sections from
-	<xref linkend="advanced-networking"/>
-	were moved here to improve the presentation.</para>
+      <para><xref linkend="network-servers"/> is all new with this
+	edition.  This chapter includes information about setting up
+	the <application>Apache HTTP Server</application>,
+	<application>ftpd</application>, and setting up a server for
+	&microsoft; &windows; clients with
+	<application>Samba</application>.  Some sections from <xref
+	  linkend="advanced-networking"/> were moved here to improve
+	the presentation.</para>
     </listitem>
 
     <listitem>
-      <para><xref linkend="advanced-networking"/>
-	has been expanded with new information about
-	using &bluetooth; devices with &os;, setting up wireless
-	networks, and Asynchronous Transfer Mode (ATM)
-	networking.</para>
+      <para><xref linkend="advanced-networking"/> has been expanded
+	with new information about using &bluetooth; devices with
+	&os;, setting up wireless networks, and Asynchronous Transfer
+	Mode (ATM) networking.</para>
     </listitem>
 
     <listitem>
@@ -155,9 +147,8 @@
   First Edition (2001)</bridgehead>
 
     <para>The second edition was the culmination of over two years of
-      work by the dedicated members of the &os; Documentation
-      Project.  The following were the major changes in this
-      edition:</para>
+      work by the dedicated members of the &os; Documentation Project.
+      The following were the major changes in this edition:</para>
 
 <!-- Talk a little about justification and other stylesheet changes? -->
 
@@ -181,62 +172,56 @@
 	  <quote>Appendices</quote>.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="install"/>
-	  was completely rewritten with many
-	  screenshots to make it much easier for new users to grasp
-	  the text.</para>
+	<para><xref linkend="install"/> was completely rewritten with
+	  many screenshots to make it much easier for new users to
+	  grasp the text.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="basics"/>
-	  has been expanded to contain additional information about
-	  processes, daemons, and signals.</para>
+	<para><xref linkend="basics"/> has been expanded to contain
+	  additional information about processes, daemons, and
+	  signals.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="ports"/>
-	  has been expanded to contain
+	<para><xref linkend="ports"/> has been expanded to contain
 	  additional information about binary package
 	  management.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="x11"/>
-	  has been completely rewritten with an
-	  emphasis on using modern desktop technologies such as
+	<para><xref linkend="x11"/> has been completely rewritten with
+	  an emphasis on using modern desktop technologies such as
 	  <application>KDE</application> and
 	  <application>GNOME</application> on &xfree86; 4.X.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="boot"/>
-	  has been expanded.</para>
+	<para><xref linkend="boot"/> has been expanded.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="disks"/> has
-	  been written from what used to be two separate chapters on
-	  <quote>Disks</quote> and <quote>Backups</quote>.  We feel
-	  that the topics are easier to comprehend when presented as
-	  a single chapter.  A section on RAID (both hardware and
-	  software) has also been added.</para>
+	<para><xref linkend="disks"/> has been written from what used
+	  to be two separate chapters on <quote>Disks</quote> and
+	  <quote>Backups</quote>.  We feel that the topics are easier
+	  to comprehend when presented as a single chapter.  A section
+	  on RAID (both hardware and software) has also been
+	  added.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="serialcomms"/>
-	  has been completely
+	<para><xref linkend="serialcomms"/> has been completely
 	  reorganized and updated for &os; 4.X/5.X.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="ppp-and-slip"/> has
-	  been substantially updated.</para>
+	<para><xref linkend="ppp-and-slip"/> has been substantially
+	  updated.</para>
       </listitem>
       <listitem>
-	<para>Many new sections have been added to
-	  <xref linkend="advanced-networking"/>.</para>
+	<para>Many new sections have been added to <xref
+	    linkend="advanced-networking"/>.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="mail"/>
-	  has been expanded to include more information about
-	  configuring <application>sendmail</application>.</para>
+	<para><xref linkend="mail"/> has been expanded to include more
+	  information about configuring
+	  <application>sendmail</application>.</para>
       </listitem>
       <listitem>
-	<para><xref linkend="linuxemu"/>
-	  has been expanded to include
+	<para><xref linkend="linuxemu"/> has been expanded to include
 	  information about installing
 	  <application>&oracle;</application> and
 	  <application>&sap.r3;</application>.</para>
@@ -267,15 +252,14 @@
     <emphasis>Common Tasks</emphasis>, covers some frequently used
     features of &os;.  This section, and all subsequent sections,
     can be read out of order.  Each chapter begins with a succinct
-    synopsis that
-    describes what the chapter covers and what the reader is expected
-    to already know.  This is meant to allow the casual reader to skip
-    around to find chapters of interest.  The third section,
-    <emphasis>System Administration</emphasis>, covers administration
-    topics.  The fourth section, <emphasis>Network
-    Communication</emphasis>, covers networking and server topics.
-    The fifth section contains
-    appendices of reference information.</para>
+    synopsis that describes what the chapter covers and what the
+    reader is expected to already know.  This is meant to allow the
+    casual reader to skip around to find chapters of interest.  The
+    third section, <emphasis>System Administration</emphasis>, covers
+    administration topics.  The fourth section, <emphasis>Network
+      Communication</emphasis>, covers networking and server topics.
+    The fifth section contains appendices of reference
+    information.</para>
 
   <variablelist>
 
@@ -328,9 +312,9 @@
       <term><emphasis><xref linkend="x11"/></emphasis></term>
       <listitem>
 	<para>Describes the X Window System in general and using
-	  X11 on &os; in particular.  Also describes common
+	  X11 on &os; in particular.  Also describes common and
 	  desktop environments such as <application>KDE</application>
-	  and <application>GNOME</application>.</para>
+	  <application>GNOME</application>.</para>
       </listitem>
     </varlistentry>
 
@@ -382,7 +366,8 @@
 <!-- Part III - System Administration -->
 
     <varlistentry>
-      <term><emphasis><xref linkend="config-tuning"/></emphasis></term>
+      <term><emphasis><xref
+	  linkend="config-tuning"/></emphasis></term>
       <listitem>
 	<para>Describes the parameters available for system
 	  administrators to tune a &os; system for optimum
@@ -393,9 +378,8 @@
     <varlistentry>
       <term><emphasis><xref linkend="boot"/></emphasis></term>
       <listitem>
-	<para>Describes the &os; boot process and explains
-	  how to control this process with configuration
-	  options.</para>
+	<para>Describes the &os; boot process and explains how to
+	  control this process with configuration options.</para>
       </listitem>
     </varlistentry>
     <varlistentry>
@@ -454,7 +438,8 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="virtualization"/></emphasis></term>
+      <term><emphasis><xref
+	  linkend="virtualization"/></emphasis></term>
       <listitem>
 	<para>Describes what virtualization systems offer, and how
 	  they can be used with &os;.</para>
@@ -469,7 +454,8 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="updating-upgrading"/></emphasis></term>
+      <term><emphasis><xref
+	  linkend="updating-upgrading"/></emphasis></term>
       <listitem>
 	<para>Explains the differences between &os;-STABLE,
 	  &os;-CURRENT, and &os; releases.  Describes which users
@@ -502,8 +488,8 @@
     <varlistentry>
       <term><emphasis><xref linkend="ppp-and-slip"/></emphasis></term>
       <listitem>
-	<para>Describes how to use PPP to
-	  connect to remote systems with &os;.</para>
+	<para>Describes how to use PPP to connect to remote systems
+	  with &os;.</para>
       </listitem>
     </varlistentry>
     <varlistentry>
@@ -516,7 +502,8 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="network-servers"/></emphasis></term>
+      <term><emphasis><xref
+	  linkend="network-servers"/></emphasis></term>
       <listitem>
 	<para>Provides detailed instructions and example configuration
 	  files to set up your &os; machine as a network filesystem
@@ -533,7 +520,8 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="advanced-networking"/></emphasis></term>
+      <term><emphasis><xref
+	  linkend="advanced-networking"/></emphasis></term>
       <listitem>
 	<para>Describes many networking topics, including sharing an
 	  Internet connection with other computers on your LAN,
@@ -600,10 +588,10 @@
     <varlistentry>
       <term><literal>Monospace</literal></term>
       <listitem>
-	<para>A <literal>monospaced</literal> font is
-	  used for error messages, commands, environment variables,
-	  names of ports, hostnames, user names, group names, device
-	  names, variables, and code fragments.</para>
+	<para>A <literal>monospaced</literal> font is used for error
+	  messages, commands, environment variables, names of ports,
+	  hostnames, user names, group names, device names, variables,
+	  and code fragments.</para>
       </listitem>
     </varlistentry>
     <varlistentry>

From owner-svn-doc-head@FreeBSD.ORG  Thu Oct 17 19:42:08 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id AA40AAE0;
 Thu, 17 Oct 2013 19:42:08 +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 97EF92CEE;
 Thu, 17 Oct 2013 19:42: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 r9HJg8px098217;
 Thu, 17 Oct 2013 19:42:08 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9HJg8GY098216;
 Thu, 17 Oct 2013 19:42:08 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310171942.r9HJg8GY098216@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 17 Oct 2013 19:42:08 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42990 - head/en_US.ISO8859-1/books/handbook/ppp-and-slip
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Oct 2013 19:42:08 -0000

Author: dru
Date: Thu Oct 17 19:42:08 2013
New Revision: 42990
URL: http://svnweb.freebsd.org/changeset/doc/42990

Log:
  Remove last reference to slip in prep to close doc/143041.

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

Modified: head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Thu Oct 17 19:38:30 2013	(r42989)
+++ head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Thu Oct 17 19:42:08 2013	(r42990)
@@ -25,9 +25,6 @@
     <indexterm id="ppp-ppp">
       <primary>PPP</primary>
     </indexterm>
-    <indexterm id="ppp-slip">
-      <primary>SLIP</primary>
-    </indexterm>
 
     <para>FreeBSD has a number of ways to link one computer to
       another.  To establish a network or Internet connection through

From owner-svn-doc-head@FreeBSD.ORG  Thu Oct 17 21:22:39 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 18A78511;
 Thu, 17 Oct 2013 21:22:39 +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 04E7523C8;
 Thu, 17 Oct 2013 21:22:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9HLMcvu053049;
 Thu, 17 Oct 2013 21:22:38 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9HLMcrw053048;
 Thu, 17 Oct 2013 21:22:38 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310172122.r9HLMcrw053048@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 17 Oct 2013 21:22:38 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42991 - head/en_US.ISO8859-1/books/handbook/ppp-and-slip
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Oct 2013 21:22:39 -0000

Author: dru
Date: Thu Oct 17 21:22:38 2013
New Revision: 42991
URL: http://svnweb.freebsd.org/changeset/doc/42991

Log:
  Initial header tightening in prep for reviewing this chapter. Many more patches to come.

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

Modified: head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Thu Oct 17 19:42:08 2013	(r42990)
+++ head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Thu Oct 17 21:22:38 2013	(r42991)
@@ -6,16 +6,17 @@
 -->
 
 <chapter id="ppp-and-slip">
+  <!--
   <chapterinfo>
     <authorgroup>
       <author>
 	<firstname>Jim</firstname>
 	<surname>Mock</surname>
-	<contrib>Restructured, reorganized, and updated by </contrib>
-	<!-- 1 Mar 2000 -->
+	<contrib>Restructured, reorganized, and updated by in Mar 2000</contrib>
       </author>
     </authorgroup>
   </chapterinfo>
+  -->
 
   <title>PPP</title>
 
@@ -48,15 +49,15 @@
       </listitem>
     </itemizedlist>
 
-    <indexterm id="ppp-ppp-user">
+    <indexterm>
       <primary>PPP</primary>
       <secondary>user PPP</secondary>
     </indexterm>
-    <indexterm id="ppp-ppp-kernel">
+    <indexterm>
       <primary>PPP</primary>
       <secondary>kernel PPP</secondary>
     </indexterm>
-    <indexterm id="ppp-ppp-ethernet">
+    <indexterm>
       <primary>PPP</primary>
       <secondary>over Ethernet</secondary>
     </indexterm>
@@ -75,6 +76,7 @@
   </sect1>
 
   <sect1 id="userppp">
+    <!--
     <sect1info>
       <authorgroup>
 	<author>
@@ -106,14 +108,9 @@
 	</author>
       </authorgroup>
     </sect1info>
+    -->
 
-    <title>Using User PPP</title>
-
-    <sect2>
-      <title>User PPP</title>
-
-      <sect3>
-	<title>Assumptions</title>
+    <title>Configuring PPP</title>
 
 	<para>This document assumes you have the following:</para>
 
@@ -198,17 +195,6 @@
 	    characters is also important.</para>
 	</note>
 
-      </sect3>
-
-      <sect3>
-	<title>Automatic <application>PPP</application>
-	  Configuration</title>
-
-	<indexterm>
-	  <primary>PPP</primary>
-	  <secondary>configuration</secondary>
-	</indexterm>
-
 	<para><command>ppp</command> uses the configuration files
 	  located in <filename class="directory">/etc/ppp</filename>.
 	  Examples can be found in <filename
@@ -222,8 +208,8 @@
 	  (i.e., your IP address changes each time you connect to
 	  your ISP).</para>
 
-	<sect4 id="userppp-staticIP">
-	  <title>PPP and Static IP Addresses</title>
+	<sect2 id="userppp-staticIP">
+	  <title>PPP With Static IP Addresses</title>
 
 	  <indexterm>
 	    <primary>PPP</primary>
@@ -513,10 +499,10 @@ protocol: ppp</screen>
 	    <filename
 	      class="directory">/usr/share/examples/ppp/</filename>
 	    directory.</para>
-	</sect4>
+	</sect2>
 
-	<sect4 id="userppp-dynamicIP">
-	  <title>PPP and Dynamic IP Addresses</title>
+	<sect2 id="userppp-dynamicIP">
+	  <title>PPP With Dynamic IP Addresses</title>
 
 	  <indexterm>
 	    <primary>PPP</primary>
@@ -615,9 +601,9 @@ protocol: ppp</screen>
 	    and
 	    <filename>/usr/share/examples/ppp/ppp.linkup.sample</filename>
 	    for a detailed example.</para>
-	</sect4>
+	</sect2>
 
-	<sect4>
+	<sect2>
 	  <title>Receiving Incoming Calls</title>
 
 	  <indexterm>
@@ -636,9 +622,9 @@ protocol: ppp</screen>
 	    file contains the following:</para>
 
 	  <programlisting>gateway_enable="YES"</programlisting>
-	</sect4>
+	</sect2>
 
-	<sect4>
+	<sect2>
 	  <title>Which getty?</title>
 
 	  <para><link linkend="dialup">Configuring FreeBSD for
@@ -665,9 +651,9 @@ protocol: ppp</screen>
 	  <para>Refer to <link linkend="userppp-mgetty">Mgetty and
 	      AutoPPP</link> for more information on
 	    <command>mgetty</command>.</para>
-	</sect4>
+	</sect2>
 
-	<sect4>
+	<sect2>
 	  <title><application>PPP</application> Permissions</title>
 
 	  <para>The <command>ppp</command> command must normally be
@@ -688,10 +674,10 @@ protocol: ppp</screen>
 	  <para>If this command is used in the
 	    <literal>default</literal> section, it gives the specified
 	    users access to everything.</para>
-	</sect4>
+	</sect2>
 
-	<sect4>
-	  <title>PPP Shells for Dynamic-IP Users</title>
+	<sect2>
+	  <title>PPP Shells for Dynamic IP Users</title>
 
 	  <indexterm>
 	    <primary>PPP shells</primary>
@@ -740,10 +726,10 @@ exec /usr/sbin/ppp -direct $IDENT</progr
 
 	    <para>which prevents <filename>/etc/motd</filename> from
 	      being displayed.</para>
-	  </sect4>
+	  </sect2>
 
-	  <sect4>
-	    <title>PPP Shells for Static-IP Users</title>
+	  <sect2>
+	    <title>PPP Shells for Static IP Users</title>
 
 	    <indexterm>
 	      <primary>PPP shells</primary>
@@ -767,11 +753,11 @@ exec /usr/sbin/ppp -direct $IDENT</progr
 	      their shell set to the symbolic link created above (for
 	      example, <username>mary</username>'s shell should be
 	      <filename>/etc/ppp/ppp-mary</filename>).</para>
-	  </sect4>
+	  </sect2>
 
-	  <sect4>
+	  <sect2>
 	    <title>Setting Up <filename>ppp.conf</filename> for
-	      Dynamic-IP Users</title>
+	      Dynamic IP Users</title>
 
 	    <para>The <filename>/etc/ppp/ppp.conf</filename> file
 	      should contain something along the lines of:</para>
@@ -798,11 +784,11 @@ ttyu1:
 	      to the one for <literal>ttyu0:</literal> above.  Each
 	      line should get a unique IP address from your pool of
 	      IP addresses for dynamic users.</para>
-	  </sect4>
+	  </sect2>
 
-	  <sect4>
+	  <sect2>
 	    <title>Setting Up <filename>ppp.conf</filename> for
-	      Static-IP Users</title>
+	      Static IP Users</title>
 
 	    <para>Along with the contents of the sample
 	      <filename>/usr/share/examples/ppp/ppp.conf</filename>
@@ -834,9 +820,9 @@ sam:
 
 mary:
   add 203.14.103.0 netmask 255.255.255.0 HISADDR</programlisting>
-	</sect4>
+	</sect2>
 
-	<sect4 id="userppp-mgetty">
+	<sect2 id="userppp-mgetty">
 	  <title><command>mgetty</command> and AutoPPP</title>
 
 	  <indexterm>
@@ -907,9 +893,9 @@ exec /usr/sbin/ppp -direct pap$IDENT</pr
 	    <filename>/etc/ppp/ppp.secret</filename>.  See
 	    <filename>/usr/share/examples/ppp/ppp.secret.sample</filename>
 	    for examples.</para>
-	</sect4>
+	</sect2>
 
-	<sect4>
+	<sect2>
 	  <title>MS Extensions</title>
 
 	  <indexterm>
@@ -950,9 +936,9 @@ set nbns 203.14.100.5</programlisting>
 	    <literal>set dns</literal> line is omitted, PPP will
 	    use the values found in
 	    <filename>/etc/resolv.conf</filename>.</para>
-	</sect4>
+	</sect2>
 
-	<sect4 id="userppp-PAPnCHAP">
+	<sect2 id="userppp-PAPnCHAP">
 	  <title>PAP and CHAP Authentication</title>
 
 	  <indexterm><primary>PAP</primary></indexterm>
@@ -1023,9 +1009,9 @@ set nbns 203.14.100.5</programlisting>
 	      </listitem>
 	    </varlistentry>
 	  </variablelist>
-	</sect4>
+	</sect2>
 
-	<sect4>
+	<sect2>
 	  <title>Changing Your <command>ppp</command> Configuration
 	    on the Fly</title>
 
@@ -1046,10 +1032,9 @@ set nbns 203.14.100.5</programlisting>
 	  <para>Once a socket has been set up, the &man.pppctl.8;
 	    program may be used in scripts that wish to manipulate
 	    the running program.</para>
-	</sect4>
-      </sect3>
+	</sect2>
 
-      <sect3 id="userppp-nat">
+      <sect2 id="userppp-nat">
 	<title>Using PPP Network Address Translation
 	  Capability</title>
 
@@ -1080,9 +1065,9 @@ nat port tcp 10.0.0.2:http http</program
 	<para>or do not trust the outside at all</para>
 
 	<programlisting>nat deny_incoming yes</programlisting>
-      </sect3>
+      </sect2>
 
-      <sect3 id="userppp-final">
+      <sect2 id="userppp-final">
 	<title>Final System Configuration</title>
 
 	<indexterm>
@@ -1188,9 +1173,9 @@ ifconfig_tun0=</programlisting>
 	  <filename>start_if.tun0</filename> script), type:</para>
 
 	<screen>&prompt.root; <userinput>ppp -auto provider</userinput></screen>
-      </sect3>
+      </sect2>
 
-      <sect3>
+      <sect2>
 	<title>Summary</title>
 
 	<para>To recap, the following steps are necessary when setting
@@ -1278,21 +1263,21 @@ ifconfig_tun0=</programlisting>
 	      file.</para>
 	  </step>
 	</procedure>
-      </sect3>
     </sect2>
   </sect1>
 
   <sect1 id="ppp-troubleshoot">
+    <!--
     <sect1info>
       <authorgroup>
 	<author>
 	  <firstname>Tom</firstname>
 	  <surname>Rhodes</surname>
-	  <contrib>Contributed by </contrib>
+	  <contrib>Contributed by in June 2003</contrib>
 	</author>
       </authorgroup>
-      <!-- 13 June 2003 -->
     </sect1info>
+    -->
     <title>Troubleshooting <acronym>PPP</acronym> Connections</title>
 
     <indexterm>
@@ -1460,8 +1445,9 @@ OK
 	connection to the <acronym>ISP</acronym> and lowercase p's
 	show that the connection has been lost for whatever reason.
 	<command>ppp</command> only has these 2 states.</para>
+      </sect2>
 
-      <sect3>
+      <sect2>
 	<title>Debugging</title>
 
 	<para>If you have a direct line and cannot seem to make a
@@ -1546,15 +1532,11 @@ nameserver <replaceable>y.y.y.y</replace
 
 	<para>to <filename>/etc/syslog.conf</filename>.  In most
 	  cases, this functionality already exists.</para>
-
-      </sect3>
     </sect2>
   </sect1>
 
-
-
-
   <sect1 id="pppoe">
+    <!--
     <sect1info>
       <authorgroup>
 	<author>
@@ -1562,12 +1544,11 @@ nameserver <replaceable>y.y.y.y</replace
 	  <surname>Mock</surname>
 	  <contrib>Contributed (from
 	    http://node.to/freebsd/how-tos/how-to-freebsd-pppoe.html)
-	    by </contrib>
+	    by in Jan 2000</contrib>
 	</author>
       </authorgroup>
-      <!-- 10 Jan 2000 -->
     </sect1info>
-
+    -->
     <title>Using PPP over Ethernet (PPPoE)</title>
 
     <indexterm>
@@ -1575,26 +1556,9 @@ nameserver <replaceable>y.y.y.y</replace
       <secondary>over Ethernet</secondary>
     </indexterm>
 
-    <indexterm>
-      <primary>PPPoE</primary>
-      <see>PPP, over Ethernet</see>
-    </indexterm>
-
     <para>This section describes how to set up PPP over Ethernet
       (<acronym>PPPoE</acronym>).</para>
 
-    <sect2>
-      <title>Configuring the Kernel</title>
-
-      <para>No kernel configuration is necessary for PPPoE any longer.
-	If the necessary netgraph support is not built into the
-	kernel, it will be dynamically loaded by
-	<application>ppp</application>.</para>
-    </sect2>
-
-    <sect2>
-      <title>Setting Up <filename>ppp.conf</filename></title>
-
       <para>Here is an example of a working
 	<filename>ppp.conf</filename>:</para>
 
@@ -1610,18 +1574,10 @@ name_of_service_provider:
   set login
   add default HISADDR</programlisting>
 
-    </sect2>
-
-    <sect2>
-      <title>Running <application>ppp</application></title>
-
       <para>As <username>root</username>, you can run:</para>
 
       <screen>&prompt.root; <userinput>ppp -ddial name_of_service_provider</userinput></screen>
 
-    </sect2>
-
-    <sect2>
       <title>Starting <application>ppp</application> at Boot</title>
 
       <para>Add the following to your
@@ -1631,7 +1587,6 @@ name_of_service_provider:
 ppp_mode="ddial"
 ppp_nat="YES"	# if you want to enable nat for your local network, otherwise NO
 ppp_profile="name_of_service_provider"</programlisting>
-    </sect2>
 
     <sect2>
       <title>Using a PPPoE Service Tag</title>
@@ -1670,16 +1625,10 @@ ppp_profile="name_of_service_provider"</
       <para>Do not forget to change <replaceable>ISP</replaceable>
 	to the profile you have just found above.</para>
 
-      <para>For additional information, see:</para>
-
-      <itemizedlist>
-	<listitem>
-	  <para><ulink
+      <para>For additional information, refer to <ulink
 	      url="http://renaud.waldura.com/doc/freebsd/pppoe/">Cheaper
 	    Broadband with FreeBSD on DSL</ulink> by Renaud
 	    Waldura.</para>
-	</listitem>
-      </itemizedlist>
     </sect2>
 
     <sect2 id="ppp-3com">
@@ -1714,7 +1663,6 @@ ppp_profile="name_of_service_provider"</
 	and a &tm.3com; <trademark
 	  class="registered">HomeConnect</trademark> ADSL Modem at
 	the same time.</para>
-
     </sect2>
   </sect1>
 
@@ -1784,7 +1732,6 @@ ppp_profile="adsl"</programlisting>
       <para>For this to work correctly you will need to have used the
 	sample <filename>ppp.conf</filename> which is supplied with
 	the <filename role="package">net/pppoa</filename> port.</para>
-
     </sect2>
 
     <sect2>
@@ -1897,7 +1844,6 @@ ng0: flags=88d1&lt;UP,POINTOPOINT,RUNNIN
 
     <para>Using <application>mpd</application> is the recommended
       way to connect to an ADSL service with &os;.</para>
-
   </sect2>
 
   <sect2>

From owner-svn-doc-head@FreeBSD.ORG  Thu Oct 17 21:56:10 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 816AD750;
 Thu, 17 Oct 2013 21:56:10 +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 6D80925C1;
 Thu, 17 Oct 2013 21:56:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9HLuAWN069616;
 Thu, 17 Oct 2013 21:56:10 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9HLuAEU069615;
 Thu, 17 Oct 2013 21:56:10 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310172156.r9HLuAEU069615@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 17 Oct 2013 21:56:10 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42992 - head/en_US.ISO8859-1/books/handbook/ppp-and-slip
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Oct 2013 21:56:10 -0000

Author: dru
Date: Thu Oct 17 21:56:10 2013
New Revision: 42992
URL: http://svnweb.freebsd.org/changeset/doc/42992

Log:
  This patch does the following:
  - replaces FreeBSD with entity
  - adds acronym tags for instances of PPP that refer to the protocol, the instances that refer to the app still need to be fixed
  - comments out "26.5.1. Using PPPoA with the Alcatel SpeedTouch USB" as the port it relies on has been broken for 4 years
  - fixes internal links
  
  This will be followed by a white space fix.

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

Modified: head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Thu Oct 17 21:22:38 2013	(r42991)
+++ head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Thu Oct 17 21:56:10 2013	(r42992)
@@ -18,47 +18,40 @@
   </chapterinfo>
   -->
 
-  <title>PPP</title>
+  <title><acronym>PPP</acronym></title>
 
   <sect1 id="ppp-and-slip-synopsis">
     <title>Synopsis</title>
 
     <indexterm id="ppp-ppp">
-      <primary>PPP</primary>
+      <primary><acronym>PPP</acronym></primary>
     </indexterm>
 
-    <para>FreeBSD has a number of ways to link one computer to
+    <para>&os; has a number of ways to link one computer to
       another.  To establish a network or Internet connection through
       a dial-up modem, or to allow others to do so through you,
-      requires the use of PPP.  This chapter describes setting
+      requires the use of <acronym>PPP</acronym>.  This chapter describes setting
       up these modem-based communication services in detail.</para>
 
     <para>After reading this chapter, you will know:</para>
 
     <itemizedlist>
       <listitem>
-	<para>How to set up user PPP.</para>
+	<para>How to set configure <acronym>PPP</acronym>.</para>
       </listitem>
       <listitem>
-	<para>How to set up <acronym>PPPoE</acronym> (PPP over
-	  Ethernet).</para>
+	<para>How to set up <acronym>PPP</acronym> over Ethernet (<acronym>PPPoE</acronym>).</para>
       </listitem>
       <listitem>
-	<para>How to set up <acronym>PPPoA</acronym> (PPP over
-	  ATM).</para>
+	<para>How to set up <acronym>PPP</acronym> over ATM (<acronym>PPPoA</acronym>).</para>
       </listitem>
     </itemizedlist>
 
     <indexterm>
-      <primary>PPP</primary>
-      <secondary>user PPP</secondary>
+      <primary><acronym>PPP</acronym></primary>
     </indexterm>
     <indexterm>
-      <primary>PPP</primary>
-      <secondary>kernel PPP</secondary>
-    </indexterm>
-    <indexterm>
-      <primary>PPP</primary>
+      <primary><acronym>PPP</acronym></primary>
       <secondary>over Ethernet</secondary>
     </indexterm>
 
@@ -70,7 +63,7 @@
       </listitem>
       <listitem>
 	<para>Understand the basics and purpose of a dialup connection
-	  and PPP.</para>
+	  and <acronym>PPP</acronym>.</para>
       </listitem>
     </itemizedlist>
   </sect1>
@@ -110,14 +103,14 @@
     </sect1info>
     -->
 
-    <title>Configuring PPP</title>
+    <title>Configuring <acronym>PPP</acronym></title>
 
 	<para>This document assumes you have the following:</para>
 
 	<itemizedlist>
 	  <listitem>
-	    <para>An account with an Internet Service Provider (ISP)<indexterm id="ppp-isp"><primary>ISP</primary></indexterm>
-	      which you connect to using PPP<indexterm id="ppp-ppp2"><primary>PPP</primary></indexterm>.</para>
+	    <para>An account with an Internet Service Provider (<acronym>ISP</acronym>)
+	      which you connect to using <acronym>PPP</acronym>.</para>
 	  </listitem>
 
 	  <listitem>
@@ -131,20 +124,18 @@
 	  </listitem>
 
 	  <listitem>
-	    <para>Your login name<indexterm id="ppp-login"><primary>login name</primary></indexterm> and password<indexterm id="ppp-password"><primary>password</primary></indexterm>.  (Either a
-	      regular &unix;<indexterm id="ppp-unix"><primary>UNIX</primary></indexterm> style login and password pair, or a PAP<indexterm id="ppp-pap"><primary>PAP</primary></indexterm>
-	      or CHAP<indexterm id="ppp-chap"><primary>CHAP</primary></indexterm> login and password pair).</para>
+	    <para>The login name and password assigned by the ISP.</para>
 	  </listitem>
 
 	  <listitem>
-	    <para>The IP address of one or more name servers<indexterm id="ppp-nameserver"><primary>nameserver</primary></indexterm>.
+	    <para>The IP address of one or more name servers.
 	      Normally, you will be given two IP addresses by your
 	      ISP to use for this.  If they have not given you at
 	      least one, then you can use the <command>enable
 		dns</command> command in <filename>ppp.conf</filename>
 	      and <application>ppp</application> will set the name
-	      servers for you.  This feature depends on your ISPs
-	      PPP implementation supporting DNS negotiation.</para>
+	      servers for you.  This feature depends on your ISP's
+	      <acronym>PPP</acronym> implementation supporting DNS negotiation.</para>
 	  </listitem>
 	</itemizedlist>
 
@@ -313,7 +304,7 @@
 	      <term>Line 6 &amp; 7:</term>
 
 	      <listitem>
-		<para>The dial string.  User PPP<indexterm><primary>PPP</primary><secondary>user PPP</secondary></indexterm> uses an expect-send
+		<para>The dial string.  PPP uses an expect-send
 		  syntax similar to the &man.chat.8; program.  Refer
 		  to the manual page for information on the features
 		  of this language.</para>
@@ -410,9 +401,9 @@
 	      <listitem>
 		<para>If you are using PAP<indexterm><primary>PAP</primary></indexterm> or CHAP<indexterm><primary>CHAP</primary></indexterm>, there will be no
 		  login at this point, and this line should be
-		  commented out or removed.  See <link
-		    linkend="userppp-PAPnCHAP">PAP and CHAP
-		    authentication</link> for further details.</para>
+		  commented out or removed.  See <xref
+		    linkend="userppp-PAPnCHAP"/>
+		  for further details.</para>
 
 		<para>The login string is of the same chat-like
 		  syntax as the dial string.  In this example, the
@@ -461,9 +452,8 @@ protocol: ppp</screen>
 		  use a <quote>guessed</quote> address, make sure that
 		  you create an entry in
 		  <filename>/etc/ppp/ppp.linkup</filename> as per the
-		  instructions for <link
-		  linkend="userppp-dynamicIP">PPP and Dynamic IP
-		  addresses</link>.  If this line is omitted,
+		  instructions in <xref
+		  linkend="userppp-dynamicIP"/>.  If this line is omitted,
 		  <command>ppp</command> cannot run in
 		  <option>-auto</option> mode.</para>
 	      </listitem>
@@ -502,10 +492,10 @@ protocol: ppp</screen>
 	</sect2>
 
 	<sect2 id="userppp-dynamicIP">
-	  <title>PPP With Dynamic IP Addresses</title>
+	  <title><acronym>PPP</acronym> With Dynamic IP Addresses</title>
 
 	  <indexterm>
-	    <primary>PPP</primary>
+	    <primary><acronym>PPP</acronym></primary>
 	    <secondary>with dynamic IP addresses</secondary>
 	  </indexterm>
 
@@ -519,9 +509,8 @@ protocol: ppp</screen>
 	    <quote>guessing</quote> an IP address and allowing
 	    <command>ppp</command> to set it up correctly using the IP
 	    Configuration Protocol (IPCP) after connecting.  The
-	    <filename>ppp.conf</filename> configuration is the same as
-	    <link linkend="userppp-staticIP">PPP and Static IP
-	    Addresses</link>, with the following change:</para>
+	    <filename>ppp.conf</filename> configuration is the same as that described in
+	    <xref linkend="userppp-staticIP"/>, with the following change:</para>
 
 	  <programlisting>17      set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.255 0.0.0.0</programlisting>
 
@@ -607,7 +596,7 @@ protocol: ppp</screen>
 	  <title>Receiving Incoming Calls</title>
 
 	  <indexterm>
-	    <primary>PPP</primary>
+	    <primary><acronym>PPP</acronym></primary>
 	    <secondary>receiving incoming calls</secondary>
 	  </indexterm>
 
@@ -627,8 +616,8 @@ protocol: ppp</screen>
 	<sect2>
 	  <title>Which getty?</title>
 
-	  <para><link linkend="dialup">Configuring FreeBSD for
-	      Dial-up Services</link> provides a good description
+	  <para><xref linkend="dialup"/>
+	    provides a good description
 	    on enabling dial-up services using &man.getty.8;.</para>
 
 	  <para>An alternative to <command>getty</command> is <ulink
@@ -645,11 +634,11 @@ protocol: ppp</screen>
 
 	  <para>Later versions of <command>mgetty</command> (from
 	    0.99beta onwards) also support the automatic detection of
-	    PPP streams, allowing your clients script-less access to
+	    <acronym>PPP</acronym> streams, allowing your clients script-less access to
 	    your server.</para>
 
-	  <para>Refer to <link linkend="userppp-mgetty">Mgetty and
-	      AutoPPP</link> for more information on
+	  <para>Refer to <xref linkend="userppp-mgetty"/>
+	    for more information on
 	    <command>mgetty</command>.</para>
 	</sect2>
 
@@ -677,10 +666,10 @@ protocol: ppp</screen>
 	</sect2>
 
 	<sect2>
-	  <title>PPP Shells for Dynamic IP Users</title>
+	  <title><acronym>PPP</acronym> Shells for Dynamic IP Users</title>
 
 	  <indexterm>
-	    <primary>PPP shells</primary>
+	    <primary><acronym>PPP</acronym> shells</primary>
 	  </indexterm>
 
 	  <para>Create a file called
@@ -710,7 +699,7 @@ exec /usr/sbin/ppp -direct $IDENT</progr
 	  <para>You should use this script as the
 	    <emphasis>shell</emphasis> for all of your dialup users.
 	    This is an example from <filename>/etc/passwd</filename>
-	    for a dialup PPP user with username
+	    for a dialup <acronym>PPP</acronym> user with username
 	    <username>pchilds</username> (remember do not directly
 	    edit the password file, use &man.vipw.8;).</para>
 
@@ -729,10 +718,10 @@ exec /usr/sbin/ppp -direct $IDENT</progr
 	  </sect2>
 
 	  <sect2>
-	    <title>PPP Shells for Static IP Users</title>
+	    <title><acronym>PPP</acronym> Shells for Static IP Users</title>
 
 	    <indexterm>
-	      <primary>PPP shells</primary>
+	      <primary><acronym>PPP</acronym> shells</primary>
 	    </indexterm>
 
 	    <para>Create the <filename>ppp-shell</filename> file as
@@ -841,7 +830,7 @@ mary:
 	      role="package">comms/mgetty+sendfax</filename> port
 	    comes with the <literal>AUTO_PPP</literal> option enabled
 	    allowing <command>mgetty</command> to detect the LCP
-	    phase of PPP connections and automatically spawn off a
+	    phase of <acronym>PPP</acronym> connections and automatically spawn off a
 	    ppp shell.  However, since the default login/password
 	    sequence does not occur it is necessary to authenticate
 	    users using either PAP or CHAP.</para>
@@ -859,7 +848,7 @@ mary:
 
 	  <para>This will tell <command>mgetty</command> to run the
 	    <filename>ppp-pap-dialup</filename> script for detected
-	    PPP connections.</para>
+	    <acronym>PPP</acronym> connections.</para>
 
 	  <para>Create a file called
 	    <filename>/etc/ppp/ppp-pap-dialup</filename> containing
@@ -907,14 +896,14 @@ exec /usr/sbin/ppp -direct pap$IDENT</pr
 	  </indexterm>
 
 	  <indexterm>
-	    <primary>PPP</primary>
+	    <primary><acronym>PPP</acronym></primary>
 	    <secondary>Microsoft extensions</secondary>
 	  </indexterm>
 
 	  <para>It is possible to configure PPP to supply DNS and
 	    NetBIOS nameserver addresses on demand.</para>
 
-	  <para>To enable these extensions with PPP version 1.x, the
+	  <para>To enable these extensions with <acronym>PPP</acronym> version 1.x, the
 	    following lines might be added to the relevant section
 	    of <filename>/etc/ppp/ppp.conf</filename>.</para>
 
@@ -922,7 +911,7 @@ exec /usr/sbin/ppp -direct pap$IDENT</pr
 set ns 203.14.100.1 203.14.100.2
 set nbns 203.14.100.5</programlisting>
 
-	  <para>And for PPP version 2 and above:</para>
+	  <para>And for <acronym>PPP</acronym> version 2 and above:</para>
 
 	  <programlisting>accept dns
 set dns 203.14.100.1 203.14.100.2
@@ -933,7 +922,7 @@ set nbns 203.14.100.5</programlisting>
 	    host.</para>
 
 	  <para>In version 2 and above, if the
-	    <literal>set dns</literal> line is omitted, PPP will
+	    <literal>set dns</literal> line is omitted, <acronym>PPP</acronym> will
 	    use the values found in
 	    <filename>/etc/resolv.conf</filename>.</para>
 	</sect2>
@@ -948,7 +937,7 @@ set nbns 203.14.100.5</programlisting>
 	    either of the PAP or CHAP authentication mechanisms.  If
 	    this is the case, your ISP will not give a
 	    <prompt>login:</prompt> prompt when you connect, but will
-	    start talking PPP immediately.</para>
+	    start talking <acronym>PPP</acronym> immediately.</para>
 
 	  <para>PAP is less secure than CHAP, but security is not
 	    normally an issue here as passwords, although being sent
@@ -956,11 +945,11 @@ set nbns 203.14.100.5</programlisting>
 	    serial line only.  There is not much room for crackers
 	    to <quote>eavesdrop</quote>.</para>
 
-	  <para>Referring back to the <link
-	      linkend="userppp-staticIP">PPP and Static IP
-	    addresses</link> or <link
-	      linkend="userppp-dynamicIP">PPP and Dynamic IP
-	    addresses</link> sections, the following alterations must
+	  <para>Referring back to <xref
+	      linkend="userppp-staticIP"/>
+	    or <xref
+	      linkend="userppp-dynamicIP"/>,
+	    the following alterations must
 	    be made:</para>
 
 	  <programlisting>13      set authname <replaceable>MyUserName</replaceable>
@@ -1035,11 +1024,11 @@ set nbns 203.14.100.5</programlisting>
 	</sect2>
 
       <sect2 id="userppp-nat">
-	<title>Using PPP Network Address Translation
+	<title>Using <acronym>PPP</acronym> Network Address Translation
 	  Capability</title>
 
 	<indexterm>
-	  <primary>PPP</primary><secondary>NAT</secondary>
+	  <primary><acronym>PPP</acronym></primary><secondary>NAT</secondary>
 	</indexterm>
 
 	<para>PPP has ability to use internal NAT without kernel
@@ -1049,7 +1038,7 @@ set nbns 203.14.100.5</programlisting>
 
 	<programlisting>nat enable yes</programlisting>
 
-	<para>Alternatively, PPP NAT may be enabled by command-line
+	<para>Alternatively, NAT may be enabled by command-line
 	  option <literal>-nat</literal>. There is also
 	  <filename>/etc/rc.conf</filename> knob named
 	  <literal>ppp_nat</literal>, which is enabled by
@@ -1071,7 +1060,7 @@ nat port tcp 10.0.0.2:http http</program
 	<title>Final System Configuration</title>
 
 	<indexterm>
-	  <primary>PPP</primary><secondary>configuration</secondary>
+	  <primary><acronym>PPP</acronym></primary><secondary>configuration</secondary>
 	</indexterm>
 
 	<para>You now have <command>ppp</command> configured, but
@@ -1167,7 +1156,7 @@ ifconfig_tun0=</programlisting>
 	<screen>&prompt.root; <userinput>ppp</userinput></screen>
 
 	<para>and then <command>dial provider</command> to start the
-	  PPP session, or, if you want <command>ppp</command> to
+	  <acronym>PPP</acronym> session, or, if you want <command>ppp</command> to
 	  establish sessions automatically when there is outbound
 	  traffic (and you have not created the
 	  <filename>start_if.tun0</filename> script), type:</para>
@@ -1281,12 +1270,12 @@ ifconfig_tun0=</programlisting>
     <title>Troubleshooting <acronym>PPP</acronym> Connections</title>
 
     <indexterm>
-      <primary>PPP</primary>
+      <primary><acronym>PPP</acronym></primary>
       <secondary>troubleshooting</secondary>
     </indexterm>
 
     <para>This section covers a few issues which may arise when
-      using PPP over a modem connection.  For instance, perhaps you
+      using <acronym>PPP</acronym> over a modem connection.  For instance, perhaps you
       need to know exactly what prompts the system you are dialing
       into will present.  Some <acronym>ISP</acronym>s present the
       <literal>ssword</literal> prompt, and others will present
@@ -1549,14 +1538,14 @@ nameserver <replaceable>y.y.y.y</replace
       </authorgroup>
     </sect1info>
     -->
-    <title>Using PPP over Ethernet (PPPoE)</title>
+    <title>Using <acronym>PPP</acronym> over Ethernet (PPPoE)</title>
 
     <indexterm>
-      <primary>PPP</primary>
+      <primary><acronym>PPP</acronym></primary>
       <secondary>over Ethernet</secondary>
     </indexterm>
 
-    <para>This section describes how to set up PPP over Ethernet
+    <para>This section describes how to set up <acronym>PPP</acronym> over Ethernet
       (<acronym>PPPoE</acronym>).</para>
 
       <para>Here is an example of a working
@@ -1601,10 +1590,8 @@ ppp_profile="name_of_service_provider"</
 	you cannot locate it there, ask your ISP's tech support
 	personnel.</para>
 
-      <para>As a last resort, you could try the method suggested by
-	the <ulink url="http://www.roaringpenguin.com/pppoe/">Roaring
-	Penguin PPPoE</ulink> program which can be found in the <link
-	linkend="ports">Ports Collection</link>.  Bear in mind
+      <para>As a last resort, you could try installing
+	the <filename role="package">net/rr-pppoe</filename> package or port.  Bear in mind
 	however, this may de-program your modem and render it useless,
 	so think twice before doing it.  Simply install the program
 	shipped with the modem by your provider.  Then, access the
@@ -1627,7 +1614,7 @@ ppp_profile="name_of_service_provider"</
 
       <para>For additional information, refer to <ulink
 	      url="http://renaud.waldura.com/doc/freebsd/pppoe/">Cheaper
-	    Broadband with FreeBSD on DSL</ulink> by Renaud
+	    Broadband with &os; on DSL</ulink> by Renaud
 	    Waldura.</para>
     </sect2>
 
@@ -1639,7 +1626,7 @@ ppp_profile="name_of_service_provider"</
 
       <para>This modem does not follow <ulink
 	  url="http://www.faqs.org/rfcs/rfc2516.html">RFC 2516</ulink>
-	(<emphasis>A Method for transmitting PPP over Ethernet
+	(<emphasis>A Method for transmitting <acronym>PPP</acronym> over Ethernet
 	(PPPoE)</emphasis>, written by L. Mamakos, K. Lidl, J. Evarts,
 	D. Carrel, D. Simone, and R. Wheeler).  Instead, different
 	packet type codes have been used for the Ethernet frames.
@@ -1647,7 +1634,7 @@ ppp_profile="name_of_service_provider"</
 	  url="http://www.3com.com/">3Com</ulink> if you think it
 	should comply with the PPPoE specification.</para>
 
-      <para>In order to make FreeBSD capable of communicating with
+      <para>In order to make &os; capable of communicating with
 	this device, a sysctl must be set.  This can be done
 	automatically at boot time by updating
 	<filename>/etc/sysctl.conf</filename>:</para>
@@ -1671,30 +1658,29 @@ ppp_profile="name_of_service_provider"</
       (PPPoA)</title>
 
     <indexterm>
-      <primary>PPP</primary>
+      <primary><acronym>PPP</acronym></primary>
       <secondary>over ATM</secondary>
     </indexterm>
 
     <indexterm>
       <primary>PPPoA</primary>
-      <see>PPP, over ATM</see>
     </indexterm>
 
     <para>The following describes how to set up PPP over ATM (PPPoA).
       PPPoA is a popular choice among European DSL providers.</para>
-
+<!--
+This port is broken as of June, 2009
     <sect2>
       <title>Using PPPoA with the Alcatel &speedtouch; USB</title>
 
       <para>PPPoA support for this device is supplied as a port in
-	FreeBSD because the firmware is distributed under <ulink
+	&os; because the firmware is distributed under <ulink
 	url="http://www.speedtouchdsl.com/disclaimer_lx.htm">Alcatel's
 	license agreement</ulink> and can not be redistributed freely
-	with the base system of FreeBSD.</para>
+	with the base system of &os;.</para>
 
-      <para>To install the software, simply use the <link
-	  linkend="ports">Ports Collection</link>. Install the
-	<filename role="package">net/pppoa</filename> port and follow
+      <para>This software can be installed using the
+	<filename role="package">net/pppoa</filename> package or port.  Once installed, follow
 	the instructions provided with it.</para>
 
       <para>Like many USB devices, the Alcatel &speedtouch; USB needs
@@ -1733,6 +1719,7 @@ ppp_profile="adsl"</programlisting>
 	sample <filename>ppp.conf</filename> which is supplied with
 	the <filename role="package">net/pppoa</filename> port.</para>
     </sect2>
+    -->
 
     <sect2>
       <title>Using mpd</title>
@@ -1740,7 +1727,7 @@ ppp_profile="adsl"</programlisting>
       <para>You can use <application>mpd</application> to connect to a
 	variety of services, in particular PPTP services.  You can
 	find <application>mpd</application> in the Ports Collection,
-	<filename role="package">net/mpd</filename>.  Many ADSL modems
+	<filename role="package">net/mpd5</filename>.  Many ADSL modems
 	require that a PPTP tunnel is created between the modem and
 	computer, one such modem is the Alcatel &speedtouch;
 	Home.</para>
@@ -1849,7 +1836,7 @@ ng0: flags=88d1&lt;UP,POINTOPOINT,RUNNIN
   <sect2>
     <title>Using pptpclient</title>
 
-    <para>It is also possible to use FreeBSD to connect to other
+    <para>It is also possible to use &os; to connect to other
       PPPoA services using <filename
 	role="package">net/pptpclient</filename>.</para>
 
@@ -1896,13 +1883,13 @@ ng0: flags=88d1&lt;UP,POINTOPOINT,RUNNIN
 
       </warning>
 
-      <para>This will open a tunnel for a PPP session to your DSL
+      <para>This will open a tunnel for a <acronym>PPP</acronym> session to your DSL
 	router.  Ethernet DSL modems have a preconfigured LAN IP
 	address which you connect to.  In the case of the Alcatel
 	&speedtouch; Home this address is <hostid
 	  role="ipaddr">10.0.0.138</hostid>. Your router
 	documentation should tell you which address your device
-	uses.  To open the tunnel and start a PPP session execute
+	uses.  To open the tunnel and start a <acronym>PPP</acronym> session execute
 	the following command:</para>
 
       <screen>&prompt.root; <userinput>pptp <replaceable>address</replaceable> <replaceable>adsl</replaceable></userinput></screen>

From owner-svn-doc-head@FreeBSD.ORG  Thu Oct 17 22:33:33 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id F1ECB8AD;
 Thu, 17 Oct 2013 22:33:32 +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 DDCC327F4;
 Thu, 17 Oct 2013 22:33:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9HMXW0Q090648;
 Thu, 17 Oct 2013 22:33:32 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9HMXWQT090647;
 Thu, 17 Oct 2013 22:33:32 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310172233.r9HMXWQT090647@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 17 Oct 2013 22:33:32 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42993 - head/en_US.ISO8859-1/books/handbook/ppp-and-slip
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Oct 2013 22:33:33 -0000

Author: dru
Date: Thu Oct 17 22:33:32 2013
New Revision: 42993
URL: http://svnweb.freebsd.org/changeset/doc/42993

Log:
  White space fix only. Translators can ignore.

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

Modified: head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Thu Oct 17 21:56:10 2013	(r42992)
+++ head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Thu Oct 17 22:33:32 2013	(r42993)
@@ -27,11 +27,11 @@
       <primary><acronym>PPP</acronym></primary>
     </indexterm>
 
-    <para>&os; has a number of ways to link one computer to
-      another.  To establish a network or Internet connection through
-      a dial-up modem, or to allow others to do so through you,
-      requires the use of <acronym>PPP</acronym>.  This chapter describes setting
-      up these modem-based communication services in detail.</para>
+    <para>&os; has a number of ways to link one computer to another.
+      To establish a network or Internet connection through a dial-up
+      modem, or to allow others to do so through you, requires the use
+      of <acronym>PPP</acronym>.  This chapter describes setting u
+      p these modem-based communication services in detail.</para>
 
     <para>After reading this chapter, you will know:</para>
 
@@ -40,10 +40,12 @@
 	<para>How to set configure <acronym>PPP</acronym>.</para>
       </listitem>
       <listitem>
-	<para>How to set up <acronym>PPP</acronym> over Ethernet (<acronym>PPPoE</acronym>).</para>
+	<para>How to set up <acronym>PPP</acronym> over Ethernet
+	  (<acronym>PPPoE</acronym>).</para>
       </listitem>
       <listitem>
-	<para>How to set up <acronym>PPP</acronym> over ATM (<acronym>PPPoA</acronym>).</para>
+	<para>How to set up <acronym>PPP</acronym> over ATM
+	  (<acronym>PPPoA</acronym>).</para>
       </listitem>
     </itemizedlist>
 
@@ -105,120 +107,119 @@
 
     <title>Configuring <acronym>PPP</acronym></title>
 
-	<para>This document assumes you have the following:</para>
+    <para>This document assumes you have the following:</para>
 
-	<itemizedlist>
-	  <listitem>
-	    <para>An account with an Internet Service Provider (<acronym>ISP</acronym>)
-	      which you connect to using <acronym>PPP</acronym>.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>A modem or
-	      other device connected to your system and properly
-	      configured to allow you to connect to your ISP.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>The dial-up number(s) of your ISP.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>The login name and password assigned by the ISP.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>The IP address of one or more name servers.
-	      Normally, you will be given two IP addresses by your
-	      ISP to use for this.  If they have not given you at
-	      least one, then you can use the <command>enable
-		dns</command> command in <filename>ppp.conf</filename>
-	      and <application>ppp</application> will set the name
-	      servers for you.  This feature depends on your ISP's
-	      <acronym>PPP</acronym> implementation supporting DNS negotiation.</para>
-	  </listitem>
-	</itemizedlist>
-
-	<para>The following information may be supplied by your ISP,
-	  but is not completely necessary:</para>
-
-	<itemizedlist>
-	  <listitem>
-	    <para>The IP address of your ISP's gateway.  The gateway
-	      is the machine to which you will connect and will be
-	      set up as your <emphasis>default route</emphasis>.  If
-	      you do not have this information, we can make one up
-	      and your ISP's PPP server will tell us the correct value
-	      when we connect.</para>
-
-	    <para>This IP number is referred to as
-	      <literal>HISADDR</literal> by
-	      <application>ppp</application>.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>The netmask you should use.  If your ISP has not
-	      provided you with one, you can safely use <hostid
-		role="netmask">255.255.255.255</hostid>.</para>
-	  </listitem>
-
-	  <listitem>
-	    <indexterm id="ppp-static-ip">
-	      <primary>static IP address</primary>
-	    </indexterm>
+    <itemizedlist>
+      <listitem>
+	<para>An account with an Internet Service Provider
+	  (<acronym>ISP</acronym>) which you connect to using
+	  <acronym>PPP</acronym>.</para>
+      </listitem>
 
-	    <para>If your ISP provides you with a static IP address
-	      and hostname, you can enter it.  Otherwise, we simply
-	      let the peer assign whatever IP address it sees
-	      fit.</para>
-	  </listitem>
-	</itemizedlist>
+      <listitem>
+	<para>A modem or other device connected to your system and
+	  properly configured to allow you to connect to your
+	  ISP.</para>
+      </listitem>
 
-	<para>If you do not have any of the required information,
-	  contact your ISP.</para>
+      <listitem>
+	<para>The dial-up number(s) of your ISP.</para>
+      </listitem>
 
-	<note>
-	  <para>Throughout this section, many of the examples showing
-	    the contents of configuration files are numbered by line.
-	    These numbers serve to aid in the presentation and
-	    discussion only and are not meant to be placed in the
-	    actual file.  Proper indentation with tab and space
-	    characters is also important.</para>
-	</note>
+      <listitem>
+	<para>The login name and password assigned by the ISP.</para>
+      </listitem>
 
-	<para><command>ppp</command> uses the configuration files
-	  located in <filename class="directory">/etc/ppp</filename>.
-	  Examples can be found in <filename
-	    class="directory">/usr/share/examples/ppp/</filename>.</para>
-
-	<para>Configuring <command>ppp</command> requires that you
-	  edit a number of files, depending on your requirements.
-	  What you put in them depends to some extent on whether your
-	  ISP allocates IP addresses statically (i.e., you get given
-	  one IP address, and always use that one) or dynamically
-	  (i.e., your IP address changes each time you connect to
-	  your ISP).</para>
+      <listitem>
+	<para>The IP address of one or more name servers.
+	  Normally, you will be given two IP addresses by your
+	  ISP to use for this.  If they have not given you at
+	  least one, then you can use the <command>enable
+	    dns</command> command in <filename>ppp.conf</filename>
+	  and <application>ppp</application> will set the name
+	  servers for you.  This feature depends on your ISP's
+	  <acronym>PPP</acronym> implementation supporting DNS
+	  negotiation.</para>
+      </listitem>
+    </itemizedlist>
 
-	<sect2 id="userppp-staticIP">
-	  <title>PPP With Static IP Addresses</title>
+    <para>The following information may be supplied by your ISP, but
+      is not completely necessary:</para>
 
-	  <indexterm>
-	    <primary>PPP</primary>
-	    <secondary>with static IP addresses</secondary>
-	  </indexterm>
+    <itemizedlist>
+      <listitem>
+	<para>The IP address of your ISP's gateway.  The gateway is
+	  the machine to which you will connect and will be set up as
+	  your <emphasis>default route</emphasis>.  If you do not have
+	  this information, we can make one up and your ISP's PPP
+	  server will tell us the correct value when we
+	  connect.</para>
+
+	<para>This IP number is referred to as
+	  <literal>HISADDR</literal> by
+	  <application>ppp</application>.</para>
+      </listitem>
 
-	  <para>You will need to edit the
-	    <filename>/etc/ppp/ppp.conf</filename> configuration file.
-	    It should look similar to the example below.</para>
-
-	  <note>
-	    <para>Lines that end in a <literal>:</literal> start in
-	      the first column (beginning of the line)&mdash; all
-	      other lines should be indented as shown using spaces
-	      or tabs.</para>
-	  </note>
+      <listitem>
+	<para>The netmask you should use.  If your ISP has not
+	  provided you with one, you can safely use <hostid
+	    role="netmask">255.255.255.255</hostid>.</para>
+      </listitem>
 
-	  <programlisting>1     default:
+      <listitem>
+	<indexterm id="ppp-static-ip">
+	  <primary>static IP address</primary>
+	</indexterm>
+
+	<para>If your ISP provides you with a static IP address and
+	  hostname, you can enter it.  Otherwise, we simply let the
+	  peer assign whatever IP address it sees fit.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>If you do not have any of the required information, contact
+      your ISP.</para>
+
+    <note>
+      <para>Throughout this section, many of the examples showing the
+	contents of configuration files are numbered by line.  These
+	numbers serve to aid in the presentation and discussion only
+	and are not meant to be placed in the actual file.  Proper
+	indentation with tab and space characters is also
+	important.</para>
+    </note>
+
+    <para><command>ppp</command> uses the configuration files located
+      in <filename class="directory">/etc/ppp</filename>.  Examples
+      can be found in <filename
+	class="directory">/usr/share/examples/ppp/</filename>.</para>
+
+    <para>Configuring <command>ppp</command> requires that you edit a
+      number of files, depending on your requirements.  What you put
+      in them depends to some extent on whether your ISP allocates IP
+      addresses statically (i.e., you get given one IP address, and
+      always use that one) or dynamically (i.e., your IP address
+      changes each time you connect to your ISP).</para>
+
+    <sect2 id="userppp-staticIP">
+      <title>PPP With Static IP Addresses</title>
+
+      <indexterm>
+	<primary>PPP</primary>
+	  <secondary>with static IP addresses</secondary>
+      </indexterm>
+
+      <para>You will need to edit the
+	<filename>/etc/ppp/ppp.conf</filename> configuration file.
+	It should look similar to the example below.</para>
+
+      <note>
+	<para>Lines that end in a <literal>:</literal> start in the
+	  first column (beginning of the line)&mdash; all other lines
+	  should be indented as shown using spaces or tabs.</para>
+      </note>
+
+      <programlisting>1     default:
 2       set log Phase Chat LCP IPCP CCP tun command
 3       ident user-ppp VERSION (built COMPILATIONDATE)
 4       set device /dev/cuau0
@@ -399,11 +400,13 @@
 	      <term>Line 15:</term>
 
 	      <listitem>
-		<para>If you are using PAP<indexterm><primary>PAP</primary></indexterm> or CHAP<indexterm><primary>CHAP</primary></indexterm>, there will be no
-		  login at this point, and this line should be
-		  commented out or removed.  See <xref
-		    linkend="userppp-PAPnCHAP"/>
-		  for further details.</para>
+		<para>If you are using
+		  PAP<indexterm><primary>PAP</primary></indexterm> or
+		  CHAP<indexterm><primary>CHAP</primary></indexterm>,
+		  there will be no login at this point, and this line
+		  should be commented out or removed.  See <xref
+		    linkend="userppp-PAPnCHAP"/> for further
+		  details.</para>
 
 		<para>The login string is of the same chat-like
 		  syntax as the dial string.  In this example, the
@@ -427,12 +430,13 @@ protocol: ppp</screen>
 	      <term>Line 16:</term>
 
 	      <listitem>
-		<para>Sets the default idle timeout<indexterm><primary>timeout</primary></indexterm> (in seconds) for
-		  the connection.  Here, the connection will be closed
-		  automatically after 300 seconds of inactivity.  If
-		  you never want to timeout, set this value to zero
-		  or use the <option>-ddial</option> command line
-		  switch.</para>
+		<para>Sets the default idle
+		  timeout<indexterm><primary>timeout</primary></indexterm>
+		  (in seconds) for the connection.  Here, the
+		  connection will be closed automatically after 300
+		  seconds of inactivity.  If you never want to
+		  timeout, set this value to zero or use the
+		  <option>-ddial</option> command line switch.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -441,20 +445,21 @@ protocol: ppp</screen>
 	      <listitem>
 		<para>Sets the interface addresses.  The string
 		  <replaceable>x.x.x.x</replaceable> should be
-		  replaced by the IP address that your provider<indexterm><primary>ISP</primary></indexterm> has
-		  allocated to you.  The string
+		  replaced by the IP address that your
+		  provider<indexterm><primary>ISP</primary></indexterm>
+		  has allocated to you.  The string
 		  <replaceable>y.y.y.y</replaceable> should be
 		  replaced by the IP address that your ISP indicated
 		  for their gateway (the machine to which you
 		  connect).  If your ISP has not given you a gateway
 		  address, use <hostid
-		  role="netmask">10.0.0.2/0</hostid>.  If you need to
-		  use a <quote>guessed</quote> address, make sure that
-		  you create an entry in
+		    role="netmask">10.0.0.2/0</hostid>.  If you need
+		  to use a <quote>guessed</quote> address, make sure
+		  that you create an entry in
 		  <filename>/etc/ppp/ppp.linkup</filename> as per the
 		  instructions in <xref
-		  linkend="userppp-dynamicIP"/>.  If this line is omitted,
-		  <command>ppp</command> cannot run in
+		    linkend="userppp-dynamicIP"/>.  If this line is
+		  omitted,  <command>ppp</command> cannot run in
 		  <option>-auto</option> mode.</para>
 	      </listitem>
 	    </varlistentry>
@@ -492,7 +497,8 @@ protocol: ppp</screen>
 	</sect2>
 
 	<sect2 id="userppp-dynamicIP">
-	  <title><acronym>PPP</acronym> With Dynamic IP Addresses</title>
+	  <title><acronym>PPP</acronym> With Dynamic IP
+	    Addresses</title>
 
 	  <indexterm>
 	    <primary><acronym>PPP</acronym></primary>
@@ -509,8 +515,10 @@ protocol: ppp</screen>
 	    <quote>guessing</quote> an IP address and allowing
 	    <command>ppp</command> to set it up correctly using the IP
 	    Configuration Protocol (IPCP) after connecting.  The
-	    <filename>ppp.conf</filename> configuration is the same as that described in
-	    <xref linkend="userppp-staticIP"/>, with the following change:</para>
+	    <filename>ppp.conf</filename> configuration is the same as
+	    that described in <xref
+	      linkend="userppp-staticIP"/>, with the following
+	    change:</para>
 
 	  <programlisting>17      set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.255 0.0.0.0</programlisting>
 
@@ -634,12 +642,11 @@ protocol: ppp</screen>
 
 	  <para>Later versions of <command>mgetty</command> (from
 	    0.99beta onwards) also support the automatic detection of
-	    <acronym>PPP</acronym> streams, allowing your clients script-less access to
-	    your server.</para>
+	    <acronym>PPP</acronym> streams, allowing your clients
+	    script-less access to your server.</para>
 
-	  <para>Refer to <xref linkend="userppp-mgetty"/>
-	    for more information on
-	    <command>mgetty</command>.</para>
+	  <para>Refer to <xref linkend="userppp-mgetty"/> for more
+	    information on <command>mgetty</command>.</para>
 	</sect2>
 
 	<sect2>
@@ -666,7 +673,8 @@ protocol: ppp</screen>
 	</sect2>
 
 	<sect2>
-	  <title><acronym>PPP</acronym> Shells for Dynamic IP Users</title>
+	  <title><acronym>PPP</acronym> Shells for Dynamic IP
+	    Users</title>
 
 	  <indexterm>
 	    <primary><acronym>PPP</acronym> shells</primary>
@@ -718,7 +726,8 @@ exec /usr/sbin/ppp -direct $IDENT</progr
 	  </sect2>
 
 	  <sect2>
-	    <title><acronym>PPP</acronym> Shells for Static IP Users</title>
+	    <title><acronym>PPP</acronym> Shells for Static IP
+	      Users</title>
 
 	    <indexterm>
 	      <primary><acronym>PPP</acronym> shells</primary>
@@ -830,10 +839,11 @@ mary:
 	      role="package">comms/mgetty+sendfax</filename> port
 	    comes with the <literal>AUTO_PPP</literal> option enabled
 	    allowing <command>mgetty</command> to detect the LCP
-	    phase of <acronym>PPP</acronym> connections and automatically spawn off a
-	    ppp shell.  However, since the default login/password
-	    sequence does not occur it is necessary to authenticate
-	    users using either PAP or CHAP.</para>
+	    phase of <acronym>PPP</acronym> connections and
+	    automatically spawn off a ppp shell.  However, since the
+	    default login/password sequence does not occur it is
+	    necessary to authenticate users using either PAP or
+	    CHAP.</para>
 
 	  <para>This section assumes the user has successfully
 	    compiled, and installed the <filename
@@ -903,15 +913,17 @@ exec /usr/sbin/ppp -direct pap$IDENT</pr
 	  <para>It is possible to configure PPP to supply DNS and
 	    NetBIOS nameserver addresses on demand.</para>
 
-	  <para>To enable these extensions with <acronym>PPP</acronym> version 1.x, the
-	    following lines might be added to the relevant section
-	    of <filename>/etc/ppp/ppp.conf</filename>.</para>
+	  <para>To enable these extensions with
+	    <acronym>PPP</acronym> version 1.x, the following lines
+	    might be added to the relevant section of
+	    <filename>/etc/ppp/ppp.conf</filename>.</para>
 
 	  <programlisting>enable msext
 set ns 203.14.100.1 203.14.100.2
 set nbns 203.14.100.5</programlisting>
 
-	  <para>And for <acronym>PPP</acronym> version 2 and above:</para>
+	  <para>And for <acronym>PPP</acronym> version 2 and
+	    above:</para>
 
 	  <programlisting>accept dns
 set dns 203.14.100.1 203.14.100.2
@@ -922,8 +934,8 @@ set nbns 203.14.100.5</programlisting>
 	    host.</para>
 
 	  <para>In version 2 and above, if the
-	    <literal>set dns</literal> line is omitted, <acronym>PPP</acronym> will
-	    use the values found in
+	    <literal>set dns</literal> line is omitted,
+	    <acronym>PPP</acronym> will use the values found in
 	    <filename>/etc/resolv.conf</filename>.</para>
 	</sect2>
 
@@ -970,7 +982,8 @@ set nbns 203.14.100.5</programlisting>
 	    <varlistentry>
 	      <term>Line 14:</term>
 	      <listitem>
-		<para>This line specifies your PAP/CHAP password<indexterm><primary>password</primary></indexterm>.
+		<para>This line specifies your PAP/CHAP
+		  password<indexterm><primary>password</primary></indexterm>.
 		  You will need to insert the correct value for
 		  <replaceable>MyPassword</replaceable>.  You may
 		  want to add an additional line, such as:</para>
@@ -1024,8 +1037,8 @@ set nbns 203.14.100.5</programlisting>
 	</sect2>
 
       <sect2 id="userppp-nat">
-	<title>Using <acronym>PPP</acronym> Network Address Translation
-	  Capability</title>
+	<title>Using <acronym>PPP</acronym> Network Address
+	  Translation Capability</title>
 
 	<indexterm>
 	  <primary><acronym>PPP</acronym></primary><secondary>NAT</secondary>
@@ -1156,9 +1169,9 @@ ifconfig_tun0=</programlisting>
 	<screen>&prompt.root; <userinput>ppp</userinput></screen>
 
 	<para>and then <command>dial provider</command> to start the
-	  <acronym>PPP</acronym> session, or, if you want <command>ppp</command> to
-	  establish sessions automatically when there is outbound
-	  traffic (and you have not created the
+	  <acronym>PPP</acronym> session, or, if you want
+	  <command>ppp</command> to establish sessions automatically
+	  when there is outbound traffic (and you have not created the
 	  <filename>start_if.tun0</filename> script), type:</para>
 
 	<screen>&prompt.root; <userinput>ppp -auto provider</userinput></screen>
@@ -1275,9 +1288,10 @@ ifconfig_tun0=</programlisting>
     </indexterm>
 
     <para>This section covers a few issues which may arise when
-      using <acronym>PPP</acronym> over a modem connection.  For instance, perhaps you
-      need to know exactly what prompts the system you are dialing
-      into will present.  Some <acronym>ISP</acronym>s present the
+      using <acronym>PPP</acronym> over a modem connection.  For
+      instance, perhaps you need to know exactly what prompts the
+      system you are dialing into will present.  Some
+      <acronym>ISP</acronym>s present the
       <literal>ssword</literal> prompt, and others will present
       <literal>password</literal>; if the <command>ppp</command>
       script is not written accordingly, the login attempt will
@@ -1519,8 +1533,8 @@ nameserver <replaceable>y.y.y.y</replace
 	<programlisting>!ppp
 *.*     /var/log/ppp.log</programlisting>
 
-	<para>to <filename>/etc/syslog.conf</filename>.  In most
-	  cases, this functionality already exists.</para>
+      <para>to <filename>/etc/syslog.conf</filename>.  In most
+	cases, this functionality already exists.</para>
     </sect2>
   </sect1>
 
@@ -1545,7 +1559,8 @@ nameserver <replaceable>y.y.y.y</replace
       <secondary>over Ethernet</secondary>
     </indexterm>
 
-    <para>This section describes how to set up <acronym>PPP</acronym> over Ethernet
+    <para>This section describes how to set up
+      <acronym>PPP</acronym> over Ethernet
       (<acronym>PPPoE</acronym>).</para>
 
       <para>Here is an example of a working
@@ -1590,14 +1605,14 @@ ppp_profile="name_of_service_provider"</
 	you cannot locate it there, ask your ISP's tech support
 	personnel.</para>
 
-      <para>As a last resort, you could try installing
-	the <filename role="package">net/rr-pppoe</filename> package or port.  Bear in mind
-	however, this may de-program your modem and render it useless,
-	so think twice before doing it.  Simply install the program
-	shipped with the modem by your provider.  Then, access the
-	<guimenu>System</guimenu> menu from the program.  The name
-	of your profile should be listed there.  It is usually
-	<emphasis>ISP</emphasis>.</para>
+      <para>As a last resort, you could try installing the <filename
+	  role="package">net/rr-pppoe</filename> package or port.
+	Bear in mind however, this may de-program your modem and
+	render it useless, so think twice before doing it.  Simply
+	install the program shipped with the modem by your provider.
+	Then, access the <guimenu>System</guimenu> menu from the
+	program.  The name of your profile should be listed there.  It
+	is usually <emphasis>ISP</emphasis>.</para>
 
       <para>The profile name (service tag) will be used in the PPPoE
 	configuration entry in <filename>ppp.conf</filename> as the
@@ -1609,13 +1624,14 @@ ppp_profile="name_of_service_provider"</
 
       <para>Do not forget to change <replaceable>xl1</replaceable>
 	to the proper device for your Ethernet card.</para>
+
       <para>Do not forget to change <replaceable>ISP</replaceable>
 	to the profile you have just found above.</para>
 
       <para>For additional information, refer to <ulink
-	      url="http://renaud.waldura.com/doc/freebsd/pppoe/">Cheaper
-	    Broadband with &os; on DSL</ulink> by Renaud
-	    Waldura.</para>
+	  url="http://renaud.waldura.com/doc/freebsd/pppoe/">Cheaper
+	  Broadband with &os; on DSL</ulink> by Renaud
+	Waldura.</para>
     </sect2>
 
     <sect2 id="ppp-3com">
@@ -1626,11 +1642,11 @@ ppp_profile="name_of_service_provider"</
 
       <para>This modem does not follow <ulink
 	  url="http://www.faqs.org/rfcs/rfc2516.html">RFC 2516</ulink>
-	(<emphasis>A Method for transmitting <acronym>PPP</acronym> over Ethernet
-	(PPPoE)</emphasis>, written by L. Mamakos, K. Lidl, J. Evarts,
-	D. Carrel, D. Simone, and R. Wheeler).  Instead, different
-	packet type codes have been used for the Ethernet frames.
-	Please complain to <ulink
+	(<emphasis>A Method for transmitting <acronym>PPP</acronym>
+	over Ethernet (PPPoE)</emphasis>, written by L. Mamakos, K.
+	Lidl, J. Evarts, D. Carrel, D. Simone, and R. Wheeler).
+	Instead, different packet type codes have been used for the
+	Ethernet frames.  Please complain to <ulink
 	  url="http://www.3com.com/">3Com</ulink> if you think it
 	should comply with the PPPoE specification.</para>
 
@@ -1727,9 +1743,9 @@ ppp_profile="adsl"</programlisting>
       <para>You can use <application>mpd</application> to connect to a
 	variety of services, in particular PPTP services.  You can
 	find <application>mpd</application> in the Ports Collection,
-	<filename role="package">net/mpd5</filename>.  Many ADSL modems
-	require that a PPTP tunnel is created between the modem and
-	computer, one such modem is the Alcatel &speedtouch;
+	<filename role="package">net/mpd5</filename>.  Many ADSL
+	modems require that a PPTP tunnel is created between the modem
+	and computer, one such modem is the Alcatel &speedtouch;
 	Home.</para>
 
       <para>First you must install the port, and then you can
@@ -1883,14 +1899,14 @@ ng0: flags=88d1&lt;UP,POINTOPOINT,RUNNIN
 
       </warning>
 
-      <para>This will open a tunnel for a <acronym>PPP</acronym> session to your DSL
-	router.  Ethernet DSL modems have a preconfigured LAN IP
-	address which you connect to.  In the case of the Alcatel
-	&speedtouch; Home this address is <hostid
+      <para>This will open a tunnel for a <acronym>PPP</acronym>
+	session to your DSL router.  Ethernet DSL modems have a
+	preconfigured LAN IP address which you connect to.  In the
+	case of the Alcatel &speedtouch; Home this address is <hostid
 	  role="ipaddr">10.0.0.138</hostid>. Your router
 	documentation should tell you which address your device
-	uses.  To open the tunnel and start a <acronym>PPP</acronym> session execute
-	the following command:</para>
+	uses.  To open the tunnel and start a <acronym>PPP</acronym>
+	session execute the following command:</para>
 
       <screen>&prompt.root; <userinput>pptp <replaceable>address</replaceable> <replaceable>adsl</replaceable></userinput></screen>
 

From owner-svn-doc-head@FreeBSD.ORG  Thu Oct 17 23:57:38 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 81749A77;
 Thu, 17 Oct 2013 23:57:36 +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 9B2AB2C27;
 Thu, 17 Oct 2013 23:57:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9HNvapn035334;
 Thu, 17 Oct 2013 23:57:36 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9HNvagu035333;
 Thu, 17 Oct 2013 23:57:36 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310172357.r9HNvagu035333@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 17 Oct 2013 23:57:36 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42994 - head/en_US.ISO8859-1/books/handbook/ppp-and-slip
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Oct 2013 23:57:38 -0000

Author: dru
Date: Thu Oct 17 23:57:36 2013
New Revision: 42994
URL: http://svnweb.freebsd.org/changeset/doc/42994

Log:
  This patch does the following:
  - rewords most occurances of "you"
  - puts acronym tags around ISP and IP
  - standardizes to "dial-up"
  
  White space patch to follow later.

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

Modified: head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Thu Oct 17 22:33:32 2013	(r42993)
+++ head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Thu Oct 17 23:57:36 2013	(r42994)
@@ -27,17 +27,16 @@
       <primary><acronym>PPP</acronym></primary>
     </indexterm>
 
-    <para>&os; has a number of ways to link one computer to another.
-      To establish a network or Internet connection through a dial-up
-      modem, or to allow others to do so through you, requires the use
-      of <acronym>PPP</acronym>.  This chapter describes setting u
-      p these modem-based communication services in detail.</para>
+    <para>&os; supports the Point-to-Point (<acronym>PPP</acronym>)
+      protocol which can be used to establish a network or Internet
+      connection using a dial-up modem.  This chapter describes how to
+      configure modem-based communication services in &os;.</para>
 
     <para>After reading this chapter, you will know:</para>
 
     <itemizedlist>
       <listitem>
-	<para>How to set configure <acronym>PPP</acronym>.</para>
+	<para>How to configure <acronym>PPP</acronym>.</para>
       </listitem>
       <listitem>
 	<para>How to set up <acronym>PPP</acronym> over Ethernet
@@ -64,7 +63,7 @@
 	<para>Be familiar with basic network terminology.</para>
       </listitem>
       <listitem>
-	<para>Understand the basics and purpose of a dialup connection
+	<para>Understand the basics and purpose of a dial-up connection
 	  and <acronym>PPP</acronym>.</para>
       </listitem>
     </itemizedlist>
@@ -107,78 +106,74 @@
 
     <title>Configuring <acronym>PPP</acronym></title>
 
-    <para>This document assumes you have the following:</para>
+    <para>In order to configure <acronym>PPP</acronym>, the following
+      items are needed:</para>
 
     <itemizedlist>
       <listitem>
-	<para>An account with an Internet Service Provider
-	  (<acronym>ISP</acronym>) which you connect to using
-	  <acronym>PPP</acronym>.</para>
+	<para>A dial-up account with an Internet Service Provider
+	  (<acronym>ISP</acronym>).</para>
       </listitem>
 
       <listitem>
-	<para>A modem or other device connected to your system and
-	  properly configured to allow you to connect to your
-	  ISP.</para>
+	<para>A dial-up modem.</para>
       </listitem>
 
       <listitem>
-	<para>The dial-up number(s) of your ISP.</para>
+	<para>The dial-up number for the <acronym>ISP</acronym>.</para>
       </listitem>
 
       <listitem>
-	<para>The login name and password assigned by the ISP.</para>
+	<para>The login name and password assigned by the <acronym>ISP</acronym>.</para>
       </listitem>
 
       <listitem>
-	<para>The IP address of one or more name servers.
-	  Normally, you will be given two IP addresses by your
-	  ISP to use for this.  If they have not given you at
-	  least one, then you can use the <command>enable
-	    dns</command> command in <filename>ppp.conf</filename>
+	<para>The <acronym>IP</acronym> address of one or more name servers.
+	  Normally, an <acronym>ISP</acronym> provides these addresses.
+	  If not, use <command>enable
+	    dns</command> in <filename>ppp.conf</filename>
 	  and <application>ppp</application> will set the name
-	  servers for you.  This feature depends on your ISP's
-	  <acronym>PPP</acronym> implementation supporting DNS
+	  servers.  This feature requires the <acronym>ISP</acronym>
+	  to supporting DNS
 	  negotiation.</para>
       </listitem>
     </itemizedlist>
 
-    <para>The following information may be supplied by your ISP, but
-      is not completely necessary:</para>
+    <para>The following information may be supplied by the <acronym>ISP</acronym>, but
+      is not necessary:</para>
 
     <itemizedlist>
       <listitem>
-	<para>The IP address of your ISP's gateway.  The gateway is
-	  the machine to which you will connect and will be set up as
-	  your <emphasis>default route</emphasis>.  If you do not have
-	  this information, we can make one up and your ISP's PPP
-	  server will tell us the correct value when we
-	  connect.</para>
+	<para>The <acronym>IP</acronym> address of the default gateway.
+	  If this information is missing
+	  the <acronym>ISP</acronym>'s <acronym>PPP</acronym>
+	  server will provide the correct value during
+	  connection setup.</para>
 
-	<para>This IP number is referred to as
+	<para>This <acronym>IP</acronym> number is referred to as
 	  <literal>HISADDR</literal> by
 	  <application>ppp</application>.</para>
       </listitem>
 
       <listitem>
-	<para>The netmask you should use.  If your ISP has not
-	  provided you with one, you can safely use <hostid
+	<para>The subnet mask.  If the <acronym>ISP</acronym> has not
+	  provided one, use <hostid
 	    role="netmask">255.255.255.255</hostid>.</para>
       </listitem>
 
       <listitem>
 	<indexterm id="ppp-static-ip">
-	  <primary>static IP address</primary>
+	  <primary>static <acronym>IP</acronym> address</primary>
 	</indexterm>
 
-	<para>If your ISP provides you with a static IP address and
-	  hostname, you can enter it.  Otherwise, we simply let the
-	  peer assign whatever IP address it sees fit.</para>
+	<para>If the <acronym>ISP</acronym> has assigned a static <acronym>IP</acronym> address and
+	  hostname, enter it.  Otherwise, this information will be provided
+	  during connection setup.</para>
       </listitem>
     </itemizedlist>
 
-    <para>If you do not have any of the required information, contact
-      your ISP.</para>
+    <para>If any required information is missing, contact
+      the <acronym>ISP</acronym>.</para>
 
     <note>
       <para>Throughout this section, many of the examples showing the
@@ -194,28 +189,26 @@
       can be found in <filename
 	class="directory">/usr/share/examples/ppp/</filename>.</para>
 
-    <para>Configuring <command>ppp</command> requires that you edit a
-      number of files, depending on your requirements.  What you put
-      in them depends to some extent on whether your ISP allocates IP
-      addresses statically (i.e., you get given one IP address, and
-      always use that one) or dynamically (i.e., your IP address
-      changes each time you connect to your ISP).</para>
+    <para>A number of files are edited when configuring
+      <command>ppp</command>.  The edits
+      depend to some extent on whether the <acronym>ISP</acronym> allocates <acronym>IP</acronym>
+      addresses statically or dynamically.</para>
 
     <sect2 id="userppp-staticIP">
-      <title>PPP With Static IP Addresses</title>
+      <title>PPP With Static <acronym>IP</acronym> Addresses</title>
 
       <indexterm>
 	<primary>PPP</primary>
-	  <secondary>with static IP addresses</secondary>
+	  <secondary>with static <acronym>IP</acronym> addresses</secondary>
       </indexterm>
 
-      <para>You will need to edit the
-	<filename>/etc/ppp/ppp.conf</filename> configuration file.
-	It should look similar to the example below.</para>
+      <para>If the ISP has provided an address that does not change, edit
+	<filename>/etc/ppp/ppp.conf</filename> as described
+	in the example below.</para>
 
       <note>
 	<para>Lines that end in a <literal>:</literal> start in the
-	  first column (beginning of the line)&mdash; all other lines
+	  first column (beginning of the line) while all other lines
 	  should be indented as shown using spaces or tabs.</para>
       </note>
 
@@ -353,9 +346,9 @@
 	      <listitem>
 		<para>Identifies an entry for a provider called
 		  <quote>provider</quote>.  This could be changed
-		  to the name of your <acronym>ISP</acronym> so
-		  that later you can use the <option>load
-		    <replaceable>ISP</replaceable></option> to start
+		  to the name of the <acronym>ISP</acronym> so
+		  that <option>load
+		    <replaceable>ISP</replaceable></option> can be used to start
 		  the connection.</para>
 	      </listitem>
 	    </varlistentry>
@@ -369,14 +362,14 @@
 		  colon (<literal>:</literal>) or pipe character
 		  (<literal>|</literal>) as a separator.  The
 		  difference between the two separators is described
-		  in &man.ppp.8;.  To summarize, if you want to rotate
-		  through the numbers, use a colon.  If you want to
+		  in &man.ppp.8;.  To summarize, to rotate
+		  through the numbers, use a colon.  To
 		  always attempt to dial the first number first and
 		  only use the other numbers if the first number
 		  fails, use the pipe character.  Always quote the
 		  entire set of phone numbers as shown.</para>
 
-		<para>You must enclose the phone number in quotation
+		<para>The phone number must be enclosed in quotation
 		  marks (<literal>"</literal>) if there is any
 		  intention on using spaces in the phone number.
 		  This can cause a simple, yet subtle error.</para>
@@ -400,9 +393,9 @@
 	      <term>Line 15:</term>
 
 	      <listitem>
-		<para>If you are using
-		  PAP<indexterm><primary>PAP</primary></indexterm> or
-		  CHAP<indexterm><primary>CHAP</primary></indexterm>,
+		<para>If 
+		  <acronym>PAP</acronym> or
+		  <acronym>CHAP</acronym> are used,
 		  there will be no login at this point, and this line
 		  should be commented out or removed.  See <xref
 		    linkend="userppp-PAPnCHAP"/> for further
@@ -418,10 +411,10 @@ login: <replaceable>foo</replaceable>
 password: <replaceable>bar</replaceable>
 protocol: ppp</screen>
 
-		<para>You will need to alter this script to suit your
-		  own needs.  When you write this script for the first
-		  time, you should ensure that you have enabled
-		  <quote>chat</quote> logging so you can determine if
+		<para>Alter this script to suit your
+		  own needs.  When writing this script for the first
+		  time, ensure that
+		  chat logging is enabled to help determine if
 		  the conversation is going as expected.</para>
 	      </listitem>
 	    </varlistentry>
@@ -434,7 +427,7 @@ protocol: ppp</screen>
 		  timeout<indexterm><primary>timeout</primary></indexterm>
 		  (in seconds) for the connection.  Here, the
 		  connection will be closed automatically after 300
-		  seconds of inactivity.  If you never want to
+		  seconds of inactivity.  To prevent a timeout
 		  timeout, set this value to zero or use the
 		  <option>-ddial</option> command line switch.</para>
 	      </listitem>
@@ -445,17 +438,16 @@ protocol: ppp</screen>
 	      <listitem>
 		<para>Sets the interface addresses.  The string
 		  <replaceable>x.x.x.x</replaceable> should be
-		  replaced by the IP address that your
-		  provider<indexterm><primary>ISP</primary></indexterm>
-		  has allocated to you.  The string
+		  replaced by the <acronym>IP</acronym> address that the
+		  <acronym>ISP</acronym>
+		  has allocated.  The string
 		  <replaceable>y.y.y.y</replaceable> should be
-		  replaced by the IP address that your ISP indicated
-		  for their gateway (the machine to which you
-		  connect).  If your ISP has not given you a gateway
+		  replaced by the <acronym>IP</acronym> address of the
+		  gateway.  If the <acronym>ISP</acronym> has not provided a gateway
 		  address, use <hostid
-		    role="netmask">10.0.0.2/0</hostid>.  If you need
-		  to use a <quote>guessed</quote> address, make sure
-		  that you create an entry in
+		    role="netmask">10.0.0.2/0</hostid>.  When
+		  using a <quote>guessed</quote> address,
+		  create an entry in
 		  <filename>/etc/ppp/ppp.linkup</filename> as per the
 		  instructions in <xref
 		    linkend="userppp-dynamicIP"/>.  If this line is
@@ -468,26 +460,26 @@ protocol: ppp</screen>
 	      <term>Line 18:</term>
 
 	      <listitem>
-		<para>Adds a default route to your ISP's gateway.  The
+		<para>Adds a default route to the gateway.  The
 		  special word <literal>HISADDR</literal> is replaced
 		  with the gateway address specified on line 17.  It
 		  is important that this line appears after line 17,
 		  otherwise <literal>HISADDR</literal> will not yet
 		  be initialized.</para>
 
-		<para>If you do not wish to run ppp in
-		  <option>-auto</option>, this line should be moved
+		<para>When
+		  <option>-auto</option> is not used, this line should be moved
 		  to the <filename>ppp.linkup</filename> file.</para>
 	      </listitem>
 	    </varlistentry>
 	  </variablelist>
 
 	  <para>It is not necessary to add an entry to
-	    <filename>ppp.linkup</filename> when you have a static
-	    IP address and are running ppp in <option>-auto</option>
-	    mode as your routing table entries are already correct
-	    before you connect.  You may however wish to create an
-	    entry to invoke programs after connection.  This is
+	    <filename>ppp.linkup</filename> when using a static
+	    <acronym>IP</acronym> address and when running ppp in <option>-auto</option>
+	    mode as the routing table entries are already correct.
+	    However, an
+	    entry can be created to invoke programs after connection.  This is
 	    explained later with the sendmail example.</para>
 
 	  <para>Example configuration files can be found in the
@@ -497,23 +489,23 @@ protocol: ppp</screen>
 	</sect2>
 
 	<sect2 id="userppp-dynamicIP">
-	  <title><acronym>PPP</acronym> With Dynamic IP
+	  <title><acronym>PPP</acronym> With Dynamic <acronym>IP</acronym>
 	    Addresses</title>
 
 	  <indexterm>
 	    <primary><acronym>PPP</acronym></primary>
-	    <secondary>with dynamic IP addresses</secondary>
+	    <secondary>with dynamic <acronym>IP</acronym> addresses</secondary>
 	  </indexterm>
 
 	  <indexterm>
 	    <primary>IPCP</primary>
 	  </indexterm>
 
-	  <para>If your service provider does not assign static IP
-	    addresses, <command>ppp</command> can be configured to
+	  <para>If the <acronym>IP</acronym>
+	    address changes whenever a connection is made, configure <command>ppp</command> to
 	    negotiate the local and remote addresses.  This is done by
-	    <quote>guessing</quote> an IP address and allowing
-	    <command>ppp</command> to set it up correctly using the IP
+	    <quote>guessing</quote> an <acronym>IP</acronym> address and allowing
+	    <command>ppp</command> to set it up correctly using the <acronym>IP</acronym>
 	    Configuration Protocol (IPCP) after connecting.  The
 	    <filename>ppp.conf</filename> configuration is the same as
 	    that described in <xref
@@ -533,15 +525,15 @@ protocol: ppp</screen>
 	      <listitem>
 		<para>The number after the <literal>/</literal>
 		  character is the number of bits of the address that
-		  ppp will insist on.  You may wish to use IP numbers
-		  more appropriate to your circumstances, but the
+		  ppp will insist on.  Other <acronym>IP</acronym> addresses
+		  can be used, but the
 		  above example will always work.</para>
 
 		<para>The last argument (<literal>0.0.0.0</literal>)
 		  tells PPP to start negotiations using address
 		  <hostid role="ipaddr">0.0.0.0</hostid> rather than
 		  <hostid role="ipaddr">10.0.0.1</hostid> and is
-		  necessary for some ISPs.  Do not use
+		  necessary for some <acronym>ISP</acronym>s.  Do not use
 		  <literal>0.0.0.0</literal> as the first argument
 		  to <command>set ifaddr</command> as it prevents
 		  PPP from setting up an initial route in
@@ -550,10 +542,10 @@ protocol: ppp</screen>
 	    </varlistentry>
 	  </variablelist>
 
-	  <para>If you are not running in <option>-auto</option> mode,
-	    you will need to create an entry in
-	    <filename>/etc/ppp/ppp.linkup</filename>.
-	    <filename>ppp.linkup</filename> is used after a connection
+	  <para>When not running in <option>-auto</option> mode,
+	    create an entry in
+	    <filename>/etc/ppp/ppp.linkup</filename> as this file
+	    is used after a connection
 	    has been established.  At this point,
 	    <command>ppp</command> will have assigned the interface
 	    addresses and it will now be possible to add the routing
@@ -572,8 +564,8 @@ protocol: ppp</screen>
 		  <filename>ppp.linkup</filename> according to the
 		  following rules: First, try to match the same label
 		  as we used in <filename>ppp.conf</filename>.  If
-		  that fails, look for an entry for the IP address of
-		  our gateway.  This entry is a four-octet IP style
+		  that fails, look for an entry for the <acronym>IP</acronym> address of
+		  our gateway.  This entry is a four-octet <acronym>IP</acronym> style
 		  label.  If we still have not found an entry, look
 		  for the <literal>MYADDR</literal> entry.</para>
 	      </listitem>
@@ -587,7 +579,7 @@ protocol: ppp</screen>
 		  default route that points to
 		  <literal>HISADDR</literal>.
 		  <literal>HISADDR</literal> will be replaced with the
-		  IP number of the gateway as negotiated by the
+		  <acronym>IP</acronym> number of the gateway as negotiated by the
 		  IPCP.</para>
 	      </listitem>
 	    </varlistentry>
@@ -608,15 +600,15 @@ protocol: ppp</screen>
 	    <secondary>receiving incoming calls</secondary>
 	  </indexterm>
 
-	  <para>When you configure <application>ppp</application> to
+	  <para>When configuring <application>ppp</application> to
 	    receive incoming calls on a machine connected to a LAN,
-	    you must decide if you wish to forward packets to the LAN.
-	    If you do, you should allocate the peer an IP number from
-	    your LAN's subnet, and use the command <command>enable
-	      proxy</command> in your
-	    <filename>/etc/ppp/ppp.conf</filename> file.  You should
-	    also confirm that the <filename>/etc/rc.conf</filename>
-	    file contains the following:</para>
+	    decide if packets should be forwarded to the LAN.
+	    If so, allocate the peer an <acronym>IP</acronym> address from
+	    the LAN's subnet, and use <command>enable
+	      proxy</command> in the
+	    <filename>/etc/ppp/ppp.conf</filename>.
+	    Alsom confirm that <filename>/etc/rc.conf</filename>
+	    contains the following line:</para>
 
 	  <programlisting>gateway_enable="YES"</programlisting>
 	</sect2>
@@ -637,13 +629,13 @@ protocol: ppp</screen>
 	  <para>The advantages of using <command>mgetty</command> is
 	    that it actively <emphasis>talks</emphasis> to modems,
 	    meaning if port is turned off in
-	    <filename>/etc/ttys</filename> then your modem will not
+	    <filename>/etc/ttys</filename> then the modem will not
 	    answer the phone.</para>
 
 	  <para>Later versions of <command>mgetty</command> (from
 	    0.99beta onwards) also support the automatic detection of
-	    <acronym>PPP</acronym> streams, allowing your clients
-	    script-less access to your server.</para>
+	    <acronym>PPP</acronym> streams, allowing clients
+	    scriptless access to the server.</para>
 
 	  <para>Refer to <xref linkend="userppp-mgetty"/> for more
 	    information on <command>mgetty</command>.</para>
@@ -653,15 +645,14 @@ protocol: ppp</screen>
 	  <title><application>PPP</application> Permissions</title>
 
 	  <para>The <command>ppp</command> command must normally be
-	    run as the <username>root</username> user.  If however,
-	    you wish to allow <command>ppp</command> to run in
-	    server mode as a normal user by executing
-	    <command>ppp</command> as described below, that user
+	    run as the <username>root</username> user.
+	    To instead allow <command>ppp</command> to run in
+	    server mode as a normal user, that user
 	    must be given permission to run <command>ppp</command>
 	    by adding them to the <groupname>network</groupname>
 	    group in <filename>/etc/group</filename>.</para>
 
-	  <para>You will also need to give them access to one or more
+	  <para>The user also needs access to one or more
 	    sections of the configuration file using the
 	    <command>allow</command> command:</para>
 
@@ -673,7 +664,7 @@ protocol: ppp</screen>
 	</sect2>
 
 	<sect2>
-	  <title><acronym>PPP</acronym> Shells for Dynamic IP
+	  <title><acronym>PPP</acronym> Shells for Dynamic <acronym>IP</acronym>
 	    Users</title>
 
 	  <indexterm>
@@ -704,12 +695,10 @@ exec /usr/sbin/ppp -direct $IDENT</progr
 
 	  <screen>&prompt.root; <userinput>ln -s ppp-shell /etc/ppp/ppp-dialup</userinput></screen>
 
-	  <para>You should use this script as the
-	    <emphasis>shell</emphasis> for all of your dialup users.
+	  <para>Use this script as the
+	    <emphasis>shell</emphasis> for all of dial-up users.
 	    This is an example from <filename>/etc/passwd</filename>
-	    for a dialup <acronym>PPP</acronym> user with username
-	    <username>pchilds</username> (remember do not directly
-	    edit the password file, use &man.vipw.8;).</para>
+	    for a dial-up <acronym>PPP</acronym>:</para>
 
 	    <programlisting>pchilds:*:1011:300:Peter Childs PPP:/home/ppp:/etc/ppp/ppp-dialup</programlisting>
 
@@ -726,7 +715,7 @@ exec /usr/sbin/ppp -direct $IDENT</progr
 	  </sect2>
 
 	  <sect2>
-	    <title><acronym>PPP</acronym> Shells for Static IP
+	    <title><acronym>PPP</acronym> Shells for Static <acronym>IP</acronym>
 	      Users</title>
 
 	    <indexterm>
@@ -735,19 +724,19 @@ exec /usr/sbin/ppp -direct $IDENT</progr
 
 	    <para>Create the <filename>ppp-shell</filename> file as
 	      above, and for each account with statically assigned
-	      IPs create a symbolic link to
+	      <acronym>IP</acronym>s create a symbolic link to
 	      <filename>ppp-shell</filename>.</para>
 
-	    <para>For example, if you have three dialup customers,
+	    <para>For example, to route /24 CIDR
+	      networks for the dial-up customers
 	      <username>fred</username>, <username>sam</username>,
-	      and <username>mary</username>, that you route /24 CIDR
-	      networks for, you would type the following:</para>
+	      and <username>mary</username>, type:</para>
 
 	    <screen>&prompt.root; <userinput>ln -s /etc/ppp/ppp-shell /etc/ppp/ppp-fred</userinput>
 &prompt.root; <userinput>ln -s /etc/ppp/ppp-shell /etc/ppp/ppp-sam</userinput>
 &prompt.root; <userinput>ln -s /etc/ppp/ppp-shell /etc/ppp/ppp-mary</userinput></screen>
 
-	    <para>Each of these users dialup accounts should have
+	    <para>Each of these users dial-up accounts should have
 	      their shell set to the symbolic link created above (for
 	      example, <username>mary</username>'s shell should be
 	      <filename>/etc/ppp/ppp-mary</filename>).</para>
@@ -755,7 +744,7 @@ exec /usr/sbin/ppp -direct $IDENT</progr
 
 	  <sect2>
 	    <title>Setting Up <filename>ppp.conf</filename> for
-	      Dynamic IP Users</title>
+	      Dynamic <acronym>IP</acronym> Users</title>
 
 	    <para>The <filename>/etc/ppp/ppp.conf</filename> file
 	      should contain something along the lines of:</para>
@@ -777,23 +766,21 @@ ttyu1:
 	    </note>
 
 	    <para>The <literal>default:</literal> section is loaded
-	      for each session.  For each dialup line enabled in
+	      for each session.  For each dial-up line enabled in
 	      <filename>/etc/ttys</filename> create an entry similar
 	      to the one for <literal>ttyu0:</literal> above.  Each
-	      line should get a unique IP address from your pool of
-	      IP addresses for dynamic users.</para>
+	      line should get a unique <acronym>IP</acronym> address from the pool of
+	      <acronym>IP</acronym> addresses for dynamic users.</para>
 	  </sect2>
 
 	  <sect2>
 	    <title>Setting Up <filename>ppp.conf</filename> for
-	      Static IP Users</title>
+	      Static <acronym>IP</acronym> Users</title>
 
 	    <para>Along with the contents of the sample
 	      <filename>/usr/share/examples/ppp/ppp.conf</filename>
-	      above you should add a section for each of the
-	      statically assigned dialup users.  We will continue with
-	      our <username>fred</username>, <username>sam</username>,
-	      and <username>mary</username> example.</para>
+	      above, add a section for each of the
+	      statically assigned dial-up users:.</para>
 
 	    <programlisting>fred:
   set ifaddr 203.14.100.1 203.14.101.1 255.255.255.255
@@ -806,7 +793,7 @@ mary:
 
 	    <para>The file <filename>/etc/ppp/ppp.linkup</filename>
 	      should also contain routing information for each static
-	      IP user if required.  The line below would add a route
+	      <acronym>IP</acronym> user if required.  The line below would add a route
 	      for the <hostid role="ipaddr">203.14.101.0/24</hostid>
 	      network via the client's ppp link.</para>
 
@@ -850,24 +837,24 @@ mary:
 	      role="package">comms/mgetty+sendfax</filename> port on
 	    his system.</para>
 
-	  <para>Make sure your
+	  <para>Ensure that
 	    <filename>/usr/local/etc/mgetty+sendfax/login.config</filename>
-	    file has the following in it:</para>
+	    has the following:</para>
 
 	  <programlisting>/AutoPPP/ -     - /etc/ppp/ppp-pap-dialup</programlisting>
 
-	  <para>This will tell <command>mgetty</command> to run the
-	    <filename>ppp-pap-dialup</filename> script for detected
+	  <para>This tells <command>mgetty</command> to run
+	    <filename>ppp-pap-dialup</filename> for detected
 	    <acronym>PPP</acronym> connections.</para>
 
-	  <para>Create a file called
+	  <para>Create an executable file called
 	    <filename>/etc/ppp/ppp-pap-dialup</filename> containing
-	    the following (the file should be executable):</para>
+	    the following:</para>
 
 	  <programlisting>#!/bin/sh
 exec /usr/sbin/ppp -direct pap$IDENT</programlisting>
 
-	  <para>For each dialup line enabled in
+	  <para>For each dial-up line enabled in
 	    <filename>/etc/ttys</filename>, create a corresponding
 	    entry in <filename>/etc/ppp/ppp.conf</filename>.  This
 	    will happily co-exist with the definitions we created
@@ -887,8 +874,8 @@ exec /usr/sbin/ppp -direct pap$IDENT</pr
 
 	  <programlisting>enable passwdauth</programlisting>
 
-	  <para>If you wish to assign some users a static IP number,
-	    you can specify the number as the third argument in
+	  <para>To assign some users a static <acronym>IP</acronym> number,
+	    specify the number as the third argument in
 	    <filename>/etc/ppp/ppp.secret</filename>.  See
 	    <filename>/usr/share/examples/ppp/ppp.secret.sample</filename>
 	    for examples.</para>
@@ -944,11 +931,11 @@ set nbns 203.14.100.5</programlisting>
 
 	  <indexterm><primary>PAP</primary></indexterm>
 	  <indexterm><primary>CHAP</primary></indexterm>
-	  <para>Some ISPs set their system up so that the
-	    authentication part of your connection is done using
+	  <para>Some <acronym>ISP</acronym>s set their system up so that the
+	    authentication part of the connection is done using
 	    either of the PAP or CHAP authentication mechanisms.  If
-	    this is the case, your ISP will not give a
-	    <prompt>login:</prompt> prompt when you connect, but will
+	    this is the case, the <acronym>ISP</acronym> will not give a
+	    <prompt>login:</prompt> prompt at connection, but will
 	    start talking <acronym>PPP</acronym> immediately.</para>
 
 	  <para>PAP is less secure than CHAP, but security is not
@@ -973,8 +960,8 @@ set nbns 203.14.100.5</programlisting>
 	      <term>Line 13:</term>
 
 	      <listitem>
-		<para>This line specifies your PAP/CHAP user name.
-		  You will need to insert the correct value for
+		<para>This line specifies the PAP/CHAP user name.
+		  Insert the correct value for
 		  <replaceable>MyUserName</replaceable>.</para>
 	      </listitem>
 	    </varlistentry>
@@ -982,9 +969,9 @@ set nbns 203.14.100.5</programlisting>
 	    <varlistentry>
 	      <term>Line 14:</term>
 	      <listitem>
-		<para>This line specifies your PAP/CHAP
+		<para>This line specifies the PAP/CHAP
 		  password<indexterm><primary>password</primary></indexterm>.
-		  You will need to insert the correct value for
+		  Insert the correct value for
 		  <replaceable>MyPassword</replaceable>.  You may
 		  want to add an additional line, such as:</para>
 
@@ -1004,9 +991,9 @@ set nbns 203.14.100.5</programlisting>
 	      <term>Line 15:</term>
 
 	      <listitem>
-		<para>Your ISP will not normally require that you log
-		  into the server if you are using PAP or CHAP.  You
-		  must therefore disable your <quote>set login</quote>
+		<para>The <acronym>ISP</acronym> will not normally require a login
+		  to the server when using PAP or CHAP.
+		  Therefore, disable the <quote>set login</quote>
 		  string.</para>
 	      </listitem>
 	    </varlistentry>
@@ -1014,13 +1001,13 @@ set nbns 203.14.100.5</programlisting>
 	</sect2>
 
 	<sect2>
-	  <title>Changing Your <command>ppp</command> Configuration
+	  <title>Changing the <command>ppp</command> Configuration
 	    on the Fly</title>
 
 	  <para>It is possible to talk to the <command>ppp</command>
 	    program while it is running in the background, but only
 	    if a suitable diagnostic port has been set up.  To do
-	    this, add the following line to your configuration:</para>
+	    this, add the following line to the configuration:</para>
 
 	  <programlisting>set server /var/run/ppp-tun<replaceable>%d</replaceable> DiagnosticPassword 0177</programlisting>
 
@@ -1057,7 +1044,7 @@ set nbns 203.14.100.5</programlisting>
 	  <literal>ppp_nat</literal>, which is enabled by
 	  default.</para>
 
-	<para>If you use this feature, you may also find useful
+	<para>When using this feature, it may be useful to include
 	  the following <filename>/etc/ppp/ppp.conf</filename> options
 	  to enable incoming connections forwarding:</para>
 
@@ -1076,23 +1063,22 @@ nat port tcp 10.0.0.2:http http</program
 	  <primary><acronym>PPP</acronym></primary><secondary>configuration</secondary>
 	</indexterm>
 
-	<para>You now have <command>ppp</command> configured, but
-	  there are a few more things to do before it is ready to
-	  work.  They all involve editing the
-	  <filename>/etc/rc.conf</filename> file.</para>
+	<para>While <command>ppp</command> is now configured,
+	  some edits still need to be made to
+	  <filename>/etc/rc.conf</filename>.</para>
 
 	<para>Working from the top down in this file, make sure the
-	  <literal>hostname=</literal> line is set, e.g.:</para>
+	  <literal>hostname=</literal> line is set:</para>
 
 	<programlisting>hostname="foo.example.com"</programlisting>
 
-	<para>If your ISP has supplied you with a static IP address
-	  and name, it is probably best that you use this name as your
+	<para>If the <acronym>ISP</acronym> has supplied a static <acronym>IP</acronym> address
+	  and name, use this name as the
 	  host name.</para>
 
 	<para>Look for the <literal>network_interfaces</literal>
-	  variable.  If you want to configure your system to dial your
-	  ISP on demand, make sure the <devicename>tun0</devicename>
+	  variable.  To configure the system to dial the
+	  <acronym>ISP</acronym> on demand, make sure the <devicename>tun0</devicename>
 	  device is added to the list, otherwise remove it.</para>
 
 	<programlisting>network_interfaces="lo0 tun0"
@@ -1107,14 +1093,14 @@ ifconfig_tun0=</programlisting>
 	  <programlisting>ppp -auto mysystem</programlisting>
 
 	  <para>This script is executed at network configuration time,
-	    starting your ppp daemon in automatic mode.  If you have
-	    a LAN for which this machine is a gateway, you may also
-	    wish to use the <option>-alias</option> switch.  Refer
+	    starting the ppp daemon in automatic mode.  If
+	    this machine acts as a gateway, consider including
+	    <option>-alias</option>.  Refer
 	    to the manual page for further details.</para>
 	</note>
 
 	<para>Make sure that the router program is set to
-	  <literal>NO</literal> with the following line in your
+	  <literal>NO</literal> with the following line in
 	  <filename>/etc/rc.conf</filename>:</para>
 
 	<programlisting>router_enable="NO"</programlisting>
@@ -1140,15 +1126,10 @@ ifconfig_tun0=</programlisting>
 	<indexterm>
 	  <primary><application>sendmail</application></primary>
 	</indexterm>
-	<para>The downside of this is that you must force
-	  <command>sendmail</command> to re-examine the mail queue
-	  whenever the ppp link is up by typing:</para>
-
-	<screen>&prompt.root; <userinput>/usr/sbin/sendmail -q</userinput></screen>
-
-	<para>You may wish to use the <command>!bg</command> command
-	  in <filename>ppp.linkup</filename> to do this
-	  automatically:</para>
+	<para>The downside is that
+	  <command>sendmail</command> is forced to re-examine the mail queue
+	  whenever the ppp link.  To automate this, include <command>!bg</command>
+	  in <filename>ppp.linkup</filename>:</para>
 
 	<programlisting>1     provider:
 2       delete ALL
@@ -1159,20 +1140,20 @@ ifconfig_tun0=</programlisting>
 	  <primary>SMTP</primary>
 	</indexterm>
 
-	<para>If you do not like this, it is possible to set up a
+	<para>An alternative is to set up a
 	  <quote>dfilter</quote> to block SMTP traffic.  Refer to the
 	  sample files for further details.</para>
 
 	<para>All that is left is to reboot the machine.  After
-	  rebooting, you can now either type:</para>
+	  rebooting, either type:</para>
 
 	<screen>&prompt.root; <userinput>ppp</userinput></screen>
 
 	<para>and then <command>dial provider</command> to start the
-	  <acronym>PPP</acronym> session, or, if you want
+	  <acronym>PPP</acronym> session, or, to configure
 	  <command>ppp</command> to establish sessions automatically
-	  when there is outbound traffic (and you have not created the
-	  <filename>start_if.tun0</filename> script), type:</para>
+	  when there is outbound traffic and
+	  <filename>start_if.tun0</filename> does not exist, type:</para>
 
 	<screen>&prompt.root; <userinput>ppp -auto provider</userinput></screen>
       </sect2>
@@ -1188,7 +1169,7 @@ ifconfig_tun0=</programlisting>
 	<procedure>
 	  <step>
 	    <para>Ensure that the <devicename>tun</devicename> device
-	      is built into your kernel.</para>
+	      is built into the kernel.</para>
 	  </step>
 
 	  <step>
@@ -1202,11 +1183,11 @@ ifconfig_tun0=</programlisting>
 	    <para>Create an entry in
 	      <filename>/etc/ppp/ppp.conf</filename>.  The
 	      <filename>pmdemand</filename> example should suffice
-	      for most ISPs.</para>
+	      for most <acronym>ISP</acronym>s.</para>
 	  </step>
 
 	  <step>
-	    <para>If you have a dynamic IP address, create an entry in
+	    <para>When using a dynamic <acronym>IP</acronym> address, create an entry in
 	      <filename>/etc/ppp/ppp.linkup</filename>.</para>
 	  </step>
 
@@ -1217,7 +1198,7 @@ ifconfig_tun0=</programlisting>
 
 	  <step>
 	    <para>Create a <filename>start_if.tun0</filename> script
-	      if you require demand dialing.</para>
+	      if demand dialing is required.</para>
 	  </step>
 	</procedure>
 
@@ -1226,7 +1207,7 @@ ifconfig_tun0=</programlisting>
 	<procedure>
 	  <step>
 	    <para>Ensure that the <devicename>tun</devicename> device
-	      is built into your kernel.</para>
+	      is built into the kernel.</para>
 	  </step>
 
 	  <step>
@@ -1261,8 +1242,7 @@ ifconfig_tun0=</programlisting>
 	  </step>
 
 	  <step>
-	    <para>Update your <filename>/etc/rc.conf</filename>
-	      file.</para>
+	    <para>Update <filename>/etc/rc.conf</filename>.</para>
 	  </step>
 	</procedure>
     </sect2>
@@ -1288,23 +1268,20 @@ ifconfig_tun0=</programlisting>
     </indexterm>
 
     <para>This section covers a few issues which may arise when
-      using <acronym>PPP</acronym> over a modem connection.  For
-      instance, perhaps you need to know exactly what prompts the
-      system you are dialing into will present.  Some
+      using <acronym>PPP</acronym> over a modem connection.  Some
       <acronym>ISP</acronym>s present the
-      <literal>ssword</literal> prompt, and others will present
-      <literal>password</literal>; if the <command>ppp</command>
+      <literal>ssword</literal> prompt while others present
+      <literal>password</literal>.  If the <command>ppp</command>
       script is not written accordingly, the login attempt will
       fail.  The most common way to debug <command>ppp</command>
-      connections is by connecting manually.  The following
-      information will walk you through a manual connection step by
-      step.</para>
+      connections is by connecting manually as described in this
+      section.</para>
 
     <sect2>
       <title>Check the Device Nodes</title>
 
       <para>When using a custom kernel, make sure to include the
-	following line in your kernel configuration file:</para>
+	following line in the kernel configuration file:</para>
 
       <programlisting>device   uart</programlisting>
 
@@ -1316,15 +1293,14 @@ ifconfig_tun0=</programlisting>
 
       <screen>&prompt.root; <userinput>dmesg | grep uart</userinput></screen>
 
-      <para>You should get some pertinent output about the
+      <para>This should display some pertinent output about the
 	<devicename>uart</devicename> devices.  These are the COM
-	ports we need.  If your modem acts like a standard serial
-	port then you should see it listed on
+	ports we need.  If the modem acts like a standard serial
+	port, it should be listed on
 	<devicename>uart1</devicename>, or
-	<devicename>COM2</devicename>.  If so, you are not required
-	to rebuild the kernel.  When matching up sio modem is on
-	<devicename>uart1</devicename> or
-	<devicename>COM2</devicename> if you are in DOS, then your
+	<devicename>COM2</devicename>.  If so,
+	a kernel rebuild is not required.  When matching up, if the modem is on
+	<devicename>uart1</devicename>, the
 	modem device would be <filename
 	  class="devicefile">/dev/cuau1</filename>.</para>
     </sect2>
@@ -1334,40 +1310,37 @@ ifconfig_tun0=</programlisting>
 
       <para>Connecting to the Internet by manually controlling
 	<command>ppp</command> is quick, easy, and a great way to
-	debug a connection or just get information on how your
+	debug a connection or just get information on how the
 	<acronym>ISP</acronym> treats <command>ppp</command> client
 	connections.  Lets start <application>PPP</application> from
 	the command line.  Note that in all of our examples we will
 	use <emphasis>example</emphasis> as the hostname of the
-	machine running <application>PPP</application>.  You start
-	<command>ppp</command> by just typing
+	machine running <application>PPP</application>.  To start
 	<command>ppp</command>:</para>
 
       <screen>&prompt.root; <userinput>ppp</userinput></screen>
 
-      <para>We have now started <command>ppp</command>.</para>
-
       <screen>ppp ON example&gt; <userinput>set device <filename class="devicefile">/dev/cuau1</filename></userinput></screen>
 
-      <para>We set our modem device, in this case it is
+      <para>This second command sets the modem device to
 	<devicename>cuau1</devicename>.</para>
 
       <screen>ppp ON example&gt; <userinput>set speed 115200</userinput></screen>
 
-      <para>Set the connection speed, in this case we
-	are using 115,200 <acronym>kbps</acronym>.</para>
+      <para>This sets the connection speed to
+	115,200 <acronym>kbps</acronym>.</para>
 
       <screen>ppp ON example&gt; <userinput>enable dns</userinput></screen>
 
-      <para>Tell <command>ppp</command> to configure our
+      <para>This tells <command>ppp</command> to configure the
 	resolver and add the nameserver lines to
 	<filename>/etc/resolv.conf</filename>.  If
-	<command>ppp</command> cannot determine our hostname, we can
-	set one manually later.</para>
+	<command>ppp</command> cannot determine the hostname, it can
+	manually be set later.</para>
 
       <screen>ppp ON example&gt; <userinput>term</userinput></screen>
 
-      <para>Switch to <quote>terminal</quote> mode so that we can
+      <para>This switches to <quote>terminal</quote> mode in order to
 	manually control the modem.</para>
 
       <programlisting>deflink: Entering terminal mode on <filename class="devicefile">/dev/cuau1</filename>
@@ -1378,7 +1351,7 @@ OK
 <userinput>atdt<replaceable>123456789</replaceable></userinput></screen>
 
       <para>Use <command>at</command> to initialize the modem,
-	then use <command>atdt</command> and the number for your
+	then use <command>atdt</command> and the number for the
 	<acronym>ISP</acronym> to begin the dial in process.</para>
 
       <screen>CONNECT</screen>
@@ -1389,24 +1362,24 @@ OK
 
       <screen>ISP Login:<userinput>myusername</userinput></screen>
 
-      <para>Here you are prompted for a username, return the
+      <para>At this prompt, return the
 	prompt with the username that was provided by the
 	<acronym>ISP</acronym>.</para>
 
       <screen>ISP Pass:<userinput>mypassword</userinput></screen>
 
-      <para>This time we are prompted for a password, just
+      <para>At this prompt,
 	reply with the password that was provided by the
 	<acronym>ISP</acronym>.  Just like logging into
 	&os;, the password will not echo.</para>
 
       <screen>Shell or PPP:<userinput>ppp</userinput></screen>
 
-      <para>Depending on your <acronym>ISP</acronym> this prompt
-	may never appear.  Here we are being asked if we wish to
-	use a shell on the provider, or to start
-	<command>ppp</command>.  In this example, we have chosen
-	to use <command>ppp</command> as we want an Internet
+      <para>Depending on the <acronym>ISP</acronym>, this prompt
+	might not appear.  If it does, it is asking whether to
+	use a shell on the provider or to start
+	<command>ppp</command>.  In this example,
+	<command>ppp</command> was selected in order to establish an Internet
 	connection.</para>
 
       <screen>Ppp ON example&gt;</screen>
@@ -1431,9 +1404,9 @@ OK
       <para>Here we add our default route, we need to do this before
 	we can talk to the outside world as currently the only
 	established connection is with the peer.  If this fails due to
-	existing routes you can put a bang character
+	existing routes, put a bang character
 	<literal>!</literal> in front of the <option>add</option>.
-	Alternatively, you can set this before making the actual
+	Alternatively, set this before making the actual
 	connection and it will negotiate a new route
 	accordingly.</para>
 
@@ -1441,52 +1414,49 @@ OK
 	connection to the Internet, which could be thrown into the
 	background using <keycombo
 	action="simul"><keycap>CTRL</keycap>
-	<keycap>z</keycap></keycombo> If you notice the
-	<command>PPP</command> return to <command>ppp</command> then
-	we have lost our connection.  This is good to know because it
-	shows our connection status.  Capital P's show that we have a
+	<keycap>z</keycap></keycombo> If
+	<command>PPP</command> returns to <command>ppp</command> then
+	the connection has bee lost.  This is good to know because it
+	shows the connection status.  Capital P's represent a
 	connection to the <acronym>ISP</acronym> and lowercase p's
-	show that the connection has been lost for whatever reason.
-	<command>ppp</command> only has these 2 states.</para>

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

From owner-svn-doc-head@FreeBSD.ORG  Fri Oct 18 02:29:59 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 4328C1F0;
 Fri, 18 Oct 2013 02:29:59 +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 2DB5E23CD;
 Fri, 18 Oct 2013 02:29: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 r9I2TxFw017467;
 Fri, 18 Oct 2013 02:29:59 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9I2Tx8T017466;
 Fri, 18 Oct 2013 02:29:59 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310180229.r9I2Tx8T017466@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Fri, 18 Oct 2013 02:29:59 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42995 - head/en_US.ISO8859-1/books/handbook/ppp-and-slip
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Oct 2013 02:29:59 -0000

Author: dru
Date: Fri Oct 18 02:29:58 2013
New Revision: 42995
URL: http://svnweb.freebsd.org/changeset/doc/42995

Log:
  White space fix only. Translators can ignore.

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

Modified: head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Thu Oct 17 23:57:36 2013	(r42994)
+++ head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Fri Oct 18 02:29:58 2013	(r42995)
@@ -63,8 +63,8 @@
 	<para>Be familiar with basic network terminology.</para>
       </listitem>
       <listitem>
-	<para>Understand the basics and purpose of a dial-up connection
-	  and <acronym>PPP</acronym>.</para>
+	<para>Understand the basics and purpose of a dial-up
+	  connection and <acronym>PPP</acronym>.</para>
       </listitem>
     </itemizedlist>
   </sect1>
@@ -120,35 +120,35 @@
       </listitem>
 
       <listitem>
-	<para>The dial-up number for the <acronym>ISP</acronym>.</para>
+	<para>The dial-up number for the
+	  <acronym>ISP</acronym>.</para>
       </listitem>
 
       <listitem>
-	<para>The login name and password assigned by the <acronym>ISP</acronym>.</para>
+	<para>The login name and password assigned by the
+	  <acronym>ISP</acronym>.</para>
       </listitem>
 
       <listitem>
-	<para>The <acronym>IP</acronym> address of one or more name servers.
-	  Normally, an <acronym>ISP</acronym> provides these addresses.
-	  If not, use <command>enable
-	    dns</command> in <filename>ppp.conf</filename>
-	  and <application>ppp</application> will set the name
-	  servers.  This feature requires the <acronym>ISP</acronym>
-	  to supporting DNS
-	  negotiation.</para>
+	<para>The <acronym>IP</acronym> address of one or more name
+	  servers.  Normally, an <acronym>ISP</acronym> provides these
+	  addresses.  If not, use <command>enable dns</command> in
+	  <filename>ppp.conf</filename> and
+	  <application>ppp</application> will set the name servers.
+	  This feature requires the <acronym>ISP</acronym> to
+	  supporting DNS negotiation.</para>
       </listitem>
     </itemizedlist>
 
-    <para>The following information may be supplied by the <acronym>ISP</acronym>, but
-      is not necessary:</para>
+    <para>The following information may be supplied by the
+      <acronym>ISP</acronym>, but is not necessary:</para>
 
     <itemizedlist>
       <listitem>
-	<para>The <acronym>IP</acronym> address of the default gateway.
-	  If this information is missing
-	  the <acronym>ISP</acronym>'s <acronym>PPP</acronym>
-	  server will provide the correct value during
-	  connection setup.</para>
+	<para>The <acronym>IP</acronym> address of the default
+	  gateway.  If this information is missing the
+	  <acronym>ISP</acronym>'s <acronym>PPP</acronym> server will
+	  provide the correct value during connection setup.</para>
 
 	<para>This <acronym>IP</acronym> number is referred to as
 	  <literal>HISADDR</literal> by
@@ -166,9 +166,10 @@
 	  <primary>static <acronym>IP</acronym> address</primary>
 	</indexterm>
 
-	<para>If the <acronym>ISP</acronym> has assigned a static <acronym>IP</acronym> address and
-	  hostname, enter it.  Otherwise, this information will be provided
-	  during connection setup.</para>
+	<para>If the <acronym>ISP</acronym> has assigned a static
+	  <acronym>IP</acronym> address and hostname, enter it.
+	  Otherwise, this information will be provided during
+	  connection setup.</para>
       </listitem>
     </itemizedlist>
 
@@ -191,20 +192,22 @@
 
     <para>A number of files are edited when configuring
       <command>ppp</command>.  The edits
-      depend to some extent on whether the <acronym>ISP</acronym> allocates <acronym>IP</acronym>
-      addresses statically or dynamically.</para>
+      depend to some extent on whether the <acronym>ISP</acronym>
+      allocates <acronym>IP</acronym> addresses statically or
+      dynamically.</para>
 
     <sect2 id="userppp-staticIP">
       <title>PPP With Static <acronym>IP</acronym> Addresses</title>
 
       <indexterm>
 	<primary>PPP</primary>
-	  <secondary>with static <acronym>IP</acronym> addresses</secondary>
+	  <secondary>with static <acronym>IP</acronym>
+	    addresses</secondary>
       </indexterm>
 
-      <para>If the ISP has provided an address that does not change, edit
-	<filename>/etc/ppp/ppp.conf</filename> as described
-	in the example below.</para>
+      <para>If the ISP has provided an address that does not change,
+	edit <filename>/etc/ppp/ppp.conf</filename> as described in
+	the example below.</para>
 
       <note>
 	<para>Lines that end in a <literal>:</literal> start in the
@@ -346,10 +349,10 @@
 	      <listitem>
 		<para>Identifies an entry for a provider called
 		  <quote>provider</quote>.  This could be changed
-		  to the name of the <acronym>ISP</acronym> so
-		  that <option>load
-		    <replaceable>ISP</replaceable></option> can be used to start
-		  the connection.</para>
+		  to the name of the <acronym>ISP</acronym> so that
+		  <option>load
+		    <replaceable>ISP</replaceable></option> can be
+		  used to start the connection.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -393,11 +396,10 @@
 	      <term>Line 15:</term>
 
 	      <listitem>
-		<para>If 
-		  <acronym>PAP</acronym> or
-		  <acronym>CHAP</acronym> are used,
-		  there will be no login at this point, and this line
-		  should be commented out or removed.  See <xref
+		<para>If  <acronym>PAP</acronym> or
+		  <acronym>CHAP</acronym> are used, there will be no
+		  login at this point, and this line should be
+		  commented out or removed.  See <xref
 		    linkend="userppp-PAPnCHAP"/> for further
 		  details.</para>
 
@@ -438,21 +440,18 @@ protocol: ppp</screen>
 	      <listitem>
 		<para>Sets the interface addresses.  The string
 		  <replaceable>x.x.x.x</replaceable> should be
-		  replaced by the <acronym>IP</acronym> address that the
-		  <acronym>ISP</acronym>
-		  has allocated.  The string
-		  <replaceable>y.y.y.y</replaceable> should be
+		  replaced by the <acronym>IP</acronym> address that
+		  the <acronym>ISP</acronym> has allocated.  The
+		  string <replaceable>y.y.y.y</replaceable> should be
 		  replaced by the <acronym>IP</acronym> address of the
-		  gateway.  If the <acronym>ISP</acronym> has not provided a gateway
-		  address, use <hostid
-		    role="netmask">10.0.0.2/0</hostid>.  When
-		  using a <quote>guessed</quote> address,
-		  create an entry in
+		  gateway.  If the <acronym>ISP</acronym> has not
+		  provided a gateway address, use <hostid
+		    role="netmask">10.0.0.2/0</hostid>.  When using a
+		  <quote>guessed</quote> address, create an entry in
 		  <filename>/etc/ppp/ppp.linkup</filename> as per the
-		  instructions in <xref
-		    linkend="userppp-dynamicIP"/>.  If this line is
-		  omitted,  <command>ppp</command> cannot run in
-		  <option>-auto</option> mode.</para>
+		  instructions in <xref linkend="userppp-dynamicIP"/>.
+		  If this line is omitted,  <command>ppp</command>
+		  cannot run in <option>-auto</option> mode.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -467,20 +466,20 @@ protocol: ppp</screen>
 		  otherwise <literal>HISADDR</literal> will not yet
 		  be initialized.</para>
 
-		<para>When
-		  <option>-auto</option> is not used, this line should be moved
-		  to the <filename>ppp.linkup</filename> file.</para>
+		<para>When <option>-auto</option> is not used, this
+		  line should be moved to the
+		  <filename>ppp.linkup</filename> file.</para>
 	      </listitem>
 	    </varlistentry>
 	  </variablelist>
 
 	  <para>It is not necessary to add an entry to
 	    <filename>ppp.linkup</filename> when using a static
-	    <acronym>IP</acronym> address and when running ppp in <option>-auto</option>
-	    mode as the routing table entries are already correct.
-	    However, an
-	    entry can be created to invoke programs after connection.  This is
-	    explained later with the sendmail example.</para>
+	    <acronym>IP</acronym> address and when running ppp in
+	    <option>-auto</option> mode as the routing table entries
+	    are already correct.  However, an entry can be created to
+	    invoke programs after connection.  This is explained later
+	    with the sendmail example.</para>
 
 	  <para>Example configuration files can be found in the
 	    <filename
@@ -489,28 +488,29 @@ protocol: ppp</screen>
 	</sect2>
 
 	<sect2 id="userppp-dynamicIP">
-	  <title><acronym>PPP</acronym> With Dynamic <acronym>IP</acronym>
-	    Addresses</title>
+	  <title><acronym>PPP</acronym> With Dynamic
+	    <acronym>IP</acronym> Addresses</title>
 
 	  <indexterm>
 	    <primary><acronym>PPP</acronym></primary>
-	    <secondary>with dynamic <acronym>IP</acronym> addresses</secondary>
+	    <secondary>with dynamic <acronym>IP</acronym>
+	      addresses</secondary>
 	  </indexterm>
 
 	  <indexterm>
 	    <primary>IPCP</primary>
 	  </indexterm>
 
-	  <para>If the <acronym>IP</acronym>
-	    address changes whenever a connection is made, configure <command>ppp</command> to
+	  <para>If the <acronym>IP</acronym> address changes whenever
+	    a connection is made, configure <command>ppp</command> to
 	    negotiate the local and remote addresses.  This is done by
-	    <quote>guessing</quote> an <acronym>IP</acronym> address and allowing
-	    <command>ppp</command> to set it up correctly using the <acronym>IP</acronym>
-	    Configuration Protocol (IPCP) after connecting.  The
+	    <quote>guessing</quote> an <acronym>IP</acronym> address
+	    and allowing <command>ppp</command> to set it up correctly
+	    using the <acronym>IP</acronym> Configuration Protocol
+	    (IPCP) after connecting.  The
 	    <filename>ppp.conf</filename> configuration is the same as
-	    that described in <xref
-	      linkend="userppp-staticIP"/>, with the following
-	    change:</para>
+	    that described in <xref linkend="userppp-staticIP"/>, with
+	    the following change:</para>
 
 	  <programlisting>17      set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.255 0.0.0.0</programlisting>
 
@@ -525,16 +525,16 @@ protocol: ppp</screen>
 	      <listitem>
 		<para>The number after the <literal>/</literal>
 		  character is the number of bits of the address that
-		  ppp will insist on.  Other <acronym>IP</acronym> addresses
-		  can be used, but the
-		  above example will always work.</para>
+		  ppp will insist on.  Other <acronym>IP</acronym>
+		  addresses can be used, but the above example will
+		  always work.</para>
 
 		<para>The last argument (<literal>0.0.0.0</literal>)
 		  tells PPP to start negotiations using address
 		  <hostid role="ipaddr">0.0.0.0</hostid> rather than
 		  <hostid role="ipaddr">10.0.0.1</hostid> and is
-		  necessary for some <acronym>ISP</acronym>s.  Do not use
-		  <literal>0.0.0.0</literal> as the first argument
+		  necessary for some <acronym>ISP</acronym>s.  Do not
+		  use <literal>0.0.0.0</literal> as the first argument
 		  to <command>set ifaddr</command> as it prevents
 		  PPP from setting up an initial route in
 		  <option>-auto</option> mode.</para>
@@ -544,12 +544,11 @@ protocol: ppp</screen>
 
 	  <para>When not running in <option>-auto</option> mode,
 	    create an entry in
-	    <filename>/etc/ppp/ppp.linkup</filename> as this file
-	    is used after a connection
-	    has been established.  At this point,
-	    <command>ppp</command> will have assigned the interface
-	    addresses and it will now be possible to add the routing
-	    table entries:</para>
+	    <filename>/etc/ppp/ppp.linkup</filename> as this file is
+	    used after a connection has been established.  At this
+	    point, <command>ppp</command> will have assigned the
+	    interface addresses and it will now be possible to add the
+	    routing table entries:</para>
 
 	  <programlisting>1     provider:
 2      add default HISADDR</programlisting>
@@ -564,8 +563,9 @@ protocol: ppp</screen>
 		  <filename>ppp.linkup</filename> according to the
 		  following rules: First, try to match the same label
 		  as we used in <filename>ppp.conf</filename>.  If
-		  that fails, look for an entry for the <acronym>IP</acronym> address of
-		  our gateway.  This entry is a four-octet <acronym>IP</acronym> style
+		  that fails, look for an entry for the
+		  <acronym>IP</acronym> address of our gateway.  This
+		  entry is a four-octet <acronym>IP</acronym> style
 		  label.  If we still have not found an entry, look
 		  for the <literal>MYADDR</literal> entry.</para>
 	      </listitem>
@@ -579,8 +579,8 @@ protocol: ppp</screen>
 		  default route that points to
 		  <literal>HISADDR</literal>.
 		  <literal>HISADDR</literal> will be replaced with the
-		  <acronym>IP</acronym> number of the gateway as negotiated by the
-		  IPCP.</para>
+		  <acronym>IP</acronym> number of the gateway as
+		  negotiated by the IPCP.</para>
 	      </listitem>
 	    </varlistentry>
 	  </variablelist>
@@ -602,8 +602,8 @@ protocol: ppp</screen>
 
 	  <para>When configuring <application>ppp</application> to
 	    receive incoming calls on a machine connected to a LAN,
-	    decide if packets should be forwarded to the LAN.
-	    If so, allocate the peer an <acronym>IP</acronym> address from
+	    decide if packets should be forwarded to the LAN.  If so,
+	    allocate the peer an <acronym>IP</acronym> address from
 	    the LAN's subnet, and use <command>enable
 	      proxy</command> in the
 	    <filename>/etc/ppp/ppp.conf</filename>.
@@ -616,8 +616,7 @@ protocol: ppp</screen>
 	<sect2>
 	  <title>Which getty?</title>
 
-	  <para><xref linkend="dialup"/>
-	    provides a good description
+	  <para><xref linkend="dialup"/> provides a good description
 	    on enabling dial-up services using &man.getty.8;.</para>
 
 	  <para>An alternative to <command>getty</command> is <ulink
@@ -645,15 +644,15 @@ protocol: ppp</screen>
 	  <title><application>PPP</application> Permissions</title>
 
 	  <para>The <command>ppp</command> command must normally be
-	    run as the <username>root</username> user.
-	    To instead allow <command>ppp</command> to run in
-	    server mode as a normal user, that user
-	    must be given permission to run <command>ppp</command>
-	    by adding them to the <groupname>network</groupname>
-	    group in <filename>/etc/group</filename>.</para>
+	    run as the <username>root</username> user.  To instead
+	    allow <command>ppp</command> to run in server mode as a
+	    normal user, that user must be given permission to run
+	    <command>ppp</command> by adding them to the
+	    <groupname>network</groupname> group in
+	    <filename>/etc/group</filename>.</para>
 
-	  <para>The user also needs access to one or more
-	    sections of the configuration file using the
+	  <para>The user also needs access to one or more sections of
+	    the configuration file using the
 	    <command>allow</command> command:</para>
 
 	  <programlisting>allow users fred mary</programlisting>
@@ -664,8 +663,8 @@ protocol: ppp</screen>
 	</sect2>
 
 	<sect2>
-	  <title><acronym>PPP</acronym> Shells for Dynamic <acronym>IP</acronym>
-	    Users</title>
+	  <title><acronym>PPP</acronym> Shells for Dynamic
+	    <acronym>IP</acronym> Users</title>
 
 	  <indexterm>
 	    <primary><acronym>PPP</acronym> shells</primary>
@@ -696,9 +695,9 @@ exec /usr/sbin/ppp -direct $IDENT</progr
 	  <screen>&prompt.root; <userinput>ln -s ppp-shell /etc/ppp/ppp-dialup</userinput></screen>
 
 	  <para>Use this script as the
-	    <emphasis>shell</emphasis> for all of dial-up users.
-	    This is an example from <filename>/etc/passwd</filename>
-	    for a dial-up <acronym>PPP</acronym>:</para>
+	    <emphasis>shell</emphasis> for all of dial-up users.  This
+	    is an example from <filename>/etc/passwd</filename> for a
+	    dial-up <acronym>PPP</acronym>:</para>
 
 	    <programlisting>pchilds:*:1011:300:Peter Childs PPP:/home/ppp:/etc/ppp/ppp-dialup</programlisting>
 
@@ -715,8 +714,8 @@ exec /usr/sbin/ppp -direct $IDENT</progr
 	  </sect2>
 
 	  <sect2>
-	    <title><acronym>PPP</acronym> Shells for Static <acronym>IP</acronym>
-	      Users</title>
+	    <title><acronym>PPP</acronym> Shells for Static
+	      <acronym>IP</acronym> Users</title>
 
 	    <indexterm>
 	      <primary><acronym>PPP</acronym> shells</primary>
@@ -727,10 +726,10 @@ exec /usr/sbin/ppp -direct $IDENT</progr
 	      <acronym>IP</acronym>s create a symbolic link to
 	      <filename>ppp-shell</filename>.</para>
 
-	    <para>For example, to route /24 CIDR
-	      networks for the dial-up customers
-	      <username>fred</username>, <username>sam</username>,
-	      and <username>mary</username>, type:</para>
+	    <para>For example, to route /24 CIDR networks for the
+	      dial-up customers <username>fred</username>,
+	      <username>sam</username>, and
+	      <username>mary</username>, type:</para>
 
 	    <screen>&prompt.root; <userinput>ln -s /etc/ppp/ppp-shell /etc/ppp/ppp-fred</userinput>
 &prompt.root; <userinput>ln -s /etc/ppp/ppp-shell /etc/ppp/ppp-sam</userinput>
@@ -769,8 +768,9 @@ ttyu1:
 	      for each session.  For each dial-up line enabled in
 	      <filename>/etc/ttys</filename> create an entry similar
 	      to the one for <literal>ttyu0:</literal> above.  Each
-	      line should get a unique <acronym>IP</acronym> address from the pool of
-	      <acronym>IP</acronym> addresses for dynamic users.</para>
+	      line should get a unique <acronym>IP</acronym> address
+	      from the pool of <acronym>IP</acronym> addresses for
+	      dynamic users.</para>
 	  </sect2>
 
 	  <sect2>
@@ -779,8 +779,8 @@ ttyu1:
 
 	    <para>Along with the contents of the sample
 	      <filename>/usr/share/examples/ppp/ppp.conf</filename>
-	      above, add a section for each of the
-	      statically assigned dial-up users:.</para>
+	      above, add a section for each of the statically assigned
+	      dial-up users:.</para>
 
 	    <programlisting>fred:
   set ifaddr 203.14.100.1 203.14.101.1 255.255.255.255
@@ -793,9 +793,10 @@ mary:
 
 	    <para>The file <filename>/etc/ppp/ppp.linkup</filename>
 	      should also contain routing information for each static
-	      <acronym>IP</acronym> user if required.  The line below would add a route
-	      for the <hostid role="ipaddr">203.14.101.0/24</hostid>
-	      network via the client's ppp link.</para>
+	      <acronym>IP</acronym> user if required.  The line below
+	      would add a route for the <hostid
+		role="ipaddr">203.14.101.0/24</hostid> network via the
+	      client's ppp link.</para>
 
 	    <programlisting>fred:
   add 203.14.101.0 netmask 255.255.255.0 HISADDR
@@ -874,8 +875,8 @@ exec /usr/sbin/ppp -direct pap$IDENT</pr
 
 	  <programlisting>enable passwdauth</programlisting>
 
-	  <para>To assign some users a static <acronym>IP</acronym> number,
-	    specify the number as the third argument in
+	  <para>To assign some users a static <acronym>IP</acronym>
+	    number, specify the number as the third argument in
 	    <filename>/etc/ppp/ppp.secret</filename>.  See
 	    <filename>/usr/share/examples/ppp/ppp.secret.sample</filename>
 	    for examples.</para>
@@ -920,8 +921,8 @@ set nbns 203.14.100.5</programlisting>
 	    name server addresses, and a NetBIOS nameserver
 	    host.</para>
 
-	  <para>In version 2 and above, if the
-	    <literal>set dns</literal> line is omitted,
+	  <para>In version 2 and above, if the <literal>set
+	      dns</literal> line is omitted,
 	    <acronym>PPP</acronym> will use the values found in
 	    <filename>/etc/resolv.conf</filename>.</para>
 	</sect2>
@@ -931,12 +932,13 @@ set nbns 203.14.100.5</programlisting>
 
 	  <indexterm><primary>PAP</primary></indexterm>
 	  <indexterm><primary>CHAP</primary></indexterm>
-	  <para>Some <acronym>ISP</acronym>s set their system up so that the
-	    authentication part of the connection is done using
-	    either of the PAP or CHAP authentication mechanisms.  If
-	    this is the case, the <acronym>ISP</acronym> will not give a
-	    <prompt>login:</prompt> prompt at connection, but will
-	    start talking <acronym>PPP</acronym> immediately.</para>
+	  <para>Some <acronym>ISP</acronym>s set their system up so
+	    that the authentication part of the connection is done
+	    using either of the PAP or CHAP authentication mechanisms.
+	    If this is the case, the <acronym>ISP</acronym> will not
+	    give a <prompt>login:</prompt> prompt at connection, but
+	    will start talking <acronym>PPP</acronym>
+	    immediately.</para>
 
 	  <para>PAP is less secure than CHAP, but security is not
 	    normally an issue here as passwords, although being sent
@@ -944,12 +946,9 @@ set nbns 203.14.100.5</programlisting>
 	    serial line only.  There is not much room for crackers
 	    to <quote>eavesdrop</quote>.</para>
 
-	  <para>Referring back to <xref
-	      linkend="userppp-staticIP"/>
-	    or <xref
-	      linkend="userppp-dynamicIP"/>,
-	    the following alterations must
-	    be made:</para>
+	  <para>Referring back to <xref linkend="userppp-staticIP"/>
+	    or <xref linkend="userppp-dynamicIP"/>, the following
+	    alterations must be made:</para>
 
 	  <programlisting>13      set authname <replaceable>MyUserName</replaceable>
 14      set authkey <replaceable>MyPassword</replaceable>
@@ -991,10 +990,10 @@ set nbns 203.14.100.5</programlisting>
 	      <term>Line 15:</term>
 
 	      <listitem>
-		<para>The <acronym>ISP</acronym> will not normally require a login
-		  to the server when using PAP or CHAP.
-		  Therefore, disable the <quote>set login</quote>
-		  string.</para>
+		<para>The <acronym>ISP</acronym> will not normally
+		  require a login to the server when using PAP or
+		  CHAP.  Therefore, disable the <quote>set
+		    login</quote> string.</para>
 	      </listitem>
 	    </varlistentry>
 	  </variablelist>
@@ -1011,17 +1010,17 @@ set nbns 203.14.100.5</programlisting>
 
 	  <programlisting>set server /var/run/ppp-tun<replaceable>%d</replaceable> DiagnosticPassword 0177</programlisting>
 
-	  <para>This will tell PPP to listen to the specified
-	    &unix; domain socket, asking clients for the specified
-	    password before allowing access.  The
-	    <literal>%d</literal> in the name is replaced with the
-	    <devicename>tun</devicename> device number that is in
-	    use.</para>
-
-	  <para>Once a socket has been set up, the &man.pppctl.8;
-	    program may be used in scripts that wish to manipulate
-	    the running program.</para>
-	</sect2>
+	<para>This will tell PPP to listen to the specified
+	  &unix; domain socket, asking clients for the specified
+	  password before allowing access.  The
+	  <literal>%d</literal> in the name is replaced with the
+	  <devicename>tun</devicename> device number that is in
+	  use.</para>
+
+	<para>Once a socket has been set up, the &man.pppctl.8;
+	  program may be used in scripts that wish to manipulate
+	  the running program.</para>
+      </sect2>
 
       <sect2 id="userppp-nat">
 	<title>Using <acronym>PPP</acronym> Network Address
@@ -1072,14 +1071,15 @@ nat port tcp 10.0.0.2:http http</program
 
 	<programlisting>hostname="foo.example.com"</programlisting>
 
-	<para>If the <acronym>ISP</acronym> has supplied a static <acronym>IP</acronym> address
-	  and name, use this name as the
+	<para>If the <acronym>ISP</acronym> has supplied a static
+	  <acronym>IP</acronym> address and name, use this name as the
 	  host name.</para>
 
 	<para>Look for the <literal>network_interfaces</literal>
 	  variable.  To configure the system to dial the
-	  <acronym>ISP</acronym> on demand, make sure the <devicename>tun0</devicename>
-	  device is added to the list, otherwise remove it.</para>
+	  <acronym>ISP</acronym> on demand, make sure the
+	  <devicename>tun0</devicename> device is added to the list,
+	  otherwise remove it.</para>
 
 	<programlisting>network_interfaces="lo0 tun0"
 ifconfig_tun0=</programlisting>
@@ -1093,10 +1093,10 @@ ifconfig_tun0=</programlisting>
 	  <programlisting>ppp -auto mysystem</programlisting>
 
 	  <para>This script is executed at network configuration time,
-	    starting the ppp daemon in automatic mode.  If
-	    this machine acts as a gateway, consider including
-	    <option>-alias</option>.  Refer
-	    to the manual page for further details.</para>
+	    starting the ppp daemon in automatic mode.  If this
+	    machine acts as a gateway, consider including
+	    <option>-alias</option>.  Refer to the manual page for
+	    further details.</para>
 	</note>
 
 	<para>Make sure that the router program is set to
@@ -1126,10 +1126,10 @@ ifconfig_tun0=</programlisting>
 	<indexterm>
 	  <primary><application>sendmail</application></primary>
 	</indexterm>
-	<para>The downside is that
-	  <command>sendmail</command> is forced to re-examine the mail queue
-	  whenever the ppp link.  To automate this, include <command>!bg</command>
-	  in <filename>ppp.linkup</filename>:</para>
+	<para>The downside is that <command>sendmail</command> is
+	  forced to re-examine the mail queue whenever the ppp link.
+	  To automate this, include <command>!bg</command> in
+	  <filename>ppp.linkup</filename>:</para>
 
 	<programlisting>1     provider:
 2       delete ALL
@@ -1153,7 +1153,8 @@ ifconfig_tun0=</programlisting>
 	  <acronym>PPP</acronym> session, or, to configure
 	  <command>ppp</command> to establish sessions automatically
 	  when there is outbound traffic and
-	  <filename>start_if.tun0</filename> does not exist, type:</para>
+	  <filename>start_if.tun0</filename> does not exist,
+	  type:</para>
 
 	<screen>&prompt.root; <userinput>ppp -auto provider</userinput></screen>
       </sect2>
@@ -1187,7 +1188,8 @@ ifconfig_tun0=</programlisting>
 	  </step>
 
 	  <step>
-	    <para>When using a dynamic <acronym>IP</acronym> address, create an entry in
+	    <para>When using a dynamic <acronym>IP</acronym> address,
+	      create an entry in
 	      <filename>/etc/ppp/ppp.linkup</filename>.</para>
 	  </step>
 
@@ -1295,14 +1297,12 @@ ifconfig_tun0=</programlisting>
 
       <para>This should display some pertinent output about the
 	<devicename>uart</devicename> devices.  These are the COM
-	ports we need.  If the modem acts like a standard serial
-	port, it should be listed on
-	<devicename>uart1</devicename>, or
-	<devicename>COM2</devicename>.  If so,
-	a kernel rebuild is not required.  When matching up, if the modem is on
-	<devicename>uart1</devicename>, the
-	modem device would be <filename
-	  class="devicefile">/dev/cuau1</filename>.</para>
+	ports we need.  If the modem acts like a standard serial port,
+	it should be listed on <devicename>uart1</devicename>, or
+	<devicename>COM2</devicename>.  If so, a kernel rebuild is not
+	required.  When matching up, if the modem is on
+	<devicename>uart1</devicename>, the modem device would be
+	<filename class="devicefile">/dev/cuau1</filename>.</para>
     </sect2>
 
     <sect2>
@@ -1350,8 +1350,8 @@ type '~h' for help</programlisting>
 OK
 <userinput>atdt<replaceable>123456789</replaceable></userinput></screen>
 
-      <para>Use <command>at</command> to initialize the modem,
-	then use <command>atdt</command> and the number for the
+      <para>Use <command>at</command> to initialize the modem, then
+	use <command>atdt</command> and the number for the
 	<acronym>ISP</acronym> to begin the dial in process.</para>
 
       <screen>CONNECT</screen>
@@ -1362,25 +1362,23 @@ OK
 
       <screen>ISP Login:<userinput>myusername</userinput></screen>
 
-      <para>At this prompt, return the
-	prompt with the username that was provided by the
-	<acronym>ISP</acronym>.</para>
+      <para>At this prompt, return the prompt with the username that
+	was provided by the <acronym>ISP</acronym>.</para>
 
       <screen>ISP Pass:<userinput>mypassword</userinput></screen>
 
-      <para>At this prompt,
-	reply with the password that was provided by the
-	<acronym>ISP</acronym>.  Just like logging into
-	&os;, the password will not echo.</para>
+      <para>At this prompt, reply with the password that was provided
+	by the <acronym>ISP</acronym>.  Just like logging into &os;,
+	the password will not echo.</para>
 
       <screen>Shell or PPP:<userinput>ppp</userinput></screen>
 
       <para>Depending on the <acronym>ISP</acronym>, this prompt
-	might not appear.  If it does, it is asking whether to
-	use a shell on the provider or to start
+	might not appear.  If it does, it is asking whether to use a
+	shell on the provider or to start
 	<command>ppp</command>.  In this example,
-	<command>ppp</command> was selected in order to establish an Internet
-	connection.</para>
+	<command>ppp</command> was selected in order to establish an
+	Internet connection.</para>
 
       <screen>Ppp ON example&gt;</screen>
 
@@ -1391,8 +1389,8 @@ OK
       <screen>PPp ON example&gt;</screen>
 
       <para>We have successfully authenticated with our
-	<acronym>ISP</acronym> and are waiting for the
-	assigned <acronym>IP</acronym> address.</para>
+	<acronym>ISP</acronym> and are waiting for the assigned
+	<acronym>IP</acronym> address.</para>
 
       <screen>PPP ON example&gt;</screen>
 
@@ -1425,40 +1423,36 @@ OK
       <sect2>
 	<title>Debugging</title>
 
-	<para>If a
-	  connection cannot be established, turn hardware flow
-	  <acronym>CTS/RTS</acronym> to off using <option>set
-	  ctsrts off</option>.  This is mainly the case when
+	<para>If a connection cannot be established, turn hardware
+	  flow <acronym>CTS/RTS</acronym> to off using <option>set
+	    ctsrts off</option>.  This is mainly the case when
 	  connected to some <application>PPP</application>-capable
 	  terminal servers, where <application>PPP</application> hangs
 	  when it tries to write data to the communication link, and
-	  waits for a Clear
-	  To Send (<acronym>CTS</acronym>) signal which may never come.  When using this option,
-	  include <option>set accmap</option>
-	  as it may be required to defeat hardware dependent
-	  on passing certain characters from end to end, most of the
-	  time XON/XOFF.  Refer to &man.ppp.8; for more
-	  information on this option and how it is used.</para>
-
-	<para>An older modem may need
-	  <option>set parity even</option>.  Parity is set at none
-	  be default, but is used for error checkingm with a large
-	  increase in traffic, on older modems.</para>
+	  waits for a Clear To Send (<acronym>CTS</acronym>) signal
+	  which may never come.  When using this option, include
+	  <option>set accmap</option> as it may be required to defeat
+	  hardware dependent on passing certain characters from end to
+	  end, most of the time XON/XOFF.  Refer to &man.ppp.8; for
+	  more information on this option and how it is used.</para>
+
+	<para>An older modem may need <option>set parity
+	    even</option>.  Parity is set at none be default, but is
+	  used for error checkingm with a large increase in traffic,
+	  on older modems.</para>
 
 	<para><application>PPP</application> may not return to the
-	  command mode, which is usually a negotiation error where
-	  the <acronym>ISP</acronym> is waiting for
-	  negotiating to begin.  At this point, using  <command>~p</command>
-	  will force ppp to start sending the configuration
-	  information.</para>
-
-	<para>If a login prompt never appears,
-	  <acronym>PAP</acronym> or
-	  <acronym>CHAP</acronym> authentication is most likely required.
-	  To use
-	  <acronym>PAP</acronym> or <acronym>CHAP</acronym>, add
-	  the following options to <application>PPP</application>
-	  before going into terminal mode:</para>
+	  command mode, which is usually a negotiation error where the
+	  <acronym>ISP</acronym> is waiting for negotiating to begin.
+	  At this point, using  <command>~p</command> will force ppp
+	  to start sending the configuration information.</para>
+
+	<para>If a login prompt never appears, <acronym>PAP</acronym>
+	  or <acronym>CHAP</acronym> authentication is most likely
+	  required.  To use <acronym>PAP</acronym> or
+	  <acronym>CHAP</acronym>, add the following options to
+	  <application>PPP</application> before going into terminal
+	  mode:</para>
 
 	<screen>ppp ON example&gt; <userinput>set authname <replaceable>myusername</replaceable></userinput></screen>
 
@@ -1472,16 +1466,15 @@ OK
 	  replaced with the password that was assigned by the
 	  <acronym>ISP</acronym>.</para>
 
-	<para>If a connection is established, but cannot seem to find any domain
-	  name,  try to &man.ping.8; an <acronym>IP</acronym>
-	  address.  If
-	  there is 100 percent (100%) packet loss, it is
-	  likely that a default route was not assigned.
-	  Double check that <option>add default
+	<para>If a connection is established, but cannot seem to find
+	  any domain name,  try to &man.ping.8; an
+	  <acronym>IP</acronym> address.  If there is 100 percent
+	  (100%) packet loss, it is likely that a default route was
+	  not assigned.  Double check that <option>add default
 	    HISADDR</option> was set during the connection.  If a
-	  connection can be made to a remote <acronym>IP</acronym> address,
-	  it is possible that a resolver address has not been added
-	  to <filename>/etc/resolv.conf</filename>.  This file
+	  connection can be made to a remote <acronym>IP</acronym>
+	  address, it is possible that a resolver address has not been
+	  added to <filename>/etc/resolv.conf</filename>.  This file
 	  should look like:</para>
 
 	<programlisting>domain <replaceable>example.com</replaceable>
@@ -1493,9 +1486,9 @@ nameserver <replaceable>y.y.y.y</replace
 	  the <acronym>IP</acronym> address of the
 	  <acronym>ISP</acronym>'s DNS servers.</para>
 
-	<para>To configure &man.syslog.3; to provide logging
-	  for the <application>PPP</application> connection, make sure
-	  this line exists in <filename>/etc/syslog.conf</filename>:</para>
+	<para>To configure &man.syslog.3; to provide logging for the
+	  <application>PPP</application> connection, make sure this
+	  line exists in <filename>/etc/syslog.conf</filename>:</para>
 
 	<programlisting>!ppp
 *.*     /var/log/ppp.log</programlisting>
@@ -1524,14 +1517,13 @@ nameserver <replaceable>y.y.y.y</replace
       <secondary>over Ethernet</secondary>
     </indexterm>
 
-    <para>This section describes how to set up
-      <acronym>PPP</acronym> over Ethernet
-      (<acronym>PPPoE</acronym>).</para>
+    <para>This section describes how to set up <acronym>PPP</acronym>
+      over Ethernet (<acronym>PPPoE</acronym>).</para>
 
-      <para>Here is an example of a working
-	<filename>ppp.conf</filename>:</para>
+    <para>Here is an example of a working
+      <filename>ppp.conf</filename>:</para>
 
-      <programlisting>default:
+    <programlisting>default:
   set log Phase tun command # you can add more detailed logging if you wish
   set ifaddr 10.0.0.1/0 10.0.0.2/0
 
@@ -1565,17 +1557,17 @@ ppp_profile="name_of_service_provider"</
 	distinguish between different PPPoE servers attached to a
 	given network.</para>
 
-      <para>Any required service tag
-	information should be in the documentation provided by the <acronym>ISP</acronym>.</para>
+      <para>Any required service tag information should be in the
+	documentation provided by the <acronym>ISP</acronym>.</para>
 
       <para>As a last resort, one could try installing the <filename
 	  role="package">net/rr-pppoe</filename> package or port.
 	Bear in mind however, this may de-program your modem and
 	render it useless, so think twice before doing it.  Simply
-	install the program shipped with the modem.
-	Then, access the <guimenu>System</guimenu> menu from the
-	program.  The name of the profile should be listed there.  It
-	is usually <emphasis>ISP</emphasis>.</para>
+	install the program shipped with the modem.  Then, access the
+	<guimenu>System</guimenu> menu from the program.  The name of
+	the profile should be listed there.  It is usually
+	<emphasis>ISP</emphasis>.</para>
 
       <para>The profile name (service tag) will be used in the PPPoE
 	configuration entry in <filename>ppp.conf</filename> as the
@@ -1585,11 +1577,11 @@ ppp_profile="name_of_service_provider"</
 
       <programlisting>set device PPPoE:<replaceable>xl1</replaceable>:<replaceable>ISP</replaceable></programlisting>
 
-      <para>Do not forget to change <replaceable>xl1</replaceable>
-	to the proper device for the Ethernet card.</para>
+      <para>Do not forget to change <replaceable>xl1</replaceable> to
+	the proper device for the Ethernet card.</para>
 
-      <para>Do not forget to change <replaceable>ISP</replaceable>
-	to the profile.</para>
+      <para>Do not forget to change <replaceable>ISP</replaceable> to
+	the profile.</para>
 
       <para>For additional information, refer to <ulink
 	  url="http://renaud.waldura.com/doc/freebsd/pppoe/">Cheaper
@@ -1603,12 +1595,14 @@ ppp_profile="name_of_service_provider"</
 	<trademark class="registered">HomeConnect</trademark> ADSL
 	Modem Dual Link</title>
 
-      <para>This modem does not follow the PPPoE specification defined in <ulink
-	  url="http://www.faqs.org/rfcs/rfc2516.html">RFC 2516</ulink>.</para>
-
-      <para>In order to make &os; capable of communicating with
-	this device, a sysctl must be set.  This can be done
-	automatically at boot time by updating
+      <para>This modem does not follow the PPPoE specification defined
+	in <ulink
+	  url="http://www.faqs.org/rfcs/rfc2516.html">RFC
+	  2516</ulink>.</para>
+
+      <para>In order to make &os; capable of communicating with this
+	device, a sysctl must be set.  This can be done automatically
+	at boot time by updating
 	<filename>/etc/sysctl.conf</filename>:</para>
 
 	<programlisting>net.graph.nonstandard_pppoe=1</programlisting>
@@ -1617,8 +1611,8 @@ ppp_profile="name_of_service_provider"</
 
       <screen>&prompt.root; <userinput>sysctl net.graph.nonstandard_pppoe=1</userinput></screen>
 
-      <para>Unfortunately, because this is a system-wide setting,
-	it is not possible to talk to a normal PPPoE client or server
+      <para>Unfortunately, because this is a system-wide setting, it
+	is not possible to talk to a normal PPPoE client or server
 	and a &tm.3com; <trademark
 	  class="registered">HomeConnect</trademark> ADSL Modem at
 	the same time.</para>
@@ -1696,20 +1690,18 @@ ppp_profile="adsl"</programlisting>
     <sect2>
       <title>Using mpd</title>
 
-      <para>The <application>mpd</application> application can be used to connect to a
-	variety of services, in particular PPTP services.  It can be installed using the
-	<filename role="package">net/mpd5</filename> package or port.  Many ADSL
-	modems require that a PPTP tunnel is created between the modem
-	and computer.</para>
-
-      <para>Once installed,
-	configure <application>mpd</application> to suit the
-	provider's settings.  The port places a set
-	of sample configuration files which are well documented in
-	<filename
-	  class="directory">/usr/local/etc/mpd/</filename>.
-	A
-	complete guide to configure <application>mpd</application>
+      <para>The <application>mpd</application> application can be used
+	to connect to a variety of services, in particular PPTP
+	services.  It can be installed using the <filename
+	  role="package">net/mpd5</filename> package or port.  Many
+	ADSL modems require that a PPTP tunnel is created between the
+	modem and computer.</para>
+
+      <para>Once installed, configure <application>mpd</application>
+	to suit the provider's settings.  The port places a set of
+	sample configuration files which are well documented in
+	<filename class="directory">/usr/local/etc/mpd/</filename>.
+	A complete guide to configure <application>mpd</application>
 	is available in HTML format in <filename
 	  class="directory">/usr/ports/share/doc/mpd/</filename>.
 	Here is a sample configuration for connecting to an ADSL
@@ -1750,10 +1742,12 @@ adsl:
 
     <calloutlist>
       <callout arearefs="co-mpd-ex-user">
-	<para>The username used to authenticate with your <acronym>ISP</acronym>.</para>
+	<para>The username used to authenticate with your
+	  <acronym>ISP</acronym>.</para>
       </callout>
       <callout arearefs="co-mpd-ex-pass">
-	<para>The password used to authenticate with your <acronym>ISP</acronym>.</para>
+	<para>The password used to authenticate with your
+	  <acronym>ISP</acronym>.</para>
       </callout>
     </calloutlist>
 
@@ -1773,12 +1767,12 @@ adsl:
 
     <calloutlist>
       <callout arearefs="co-mpd-ex-self">
-	<para>The <acronym>IP</acronym> address of &os; computer running
-	  <application>mpd</application>.</para>
+	<para>The <acronym>IP</acronym> address of &os; computer
+	  running <application>mpd</application>.</para>
       </callout>
       <callout arearefs="co-mpd-ex-peer">
-	<para>The <acronym>IP</acronym> address of the ADSL modem.  The Alcatel
-	  &speedtouch; Home defaults to <hostid
+	<para>The <acronym>IP</acronym> address of the ADSL modem.
+	  The Alcatel &speedtouch; Home defaults to <hostid
 	    role="ipaddr">10.0.0.138</hostid>.</para>
       </callout>
     </calloutlist>
@@ -1808,10 +1802,10 @@ ng0: flags=88d1&lt;UP,POINTOPOINT,RUNNIN
 
     <para>To use <filename role="package">net/pptpclient</filename>
       to connect to a DSL service, install the port or package, then
-      edit <filename>/etc/ppp/ppp.conf</filename>.
-      An example section of <filename>ppp.conf</filename>
-      is given below.  For further information on
-      <filename>ppp.conf</filename> options consult &man.ppp.8;.</para>
+      edit <filename>/etc/ppp/ppp.conf</filename>.  An example section
+      of <filename>ppp.conf</filename> is given below.  For further
+      information on <filename>ppp.conf</filename> options consult
+      &man.ppp.8;.</para>
 
     <programlisting>adsl:
  set log phase chat lcp ipcp ccp tun command
@@ -1824,8 +1818,7 @@ ng0: flags=88d1&lt;UP,POINTOPOINT,RUNNIN
 
     <calloutlist>
       <callout arearefs="co-pptp-ex-user">
-	<para>The username for the DSL
-	  provider.</para>
+	<para>The username for the DSL provider.</para>
       </callout>
 
       <callout arearefs="co-pptp-ex-pass">
@@ -1835,9 +1828,8 @@ ng0: flags=88d1&lt;UP,POINTOPOINT,RUNNIN
 
     <warning>
       <para>Since the account's password is added to
-	<filename>ppp.conf</filename>in plain text form,
-	make sure nobody can read the contents of this
-	file:</para>
+	<filename>ppp.conf</filename>in plain text form, make sure
+	nobody can read the contents of this file:</para>
 
       <screen>&prompt.root; <userinput>chown root:wheel /etc/ppp/ppp.conf</userinput>
 &prompt.root; <userinput>chmod 600 /etc/ppp/ppp.conf</userinput></screen>
@@ -1846,11 +1838,11 @@ ng0: flags=88d1&lt;UP,POINTOPOINT,RUNNIN
 
       <para>This will open a tunnel for a <acronym>PPP</acronym>
 	session to the DSL router.  Ethernet DSL modems have a
-	preconfigured LAN <acronym>IP</acronym> address to connect to.  In the
-	case of the Alcatel &speedtouch; Home, this address is <hostid
-	  role="ipaddr">10.0.0.138</hostid>. The router's
-	documentation should list the address the device
-	uses.  To open the tunnel and start a <acronym>PPP</acronym>
+	preconfigured LAN <acronym>IP</acronym> address to connect to.
+	In the case of the Alcatel &speedtouch; Home, this address is
+	<hostid role="ipaddr">10.0.0.138</hostid>. The router's
+	documentation should list the address the device uses.  To
+	open the tunnel and start a <acronym>PPP</acronym>
 	session:</para>

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

From owner-svn-doc-head@FreeBSD.ORG  Fri Oct 18 10:59:05 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 996307F1;
 Fri, 18 Oct 2013 10:59:05 +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 86C372575;
 Fri, 18 Oct 2013 10:59: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 r9IAx5Dn086308;
 Fri, 18 Oct 2013 10:59:05 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9IAx5rD086307;
 Fri, 18 Oct 2013 10:59:05 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310181059.r9IAx5rD086307@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Fri, 18 Oct 2013 10:59:05 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42997 - head/en_US.ISO8859-1/books/handbook/ppp-and-slip
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Oct 2013 10:59:05 -0000

Author: dru
Date: Fri Oct 18 10:59:05 2013
New Revision: 42997
URL: http://svnweb.freebsd.org/changeset/doc/42997

Log:
  Make validator happy.
  
  Submitted by:	bcr

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

Modified: head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Fri Oct 18 10:25:04 2013	(r42996)
+++ head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Fri Oct 18 10:59:05 2013	(r42997)
@@ -1539,8 +1539,6 @@ name_of_service_provider:
 
       <screen>&prompt.root; <userinput>ppp -ddial name_of_service_provider</userinput></screen>
 
-      <title>Starting <application>ppp</application> at Boot</title>
-
       <para>Add the following to
 	<filename>/etc/rc.conf</filename>:</para>
 

From owner-svn-doc-head@FreeBSD.ORG  Fri Oct 18 10:25:05 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 48135840;
 Fri, 18 Oct 2013 10:25:05 +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 262162353;
 Fri, 18 Oct 2013 10:25: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 r9IAP5EG069913;
 Fri, 18 Oct 2013 10:25:05 GMT (envelope-from ryusuke@svn.freebsd.org)
Received: (from ryusuke@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9IAP51E069911;
 Fri, 18 Oct 2013 10:25:05 GMT (envelope-from ryusuke@svn.freebsd.org)
Message-Id: <201310181025.r9IAP51E069911@svn.freebsd.org>
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Fri, 18 Oct 2013 10:25:05 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42996 - head/ja_JP.eucJP/books/handbook/desktop
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Mailman-Approved-At: Fri, 18 Oct 2013 12:15:39 +0000
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Oct 2013 10:25:05 -0000

Author: ryusuke
Date: Fri Oct 18 10:25:04 2013
New Revision: 42996
URL: http://svnweb.freebsd.org/changeset/doc/42996

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

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

Modified: head/ja_JP.eucJP/books/handbook/desktop/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/desktop/chapter.xml	Fri Oct 18 02:29:58 2013	(r42995)
+++ head/ja_JP.eucJP/books/handbook/desktop/chapter.xml	Fri Oct 18 10:25:04 2013	(r42996)
@@ -3,11 +3,12 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r42717
+     Original revision: r42925
      $FreeBSD$
 -->
 
 <chapter id="desktop">
+  <!--
   <chapterinfo>
     <authorgroup>
       <author>
@@ -17,6 +18,7 @@
       </author>
     </authorgroup>
   </chapterinfo>
+-->
 
   <title>¥Ç¥¹¥¯¥È¥Ă¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</title>
 
@@ -24,13 +26,20 @@
     <title>¤³¤Î¾Ï¤Ç¤Ï</title>
 
     <para>&os; ¤ÏÀ­Ç½¤ä°ÂÄêÀ­¤Ë¤è¤ê¥µ¡¼¥Đ¤È¤·¤Æ¿Íµ¤¤¬¤¢¤ë°́Êư¤Ç¡¢
-      Æü¡¹¤Î¥Ç¥¹¥¯¥È¥Ă¥×¤È¤·¤Æ¤ÎÍøÍѤˤâŬ¤·¤Æ¤¤¤̃¤¹¡£<link
-	linkend="packages-using">packages</link> ¤ä <link
-	linkend="ports-using">ports</link> ¤«¤é
-      &os.numports; ¤̣Ķ¤¨¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤̣ÍøÍѤǤ­¤ë¤Î¤Ç¡¢
+      Æü¡¹¤Î¥Ç¥¹¥¯¥È¥Ă¥×¤È¤·¤Æ¤ÎÍøÍѤˤâŬ¤·¤Æ¤¤¤̃¤¹¡£
+      &os.numports; ¤̣Ķ¤¨¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤̣
+      packages ¤ä ports ¤«¤éÍøÍѤǤ­¤ë¤Î¤Ç¡¢
       ¤µ¤̃¤¶¤̃¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤̣Æ°¤«¤»¤ë¤è¤¦¤Ë¥«¥¹¥¿¥̃¥¤¥º¤·¤¿¥Ç¥¹¥¯¥È¥Ă¥×¤̣ºî¤ê¾å¤²¤ë¤³¤È¤¬¤Ç¤­¤̃¤¹¡£
       ¤³¤Î¾Ï¤Ç¤Ï¡¢packages ¤ä Ports Collection
-      ¤̣ÍѤ¤¤Æ¡¢¿Íµ¤¤Î¹â¤¤¥Ç¥¹¥¯¥È¥Ă¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤̣³Ú¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊưË¡¤̣ÀầÀ¤·¤̃¤¹¡£</para>
+      ¤̣ÍѤ¤¤Æ¡¢¿Íµ¤¤Î¹â¤¤¥Ç¥¹¥¯¥È¥Ă¥×¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤̣¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊưË¡¤Ë¤Ä¤¤¤ÆÀầÀ¤·¤̃¤¹¡£</para>
+
+    <note>
+      <para>°́¤«¤é¹½ĂÛ¤¹¤ë¤Î¤Ç¤Ï¤Ê¤¯¡¢
+	»öÁ°¤Ë¹½ĂÛ¤µ¤́¤¿¥Ç¥¹¥¯¥È¥Ă¥×¥Đ¡¼¥¸¥ç¥ó¤Î FreeBSD
+	¤̣¤ªË¾¤ß¤Î¥æ¡¼¥¶¤Ï¡¢<ulink
+	  url="http://www.pcbsd.org/">pcbsd.org
+	¥¦¥§¥Ö¥µ¥¤¥È</ulink> ¤̣¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+    </note>
 
     <para>&os; ¤Ï¡¢<link linkend="linuxemu">&linux; ¥Đ¥¤¥Ê¥ê¸ß´¹</link>
       µ¡Ç½¤̣»ư¤Ä¤Î¤Ç¡¢&linux; ÍѤ˳«È¯¤µ¤́¤¿Â¿¤¯¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤̣
@@ -117,7 +126,7 @@
 		OpenOffice</application></entry>
 	    <entry><literal>openoffice</literal></entry>
 	    <entry><filename
-		role="package">editors/openoffice-3</filename></entry>
+		role="package">editors/openoffice-4</filename></entry>
 	  </row>
 
 	  <row>
@@ -193,18 +202,23 @@
     <itemizedlist>
       <listitem>
 	<para>package ¤̃¤¿¤Ï ports
-	  ¤̣ÍѤ¤¤¿¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¥½¥Ơ¥È¥¦¥§¥¢¤Î¥¤¥ó¥¹¥È¡¼¥ëÊưË¡¡£</para>
+	  ¤̣ÍѤ¤¤¿¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¥½¥Ơ¥È¥¦¥§¥¢¤Î¥¤¥ó¥¹¥È¡¼¥ëÊưË¡
+	  (<xref linkend="ports"/>)¡£</para>
+      </listitem>
+
+      <listitem>
+	<para>X ¤ª¤è¤Ó¥¦¥£¥ó¥É¥¦¥̃¥Í¡¼¥¸¥ă¤Î¥¤¥ó¥¹¥È¡¼¥ëÊưË¡
+	  (<xref linkend="x11"/>)¡£</para>
       </listitem>
 
       <listitem>
-	<para>&linux; ¥Đ¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤̣Í­¸ú¤Ë¤¹¤ëÊưË¡¡£</para>
+	<para>&linux; ¥Đ¥¤¥Ê¥ê¸ß´¹µ¡Ç½¤̣Í­¸ú¤Ë¤¹¤ëÊưË¡
+	  (<xref linkend="linuxemu"/>)¡£</para>
       </listitem>
     </itemizedlist>
 
     <para>¥̃¥ë¥Á¥á¥Ç¥£¥¢´Ä¶­¤̣À°¤¨¤ëÊưË¡¤Ë¤Ä¤¤¤Æ¤Ï
-      <xref linkend="multimedia"/> ¤̣¡¢
-      ÅÅ»̉¥á¡¼¥ë¤̣ÀßÄꤷ¤Æ»È¤¤¤¿¤¤¾́¹ç¤Ë¤Ï
-      <xref linkend="mail"/> ¤̣»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      <xref linkend="multimedia"/> ¤̣»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
     <note>
       <title>̀ơĂí</title>
@@ -236,10 +250,10 @@
       ¤³¤́¤é¤Î¥Ç¥¹¥¯¥È¥Ă¥×´Ä¶­¤̣ÀßÄꤹ¤ë¤¿¤á¤Î¾đÊó¤Ë¤Ä¤¤¤Æ¤Ï
       <xref linkend="x11-wm"/> ¤̣»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-    <para>·ÚÎ̀¤Ê¥Ö¥é¥¦¥¶¤È¤·¤Æ¤Ï¡¢
-      <filename role="package">www/dillo2</filename>,
-      <filename role="package">www/links</filename>,
-      <filename role="package">www/w3m</filename>
+    <para>·ÚÎ̀¤Ê¥Ö¥é¥¦¥¶¤Ë¤Ï¡¢<filename
+	role="package">www/dillo2</filename>, <filename
+	role="package">www/links</filename>, ¤ª¤è¤Ó <filename
+	role="package">www/w3m</filename>
       ¤È¤¤¤Ă¤¿¤â¤Î¤¬¤¢¤ê¤̃¤¹¡£</para>
 
     <para>¤³¤ÎÀá¤Ç¤Ï°Ê²¼¤Î¿Íµ¤¤Î¤¢¤ë web ¥Ö¥é¥¦¥¶¤Î¥¤¥ó¥¹¥È¡¼¥ëÊưË¡¤Ë¤Ä¤¤¤ÆÀầÀ¤·¤̃¤¹¡£
@@ -263,7 +277,8 @@
 	    <entry><application>Firefox</application></entry>
 	    <entry>Ăæ</entry>
 	    <entry>½Å</entry>
-	    <entry>&os; ¤ª¤è¤Ó &linux; ÈǤ̣¤¬ÍøÍѤǤ­¤̃¤¹¡£</entry>
+	    <entry>&os;, &linux;
+	      ¤ª¤è¤ÓĂÏ°è²½¤µ¤́¤¿¥Đ¡¼¥¸¥ç¥ó¤̣ÍøÍѤǤ­¤̃¤¹¡£</entry>
 	  </row>
 
 	  <row>
@@ -298,8 +313,7 @@
       </indexterm>
 
       <para><application>Firefox</application> ¤Ï¡¢
-	Àè¿ÊŪ¤Ç̀µÎÁ¤«¤Ä¥ª¡¼¥×¥ó¥½¡¼¥¹¤Î¥Ö¥é¥¦¥¶¤Ç¤¹¡£
-	&os; ¤Ë´°Á´¤ËÂб₫¤·¤Æ¤¤¤̃¤¹¡£
+	&os; ¤Ë´°Á´¤ËÂб₫¤·¤¿¥ª¡¼¥×¥ó¥½¡¼¥¹¤Î¥Ö¥é¥¦¥¶¤Ç¤¹¡£
 	ɸ½à¤Ë½àµ̣¤·¤¿ HTML ɽ¼¨¥¨¥ó¥¸¥ó¡¢¥¿¥Ö¥Ö¥é¥¦¥¸¥ó¥°¡¢¥Ư¥Ă¥×¥¢¥Ă¥×¥Ö¥í¥Ă¥¯¡¢
 	³ÈÄ¥À­¡¢¹â¤¤°ÂÁ´À­¤Ê¤É¤¬ÆĂħ¤Ç¤¹¡£
 	<application>Firefox</application> ¤Ï <application>Mozilla</application>
@@ -333,13 +347,12 @@
     <sect3 id="moz-java-plugin">
       <title>Firefox ¤È &java; ¥×¥é¥°¥¤¥ó</title>
 
-      <note>
-	<para>°Ê²¼¤ÎÀá¤Ç¤Ï¡¢<application>Firefox</application>
-	  ¤¬¤¢¤é¤«¤¸¤á¥¤¥ó¥¹¥È¡¼¥ë¤µ¤́¤Æ¤¤¤ë¤³¤È¤̣Á°Äó¤È¤·¤Æ¤¤¤̃¤¹¡£</para>
-      </note>
-
-      <para><filename role="package">java/icedtea-web</filename> ¤Ï¡¢
-	Java ¥¢¥×¥́¥Ă¥È¤ËÂФ·¡¢¥Ơ¥ê¡¼¥½¥Ơ¥È¤Î web ¥Ö¥é¥¦¥¶¤Î¥×¥é¥°¥¤¥ó¤̣Ä󶡤·¤̃¤¹¡£
+      <para>
+	<application>Firefox</application> ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤Ï¡¢
+	&java; ¤Î¥µ¥Ư¡¼¥È¤Ï´̃¤̃¤́¤̃¤»¤ó¡£
+	<filename role="package">java/icedtea-web</filename> ¤Ï¡¢
+	Java ¥¢¥×¥́¥Ă¥È¤̣¼Â¹Ô¤¹¤ë¤¿¤á¤Î¡¢
+	¥Ơ¥ê¡¼¥½¥Ơ¥È¤Î web ¥Ö¥é¥¦¥¶¤Î¥×¥é¥°¥¤¥ó¤Ç¤¹¡£
 	package ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤̃¤¹¡£port ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤Ë¤Ï¡¢
 	°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
@@ -370,9 +383,9 @@
 	<primary>Flash</primary>
       </indexterm>
 
-      <para>&os; ÍѤΠ&adobe; &flash; ¥×¥é¥°¥¤¥ó¤ÏÄ󶡤µ¤́¤Æ¤¤¤̃¤»¤ó¡£
-	¤·¤«¤·¤Ê¤¬¤é¡¢&linux;
-	¥Đ¡¼¥¸¥ç¥ó¤Î¥×¥é¥°¥¤¥ó¤̣¼Â¹Ô¤¹¤ë¤¿¤á¤Î¥½¥Ơ¥È¥¦¥§¥¢¥́¥¤¥ä (wrapper) ¤¬Â¸ºß¤·¤̃¤¹¡£
+      <para>&os; ÍѤΠ&adobe; &flash; ¥×¥é¥°¥¤¥ó¤ÏÄ󶡤µ¤́¤Æ¤¤¤̃¤»¤ó¤¬¡¢
+	&linux;
+	ÈǤΥץ饰¥¤¥ó¤̣¼Â¹Ô¤¹¤ë¤¿¤á¤Î¥½¥Ơ¥È¥¦¥§¥¢ wrapper ¤̣ÍøÍѤǤ­¤̃¤¹¡£
 	¤³¤Î wrapper ¤Ï¡¢
 	&realplayer; ¥×¥é¥°¥¤¥ó¤È¤¤¤Ă¤¿Â¾¤Î¥Ö¥é¥¦¥¶¤Î¥×¥é¥°¥¤¥ó¤Ë¤âÂб₫¤·¤Æ¤¤¤̃¤¹¡£</para>
 
@@ -430,11 +443,11 @@
 
       <title>Firefox ¤È Swfdec &flash; ¥×¥é¥°¥¤¥ó</title>
 
-      <para>Swfdec ¤Ï &flash;
-	¥¢¥Ë¥á¡¼¥·¥ç¥ó¤Î¥Ç¥³¡¼¥É¤ä¥́¥ó¥À¥ê¥ó¥°¤̣¹Ô¤¦¥é¥¤¥Ö¥é¥ê¤Ç¤¹¡£
-	Swfdec-Mozilla ¤Ï¡¢<application>Firefox</application> ¥Ö¥é¥¦¥¶¤Ë¤ª¤¤¤Æ
-	SWF ¥Ơ¥¡¥¤¥ë¤̣¼Â¹Ô¤¹¤ë¤¿¤á¤Î¥×¥é¥°¥¤¥ó¤Ç¡¢Swfdec ¥é¥¤¥Ö¥é¥ê¤̣ÍøÍѤ·¤Æ¤¤¤̃¤¹¡£
-	¤³¤Î¥é¥¤¥Ö¥é¥ê¤Ï¡¢¸½ºß¤Ç¤âÀ¹¤ó¤Ë³«È¯¤µ¤́¤Æ¤¤¤̃¤¹¡£</para>
+      <para><application>Swfdec</application> ¤Ï &flash;
+	¥¢¥Ë¥á¡¼¥·¥ç¥ó¤Î¥Ç¥³¡¼¥À¡¼¤ª¤è¤Ó¥́¥ó¥À¥é¡¼¤Ç¤¹¡£
+	<application>Swfdec-Mozilla</application> ¤Ï¡¢
+	<application>Firefox</application> ¥Ö¥é¥¦¥¶¤Ë¤ª¤¤¤Æ
+	SWF ¥Ơ¥¡¥¤¥ë¤̣¼Â¹Ô¤¹¤ë¤¿¤á¤Î¥×¥é¥°¥¤¥ó¤Ç¡¢Swfdec ¥é¥¤¥Ö¥é¥ê¤̣ÍøÍѤ·¤Æ¤¤¤̃¤¹¡£</para>
 
       <para>package ¤̣¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤̣¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
@@ -490,7 +503,8 @@
 	¤½¤Î¸å¡¢<filename
 	  role="package">www/opera-linuxplugins</filename> port
 	¤â¤·¤¯¤Ï package ¤̣¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
-	°Ê²¼¤ÎÎă¤Ç¤Ï¡¢Î¾Êư¤̣ ports ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤·¤̃¤¹¡£</para>
+	°Ê²¼¤ÎÎă¤Ç¤Ï¡¢Î¾Êư¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤̣
+	ports ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤·¤̃¤¹¡£</para>
 
       <screen>&prompt.root; <userinput>cd /usr/ports/www/linux-f10-flashplugin11</userinput>
 &prompt.root; <userinput>make install clean</userinput>
@@ -504,8 +518,8 @@
 	¸½ºßÍøÍѲÄǽ¤Ê¥×¥é¥°¥¤¥ó¤Î°́Í÷¤¬É½¼¨¤µ¤́¤̃¤¹¡£</para>
 
       <para><application>&java;</application> ¥×¥é¥°¥¤¥ó¤̣ÄÉ²Ă¤¹¤ë¤Ë¤Ï¡¢
-	<link linkend="moz-java-plugin">Firefox ¤Ç¤Î¼ê½ç</link>
-	¤Ë¤·¤¿¤¬¤Ă¤Æ¤¯¤À¤µ¤¤¡£</para>
+	<xref linkend="moz-java-plugin"/>
+ 	¤Ë½ñ¤«¤́¤Æ¤¤¤ë¼ê½ç¤Ë½¾¤Ă¤Æ¤¯¤À¤µ¤¤¡£</para>
     </sect2>
 
     <sect2>
@@ -515,11 +529,10 @@
 	<primary><application>Konqueror</application></primary>
       </indexterm>
 
-      <para><application>Konqueror</application> ¤Ï <filename
-	  role="package">x11/kde4-baseapps</filename>
-	¤̣¹½À®¤¹¤ë¥½¥Ơ¥È¥¦¥§¥¢¤Ç¤¹¡£
-	<application>Konqueror</application> ¤Ï¥Ö¥é¥¦¥¶¤Ç¤¢¤ë¤ÈƱ»₫¤Ë¡¢
-	¥Ơ¥¡¥¤¥ë¥̃¥Í¡¼¥¸¥ă¤ª¤è¤Ó¥̃¥ë¥Á¥á¥Ç¥£¥¢¥Ó¥å¡¼¥¢¤Ị̂̀³ä¤â²̀¤¿¤·¤̃¤¹¡£</para>
+      <para><application>Konqueror</application> ¤Ï¥Ö¥é¥¦¥¶¤Ç¤¢¤ë¤ÈƱ»₫¤Ë¡¢
+	¥Ơ¥¡¥¤¥ë¥̃¥Í¡¼¥¸¥ă¤ª¤è¤Ó¥̃¥ë¥Á¥á¥Ç¥£¥¢¥Ó¥å¡¼¥¢¤Ị̂̀³ä¤â²̀¤¿¤·¤̃¤¹¡£
+	<filename role="package">x11/kde4-baseapps</filename> package ¤̃¤¿¤Ï
+	port ¤Ë´̃¤̃¤́¤Æ¤¤¤̃¤¹¡£</para>
 
       <para><application>Konqueror</application> ¤Ï¡¢KHTML ¤È¤È¤â¤Ë¡¢WebKit
 	¤Ë¤âÂб₫¤·¤Æ¤¤¤̃¤¹¡£WebKit ¤Ï Chromium
@@ -585,12 +598,9 @@
     <sect3 id="chromium-java-plugin">
       <title>Chromium ¤È &java; ¥×¥é¥°¥¤¥ó</title>
 
-      <note>
-	<para>°Ê²¼¤ÎÀá¤Ç¤Ï¡¢<application>Chromium</application>
-	  ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤́¤Æ¤¤¤ë¤³¤È¤̣Á°Äó¤È¤·¤Æ¤¤¤̃¤¹¡£</para>
-      </note>
-
-      <para>&java; ¥×¥é¥°¥¤¥ó¤̣¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢
+      <para><application>Chromium</application> ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤Ï¡¢
+	&java; ¤Ø¤Î¥µ¥Ư¡¼¥È¤Ï´̃¤̃¤́¤̃¤»¤ó¡£
+	&java; ¥×¥é¥°¥¤¥ó¤̣¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢
 	<xref linkend="moz-java-plugin"/>
 	¤Ë½ñ¤«¤́¤Æ¤¤¤ë¼ê½ç¤Ë½¾¤Ă¤Æ¤¯¤À¤µ¤¤¡£</para>
 
@@ -613,8 +623,8 @@
 	<title>Chromium ¤È &adobe;&nbsp;&flash; ¥×¥é¥°¥¤¥ó</title>
 
 	<para><application>Chromium</application> ¤È &adobe;&nbsp;&flash;
-	  ¤ÎÀßÄê¤Ï¡¢<link
-	  linkend="moz-flash-plugin">Firefox ¤Î¼ê½ç</link> ¤ÈƱ¤¸¤Ç¤¹¡£
+	  ¤ÎÀßÄê¤Ï¡¢<xref
+	  linkend="moz-flash-plugin"/> ¤Ë½ñ¤«¤́¤Æ¤¤¤ë¼ê½ç¤ÈƱ¤¸¤Ç¤¹¡£
 	  <application>Chromium</application>
 	  ¤Ï¡¢Â¾¤Î¥Ö¥é¥¦¥¶¤Î¥×¥é¥°¥¤¥ó¤̣ÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤ë¤Î¤Ç¡¢
 	  ÄÉ²Ă¤ÎÀßÄê¤ÏɬÍפ¢¤ê¤̃¤»¤ó¡£</para>
@@ -626,14 +636,15 @@
     <title>À¸»ºÅª¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó</title>
 
     <para>À¸»ºÅª¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤È¤¤¤¦¤³¤È¤Ë¤Ê¤ë¤È¡¢
-      ¿·¤·¤¤¥æ¡¼¥¶¤Ï¤·¤Đ¤·¤Đ̀¥ÎÏŪ¤Ê¥ª¥Ơ¥£¥¹¥¹¥¤¡¼¥È¤ä
-      ¿Æ¤·¤ß¤Î¤¢¤ë¥ï¡¼¥É¥×¥í¥»¥Ă¥µ¤̣µá¤á¤ë¤Ç¤·¤ç¤¦¡£
-      ¥Ç¥Ơ¥©¥ë¥È¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç¤Ï¤¢¤ê¤̃¤»¤ó¤¬¡¢
+      ¿·¤·¤¤¥æ¡¼¥¶¤Ï¤·¤Đ¤·¤Đ¥ª¥Ơ¥£¥¹¥¹¥¤¡¼¥È¤ä¡¢
+      »È¤¤¤ä¤¹¤¤Ê¸½ñºîÀ®¥½¥Ơ¥È¥¦¥§¥¢¤̣µá¤á¤ë¤Ç¤·¤ç¤¦¡£
+      ¥Ç¥Ơ¥©¥ë¥È¤ÎÀ¸»ºÅª¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç¤Ï¤¢¤ê¤̃¤»¤ó¤¬¡¢
       <application>KDE</application> ¤Î¤è¤¦¤Ê
       <link linkend="x11-wm">¥Ç¥¹¥¯¥È¥Ă¥×´Ä¶­</link>
       ¤Ï¥ª¥Ơ¥£¥¹¥¹¥¤¡¼¥È¤̣Ä󶡤·¤Æ¤¤¤̃¤¹¡£
-      ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤́¤Æ¤¤¤ë¥Ç¥¹¥¯¥È¥Ă¥×´Ä¶­¤Ë¤«¤«¤ï¤é¤º¡¢&os; ¤Ç¤Ï¡¢
-      ¤¤¤¯¤Ä¤â¤Î¥ª¥Ơ¥£¥¹¥¹¥¤¡¼¥È¡¢Ê¸½ñºîÀ®¥½¥Ơ¥È¥¦¥§¥¢¤̣ÍøÍѤǤ­¤̃¤¹¡£</para>
+      ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤́¤Æ¤¤¤ë¥¦¥£¥ó¥É¥¦¥̃¥Í¡¼¥¸¥ă¤Ë¤«¤«¤ï¤é¤º¡¢&os; ¤Ç¤Ï¡¢
+      ¤¤¤¯¤Ä¤â¤Î¥ª¥Ơ¥£¥¹¥¹¥¤¡¼¥È¡¢
+      ¥°¥é¥Ơ¥£¥«¥ë¤Êʸ½ñºîÀ®¥½¥Ơ¥È¥¦¥§¥¢¤̣ÍøÍѤǤ­¤̃¤¹¡£</para>
 
     <para>¤³¤ÎÀá¤Ç¤Ï¡¢°Ê²¼¤Î¿Íµ¤¤Î¤¢¤ëÀ¸»ºÅª¤Ê¥½¥Ơ¥È¥¦¥§¥¢¤Î¥¤¥ó¥¹¥È¡¼¥ëÊưË¡¤Ë¤Ä¤¤¤ÆÀầÀ¤·¤̃¤¹¡£
       ¤â¤·¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬¥ê¥½¡¼¥¹¤̣ÂçÎ̀¤Ë¾ĂÈñ¤·¤¿¤ê¡¢
@@ -707,9 +718,9 @@
 	<secondary><application>Calligra</application></secondary>
       </indexterm>
 
-      <para>KDE ¥³¥ß¥å¥Ë¥Æ¥£¤Ï¥Ç¥¹¥¯¥È¥Ă¥×´Ä¶­¤È¤È¤â¤Ë¡¢
-	<application>KDE</application> ´Ä¶­°Ê³°¤Ç¤âÍøÍѲÄǽ¤Ê
-	¥ª¥Ơ¥£¥¹¥¹¥¤¡¼¥È¤̣Ä󶡤·¤Æ¤¤¤̃¤¹¡£
+      <para>KDE ¥Ç¥¹¥¯¥È¥Ă¥×¤Ë¤Ï¡¢
+	<application>KDE</application>
+	´Ä¶­°Ê³°¤Ç¤âÍøÍѲÄǽ¤Ê¥ª¥Ơ¥£¥¹¥¹¥¤¡¼¥È¤¬¤¢¤ê¤̃¤¹¡£
 	<application>Calligra</application> ¤Ë¤Ï¡¢Â¾¤Î¥ª¥Ơ¥£¥¹¥¹¥¤¡¼¥È¤ÈƱÍͤˡ¢
 	ɸ½àŪ¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬´̃¤̃¤́¤Æ¤¤¤̃¤¹¡£
 	<application>Words</application> ¤Ïʸ½ñºîÀ®¥½¥Ơ¥È¥¦¥§¥¢¡¢
@@ -718,13 +729,8 @@
 	¤Ï¥×¥́¥¼¥ó¥Æ¡¼¥·¥ç¥ó¥½¥Ơ¥È¥¦¥§¥¢¡¢¤½¤·¤Æ
 	<application>Karbon</application> ¤Ï¿̃·ÁÉÁ²è¥½¥Ơ¥È¥¦¥§¥¢¤Ç¤¹¡£</para>
 
-      <para>ºÇ¿·¤Î <application>KOffice</application>
-	¤̣¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾́¹ç¤Ë¤Ï¡¢»öÁ°¤Ë <application>KDE</application>
-	¤̣ºÇ¿·¤Î¥Đ¡¼¥¸¥ç¥ó¤Ë¤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-      <para><filename
-	  role="package">editors/calligra</filename> ¤Ï¡¢package ¤̃¤¿¤Ï port
-	¤«¤é¥¤¥ó¥¹¥È¡¼¥ë½ĐÍè¤̃¤¹¡£      
+      <para>&os; ¤Ç¤Ï package ¤̃¤¿¤Ï port ¤«¤é <filename
+	  role="package">editors/calligra</filename> ¤̣¥¤¥ó¥¹¥È¡¼¥ë½ĐÍè¤̃¤¹¡£
 	package ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤̃¤¹¡£</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r calligra</userinput></screen>
@@ -745,12 +751,11 @@
 
       <para><application>AbiWord</application>
 	¤Ï¡¢<application>&microsoft; Word</application>
-	¤Î¤è¤¦¤Ê¸«¤¿̀ܤäÁàºî´¶¤̣»ư¤Ä¥Ơ¥ê¡¼¤Î¥ï¡¼¥É¥×¥í¥»¥Ă¥µ¤Ç¤¹¡£
-	½ñÎà¤ä¼ê»æ¡¢Êó¹đ½ñ¡¢¥á¥â¤Ê¤É¤̣½ñ¤¯¤Î¤ËŬ¤·¤Æ¤¤¤̃¤¹¡£
-	®¤¯¡¢Â¿¤¯¤ÎÆĂħ¤¬¤¢¤ê¡¢¥æ¡¼¥¶¥Ơ¥́¥ó¥É¥ê¤Ç¤¹¡£</para>
+	¤Î¤è¤¦¤Ê¸«¤¿̀ܤäÁàºî´¶¤̣»ư¤Ä¥Ơ¥ê¡¼¤Îʸ½ñºîÀ®¥½¥Ơ¥È¥¦¥§¥¢¤Ç¤¹¡£
+	®¤¯¡¢Â¿¤¯¤Îµ¡Ç½¤̣»ư¤Á¡¢¥æ¡¼¥¶¥Ơ¥́¥ó¥É¥ê¤Ç¤¹¡£</para>
 
       <para><application>AbiWord</application> ¤Ï¡¢
-	&microsoft; <filename>.doc</filename>
+	&microsoft; <filename>.rtf</filename>
 	¤Î¤è¤¦¤ÊÆȼ«»ÅỊ́ͤ´̃¤à¿¤¯¤Î·Á¼°¤Î¥Ơ¥¡¥¤¥ë¤̣Æɤ߽ñ¤­¤Ç¤­¤̃¤¹¡£</para>
 
       <para><application>AbiWord</application> ¤̣ package
@@ -791,9 +796,9 @@
       <screen>&prompt.root; <userinput>cd /usr/ports/graphics/gimp</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
-      <para>Ports Collection ¤Î <ulink
-	  url="http://www.FreeBSD.org/ports/graphics.html">graphics</ulink>
-	¥«¥Æ¥´¥ê¤Ë¤Ï¡¢<application>GIMP</application> ¤Ë´ØÏ¢¤·¤¿¥×¥é¥°¥¤¥ó¡¢
+      <para>Ports Collection ¤Î graphics ¥«¥Æ¥´¥ê (<ulink
+	  url="http://www.FreeBSD.org/ports/graphics.html">freebsd.org/ports/graphics.html</ulink>)
+	¤Ë¤Ï¡¢<application>GIMP</application> ¤Ë´ØÏ¢¤·¤¿¥×¥é¥°¥¤¥ó¡¢
 	¥Ø¥ë¥×¥Ơ¥¡¥¤¥ë¤ª¤è¤Ó¥æ¡¼¥¶¥̃¥Ë¥å¥¢¥ë¤Ê¤É¤¬¤¢¤ê¤̃¤¹¡£</para>
 
     </sect2>
@@ -813,27 +818,22 @@
 	</secondary>
       </indexterm>
 
-      <para>2011 ǯ 7 ·î 1 Æü¡¢&oracle; ¤Ï
-	<application>OpenOffice.org</application> ¤Î¥³¡¼¥É¥Ù¡¼¥¹¤̣
-	Apache Software Foundation ¤Ø´ó£¤·¤̃¤·¤¿¡£	
-	¸½ºß <application>OpenOffice.org</application> ¤Ï¡¢
-	<application>Apache OpenOffice</application> ¤È¤·¤ÆĂΤé¤́¡¢
+      <para><application>Apache OpenOffice</application> ¤Ï¡¢
 	Apache Software Foundation
-	¤Î¥¤¥ó¥­¥å¥Ù¡¼¥¿¥×¥í¥¸¥§¥¯¥È¤È¤·¤Æ³«È¯¤¬¹Ô¤ï¤́¤Æ¤¤¤̃¤¹¡£</para>
-
-      <para><application>Apache OpenOffice</application>
+	¤Î¥¤¥ó¥­¥å¥Ù¡¼¥¿¥×¥í¥¸¥§¥¯¥È¤È¤·¤Æ³«È¯¤¬¹Ô¤ï¤́¤Æ¤¤¤ë¥ª¡¼¥×¥ó¥½¡¼¥¹¤Î¥ª¥Ơ¥£¥¹¥¹¥¤¡¼¥È¤Ç¤¹¡£
+	<application>Apache OpenOffice</application>
 	¤Ï¡¢´°Á´¤Ê¥ª¥Ơ¥£¥¹¥¹¥¤¡¼¥È¤Ëɬ¿Ü¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó
-	(¥ï¡¼¥É¥×¥í¥»¥Ă¥µ¡¢É½·×»»¥½¥Ơ¥È¥¦¥§¥¢¡¢
+	(ʸ½ñºîÀ®¥½¥Ơ¥È¥¦¥§¥¢¡¢É½·×»»¥½¥Ơ¥È¥¦¥§¥¢¡¢
 	¥×¥́¥¼¥ó¥Æ¡¼¥·¥ç¥ó¥½¥Ơ¥È¥¦¥§¥¢¡¢¤½¤·¤Æ¿̃·ÁÉÁ²è¥½¥Ơ¥È¥¦¥§¥¢)
 	¤̣¤̉¤È¤È¤ª¤ê·¤¨¤Æ¤¤¤̃¤¹¡£
 	¥æ¡¼¥¶¥¤¥ó¥¿¥Ơ¥§¡¼¥¹¤Ï¾¤Î¥ª¥Ơ¥£¥¹¥¹¥¤¡¼¥È¤È»÷¤Æ¤ª¤ê¡¢
 	¹­¤¯ÍѤ¤¤é¤́¤Æ¤¤¤ë¤µ¤̃¤¶¤̃¤Ê·Á¼°¤Î¥Ơ¥¡¥¤¥ë¤̣Æɤ߽ñ¤­¤Ç¤­¤̃¤¹¡£
-	¥¤¥ó¥¿¥Ơ¥§¡¼¥¹¡¢¥¹¥Ú¥ë¥Á¥§¥Ă¥«¡¢¼­½ñ¤Ï¹ñºƯ²½¤µ¤́¤Æ¤ª¤ê¡¢
-	¿¤¯¤Î¸À¸́¤ÇÍøÍѤǤ­¤̃¤¹¡£</para>
+	¿¤¯¤Î¸À¸́¤ÇÍøÍѤǤ­¡¢¥¤¥ó¥¿¥Ơ¥§¡¼¥¹¡¢¥¹¥Ú¥ë¥Á¥§¥Ă¥«¡¢
+	¼­½ñ¤Ï¹ñºƯ²½¤µ¤́¤Æ¤¤¤̃¤¹¡£</para>
 
       <para><application>Apache OpenOffice</application>
-	¤Î¥ï¡¼¥É¥×¥í¥»¥Ă¥µ¤Ï¡¢¥Í¥¤¥Æ¥£¥Ö¤Î¥Ơ¥¡¥¤¥ë·Á¼°¤Ë XML ¤̣ºÎÍѤ¹¤ë¤³¤È¤Ç
-	¥Ư¡¼¥¿¥Ó¥ê¥Æ¥£¤ä½ÀÆđÀ­¤̣¹â¤á¤Æ¤¤¤̃¤¹¡£
+	¤Îʸ½ñºîÀ®¥½¥Ơ¥È¥¦¥§¥¢¤Ï¡¢¥Í¥¤¥Æ¥£¥Ö¤Î XML
+	¥Ơ¥¡¥¤¥ë·Á¼°¤̣ºÎÍѤ¹¤ë¤³¤È¤Ç¥Ư¡¼¥¿¥Ó¥ê¥Æ¥£¤ä½ÀÆđÀ­¤̣¹â¤á¤Æ¤¤¤̃¤¹¡£
 	ɽ·×»»¥½¥Ơ¥È¥¦¥§¥¢¤Ë¤Ï¥̃¥¯¥íµ¡Ç½¤¬¤¢¤ê¡¢
 	³°Éô¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÈÀܳ¤¹¤ë¤³¤È¤â¤Ç¤­¤̃¤¹¡£
 	<application>Apache OpenOffice</application> ¤Ï¡¢
@@ -841,27 +841,16 @@
 	¤Ë¤ª¤¤¤Æ°ÂÄꤷ¤Æ¥Í¥¤¥Æ¥£¥Ö¤ËÆ°ºî¤·¤Æ¤¤¤̃¤¹¡£
 	<application>Apache OpenOffice</application>
 	¤Ë¤Ä¤¤¤Æ¤Î¤è¤ê¾Ü¤·¤¤¾đÊó¤Ï¡¢<ulink
-	  url="http://incubator.apache.org/openofficeorg/">Apache
-	OpenOffice web ¥µ¥¤¥È</ulink> ¤̣¤´Í÷¤¯¤À¤µ¤¤¡£¤̃¤¿¡¢<ulink
-	  url="http://porting.openoffice.org/freebsd/">&os; Apache
-	OpenOffice °Ü¿¢¥Á¡¼¥à</ulink>
-	¤Î web ¥µ¥¤¥È¤«¤é¡¢&os; ÆĂÍ­¤Î¾đÊó¤ä
-	packages ¤̣ľÀܼèÆÀ¤¹¤ë¤³¤È¤â¤Ç¤­¤̃¤¹¡£</para>
+	  url="http://openoffice.org/">openoffice.org</ulink>
+	¤̣¤´Í÷¤¯¤À¤µ¤¤¡£¤̃¤¿¡¢<ulink
+	  url="http://porting.openoffice.org/freebsd/">porting.openoffice.org/freebsd/</ulink>
+	¤«¤é¡¢&os; ÆĂÍ­¤Î¾đÊó¤̣»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <para><application>Apache OpenOffice</application> package
 	¤̣¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤ËÆ₫ÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.root; <userinput>pkg_add -r apache-openoffice</userinput></screen>
 
-      <note>
-	<para>&os; ¤Î¥ê¥ê¡¼¥¹ÈǤ̣»ÈÍѤ·¤Æ¤¤¤ë¾́¹ç¤Ë¤Ï¡¢¤³¤ÎÁàºî¤Ï¤¦¤̃¤¯¤¤¤¯¤Ç¤·¤ç¤¦¡£
-	  ¤½¤́°Ê³°¤ÎÈǤ̣»ÈÍѤ·¤Æ¤¤¤ë¾́¹ç¤Ë¤Ï¡¢
-	  &os; <application>Apache OpenOffice</application>
-	  °Ü¿¢¥Á¡¼¥à¤Î web ¥µ¥¤¥È¤«¤éŬÀÚ¤Ê package ¤̣¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¡¢
-	  &man.pkg.add.1; ¤̣»ÈÍѤ·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
-	  ¤³¤Î¥¦¥§¥Ö¥µ¥¤¥È¤«¤é¡¢¥ê¥ê¡¼¥¹ÈǤȳ«È¯ÈǤÎξÊư¤̣¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤̃¤¹¡£</para>
-      </note>
-
       <para>package ¤̣¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤é¡¢°Ê²¼¤Î¥³¥̃¥ó¥É¤̣Æ₫ÎϤ·¤Æ
 	<application>Apache OpenOffice</application> ¤̣µ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
@@ -869,20 +858,18 @@
 
       <para>¤³¤³¤Ç <replaceable>X.Y.Z</replaceable> ¤Ï¡¢
 	¥¤¥ó¥¹¥È¡¼¥ë¤µ¤́¤Æ¤¤¤ë
-	<application>Apache OpenOffice</application> ¤Î¥Đ¡¼¥¸¥ç¥óÈÖ¹æ¤Ç¤¹¡£</para>
-
-      <note>
-	<para>½é²óµ¯Æ°»₫¤Ë¡¢¤¤¤¯¤Ä¤«¤Î¼Á̀䤬¹Ô¤ï¤́¡¢
-	  ¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥́¥¯¥È¥ê¤Ë <filename>.openoffice.org</filename>
-	  ¥Ơ¥©¥ë¥À¤¬ºîÀ®¤µ¤́¤̃¤¹¡£</para>
-      </note>
+	<application>Apache OpenOffice</application> ¤Î¥Đ¡¼¥¸¥ç¥óÈÖ¹æ¤Ç¤¹¡£
+	<application>Apache OpenOffice</application>
+	¤Î½é²óµ¯Æ°»₫¤Ë¡¢¤¤¤¯¤Ä¤«¤Î¼Á̀䤬¹Ô¤ï¤́¡¢
+	¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥́¥¯¥È¥ê¤Ë <filename>.openoffice.org</filename>
+	¥Ơ¥©¥ë¥À¤¬ºîÀ®¤µ¤́¤̃¤¹¡£</para>
 
       <para>´ơ˾¤Î <application>Apache OpenOffice</application> ¤Î packages
 	¤̣ÍøÍѤǤ­¤Ê¤¤¾́¹ç¤Ë¤Ï¡¢port ¤̣ÍøÍѤ¹¤ëÊưË¡¤â¤¢¤ê¤̃¤¹¡£
 	¤·¤«¤·¤Ê¤¬¤é¡¢¥³¥ó¥Ñ¥¤¥ë¤Ë¤ÏÂ礭¤Ê¥Ç¥£¥¹¥¯¥¹¥Ú¡¼¥¹¤È¡¢
 	ËÜÅö¤Ë¤«¤Ê¤êŤ¤»₫´Ö¤̣ɬÍפȤ·¤̃¤¹¡£</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/ports/editors/openoffice-3</userinput>
+      <screen>&prompt.root; <userinput>cd /usr/ports/editors/openoffice-4</userinput>
 &prompt.root; <userinput>make install clean</userinput></screen>
 
       <note>
@@ -909,18 +896,18 @@
       </indexterm>
 
       <para><application>LibreOffice</application> ¤Ï¡¢<ulink
-	  url="http://www.documentfoundation.org/">The Document
-	Foundation</ulink>
+	  url="http://www.documentfoundation.org/">documentfoundation.org</ulink>
 	¤¬³«È¯¤·¤Æ¤¤¤ë¥Ơ¥ê¡¼¥½¥Ơ¥È¥¦¥§¥¢¤Î¥ª¥Ơ¥£¥¹¥¹¥£¡¼¥È¤Ç¤¹¡£
 	¾¤Î¥á¥¸¥ă¡¼¤Ê¥ª¥Ơ¥£¥¹¥¹¥£¡¼¥È¤È¸ß´¹À­¤¬¤¢¤ê¡¢
 	¤µ¤̃¤¶¤̃¤Ê¥×¥é¥Ă¥È¥Ơ¥©¡¼¥à¤ÇÍøÍѤǤ­¤̃¤¹¡£
+	<application>OpenOffice.org</application>
+	¤«¤é¤Î¿·¤·¤¤¥Ơ¥©¡¼¥¯¤Ç¡¢
 	´°Á´¤Ê¥ª¥Ơ¥£¥¹À¸»ºÀ­¥¹¥£¡¼¥È¤Ëɬ¿Ü¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó
-	(ʸ½ñºîÀ®¥½¥Ơ¥È¥¦¥§¥¢¡¢É½·×»»¥½¥Ơ¥È¥¦¥§¥¢¡¢¥×¥́¥¼¥ó¥Æ¡¼¥·¥ç¥ó¥½¥Ơ¥È¥¦¥§¥¢¡¢
-	¿̃·ÁÉÁ²è¥½¥Ơ¥È¥¦¥§¥¢¡¢¥Ç¡¼¥¿¥Ù¡¼¥¹´ÉÍư¥½¥Ơ¥È¥¦¥§¥¢¡¢¿ô¼°¥¨¥Ç¥£¥¿)
-	¤̣¤¹¤Ù¤Æ·¤¨¤Æ¤¤¤ë <application>OpenOffice.org</application>
-	¤«¤é¤Î¿·¤·¤¤¥Ơ¥©¡¼¥¯¤Ç¤¹¡£
-	¥¤¥ó¥¿¥Ơ¥§¡¼¥¹¡¢¥¹¥Ú¥ë¥Á¥§¥Ă¥«¡¢¼­½ñ¤Ï¹ñºƯ²½¤µ¤́¤Æ¤ª¤ê¡¢
-	¿¤¯¤Î¸À¸́¤ÇÍøÍѤǤ­¤̃¤¹¡£</para>
+	(ʸ½ñºîÀ®¥½¥Ơ¥È¥¦¥§¥¢¡¢É½·×»»¥½¥Ơ¥È¥¦¥§¥¢¡¢
+	¥×¥́¥¼¥ó¥Æ¡¼¥·¥ç¥ó¥½¥Ơ¥È¥¦¥§¥¢¡¢¿̃·ÁÉÁ²è¥½¥Ơ¥È¥¦¥§¥¢¡¢
+	¥Ç¡¼¥¿¥Ù¡¼¥¹´ÉÍư¥½¥Ơ¥È¥¦¥§¥¢¡¢¿ô¼°¥¨¥Ç¥£¥¿) ¤̣¤¹¤Ù¤Æ·¤¨¤Æ¤¤¤̃¤¹¡£
+	¿¤¯¤Î¸À¸́¤ÇÍøÍѤǤ­¡¢
+	¥¤¥ó¥¿¥Ơ¥§¡¼¥¹¡¢¥¹¥Ú¥ë¥Á¥§¥Ă¥«¡¢¼­½ñ¤Ï¹ñºƯ²½¤µ¤́¤Æ¤¤¤̃¤¹¡£</para>
 
       <para><application>LibreOffice</application>
 	¤Î¥ï¡¼¥É¥×¥í¥»¥Ă¥µ¤Ï¡¢
@@ -933,7 +920,8 @@
 	¤Ë¤ª¤¤¤Æ°ÂÄꤷ¤Æ¥Í¥¤¥Æ¥£¥Ö¤ËÆ°ºî¤·¤Æ¤¤¤̃¤¹¡£
 	<application>LibreOffice</application>
 	¤Ë¤Ä¤¤¤Æ¤Î¾Ü¤·¤¤¾đÊó¤Ï¡¢
-	<ulink url="http://www.libreoffice.org/">LibreOffice ¥¦¥§¥Ö¥µ¥¤¥È</ulink>
+	<ulink
+	  url="http://www.libreoffice.org/">libreoffice.org</ulink>
 	¤̣¤´Í÷¤¯¤À¤µ¤¤¡£</para>
 
       <para>±Ñ¸́ÈǤΠ<application>LibreOffice</application> package
@@ -941,8 +929,8 @@
 
       <screen>&prompt.root; <userinput>pkg_add -r libreoffice</userinput></screen>
 
-      <para>Ports Collection ¤Î <ulink
-	  url="http://www.FreeBSD.org/ports/editors.html">editors</ulink>
+      <para>Ports Collection ¤Î edtors ¥«¥Æ¥´¥ê (<ulink
+	  url="http://www.FreeBSD.org/ports/editors.html">freebsd.org/ports/editors.html</ulink>)
 	¥«¥Æ¥´¥ê¤Ë¤Ï¡¢ĂÏ°è²½¤µ¤́¤¿ <application>LibreOffice</application>
 	¤¬ÍÑ°Ơ¤µ¤́¤Æ¤¤¤̃¤¹¡£
 	ĂÏ°è²½¤µ¤́¤¿ package ¤̣¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢
@@ -954,12 +942,10 @@
 
       <screen>&prompt.user; <userinput>libreoffice</userinput></screen>
 
-      <note>
-	<para>½é²óµ¯Æ°»₫¤Ë¤Ï¡¢¤¤¤¯¤Ä¤«¤Î¼Á̀䤬¹Ô¤ï¤́¡¢
-	  ¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥́¥¯¥È¥ê¤Ë
-	  <filename class="directory">.libreoffice</filename>
-	  ¥Ơ¥©¥ë¥À¤¬ºîÀ®¤µ¤́¤̃¤¹¡£</para>
-      </note>
+      <para>½é²óµ¯Æ°»₫¤Ë¤Ï¡¢¤¤¤¯¤Ä¤«¤Î¼Á̀䤬¹Ô¤ï¤́¡¢
+	¥æ¡¼¥¶¤Î¥Û¡¼¥à¥Ç¥£¥́¥¯¥È¥ê¤Ë
+	<filename class="directory">.libreoffice</filename>
+	¥Ơ¥©¥ë¥À¤¬ºîÀ®¤µ¤́¤̃¤¹¡£</para>
 
       <para>´ơ˾¤Î <application>LibreOffice</application> ¤Î packages
 	¤̣ÍøÍѤǤ­¤Ê¤¤¾́¹ç¤Ë¤Ï¡¢port ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤¹¤ëÊưË¡¤â¤¢¤ê¤̃¤¹¡£
@@ -974,9 +960,9 @@
 	<para>ĂÏ°è²½¤µ¤́¤¿¥Đ¡¼¥¸¥ç¥ó¤̣¥Ó¥ë¥É¤·¤¿¤¤¤Î¤Ê¤é¡¢
 	  ´ơ˾¤Î¸À¸́¤Î port ¥Ç¥£¥́¥¯¥È¥ê¤Ë <application>cd</application>
 	  ¥³¥̃¥ó¥É¤Ç°ÜÆ°¤·¤Æ¤¯¤À¤µ¤¤¡£
-	  Âб₫¤·¤Æ¤¤¤ë¸À¸́¤Ï¡¢Ports Collection ¤Î <ulink
-	    url="http://www.FreeBSD.org/ports/editors.html">editors</ulink>
-	  ¥«¥Æ¥´¥ê¤Ë¤¢¤ê¤̃¤¹¡£</para>
+	  Âб₫¤·¤Æ¤¤¤ë¸À¸́¤Ï¡¢Ports Collection ¤Î editors ¥«¥Æ¥´¥ê (<ulink
+	    url="http://www.FreeBSD.org/ports/editors.html">freebsd.org/ports/editors.html</ulink>)
+	  ¤Ë¤¢¤ê¤̃¤¹¡£</para>
       </note>
     </sect2>
   </sect1>
@@ -1045,16 +1031,16 @@
 
       <para>º£¤ä¿¤¯¤Îʸ½ñ¤¬ Portable Document Format (PDF)
 	¥Ơ¥¡¥¤¥ë·Á¼°¤ÇÇÛÉÛ¤µ¤́¤Æ¤¤¤̃¤¹¡£
-	PDF ¥Ơ¥¡¥¤¥ë¤̣Æɤà¤Î¤Ë¤è¤¯ÍѤ¤¤é¤́¤ë¥Ó¥å¡¼¥¢¤¬
+	¤è¤¯ÍѤ¤¤é¤́¤ë PDF ¥Ó¥å¡¼¥¢¤¬
 	&adobe; ¤¬ &linux; ÍѤ˥ê¥ê¡¼¥¹¤·¤Æ¤¤¤ë
 	<application>&acrobat.reader;</application> ¤Ç¤¹¡£
 	&os; ¤Ï &linux; ¥Đ¥¤¥Ê¥ê¤̣¼Â¹Ô¤Ç¤­¤ë¤Î¤Ç¡¢
 	&os; ¤Ç¤â¤³¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤̣ÍøÍѤǤ­¤̃¤¹¡£
 	¥é¥¤¥»¥ó¥¹¤ÎÀ©¸Â¤«¤é package ¤ÏÍøÍѤǤ­¤Ê¤¤¤¿¤á¡¢
 	ports ¤«¤é¥³¥ó¥Ñ¥¤¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤̃¤¹¡£
-	ĂÏ°è²½¤µ¤́¤¿¤â¤Î¤¬ Ports Collection ¤Î <ulink
-	  url="http://www.FreeBSD.org/ports/print.html">print</ulink>
-	¥«¥Æ¥´¥ê¤ËÍÑ°Ơ¤µ¤́¤Æ¤¤¤̃¤¹¡£</para>
+	ĂÏ°è²½¤µ¤́¤¿¤â¤Î¤¬ Ports Collection ¤Î print ¥«¥Æ¥´¥ê (<ulink
+	  url="http://www.FreeBSD.org/ports/print.html">freebsd.org/ports/print.html</ulink>)
+	¤ËÍÑ°Ơ¤µ¤́¤Æ¤¤¤̃¤¹¡£</para>
 
       <para>°Ê²¼¤Î¥³¥̃¥ó¥É¤Ï¡¢Ports Collection ¤«¤é¡¢
 	<application>&acrobat.reader; 9</application>
@@ -1082,17 +1068,14 @@
 	<secondary>¥Ó¥å¡¼¥¢</secondary>
       </indexterm>
 
-      <para><ulink
-	  url="http://www.gnu.org/software/gv/">gv</ulink>
-	¤Ï &postscript; ¤È PDF
-	¤Î¥Ó¥å¡¼¥¢¤Ç¤¹¡£¤³¤́¤Ï¤â¤È¤â¤È
+      <para><application>gv</application>
+	¤Ï &postscript; ¤È PDF ¤Î¥Ó¥å¡¼¥¢¤Ç¤¹¡£¤³¤́¤Ï
 	<application>ghostview</application> ¤̣¥Ù¡¼¥¹¤È¤·¤Æ¤¤¤̃¤¹¤¬¡¢
 	<application>Xaw3d</application>
-	¥é¥¤¥Ö¥é¥ê¤Ë¤è¤Ă¤Æ¤è¤êÎɤ¤³°´Ñ¤Ë¤Ê¤Ă¤Æ¤¤¤̃¤¹¡£
-	Æ°ºî¤¬Â®¤¯¤Æ¡¢¥æ¡¼¥¶¥¤¥ó¥¿¥Ơ¥§¡¼¥¹¤â¥·¥ó¥×¥ë¤Ç¤¹¡£
+	¥¦¥£¥¸¥Ă¥È¥Ä¡¼¥ë¥­¥Ă¥È¤Ë¤è¤Ă¤Æ¤è¤êÎɤ¤³°´Ñ¤Ë¤Ê¤Ă¤Æ¤¤¤̃¤¹¡£
 	<application>gv</application> ¤ÏÍÑ»æ¤Î¸₫¤­¤ä¥µ¥¤¥º¡¢
-	³ÈÂç½̀¾®¡¢¥¢¥ó¥Á¥¨¥¤¥ê¥¢¥¹¤Ê¤É¤¿¤¯¤µ¤ó¤Îµ¡Ç½¤̣»ư¤Ă¤Æ¤¤¤̃¤¹¡£
-	¤Û¤È¤ó¤É¤¹¤Ù¤Æ¤ÎÁàºî¤Ï¥­¡¼¥Ü¡¼¥É¤È¥̃¥¦¥¹¤ÎξÊư¤Ç¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤̃¤¹¡£</para>
+	³ÈÂç½̀¾®¡¢¥¢¥ó¥Á¥¨¥¤¥ê¥¢¥¹¤Ê¤É¤¿¤¯¤µ¤ó¤ÎÀßÄê²Äǽ¤Êµ¡Ç½¤̣»ư¤Ă¤Æ¤¤¤̃¤¹¡£
+	¤Û¤È¤ó¤É¤¹¤Ù¤Æ¤ÎÁàºî¤̣¥­¡¼¥Ü¡¼¥É¤«¥̃¥¦¥¹¤Î¤É¤Á¤é¤«¤À¤±¤Ç¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤̃¤¹¡£</para>
 
       <para>package ¤«¤é <application>gv</application>
 	¤̣¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¤è¤¦¤Ë¤·¤̃¤¹¡£</para>
@@ -1116,13 +1099,12 @@
 	<secondary>¥Ó¥å¡¼¥¢</secondary>
       </indexterm>
 
-      <para>&os; ¸₫¤±¤Î·Ú¤¤ PDF ¥Ó¥å¡¼¥¢¤̣»È¤¤¤¿¤¤¤Î¤Ê¤é¡¢<ulink
-	  url="http://www.foolabs.com/xpdf/">xpdf</ulink>
+      <para>&os; ¸₫¤±¤Î·Ú¤¤ PDF ¥Ó¥å¡¼¥¢¤̣»È¤¤¤¿¤¤¤Î¤Ê¤é
+	<application>Xpdf</application>
 	¤̣»î¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£
 	¤³¤́¤Ï¾¯¤Ê¤¤¥ê¥½¡¼¥¹¤ÇÆ°ºî¤¹¤ë¥Ó¥å¡¼¥¢¤Ç¡¢·Ú¤¯¤Æ¸úΨŪ¤Ç¤¹¡£
 	ɸ½à¤Î X ¥Ơ¥©¥ó¥È¤̣ÍøÍѤ·¡¢
-	<application>&motif;</application>,
-	¤½¤Î¾¤Î X ¥Ä¡¼¥ë¥­¥Ă¥È¤̣ɬÍפȤ·¤̃¤»¤ó¡£</para>
+	¾¤Î X ¥Ä¡¼¥ë¥­¥Ă¥È¤̣ɬÍפȤ·¤̃¤»¤ó¡£</para>
 
       <para><application>Xpdf</application> ¤Î
 	package ¤̣¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¼¡¤Î¥³¥̃¥ó¥É¤̣Æ₫ÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -1147,12 +1129,11 @@
 	<primary><application>GQview</application></primary>
       </indexterm>
 
-      <para><ulink
-	  url="http://gqview.sourceforge.net/">GQview</ulink>
+      <para><application>GQview</application>
 	¤Ï²èÁü´ÉÍư¥½¥Ơ¥È¥¦¥§¥¢¤Ç¤¹¡£
 	¥¯¥ê¥Ă¥¯¤̉¤È¤Ä¤Ç²èÁü¥Ơ¥¡¥¤¥ë¤̣³«¤¤¤¿¤ê¡¢³°Éô¥¨¥Ç¥£¥¿¤̣µ¯Æ°¤·¤¿¤ê¡¢
 	¥µ¥à¥Í¥¤¥ë²èÁü¤̣ºîÀ®¤Ç¤­¤̃¤¹¡£
-	¤̃¤¿¡¢¥¹¥é¥¤¥É¥·¥ç¡¼¤ä´đËÜŪ¤Ê¥Ơ¥¡¥¤¥ëÁàºîµ¡Ç½¤âÈ÷¤¨¤Æ¤¤¤̃¤¹¡£
+	¤̃¤¿¡¢¥¹¥é¥¤¥É¥·¥ç¡¼¤ä´đËÜŪ¤Ê¥Ơ¥¡¥¤¥ëÁàºîµ¡Ç½¤âÈ÷¤¨¤Æ¤ª¤ê¡¢
 	²èÁü¤Î¥³¥́¥¯¥·¥ç¥ó¤Î´ÉÍư¤ä¡¢½ÅÊ£¤·¤¿¥Ơ¥¡¥¤¥ë¤̣¸«¤Ä¤±¤ë¤³¤È¤¬´Êñ¤Ë¤Ç¤­¤̃¤¹¡£
 	<application>GQview</application> ¤ÏÁ´²è̀̀ɽ¼¨¡¢
 	¤ª¤è¤Ó¹ñºƯ²½¤Ë¤âÂб₫¤·¤Æ¤¤¤̃¤¹¡£</para>
@@ -1225,8 +1206,7 @@
 	<primary><application>GnuCash</application></primary>
       </indexterm>
 
-      <para><ulink
-	  url="http://www.gnucash.org/">GnuCash</ulink> ¤Ï¡¢
+      <para><application>GnuCash</application> ¤Ï¡¢
 	<application>GNOME</application> ¤Î°́Éô¤Ç¡¢
 	»È¤¤¤ä¤¹¤¯¤«¤Ä¶¯ÎϤʥ¢¥×¥ê¥±¡¼¥·¥ç¥ó¤È¤·¤Æ¥¨¥ó¥É¥æ¡¼¥¶¤ËÄ󶡤µ¤́¤Æ¤¤¤̃¤¹¡£
 	<application>GnuCash</application> ¤̣»È¤¨¤Đ¡¢
@@ -1265,12 +1245,10 @@
 	<secondary><application>Gnumeric</application></secondary>
       </indexterm>
 
-      <para><ulink
-	  url="http://projects.gnome.org/gnumeric/index.shtml">Gnumeric</ulink> ¤Ï¡¢
+      <para><application>Gnumeric</application> ¤Ï¡¢
 	<application>GNOME</application>
 	¥³¥ß¥å¥Ë¥Æ¥£¤Ë¤è¤Ă¤Æ³«È¯¤µ¤́¤Æ¤¤¤ëɽ·×»»¥½¥Ơ¥È¥¦¥§¥¢¤Ç¤¹¡£
-	¥»¥ë¤Î½ñ¼°¤Ë½¾¤Ă¤Æ¥æ¡¼¥¶¤ÎÆ₫ÎϤ̣¼«Æ°Åª¤Ë
-	<quote>¿ä¬</quote>¤¹¤ëÊØÍø¤Êµ¡Ç½¤ä¡¢
+	¥»¥ë¤Î½ñ¼°¤Ë½¾¤Ă¤Æ¥æ¡¼¥¶¤ÎÆ₫ÎϤ̣¼«Æ°Åª¤Ë¿ä¬¤¹¤ëÊØÍø¤Êµ¡Ç½¤ä¡¢
 	¿¤¯¤Î¥·¡¼¥±¥ó¥¹¤ËÂФ¹¤ë¼«Æ°Êä´°µ¡Ç½¤¬¤¢¤ê¤̃¤¹¡£
 	<application>Excel</application>,
 	<application>Lotus 1-2-3</application>,
@@ -1301,15 +1279,14 @@
 	<secondary><application>KMyMoney</application></secondary>
       </indexterm>
 
-      <para><ulink
-	  url="http://kmymoney2.sourceforge.net">KMyMoney</ulink>
+      <para><application>KMyMoney</application>
 	¤Ï¡¢<application>KDE</application>
 	¥³¥ß¥å¥Ë¥Æ¥£¤¬ºîÀ®¤·¤Æ¤¤¤ë¸Ä¿ÍÍѺầ³´ÉÍư¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ç¤¹¡£
-	¾¦ÍѤθĿÍÍѺầ³´ÉÍư¥½¥Ơ¥È¥¦¥§¥¢¤Ë¸«¤é¤́¤ëµ¡Ç½¤̣¼è¤êÆ₫¤́¡¢
-	Ä󶡤¹¤ë¤³¤È¤̣ܻ̀ؤ·¤Æ¤¤¤̃¤¹¡£
+	<application>KMyMoney</application> ¤Ï¡¢
+	¾¦ÍѤθĿÍÍѺầ³´ÉÍư¥½¥Ơ¥È¥¦¥§¥¢¤Ë¸«¤é¤́¤ë½ÅÍפʵ¡Ç½¤̣Ä󶡤¹¤ë¤³¤È¤̣ܻ̀ؤ·¤Æ¤¤¤̃¤¹¡£
 	¤̃¤¿¡¢»È¤¤¤ä¤¹¤¤Ê£¼°Êíµ­µ¡Ç½¤âÆĂħ¤Ç¤¹¡£
-	KMyMoney ¤Ïɸ½à¤Î Quicken Interchange
-	Format (QIF) ¥Ơ¥¡¥¤¥ë¤̣¥¤¥ó¥Ư¡¼¥È²Äǽ¤Ç¡¢
+	<application>KMyMoney</application> ¤Ïɸ½à¤Î
+	<application>Quicken</application> QIF ¥Ơ¥¡¥¤¥ë¤̣¥¤¥ó¥Ư¡¼¥È²Äǽ¤Ç¡¢
 	Åê»ñÍúỊ̂¤äÊ£¿ôÄ̀²ß¤Î¼è°·¤¤¡¢ºâÀ¯¾ơ¶·¤Î¥́¥Ư¡¼¥È¤̣Ä󶡤·¤̃¤¹¡£</para>
 
       <para>package ¤«¤é <application>KMyMoney</application>

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

Author: rene
Date: Fri Oct 18 12:26:17 2013
New Revision: 42998
URL: http://svnweb.freebsd.org/changeset/doc/42998

Log:
  Provide a translation for the secteam-secretary entity.

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

Modified: head/nl_NL.ISO8859-1/share/xml/teams.ent
==============================================================================
--- head/nl_NL.ISO8859-1/share/xml/teams.ent	Fri Oct 18 10:59:05 2013	(r42997)
+++ head/nl_NL.ISO8859-1/share/xml/teams.ent	Fri Oct 18 12:26:17 2013	(r42998)
@@ -50,6 +50,6 @@
 
 <!ENTITY a.re "Uitgave Engineeringteam <email>re@FreeBSD.org</email>">
 
-<!ENTITY a.secteam-secretary "Security Team Secretary <email>secteam-secretary@FreeBSD.org</email>">
+<!ENTITY a.secteam-secretary "Beveiligingsteamsecretaris <email>secteam-secretary@FreeBSD.org</email>">
 
 <!ENTITY a.security-officer "Beveiligingsbeambtenteam <email>security-officer@FreeBSD.org</email>">

From owner-svn-doc-head@FreeBSD.ORG  Fri Oct 18 13:52:57 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [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 A013825E;
 Fri, 18 Oct 2013 13:52:57 +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 8BC2F22DE;
 Fri, 18 Oct 2013 13:52:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9IDqvmP080756;
 Fri, 18 Oct 2013 13:52:57 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9IDqvaP080755;
 Fri, 18 Oct 2013 13:52:57 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310181352.r9IDqvaP080755@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Fri, 18 Oct 2013 13:52:57 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42999 -
 head/en_US.ISO8859-1/books/handbook/network-servers
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Oct 2013 13:52:57 -0000

Author: dru
Date: Fri Oct 18 13:52:57 2013
New Revision: 42999
URL: http://svnweb.freebsd.org/changeset/doc/42999

Log:
  Clarify bpf note.
  
  Submitted by:	wblock

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	Fri Oct 18 12:26:17 2013	(r42998)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Fri Oct 18 13:52:57 2013	(r42999)
@@ -2655,9 +2655,9 @@ result: 0 Success
 	&os;.  Users who prefer to create a custom kernel need to keep
 	this device if  <acronym>DHCP</acronym> is used.</para>
 
-      <para>Those who are security conscious should note that
-	<devicename>bpf</devicename> also allows packet sniffers to
-	function correctly.</para>
+      <para>It should be noted that <devicename>bpf</devicename> also
+	allows privileged users to run network packet sniffers on
+	that system.</para>
     </note>
 
     <sect2>

From owner-svn-doc-head@FreeBSD.ORG  Fri Oct 18 17:55:49 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [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 E2CD1DF6;
 Fri, 18 Oct 2013 17:55:48 +0000 (UTC) (envelope-from kwm@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 CE9352451;
 Fri, 18 Oct 2013 17:55: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 r9IHtmlm010569;
 Fri, 18 Oct 2013 17:55:48 GMT (envelope-from kwm@svn.freebsd.org)
Received: (from kwm@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9IHtmHH010566;
 Fri, 18 Oct 2013 17:55:48 GMT (envelope-from kwm@svn.freebsd.org)
Message-Id: <201310181755.r9IHtmHH010566@svn.freebsd.org>
From: Koop Mast <kwm@FreeBSD.org>
Date: Fri, 18 Oct 2013 17:55:48 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43000 - in head: en_US.ISO8859-1/htdocs/gnome
 en_US.ISO8859-1/htdocs/gnome/docs share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Oct 2013 17:55:49 -0000

Author: kwm (ports committer)
Date: Fri Oct 18 17:55:47 2013
New Revision: 43000
URL: http://svnweb.freebsd.org/changeset/doc/43000

Log:
  Bump development version that we are currently working on.
  Update misc items like supported FreeBSD versions. And GNOME development happens in SVN these days.
  Replace FreeBSD with &os; [1]
  
  Reviewed by:	rene@
  Suggested by:	rene@ [1]

Modified:
  head/en_US.ISO8859-1/htdocs/gnome/docs/develfaq.xml
  head/en_US.ISO8859-1/htdocs/gnome/index.xsl
  head/share/xml/release.ent

Modified: head/en_US.ISO8859-1/htdocs/gnome/docs/develfaq.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/gnome/docs/develfaq.xml	Fri Oct 18 13:52:57 2013	(r42999)
+++ head/en_US.ISO8859-1/htdocs/gnome/docs/develfaq.xml	Fri Oct 18 17:55:47 2013	(r43000)
@@ -22,7 +22,7 @@
      <li> <a href="#q5">What should I do when something does not work?</a></li>
      <li> <a href="#q6">How can I help with the development versions?</a></li>
      <li> <a href="#q7">What is the current state of development GNOME on
-       FreeBSD</a></li>
+       &os;</a></li>
     </ol>
 
   <h2>Full Text </h2>
@@ -38,20 +38,22 @@
         <ol>
           <li><b>STABLE</b> - The applications and libraries in the stable
 	    branch are considered "release quality," and are the versions that
-	    appear in the FreeBSD ports tree.  The current stable version is
+	    appear in the &os; ports tree.  The current stable version is
 	    GNOME &gnomever;.</li>
           <li><b>DEVELOPMENT</b> - In between stable releases are development
             releases.  Traditionally, GNOME development releases have odd minor
-	    numbers (e.g. 2.3, &gnomedevelver;, 2.(n*2)-1).  Development releases will
+	    numbers (e.g. 2.3, &gnomedevelver;, 3.(n*2)-1).  Development releases will
 	    become stable releases, and move from alpha to beta quality during
-	    their lifecycle. The development releases need testing by FreeBSD
+	    their lifecycle. The development releases need testing by &os;
 	    users to minimize the number of surprises when the new stable
-	    versions are committed to the FreeBSD CVS tree. This document is
-	    about the development branch.  The current development branch
-	    is GNOME &gnomedevelver;.</li>
+	    versions are committed to the &os; SVN tree. This document is
+	    about the development branch.  At any time the development branch for &os;
+	    might be based of a stable GNOME release.  However it will be tagged 
+	    "development" here if it is the version that is work in progress by the &os;
+	    GNOME team. The current development branch for &os; is GNOME &gnomedevelver;.</li>
 	  <li><b>GIT</b> - Often newer-than-new, the GIT master versions of GNOME
             applications and libraries are alpha quality, or often completely
-            unbuildable.  The FreeBSD GNOME project pays attention to, but
+            unbuildable.  The &os; GNOME project pays attention to, but
 	    does not track the alpha quality code.</li>
         </ol>
       </li>
@@ -62,7 +64,7 @@
 <!-- A2 -->
         <p>If you are looking for a stable environment, absolutely not.  Please
           only track the GNOME &gnomedevelver; branch if you wish to help identify bugs
-	  and improve the FreeBSD GNOME project.  You will find little
+	  and improve the &os; GNOME project.  You will find little
 	  sympathy if a development-quality GNOME application eats your
 	  homework.</p>
       </li>
@@ -72,12 +74,12 @@
         <p><b>How do I obtain the development versions of GNOME stuff?</b></p>
 <!-- A3 -->
         <p><a href="mailto:marcus@FreeBSD.org">Marcus</a> maintains a
-	  CVS repository where all the development versions of
-	  the GNOME components for FreeBSD are housed.  Instructions for
+	  SVN repository where all the development versions of
+	  the GNOME components for &os; are housed.  Instructions for
 	  how to check out the development ports module and how to merge it
-	  into the FreeBSD ports tree reside on the entrance page to his
+	  into the &os; ports tree reside on the entrance page to his SVN
 	  repository.  Please read carefully the instructions at
-	  <a href="http://www.marcuscom.com:8080/cgi-bin/cvsweb.cgi">http://www.marcuscom.com:8080/cgi-bin/cvsweb.cgi</a>.
+	  <a href="http://www.marcuscom.com:8080/viewvc/viewvc.cgi/marcuscom/">http://www.marcuscom.com:8080/viewvc/viewvc.cgi/marcuscom/</a>.
         </p>
 
 	<p>During the development cycle, FreeBSD-specific caveats and
@@ -97,7 +99,7 @@
 <pre>
 WITH_DEBUG="yes"
 </pre>
-	<p>GNOME has an excellent guide for getting <a href="http://live.gnome.org/GettingTraces">
+	<p>GNOME has an excellent guide for getting <a href="https://wiki.gnome.org/GettingTraces">
 	  useful back traces</a>.</p>
       </li>
 
@@ -106,7 +108,7 @@ WITH_DEBUG="yes"
         <p><b>How do I keep everything up-to-date and in sync?</b></p>
 <!-- A4 -->
         <p>The short answer is that you need to use the <tt>marcusmerge</tt>
-	  script to merge the development tree with the FreeBSD ports tree.
+	  script to merge the development tree with the &os; ports tree.
 	  The <tt>marcusmerge</tt> script is available
 	  <a href="http://www.marcuscom.com/downloads/marcusmerge">
 	  here</a>, and a man page on using the script is available
@@ -127,7 +129,8 @@ WITH_DEBUG="yes"
 	  (<tt>irc.freenode.net</tt>).</p>
 
         <p>If all of this sounds scary, or you need a desktop that
-	  "Just Works," you should stick with the stable GNOME branch.</p>
+	  "Just Works," you should stick with the &gnomever; version that 
+	  is available in the &os; ports tree.</p>
       </li>
 
 <!-- Q5 -->
@@ -137,7 +140,7 @@ WITH_DEBUG="yes"
         <p>It depends.  If you think the problem is truly a bug with the
 	  GNOME component, you can report a bug using <b>bug-buddy</b> or
 	  the GNOME <a href="http://bugzilla.gnome.org">Bugzilla</a>
-	  interface.  If you think the problem lies in a FreeBSD port, or
+	  interface.  If you think the problem lies in a &os; port, or
 	  is FreeBSD-specific, send email to
 	  <a href="mailto:&email;@FreeBSD.org">&email;@FreeBSD.org</a>,
 	  or report the problem on the <em>#freebsd-gnome</em> IRC
@@ -161,11 +164,10 @@ WITH_DEBUG="yes"
 
 <!-- Q7 -->
       <li style="padding-bottom: 0.5em"><a name="q7"></a>
-        <p><b>What is the current state of development GNOME on FreeBSD?</b></p>
+        <p><b>What is the current state of development GNOME on &os;?</b></p>
 <!-- A7 -->
-        <p>We have just cleared out the MarcusCom ports tree after
-	  merging &gnomever; into the FreeBSD ports tree.  Stay tuned
-	  for the start of &gnomedevelver; work.</p>
+        <p>&gnomever; is the latest version that was merged into the &os; ports tree.  
+        Work is currently underway to make &gnomedevelver; stable.</p>
       </li>
     </ol>
 </body>

Modified: head/en_US.ISO8859-1/htdocs/gnome/index.xsl
==============================================================================
--- head/en_US.ISO8859-1/htdocs/gnome/index.xsl	Fri Oct 18 13:52:57 2013	(r42999)
+++ head/en_US.ISO8859-1/htdocs/gnome/index.xsl	Fri Oct 18 17:55:47 2013	(r43000)
@@ -100,9 +100,9 @@
 	       	   web browsers, audio players, office programs, and
 	       	   more.</p>
 
-		       <p>The FreeBSD GNOME Project is a team of devoted
+		       <p>The &os; GNOME Project is a team of devoted
 			 developers and users that manage the
-			 integration of GNOME and FreeBSD.</p>
+			 integration of GNOME and &os;.</p>
 
 		<h2>How to install GNOME</h2>
 
@@ -129,15 +129,15 @@
 
               <h2>State of the port</h2>
 
-	      <p>GNOME for FreeBSD is currently fully supported on
-		8.3, 8-STABLE, 9.0, 9.1, and 9-STABLE, while
-                10.0-CURRENT is provided on a best effort basis.
-		Most of GNOME has been ported to FreeBSD, but there is still
-		<a href="docs/volunteer.html">plenty left to be done</a>!</p>
+	      <p>GNOME for &os; is currently fully supported on
+		8.4, 8-STABLE, 9.1, 9.2, and 9-STABLE, 10.0 and 10-STABLE while
+                11.0-CURRENT is provided on a best effort basis.
+		Work is being done to replace Gnome 2 with Mate and Gnome3.  
+		There is still <a href="docs/volunteer.html">plenty left to be done</a>!</p>
 
 	      <h2>One stop solution shop!</h2>
 
-	      <p>GNOME is simple and easy to build using the FreeBSD ports system, but
+	      <p>GNOME is simple and easy to build using the &os; ports system, but
 	        sometimes things simply go wrong. If GNOME -- or anything that uses
 		GNOME libraries -- is not building the way it should, simply run the
 		<a href="/gnome/gnomelogalyzer.sh">gnomelogalyzer.sh</a>

Modified: head/share/xml/release.ent
==============================================================================
--- head/share/xml/release.ent	Fri Oct 18 13:52:57 2013	(r42999)
+++ head/share/xml/release.ent	Fri Oct 18 17:55:47 2013	(r43000)
@@ -83,4 +83,4 @@
 
 <!ENTITY gnomeoldver '2.30'>
 <!ENTITY gnomever '2.32'>
-<!ENTITY gnomedevelver '2.90'>
+<!ENTITY gnomedevelver '3.6'>

From owner-svn-doc-head@FreeBSD.ORG  Fri Oct 18 19:02:50 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [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 5EB6BDA8;
 Fri, 18 Oct 2013 19:02:50 +0000 (UTC) (envelope-from kwm@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 4ADD527EB;
 Fri, 18 Oct 2013 19:02:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9IJ2oKQ046597;
 Fri, 18 Oct 2013 19:02:50 GMT (envelope-from kwm@svn.freebsd.org)
Received: (from kwm@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9IJ2oHg046596;
 Fri, 18 Oct 2013 19:02:50 GMT (envelope-from kwm@svn.freebsd.org)
Message-Id: <201310181902.r9IJ2oHg046596@svn.freebsd.org>
From: Koop Mast <kwm@FreeBSD.org>
Date: Fri, 18 Oct 2013 19:02:50 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43001 - head/en_US.ISO8859-1/htdocs/gnome/docs
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Oct 2013 19:02:50 -0000

Author: kwm (ports committer)
Date: Fri Oct 18 19:02:49 2013
New Revision: 43001
URL: http://svnweb.freebsd.org/changeset/doc/43001

Log:
  White space cleanup. Use tabs for "level 4". And double space after full stop.
  
  Reviewed by:	rene@

Modified:
  head/en_US.ISO8859-1/htdocs/gnome/docs/develfaq.xml

Modified: head/en_US.ISO8859-1/htdocs/gnome/docs/develfaq.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/gnome/docs/develfaq.xml	Fri Oct 18 17:55:47 2013	(r43000)
+++ head/en_US.ISO8859-1/htdocs/gnome/docs/develfaq.xml	Fri Oct 18 19:02:49 2013	(r43001)
@@ -15,14 +15,14 @@
 
   <h2>Contents</h2>
     <ol>
-     <li> <a href="#q1">What are development versions of GNOME all about?</a></li>
-     <li> <a href="#q2">Should I track development versions?</a></li>
-     <li> <a href="#q3">How do I obtain development versions of GNOME stuff?</a></li>
-     <li> <a href="#q4">How do I keep everything up-to-date and in sync?</a></li>
-     <li> <a href="#q5">What should I do when something does not work?</a></li>
-     <li> <a href="#q6">How can I help with the development versions?</a></li>
-     <li> <a href="#q7">What is the current state of development GNOME on
-       &os;</a></li>
+      <li> <a href="#q1">What are development versions of GNOME all about?</a></li>
+      <li> <a href="#q2">Should I track development versions?</a></li>
+      <li> <a href="#q3">How do I obtain development versions of GNOME stuff?</a></li>
+      <li> <a href="#q4">How do I keep everything up-to-date and in sync?</a></li>
+      <li> <a href="#q5">What should I do when something does not work?</a></li>
+      <li> <a href="#q6">How can I help with the development versions?</a></li>
+      <li> <a href="#q7">What is the current state of development GNOME on
+	&os;</a></li>
     </ol>
 
   <h2>Full Text </h2>
@@ -30,40 +30,40 @@
     <ol>
 <!-- Q1 -->
       <li style="padding-bottom: 0.5em"><a name="q1"></a>
-        <p><b>What are development versions of GNOME all about?</b></p>
+	<p><b>What are development versions of GNOME all about?</b></p>
 <!-- A1 -->
-        <p>The development versions are the packages released by the GNOME
-          project that will eventually become the stable (release) versions.
+	<p>The development versions are the packages released by the GNOME
+	  project that will eventually become the stable (release) versions.
 	  There are three working branches of GNOME development:</p>
-        <ol>
-          <li><b>STABLE</b> - The applications and libraries in the stable
+	<ol>
+	  <li><b>STABLE</b> - The applications and libraries in the stable
 	    branch are considered "release quality," and are the versions that
 	    appear in the &os; ports tree.  The current stable version is
 	    GNOME &gnomever;.</li>
-          <li><b>DEVELOPMENT</b> - In between stable releases are development
-            releases.  Traditionally, GNOME development releases have odd minor
+	  <li><b>DEVELOPMENT</b> - In between stable releases are development
+	    releases.  Traditionally, GNOME development releases have odd minor
 	    numbers (e.g. 2.3, &gnomedevelver;, 3.(n*2)-1).  Development releases will
 	    become stable releases, and move from alpha to beta quality during
-	    their lifecycle. The development releases need testing by &os;
+	    their lifecycle.  The development releases need testing by &os;
 	    users to minimize the number of surprises when the new stable
 	    versions are committed to the &os; SVN tree. This document is
 	    about the development branch.  At any time the development branch for &os;
 	    might be based of a stable GNOME release.  However it will be tagged 
 	    "development" here if it is the version that is work in progress by the &os;
-	    GNOME team. The current development branch for &os; is GNOME &gnomedevelver;.</li>
+	    GNOME team.  The current development branch for &os; is GNOME &gnomedevelver;.</li>
 	  <li><b>GIT</b> - Often newer-than-new, the GIT master versions of GNOME
-            applications and libraries are alpha quality, or often completely
-            unbuildable.  The &os; GNOME project pays attention to, but
+	    applications and libraries are alpha quality, or often completely
+	    unbuildable.  The &os; GNOME project pays attention to, but
 	    does not track the alpha quality code.</li>
-        </ol>
+	</ol>
       </li>
 
 <!-- Q2 -->
       <li style="padding-bottom: 0.5em"><a name="q2"></a>
-        <p><b>Should I track GNOME development versions?</b></p>
+	<p><b>Should I track GNOME development versions?</b></p>
 <!-- A2 -->
-        <p>If you are looking for a stable environment, absolutely not.  Please
-          only track the GNOME &gnomedevelver; branch if you wish to help identify bugs
+	<p>If you are looking for a stable environment, absolutely not.  Please
+	  only track the GNOME &gnomedevelver; branch if you wish to help identify bug
 	  and improve the &os; GNOME project.  You will find little
 	  sympathy if a development-quality GNOME application eats your
 	  homework.</p>
@@ -71,21 +71,21 @@
 
 <!-- Q3 -->
       <li style="padding-bottom: 0.5em"><a name="q3"></a>
-        <p><b>How do I obtain the development versions of GNOME stuff?</b></p>
+	<p><b>How do I obtain the development versions of GNOME stuff?</b></p>
 <!-- A3 -->
-        <p><a href="mailto:marcus@FreeBSD.org">Marcus</a> maintains a
+	<p><a href="mailto:marcus@FreeBSD.org">Marcus</a> maintains a
 	  SVN repository where all the development versions of
 	  the GNOME components for &os; are housed.  Instructions for
 	  how to check out the development ports module and how to merge it
 	  into the &os; ports tree reside on the entrance page to his SVN
 	  repository.  Please read carefully the instructions at
-	  <a href="http://www.marcuscom.com:8080/viewvc/viewvc.cgi/marcuscom/">http://www.marcuscom.com:8080/viewvc/viewvc.cgi/marcuscom/</a>.
-        </p>
+	  <a href="http://www.marcuscom.com:8080/viewvc/viewvc.cgi/marcuscom/">
+	  http://www.marcuscom.com:8080/viewvc/viewvc.cgi/marcuscom/</a>.</p>
 
 	<p>During the development cycle, FreeBSD-specific caveats and
 	  other useful information will be sent to <a
 	  href="mailto:marcuscom-devel@marcuscom.com">
-	    marcuscom-devel@marcuscom.com</a>.  If you are tracking
+	  marcuscom-devel@marcuscom.com</a>.  If you are tracking
 	  the GNOME development branch, you <b>must</b> <a
 	  href="http://www.marcuscom.com/mailman/listinfo/marcuscom-devel">
 	  subscribe</a> to this list.  You should also consider <a
@@ -105,9 +105,9 @@ WITH_DEBUG="yes"
 
 <!-- Q4 -->
       <li style="padding-bottom: 0.5em"><a name="q4"></a>
-        <p><b>How do I keep everything up-to-date and in sync?</b></p>
+	<p><b>How do I keep everything up-to-date and in sync?</b></p>
 <!-- A4 -->
-        <p>The short answer is that you need to use the <tt>marcusmerge</tt>
+	<p>The short answer is that you need to use the <tt>marcusmerge</tt>
 	  script to merge the development tree with the &os; ports tree.
 	  The <tt>marcusmerge</tt> script is available
 	  <a href="http://www.marcuscom.com/downloads/marcusmerge">
@@ -128,16 +128,16 @@ WITH_DEBUG="yes"
 	  <em>#freebsd-gnome</em> IRC channel on FreeNode
 	  (<tt>irc.freenode.net</tt>).</p>
 
-        <p>If all of this sounds scary, or you need a desktop that
-	  "Just Works," you should stick with the &gnomever; version that 
+	<p>If all of this sounds scary, or you need a desktop that
+	  "Just Works," you should stick with the &gnomever; version that
 	  is available in the &os; ports tree.</p>
       </li>
 
 <!-- Q5 -->
       <li style="padding-bottom: 0.5em"><a name="q5"></a>
-        <p><b>What should I do when something does not work?</b></p>
+	<p><b>What should I do when something does not work?</b></p>
 <!-- A5 -->
-        <p>It depends.  If you think the problem is truly a bug with the
+	<p>It depends.  If you think the problem is truly a bug with the
 	  GNOME component, you can report a bug using <b>bug-buddy</b> or
 	  the GNOME <a href="http://bugzilla.gnome.org">Bugzilla</a>
 	  interface.  If you think the problem lies in a &os; port, or
@@ -146,14 +146,14 @@ WITH_DEBUG="yes"
 	  or report the problem on the <em>#freebsd-gnome</em> IRC
 	  channel on FreeNode.</p>
 
-        <p>Please forward all relevant bug IDs to
+	<p>Please forward all relevant bug IDs to
 	  <a href="mailto:&email;@FreeBSD.org">&email;@FreeBSD.org</a>
 	  so we can keep track of known issues.  Thanks!</p>
       </li>
 
 <!-- Q6 -->
       <li style="padding-bottom: 0.5em"><a name="q6"></a>
-        <p><b>How can I help with the development versions?</b></p>
+	<p><b>How can I help with the development versions?</b></p>
 <!-- A6 -->
 	<p>Now that work on &gnomedevelver; has started, we need
 	  people to install it, and test things.  If you are compiling
@@ -164,10 +164,10 @@ WITH_DEBUG="yes"
 
 <!-- Q7 -->
       <li style="padding-bottom: 0.5em"><a name="q7"></a>
-        <p><b>What is the current state of development GNOME on &os;?</b></p>
+	<p><b>What is the current state of development GNOME on &os;?</b></p>
 <!-- A7 -->
-        <p>&gnomever; is the latest version that was merged into the &os; ports tree.  
-        Work is currently underway to make &gnomedevelver; stable.</p>
+	<p>&gnomever; is the latest version that was merged into the &os; ports tree.  
+	  Work is currently underway to make &gnomedevelver; stable.</p>
       </li>
     </ol>
 </body>

From owner-svn-doc-head@FreeBSD.ORG  Fri Oct 18 19:12:33 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [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 D6A54E89;
 Fri, 18 Oct 2013 19:12:33 +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 C2E512852;
 Fri, 18 Oct 2013 19:12: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 r9IJCXEU052147;
 Fri, 18 Oct 2013 19:12:33 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9IJCXVD052146;
 Fri, 18 Oct 2013 19:12:33 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310181912.r9IJCXVD052146@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Fri, 18 Oct 2013 19:12:33 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43002 - head/en_US.ISO8859-1/books/handbook/ppp-and-slip
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Oct 2013 19:12:34 -0000

Author: dru
Date: Fri Oct 18 19:12:33 2013
New Revision: 43002
URL: http://svnweb.freebsd.org/changeset/doc/43002

Log:
  General tightening and cleanup of sections 26.1, 26.2, and 26.2.1.
  - fix some acronyms along the way
  
  The example in 26.2.1 should be changed to use callouts.
  
  To be followed by a white space fix.

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

Modified: head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Fri Oct 18 19:02:49 2013	(r43001)
+++ head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Fri Oct 18 19:12:33 2013	(r43002)
@@ -36,14 +36,15 @@
 
     <itemizedlist>
       <listitem>
-	<para>How to configure <acronym>PPP</acronym>.</para>
+	<para>How to configure, use, and troubleshoot a 
+	  <acronym>PPP</acronym> connection.</para>
       </listitem>
       <listitem>
 	<para>How to set up <acronym>PPP</acronym> over Ethernet
 	  (<acronym>PPPoE</acronym>).</para>
       </listitem>
       <listitem>
-	<para>How to set up <acronym>PPP</acronym> over ATM
+	<para>How to set up <acronym>PPP</acronym> over <acronym>ATM</acronym>
 	  (<acronym>PPPoA</acronym>).</para>
       </listitem>
     </itemizedlist>
@@ -106,7 +107,9 @@
 
     <title>Configuring <acronym>PPP</acronym></title>
 
-    <para>In order to configure <acronym>PPP</acronym>, the following
+    <para>&os; provides built-in support for managing dial-up
+      <acronym>PPP</acronym> connections using &man.ppp.8;.  In order
+      to use a <acronym>PPP</acronym> connection, the following
       items are needed:</para>
 
     <itemizedlist>
@@ -130,35 +133,35 @@
       </listitem>
 
       <listitem>
-	<para>The <acronym>IP</acronym> address of one or more name
-	  servers.  Normally, an <acronym>ISP</acronym> provides these
-	  addresses.  If not, use <command>enable dns</command> in
-	  <filename>ppp.conf</filename> and
-	  <application>ppp</application> will set the name servers.
-	  This feature requires the <acronym>ISP</acronym> to
-	  supporting DNS negotiation.</para>
+	<para>The <acronym>IP</acronym> address of one or more <acronym>DNS</acronym>
+	  servers.  Normally, the <acronym>ISP</acronym> provides these
+	  addresses.  If it did not, &os; can be configured to use
+	  <acronym>DNS</acronym> negotiation.</para>
       </listitem>
     </itemizedlist>
 
+    <para>If any of the required information is missing, contact
+      the <acronym>ISP</acronym>.</para>
+
     <para>The following information may be supplied by the
       <acronym>ISP</acronym>, but is not necessary:</para>
 
     <itemizedlist>
       <listitem>
 	<para>The <acronym>IP</acronym> address of the default
-	  gateway.  If this information is missing the
-	  <acronym>ISP</acronym>'s <acronym>PPP</acronym> server will
-	  provide the correct value during connection setup.</para>
-
-	<para>This <acronym>IP</acronym> number is referred to as
-	  <literal>HISADDR</literal> by
-	  <application>ppp</application>.</para>
+	  gateway.  If this information is unknown, the
+	  <acronym>ISP</acronym> will automatically
+	  provide the correct value during connection setup.  When
+	  configuring <acronym>PPP</acronym> on &os;,
+	  this address is referred to as
+	  <literal>HISADDR</literal>.</para>
       </listitem>
 
       <listitem>
 	<para>The subnet mask.  If the <acronym>ISP</acronym> has not
-	  provided one, use <hostid
-	    role="netmask">255.255.255.255</hostid>.</para>
+	  provided one, <hostid
+	    role="netmask">255.255.255.255</hostid> will be used in
+	  the &man.ppp.8; configuration file.</para>
       </listitem>
 
       <listitem>
@@ -167,35 +170,33 @@
 	</indexterm>
 
 	<para>If the <acronym>ISP</acronym> has assigned a static
-	  <acronym>IP</acronym> address and hostname, enter it.
-	  Otherwise, this information will be provided during
+	  <acronym>IP</acronym> address and hostname, it should be
+	  input into the configuration file.
+	  Otherwise, this information will be automatically provided during
 	  connection setup.</para>
       </listitem>
     </itemizedlist>
 
-    <para>If any required information is missing, contact
-      the <acronym>ISP</acronym>.</para>
+    <para>The rest of this section demonstrates how to configure &os;
+      for common <acronym>PPP</acronym> connection
+      scenarios.  The required configuration file is
+      <filename>/etc/ppp/ppp.conf</filename> and additional files and
+      examples are available in <filename
+	class="directory">/usr/share/examples/ppp/</filename>.</para>
 
     <note>
-      <para>Throughout this section, many of the examples showing the
-	contents of configuration files are numbered by line.  These
-	numbers serve to aid in the presentation and discussion only
-	and are not meant to be placed in the actual file.  Proper
-	indentation with tab and space characters is also
-	important.</para>
+      <para>Throughout this section, many of the file examples
+	display line numbers.  These line
+	numbers have been added to make it easier to follow the discussion
+	  and are not meant to be placed in the actual file.</para>  
+	    
+      <para>When editing a configuration file, proper
+	indentation is
+	important.  Lines that end in a <literal>:</literal> start in the
+	first column (beginning of the line) while all other lines
+	should be indented as shown using spaces or tabs.</para>
     </note>
 
-    <para><command>ppp</command> uses the configuration files located
-      in <filename class="directory">/etc/ppp</filename>.  Examples
-      can be found in <filename
-	class="directory">/usr/share/examples/ppp/</filename>.</para>
-
-    <para>A number of files are edited when configuring
-      <command>ppp</command>.  The edits
-      depend to some extent on whether the <acronym>ISP</acronym>
-      allocates <acronym>IP</acronym> addresses statically or
-      dynamically.</para>
-
     <sect2 id="userppp-staticIP">
       <title>PPP With Static <acronym>IP</acronym> Addresses</title>
 
@@ -205,19 +206,13 @@
 	    addresses</secondary>
       </indexterm>
 
-      <para>If the ISP has provided an address that does not change,
+      <para>If the <acronym>ISP</acronym>, also known as the peer, has provided an address that does not change,
 	edit <filename>/etc/ppp/ppp.conf</filename> as described in
 	the example below.</para>
 
-      <note>
-	<para>Lines that end in a <literal>:</literal> start in the
-	  first column (beginning of the line) while all other lines
-	  should be indented as shown using spaces or tabs.</para>
-      </note>
-
       <programlisting>1     default:
 2       set log Phase Chat LCP IPCP CCP tun command
-3       ident user-ppp VERSION (built COMPILATIONDATE)
+3       ident user-ppp VERSION
 4       set device /dev/cuau0
 5       set speed 115200
 6       set dial "ABORT BUSY ABORT NO\\sCARRIER TIMEOUT 5 \
@@ -229,18 +224,17 @@
 12      set phone "(123) 456 7890"
 13      set authname foo
 14      set authkey bar
-15      set login "TIMEOUT 10 \"\" \"\" gin:--gin: \\U word: \\P col: ppp"
-16      set timeout 300
-17      set ifaddr <replaceable>x.x.x.x</replaceable> <replaceable>y.y.y.y</replaceable> 255.255.255.255 0.0.0.0
-18      add default HISADDR</programlisting>
+15      set timeout 300
+16      set ifaddr <replaceable>x.x.x.x</replaceable>/0 <replaceable>y.y.y.y</replaceable>/0 255.255.255.255 0.0.0.0
+17      add default HISADDR</programlisting>
 
 	  <variablelist>
 	    <varlistentry>
 	      <term>Line 1:</term>
 
 	      <listitem>
-		<para>Identifies the default entry.  Commands in this
-		  entry are executed automatically when ppp is
+		<para>Identifies the <literal>default</literal> entry.  Commands in this
+		  entry (lines 2 through 9) are executed automatically when <command>ppp</command> is
 		  run.</para>
 	      </listitem>
 	    </varlistentry>
@@ -249,14 +243,12 @@
 	      <term>Line 2:</term>
 
 	      <listitem>
-		<para>Enables logging parameters.  When the
+		<para>Enables verbose logging parameters for testing the connection.  Once the
 		  configuration is working satisfactorily, this line
-		  should be reduced to saying:</para>
+		  should be reduced to:</para>
 
 		  <programlisting>set log phase tun</programlisting>
 
-		<para>in order to avoid excessive log file
-		  sizes.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -264,12 +256,9 @@
 	      <term>Line 3:</term>
 
 	      <listitem>
-		<para>Tells PPP how to identify itself to the peer.
-		  PPP identifies itself to the peer if it has any
-		  trouble negotiating and setting up the link,
-		  providing information that the peers administrator
-		  may find useful when investigating such
-		  problems.</para>
+		<para>Displays the version of &man.ppp.8; to the 
+		  <acronym>PPP</acronym> software running on the other side of the 
+		  connection.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -278,7 +267,7 @@
 
 	      <listitem>
 		<para>Identifies the device to which the modem is
-		  connected.  <devicename>COM1</devicename> is
+		  connected, where  <devicename>COM1</devicename> is
 		  <filename class="devicefile">/dev/cuau0</filename>
 		  and
 		  <devicename>COM2</devicename> is
@@ -291,26 +280,23 @@
 	      <term>Line 5:</term>
 
 	      <listitem>
-		<para>Sets the speed you want to connect at.  If
-		  115200 does not work (it should with any reasonably
-		  new modem), try 38400 instead.</para>
+		<para>Sets the connection speed.  If
+		  <literal>115200</literal> does not work on an older modem,
+		  try <literal>38400</literal> instead.</para>
 	      </listitem>
 	    </varlistentry>
 
 	    <varlistentry>
-	      <term>Line 6 &amp; 7:</term>
+	      <term>Lines 6 &amp; 7:</term>
 
 	      <listitem>
-		<para>The dial string.  PPP uses an expect-send
-		  syntax similar to the &man.chat.8; program.  Refer
-		  to the manual page for information on the features
-		  of this language.</para>
+		<para>The dial string written as an expect-send
+		  syntax.  Refer to &man.chat.8; for more information.</para>
 
 		<para>Note that this command continues onto the next
 		  line for readability.  Any command in
 		  <filename>ppp.conf</filename> may do this if the
-		  last character on the line is a <literal>\</literal>
-		  character.</para>
+		  last character on the line is <literal>\</literal>.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -318,9 +304,7 @@
 	      <term>Line 8:</term>
 
 	      <listitem>
-		<para>Sets the idle timeout for the link.  180 seconds
-		  is the default, so this line is purely
-		  cosmetic.</para>
+		<para>Sets the idle timeout for the link in seconds.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -328,9 +312,9 @@
 	      <term>Line 9:</term>
 
 	      <listitem>
-		<para>Tells PPP to ask the peer to confirm the local
-		  resolver settings.  If you run a local name server,
-		  this line should be commented out or removed.</para>
+		<para>Instructs the peer to confirm the <acronym>DNS</acronym>
+		  settings.  If the local network is running its own <acronym>DNS</acronym> server,
+		    this line should be commented out, by adding a <literal>#</literal> at the beginning of the line, or removed.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -339,7 +323,7 @@
 
 	      <listitem>
 		<para>A blank line for readability.  Blank lines are
-		  ignored by PPP.</para>
+		  ignored by &man.ppp.8;.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -347,8 +331,8 @@
 	      <term>Line 11:</term>
 
 	      <listitem>
-		<para>Identifies an entry for a provider called
-		  <quote>provider</quote>.  This could be changed
+		<para>Identifies an entry called
+		  <literal>provider</literal>.  This could be changed
 		  to the name of the <acronym>ISP</acronym> so that
 		  <option>load
 		    <replaceable>ISP</replaceable></option> can be
@@ -360,35 +344,24 @@
 	      <term>Line 12:</term>
 
 	      <listitem>
-		<para>Sets the phone number for this provider.
+		<para>Use the phone number for the <acronym>ISP</acronym>.
 		  Multiple phone numbers may be specified using the
 		  colon (<literal>:</literal>) or pipe character
-		  (<literal>|</literal>) as a separator.  The
-		  difference between the two separators is described
-		  in &man.ppp.8;.  To summarize, to rotate
+		  (<literal>|</literal>) as a separator.  To rotate
 		  through the numbers, use a colon.  To
 		  always attempt to dial the first number first and
 		  only use the other numbers if the first number
-		  fails, use the pipe character.  Always quote the
-		  entire set of phone numbers as shown.</para>
-
-		<para>The phone number must be enclosed in quotation
-		  marks (<literal>"</literal>) if there is any
-		  intention on using spaces in the phone number.
-		  This can cause a simple, yet subtle error.</para>
-	      </listitem>
+		  fails, use the pipe character.  Always enclose the
+		  entire set of phone numbers between quotation
+		  marks (<literal>"</literal>) to prevent dialing failures.</para>
+		</listitem>
 	    </varlistentry>
 
 	    <varlistentry>
-	      <term>Line 13 &amp; 14:</term>
+	      <term>Lines 13 &amp; 14:</term>
 
 	      <listitem>
-		<para>Identifies the user name and password.  When
-		  connecting using a &unix; style login prompt, these
-		  values are referred to by the <command>set
-		    login</command> command using the \U and \P
-		  variables.  When connecting using PAP or CHAP, these
-		  values are used at authentication time.</para>
+		<para>Use the user name and password for the <acronym>ISP</acronym>.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -396,55 +369,25 @@
 	      <term>Line 15:</term>
 
 	      <listitem>
-		<para>If  <acronym>PAP</acronym> or
-		  <acronym>CHAP</acronym> are used, there will be no
-		  login at this point, and this line should be
-		  commented out or removed.  See <xref
-		    linkend="userppp-PAPnCHAP"/> for further
-		  details.</para>
-
-		<para>The login string is of the same chat-like
-		  syntax as the dial string.  In this example, the
-		  string works for a service whose login session looks
-		  like this:</para>
-
-		<screen>J. Random Provider
-login: <replaceable>foo</replaceable>
-password: <replaceable>bar</replaceable>
-protocol: ppp</screen>
-
-		<para>Alter this script to suit your
-		  own needs.  When writing this script for the first
-		  time, ensure that
-		  chat logging is enabled to help determine if
-		  the conversation is going as expected.</para>
-	      </listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term>Line 16:</term>
-
-	      <listitem>
 		<para>Sets the default idle
-		  timeout<indexterm><primary>timeout</primary></indexterm>
-		  (in seconds) for the connection.  Here, the
+		  timeout
+		  in seconds for the connection.  In this example, the
 		  connection will be closed automatically after 300
-		  seconds of inactivity.  To prevent a timeout
-		  timeout, set this value to zero or use the
-		  <option>-ddial</option> command line switch.</para>
+		  seconds of inactivity.  To prevent a timeout,
+		  set this value to zero.</para>
 	      </listitem>
 	    </varlistentry>
 
 	    <varlistentry>
-	      <term>Line 17:</term>
+	      <term>Line 16:</term>
 	      <listitem>
-		<para>Sets the interface addresses.  The string
+		<para>Sets the interface addresses.  The
 		  <replaceable>x.x.x.x</replaceable> should be
-		  replaced by the <acronym>IP</acronym> address that
-		  the <acronym>ISP</acronym> has allocated.  The
-		  string <replaceable>y.y.y.y</replaceable> should be
+		  replaced by the static <acronym>IP</acronym> address that
+		  the <acronym>ISP</acronym> has allocated and the
+		  <replaceable>y.y.y.y</replaceable> should be
 		  replaced by the <acronym>IP</acronym> address of the
-		  gateway.  If the <acronym>ISP</acronym> has not
+		  default gateway.  If the <acronym>ISP</acronym> has not
 		  provided a gateway address, use <hostid
 		    role="netmask">10.0.0.2/0</hostid>.  When using a
 		  <quote>guessed</quote> address, create an entry in
@@ -456,35 +399,26 @@ protocol: ppp</screen>
 	    </varlistentry>
 
 	    <varlistentry>
-	      <term>Line 18:</term>
+	      <term>Line 17:</term>
 
 	      <listitem>
-		<para>Adds a default route to the gateway.  The
-		  special word <literal>HISADDR</literal> is replaced
-		  with the gateway address specified on line 17.  It
-		  is important that this line appears after line 17,
-		  otherwise <literal>HISADDR</literal> will not yet
-		  be initialized.</para>
-
-		<para>When <option>-auto</option> is not used, this
-		  line should be moved to the
-		  <filename>ppp.linkup</filename> file.</para>
-	      </listitem>
+		<para>Keep this line as-is as it adds a default route to the gateway.  The
+		  <literal>HISADDR</literal> will automatically be replaced
+		  with the gateway address specified on line 16.  It
+		  is important that this line appears after line 16.</para>  
+
+		  <para>When <option>-auto</option> mode is not used to start the connection, this
+		  line should be moved to
+		  <filename>ppp.linkup</filename>.  Examples for this 
+		  file can be found in <filename
+		    class="directory">/usr/share/examples/ppp/</filename>.
+		  However,
+	    <filename>ppp.linkup</filename> is not needed when running &man.ppp.8; in
+	    <option>-auto</option> mode as the routing table entries
+	    are already correct.</para>
+	     </listitem>
 	    </varlistentry>
 	  </variablelist>
-
-	  <para>It is not necessary to add an entry to
-	    <filename>ppp.linkup</filename> when using a static
-	    <acronym>IP</acronym> address and when running ppp in
-	    <option>-auto</option> mode as the routing table entries
-	    are already correct.  However, an entry can be created to
-	    invoke programs after connection.  This is explained later
-	    with the sendmail example.</para>
-
-	  <para>Example configuration files can be found in the
-	    <filename
-	      class="directory">/usr/share/examples/ppp/</filename>
-	    directory.</para>
 	</sect2>
 
 	<sect2 id="userppp-dynamicIP">
@@ -1618,19 +1552,19 @@ ppp_profile="name_of_service_provider"</
   </sect1>
 
   <sect1 id="pppoa">
-    <title>Using <application>PPP</application> over ATM
+    <title>Using <application>PPP</application> over <acronym>ATM</acronym>
       (PPPoA)</title>
 
     <indexterm>
       <primary><acronym>PPP</acronym></primary>
-      <secondary>over ATM</secondary>
+      <secondary>over <acronym>ATM</acronym></secondary>
     </indexterm>
 
     <indexterm>
       <primary>PPPoA</primary>
     </indexterm>
 
-    <para>The following describes how to set up PPP over ATM (PPPoA).
+    <para>The following describes how to set up PPP over <acronym>ATM</acronym> (PPPoA).
       PPPoA is a popular choice among European DSL providers.</para>
 <!--
 This port is broken as of June, 2009

From owner-svn-doc-head@FreeBSD.ORG  Fri Oct 18 19:37:57 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id C7E63467;
 Fri, 18 Oct 2013 19:37:57 +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 B3F1D2999;
 Fri, 18 Oct 2013 19:37:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9IJbvRT064238;
 Fri, 18 Oct 2013 19:37:57 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9IJbvBI064237;
 Fri, 18 Oct 2013 19:37:57 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310181937.r9IJbvBI064237@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Fri, 18 Oct 2013 19:37:57 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43003 - head/en_US.ISO8859-1/books/handbook/ppp-and-slip
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Oct 2013 19:37:57 -0000

Author: dru
Date: Fri Oct 18 19:37:57 2013
New Revision: 43003
URL: http://svnweb.freebsd.org/changeset/doc/43003

Log:
  White space fix only. Translators can ignore.

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

Modified: head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Fri Oct 18 19:12:33 2013	(r43002)
+++ head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Fri Oct 18 19:37:57 2013	(r43003)
@@ -36,7 +36,7 @@
 
     <itemizedlist>
       <listitem>
-	<para>How to configure, use, and troubleshoot a 
+	<para>How to configure, use, and troubleshoot a
 	  <acronym>PPP</acronym> connection.</para>
       </listitem>
       <listitem>
@@ -44,7 +44,8 @@
 	  (<acronym>PPPoE</acronym>).</para>
       </listitem>
       <listitem>
-	<para>How to set up <acronym>PPP</acronym> over <acronym>ATM</acronym>
+	<para>How to set up <acronym>PPP</acronym> over
+	  <acronym>ATM</acronym>
 	  (<acronym>PPPoA</acronym>).</para>
       </listitem>
     </itemizedlist>
@@ -109,8 +110,8 @@
 
     <para>&os; provides built-in support for managing dial-up
       <acronym>PPP</acronym> connections using &man.ppp.8;.  In order
-      to use a <acronym>PPP</acronym> connection, the following
-      items are needed:</para>
+      to use a <acronym>PPP</acronym> connection, the following items
+      are needed:</para>
 
     <itemizedlist>
       <listitem>
@@ -133,9 +134,10 @@
       </listitem>
 
       <listitem>
-	<para>The <acronym>IP</acronym> address of one or more <acronym>DNS</acronym>
-	  servers.  Normally, the <acronym>ISP</acronym> provides these
-	  addresses.  If it did not, &os; can be configured to use
+	<para>The <acronym>IP</acronym> address of one or more
+	  <acronym>DNS</acronym> servers.  Normally, the
+	  <acronym>ISP</acronym> provides these addresses.  If it did
+	  not, &os; can be configured to use
 	  <acronym>DNS</acronym> negotiation.</para>
       </listitem>
     </itemizedlist>
@@ -152,9 +154,8 @@
 	  gateway.  If this information is unknown, the
 	  <acronym>ISP</acronym> will automatically
 	  provide the correct value during connection setup.  When
-	  configuring <acronym>PPP</acronym> on &os;,
-	  this address is referred to as
-	  <literal>HISADDR</literal>.</para>
+	  configuring <acronym>PPP</acronym> on &os;, this address is
+	  referred to as <literal>HISADDR</literal>.</para>
       </listitem>
 
       <listitem>
@@ -171,29 +172,28 @@
 
 	<para>If the <acronym>ISP</acronym> has assigned a static
 	  <acronym>IP</acronym> address and hostname, it should be
-	  input into the configuration file.
-	  Otherwise, this information will be automatically provided during
+	  input into the configuration file.  Otherwise, this
+	  information will be automatically provided during
 	  connection setup.</para>
       </listitem>
     </itemizedlist>
 
     <para>The rest of this section demonstrates how to configure &os;
-      for common <acronym>PPP</acronym> connection
-      scenarios.  The required configuration file is
+      for common <acronym>PPP</acronym> connection scenarios.  The
+      required configuration file is
       <filename>/etc/ppp/ppp.conf</filename> and additional files and
       examples are available in <filename
 	class="directory">/usr/share/examples/ppp/</filename>.</para>
 
     <note>
       <para>Throughout this section, many of the file examples
-	display line numbers.  These line
-	numbers have been added to make it easier to follow the discussion
-	  and are not meant to be placed in the actual file.</para>  
-	    
-      <para>When editing a configuration file, proper
-	indentation is
-	important.  Lines that end in a <literal>:</literal> start in the
-	first column (beginning of the line) while all other lines
+	display line numbers.  These line numbers have been added to
+	make it easier to follow the discussion and are not meant to
+	be placed in the actual file.</para>
+
+      <para>When editing a configuration file, proper indentation is
+	important.  Lines that end in a <literal>:</literal> start in
+	the first column (beginning of the line) while all other lines
 	should be indented as shown using spaces or tabs.</para>
     </note>
 
@@ -206,9 +206,10 @@
 	    addresses</secondary>
       </indexterm>
 
-      <para>If the <acronym>ISP</acronym>, also known as the peer, has provided an address that does not change,
-	edit <filename>/etc/ppp/ppp.conf</filename> as described in
-	the example below.</para>
+      <para>If the <acronym>ISP</acronym>, also known as the peer, has
+	provided an address that does not change, edit
+	<filename>/etc/ppp/ppp.conf</filename> as described in the
+	example below.</para>
 
       <programlisting>1     default:
 2       set log Phase Chat LCP IPCP CCP tun command
@@ -233,9 +234,10 @@
 	      <term>Line 1:</term>
 
 	      <listitem>
-		<para>Identifies the <literal>default</literal> entry.  Commands in this
-		  entry (lines 2 through 9) are executed automatically when <command>ppp</command> is
-		  run.</para>
+		<para>Identifies the <literal>default</literal> entry.
+		  Commands in this entry (lines 2 through 9) are
+		  executed automatically when <command>ppp</command>
+		  is run.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -243,9 +245,10 @@
 	      <term>Line 2:</term>
 
 	      <listitem>
-		<para>Enables verbose logging parameters for testing the connection.  Once the
-		  configuration is working satisfactorily, this line
-		  should be reduced to:</para>
+		<para>Enables verbose logging parameters for testing
+		  the connection.  Once the configuration is working
+		  satisfactorily, this line should be reduced
+		  to:</para>
 
 		  <programlisting>set log phase tun</programlisting>
 
@@ -256,9 +259,9 @@
 	      <term>Line 3:</term>
 
 	      <listitem>
-		<para>Displays the version of &man.ppp.8; to the 
-		  <acronym>PPP</acronym> software running on the other side of the 
-		  connection.</para>
+		<para>Displays the version of &man.ppp.8; to the
+		  <acronym>PPP</acronym> software running on the other
+		  side of the  connection.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -269,9 +272,7 @@
 		<para>Identifies the device to which the modem is
 		  connected, where  <devicename>COM1</devicename> is
 		  <filename class="devicefile">/dev/cuau0</filename>
-		  and
-		  <devicename>COM2</devicename> is
-		  <filename
+		  and <devicename>COM2</devicename> is <filename
 		    class="devicefile">/dev/cuau1</filename>.</para>
 	      </listitem>
 	    </varlistentry>
@@ -281,8 +282,8 @@
 
 	      <listitem>
 		<para>Sets the connection speed.  If
-		  <literal>115200</literal> does not work on an older modem,
-		  try <literal>38400</literal> instead.</para>
+		  <literal>115200</literal> does not work on an older
+		  modem, try <literal>38400</literal> instead.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -291,12 +292,14 @@
 
 	      <listitem>
 		<para>The dial string written as an expect-send
-		  syntax.  Refer to &man.chat.8; for more information.</para>
+		  syntax.  Refer to &man.chat.8; for more
+		  information.</para>
 
 		<para>Note that this command continues onto the next
 		  line for readability.  Any command in
 		  <filename>ppp.conf</filename> may do this if the
-		  last character on the line is <literal>\</literal>.</para>
+		  last character on the line is
+		  <literal>\</literal>.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -304,7 +307,8 @@
 	      <term>Line 8:</term>
 
 	      <listitem>
-		<para>Sets the idle timeout for the link in seconds.</para>
+		<para>Sets the idle timeout for the link in
+		  seconds.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -312,9 +316,12 @@
 	      <term>Line 9:</term>
 
 	      <listitem>
-		<para>Instructs the peer to confirm the <acronym>DNS</acronym>
-		  settings.  If the local network is running its own <acronym>DNS</acronym> server,
-		    this line should be commented out, by adding a <literal>#</literal> at the beginning of the line, or removed.</para>
+		<para>Instructs the peer to confirm the
+		  <acronym>DNS</acronym> settings.  If the local
+		  network is running its own <acronym>DNS</acronym>
+		  server, this line should be commented out, by adding
+		  a <literal>#</literal> at the beginning of the line,
+		  or removed.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -344,24 +351,26 @@
 	      <term>Line 12:</term>
 
 	      <listitem>
-		<para>Use the phone number for the <acronym>ISP</acronym>.
-		  Multiple phone numbers may be specified using the
-		  colon (<literal>:</literal>) or pipe character
-		  (<literal>|</literal>) as a separator.  To rotate
-		  through the numbers, use a colon.  To
-		  always attempt to dial the first number first and
-		  only use the other numbers if the first number
-		  fails, use the pipe character.  Always enclose the
-		  entire set of phone numbers between quotation
-		  marks (<literal>"</literal>) to prevent dialing failures.</para>
-		</listitem>
+		<para>Use the phone number for the
+		  <acronym>ISP</acronym>.  Multiple phone numbers may
+		  be specified using the colon (<literal>:</literal>)
+		  or pipe character (<literal>|</literal>) as a
+		  separator.  To rotate through the numbers, use a
+		  colon.  To always attempt to dial the first number
+		  first and only use the other numbers if the first
+		  number fails, use the pipe character.  Always
+		  enclose the entire set of phone numbers between
+		  quotation marks (<literal>"</literal>) to prevent
+		  dialing failures.</para>
+	      </listitem>
 	    </varlistentry>
 
 	    <varlistentry>
 	      <term>Lines 13 &amp; 14:</term>
 
 	      <listitem>
-		<para>Use the user name and password for the <acronym>ISP</acronym>.</para>
+		<para>Use the user name and password for the
+		  <acronym>ISP</acronym>.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -369,12 +378,11 @@
 	      <term>Line 15:</term>
 
 	      <listitem>
-		<para>Sets the default idle
-		  timeout
-		  in seconds for the connection.  In this example, the
-		  connection will be closed automatically after 300
-		  seconds of inactivity.  To prevent a timeout,
-		  set this value to zero.</para>
+		<para>Sets the default idle timeout in seconds for the
+		  connection.  In this example, the connection will be
+		  closed automatically after 300 seconds of
+		  inactivity.  To prevent a timeout, set this value to
+		  zero.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -383,12 +391,12 @@
 	      <listitem>
 		<para>Sets the interface addresses.  The
 		  <replaceable>x.x.x.x</replaceable> should be
-		  replaced by the static <acronym>IP</acronym> address that
-		  the <acronym>ISP</acronym> has allocated and the
-		  <replaceable>y.y.y.y</replaceable> should be
+		  replaced by the static <acronym>IP</acronym> address
+		  that the <acronym>ISP</acronym> has allocated and
+		  the <replaceable>y.y.y.y</replaceable> should be
 		  replaced by the <acronym>IP</acronym> address of the
-		  default gateway.  If the <acronym>ISP</acronym> has not
-		  provided a gateway address, use <hostid
+		  default gateway.  If the <acronym>ISP</acronym> has
+		  not provided a gateway address, use <hostid
 		    role="netmask">10.0.0.2/0</hostid>.  When using a
 		  <quote>guessed</quote> address, create an entry in
 		  <filename>/etc/ppp/ppp.linkup</filename> as per the
@@ -402,21 +410,22 @@
 	      <term>Line 17:</term>
 
 	      <listitem>
-		<para>Keep this line as-is as it adds a default route to the gateway.  The
-		  <literal>HISADDR</literal> will automatically be replaced
-		  with the gateway address specified on line 16.  It
-		  is important that this line appears after line 16.</para>  
-
-		  <para>When <option>-auto</option> mode is not used to start the connection, this
-		  line should be moved to
-		  <filename>ppp.linkup</filename>.  Examples for this 
+		<para>Keep this line as-is as it adds a default route
+		  to the gateway.  The <literal>HISADDR</literal> will
+		  automatically be replaced with the gateway address
+		  specified on line 16.  It is important that this
+		  line appears after line 16.</para>
+
+		<para>When <option>-auto</option> mode is not used to
+		  start the connection, this line should be moved to
+		  <filename>ppp.linkup</filename>.  Examples for this
 		  file can be found in <filename
 		    class="directory">/usr/share/examples/ppp/</filename>.
-		  However,
-	    <filename>ppp.linkup</filename> is not needed when running &man.ppp.8; in
-	    <option>-auto</option> mode as the routing table entries
-	    are already correct.</para>
-	     </listitem>
+		  However, <filename>ppp.linkup</filename> is not
+		  needed when running &man.ppp.8; in
+		  <option>-auto</option> mode as the routing table
+		  entries are already correct.</para>
+	      </listitem>
 	    </varlistentry>
 	  </variablelist>
 	</sect2>

From owner-svn-doc-head@FreeBSD.ORG  Fri Oct 18 20:50:46 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [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 5A9B93A4;
 Fri, 18 Oct 2013 20:50:46 +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 39DE12D04;
 Fri, 18 Oct 2013 20:50:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9IKok70004471;
 Fri, 18 Oct 2013 20:50:46 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9IKok57004470;
 Fri, 18 Oct 2013 20:50:46 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310182050.r9IKok57004470@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Fri, 18 Oct 2013 20:50:46 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43004 - head/en_US.ISO8859-1/books/handbook/ppp-and-slip
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Oct 2013 20:50:46 -0000

Author: dru
Date: Fri Oct 18 20:50:45 2013
New Revision: 43004
URL: http://svnweb.freebsd.org/changeset/doc/43004

Log:
  Begin shuffling content to divide it into basic configuration, advanced configuration, authentication, and dial-ins instead of dial-outs. More shuffling to come.
  
  Add more to the intro to help make sense of how everything fits together.
  
  General tightening and clarification in sections 26.2.2 and 26.2.3. White space fix won't occur until after next shuffling is complete.

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

Modified: head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Fri Oct 18 19:37:57 2013	(r43003)
+++ head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Fri Oct 18 20:50:45 2013	(r43004)
@@ -109,7 +109,15 @@
     <title>Configuring <acronym>PPP</acronym></title>
 
     <para>&os; provides built-in support for managing dial-up
-      <acronym>PPP</acronym> connections using &man.ppp.8;.  In order
+      <acronym>PPP</acronym> connections using &man.ppp.8;. The 
+      default &os; kernel provides support for 
+      <devicename>tun</devicename> which is used to interact with a 
+      modem hardware.  Configuration is performed by editing at least
+      one configuration file, and configuration files containing
+      examples are provided.  Finally, <command>ppp</command> is
+      used to start and manage connections.</para> 
+      
+    <para>In order
       to use a <acronym>PPP</acronym> connection, the following items
       are needed:</para>
 
@@ -198,7 +206,7 @@
     </note>
 
     <sect2 id="userppp-staticIP">
-      <title>PPP With Static <acronym>IP</acronym> Addresses</title>
+      <title>PPP With a Static <acronym>IP</acronym> Address</title>
 
       <indexterm>
 	<primary>PPP</primary>
@@ -431,8 +439,8 @@
 	</sect2>
 
 	<sect2 id="userppp-dynamicIP">
-	  <title><acronym>PPP</acronym> With Dynamic
-	    <acronym>IP</acronym> Addresses</title>
+	  <title><acronym>PPP</acronym> With a Dynamic
+	    <acronym>IP</acronym> Address</title>
 
 	  <indexterm>
 	    <primary><acronym>PPP</acronym></primary>
@@ -445,94 +453,28 @@
 	  </indexterm>
 
 	  <para>If the <acronym>IP</acronym> address changes whenever
-	    a connection is made, configure <command>ppp</command> to
-	    negotiate the local and remote addresses.  This is done by
-	    <quote>guessing</quote> an <acronym>IP</acronym> address
-	    and allowing <command>ppp</command> to set it up correctly
-	    using the <acronym>IP</acronym> Configuration Protocol
-	    (IPCP) after connecting.  The
-	    <filename>ppp.conf</filename> configuration is the same as
-	    that described in <xref linkend="userppp-staticIP"/>, with
-	    the following change:</para>
-
-	  <programlisting>17      set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.255 0.0.0.0</programlisting>
-
-	  <para>Again, do not include the line number, it is just for
-	    reference.  Indentation of at least one space is
-	    required.</para>
+	    a connection is made, change the <literal>set ifaddr</literal> line
+	    in <filename>/etc/ppp/ppp.conf</filename> to the following value.
+	    This tells &man.ppp.8; to use the
+	    <acronym>IP</acronym> Configuration Protocol
+	    (<acronym>IPCP</acronym>) to negotiate the <acronym>IP</acronym> address.</para>
 
-	  <variablelist>
-	    <varlistentry>
-	      <term>Line 17:</term>
-
-	      <listitem>
-		<para>The number after the <literal>/</literal>
-		  character is the number of bits of the address that
-		  ppp will insist on.  Other <acronym>IP</acronym>
-		  addresses can be used, but the above example will
-		  always work.</para>
-
-		<para>The last argument (<literal>0.0.0.0</literal>)
-		  tells PPP to start negotiations using address
-		  <hostid role="ipaddr">0.0.0.0</hostid> rather than
-		  <hostid role="ipaddr">10.0.0.1</hostid> and is
-		  necessary for some <acronym>ISP</acronym>s.  Do not
-		  use <literal>0.0.0.0</literal> as the first argument
-		  to <command>set ifaddr</command> as it prevents
-		  PPP from setting up an initial route in
-		  <option>-auto</option> mode.</para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
+	  <programlisting>set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.255 0.0.0.0</programlisting>
 
 	  <para>When not running in <option>-auto</option> mode,
-	    create an entry in
-	    <filename>/etc/ppp/ppp.linkup</filename> as this file is
+	    create
+	    <filename>/etc/ppp/ppp.linkup</filename> with the following lines.  This file is
 	    used after a connection has been established.  At this
-	    point, <command>ppp</command> will have assigned the
-	    interface addresses and it will now be possible to add the
-	    routing table entries:</para>
-
-	  <programlisting>1     provider:
-2      add default HISADDR</programlisting>
-
-	  <variablelist>
-	    <varlistentry>
-	      <term>Line 1:</term>
-
-	      <listitem>
-		<para>On establishing a connection,
-		  <command>ppp</command> will look for an entry in
-		  <filename>ppp.linkup</filename> according to the
-		  following rules: First, try to match the same label
-		  as we used in <filename>ppp.conf</filename>.  If
-		  that fails, look for an entry for the
-		  <acronym>IP</acronym> address of our gateway.  This
-		  entry is a four-octet <acronym>IP</acronym> style
-		  label.  If we still have not found an entry, look
-		  for the <literal>MYADDR</literal> entry.</para>
-	      </listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term>Line 2:</term>
-
-	      <listitem>
-		<para>This line tells <command>ppp</command> to add a
-		  default route that points to
-		  <literal>HISADDR</literal>.
-		  <literal>HISADDR</literal> will be replaced with the
-		  <acronym>IP</acronym> number of the gateway as
-		  negotiated by the IPCP.</para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
+	    point, the <acronym>IP</acronym> address will have been assigned
+	    and it will now be possible to add the
+	    routing table entries.  The <literal>HISADDR</literal> line will be replaced with the
+	    <acronym>IP</acronym> address of the default gateway as
+	    negotiated using <acronym>IPCP</acronym>.  Make sure that
+	    <replaceable>provider</replaceable> matches the value
+	    used in <filename>ppp.conf</filename>.</para>
 
-	  <para>See the <literal>pmdemand</literal> entry in the files
-	    <filename>/usr/share/examples/ppp/ppp.conf.sample</filename>
-	    and
-	    <filename>/usr/share/examples/ppp/ppp.linkup.sample</filename>
-	    for a detailed example.</para>
+	  <programlisting>provider:
+      add default HISADDR</programlisting>
 	</sect2>
 
 	<sect2>
@@ -543,44 +485,47 @@
 	    <secondary>receiving incoming calls</secondary>
 	  </indexterm>
 
-	  <para>When configuring <application>ppp</application> to
-	    receive incoming calls on a machine connected to a LAN,
-	    decide if packets should be forwarded to the LAN.  If so,
-	    allocate the peer an <acronym>IP</acronym> address from
-	    the LAN's subnet, and use <command>enable
-	      proxy</command> in the
+	  <para>When configuring &man.ppp.8; to
+	    receive incoming calls on a machine connected to a Local
+	    Area Network (<acronym>LAN</acronym>),
+	    decide if packets should be forwarded to the <acronym>LAN</acronym>.  If so,
+	    allocate the connecting system an <acronym>IP</acronym> address from
+	    the <acronym>LAN</acronym>'s subnet, and add the <command>enable
+	      proxy</command> line to
 	    <filename>/etc/ppp/ppp.conf</filename>.
-	    Alsom confirm that <filename>/etc/rc.conf</filename>
+	    Also, confirm that <filename>/etc/rc.conf</filename>
 	    contains the following line:</para>
 
 	  <programlisting>gateway_enable="YES"</programlisting>
-	</sect2>
-
-	<sect2>
-	  <title>Which getty?</title>
-
-	  <para><xref linkend="dialup"/> provides a good description
-	    on enabling dial-up services using &man.getty.8;.</para>
-
-	  <para>An alternative to <command>getty</command> is <ulink
-	      url="http://mgetty.greenie.net/">mgetty</ulink> (from
-	    <filename role="package">comms/mgetty+sendfax</filename>
-	    port), a smarter version of <command>getty</command>
-	    designed with dial-up lines in mind.</para>
+	  
+	  <para>Refer to &man.ppp.8; and 
+	    <filename>/usr/share/examples/ppp/ppp.conf.sample</filename>
+	    for more details.  The following steps will also be required:</para>
+	    
+	    <procedure>
+	      <step>
+	    <para>Create an entry in <filename>/etc/passwd</filename>
+	      (using the &man.vipw.8; program).</para>
+	  </step>
 
-	  <para>The advantages of using <command>mgetty</command> is
-	    that it actively <emphasis>talks</emphasis> to modems,
-	    meaning if port is turned off in
-	    <filename>/etc/ttys</filename> then the modem will not
-	    answer the phone.</para>
+	  <step>
+	    <para>Create a profile in this users home directory that
+	      runs <command>ppp -direct direct-server</command> or
+	      similar.</para>
+	  </step>
 
-	  <para>Later versions of <command>mgetty</command> (from
-	    0.99beta onwards) also support the automatic detection of
-	    <acronym>PPP</acronym> streams, allowing clients
-	    scriptless access to the server.</para>
+	  <step>
+	    <para>Create an entry in
+	      <filename>/etc/ppp/ppp.conf</filename>.  The
+	      <filename>direct-server</filename> example should
+	      suffice.</para>
+	  </step>
 
-	  <para>Refer to <xref linkend="userppp-mgetty"/> for more
-	    information on <command>mgetty</command>.</para>
+	  <step>
+	    <para>Create an entry in
+	      <filename>/etc/ppp/ppp.linkup</filename>.</para>
+	  </step>
+	</procedure>
 	</sect2>
 
 	<sect2>
@@ -765,6 +710,28 @@ mary:
 	  <indexterm>
 	    <primary>LCP</primary>
 	  </indexterm>
+	  <para><xref linkend="dialup"/> provides a good description
+	    on enabling dial-up services using &man.getty.8;.</para>
+
+	  <para>An alternative to <command>getty</command> is <ulink
+	      url="http://mgetty.greenie.net/">mgetty</ulink> (from
+	    <filename role="package">comms/mgetty+sendfax</filename>
+	    port), a smarter version of <command>getty</command>
+	    designed with dial-up lines in mind.</para>
+
+	  <para>The advantages of using <command>mgetty</command> is
+	    that it actively <emphasis>talks</emphasis> to modems,
+	    meaning if port is turned off in
+	    <filename>/etc/ttys</filename> then the modem will not
+	    answer the phone.</para>
+
+	  <para>Later versions of <command>mgetty</command> (from
+	    0.99beta onwards) also support the automatic detection of
+	    <acronym>PPP</acronym> streams, allowing clients
+	    scriptless access to the server.</para>
+
+	  <para>Refer to <xref linkend="userppp-mgetty"/> for more
+	    information on <command>mgetty</command>.</para>
 
 	  <para>By default the <filename
 	      role="package">comms/mgetty+sendfax</filename> port
@@ -1101,96 +1068,6 @@ ifconfig_tun0=</programlisting>
 
 	<screen>&prompt.root; <userinput>ppp -auto provider</userinput></screen>
       </sect2>
-
-      <sect2>
-	<title>Summary</title>
-
-	<para>To recap, the following steps are necessary when setting
-	  up ppp for the first time:</para>
-
-	<para>Client side:</para>
-
-	<procedure>
-	  <step>
-	    <para>Ensure that the <devicename>tun</devicename> device
-	      is built into the kernel.</para>
-	  </step>
-
-	  <step>
-	    <para>Ensure that the <filename
-		class="devicefile">tun<replaceable>N</replaceable></filename>
-	      device file is available in the <filename
-		class="directory">/dev</filename> directory.</para>
-	  </step>
-
-	  <step>
-	    <para>Create an entry in
-	      <filename>/etc/ppp/ppp.conf</filename>.  The
-	      <filename>pmdemand</filename> example should suffice
-	      for most <acronym>ISP</acronym>s.</para>
-	  </step>
-
-	  <step>
-	    <para>When using a dynamic <acronym>IP</acronym> address,
-	      create an entry in
-	      <filename>/etc/ppp/ppp.linkup</filename>.</para>
-	  </step>
-
-	  <step>
-	    <para>Update your <filename>/etc/rc.conf</filename>
-	      file.</para>
-	  </step>
-
-	  <step>
-	    <para>Create a <filename>start_if.tun0</filename> script
-	      if demand dialing is required.</para>
-	  </step>
-	</procedure>
-
-	<para>Server side:</para>
-
-	<procedure>
-	  <step>
-	    <para>Ensure that the <devicename>tun</devicename> device
-	      is built into the kernel.</para>
-	  </step>
-
-	  <step>
-	    <para>Ensure that the
-	      <filename
-		class="devicefile">tun<replaceable>N</replaceable></filename>
-	      device file is available in the <filename
-		class="directory">/dev</filename> directory.</para>
-	  </step>
-
-	  <step>
-	    <para>Create an entry in <filename>/etc/passwd</filename>
-	      (using the &man.vipw.8; program).</para>
-	  </step>
-
-	  <step>
-	    <para>Create a profile in this users home directory that
-	      runs <command>ppp -direct direct-server</command> or
-	      similar.</para>
-	  </step>
-
-	  <step>
-	    <para>Create an entry in
-	      <filename>/etc/ppp/ppp.conf</filename>.  The
-	      <filename>direct-server</filename> example should
-	      suffice.</para>
-	  </step>
-
-	  <step>
-	    <para>Create an entry in
-	      <filename>/etc/ppp/ppp.linkup</filename>.</para>
-	  </step>
-
-	  <step>
-	    <para>Update <filename>/etc/rc.conf</filename>.</para>
-	  </step>
-	</procedure>
-    </sect2>
   </sect1>
 
   <sect1 id="ppp-troubleshoot">

From owner-svn-doc-head@FreeBSD.ORG  Fri Oct 18 21:36:01 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [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 20EBD32F;
 Fri, 18 Oct 2013 21:36:01 +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 0D69B2FCA;
 Fri, 18 Oct 2013 21:36:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ILa07U028873;
 Fri, 18 Oct 2013 21:36:00 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ILa0DM028871;
 Fri, 18 Oct 2013 21:36:00 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310182136.r9ILa0DM028871@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Fri, 18 Oct 2013 21:36:00 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43005 - head/en_US.ISO8859-1/books/handbook/ppp-and-slip
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Oct 2013 21:36:01 -0000

Author: dru
Date: Fri Oct 18 21:36:00 2013
New Revision: 43005
URL: http://svnweb.freebsd.org/changeset/doc/43005

Log:
  Combine Static and Dynamic IP sections into a Basic Configuration section.
  
  Make it clearer when ppp.linkup is required.
  
  This section still has to make it obvious how to actually use ppp once a basic configuration has been created.
  
  The next few patches will shuffle content to organize it into various advanced configuration sections.

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

Modified: head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Fri Oct 18 20:50:45 2013	(r43004)
+++ head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Fri Oct 18 21:36:00 2013	(r43005)
@@ -206,7 +206,7 @@
     </note>
 
     <sect2 id="userppp-staticIP">
-      <title>PPP With a Static <acronym>IP</acronym> Address</title>
+      <title>Basic Configuration</title>
 
       <indexterm>
 	<primary>PPP</primary>
@@ -214,10 +214,11 @@
 	    addresses</secondary>
       </indexterm>
 
-      <para>If the <acronym>ISP</acronym>, also known as the peer, has
-	provided an address that does not change, edit
-	<filename>/etc/ppp/ppp.conf</filename> as described in the
-	example below.</para>
+      <para>In order to configure a <acronym>PPP</acronym> connection,
+	first edit
+	<filename>/etc/ppp/ppp.conf</filename> with the dial-in
+	information for the <acronym>ISP</acronym>. This file is described
+	as follows:</para>
 
       <programlisting>1     default:
 2       set log Phase Chat LCP IPCP CCP tun command
@@ -397,20 +398,34 @@
 	    <varlistentry>
 	      <term>Line 16:</term>
 	      <listitem>
-		<para>Sets the interface addresses.  The
-		  <replaceable>x.x.x.x</replaceable> should be
-		  replaced by the static <acronym>IP</acronym> address
-		  that the <acronym>ISP</acronym> has allocated and
-		  the <replaceable>y.y.y.y</replaceable> should be
-		  replaced by the <acronym>IP</acronym> address of the
+		<para>Sets the interface addresses.  The values used 
+		  depend upon whether a static <acronym>IP</acronym>
+		  address has been obtained from the
+		  <acronym>ISP</acronym> or if it  instead negotiates
+		  a dynamic <acronym>IP</acronym> address during
+		  connection.</para>  
+
+		<para>If the 
+		  <acronym>ISP</acronym> has allocated a static
+		  <acronym>IP</acronym> address and default gateway, replace
+		  <replaceable>x.x.x.x</replaceable> with the static 
+		  <acronym>IP</acronym> address and replace
+		  <replaceable>y.y.y.y</replaceable> with the
+		  <acronym>IP</acronym> address of the
 		  default gateway.  If the <acronym>ISP</acronym> has
-		  not provided a gateway address, use <hostid
-		    role="netmask">10.0.0.2/0</hostid>.  When using a
-		  <quote>guessed</quote> address, create an entry in
-		  <filename>/etc/ppp/ppp.linkup</filename> as per the
-		  instructions in <xref linkend="userppp-dynamicIP"/>.
-		  If this line is omitted,  <command>ppp</command>
-		  cannot run in <option>-auto</option> mode.</para>
+		  only provided a static <acronym>IP</acronym> address
+		  without a gateway address, replace <replaceable>y.y.y.y</replaceable> with <hostid
+		    role="netmask">10.0.0.2/0</hostid>.</para>
+		    
+	<para>If the <acronym>IP</acronym> address changes whenever
+	    a connection is made, change this line
+	    to the following value.
+	    This tells &man.ppp.8; to use the
+	    <acronym>IP</acronym> Configuration Protocol
+	    (<acronym>IPCP</acronym>) to negotiate a dynamic <acronym>IP</acronym> address:</para>
+
+	  <programlisting>set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.255 0.0.0.0</programlisting>	
+
 	      </listitem>
 	    </varlistentry>
 
@@ -423,60 +438,35 @@
 		  automatically be replaced with the gateway address
 		  specified on line 16.  It is important that this
 		  line appears after line 16.</para>
-
-		<para>When <option>-auto</option> mode is not used to
-		  start the connection, this line should be moved to
-		  <filename>ppp.linkup</filename>.  Examples for this
-		  file can be found in <filename
-		    class="directory">/usr/share/examples/ppp/</filename>.
-		  However, <filename>ppp.linkup</filename> is not
-		  needed when running &man.ppp.8; in
-		  <option>-auto</option> mode as the routing table
-		  entries are already correct.</para>
 	      </listitem>
 	    </varlistentry>
 	  </variablelist>
-	</sect2>
-
-	<sect2 id="userppp-dynamicIP">
-	  <title><acronym>PPP</acronym> With a Dynamic
-	    <acronym>IP</acronym> Address</title>
-
-	  <indexterm>
-	    <primary><acronym>PPP</acronym></primary>
-	    <secondary>with dynamic <acronym>IP</acronym>
-	      addresses</secondary>
-	  </indexterm>
-
-	  <indexterm>
-	    <primary>IPCP</primary>
-	  </indexterm>
-
-	  <para>If the <acronym>IP</acronym> address changes whenever
-	    a connection is made, change the <literal>set ifaddr</literal> line
-	    in <filename>/etc/ppp/ppp.conf</filename> to the following value.
-	    This tells &man.ppp.8; to use the
-	    <acronym>IP</acronym> Configuration Protocol
-	    (<acronym>IPCP</acronym>) to negotiate the <acronym>IP</acronym> address.</para>
-
-	  <programlisting>set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.255 0.0.0.0</programlisting>
 
-	  <para>When not running in <option>-auto</option> mode,
-	    create
-	    <filename>/etc/ppp/ppp.linkup</filename> with the following lines.  This file is
-	    used after a connection has been established.  At this
+	  <para>Depending upon whether &man.ppp.8; is started
+	    manually or automatically, a
+	    <filename>/etc/ppp/ppp.linkup</filename> may also need to
+	    be created which contains the following lines.  This file
+	    is required when running <command>ppp</command>
+	    in <option>-auto</option> mode.  This file is
+	    used after the connection has been established.  At this
 	    point, the <acronym>IP</acronym> address will have been assigned
-	    and it will now be possible to add the
-	    routing table entries.  The <literal>HISADDR</literal> line will be replaced with the
-	    <acronym>IP</acronym> address of the default gateway as
-	    negotiated using <acronym>IPCP</acronym>.  Make sure that
+	    and it is now be possible to add the
+	    routing table entries.  When creating this file, make sure that
 	    <replaceable>provider</replaceable> matches the value
-	    used in <filename>ppp.conf</filename>.</para>
+	    demonstrated in line 11 of <filename>ppp.conf</filename>.</para>
 
 	  <programlisting>provider:
       add default HISADDR</programlisting>
-	</sect2>
 
+	<para>This file is also needed when the default gateway
+	  address is <quote>guessed</quote> in a static
+	  <acronym>IP</acronym> address configuration.  In this case,
+	  remove line 17 from <filename>ppp.conf</filename> and
+	  create <filename>/etc/ppp/ppp.linkup</filename> with the
+	  above two lines.  More examples for this file can be found
+	  in <filename
+	    class="directory">/usr/share/examples/ppp/</filename>.</para>
+    </sect2>
 	<sect2>
 	  <title>Receiving Incoming Calls</title>
 

From owner-svn-doc-head@FreeBSD.ORG  Fri Oct 18 22:15:40 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [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 5E420E36;
 Fri, 18 Oct 2013 22:15:40 +0000 (UTC)
 (envelope-from nemysis@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 4C3E72218;
 Fri, 18 Oct 2013 22:15: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 r9IMFeLh050668;
 Fri, 18 Oct 2013 22:15:40 GMT (envelope-from nemysis@svn.freebsd.org)
Received: (from nemysis@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9IMFeqG050666;
 Fri, 18 Oct 2013 22:15:40 GMT (envelope-from nemysis@svn.freebsd.org)
Message-Id: <201310182215.r9IMFeqG050666@svn.freebsd.org>
From: Rusmir Dusko <nemysis@FreeBSD.org>
Date: Fri, 18 Oct 2013 22:15:40 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43006 - head/en_US.ISO8859-1/books/porters-handbook
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Oct 2013 22:15:40 -0000

Author: nemysis (ports committer)
Date: Fri Oct 18 22:15:39 2013
New Revision: 43006
URL: http://svnweb.freebsd.org/changeset/doc/43006

Log:
  - Add Use pure to uses.xml
  
  Approved by:	pawel (mentor)

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

Modified: head/en_US.ISO8859-1/books/porters-handbook/uses.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/uses.xml	Fri Oct 18 21:36:00 2013	(r43005)
+++ head/en_US.ISO8859-1/books/porters-handbook/uses.xml	Fri Oct 18 22:15:39 2013	(r43006)
@@ -165,6 +165,17 @@
 </row>
 
 <row>
+  <entry><literal>pure</literal></entry>
+  <entry>(none), <literal>ffi</literal></entry>
+  <entry>Implies that the port uses <filename
+      role="package">lang/pure</filename> in one way or another,
+    but largely is used for building related pure ports.
+    With the <literal>ffi</literal> argument, it implies <filename
+      role="package">devel/pure-ffi</filename>
+    as a run-time dependency.</entry>
+</row>
+
+<row>
   <entry><literal>qmail</literal></entry>
   <entry>(none), <literal>build</literal>, <literal>run</literal>,
     <literal>both</literal>, <literal>vars</literal></entry>

From owner-svn-doc-head@FreeBSD.ORG  Fri Oct 18 22:54:07 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 944D88F6;
 Fri, 18 Oct 2013 22:54:07 +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 65DF22438;
 Fri, 18 Oct 2013 22:54:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9IMs72C072503;
 Fri, 18 Oct 2013 22:54:07 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9IMs7vi072502;
 Fri, 18 Oct 2013 22:54:07 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310182254.r9IMs7vi072502@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Fri, 18 Oct 2013 22:54:07 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43007 - head/en_US.ISO8859-1/books/handbook/ppp-and-slip
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Oct 2013 22:54:07 -0000

Author: dru
Date: Fri Oct 18 22:54:06 2013
New Revision: 43007
URL: http://svnweb.freebsd.org/changeset/doc/43007

Log:
  For now, ignore sections dealing with dial-in customers as any ISPs still doing this probably already know how to do it.
  
  Reviewed by:	discussed with bjk

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

Modified: head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Fri Oct 18 22:15:39 2013	(r43006)
+++ head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Fri Oct 18 22:54:06 2013	(r43007)
@@ -467,6 +467,8 @@
 	  in <filename
 	    class="directory">/usr/share/examples/ppp/</filename>.</para>
     </sect2>
+    
+    <?ignore
 	<sect2>
 	  <title>Receiving Incoming Calls</title>
 
@@ -517,6 +519,7 @@
 	  </step>
 	</procedure>
 	</sect2>
+	?>
 
 	<sect2>
 	  <title><application>PPP</application> Permissions</title>
@@ -539,7 +542,7 @@
 	    <literal>default</literal> section, it gives the specified
 	    users access to everything.</para>
 	</sect2>
-
+<?ignore
 	<sect2>
 	  <title><acronym>PPP</acronym> Shells for Dynamic
 	    <acronym>IP</acronym> Users</title>
@@ -590,7 +593,6 @@ exec /usr/sbin/ppp -direct $IDENT</progr
 	    <para>which prevents <filename>/etc/motd</filename> from
 	      being displayed.</para>
 	  </sect2>
-
 	  <sect2>
 	    <title><acronym>PPP</acronym> Shells for Static
 	      <acronym>IP</acronym> Users</title>
@@ -685,7 +687,7 @@ sam:
 mary:
   add 203.14.103.0 netmask 255.255.255.0 HISADDR</programlisting>
 	</sect2>
-
+?>
 	<sect2 id="userppp-mgetty">
 	  <title><command>mgetty</command> and AutoPPP</title>
 
@@ -846,8 +848,7 @@ set nbns 203.14.100.5</programlisting>
 	    serial line only.  There is not much room for crackers
 	    to <quote>eavesdrop</quote>.</para>
 
-	  <para>Referring back to <xref linkend="userppp-staticIP"/>
-	    or <xref linkend="userppp-dynamicIP"/>, the following
+	  <para>The following
 	    alterations must be made:</para>
 
 	  <programlisting>13      set authname <replaceable>MyUserName</replaceable>

From owner-svn-doc-head@FreeBSD.ORG  Fri Oct 18 23:17:18 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [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 E6828F96;
 Fri, 18 Oct 2013 23:17:17 +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 C35F4256C;
 Fri, 18 Oct 2013 23:17:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9INHHjq084743;
 Fri, 18 Oct 2013 23:17:17 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9INHHRC084742;
 Fri, 18 Oct 2013 23:17:17 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201310182317.r9INHHRC084742@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Fri, 18 Oct 2013 23:17:17 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43008 - head/en_US.ISO8859-1/books/handbook/ppp-and-slip
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Oct 2013 23:17:18 -0000

Author: dru
Date: Fri Oct 18 23:17:17 2013
New Revision: 43008
URL: http://svnweb.freebsd.org/changeset/doc/43008

Log:
  White space fix only. Translators can ignore.

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

Modified: head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Fri Oct 18 22:54:06 2013	(r43007)
+++ head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Fri Oct 18 23:17:17 2013	(r43008)
@@ -109,17 +109,16 @@
     <title>Configuring <acronym>PPP</acronym></title>
 
     <para>&os; provides built-in support for managing dial-up
-      <acronym>PPP</acronym> connections using &man.ppp.8;. The 
-      default &os; kernel provides support for 
-      <devicename>tun</devicename> which is used to interact with a 
+      <acronym>PPP</acronym> connections using &man.ppp.8;.  The
+      default &os; kernel provides support for
+      <devicename>tun</devicename> which is used to interact with a
       modem hardware.  Configuration is performed by editing at least
       one configuration file, and configuration files containing
       examples are provided.  Finally, <command>ppp</command> is
-      used to start and manage connections.</para> 
-      
-    <para>In order
-      to use a <acronym>PPP</acronym> connection, the following items
-      are needed:</para>
+      used to start and manage connections.</para>
+
+    <para>In order to use a <acronym>PPP</acronym> connection, the
+      following items are needed:</para>
 
     <itemizedlist>
       <listitem>
@@ -160,10 +159,10 @@
       <listitem>
 	<para>The <acronym>IP</acronym> address of the default
 	  gateway.  If this information is unknown, the
-	  <acronym>ISP</acronym> will automatically
-	  provide the correct value during connection setup.  When
-	  configuring <acronym>PPP</acronym> on &os;, this address is
-	  referred to as <literal>HISADDR</literal>.</para>
+	  <acronym>ISP</acronym> will automatically provide the
+	  correct value during connection setup.  When configuring
+	  <acronym>PPP</acronym> on &os;, this address is referred to
+	  as <literal>HISADDR</literal>.</para>
       </listitem>
 
       <listitem>
@@ -215,10 +214,9 @@
       </indexterm>
 
       <para>In order to configure a <acronym>PPP</acronym> connection,
-	first edit
-	<filename>/etc/ppp/ppp.conf</filename> with the dial-in
-	information for the <acronym>ISP</acronym>. This file is described
-	as follows:</para>
+	first edit <filename>/etc/ppp/ppp.conf</filename> with the
+	dial-in information for the <acronym>ISP</acronym>. This file
+	is described as follows:</para>
 
       <programlisting>1     default:
 2       set log Phase Chat LCP IPCP CCP tun command
@@ -398,33 +396,33 @@
 	    <varlistentry>
 	      <term>Line 16:</term>
 	      <listitem>
-		<para>Sets the interface addresses.  The values used 
+		<para>Sets the interface addresses.  The values used
 		  depend upon whether a static <acronym>IP</acronym>
 		  address has been obtained from the
 		  <acronym>ISP</acronym> or if it  instead negotiates
 		  a dynamic <acronym>IP</acronym> address during
-		  connection.</para>  
+		  connection.</para>
 
-		<para>If the 
-		  <acronym>ISP</acronym> has allocated a static
-		  <acronym>IP</acronym> address and default gateway, replace
-		  <replaceable>x.x.x.x</replaceable> with the static 
-		  <acronym>IP</acronym> address and replace
-		  <replaceable>y.y.y.y</replaceable> with the
-		  <acronym>IP</acronym> address of the
-		  default gateway.  If the <acronym>ISP</acronym> has
-		  only provided a static <acronym>IP</acronym> address
-		  without a gateway address, replace <replaceable>y.y.y.y</replaceable> with <hostid
+		<para>If the  <acronym>ISP</acronym> has allocated a
+		  static <acronym>IP</acronym> address and default
+		  gateway, replace <replaceable>x.x.x.x</replaceable>
+		  with the static  <acronym>IP</acronym> address and
+		  replace <replaceable>y.y.y.y</replaceable> with the
+		  <acronym>IP</acronym> address of the default
+		  gateway.  If the <acronym>ISP</acronym> has only
+		  provided a static <acronym>IP</acronym> address
+		  without a gateway address, replace
+		  <replaceable>y.y.y.y</replaceable> with <hostid
 		    role="netmask">10.0.0.2/0</hostid>.</para>
-		    
-	<para>If the <acronym>IP</acronym> address changes whenever
-	    a connection is made, change this line
-	    to the following value.
-	    This tells &man.ppp.8; to use the
-	    <acronym>IP</acronym> Configuration Protocol
-	    (<acronym>IPCP</acronym>) to negotiate a dynamic <acronym>IP</acronym> address:</para>
 
-	  <programlisting>set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.255 0.0.0.0</programlisting>	
+		<para>If the <acronym>IP</acronym> address changes
+		  whenever a connection is made, change this line to
+		  the following value.  This tells &man.ppp.8; to use
+		  the <acronym>IP</acronym> Configuration Protocol
+		  (<acronym>IPCP</acronym>) to negotiate a dynamic
+		  <acronym>IP</acronym> address:</para>
+
+	  <programlisting>set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.255 0.0.0.0</programlisting>
 
 	      </listitem>
 	    </varlistentry>
@@ -446,14 +444,15 @@
 	    manually or automatically, a
 	    <filename>/etc/ppp/ppp.linkup</filename> may also need to
 	    be created which contains the following lines.  This file
-	    is required when running <command>ppp</command>
-	    in <option>-auto</option> mode.  This file is
-	    used after the connection has been established.  At this
-	    point, the <acronym>IP</acronym> address will have been assigned
-	    and it is now be possible to add the
-	    routing table entries.  When creating this file, make sure that
+	    is required when running <command>ppp</command> in
+	    <option>-auto</option> mode.  This file is used after the
+	    connection has been established.  At this point, the
+	    <acronym>IP</acronym> address will have been assigned and
+	    it is now be possible to add the routing table entries.
+	    When creating this file, make sure that
 	    <replaceable>provider</replaceable> matches the value
-	    demonstrated in line 11 of <filename>ppp.conf</filename>.</para>
+	    demonstrated in line 11 of
+	    <filename>ppp.conf</filename>.</para>
 
 	  <programlisting>provider:
       add default HISADDR</programlisting>
@@ -467,7 +466,7 @@
 	  in <filename
 	    class="directory">/usr/share/examples/ppp/</filename>.</para>
     </sect2>
-    
+
     <?ignore
 	<sect2>
 	  <title>Receiving Incoming Calls</title>
@@ -477,47 +476,49 @@
 	    <secondary>receiving incoming calls</secondary>
 	  </indexterm>
 
-	  <para>When configuring &man.ppp.8; to
-	    receive incoming calls on a machine connected to a Local
-	    Area Network (<acronym>LAN</acronym>),
-	    decide if packets should be forwarded to the <acronym>LAN</acronym>.  If so,
-	    allocate the connecting system an <acronym>IP</acronym> address from
-	    the <acronym>LAN</acronym>'s subnet, and add the <command>enable
-	      proxy</command> line to
+	  <para>When configuring &man.ppp.8; to receive incoming calls
+	    on a machine connected to a Local Area Network
+	    (<acronym>LAN</acronym>), decide if packets should be
+	    forwarded to the <acronym>LAN</acronym>.  If so, allocate
+	    the connecting system an <acronym>IP</acronym> address
+	    from the <acronym>LAN</acronym>'s subnet, and add the
+	    <command>enable proxy</command> line to
 	    <filename>/etc/ppp/ppp.conf</filename>.
 	    Also, confirm that <filename>/etc/rc.conf</filename>
 	    contains the following line:</para>
 
 	  <programlisting>gateway_enable="YES"</programlisting>
-	  
-	  <para>Refer to &man.ppp.8; and 
+
+	  <para>Refer to &man.ppp.8; and
 	    <filename>/usr/share/examples/ppp/ppp.conf.sample</filename>
-	    for more details.  The following steps will also be required:</para>
-	    
-	    <procedure>
-	      <step>
-	    <para>Create an entry in <filename>/etc/passwd</filename>
-	      (using the &man.vipw.8; program).</para>
-	  </step>
-
-	  <step>
-	    <para>Create a profile in this users home directory that
-	      runs <command>ppp -direct direct-server</command> or
-	      similar.</para>
-	  </step>
-
-	  <step>
-	    <para>Create an entry in
-	      <filename>/etc/ppp/ppp.conf</filename>.  The
-	      <filename>direct-server</filename> example should
-	      suffice.</para>
-	  </step>
-
-	  <step>
-	    <para>Create an entry in
-	      <filename>/etc/ppp/ppp.linkup</filename>.</para>
-	  </step>
-	</procedure>
+	    for more details.  The following steps will also be
+	    required:</para>
+
+	  <procedure>
+	    <step>
+	      <para>Create an entry in
+		<filename>/etc/passwd</filename> (using the
+		&man.vipw.8; program).</para>
+	    </step>
+
+	    <step>
+	      <para>Create a profile in this users home directory that
+		runs <command>ppp -direct direct-server</command> or
+		similar.</para>
+	    </step>
+
+	    <step>
+	      <para>Create an entry in
+		<filename>/etc/ppp/ppp.conf</filename>.  The
+		<filename>direct-server</filename> example should
+		suffice.</para>
+	    </step>
+
+	    <step>
+	      <para>Create an entry in
+		<filename>/etc/ppp/ppp.linkup</filename>.</para>
+	    </step>
+	  </procedure>
 	</sect2>
 	?>
 
@@ -542,7 +543,7 @@
 	    <literal>default</literal> section, it gives the specified
 	    users access to everything.</para>
 	</sect2>
-<?ignore
+	<?ignore
 	<sect2>
 	  <title><acronym>PPP</acronym> Shells for Dynamic
 	    <acronym>IP</acronym> Users</title>
@@ -687,7 +688,7 @@ sam:
 mary:
   add 203.14.103.0 netmask 255.255.255.0 HISADDR</programlisting>
 	</sect2>
-?>
+	?>
 	<sect2 id="userppp-mgetty">
 	  <title><command>mgetty</command> and AutoPPP</title>
 
@@ -1057,8 +1058,8 @@ ifconfig_tun0=</programlisting>
 	  <filename>start_if.tun0</filename> does not exist,
 	  type:</para>
 
-	<screen>&prompt.root; <userinput>ppp -auto provider</userinput></screen>
-      </sect2>
+      <screen>&prompt.root; <userinput>ppp -auto provider</userinput></screen>
+    </sect2>
   </sect1>
 
   <sect1 id="ppp-troubleshoot">
@@ -1429,8 +1430,8 @@ ppp_profile="name_of_service_provider"</
   </sect1>
 
   <sect1 id="pppoa">
-    <title>Using <application>PPP</application> over <acronym>ATM</acronym>
-      (PPPoA)</title>
+    <title>Using <application>PPP</application> over
+      <acronym>ATM</acronym> (PPPoA)</title>
 
     <indexterm>
       <primary><acronym>PPP</acronym></primary>
@@ -1441,8 +1442,9 @@ ppp_profile="name_of_service_provider"</
       <primary>PPPoA</primary>
     </indexterm>
 
-    <para>The following describes how to set up PPP over <acronym>ATM</acronym> (PPPoA).
-      PPPoA is a popular choice among European DSL providers.</para>
+    <para>The following describes how to set up PPP over
+      <acronym>ATM</acronym> (PPPoA).  PPPoA is a popular choice among
+      European DSL providers.</para>
 <!--
 This port is broken as of June, 2009
     <sect2>

From owner-svn-doc-head@FreeBSD.ORG  Sat Oct 19 16:52:39 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id D1E70189;
 Sat, 19 Oct 2013 16:52:39 +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 BE9202460;
 Sat, 19 Oct 2013 16:52:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9JGqd0W061005;
 Sat, 19 Oct 2013 16:52:39 GMT (envelope-from pgj@svn.freebsd.org)
Received: (from pgj@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9JGqdm1061004;
 Sat, 19 Oct 2013 16:52:39 GMT (envelope-from pgj@svn.freebsd.org)
Message-Id: <201310191652.r9JGqdm1061004@svn.freebsd.org>
From: Gabor Pali <pgj@FreeBSD.org>
Date: Sat, 19 Oct 2013 16:52:39 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43009 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Oct 2013 16:52:39 -0000

Author: pgj
Date: Sat Oct 19 16:52:39 2013
New Revision: 43009
URL: http://svnweb.freebsd.org/changeset/doc/43009

Log:
  - Further improvements to the 2013Q3 report
  
  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	Fri Oct 18 23:17:17 2013	(r43008)
+++ head/en_US.ISO8859-1/htdocs/news/status/report-2013-07-2013-09.xml	Sat Oct 19 16:52:39 2013	(r43009)
@@ -96,11 +96,12 @@
     </links>
 
     <body>
-      <p>An enhancement to the AES-NI implementation for OpenCrypto has
-	been committed that significantly improves AES-XTS and AES-CBC
-	decryption performance.  This gives <tt>geli(8)</tt> around a
-	three times performance boost on <tt>gnop(8)</tt> using AES-XTS
-	compared to the old code.</p>
+      <p>An enhancement to the AES-NI implementation for OpenCrypto, the
+	kernel's cryptography framework, has been committed that
+	significantly improves AES-XTS and AES-CBC decryption
+	performance.  This gives <tt>geli(8)</tt> around a three times
+	performance boost on <tt>gnop(8)</tt> using AES-XTS compared to
+	the old code.</p>
 
       <p>These improvements are available to users of the OpenCrypto
 	framework and <tt>crypto(4)</tt>.</p>
@@ -206,13 +207,15 @@
 	Experiments have shown that applying only the above GEOM direct
 	dispatch changes burns up to 60% of system CPU time or even more
 	in attempts to obtain these locks by multiple callers, killing
-	any benefits of GEOM direct dispatch.  To overcome that, a new
-	fine-grained CAM locking design was implemented.  It implies
-	splitting the big per-SIM locks into several smaller ones:
-	per-LUN locks, per-bus locks, queue locks, etc.  After these
-	changes, the remaining per-SIM lock protects only the controller
-	driver internals, reducing lock congestion down to an acceptable
-	level and keeping compatibility with existing drivers.</p>
+	any benefits of GEOM direct dispatch.</p>
+	
+      <p>To overcome this scaling limitation, a new fine-grained CAM
+	locking design was implemented.  It implies splitting the big
+	per-SIM locks into several smaller ones: per-LUN locks, per-bus
+	locks, queue locks, etc.  After these changes, the remaining
+	per-SIM lock protects only the controller driver internals,
+	reducing lock congestion down to an acceptable level and keeping
+	compatibility with existing drivers.</p>
 
       <p>Together, the GEOM and CAM changes double the peak I/O rate,
 	reaching up to 1,000,000 IOPS on contemporary hardware.</p>
@@ -280,9 +283,11 @@
     </links>
 
     <body>
-      <p>The VirtIO network driver, <tt>vtnet(4)</tt>, recently gained
-	support for multiple queues, along with a significant cleanup
-	and support for a few additional features.</p>
+      <p>The VirtIO network driver, <tt>vtnet(4)</tt>, is used by &os;
+	systems running on hypervisors including <tt>bhyve(4)</tt> and
+	Linux's KVM.  It recently gained support for multiple queues,
+	along with a significant cleanup and support for a few
+	additional features.</p>
     </body>
   </project>
 
@@ -460,7 +465,7 @@
 	completed (see links).  Specifically:</p>
 
       <ul>
-	<li>A service which receives and serves download requests.  It
+	<li>A service that receives and serves download requests.  It
 	  samples download speeds from different mirrors and uses this
 	  information to pick the best mirror on the next request.  It
 	  can migrate jobs between mirrors if it realizes that a
@@ -737,8 +742,8 @@
 	report:</p>
 
       <ul>
-	<li>The <tt>pmap</tt> module has been adjusted to fully utilize
-	  superpages.</li>
+	<li>The <tt>pmap(9)</tt> module has been adjusted to fully
+	  utilize superpages.</li>
 
 	<li>Found and fixed minor bugs in superpage management.</li>
 
@@ -1234,6 +1239,13 @@
     </contact>
 
     <body>
+      <p>Capsicum is the &os; sandboxing subsystem, which presents
+	programmers with a capability module allowing fine-grained
+	delegation of rights to less-privileged processes.  Casper is a
+	friendly daemon that provides services to sandboxed processes,
+	allowing policy-based access to privileged services such as DNS
+	resolution.</p>
+
       <p>The work on Capsicum and related projects (such as Casper,
 	<tt>libnv</tt>, etc.) is progressing nicely.  An overhaul of the
 	<tt>cap_rights_t</tt> was committed to &os; <tt>head</tt> and
@@ -1299,7 +1311,8 @@
 	been made to the <tt>www/webkit-gtk3</tt> port, however it still
 	is rather fragile.</p>
 
-      <p>MATE is about ready to go in.</p>
+      <p>MATE, a desktop environment forked from the now-unmaintained
+	codebase of GNOME&nbsp;2, is about ready to go in.</p>
 
       <p>GNOME&nbsp;2 will be removed at some point in the near future.
 	How or when this will happen is not yet clear.</p>
@@ -1341,16 +1354,16 @@
     <body>
       <p>The &os; Documentation Project Primer had not changed at the
 	same rate as the documents themselves.  Some sections were
-	outdated and others were wordy and confusing, while information on
-	new changes to the documentation were not described at all.  In
-	July, Warren gave the entire FDP Primer a fairly intense edit
-	for simplicity and clarity.  Chapters and sections were moved
-	into a more logical order, and information was updated to be a
-	better guide to the current state.  Markup examples were added
-	and revised.  Style guidelines were also extended and updated.
-	The Primer is now far more consistent and usable.  As always,
-	there is still room for improvement, and additions or
-	corrections are encouraged.</p>
+	outdated and others were verbose and confusing, while
+	information on new changes to the documentation were not
+	described at all.  In July, Warren gave the entire FDP Primer a
+	fairly intense edit for simplicity and clarity.  Chapters and
+	sections were moved into a more logical order, and information
+	was updated to be a better guide to the current state.  Markup
+	examples were added and revised.  Style guidelines were also
+	extended and updated.  The Primer is now far more consistent and
+	usable.  As always, there is still room for improvement, and
+	additions or corrections are encouraged.</p>
     </body>
 
     <help>
@@ -1373,25 +1386,24 @@
     </contact>
 
     <body>
-      <p>There are some things going on with the &os;/sparc64 port
-	behind the scenes.</p>
+      <p>There are several things going on with the &os;/sparc64
+	port.</p>
 
-      <p>For one, after having fixed all remaining problems and starting
-	with 9.2-RELEASE, release bits for this architecture are
-	cross-built on the &os; Project cluster.  As one might already
-	have noticed, this means that from now on, sparc64 install sets
-	and images including those for ALPHA, BETA, and RC builds, are
-	already available alongside those for the other platforms
-	supported by &os;.  It also means that since August 2013,
-	automatically cross-built monthly &os;/sparc64 snapshots are
-	distributed via the official project mirrors.  Hopefully, this
-	can soon be extended further with <tt>freebsd-update(8)</tt>
-	support for sparc64.</p>
-
-      <p>Second, the X.Org ports have been fixed to work on sparc64 when
-	built with the <tt>WITH_NEW_XORG</tt> knob.  However, it still
-	needs to be evaluated whether the recently committed update to
-	Mesa 9.1.6 has introduced any breakage.</p>
+      <p>After having fixed all remaining problems and starting with
+	9.2-RELEASE, releases for this architecture are cross-built on
+	the &os; Project cluster.  As one might already have noticed,
+	this means that from now on, sparc64 install sets and images
+	including those for ALPHA, BETA, and RC builds, are available
+	alongside those for the other platforms supported by &os;.
+	Since August 2013, automatically cross-built monthly
+	&os;/sparc64 snapshots are distributed via the official project
+	mirrors.  Hopefully, this can soon be extended further with
+	<tt>freebsd-update(8)</tt> support for sparc64.</p>
+
+      <p>The X.Org ports have been fixed to work on sparc64 when built
+	with the <tt>WITH_NEW_XORG</tt> knob.  However, it still needs
+	to be evaluated whether the recently committed update to Mesa
+	9.1.6 has introduced any breakage.</p>
     </body>
   </project>
 
@@ -1425,9 +1437,11 @@
 	manipulating the infrastructure to modernize and update it, in
 	preperation for <tt>pkg(8)</tt> replacing the old
 	<tt>pkg_add(1)</tt> infrastructure, as well as preparing for
-	&os; with Clang as default compiler.</p>
+	&os;&nbsp;10.0 with Clang as default compiler, <tt>libc++</tt>
+	as the default C++ standard library, and <tt>iconv(1)</tt>
+	integrated into <tt>libc</tt>.</p>
 
-      <p>Automated procedures for Quality Assurance have been
+      <p>Automated procedures for quality assurance have been
 	implemented, notably <tt>pkg-fallout</tt>.  All porters are
 	encouraged to subscribe to the associated mailing list (see
 	links), and do their part to fix ports for <tt>pkg(8)</tt> and