From owner-svn-doc-projects@FreeBSD.ORG  Sun May 12 13:19:04 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id C47F3B21;
 Sun, 12 May 2013 13:19:04 +0000 (UTC) (envelope-from dru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B5E07B0F;
 Sun, 12 May 2013 13:19:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CDJ462011244;
 Sun, 12 May 2013 13:19:04 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CDJ4Z0011243;
 Sun, 12 May 2013 13:19:04 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201305121319.r4CDJ4Z0011243@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Sun, 12 May 2013 13:19:04 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41607 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 May 2013 13:19:04 -0000

Author: dru
Date: Sun May 12 13:19:04 2013
New Revision: 41607
URL: http://svnweb.freebsd.org/changeset/doc/41607

Log:
  This patch addresses the following:
  
  - you
  
  - missing acronym tags
  
  - replace command/app tags with entities
  
  - fix links
  
  - update some sample files
  
  - move sysctl.conf section until after sysctl to improve the flow
   of a topic not yet introduced
  
  A subsequent patch will fix white space.
  
  Approved by:  bcr (mentor)

Modified:
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config/chapter.xml

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config/chapter.xml	Sun May 12 10:42:44 2013	(r41606)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config/chapter.xml	Sun May 12 13:19:04 2013	(r41607)
@@ -73,7 +73,7 @@
       </listitem>
 
       <listitem>
-	<para>How to tune &os; using <command>sysctl</command>
+	<para>How to tune &os; using &man.sysctl.8;
 	  variables.</para>
       </listitem>
 
@@ -120,30 +120,31 @@
 
 	<para>When laying out file systems with &man.bsdlabel.8; or
 	  &man.sysinstall.8;, remember that hard drives transfer data
-	  faster from the outer tracks to the inner.  Thus smaller and
+	  faster from the outer tracks to the inner.  Thus, smaller and
 	  heavier-accessed file systems should be closer to the
 	  outside of the drive, while larger partitions like
 	  <filename class="directory">/usr</filename> should be placed
 	  toward the inner parts of the disk.  It is a good idea to
-	  create partitions in an order similar to: root, swap,
-	  <filename class="directory">/var</filename>,
+	  create partitions in an order similar to: <filename
+	    class="directory">/</filename>, swap,
+	  <filename class="directory">/var</filename>, and
 	  <filename class="directory">/usr</filename>.</para>
 
 	<para>The size of the
 	  <filename class="directory">/var</filename> partition
 	  reflects the intended machine's usage.  This partition
-	  <filename class="directory">/var</filename> is used to hold
+	  is used to hold
 	  mailboxes, log files, and printer spools.  Mailboxes and log
-	  files can grow to unexpected sizes depending on how many
-	  users exist and how long log files are kept.  Most users
+	  files can grow to unexpected sizes depending on the number of
+	  users and how long log files are kept.  On average, most users
 	  rarely need more than about a gigabyte of free disk space in
 	  <filename class="directory">/var</filename>.</para>
 
 	<note>
-	  <para>There are a few times that a lot of disk space is
+	  <para>Sometimes, a lot of disk space is
 	    required in
 	    <filename class="directory">/var/tmp</filename>.  When new
-	    software is installed with &man.pkg.add.1; the packaging
+	    software is installed with &man.pkg.add.1;, the packaging
 	    tools extract a temporary copy of the packages under
 	    <filename class="directory">/var/tmp</filename>.  Large
 	    software packages, like
@@ -166,8 +167,9 @@
 	  hassle.</para>
 
 	<note>
-	  <para>Some users have found that &man.sysinstall.8;'s
-	    <literal>Auto-defaults</literal> partition sizer will
+	  <para>The 
+	    <literal>Auto-defaults</literal> partition sizer used by
+	    &man.sysinstall.8; will
 	    sometimes select smaller than adequate
 	    <filename class="directory">/var</filename> and
 	    <filename class="directory">/</filename> partitions.
@@ -182,18 +184,24 @@
 	<indexterm><primary>swap partition</primary></indexterm>
 
 	<para>As a rule of thumb, the swap partition should be about
-	  double the size of physical memory (RAM) as the kernel's
-	  virtual memory (VM) paging algorithms are tuned to perform
+	  double the size of physical memory (<acronym>RAM</acronym>)
+	  as the kernel's
+	  virtual memory (<acronym>VM</acronym>) paging algorithms
+	  are tuned to perform
 	  best when the swap partition is at least two times
-	  the size of main memory.  Systems with minimal RAM may
+	  the size of main memory.  Systems with minimal
+	  <acronym>RAM</acronym> may
 	  perform better with more swap.  Configuring too little swap
-	  can lead to inefficiencies in the VM page scanning code and
+	  can lead to inefficiencies in the <acronym>VM</acronym>
+	  page scanning code and
 	  might create issues later if more memory is added.</para>
 
-	<para>On larger systems with multiple SCSI disks or multiple
-	  IDE disks operating on different controllers, it is
-	  recommended that swap be configured on each drive (up to
-	  four drives).  The swap partitions should be approximately
+	<para>On larger systems with multiple <acronym>SCSI</acronym>
+	  disks or multiple
+	  <acronym>IDE</acronym> disks operating on different
+	  controllers, it is
+	  recommended that swap be configured on each drive, up to
+	  four drives.  The swap partitions should be approximately
 	  the same size.  The kernel can handle arbitrary sizes but
 	  internal data structures scale to 4 times the largest swap
 	  partition.  Keeping the swap partitions near the same size
@@ -219,10 +227,10 @@
 
 	<para>By properly partitioning a system, fragmentation
 	  introduced in the smaller write heavy partitions will not
-	  bleed over into the mostly-read partitions.  Keeping the
-	  write-loaded partitions closer to the disk's edge, will
+	  bleed over into the mostly read partitions.  Keeping the
+	  write loaded partitions closer to the disk's edge will
 	  increase I/O performance in the partitions where it occurs
-	  the most.  Now while I/O performance in the larger
+	  the most.  While I/O performance in the larger
 	  partitions may be needed, shifting them more toward the edge
 	  of the disk will not lead to a significant performance
 	  improvement over moving
@@ -283,21 +291,20 @@ ifconfig_fxp0="inet 10.1.1.1/8"</program
       </listitem>
     </itemizedlist>
 
-    <para><filename>rc.conf</filename> can then be
-      distributed to every system using <command>rsync</command> or a
-      similar program, while <filename>rc.conf.local</filename>
+    <para>Distribute <filename>/etc/rc.conf</filename>
+      to every system using <command>rsync</command> or a
+      similar program, while <filename>/etc/rc.conf.local</filename>
       remains unique.</para>
 
     <para>Upgrading the system using &man.sysinstall.8; or
       <command>make world</command> will not overwrite
-      <filename>rc.conf</filename>, so system configuration
+      <filename>/etc/rc.conf</filename>, so system configuration
       information will not be lost.</para>
 
     <tip>
-      <para>The <filename>/etc/rc.conf</filename> configuration file
+      <para>The configuration in <filename>/etc/rc.conf</filename>
 	is parsed by &man.sh.1;.  This allows system operators to
-	add a certain amount of logic to this file, which may help to
-	create very complex configuration scenarios.  Refer to
+	create complex configuration scenarios.  Refer to
 	&man.rc.conf.5; for further information on this topic.</para>
     </tip>
   </sect1>
@@ -320,10 +327,11 @@ ifconfig_fxp0="inet 10.1.1.1/8"</program
 
     <para>Normally, when a port or package is installed, sample
       configuration files are also installed.  These are usually
-      identified with a <filename>.default</filename> suffix.  If
+      identified with a suffix such as <filename>.sample</filename>.
+      If
       there are no existing configuration files for the application,
-      they will be created by copying the
-      <filename>.default</filename> files.</para>
+      they can be created by copying the
+      sample files.</para>
 
     <para>For example, consider the contents of the directory
       <filename
@@ -378,8 +386,8 @@ ifconfig_fxp0="inet 10.1.1.1/8"</program
 
       <para>Now that &os; includes <filename>rc.d</filename>,
 	configuration of application startup is easier and provides
-	more features.  Using the key words discussed in the
-	<link linkend="configtuning-rcd">rc.d</link> section,
+	more features.  Using the key words discussed in
+	<xref linkend="configtuning-rcd"/>,
 	applications can be set to start after certain other services
 	and extra flags can be passed through
 	<filename>/etc/rc.conf</filename> in place of hard coded flags
@@ -411,47 +419,43 @@ pidfile=${utility_pidfile-"/var/run/util
 run_rc_command "$1"</programlisting>
 
       <para>This script will ensure that the provided
-	<application>utility</application> will be started after the
+	<literal>utility</literal> will be started after the
 	<literal>DAEMON</literal> pseudo-service.  It also provides a
-	method for setting and tracking the <acronym>PID</acronym>, or
-	process <acronym>ID</acronym> file.</para>
+	method for setting and tracking the process ID
+	(<acronym>PID</acronym>).</para>
 
       <para>This application could then have the following line placed
 	in <filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>utility_enable="YES"</programlisting>
 
-      <para>This method also allows for easier manipulation of the
+      <para>This method allows for easier manipulation of
 	command line arguments, inclusion of the default functions
 	provided in <filename>/etc/rc.subr</filename>, compatibility
-	with the &man.rcorder.8; utility and provides for easier
+	with &man.rcorder.8;, and provides for easier
 	configuration via <filename>rc.conf</filename>.</para>
     </sect2>
 
     <sect2>
       <title>Using Services to Start Services</title>
 
-      <para>Other services, such as the <acronym>POP</acronym>3 server
-	daemons or <acronym>IMAP</acronym>, could be started using
-	&man.inetd.8;.  This involves installing the service utility
-	from the Ports Collection with a configuration line added to
-	<filename>/etc/inetd.conf</filename>, or by
-	uncommenting one of the current configuration lines.  Working
-	with <application>inetd</application> and its configuration is
-	described in depth in the
-	<link linkend="network-inetd">inetd</link> section.</para>
-
-      <para>In some cases it may make more sense to use the
-	&man.cron.8; daemon to start system services.  This approach
-	has a number of advantages because <command>cron</command>
-	runs these processes as the <filename>crontab</filename>'s
-	file owner.  This allows regular users to start and maintain
-	some applications.</para>
-
-      <para>The <command>cron</command> utility provides a unique
-	feature, <literal>@reboot</literal>, which may be used in
-	place of the time specification.  This will cause the job to
-	be run when &man.cron.8; is started, normally during system
+      <para>Other services can be started using
+	&man.inetd.8;.  Working
+	with &man.inetd.8; and its configuration is
+	described in depth in
+	<xref linkend="network-inetd"/>.</para>
+
+      <para>In some cases, it may make more sense to use
+	&man.cron.8; to start system services.  This approach
+	has a number of advantages as &man.cron.8;
+	runs these processes as the owner of the &man.crontab.5;.
+	This allows regular users to start and maintain their own
+	applications.</para>
+
+      <para>The <literal>@reboot</literal> feature of &man.cron.8;,
+	may be used in
+	place of the time specification.  This causes the job to
+	run when &man.cron.8; is started, normally during system
 	initialization.</para>
     </sect2>
   </sect1>
@@ -467,7 +471,7 @@ run_rc_command "$1"</programlisting>
 	</author>
       </authorgroup>
     </sect1info>
-    <title>Configuring the <command>cron</command> Utility</title>
+    <title>Configuring &man.cron.8;</title>
 
     <indexterm><primary>cron</primary>
       <secondary>configuration</secondary></indexterm>
@@ -477,15 +481,15 @@ run_rc_command "$1"</programlisting>
       <filename>/etc/crontab</filename> for tasks to execute and
       searches
       <filename class="directory">/var/cron/tabs</filename> for custom
-      <filename>crontab</filename> files.  These files store
+      &man.crontab.5; files.  These files store
       information about specific functions which
-      <command>cron</command> is supposed to perform at certain
+      &man.cron.8; is supposed to perform at certain
       times.</para>
 
-    <para>The <command>cron</command> utility uses two different types
-      of configuration files, the system crontab and user crontabs.
+    <para>Two different types of configuration files are used by
+      &man.cron.8;: the system crontab and user crontabs.
       These formats only differ in the sixth field and later.  In the
-      system crontab, <command>cron</command> will run the command as
+      system crontab, &man.cron.8; runs the command as
       the user specified in the sixth field.  In a user crontab, all
       commands run as the user who created the crontab, so the sixth
       field is the last field; this is an important security feature.
@@ -499,29 +503,27 @@ run_rc_command "$1"</programlisting>
 
       <para>The <username>root</username> user can have a user crontab
 	just like any other user.  The <username>root</username> user
-	crontab is separate from <filename>/etc/crontab</filename>
-	(the system crontab).  Because the system crontab effectively
-	invokes the specified commands as root there is usually no
+	crontab is separate from the system crontab,
+	<filename>/etc/crontab</filename>.
+	Because the system crontab
+	invokes the specified commands as <username>root</username>,
+	there is usually no
 	need to create a user crontab for
 	<username>root</username>.</para>
     </note>
 
-    <para>Let us take a look at <filename>/etc/crontab</filename>,
-      the system crontab:</para>
+    <para>Here is a sample entry from <filename>/etc/crontab</filename>:</para>
 
-    <programlisting># /etc/crontab - root's crontab for &os;
+    <programlisting># /etc/crontab - root's crontab for FreeBSD
 #
-# &dollar;&os;: src/etc/crontab,v 1.32 2002/11/22 16:13:39 tom Exp &dollar;
+# $FreeBSD$
 # <co id="co-comments"/>
 #
 SHELL=/bin/sh
 PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin <co id="co-env"/>
-HOME=/var/log
-#
 #
 #minute	hour	mday	month	wday	who	command <co id="co-field-descr"/>
 #
-#
 */5	*	*	*	*	root	/usr/libexec/atrun <co id="co-main"/></programlisting>
 
     <calloutlist>
@@ -536,52 +538,51 @@ HOME=/var/log
       </callout>
 
       <callout arearefs="co-env">
-	<para>First, the environment must be defined.  The equals
+	<para>The equals
 	  (<literal>=</literal>) character is used to define any
-	  environment settings, as with this example where it is used
-	  for the <envar>SHELL</envar>, <envar>PATH</envar>, and
-	  <envar>HOME</envar> options.  If the shell line is omitted,
-	  <command>cron</command> will use the default, which is
-	  <command>sh</command>.  If the <envar>PATH</envar> variable
+	  environment settings.  In this example, it is used to define
+	  the <envar>SHELL</envar> and <envar>PATH</envar>.
+	  If the <envar>SHELL</envar> is omitted,
+	  &man.cron.8; will use the default of
+	  &man.sh.1;.  If the <envar>PATH</envar>
 	  is omitted, no default will be used and file locations will
-	  need to be absolute.  If <envar>HOME</envar> is omitted,
-	  <command>cron</command> will use the invoking users home
-	  directory.</para>
+	  need to be absolute.</para>
       </callout>
 
       <callout arearefs="co-field-descr">
-	<para>This line defines a total of seven fields.  Listed here
-	  are the values <literal>minute</literal>,
+	<para>This line defines a total of seven fields:
+	  <literal>minute</literal>,
 	  <literal>hour</literal>, <literal>mday</literal>,
 	  <literal>month</literal>, <literal>wday</literal>,
 	  <literal>who</literal>, and <literal>command</literal>.
 	  These are almost all self explanatory.
-	  <literal>minute</literal> is the time in minutes the command
-	  will be run.  <literal>hour</literal> is similar to the
-	  <literal>minute</literal> option, just in hours.
-	  <literal>mday</literal> stands for day of the month.
-	  <literal>month</literal> is similar to
-	  <literal>hour</literal> and <literal>minute</literal>, as it
+	  <literal>minute</literal> is the time in minutes when the
+	  specified command
+	  will be run.  <literal>hour</literal> is the hour when
+	  the specified command will be run.
+	  <literal>mday</literal> stands for day of the month and
+	  <literal>month</literal>
 	  designates the month.  The <literal>wday</literal> option
-	  stands for day of the week.  All these fields must be
-	  numeric values, and follow the twenty-four hour clock.  The
-	  <literal>who</literal> field is special, and only exists in
-	  <filename>/etc/crontab</filename>.  This field specifies
+	  stands for day of the week.  These fields must be
+	  numeric values, representing the twenty-four hour clock,
+	  or a <literal>*</literal>, representing all values for that
+	  field.  The
+	  <literal>who</literal> field only exists in the system
+	  crontab.  This field specifies
 	  which user the command should be run as.  The last field is
 	  the command to be executed.</para>
       </callout>
 
       <callout arearefs="co-main">
-	<para>This last line will define the values discussed above.
+	<para>This last line defines the values discussed above.
 	  This example has a <literal>*/5</literal> listing,followed
 	  by several more <literal>*</literal> characters.  These
 	  <literal>*</literal> characters mean
 	  <quote>first-last</quote>, and can be interpreted as
 	  <emphasis>every</emphasis> time.  In this example,
-	  <command>atrun</command> is invoked by
-	  <username>root</username> every five minutes regardless of
-	  the day or month.  For more information on
-	  <command>atrun</command>, refer to &man.atrun.8;.</para>
+	  &man.atrun.8; is invoked by
+	  <username>root</username> every five minutes, regardless of
+	  the day or month.</para>
 
 	<para>Commands can have any number of flags passed to them;
 	  however, commands which extend to multiple lines need to be
@@ -591,11 +592,10 @@ HOME=/var/log
     </calloutlist>
 
     <para>This is the basic setup for every
-      <filename>crontab</filename>, although there is one thing
-      different about this one.  Field number six, which specifies
+      &man.crontab.5;.  However, field number six, which specifies
       the username, only exists in the system
-      <filename>crontab</filename>.  This field should be omitted for
-      individual user <filename>crontab</filename> files.</para>
+      &man.crontab.5;.  This field should be omitted for
+      individual user &man.crontab.5; files.</para>
 
     <sect2 id="configtuning-installcrontab">
       <title>Installing a Crontab</title>
@@ -604,7 +604,7 @@ HOME=/var/log
 	<para>Do not use the procedure described here to edit and
 	  install the system crontab,
 	  <filename>/etc/crontab</filename>.  Instead, use an
-	  editor: <command>cron</command> will notice that the file
+	  editor and &man.cron.8; will notice that the file
 	  has changed and immediately begin using the updated version.
 	  See <ulink
 	    url="&url.books.faq;/admin.html#root-not-found-cron-errors">
@@ -612,27 +612,27 @@ HOME=/var/log
       </important>
 
       <para>To install a freshly written user
-	<filename>crontab</filename>, first use an editor to create
+	&man.crontab.5;, use an editor to create
 	and save a file in the proper format.  Then, specify the file
-	name with <command>crontab</command>:</para>
+	name with &man.crontab.1;:</para>
 
       <screen>&prompt.user; <userinput>crontab crontab-file</userinput></screen>
 
       <para>In this example, <filename>crontab-file</filename> is the
-	filename of a <filename>crontab</filename> that was previously
+	filename of a &man.crontab.5; that was previously
 	created.</para>
 
-      <para>To list installed <filename>crontab</filename> files, pass
-	<option>-l</option> to <command>crontab</command>.</para>
+      <para>To list installed &man.crontab.5; files, pass
+	<option>-l</option> to &man.crontab.1;.</para>
 
-      <para>For users who wish to begin their own crontab file from
-	scratch, without the use of a template, the
-	<command>crontab -e</command> option is available.  This will
-	invoke the selected editor with an empty file.  When the file
+      <para>Users who wish to begin their own crontab file from
+	scratch, without the use of a template, can use
+	<command>crontab -e</command>.  This will
+	invoke the default editor with an empty file.  When the file
 	is saved, it will be automatically installed by
-	<command>crontab</command>.</para>
+	&man.crontab.1;.</para>
 
-      <para>In order to remove a user <filename>crontab</filename>
+      <para>In order to remove a user &man.crontab.5;
 	completely, use <command>crontab -r</command>.</para>
     </sect2>
   </sect1>
@@ -651,105 +651,112 @@ HOME=/var/log
 
     <title>Using &man.rc.8; Under &os;</title>
 
-    <para>In 2002 &os; integrated the NetBSD <filename>rc.d</filename>
-      system for system initialization.  Users should notice the files
-      listed in the <filename class="directory">/etc/rc.d</filename>
-      directory.  Many of these files are for basic services which can
+    <para>In 2002, &os; integrated the NetBSD &man.rc.8;
+      system for system initialization.  The files
+      listed in <filename class="directory">/etc/rc.d</filename>
+      provide basic services which can
       be controlled with the <option>start</option>,
-      <option>stop</option>, and <option>restart</option> options.
+      <option>stop</option>, and <option>restart</option> options
+      to &man.service.8;.
       For instance, &man.sshd.8; can be restarted with the following
       command:</para>
 
     <screen>&prompt.root; <userinput>service sshd restart</userinput></screen>
 
-    <para>This procedure is similar for other services.  Of course,
-      services are usually started automatically at boot time as
-      specified in &man.rc.conf.5;.  For example, enabling the Network
-      Address Translation daemon at startup is as simple as adding the
+    <para>This procedure can be used to start services on a running
+      system.
+      Services will be started automatically at boot time as
+      specified in &man.rc.conf.5;.  For example, to enable &man.natd.8;
+      at system startup, add the
       following line to <filename>/etc/rc.conf</filename>:</para>
 
     <programlisting>natd_enable="YES"</programlisting>
 
     <para>If a <option>natd_enable="NO"</option> line is already
-      present, then simply change the <option>NO</option> to
-      <option>YES</option>.  The rc scripts will automatically load
-      any other dependent services during the next reboot, as
+      present, change the <literal>NO</literal> to
+      <literal>YES</literal>.  The &man.rc.8; scripts will
+      automatically load
+      any dependent services during the next boot, as
       described below.</para>
 
-    <para>Since the <filename>rc.d</filename> system is primarily
-      intended to start/stop services at system startup/shutdown time,
-      the standard <option>start</option>, <option>stop</option> and
+    <para>Since the &man.rc.8; system is primarily
+      intended to start and stop services at system startup and
+      shutdown time,
+      the <option>start</option>, <option>stop</option> and
       <option>restart</option> options will only perform their action
-      if the appropriate <filename>/etc/rc.conf</filename> variables
-      are set.  For instance, <command>sshd restart</command> will
+      if the appropriate <filename>/etc/rc.conf</filename> variable
+      is set.  For instance, <command>sshd restart</command> will
       only work if <varname>sshd_enable</varname> is set to
       <option>YES</option> in <filename>/etc/rc.conf</filename>.
       To <option>start</option>, <option>stop</option> or
       <option>restart</option> a service regardless of the settings in
-      <filename>/etc/rc.conf</filename>, the commands should be
+      <filename>/etc/rc.conf</filename>, these commands should be
       prefixed with <quote>one</quote>.  For instance, to restart
-      <command>sshd</command> regardless of the current
+      &man.sshd.8; regardless of the current
       <filename>/etc/rc.conf</filename> setting, execute the following
       command:</para>
 
     <screen>&prompt.root; <userinput>service sshd onerestart</userinput></screen>
 
-    <para>It is easy to check if a service is enabled in
-      <filename>/etc/rc.conf</filename> by running the appropriate
-      <filename>rc.d</filename> script with the option
-      <option>rcvar</option>.  Thus, an administrator can check that
-      <command>sshd</command> is in fact enabled in
-      <filename>/etc/rc.conf</filename> by running:</para>
+    <para>To check if a service is enabled in
+      <filename>/etc/rc.conf</filename>, run the appropriate
+      &man.rc.8; script with
+      <option>rcvar</option>.  This example checks to see if
+      &man.sshd.8; is enabled in
+      <filename>/etc/rc.conf</filename>:</para>
 
     <screen>&prompt.root; <userinput>service sshd rcvar</userinput>
 # sshd
 $sshd_enable=YES</screen>
 
     <note>
-      <para>The second line (<literal># sshd</literal>) is the output
-	from <command>sshd</command>, not a
+      <para>The <literal># sshd</literal> line is output from the
+	above command,
+	not a
 	<username>root</username> console.</para>
     </note>
 
     <para>To determine whether or not a service is running, use
       <option>status</option>.  For instance, to verify that
-      <command>sshd</command> is running:</para>
+      &man.sshd.8; is running:</para>
 
     <screen>&prompt.root; <userinput>service sshd status</userinput>
 sshd is running as pid 433.</screen>
 
-    <para>In some cases it is also possible to <option>reload</option>
-      a service.  This will attempt to send a signal to an individual
+    <para>In some cases, it is also possible to <option>reload</option>
+      a service.  This attempts to send a signal to an individual
       service, forcing the service to reload its configuration files.
-      In most cases this means sending the service a
+      In most cases, this means sending the service a
       <literal>SIGHUP</literal> signal.  Support for this feature is
       not included for every service.</para>
 
-    <para>The <filename>rc.d</filename> system is not only used for
-      network services, it also contributes to most of the system
+    <para>The &man.rc.8; system is used for
+      network services and it also contributes to most of the system
       initialization.  For instance, when the
-      <filename>bgfsck</filename> script is executed, it will print
+      <filename>/etc/rc.d/bgfsck</filename> script is executed, it
+      prints
       out the following message:</para>
 
     <screen>Starting background file system checks in 60 seconds.</screen>
 
-    <para>Therefore this file is used for background file system
-      checks, which are done only during system initialization.</para>
+    <para>This script is used for background file system
+      checks, which occur only during system initialization.</para>
 
     <para>Many system services depend on other services to function
-      properly.  For example, NIS and other RPC-based services may
-      fail to start until after the <command>rpcbind</command>
-      (portmapper) service has started.  To resolve this issue,
+      properly.  For example, &man.yp.8; and other
+      <acronym>RPC</acronym>-based services may
+      fail to start until after the &man.rpcbind.8;
+      service has started.  To resolve this issue,
       information about dependencies and other meta-data is included
       in the comments at the top of each startup script.  The
-      &man.rcorder.8; program is then used to parse these comments
+      &man.rcorder.8; program is used to parse these comments
       during system initialization to determine the order in which
       system services should be invoked to satisfy the
       dependencies.</para>
 
-    <para>The following words must be included in all startup scripts
-      (they are required by &man.rc.subr.8; to <quote>enable</quote>
-      the startup script):</para>
+    <para>The following key word must be included in all startup scripts
+      as it is required by &man.rc.subr.8; to <quote>enable</quote>
+      the startup script:</para>
 
     <itemizedlist>
       <listitem>
@@ -758,34 +765,36 @@ sshd is running as pid 433.</screen>
       </listitem>
     </itemizedlist>
 
-    <para>The following words may be included at the top of each
-      startup file.  They are not strictly necessary, but they are
+    <para>The following key words may be included at the top of each
+      startup script.  They are not strictly necessary, but are
       useful as hints to &man.rcorder.8;:</para>
 
     <itemizedlist>
       <listitem>
 	<para><literal>REQUIRE</literal>: Lists services which are
-	  required for this service.  This file will run
+	  required for this service.  The script containing this key
+	  word will run
 	  <emphasis>after</emphasis> the specified services.</para>
       </listitem>
 
       <listitem>
 	<para><literal>BEFORE</literal>: Lists services which depend
-	  on this service.  This file will run
+	  on this service.  The script containing this key word will
+	  run
 	  <emphasis>before</emphasis> the specified services.</para>
       </listitem>
     </itemizedlist>
 
     <para>By carefully setting these keywords for each startup script,
-      an administrator has a very fine-grained level of control of the
-      startup order of the scripts, without the hassle of
-      <quote>runlevels</quote> like some other &unix; operating
+      an administrator has a fine-grained level of control of the
+      startup order of the scripts, without the need for
+      <quote>runlevels</quote> used by some &unix; operating
       systems.</para>
 
-    <para>Additional information about the <filename>rc.d</filename>
-      system can be found in &man.rc.8; and &man.rc.subr.8;.  Refer to
+    <para>Additional information
+      can be found in &man.rc.8; and &man.rc.subr.8;.  Refer to
       <ulink url="&url.articles.rc-scripting">this article</ulink> for
-      instructions on how to create custom <filename>rc.d</filename>
+      instructions on how to create custom &man.rc.8;
       scripts.</para>
   </sect1>
 
@@ -808,7 +817,8 @@ sshd is running as pid 433.</screen>
       <secondary>configuration</secondary>
     </indexterm>
 
-    <para>Adding and configuring a network card is a common task for
+    <para>Adding and configuring a network interface card
+      (<acronym>NIC</acronym>)  is a common task for
       any &os; administrator.</para>
 
     <sect2>
@@ -819,24 +829,31 @@ sshd is running as pid 433.</screen>
 	<secondary>driver</secondary>
       </indexterm>
 
-      <para>First, determine the model of the network interface card
-	and the chip it uses.  &os; supports a wide variety of network
-	interface cards.  Check the Hardware Compatibility List for
-	the &os; release to see if the card is supported.</para>
-
-      <para>If the card is supported, determine the name of the &os;
-	driver for the card.  Refer to
+      <para>First, determine the model of the <acronym>NIC</acronym>
+	and the chip it uses.  &os; supports a wide variety of
+	<acronym>NIC</acronym>s.  Check the Hardware Compatibility
+	List for
+	the &os; release to see if the <acronym>NIC</acronym> is
+	supported.</para>
+
+      <para>If the <acronym>NIC</acronym> is supported, determine
+	the name of the &os;
+	driver for the <acronym>NIC</acronym>.  Refer to
 	<filename>/usr/src/sys/conf/NOTES</filename> and
 	<filename>/usr/src/sys/<replaceable>arch</replaceable>/conf/NOTES</filename>
-	for the list of network interface drivers with some
+	for the list of <acronym>NIC</acronym> drivers with some
 	information about the supported chipsets.  When in doubt, read
 	the manual page of the driver as it will provide more
 	information about the supported hardware and any known
 	limitations of the driver.</para>
 
-      <para>The drivers for common network cards are already present
-	in the <filename>GENERIC</filename> kernel, meaning the card
-	should show up during boot, as in this example:</para>
+      <para>The drivers for common <acronym>NIC</acronym>s are
+	already present
+	in the <filename>GENERIC</filename> kernel, meaning the
+	<acronym>NIC</acronym>
+	should show up during boot.  In this example, two
+	<acronym>NIC</acronym>s using
+	the &man.dc.4; driver are present on the system:</para>
 
       <screen>dc0: &lt;82c169 PNIC 10/100BaseTX&gt; port 0xa000-0xa0ff mem 0xd3800000-0xd38
 000ff irq 15 at device 11.0 on pci0
@@ -853,52 +870,51 @@ bmtphy1:  10baseT, 10baseT-FDX, 100baseT
 dc1: Ethernet address: 00:a0:cc:da:da:db
 dc1: [ITHREAD]</screen>
 
-      <para>In this example, two cards using the &man.dc.4; driver are
-	present on the system.</para>
-
-      <para>If the driver for the interface is not present in
+      <para>If the driver for the <acronym>NIC</acronym> is not
+	present in
 	<filename>GENERIC</filename>, but a driver is available, the
-	driver will need to be loaded before the interface can be
+	driver will need to be loaded before the
+	<acronym>NIC</acronym> can be
 	configured and used.  This may be accomplished in one of two
 	ways:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>The easiest way is to load a kernel module for the
-	    network card with &man.kldload.8;.  To also automatically
+	    <acronym>NIC</acronym> using &man.kldload.8;.  To also
+	    automatically
 	    load the driver at boot time, add the appropriate line to
-	    <filename>/boot/loader.conf</filename>.  Not all NIC
-	    drivers are available as modules; notable examples of
-	    devices for which modules do not exist are ISA
-	    cards.</para>
+	    <filename>/boot/loader.conf</filename>.  Not all
+	    <acronym>NIC</acronym>
+	    drivers are available as modules.</para>
 	</listitem>
 
 	<listitem>
-	  <para>Alternatively, statically compile support for the card
+	  <para>Alternatively, statically compile support for the
+	    <acronym>NIC</acronym>
 	    into a custom kernel.  Refer to
 	    <filename>/usr/src/sys/conf/NOTES</filename>,
 	    <filename>/usr/src/sys/<replaceable>arch</replaceable>/conf/NOTES</filename>
 	    and the manual page of the driver to determine which line
 	    to add to the custom kernel configuration file.  For more
 	    information about recompiling the kernel, refer to
-	    <xref linkend="kernelconfig"/>.  If the card was detected
+	    <xref linkend="kernelconfig"/>.  If the
+	    <acronym>NIC</acronym> was detected
 	    at boot, the kernel does not need to be recompiled.</para>
 	</listitem>
       </itemizedlist>
 
       <sect3 id="config-network-ndis">
-	<title>Using &windows; NDIS Drivers</title>
+	<title>Using &windows; <acronym>NDIS</acronym> Drivers</title>
 
-	<indexterm><primary>NDIS</primary></indexterm>
+	<indexterm><primary><acronym>NDIS</acronym></primary></indexterm>
 	<indexterm><primary>NDISulator</primary></indexterm>
 	<indexterm><primary>&windows; drivers</primary></indexterm>
-	<indexterm><primary>Microsoft Windows</primary></indexterm>
-	<indexterm>
-	  <primary>Microsoft Windows</primary>
-	  <secondary>device drivers</secondary>
+	<indexterm><primary>&microsoft.windows;</primary></indexterm>
+	<indexterm><secondary>device drivers</secondary>
 	</indexterm>
 	<indexterm>
-	  <primary>KLD (kernel loadable object)</primary>
+	  <primary><acronym>KLD</acronym> (kernel loadable object)</primary>
 	</indexterm>
 <!-- We should probably omit the expanded name, and add a <see> entry
 for it.  Whatever is done must also be done to the same indexterm in
@@ -908,43 +924,48 @@ linuxemu/chapter.xml -->
 	  provide schematics for their drivers to the open source
 	  community because they regard such information as trade
 	  secrets.  Consequently, the developers of &os; and other
-	  operating systems are left two choices: develop the drivers
+	  operating systems are left with two choices: develop the
+	  drivers
 	  by a long and pain-staking process of reverse engineering or
-	  using the existing driver binaries available for the
-	  &microsoft.windows; platforms.  Most developers, including
-	  those involved with &os;, have taken the latter
-	  approach.</para>
-
-	<para>Thanks to the contributions of Bill Paul (wpaul) there
-	  is <quote>native</quote> support for the Network Driver
-	  Interface Specification (NDIS).  The &os; NDISulator
-	  (otherwise known as Project Evil) takes a &windows; driver
-	  binary and basically tricks it into thinking it is running
-	  on &windows;.  Because the &man.ndis.4; driver is using a
-	  &windows; binary, it only runs on &i386; and amd64 systems.
-	  PCI, CardBus, PCMCIA (PC-Card), and USB devices are
+	  using the existing driver binaries available for
+	  &microsoft.windows; platforms.</para>
+
+	<para>&os; provides
+	  <quote>native</quote> support for the Network Driver
+	    Interface Specification (<acronym>NDIS</acronym>).  It
+	  includes
+	  &man.ndisgen.8; which can be used to
+	  convert a &windowsxp; driver
+	  into a format that can be used on &os;.
+	  Because the &man.ndis.4; driver uses a
+	  &windowsxp; binary, it only runs on &i386; and amd64 systems.
+	  <acronym>PCI</acronym>, CardBus, <acronym>PCMCIA</acronym>,
+	  and <acronym>USB</acronym> devices are
 	  supported.</para>
 
-	<para>To use the NDISulator, three things are needed:</para>
+	<para>To use &man.ndisgen.8;, three things are needed:</para>
 
 	<orderedlist>
 	  <listitem>
-	    <para>Kernel sources</para>
+	    <para>&os; kernel sources.</para>
 	  </listitem>
 
 	  <listitem>
-	    <para>&windowsxp; driver binary
-	      (<filename>.SYS</filename> extension)</para>
+	    <para>A &windowsxp; driver binary with a
+	      <filename>.SYS</filename> extension.</para>
 	  </listitem>
 
 	  <listitem>
-	    <para>&windowsxp; driver configuration file
-	      (<filename>.INF</filename> extension)</para>
+	    <para>A &windowsxp; driver configuration file with a
+	      <filename>.INF</filename> extension.</para>
 	  </listitem>
 	</orderedlist>
 
-	<para>Locate the files for the specific card.  Generally,
-	  they can be found on the included CDs or at the vendor's
+	<para>Download the <filename>.SYS</filename> and
+	  <filename>.INF</filename> files for the specific
+	  <acronym>NIC</acronym>.
+	  Generally,
+	  these can be found on the driver CD or at the vendor's
 	  website.  The following examples use
 	  <filename>W32DRIVER.SYS</filename> and
 	  <filename>W32DRIVER.INF</filename>.</para>
@@ -959,8 +980,9 @@ linuxemu/chapter.xml -->
 
 	<screen>&prompt.root; <userinput>ndisgen <replaceable>/path/to/W32DRIVER.INF</replaceable> <replaceable>/path/to/W32DRIVER.SYS</replaceable></userinput></screen>
 
-	<para>&man.ndisgen.8; is interactive and prompts for any extra
-	  information it requires.  A new kernel module is written in
+	<para>This command is interactive and prompts for any extra
+	  information it requires.  A new kernel module will be
+	  generated in
 	  the current directory.  Use &man.kldload.8; to load the new
 	  module:</para>
 
@@ -976,12 +998,13 @@ linuxemu/chapter.xml -->
 	<screen>&prompt.root; <userinput>kldload ndis</userinput>
 &prompt.root; <userinput>kldload if_ndis</userinput></screen>
 
-	<para>The first command loads the NDIS miniport driver
-	  wrapper, the second loads the actual network
-	  interface.</para>
+	<para>The first command loads the &man.ndis.4;
+	  miniport driver
+	  wrapper and the second loads the generated <acronym>NIC</acronym>
+	  driver.</para>
 
-	<para>Now, check &man.dmesg.8; to see if there were any errors
-	  loading.  If all went well, the output should be similar to
+	<para>Check &man.dmesg.8; to see if there were any load errors.
+	  If all went well, the output should be similar to
 	  the following:</para>
 
 	<screen>ndis0: &lt;Wireless-G PCI Adapter&gt; mem 0xf4100000-0xf4101fff irq 3 at device 8.0 on pci1
@@ -990,14 +1013,14 @@ ndis0: Ethernet address: 0a:b1:2c:d3:4e:
 ndis0: 11b rates: 1Mbps 2Mbps 5.5Mbps 11Mbps
 ndis0: 11g rates: 6Mbps 9Mbps 12Mbps 18Mbps 36Mbps 48Mbps 54Mbps</screen>
 
-	<para>From here you can treat the
-	  <devicename>ndis0</devicename> device like any other network
-	  interface (e.g., <devicename>dc0</devicename>).</para>
+	<para>From here,
+	  <devicename>ndis0</devicename> can be configured like any other
+	  <acronym>NIC</acronym>.</para>
 
-	<para>To configure the system to load the NDIS modules at
+	<para>To configure the system to load the &man.ndis.4; modules at
 	  boot time, copy the generated module,
-	  <filename>W32DRIVER_SYS.ko</filename>, to the <filename
-	  class="directory">/boot/modules</filename> directory.  Then,
+	  <filename>W32DRIVER_SYS.ko</filename>, to <filename
+	  class="directory">/boot/modules</filename>.  Then,
 	  add the following line to
 	  <filename>/boot/loader.conf</filename>:</para>
 
@@ -1013,12 +1036,13 @@ ndis0: 11g rates: 6Mbps 9Mbps 12Mbps 18M
 	<secondary>configuration</secondary>
       </indexterm>
 
-      <para>Once the right driver is loaded for the network card, the
-	card needs to be configured.  As with many other things, the
-	network card may have been configured at installation time by
-	<application>sysinstall</application>.</para>
+      <para>Once the right driver is loaded for the
+	<acronym>NIC</acronym>, the
+	card needs to be configured.  It
+	may have been configured at installation time by
+	&man.sysinstall.8;.</para>
 
-      <para>To display the configuration for the network interfaces,
+      <para>To display the <acronym>NIC</acronym> configuration,
 	enter the following command:</para>
 
       <screen>&prompt.user; <userinput>ifconfig</userinput>
@@ -1047,27 +1071,29 @@ lo0: flags=8049&lt;UP,LOOPBACK,RUNNING,M
       <itemizedlist>
 	<listitem>
 	  <para><devicename>dc0</devicename>: The first Ethernet
-	    interface</para>
+	    interface.</para>
 	</listitem>
 
 	<listitem>
 	  <para><devicename>dc1</devicename>: The second Ethernet
-	    interface</para>
+	    interface.</para>
 	</listitem>
 
 	<listitem>
 	  <para><devicename>lo0</devicename>: The loopback
-	    device</para>
+	    device.</para>
 	</listitem>
       </itemizedlist>
 
       <para>&os; uses the driver name followed by the order in which
-	one the card is detected at the kernel boot to name the
-	network card.  For example <devicename>sis2</devicename> would
-	be the third network card on the system using the &man.sis.4;
+	the card is detected at boot to name the
+	<acronym>NIC</acronym>.  For example,
+	<devicename>sis2</devicename> is
+	the third <acronym>NIC</acronym> on the system using the
+	&man.sis.4;
 	driver.</para>
 
-      <para>In this example, the <devicename>dc0</devicename> device
+      <para>In this example, <devicename>dc0</devicename>
 	is up and running.  The key indicators are:</para>
 
       <orderedlist>
@@ -1078,32 +1104,33 @@ lo0: flags=8049&lt;UP,LOOPBACK,RUNNING,M
 
 	<listitem>
 	  <para>The card has an Internet (<literal>inet</literal>)
-	    address (in this case
-	    <hostid role="ipaddr">192.168.1.3</hostid>).</para>
+	    address,
+	    <hostid role="ipaddr">192.168.1.3</hostid>.</para>
 	</listitem>
 
 	<listitem>
 	  <para>It has a valid subnet mask
-	    (<literal>netmask</literal>;
+	    (<literal>netmask</literal>), where
 	    <hostid role="netmask">0xffffff00</hostid> is the same as
-	    <hostid role="netmask">255.255.255.0</hostid>).</para>
+	    <hostid role="netmask">255.255.255.0</hostid>.</para>
 	</listitem>
 
 	<listitem>
-	  <para>It has a valid broadcast address (in this case,
-	    <hostid role="ipaddr">192.168.1.255</hostid>).</para>
+	  <para>It has a valid broadcast address,
+	    <hostid role="ipaddr">192.168.1.255</hostid>.</para>
 	</listitem>
 
 	<listitem>
-	  <para>The MAC address of the card (<literal>ether</literal>)
-	    is <hostid role="mac">00:a0:cc:da:da:da</hostid></para>
+	  <para>The <acronym>MAC</acronym> address of the card
+	    (<literal>ether</literal>)
+	    is <hostid role="mac">00:a0:cc:da:da:da</hostid>.</para>
 	</listitem>
 
 	<listitem>
 	  <para>The physical media selection is on autoselection mode
 	    (<literal>media: Ethernet autoselect (100baseTX
 	      &lt;full-duplex&gt;)</literal>).  In this example,
-	    <devicename>dc1</devicename> was configured to run with
+	    <devicename>dc1</devicename> is configured to run with
 	    <literal>10baseT/UTP</literal> media.  For more
 	    information on available media types for a driver, refer
 	    to its manual page.</para>
@@ -1130,39 +1157,44 @@ lo0: flags=8049&lt;UP,LOOPBACK,RUNNING,M
 
       <para>it would indicate the card has not been configured.</para>
 
-      <para>To configure the card, you will need
-	<username>root</username> privileges.  The network card
+      <para>The card must be configured as
+	<username>root</username>.  The <acronym>NIC</acronym>

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

From owner-svn-doc-projects@FreeBSD.ORG  Sun May 12 15:15:21 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id A408F7B1;
 Sun, 12 May 2013 15:15:21 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 96E29F4F;
 Sun, 12 May 2013 15:15:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CFFLes052393;
 Sun, 12 May 2013 15:15:21 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CFFLiM052392;
 Sun, 12 May 2013 15:15:21 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201305121515.r4CFFLiM052392@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sun, 12 May 2013 15:15:21 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41608 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 May 2013 15:15:21 -0000

Author: gjb
Date: Sun May 12 15:15:20 2013
New Revision: 41608
URL: http://svnweb.freebsd.org/changeset/doc/41608

Log:
  Fix index generation (I think...).

Modified:
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config/chapter.xml

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config/chapter.xml	Sun May 12 13:19:04 2013	(r41607)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config/chapter.xml	Sun May 12 15:15:20 2013	(r41608)
@@ -910,8 +910,8 @@ dc1: [ITHREAD]</screen>
 	<indexterm><primary><acronym>NDIS</acronym></primary></indexterm>
 	<indexterm><primary>NDISulator</primary></indexterm>
 	<indexterm><primary>&windows; drivers</primary></indexterm>
-	<indexterm><primary>&microsoft.windows;</primary></indexterm>
-	<indexterm><secondary>device drivers</secondary>
+	<indexterm><primary>&microsoft.windows;</primary>
+	<secondary>device drivers</secondary>
 	</indexterm>
 	<indexterm>
 	  <primary><acronym>KLD</acronym> (kernel loadable object)</primary>

From owner-svn-doc-projects@FreeBSD.ORG  Sun May 12 15:28:17 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E8E5FBAE;
 Sun, 12 May 2013 15:28:17 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id DB5F6FB9;
 Sun, 12 May 2013 15:28:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CFSHVe056341;
 Sun, 12 May 2013 15:28:17 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CFSHl0056340;
 Sun, 12 May 2013 15:28:17 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201305121528.r4CFSHl0056340@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sun, 12 May 2013 15:28:17 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41609 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 May 2013 15:28:18 -0000

Author: gjb
Date: Sun May 12 15:28:17 2013
New Revision: 41609
URL: http://svnweb.freebsd.org/changeset/doc/41609

Log:
  Fix whitespace nit from previous commit.

Modified:
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config/chapter.xml

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config/chapter.xml	Sun May 12 15:15:20 2013	(r41608)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config/chapter.xml	Sun May 12 15:28:17 2013	(r41609)
@@ -911,7 +911,7 @@ dc1: [ITHREAD]</screen>
 	<indexterm><primary>NDISulator</primary></indexterm>
 	<indexterm><primary>&windows; drivers</primary></indexterm>
 	<indexterm><primary>&microsoft.windows;</primary>
-	<secondary>device drivers</secondary>
+	  <secondary>device drivers</secondary>
 	</indexterm>
 	<indexterm>
 	  <primary><acronym>KLD</acronym> (kernel loadable object)</primary>

From owner-svn-doc-projects@FreeBSD.ORG  Sun May 12 17:36:00 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id CA6D24C7;
 Sun, 12 May 2013 17:36:00 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id BD0235EA;
 Sun, 12 May 2013 17:36:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CHa0LR003164;
 Sun, 12 May 2013 17:36:00 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CHa0Kc003163;
 Sun, 12 May 2013 17:36:00 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201305121736.r4CHa0Kc003163@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sun, 12 May 2013 17:36:00 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41610 - projects/xml-tools/share/misc
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 May 2013 17:36:00 -0000

Author: gabor
Date: Sun May 12 17:36:00 2013
New Revision: 41610
URL: http://svnweb.freebsd.org/changeset/doc/41610

Log:
  - Readjust styling for some recent changes

Modified:
  projects/xml-tools/share/misc/docbook.css

Modified: projects/xml-tools/share/misc/docbook.css
==============================================================================
--- projects/xml-tools/share/misc/docbook.css	Sun May 12 15:28:17 2013	(r41609)
+++ projects/xml-tools/share/misc/docbook.css	Sun May 12 17:36:00 2013	(r41610)
@@ -145,12 +145,15 @@ div.procedure p b {
 }
 
 h1.title, h2.title, h3.title, h4.title, h5.title, h6.title,
-h3.author, .corpauthor, .abstract p.title,
-div.toc p:first-child,
-div.list-of-figures p:first-child,
-div.list-of-tables p:first-child,
-div.list-of-examples p:first-child {
+h3.author, .corpauthor,
+div.abstract div.abstract-title,
+div.toc div.toc-title,
+div.list-of-figures div.toc-title,
+div.list-of-tables div.toc-title,
+div.list-of-examples div.toc-title {
+	font-weight: bold;
 	line-height: 1.3;
+	margin-top: 1em;
 	margin-left: 0;
 	color: #990000;
 }

From owner-svn-doc-projects@FreeBSD.ORG  Sun May 12 17:36:38 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 92947506;
 Sun, 12 May 2013 17:36:38 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 848E25ED;
 Sun, 12 May 2013 17:36:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CHacr7003316;
 Sun, 12 May 2013 17:36:38 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CHaccw003315;
 Sun, 12 May 2013 17:36:38 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201305121736.r4CHaccw003315@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sun, 12 May 2013 17:36:38 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41611 - projects/xml-tools/share/xml
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 May 2013 17:36:38 -0000

Author: gabor
Date: Sun May 12 17:36:38 2013
New Revision: 41611
URL: http://svnweb.freebsd.org/changeset/doc/41611

Log:
  - Add title to legalnotices, which changes the link name pointing to them

Modified:
  projects/xml-tools/share/xml/trademarks.ent

Modified: projects/xml-tools/share/xml/trademarks.ent
==============================================================================
--- projects/xml-tools/share/xml/trademarks.ent	Sun May 12 17:36:00 2013	(r41610)
+++ projects/xml-tools/share/xml/trademarks.ent	Sun May 12 17:36:38 2013	(r41611)
@@ -426,6 +426,8 @@ Coverity, Inc.</para>">
 
 <!ENTITY legalnotice '
 <legalnotice id="legalnotice">
+  <title>Copyright</title>
+
   <para>Redistribution and use in source (XML DocBook) and &apos;compiled&apos;
     forms (XML, HTML, PDF, PostScript, RTF and so forth) with or without
     modification, are permitted provided that the following conditions are
@@ -466,6 +468,7 @@ Coverity, Inc.</para>">
 
 <!ENTITY trademarks '
 <legalnotice id="trademarks" role="trademarks">
+  <title>Legal Notice</title>
 
   <para>FreeBSD is a registered trademark of The FreeBSD Foundation.</para>
 

From owner-svn-doc-projects@FreeBSD.ORG  Sun May 12 17:37:11 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 6AC7B544;
 Sun, 12 May 2013 17:37:11 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5DA415F0;
 Sun, 12 May 2013 17:37:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CHbBd2003450;
 Sun, 12 May 2013 17:37:11 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CHbBYR003449;
 Sun, 12 May 2013 17:37:11 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201305121737.r4CHbBYR003449@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sun, 12 May 2013 17:37:11 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41612 - projects/xml-tools/share/xsl
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 May 2013 17:37:11 -0000

Author: gabor
Date: Sun May 12 17:37:10 2013
New Revision: 41612
URL: http://svnweb.freebsd.org/changeset/doc/41612

Log:
  - Do not render userinput with bold

Modified:
  projects/xml-tools/share/xsl/freebsd-common.xsl

Modified: projects/xml-tools/share/xsl/freebsd-common.xsl
==============================================================================
--- projects/xml-tools/share/xsl/freebsd-common.xsl	Sun May 12 17:36:38 2013	(r41611)
+++ projects/xml-tools/share/xsl/freebsd-common.xsl	Sun May 12 17:37:10 2013	(r41612)
@@ -12,6 +12,10 @@
     <xsl:call-template name="inline.monoseq"/>
   </xsl:template>
 
+  <xsl:template match="userinput">
+    <xsl:call-template name="inline.monoseq"/>
+  </xsl:template>
+
   <xsl:template name="svnweb.link">
     <xsl:param name="repo" select="'base'"/>
     <xsl:param name="rev"/>

From owner-svn-doc-projects@FreeBSD.ORG  Sun May 12 17:37:58 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 9C99B593;
 Sun, 12 May 2013 17:37:58 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 75D8D5FB;
 Sun, 12 May 2013 17:37:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CHbwab003607;
 Sun, 12 May 2013 17:37:58 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CHbwYf003606;
 Sun, 12 May 2013 17:37:58 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201305121737.r4CHbwYf003606@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sun, 12 May 2013 17:37:58 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41613 - projects/xml-tools/share/xsl
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 May 2013 17:37:58 -0000

Author: gabor
Date: Sun May 12 17:37:57 2013
New Revision: 41613
URL: http://svnweb.freebsd.org/changeset/doc/41613

Log:
  - Add a doc format navigation at the end of the titlepage as we used to have

Modified:
  projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl

Modified: projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl
==============================================================================
--- projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl	Sun May 12 17:37:10 2013	(r41612)
+++ projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl	Sun May 12 17:37:57 2013	(r41613)
@@ -10,10 +10,10 @@
                 exclude-result-prefixes="#default">
 
   <!-- Include the common customizations -->
-  <xsl:include href="freebsd-common.xsl"/>
+  <xsl:import href="freebsd-common.xsl"/>
 
   <!-- Include customized XHTML titlepage -->
-  <xsl:include href="freebsd-xhtml-titlepage.xsl"/>
+  <xsl:import href="freebsd-xhtml-titlepage.xsl"/>
 
   <!-- Redefine variables, and replace templates as necessary here -->
 
@@ -49,6 +49,20 @@
     For questions about this documentation, e-mail &lt;<a href="mailto:doc@FreeBSD.org">doc@FreeBSD.org</a>&gt;.</small></p>
   </xsl:template>
 
+  <xsl:template name="docformatnav">
+    <xsl:variable name="single.fname">
+      <xsl:choose>
+        <xsl:when test="/book">book.html</xsl:when>
+        <xsl:when test="/article">article.html</xsl:when>
+      </xsl:choose>
+    </xsl:variable>
+
+    <div class="docformatnavi">
+      [ <a href="index.html">Split HTML</a> /
+      <a href="{$single.fname}">Single HTML</a> ]
+    </div>
+  </xsl:template>
+
   <xsl:template match="citerefentry" mode="no.anchor.mode">
     <xsl:apply-templates select="*" mode="no.anchor.mode"/>
   </xsl:template>
@@ -284,4 +298,11 @@
     </xsl:if>
     <xsl:text>.</xsl:text>
   </xsl:template>
+
+  <!-- Hook in format navigation at the end of the titlepage -->
+  <xsl:template name="book.titlepage.separator">
+    <xsl:call-template name="docformatnav"/>
+
+    <hr/>
+  </xsl:template>
 </xsl:stylesheet>

From owner-svn-doc-projects@FreeBSD.ORG  Sun May 12 18:54:31 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 32E004F8;
 Sun, 12 May 2013 18:54:31 +0000 (UTC) (envelope-from dru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2440C97F;
 Sun, 12 May 2013 18:54:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CIsT6E030456;
 Sun, 12 May 2013 18:54:29 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CIsT9K030455;
 Sun, 12 May 2013 18:54:29 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201305121854.r4CIsT9K030455@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Sun, 12 May 2013 18:54:29 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41615 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 May 2013 18:54:31 -0000

Author: dru
Date: Sun May 12 18:54:29 2013
New Revision: 41615
URL: http://svnweb.freebsd.org/changeset/doc/41615

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

Modified:
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config/chapter.xml

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config/chapter.xml	Sun May 12 17:59:38 2013	(r41614)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config/chapter.xml	Sun May 12 18:54:29 2013	(r41615)
@@ -68,13 +68,12 @@
       </listitem>
 
       <listitem>
-	<para>How to use the various configuration files in
-	  <filename class="directory">/etc</filename>.</para>
+	<para>How to use the various configuration files in <filename
+	    class="directory">/etc</filename>.</para>
       </listitem>
 
       <listitem>
-	<para>How to tune &os; using &man.sysctl.8;
-	  variables.</para>
+	<para>How to tune &os; using &man.sysctl.8; variables.</para>
       </listitem>
 
       <listitem>
@@ -120,8 +119,8 @@
 
 	<para>When laying out file systems with &man.bsdlabel.8; or
 	  &man.sysinstall.8;, remember that hard drives transfer data
-	  faster from the outer tracks to the inner.  Thus, smaller and
-	  heavier-accessed file systems should be closer to the
+	  faster from the outer tracks to the inner.  Thus, smaller
+	  and heavier-accessed file systems should be closer to the
 	  outside of the drive, while larger partitions like
 	  <filename class="directory">/usr</filename> should be placed
 	  toward the inner parts of the disk.  It is a good idea to
@@ -133,26 +132,25 @@
 	<para>The size of the
 	  <filename class="directory">/var</filename> partition
 	  reflects the intended machine's usage.  This partition
-	  is used to hold
-	  mailboxes, log files, and printer spools.  Mailboxes and log
-	  files can grow to unexpected sizes depending on the number of
-	  users and how long log files are kept.  On average, most users
-	  rarely need more than about a gigabyte of free disk space in
-	  <filename class="directory">/var</filename>.</para>
+	  is used to hold mailboxes, log files, and printer spools.
+	  Mailboxes and log files can grow to unexpected sizes
+	  depending on the number of users and how long log files
+	  are kept.  On average, most users rarely need more than
+	  about a gigabyte of free disk space in <filename
+	    class="directory">/var</filename>.</para>
 
 	<note>
-	  <para>Sometimes, a lot of disk space is
-	    required in
-	    <filename class="directory">/var/tmp</filename>.  When new
-	    software is installed with &man.pkg.add.1;, the packaging
-	    tools extract a temporary copy of the packages under
-	    <filename class="directory">/var/tmp</filename>.  Large
-	    software packages, like
+	  <para>Sometimes, a lot of disk space is required in
+	    <filename class="directory">/var/tmp</filename>.  When
+	    new software is installed with &man.pkg.add.1;, the
+	    packaging tools extract a temporary copy of the packages
+	    under <filename class="directory">/var/tmp</filename>.
+	    Large software packages, like
 	    <application>Firefox</application>,
 	    <application>OpenOffice</application> or
 	    <application>LibreOffice</application> may be tricky to
-	    install if there is not enough disk space under
-	    <filename class="directory">/var/tmp</filename>.</para>
+	    install if there is not enough disk space under <filename
+	      class="directory">/var/tmp</filename>.</para>
 	</note>
 
 	<para>The <filename class="directory">/usr</filename>
@@ -162,17 +160,14 @@
 	  partition.</para>
 
 	<para>When selecting partition sizes, keep the space
-	  requirements in mind.  Running out of space in
-	  one partition while barely using another can be a
-	  hassle.</para>
+	  requirements in mind.  Running out of space in one partition
+	  while barely using another can be a hassle.</para>
 
 	<note>
-	  <para>The 
-	    <literal>Auto-defaults</literal> partition sizer used by
-	    &man.sysinstall.8; will
-	    sometimes select smaller than adequate
-	    <filename class="directory">/var</filename> and
-	    <filename class="directory">/</filename> partitions.
+	  <para>The  <literal>Auto-defaults</literal> partition sizer
+	    used by &man.sysinstall.8; will sometimes select smaller
+	    than adequate <filename class="directory">/var</filename>
+	    and <filename class="directory">/</filename> partitions.
 	    Partition wisely and generously.</para>
 	</note>
       </sect3>
@@ -185,30 +180,27 @@
 
 	<para>As a rule of thumb, the swap partition should be about
 	  double the size of physical memory (<acronym>RAM</acronym>)
-	  as the kernel's
-	  virtual memory (<acronym>VM</acronym>) paging algorithms
-	  are tuned to perform
-	  best when the swap partition is at least two times
-	  the size of main memory.  Systems with minimal
-	  <acronym>RAM</acronym> may
-	  perform better with more swap.  Configuring too little swap
-	  can lead to inefficiencies in the <acronym>VM</acronym>
-	  page scanning code and
-	  might create issues later if more memory is added.</para>
+	  as the kernel's virtual memory (<acronym>VM</acronym>)
+	  paging algorithms are tuned to perform best when the swap
+	  partition is at least two times the size of main memory.
+	  Systems with minimal <acronym>RAM</acronym> may perform
+	  better with more swap.  Configuring too little swap can
+	  lead to inefficiencies in the <acronym>VM</acronym> page
+	  scanning code and might create issues later if more memory
+	  is added.</para>
 
 	<para>On larger systems with multiple <acronym>SCSI</acronym>
-	  disks or multiple
-	  <acronym>IDE</acronym> disks operating on different
-	  controllers, it is
-	  recommended that swap be configured on each drive, up to
-	  four drives.  The swap partitions should be approximately
-	  the same size.  The kernel can handle arbitrary sizes but
-	  internal data structures scale to 4 times the largest swap
-	  partition.  Keeping the swap partitions near the same size
-	  will allow the kernel to optimally stripe swap space across
-	  disks.  Large swap sizes are fine, even if swap is not used
-	  much.  It might be easier to recover from a runaway program
-	  before being forced to reboot.</para>
+	  disks or multiple <acronym>IDE</acronym> disks operating
+	  on different controllers, it is recommended that swap be
+	  configured on each drive, up to four drives.  The swap
+	  partitions should be approximately the same size.  The
+	  kernel can handle arbitrary sizes but internal data
+	  structures scale to 4 times the largest swap partition.
+	  Keeping the swap partitions near the same size will allow
+	  the kernel to optimally stripe swap space across disks.
+	  Large swap sizes are fine, even if swap is not used much.
+	  It might be easier to recover from a runaway program before
+	  being forced to reboot.</para>
       </sect3>
 
       <sect3>
@@ -218,24 +210,24 @@
 	  fine, but there are several reasons why this is a bad idea.
 	  First, each partition has different operational
 	  characteristics and separating them allows the file system
-	  to tune accordingly.  For example, the root and
-	  <filename class="directory">/usr</filename> partitions are
+	  to tune accordingly.  For example, the root and <filename
+	    class="directory">/usr</filename> partitions are
 	  read-mostly, with few writes, while a lot of reads and
-	  writes could occur in
-	  <filename class="directory">/var</filename> and
-	  <filename class="directory">/var/tmp</filename>.</para>
+	  writes could occur in <filename
+	    class="directory">/var</filename> and <filename
+	    class="directory">/var/tmp</filename>.</para>
 
 	<para>By properly partitioning a system, fragmentation
 	  introduced in the smaller write heavy partitions will not
 	  bleed over into the mostly read partitions.  Keeping the
 	  write loaded partitions closer to the disk's edge will
 	  increase I/O performance in the partitions where it occurs
-	  the most.  While I/O performance in the larger
-	  partitions may be needed, shifting them more toward the edge
-	  of the disk will not lead to a significant performance
-	  improvement over moving
-	  <filename class="directory">/var</filename> to the edge.
-	  Finally, there are safety concerns.  A smaller, neater root
+	  the most.  While I/O performance in the larger partitions
+	  may be needed, shifting them more toward the edge of the
+	  disk will not lead to a significant performance
+	  improvement over moving <filename
+	    class="directory">/var</filename> to the edge.  Finally,
+	  there are safety concerns.  A smaller, neater root
 	  partition which is mostly read-only has a greater chance of
 	  surviving a bad crash.</para>
       </sect3>
@@ -251,8 +243,8 @@
     </indexterm>
 
     <para>The principal location for system configuration information
-      is <filename>/etc/rc.conf</filename>.  This file contains
-      a wide range of configuration information and it is read at
+      is <filename>/etc/rc.conf</filename>.  This file contains a
+      wide range of configuration information and it is read at
       system startup to configure the system.  It provides the
       configuration information for the <filename>rc*</filename>
       files.</para>
@@ -269,8 +261,7 @@
       system-specific configuration in order to keep administration
       overhead down.  The recommended approach is to place
       system-specific configuration into
-      <filename>/etc/rc.conf.local</filename>.  For
-      example:</para>
+      <filename>/etc/rc.conf.local</filename>.  For example:</para>
 
     <itemizedlist>
       <listitem>
@@ -291,10 +282,10 @@ ifconfig_fxp0="inet 10.1.1.1/8"</program
       </listitem>
     </itemizedlist>
 
-    <para>Distribute <filename>/etc/rc.conf</filename>
-      to every system using <command>rsync</command> or a
-      similar program, while <filename>/etc/rc.conf.local</filename>
-      remains unique.</para>
+    <para>Distribute <filename>/etc/rc.conf</filename> to every
+      system using <command>rsync</command> or a similar program,
+      while <filename>/etc/rc.conf.local</filename> remains
+      unique.</para>
 
     <para>Upgrading the system using &man.sysinstall.8; or
       <command>make world</command> will not overwrite
@@ -320,18 +311,17 @@ ifconfig_fxp0="inet 10.1.1.1/8"</program
 
     <indexterm><primary>/usr/local/etc</primary></indexterm>
 
-    <para>Typically, these files are installed in
-      <filename class="directory">/usr/local/etc</filename>.  In the
-      case where an application has a large number of configuration
+    <para>Typically, these files are installed in <filename
+	class="directory">/usr/local/etc</filename>.  In the case
+      where an application has a large number of configuration
       files, a subdirectory will be created to hold them.</para>
 
     <para>Normally, when a port or package is installed, sample
       configuration files are also installed.  These are usually
       identified with a suffix such as <filename>.sample</filename>.
-      If
-      there are no existing configuration files for the application,
-      they can be created by copying the
-      sample files.</para>
+      If there are no existing configuration files for the
+      application, they can be created by copying the sample
+      files.</para>
 
     <para>For example, consider the contents of the directory
       <filename
@@ -348,10 +338,10 @@ ifconfig_fxp0="inet 10.1.1.1/8"</program
 -rw-r--r--  1 root  wheel   7980 May 20  1998 srm.conf
 -rw-r--r--  1 root  wheel   7933 May 20  1998 srm.conf.default</literallayout>
 
-    <para>The file sizes show that only
-      <filename>srm.conf</filename> has been changed.  A later
-      update of the <application>Apache</application> port would not
-      overwrite this changed file.</para>
+    <para>The file sizes show that only <filename>srm.conf</filename>
+      has been changed.  A later update of the
+      <application>Apache</application> port would not overwrite
+      this changed file.</para>
   </sect1>
 
   <sect1 id="configtuning-starting-services">
@@ -371,10 +361,10 @@ ifconfig_fxp0="inet 10.1.1.1/8"</program
 
     <para>Many users install third party software on &os; from the
       Ports Collection and require the installed services to be
-      started upon system initialization.  Services,
-      such as <filename role="package">mail/postfix</filename> or
-      <filename role="package">www/apache22</filename> are just two of
-      the many software packages which may be started during system
+      started upon system initialization.  Services, such as
+      <filename role="package">mail/postfix</filename> or
+      <filename role="package">www/apache22</filename> are just two
+      of the many software packages which may be started during system
       initialization.  This section explains the procedures available
       for starting third party software.</para>
 
@@ -386,13 +376,12 @@ ifconfig_fxp0="inet 10.1.1.1/8"</program
 
       <para>Now that &os; includes <filename>rc.d</filename>,
 	configuration of application startup is easier and provides
-	more features.  Using the key words discussed in
-	<xref linkend="configtuning-rcd"/>,
-	applications can be set to start after certain other services
-	and extra flags can be passed through
-	<filename>/etc/rc.conf</filename> in place of hard coded flags
-	in the start up script.  A basic script may look similar to
-	the following:</para>
+	more features.  Using the key words discussed in <xref
+	  linkend="configtuning-rcd"/>, applications can be set to
+	start after certain other services and extra flags can be
+	passed through <filename>/etc/rc.conf</filename> in place of
+	hard coded flags in the start up script.  A basic script may
+	look similar to the following:</para>
 
       <programlisting>#!/bin/sh
 #
@@ -429,34 +418,32 @@ run_rc_command "$1"</programlisting>
 
       <programlisting>utility_enable="YES"</programlisting>
 
-      <para>This method allows for easier manipulation of
-	command line arguments, inclusion of the default functions
-	provided in <filename>/etc/rc.subr</filename>, compatibility
-	with &man.rcorder.8;, and provides for easier
-	configuration via <filename>rc.conf</filename>.</para>
+      <para>This method allows for easier manipulation of command
+	line arguments, inclusion of the default functions provided
+	in <filename>/etc/rc.subr</filename>, compatibility with
+	&man.rcorder.8;, and provides for easier configuration via
+	<filename>rc.conf</filename>.</para>
     </sect2>
 
     <sect2>
       <title>Using Services to Start Services</title>
 
-      <para>Other services can be started using
-	&man.inetd.8;.  Working
-	with &man.inetd.8; and its configuration is
+      <para>Other services can be started using &man.inetd.8;.
+	Working with &man.inetd.8; and its configuration is
 	described in depth in
 	<xref linkend="network-inetd"/>.</para>
 
       <para>In some cases, it may make more sense to use
 	&man.cron.8; to start system services.  This approach
-	has a number of advantages as &man.cron.8;
-	runs these processes as the owner of the &man.crontab.5;.
-	This allows regular users to start and maintain their own
+	has a number of advantages as &man.cron.8; runs these
+	processes as the owner of the &man.crontab.5;.  This allows
+	regular users to start and maintain their own
 	applications.</para>
 
       <para>The <literal>@reboot</literal> feature of &man.cron.8;,
-	may be used in
-	place of the time specification.  This causes the job to
-	run when &man.cron.8; is started, normally during system
-	initialization.</para>
+	may be used in place of the time specification.  This causes
+	the job to run when &man.cron.8; is started, normally during
+	system initialization.</para>
     </sect2>
   </sect1>
 
@@ -479,20 +466,18 @@ run_rc_command "$1"</programlisting>
     <para>One of the most useful utilities in &os; is &man.cron.8;.
       This utility runs in the background and regularly checks
       <filename>/etc/crontab</filename> for tasks to execute and
-      searches
-      <filename class="directory">/var/cron/tabs</filename> for custom
-      &man.crontab.5; files.  These files store
-      information about specific functions which
-      &man.cron.8; is supposed to perform at certain
-      times.</para>
+      searches <filename class="directory">/var/cron/tabs</filename>
+      for custom &man.crontab.5; files.  These files store
+      information about specific functions which &man.cron.8; is
+      supposed to perform at certain times.</para>
 
     <para>Two different types of configuration files are used by
-      &man.cron.8;: the system crontab and user crontabs.
-      These formats only differ in the sixth field and later.  In the
-      system crontab, &man.cron.8; runs the command as
-      the user specified in the sixth field.  In a user crontab, all
-      commands run as the user who created the crontab, so the sixth
-      field is the last field; this is an important security feature.
+      &man.cron.8;: the system crontab and user crontabs.  These
+      formats only differ in the sixth field and later.  In the
+      system crontab, &man.cron.8; runs the command as the user
+      specified in the sixth field.  In a user crontab, all commands
+      run as the user who created the crontab, so the sixth field
+      is the last field; this is an important security feature.
       The final field is always the command to run.</para>
 
     <note>
@@ -505,14 +490,13 @@ run_rc_command "$1"</programlisting>
 	just like any other user.  The <username>root</username> user
 	crontab is separate from the system crontab,
 	<filename>/etc/crontab</filename>.
-	Because the system crontab
-	invokes the specified commands as <username>root</username>,
-	there is usually no
-	need to create a user crontab for
-	<username>root</username>.</para>
+	Because the system crontab invokes the specified commands as
+	<username>root</username>, there is usually no need to create
+	a user crontab for <username>root</username>.</para>
     </note>
 
-    <para>Here is a sample entry from <filename>/etc/crontab</filename>:</para>
+    <para>Here is a sample entry from
+      <filename>/etc/crontab</filename>:</para>
 
     <programlisting># /etc/crontab - root's crontab for FreeBSD
 #
@@ -538,15 +522,13 @@ PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin 
       </callout>
 
       <callout arearefs="co-env">
-	<para>The equals
-	  (<literal>=</literal>) character is used to define any
-	  environment settings.  In this example, it is used to define
-	  the <envar>SHELL</envar> and <envar>PATH</envar>.
-	  If the <envar>SHELL</envar> is omitted,
-	  &man.cron.8; will use the default of
-	  &man.sh.1;.  If the <envar>PATH</envar>
-	  is omitted, no default will be used and file locations will
-	  need to be absolute.</para>
+	<para>The equals (<literal>=</literal>) character is used to
+	  define any environment settings.  In this example, it is
+	  used to define the <envar>SHELL</envar> and
+	  <envar>PATH</envar>.  If the <envar>SHELL</envar> is
+	  omitted, &man.cron.8; will use the default of &man.sh.1;.
+	  If the <envar>PATH</envar> is omitted, no default will be
+	  used and file locations will need to be absolute.</para>
       </callout>
 
       <callout arearefs="co-field-descr">
@@ -557,20 +539,18 @@ PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin 
 	  <literal>who</literal>, and <literal>command</literal>.
 	  These are almost all self explanatory.
 	  <literal>minute</literal> is the time in minutes when the
-	  specified command
-	  will be run.  <literal>hour</literal> is the hour when
-	  the specified command will be run.
+	  specified command will be run.  <literal>hour</literal> is
+	  the hour when the specified command will be run.
 	  <literal>mday</literal> stands for day of the month and
-	  <literal>month</literal>
-	  designates the month.  The <literal>wday</literal> option
-	  stands for day of the week.  These fields must be
-	  numeric values, representing the twenty-four hour clock,
-	  or a <literal>*</literal>, representing all values for that
-	  field.  The
+	  <literal>month</literal> designates the month.  The
+	  <literal>wday</literal> option stands for day of the week.
+	  These fields must be numeric values, representing the
+	  twenty-four hour clock, or a <literal>*</literal>,
+	  representing all values for that field.  The
 	  <literal>who</literal> field only exists in the system
-	  crontab.  This field specifies
-	  which user the command should be run as.  The last field is
-	  the command to be executed.</para>
+	  crontab.  This field specifies which user the command
+	  should be run as.  The last field is the command to be
+	  executed.</para>
       </callout>
 
       <callout arearefs="co-main">
@@ -580,9 +560,8 @@ PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin 
 	  <literal>*</literal> characters mean
 	  <quote>first-last</quote>, and can be interpreted as
 	  <emphasis>every</emphasis> time.  In this example,
-	  &man.atrun.8; is invoked by
-	  <username>root</username> every five minutes, regardless of
-	  the day or month.</para>
+	  &man.atrun.8; is invoked by <username>root</username>
+	  every five minutes, regardless of the day or month.</para>
 
 	<para>Commands can have any number of flags passed to them;
 	  however, commands which extend to multiple lines need to be
@@ -591,11 +570,10 @@ PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin 
       </callout>
     </calloutlist>
 
-    <para>This is the basic setup for every
-      &man.crontab.5;.  However, field number six, which specifies
-      the username, only exists in the system
-      &man.crontab.5;.  This field should be omitted for
-      individual user &man.crontab.5; files.</para>
+    <para>This is the basic setup for every &man.crontab.5;.
+      However, field number six, which specifies the username, only
+      exists in the system &man.crontab.5;.  This field should be
+      omitted for individual user &man.crontab.5; files.</para>
 
     <sect2 id="configtuning-installcrontab">
       <title>Installing a Crontab</title>
@@ -604,17 +582,16 @@ PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin 
 	<para>Do not use the procedure described here to edit and
 	  install the system crontab,
 	  <filename>/etc/crontab</filename>.  Instead, use an
-	  editor and &man.cron.8; will notice that the file
-	  has changed and immediately begin using the updated version.
+	  editor and &man.cron.8; will notice that the file has
+	  changed and immediately begin using the updated version.
 	  See <ulink
 	    url="&url.books.faq;/admin.html#root-not-found-cron-errors">
 	    this FAQ entry</ulink> for more information.</para>
       </important>
 
-      <para>To install a freshly written user
-	&man.crontab.5;, use an editor to create
-	and save a file in the proper format.  Then, specify the file
-	name with &man.crontab.1;:</para>
+      <para>To install a freshly written user &man.crontab.5;, use
+	an editor to create and save a file in the proper format.
+	Then, specify the file name with &man.crontab.1;:</para>
 
       <screen>&prompt.user; <userinput>crontab crontab-file</userinput></screen>
 
@@ -627,13 +604,12 @@ PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin 
 
       <para>Users who wish to begin their own crontab file from
 	scratch, without the use of a template, can use
-	<command>crontab -e</command>.  This will
-	invoke the default editor with an empty file.  When the file
-	is saved, it will be automatically installed by
-	&man.crontab.1;.</para>
+	<command>crontab -e</command>.  This will invoke the default
+	editor with an empty file.  When the file is saved, it will
+	be automatically installed by &man.crontab.1;.</para>
 
-      <para>In order to remove a user &man.crontab.5;
-	completely, use <command>crontab -r</command>.</para>
+      <para>In order to remove a user &man.crontab.5; completely,
+	use <command>crontab -r</command>.</para>
     </sect2>
   </sect1>
 
@@ -651,46 +627,41 @@ PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin 
 
     <title>Using &man.rc.8; Under &os;</title>
 
-    <para>In 2002, &os; integrated the NetBSD &man.rc.8;
-      system for system initialization.  The files
-      listed in <filename class="directory">/etc/rc.d</filename>
-      provide basic services which can
-      be controlled with the <option>start</option>,
+    <para>In 2002, &os; integrated the NetBSD &man.rc.8; system for
+      system initialization.  The files listed in <filename
+	class="directory">/etc/rc.d</filename> provide basic services
+      which can be controlled with the <option>start</option>,
       <option>stop</option>, and <option>restart</option> options
-      to &man.service.8;.
-      For instance, &man.sshd.8; can be restarted with the following
-      command:</para>
+      to &man.service.8;.  For instance, &man.sshd.8; can be restarted
+      with the following command:</para>
 
     <screen>&prompt.root; <userinput>service sshd restart</userinput></screen>
 
     <para>This procedure can be used to start services on a running
-      system.
-      Services will be started automatically at boot time as
-      specified in &man.rc.conf.5;.  For example, to enable &man.natd.8;
-      at system startup, add the
-      following line to <filename>/etc/rc.conf</filename>:</para>
+      system.  Services will be started automatically at boot time
+      as specified in &man.rc.conf.5;.  For example, to enable
+      &man.natd.8; at system startup, add the following line to
+      <filename>/etc/rc.conf</filename>:</para>
 
     <programlisting>natd_enable="YES"</programlisting>
 
     <para>If a <option>natd_enable="NO"</option> line is already
       present, change the <literal>NO</literal> to
       <literal>YES</literal>.  The &man.rc.8; scripts will
-      automatically load
-      any dependent services during the next boot, as
-      described below.</para>
-
-    <para>Since the &man.rc.8; system is primarily
-      intended to start and stop services at system startup and
-      shutdown time,
-      the <option>start</option>, <option>stop</option> and
+      automatically load any dependent services during the next boot,
+      as described below.</para>
+
+    <para>Since the &man.rc.8; system is primarily intended to start
+      and stop services at system startup and shutdown time, the
+      <option>start</option>, <option>stop</option> and
       <option>restart</option> options will only perform their action
       if the appropriate <filename>/etc/rc.conf</filename> variable
       is set.  For instance, <command>sshd restart</command> will
       only work if <varname>sshd_enable</varname> is set to
       <option>YES</option> in <filename>/etc/rc.conf</filename>.
       To <option>start</option>, <option>stop</option> or
-      <option>restart</option> a service regardless of the settings in
-      <filename>/etc/rc.conf</filename>, these commands should be
+      <option>restart</option> a service regardless of the settings
+      in <filename>/etc/rc.conf</filename>, these commands should be
       prefixed with <quote>one</quote>.  For instance, to restart
       &man.sshd.8; regardless of the current
       <filename>/etc/rc.conf</filename> setting, execute the following
@@ -700,9 +671,8 @@ PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin 
 
     <para>To check if a service is enabled in
       <filename>/etc/rc.conf</filename>, run the appropriate
-      &man.rc.8; script with
-      <option>rcvar</option>.  This example checks to see if
-      &man.sshd.8; is enabled in
+      &man.rc.8; script with <option>rcvar</option>.  This example
+      checks to see if &man.sshd.8; is enabled in
       <filename>/etc/rc.conf</filename>:</para>
 
     <screen>&prompt.root; <userinput>service sshd rcvar</userinput>
@@ -711,9 +681,7 @@ $sshd_enable=YES</screen>
 
     <note>
       <para>The <literal># sshd</literal> line is output from the
-	above command,
-	not a
-	<username>root</username> console.</para>
+	above command, not a <username>root</username> console.</para>
     </note>
 
     <para>To determine whether or not a service is running, use
@@ -723,40 +691,38 @@ $sshd_enable=YES</screen>
     <screen>&prompt.root; <userinput>service sshd status</userinput>
 sshd is running as pid 433.</screen>
 
-    <para>In some cases, it is also possible to <option>reload</option>
-      a service.  This attempts to send a signal to an individual
-      service, forcing the service to reload its configuration files.
-      In most cases, this means sending the service a
-      <literal>SIGHUP</literal> signal.  Support for this feature is
-      not included for every service.</para>
-
-    <para>The &man.rc.8; system is used for
-      network services and it also contributes to most of the system
-      initialization.  For instance, when the
+    <para>In some cases, it is also possible to
+      <option>reload</option> a service.  This attempts to send a
+      signal to an individual service, forcing the service to reload
+      its configuration files.  In most cases, this means sending
+      the service a <literal>SIGHUP</literal> signal.  Support for
+      this feature is not included for every service.</para>
+
+    <para>The &man.rc.8; system is used for network services and it
+      also contributes to most of the system initialization.  For
+      instance, when the
       <filename>/etc/rc.d/bgfsck</filename> script is executed, it
-      prints
-      out the following message:</para>
+      prints out the following message:</para>
 
     <screen>Starting background file system checks in 60 seconds.</screen>
 
-    <para>This script is used for background file system
-      checks, which occur only during system initialization.</para>
+    <para>This script is used for background file system checks,
+      which occur only during system initialization.</para>
 
     <para>Many system services depend on other services to function
       properly.  For example, &man.yp.8; and other
-      <acronym>RPC</acronym>-based services may
-      fail to start until after the &man.rpcbind.8;
-      service has started.  To resolve this issue,
-      information about dependencies and other meta-data is included
-      in the comments at the top of each startup script.  The
-      &man.rcorder.8; program is used to parse these comments
+      <acronym>RPC</acronym>-based services may fail to start until
+      after the &man.rpcbind.8; service has started.  To resolve this
+      issue, information about dependencies and other meta-data is
+      included in the comments at the top of each startup script.
+      The &man.rcorder.8; program is used to parse these comments
       during system initialization to determine the order in which
       system services should be invoked to satisfy the
       dependencies.</para>
 
-    <para>The following key word must be included in all startup scripts
-      as it is required by &man.rc.subr.8; to <quote>enable</quote>
-      the startup script:</para>
+    <para>The following key word must be included in all startup
+      scripts as it is required by &man.rc.subr.8; to
+      <quote>enable</quote> the startup script:</para>
 
     <itemizedlist>
       <listitem>
@@ -773,15 +739,15 @@ sshd is running as pid 433.</screen>
       <listitem>
 	<para><literal>REQUIRE</literal>: Lists services which are
 	  required for this service.  The script containing this key
-	  word will run
-	  <emphasis>after</emphasis> the specified services.</para>
+	  word will run <emphasis>after</emphasis> the specified
+	  services.</para>
       </listitem>
 
       <listitem>
 	<para><literal>BEFORE</literal>: Lists services which depend
 	  on this service.  The script containing this key word will
-	  run
-	  <emphasis>before</emphasis> the specified services.</para>
+	  run <emphasis>before</emphasis> the specified
+	  services.</para>
       </listitem>
     </itemizedlist>
 
@@ -791,9 +757,9 @@ sshd is running as pid 433.</screen>
       <quote>runlevels</quote> used by some &unix; operating
       systems.</para>
 
-    <para>Additional information
-      can be found in &man.rc.8; and &man.rc.subr.8;.  Refer to
-      <ulink url="&url.articles.rc-scripting">this article</ulink> for
+    <para>Additional information can be found in &man.rc.8; and
+      &man.rc.subr.8;.  Refer to <ulink
+	url="&url.articles.rc-scripting">this article</ulink> for
       instructions on how to create custom &man.rc.8;
       scripts.</para>
   </sect1>
@@ -818,8 +784,8 @@ sshd is running as pid 433.</screen>
     </indexterm>
 
     <para>Adding and configuring a network interface card
-      (<acronym>NIC</acronym>)  is a common task for
-      any &os; administrator.</para>
+      (<acronym>NIC</acronym>)  is a common task for any &os;
+      administrator.</para>
 
     <sect2>
       <title>Locating the Correct Driver</title>
@@ -832,14 +798,12 @@ sshd is running as pid 433.</screen>
       <para>First, determine the model of the <acronym>NIC</acronym>
 	and the chip it uses.  &os; supports a wide variety of
 	<acronym>NIC</acronym>s.  Check the Hardware Compatibility
-	List for
-	the &os; release to see if the <acronym>NIC</acronym> is
-	supported.</para>
+	List for the &os; release to see if the <acronym>NIC</acronym>
+	is supported.</para>
 
       <para>If the <acronym>NIC</acronym> is supported, determine
-	the name of the &os;
-	driver for the <acronym>NIC</acronym>.  Refer to
-	<filename>/usr/src/sys/conf/NOTES</filename> and
+	the name of the &os; driver for the <acronym>NIC</acronym>.
+	Refer to <filename>/usr/src/sys/conf/NOTES</filename> and
 	<filename>/usr/src/sys/<replaceable>arch</replaceable>/conf/NOTES</filename>
 	for the list of <acronym>NIC</acronym> drivers with some
 	information about the supported chipsets.  When in doubt, read
@@ -848,12 +812,10 @@ sshd is running as pid 433.</screen>
 	limitations of the driver.</para>
 
       <para>The drivers for common <acronym>NIC</acronym>s are
-	already present
-	in the <filename>GENERIC</filename> kernel, meaning the
-	<acronym>NIC</acronym>
-	should show up during boot.  In this example, two
-	<acronym>NIC</acronym>s using
-	the &man.dc.4; driver are present on the system:</para>
+	already present in the <filename>GENERIC</filename> kernel,
+	meaning the <acronym>NIC</acronym> should show up during boot.
+	In this example, two <acronym>NIC</acronym>s using the
+	&man.dc.4; driver are present on the system:</para>
 
       <screen>dc0: &lt;82c169 PNIC 10/100BaseTX&gt; port 0xa000-0xa0ff mem 0xd3800000-0xd38
 000ff irq 15 at device 11.0 on pci0
@@ -871,36 +833,33 @@ dc1: Ethernet address: 00:a0:cc:da:da:db
 dc1: [ITHREAD]</screen>
 
       <para>If the driver for the <acronym>NIC</acronym> is not
-	present in
-	<filename>GENERIC</filename>, but a driver is available, the
-	driver will need to be loaded before the
-	<acronym>NIC</acronym> can be
-	configured and used.  This may be accomplished in one of two
-	ways:</para>
+	present in <filename>GENERIC</filename>, but a driver is
+	available, the driver will need to be loaded before the
+	<acronym>NIC</acronym> can be configured and used.  This may
+	be accomplished in one of two ways:</para>
 
       <itemizedlist>
 	<listitem>
 	  <para>The easiest way is to load a kernel module for the
 	    <acronym>NIC</acronym> using &man.kldload.8;.  To also
-	    automatically
-	    load the driver at boot time, add the appropriate line to
+	    automatically load the driver at boot time, add the
+	    appropriate line to
 	    <filename>/boot/loader.conf</filename>.  Not all
-	    <acronym>NIC</acronym>
-	    drivers are available as modules.</para>
+	    <acronym>NIC</acronym> drivers are available as
+	    modules.</para>
 	</listitem>
 
 	<listitem>
 	  <para>Alternatively, statically compile support for the
-	    <acronym>NIC</acronym>
-	    into a custom kernel.  Refer to
+	    <acronym>NIC</acronym> into a custom kernel.  Refer to
 	    <filename>/usr/src/sys/conf/NOTES</filename>,
 	    <filename>/usr/src/sys/<replaceable>arch</replaceable>/conf/NOTES</filename>
 	    and the manual page of the driver to determine which line
 	    to add to the custom kernel configuration file.  For more
-	    information about recompiling the kernel, refer to
-	    <xref linkend="kernelconfig"/>.  If the
-	    <acronym>NIC</acronym> was detected
-	    at boot, the kernel does not need to be recompiled.</para>
+	    information about recompiling the kernel, refer to <xref
+	      linkend="kernelconfig"/>.  If the
+	    <acronym>NIC</acronym> was detected at boot, the kernel
+	    does not need to be recompiled.</para>
 	</listitem>
       </itemizedlist>
 
@@ -914,7 +873,8 @@ dc1: [ITHREAD]</screen>
 	  <secondary>device drivers</secondary>
 	</indexterm>
 	<indexterm>
-	  <primary><acronym>KLD</acronym> (kernel loadable object)</primary>
+	  <primary><acronym>KLD</acronym> (kernel loadable
+	    object)</primary>
 	</indexterm>
 <!-- We should probably omit the expanded name, and add a <see> entry
 for it.  Whatever is done must also be done to the same indexterm in
@@ -925,23 +885,19 @@ linuxemu/chapter.xml -->
 	  community because they regard such information as trade
 	  secrets.  Consequently, the developers of &os; and other
 	  operating systems are left with two choices: develop the
-	  drivers
-	  by a long and pain-staking process of reverse engineering or
-	  using the existing driver binaries available for
-	  &microsoft.windows; platforms.</para>
-
-	<para>&os; provides
-	  <quote>native</quote> support for the Network Driver
-	    Interface Specification (<acronym>NDIS</acronym>).  It
-	  includes
-	  &man.ndisgen.8; which can be used to
-	  convert a &windowsxp; driver
-	  into a format that can be used on &os;.
-	  Because the &man.ndis.4; driver uses a
-	  &windowsxp; binary, it only runs on &i386; and amd64 systems.
-	  <acronym>PCI</acronym>, CardBus, <acronym>PCMCIA</acronym>,
-	  and <acronym>USB</acronym> devices are
-	  supported.</para>
+	  drivers by a long and pain-staking process of reverse
+	  engineering or using the existing driver binaries available
+	  for &microsoft.windows; platforms.</para>
+
+	<para>&os; provides <quote>native</quote> support for the
+	  Network Driver Interface Specification
+	  (<acronym>NDIS</acronym>).  It includes &man.ndisgen.8;
+	  which can be used to convert a &windowsxp; driver into a
+	  format that can be used on &os;.  Because the &man.ndis.4;
+	  driver uses a &windowsxp; binary, it only runs on &i386;
+	  and amd64 systems.  <acronym>PCI</acronym>, CardBus,
+	  <acronym>PCMCIA</acronym>, and <acronym>USB</acronym>
+	  devices are supported.</para>
 
 	<para>To use &man.ndisgen.8;, three things are needed:</para>
 
@@ -963,11 +919,9 @@ linuxemu/chapter.xml -->
 
 	<para>Download the <filename>.SYS</filename> and
 	  <filename>.INF</filename> files for the specific
-	  <acronym>NIC</acronym>.
-	  Generally,
-	  these can be found on the driver CD or at the vendor's
-	  website.  The following examples use
-	  <filename>W32DRIVER.SYS</filename> and
+	  <acronym>NIC</acronym>.  Generally, these can be found on
+	  the driver CD or at the vendor's website.  The following
+	  examples use <filename>W32DRIVER.SYS</filename> and
 	  <filename>W32DRIVER.INF</filename>.</para>
 
 	<para>The driver bit width must match the version of &os;.
@@ -982,9 +936,8 @@ linuxemu/chapter.xml -->
 
 	<para>This command is interactive and prompts for any extra
 	  information it requires.  A new kernel module will be
-	  generated in
-	  the current directory.  Use &man.kldload.8; to load the new
-	  module:</para>
+	  generated in the current directory.  Use &man.kldload.8;
+	  to load the new module:</para>
 
 	<screen>&prompt.root; <userinput>kldload <replaceable>./W32DRIVER_SYS.ko</replaceable></userinput></screen>
 
@@ -998,13 +951,12 @@ linuxemu/chapter.xml -->
 	<screen>&prompt.root; <userinput>kldload ndis</userinput>
 &prompt.root; <userinput>kldload if_ndis</userinput></screen>
 
-	<para>The first command loads the &man.ndis.4;
-	  miniport driver
-	  wrapper and the second loads the generated <acronym>NIC</acronym>
-	  driver.</para>
+	<para>The first command loads the &man.ndis.4; miniport driver
+	  wrapper and the second loads the generated
+	  <acronym>NIC</acronym> driver.</para>
 
-	<para>Check &man.dmesg.8; to see if there were any load errors.
-	  If all went well, the output should be similar to
+	<para>Check &man.dmesg.8; to see if there were any load
+	  errors.  If all went well, the output should be similar to
 	  the following:</para>
 
 	<screen>ndis0: &lt;Wireless-G PCI Adapter&gt; mem 0xf4100000-0xf4101fff irq 3 at device 8.0 on pci1
@@ -1013,15 +965,14 @@ ndis0: Ethernet address: 0a:b1:2c:d3:4e:
 ndis0: 11b rates: 1Mbps 2Mbps 5.5Mbps 11Mbps
 ndis0: 11g rates: 6Mbps 9Mbps 12Mbps 18Mbps 36Mbps 48Mbps 54Mbps</screen>
 
-	<para>From here,
-	  <devicename>ndis0</devicename> can be configured like any other
-	  <acronym>NIC</acronym>.</para>
+	<para>From here, <devicename>ndis0</devicename> can be
+	  configured like any other <acronym>NIC</acronym>.</para>
 
-	<para>To configure the system to load the &man.ndis.4; modules at
-	  boot time, copy the generated module,
+	<para>To configure the system to load the &man.ndis.4; modules
+	  at boot time, copy the generated module,
 	  <filename>W32DRIVER_SYS.ko</filename>, to <filename
-	  class="directory">/boot/modules</filename>.  Then,
-	  add the following line to
+	  class="directory">/boot/modules</filename>.  Then, add the
+	  following line to
 	  <filename>/boot/loader.conf</filename>:</para>
 
 	<programlisting>W32DRIVER_SYS_load="YES"</programlisting>
@@ -1037,8 +988,7 @@ ndis0: 11g rates: 6Mbps 9Mbps 12Mbps 18M
       </indexterm>
 
       <para>Once the right driver is loaded for the
-	<acronym>NIC</acronym>, the
-	card needs to be configured.  It
+	<acronym>NIC</acronym>, the card needs to be configured.  It
 	may have been configured at installation time by
 	&man.sysinstall.8;.</para>
 
@@ -1088,13 +1038,12 @@ lo0: flags=8049&lt;UP,LOOPBACK,RUNNING,M
       <para>&os; uses the driver name followed by the order in which
 	the card is detected at boot to name the
 	<acronym>NIC</acronym>.  For example,
-	<devicename>sis2</devicename> is
-	the third <acronym>NIC</acronym> on the system using the
-	&man.sis.4;
+	<devicename>sis2</devicename> is the third
+	<acronym>NIC</acronym> on the system using the &man.sis.4;
 	driver.</para>
 
-      <para>In this example, <devicename>dc0</devicename>
-	is up and running.  The key indicators are:</para>
+      <para>In this example, <devicename>dc0</devicename> is up and
+	running.  The key indicators are:</para>
 
       <orderedlist>
 	<listitem>
@@ -1104,26 +1053,26 @@ lo0: flags=8049&lt;UP,LOOPBACK,RUNNING,M
 
 	<listitem>
 	  <para>The card has an Internet (<literal>inet</literal>)
-	    address,
-	    <hostid role="ipaddr">192.168.1.3</hostid>.</para>
+	    address, <hostid
+	      role="ipaddr">192.168.1.3</hostid>.</para>
 	</listitem>
 
 	<listitem>
 	  <para>It has a valid subnet mask
-	    (<literal>netmask</literal>), where
-	    <hostid role="netmask">0xffffff00</hostid> is the same as
+	    (<literal>netmask</literal>), where <hostid
+	      role="netmask">0xffffff00</hostid> is the same as
 	    <hostid role="netmask">255.255.255.0</hostid>.</para>
 	</listitem>
 
 	<listitem>
-	  <para>It has a valid broadcast address,
-	    <hostid role="ipaddr">192.168.1.255</hostid>.</para>
+	  <para>It has a valid broadcast address, <hostid
+	      role="ipaddr">192.168.1.255</hostid>.</para>
 	</listitem>
 
 	<listitem>
 	  <para>The <acronym>MAC</acronym> address of the card
-	    (<literal>ether</literal>)
-	    is <hostid role="mac">00:a0:cc:da:da:da</hostid>.</para>
+	    (<literal>ether</literal>) is <hostid
+	      role="mac">00:a0:cc:da:da:da</hostid>.</para>
 	</listitem>
 
 	<listitem>
@@ -1157,14 +1106,12 @@ lo0: flags=8049&lt;UP,LOOPBACK,RUNNING,M
 
       <para>it would indicate the card has not been configured.</para>
 
-      <para>The card must be configured as
-	<username>root</username>.  The <acronym>NIC</acronym>
-	configuration can be performed from the command line with
-	&man.ifconfig.8; but will not persist after a reboot unless
-	the configuration is also added to
-	<filename>/etc/rc.conf</filename>.  Add a
-	line for each <acronym>NIC</acronym> present on the system,
-	as seen in
+      <para>The card must be configured as <username>root</username>.
+	The <acronym>NIC</acronym> configuration can be performed
+	from the command line with &man.ifconfig.8; but will not
+	persist after a reboot unless the configuration is also added
+	to <filename>/etc/rc.conf</filename>.  Add a line for each
+	<acronym>NIC</acronym> present on the system, as seen in
 	this example:</para>
 
       <programlisting>ifconfig_dc0="inet 192.168.1.3 netmask 255.255.255.0"
@@ -1172,31 +1119,27 @@ ifconfig_dc1="inet 10.0.0.1 netmask 255.
 
       <para>Replace <devicename>dc0</devicename> and
 	<devicename>dc1</devicename> and the <acronym>IP</acronym>
-	address information
-	with the correct values for the system.

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

From owner-svn-doc-projects@FreeBSD.ORG  Mon May 13 16:51:51 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id B7783435;
 Mon, 13 May 2013 16:51:51 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A9B66894;
 Mon, 13 May 2013 16:51:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4DGpp0V099678;
 Mon, 13 May 2013 16:51:51 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4DGpp30099677;
 Mon, 13 May 2013 16:51:51 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201305131651.r4DGpp30099677@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 13 May 2013 16:51:51 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41626 - projects/xml-tools/share/misc
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 May 2013 16:51:51 -0000

Author: gabor
Date: Mon May 13 16:51:51 2013
New Revision: 41626
URL: http://svnweb.freebsd.org/changeset/doc/41626

Log:
  - Add a boxed formatting for procedure descriptions

Modified:
  projects/xml-tools/share/misc/docbook.css

Modified: projects/xml-tools/share/misc/docbook.css
==============================================================================
--- projects/xml-tools/share/misc/docbook.css	Mon May 13 14:56:33 2013	(r41625)
+++ projects/xml-tools/share/misc/docbook.css	Mon May 13 16:51:51 2013	(r41626)
@@ -259,14 +259,14 @@ div.programlisting {
 	text-align: left;
 }
 
-.note, .tip, .important, .warning, .caution, .example {
+.note, .tip, .important, .warning, .caution, .example, div.procedure {
 	border-radius: 6px;
 	padding: 2ex 2ex;
 	margin: .75em 3em .75em 3em;
         line-height: 1.3;
 }
 
-.note {
+.note, div.procedure {
 	color: #222;
 	background: #eee;
 	border: 1px solid #ccc;
@@ -314,6 +314,12 @@ div.programlisting {
 	margin-right: 0;
 }
 
+.procedure-title {
+	font-weight: bold;
+        line-height: 1;
+        margin-right: 0;
+}
+
 .note p, .tip p, .important p, .warning p, .caution p, .example p {
 	display: inline;
 }
@@ -331,6 +337,10 @@ div.programlisting {
 	font-weight: bold;
 }
 
+.userinput {
+	font-weight: normal;
+}
+
 pre.screen strong {
 	font-weight: normal;
 }

From owner-svn-doc-projects@FreeBSD.ORG  Mon May 13 16:52:32 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id D125D48C;
 Mon, 13 May 2013 16:52:32 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C36528A3;
 Mon, 13 May 2013 16:52:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4DGqWrX099838;
 Mon, 13 May 2013 16:52:32 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4DGqWn4099837;
 Mon, 13 May 2013 16:52:32 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201305131652.r4DGqWn4099837@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 13 May 2013 16:52:32 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41627 - projects/xml-tools/share/xsl
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 May 2013 16:52:32 -0000

Author: gabor
Date: Mon May 13 16:52:32 2013
New Revision: 41627
URL: http://svnweb.freebsd.org/changeset/doc/41627

Log:
  - Do not render commands in bold
  - Merge two patterns

Modified:
  projects/xml-tools/share/xsl/freebsd-common.xsl

Modified: projects/xml-tools/share/xsl/freebsd-common.xsl
==============================================================================
--- projects/xml-tools/share/xsl/freebsd-common.xsl	Mon May 13 16:51:51 2013	(r41626)
+++ projects/xml-tools/share/xsl/freebsd-common.xsl	Mon May 13 16:52:32 2013	(r41627)
@@ -8,11 +8,7 @@
   <!-- Global customisation -->
 
   <!-- Redefine variables, and replace templates as necessary here -->
-  <xsl:template match="hostid|username|groupname|devicename|maketarget|makevar">
-    <xsl:call-template name="inline.monoseq"/>
-  </xsl:template>
-
-  <xsl:template match="userinput">
+  <xsl:template match="hostid|username|groupname|devicename|maketarget|makevar|userinput|command">
     <xsl:call-template name="inline.monoseq"/>
   </xsl:template>
 

From owner-svn-doc-projects@FreeBSD.ORG  Wed May 15 13:40:07 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 705AD285;
 Wed, 15 May 2013 13:40:07 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 62A6EE68;
 Wed, 15 May 2013 13:40:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4FDe7oR043551;
 Wed, 15 May 2013 13:40:07 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4FDe71j043550;
 Wed, 15 May 2013 13:40:07 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201305151340.r4FDe71j043550@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 15 May 2013 13:40:07 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41629 - projects/xml-tools/share/mk
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 May 2013 13:40:07 -0000

Author: gabor
Date: Wed May 15 13:40:06 2013
New Revision: 41629
URL: http://svnweb.freebsd.org/changeset/doc/41629

Log:
  - The old LANGCODE detection was bogus and did not work properly with
    release notes. Use a different approach that works.

Modified:
  projects/xml-tools/share/mk/doc.common.mk

Modified: projects/xml-tools/share/mk/doc.common.mk
==============================================================================
--- projects/xml-tools/share/mk/doc.common.mk	Tue May 14 14:06:32 2013	(r41628)
+++ projects/xml-tools/share/mk/doc.common.mk	Wed May 15 13:40:06 2013	(r41629)
@@ -20,20 +20,8 @@ DOC_PREFIX_NAME?=	head
 .endif
 
 .if (!defined(LANGCODE) || empty(LANGCODE))
-# Calculate _LANGCODE.
-_LANGCODE:=	${.CURDIR}
-. for _ in 1 2 3 4 5 6 7 8 9 10
-.  if !(${_LANGCODE:H:T} == ${DOC_PREFIX_NAME})
-_LANGCODE:=	${_LANGCODE:H}
-.  endif
-. endfor
-_LANGCODE:=	${_LANGCODE:T}
-.else # (!defined(LANGCODE) || empty(LANGCODE))
-# when LANGCODE is defined, use the value.
-_LANGCODE?=	${LANGCODE}
-.endif # (!defined(LANGCODE) || empty(LANGCODE))
-
-LANGCODE?=	${_LANGCODE}
+LANGCODE!=	echo ${.CURDIR} | grep -o '[a-z]*_[A-Z]*\.[-A-Za-z0-9]*' || true
+.endif
 
 # normalize DOC_PREFIX
 DOC_PREFIX!=	${REALPATH} ${DOC_PREFIX}

From owner-svn-doc-projects@FreeBSD.ORG  Wed May 15 13:40:52 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 13A50314;
 Wed, 15 May 2013 13:40:52 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 06F9FE7E;
 Wed, 15 May 2013 13:40:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4FDepmX045126;
 Wed, 15 May 2013 13:40:51 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4FDepMN045125;
 Wed, 15 May 2013 13:40:51 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201305151340.r4FDepMN045125@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 15 May 2013 13:40:51 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41630 - projects/xml-tools/share/mk
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 May 2013 13:40:52 -0000

Author: gabor
Date: Wed May 15 13:40:51 2013
New Revision: 41630
URL: http://svnweb.freebsd.org/changeset/doc/41630

Log:
  - Properly support EXTRA_CATALOGS (they are now XML catalogs)

Modified:
  projects/xml-tools/share/mk/doc.xml.mk

Modified: projects/xml-tools/share/mk/doc.xml.mk
==============================================================================
--- projects/xml-tools/share/mk/doc.xml.mk	Wed May 15 13:40:06 2013	(r41629)
+++ projects/xml-tools/share/mk/doc.xml.mk	Wed May 15 13:40:51 2013	(r41630)
@@ -6,6 +6,9 @@ XML_CATALOG_FILES=	file://${.OBJDIR}/cat
 			file://${DOC_PREFIX}/share/xml/catalog.xml \
 			file://${DOC_PREFIX}/share/xml/catalog-common.xml \
 			file://${LOCALBASE}/share/xml/catalog
+.if defined(EXTRA_CATALOGS)
+XML_CATALOG_FILES+=	${EXTRA_CATALOGS}
+.endif
 
 .if exists(${DOC_PREFIX}/share/xml/catalog-cwd.xml)
 XML_CATALOG_CWD=	${DOC_PREFIX}/share/xml/catalog-cwd.xml

From owner-svn-doc-projects@FreeBSD.ORG  Wed May 15 13:42:25 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id CDC4D4AC;
 Wed, 15 May 2013 13:42:25 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C15EAE9A;
 Wed, 15 May 2013 13:42:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4FDgP4O045574;
 Wed, 15 May 2013 13:42:25 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4FDgP9T045572;
 Wed, 15 May 2013 13:42:25 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201305151342.r4FDgP9T045572@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 15 May 2013 13:42:25 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41631 - projects/xml-tools/share/xml
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 May 2013 13:42:25 -0000

Author: gabor
Date: Wed May 15 13:42:25 2013
New Revision: 41631
URL: http://svnweb.freebsd.org/changeset/doc/41631

Log:
  - Add a releasetype profiling attribute that will be used in the release
    notes to avoid the ugly workaround of that parameter entities can only
    be used in DTD subset now.

Modified:
  projects/xml-tools/share/xml/freebsd45.dtd

Modified: projects/xml-tools/share/xml/freebsd45.dtd
==============================================================================
--- projects/xml-tools/share/xml/freebsd45.dtd	Wed May 15 13:40:51 2013	(r41630)
+++ projects/xml-tools/share/xml/freebsd45.dtd	Wed May 15 13:42:25 2013	(r41631)
@@ -32,7 +32,11 @@
 <!ENTITY % edition.attrib
 	"edition	CDATA		#IMPLIED">
 
-<!ENTITY % local.effectivity.attrib "%edition.attrib;">
+<!ENTITY % releasetype.attrib
+	"releasetype	CDATA		#IMPLIED">
+
+<!ENTITY % local.effectivity.attrib "%edition.attrib;
+				     %releasetype.attrib;">
 
 <!ELEMENT xi:include (xi:fallback?)>
 

From owner-svn-doc-projects@FreeBSD.ORG  Wed May 15 14:07:05 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 1398FCCF;
 Wed, 15 May 2013 14:07:05 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 038DEAC;
 Wed, 15 May 2013 14:07:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4FE74ch053784;
 Wed, 15 May 2013 14:07:04 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4FE72ec053763;
 Wed, 15 May 2013 14:07:02 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201305151407.r4FE72ec053763@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 15 May 2013 14:07:02 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41632 - in projects/xml-tools:
 de_DE.ISO8859-1/htdocs/docs de_DE.ISO8859-1/share/xml
 en_US.ISO8859-1/articles/contributors
 en_US.ISO8859-1/articles/mailing-list-faq en_US.ISO8859-1/art...
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 May 2013 14:07:05 -0000

Author: gabor
Date: Wed May 15 14:07:01 2013
New Revision: 41632
URL: http://svnweb.freebsd.org/changeset/doc/41632

Log:
  - MFH

Added:
  projects/xml-tools/en_US.ISO8859-1/htdocs/news/status/report-2013-01-2013-03.xml
     - copied unchanged from r41631, head/en_US.ISO8859-1/htdocs/news/status/report-2013-01-2013-03.xml
Deleted:
  projects/xml-tools/en_US.ISO8859-1/htdocs/docproj/sgml.xml
  projects/xml-tools/ja_JP.eucJP/htdocs/docproj/sgml.xml
Modified:
  projects/xml-tools/de_DE.ISO8859-1/htdocs/docs/books.xml
  projects/xml-tools/de_DE.ISO8859-1/share/xml/news.xml
  projects/xml-tools/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
  projects/xml-tools/en_US.ISO8859-1/articles/mailing-list-faq/article.xml
  projects/xml-tools/en_US.ISO8859-1/articles/new-users/article.xml
  projects/xml-tools/en_US.ISO8859-1/books/faq/book.xml
  projects/xml-tools/en_US.ISO8859-1/htdocs/community/irc.xml
  projects/xml-tools/en_US.ISO8859-1/htdocs/community/webresources.xml
  projects/xml-tools/en_US.ISO8859-1/htdocs/docproj/Makefile
  projects/xml-tools/en_US.ISO8859-1/htdocs/docproj/docproj.xml
  projects/xml-tools/en_US.ISO8859-1/htdocs/features.xml
  projects/xml-tools/en_US.ISO8859-1/htdocs/news/status/Makefile
  projects/xml-tools/en_US.ISO8859-1/htdocs/news/status/status.xml
  projects/xml-tools/en_US.ISO8859-1/htdocs/releases/8.4R/schedule.xml
  projects/xml-tools/en_US.ISO8859-1/htdocs/releases/index.xml
  projects/xml-tools/en_US.ISO8859-1/htdocs/releng/index.xml
  projects/xml-tools/en_US.ISO8859-1/htdocs/security/security.xml
  projects/xml-tools/ja_JP.eucJP/books/handbook/users/chapter.xml
  projects/xml-tools/ja_JP.eucJP/htdocs/community/webresources.xml
  projects/xml-tools/ja_JP.eucJP/htdocs/docproj/Makefile
  projects/xml-tools/ja_JP.eucJP/htdocs/docproj/docproj.xml
  projects/xml-tools/ja_JP.eucJP/htdocs/java/index.xml
  projects/xml-tools/ja_JP.eucJP/htdocs/java/news.xml
  projects/xml-tools/ja_JP.eucJP/htdocs/releases/index.xml
  projects/xml-tools/ja_JP.eucJP/htdocs/security/security.xml
  projects/xml-tools/ja_JP.eucJP/share/xml/news.xml
  projects/xml-tools/nl_NL.ISO8859-1/articles/Makefile
  projects/xml-tools/nl_NL.ISO8859-1/books/handbook/book.xml
  projects/xml-tools/nl_NL.ISO8859-1/books/handbook/jails/chapter.xml
  projects/xml-tools/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.xml
  projects/xml-tools/nl_NL.ISO8859-1/books/handbook/pgpkeys/chapter.xml
  projects/xml-tools/nl_NL.ISO8859-1/books/handbook/security/chapter.xml
  projects/xml-tools/nl_NL.ISO8859-1/books/handbook/x11/chapter.xml
  projects/xml-tools/nl_NL.ISO8859-1/htdocs/administration.xml
  projects/xml-tools/nl_NL.ISO8859-1/htdocs/features.xml
  projects/xml-tools/nl_NL.ISO8859-1/htdocs/where.xml
  projects/xml-tools/nl_NL.ISO8859-1/share/xml/mailing-lists.ent
  projects/xml-tools/nl_NL.ISO8859-1/share/xml/navibar.l10n.ent
  projects/xml-tools/ru_RU.KOI8-R/articles/mailing-list-faq/Makefile
  projects/xml-tools/ru_RU.KOI8-R/articles/mailing-list-faq/article.xml
  projects/xml-tools/ru_RU.KOI8-R/articles/new-users/Makefile
  projects/xml-tools/ru_RU.KOI8-R/articles/new-users/article.xml
  projects/xml-tools/share/xml/commercial.isp.xml
  projects/xml-tools/share/xml/mirrors.xml
  projects/xml-tools/share/xml/news.xml
  projects/xml-tools/share/xml/release.ent
Directory Properties:
  projects/xml-tools/   (props changed)
  projects/xml-tools/de_DE.ISO8859-1/   (props changed)
  projects/xml-tools/en_US.ISO8859-1/   (props changed)
  projects/xml-tools/ja_JP.eucJP/   (props changed)
  projects/xml-tools/nl_NL.ISO8859-1/   (props changed)
  projects/xml-tools/ru_RU.KOI8-R/   (props changed)
  projects/xml-tools/share/   (props changed)

Modified: projects/xml-tools/de_DE.ISO8859-1/htdocs/docs/books.xml
==============================================================================
--- projects/xml-tools/de_DE.ISO8859-1/htdocs/docs/books.xml	Wed May 15 13:42:25 2013	(r41631)
+++ projects/xml-tools/de_DE.ISO8859-1/htdocs/docs/books.xml	Wed May 15 14:07:01 2013	(r41632)
@@ -161,10 +161,6 @@
         CVSROOT-Infrastruktur wie der des FreeBSD Projects
         einrichtet.</p>
 
-    <p><a href="&url.articles;/cvsup-advanced/index.html">CVSup
-        Advanced Points</a> (cvsup-advanced)<br/>
-      Ein Artikel, der die Feinheiten von CVSup beschreibt.</p>
-
     <p><a href="&url.articles.de;/explaining-bsd/index.html">
         Hintergrundwissen zu BSD</a> (explaining-bsd)<br/>
       Eine Antwort auf die Frage: "Was ist BSD?"</p>
@@ -192,7 +188,7 @@
       Tipps und Tricks, wie man am besten die gewünschten
         Informationen von der Mailingliste -questions erhält.</p>
 
-    <p><a href="&url.articles;/freebsd-update-server/index.html">Build
+    <p><a href="&url.articles.de;/freebsd-update-server/index.html">Build
         Your Own FreeBSD Update Server</a> (freebsd-update-server)<br/>
       Der Einsatz eines FreeBSD Update-Servers erlaubt es
         Systemadministratoren, Updates für mehrere Maschinen

Modified: projects/xml-tools/de_DE.ISO8859-1/share/xml/news.xml
==============================================================================
--- projects/xml-tools/de_DE.ISO8859-1/share/xml/news.xml	Wed May 15 13:42:25 2013	(r41631)
+++ projects/xml-tools/de_DE.ISO8859-1/share/xml/news.xml	Wed May 15 14:07:01 2013	(r41632)
@@ -4,7 +4,7 @@
 <!--
      $FreeBSD$
      $FreeBSDde$
-     basiert auf: r41524
+     basiert auf: r41569
 -->
 
 <!-- Simple schema for FreeBSD Project news.
@@ -39,6 +39,26 @@
     <name>2013</name>
 
     <month>
+      <name>5</name>
+
+      <day>
+	<name>8</name>
+
+	<event>
+	  <title>&os;&nbsp;8.4-RC3 verfügbar</title>
+
+	  <p>Der dritte Release Candidate aus dem &os;-8.4-Releasezyklus
+	    ist <a
+	    href="&lists.stable;/2013-May/073389.html">verfügbar</a>.
+	    ISO-Images für die Architekturen amd64, i386 sowie
+	    pc98 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>
+    </month>
+    
+    <month>
       <name>4</name>
 
       <day>

Modified: projects/xml-tools/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Wed May 15 13:42:25 2013	(r41631)
+++ projects/xml-tools/en_US.ISO8859-1/articles/contributors/contrib.additional.xml	Wed May 15 14:07:01 2013	(r41632)
@@ -9248,7 +9248,7 @@
 
     <listitem>
       <para>Sergei Vyshenski
-	<email>svysh@pn.sinp.msu.ru</email></para>
+	<email>svysh.fbsd@gmail.com</email></para>
     </listitem>
 
     <listitem>

Modified: projects/xml-tools/en_US.ISO8859-1/articles/mailing-list-faq/article.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/articles/mailing-list-faq/article.xml	Wed May 15 13:42:25 2013	(r41631)
+++ projects/xml-tools/en_US.ISO8859-1/articles/mailing-list-faq/article.xml	Wed May 15 14:07:01 2013	(r41632)
@@ -306,14 +306,6 @@
 
 	      <itemizedlist>
 		<listitem>
-		  <para>cc:Mail</para>
-		</listitem>
-
-		<listitem>
-		  <para>&eudora; (older versions)</para>
-		</listitem>
-
-		<listitem>
 		  <para>exmh</para>
 		</listitem>
 
@@ -322,22 +314,11 @@
 		</listitem>
 
 		<listitem>
-		  <para>&microsoft; Internet Mail</para>
-		</listitem>
-
-		<listitem>
 		  <para>&microsoft; &outlook;</para>
 		</listitem>
-
-		<listitem>
-		  <para>&netscape; (older versions)</para>
-		</listitem>
 	      </itemizedlist>
 
-	      <para>As you can see, the mailers in the Microsoft world
-		are frequent offenders.  If at all possible, use a &unix;
-		mailer. If you must use a mailer under Microsoft
-		environments, make sure it is set up correctly.  Try not
+	      <para>Try not
 		to use <acronym>MIME</acronym>: a lot of people use mailers
 		which do not get on very well with
 		<acronym>MIME</acronym>.</para>

Modified: projects/xml-tools/en_US.ISO8859-1/articles/new-users/article.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/articles/new-users/article.xml	Wed May 15 13:42:25 2013	(r41631)
+++ projects/xml-tools/en_US.ISO8859-1/articles/new-users/article.xml	Wed May 15 14:07:01 2013	(r41632)
@@ -27,7 +27,6 @@
       &tm-attrib.freebsd;
       &tm-attrib.ibm;
       &tm-attrib.microsoft;
-      &tm-attrib.netscape;
       &tm-attrib.opengroup;
       &tm-attrib.general;
     </legalnotice>
@@ -854,24 +853,18 @@
       your network running yet and there was no file for the port in
       <filename>/cdrom/ports/distfiles</filename>, you will have to
       get the distfile using another machine and copy it to
-      <filename>/usr/ports/distfiles</filename> from a floppy or your
-      DOS partition.  Read <filename>Makefile</filename> (with
+      <filename>/usr/ports/distfiles</filename>.
+      Read <filename>Makefile</filename> (with
       <command>cat</command> or <command>more</command> or
       <command>view</command>) to find out where to go (the master
-      distribution site) to get the file and what its name is.  Its
-      name will be truncated when downloaded to DOS, and after you get
-      it into <filename>/usr/ports/distfiles</filename> you will have to
-      rename it (with the <command>mv</command> command) to its
-      original name so it can be found.  (Use binary file transfers!)
+      distribution site) to get the file and what its name is.
+      (Use binary file transfers!)
       Then go back to <filename>/usr/local/kermit</filename>, find the
       directory with <filename>Makefile</filename>, and type
       <command>make all install</command>.</para>
 
     <para>The other thing that happens when installing ports or
-      packages is that some other program is needed.  If the
-      installation stops with a message <errorname>can't find
-	unzip</errorname> or whatever, you might need to install the
-      package or port for unzip before you continue.</para>
+      packages is that some other program is needed.</para>
 
     <para>Once it is installed type <command>rehash</command> to make
       FreeBSD reread the files in the path so it knows what is there.
@@ -885,37 +878,6 @@
       want is in the directory you are in, you need to type
       <filename>./</filename> before the command to make it work; no
       space after the slash.)</para>
-
-    <para>You might want to get the most recent version of &netscape;
-      from their <ulink url="ftp://ftp.netscape.com/">FTP site</ulink>.
-      (&netscape; requires the X Window System.) There is now a FreeBSD
-      version, so look around carefully.  Just use <command>gunzip
-      <replaceable>filename</replaceable></command> and <command>tar
-      xvf <replaceable>filename</replaceable></command> on it, move
-      the binary to <filename>/usr/local/bin</filename> or some other
-      place binaries are kept, <command>rehash</command>, and then put
-      the following lines in <filename>.cshrc</filename> in each
-      user's home directory or (easier) in
-      <filename>/etc/csh.cshrc</filename>, the system-wide
-      <command>csh</command> start-up file:</para>
-
-    <informalexample>
-      <programlisting>setenv XKEYSYMDB /usr/X11R6/lib/X11/XKeysymDB
-setenv XNLSPATH /usr/X11R6/lib/X11/nls</programlisting>
-    </informalexample>
-
-    <para>This assumes that the file <filename>XKeysymDB</filename>
-      and the directory <filename>nls</filename> are in
-      <filename>/usr/X11R6/lib/X11</filename>; if they are not, find
-      them and put them there.</para>
-
-    <para>If you originally got &netscape; as a port using the CDROM (or
-      FTP), do not replace <filename>/usr/local/bin/netscape</filename>
-      with the new netscape binary; this is just a shell script that
-      sets up the environment variables for you.  Instead rename the
-      new binary to <filename>netscape.bin</filename> and replace the
-      old binary, which is
-      <filename>/usr/local/netscape/netscape</filename>.</para>
   </sect1>
 
   <sect1 id="your-working-environment">

Modified: projects/xml-tools/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/books/faq/book.xml	Wed May 15 13:42:25 2013	(r41631)
+++ projects/xml-tools/en_US.ISO8859-1/books/faq/book.xml	Wed May 15 14:07:01 2013	(r41632)
@@ -1674,28 +1674,6 @@
 	</qandaentry>
 
 	<qandaentry>
-	  <question id="smp-support">
-	    <para>Does &os; support Symmetric Multiprocessing
-	      (SMP)?</para>
-	  </question>
-
-	  <answer>
-	    <para>Symmetric multi-processor (SMP) systems are generally
-	      supported by &os;, although in some cases, BIOS or
-	      motherboard bugs may generate some problems.</para>
-
-	    <para>&os; will take advantage of HyperThreading (HTT)
-	      support on &intel; CPUs that support this feature.  A kernel
-	      with the <literal>options SMP</literal> option, enabled
-	      by default,
-	      will automatically detect the additional logical
-	      processors.</para>
-
-	    <para>&man.smp.4; has more details.</para>
-	  </answer>
-	</qandaentry>
-
-	<qandaentry>
 	  <question id="microcode">
 	    <para>What is microcode?
 	      How do I install &intel; CPU microcode updates?</para>
@@ -1755,11 +1733,7 @@
 
 	  <answer>
 	    <para>&os; supports SCSI and QIC-36 (with a QIC-02
-	      interface).  This includes 8-mm (aka Exabyte) and DAT
-	      drives.</para>
-
-	    <para>Some of the early 8-mm drives are not quite compatible
-	      with SCSI-2, and may not work well with &os;.</para>
+	      interface).</para>
 	  </answer>
 	</qandaentry>
 
@@ -2046,7 +2020,7 @@ bindkey ^[[3~ delete-char # for xterm</p
 		system, it may also be buggy code, but more often than not
 		these problems are found and fixed long before us
 		general FAQ readers get to use these bits of code (that
-		is what -current is for).</para>
+		is what -CURRENT is for).</para>
 	    </listitem>
 	  </orderedlist>
 
@@ -2823,22 +2797,6 @@ kern.timecounter.hardware: TSC -&gt; i82
       </qandaentry>
 
       <qandaentry>
-	<question id="database-systems">
-	  <para>Are there any Database systems for &os;?</para>
-	</question>
-
-	<answer>
-	  <para>Yes!  See the <ulink
-	      url="&url.base;/commercial/software_bycat.html#category_database">Commercial Vendors</ulink>
-	    section of &os;'s Web site.</para>
-
-	  <para>Also see the <ulink
-	      url="&url.base;/ports/databases.html">Databases</ulink>
-	    section of the Ports Collection.</para>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
 	<question id="convert-back-from-pkgng">
 	  <para>How can I convert from pkgng to the old package
 	    tools?</para>

Modified: projects/xml-tools/en_US.ISO8859-1/htdocs/community/irc.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/htdocs/community/irc.xml	Wed May 15 13:42:25 2013	(r41631)
+++ projects/xml-tools/en_US.ISO8859-1/htdocs/community/irc.xml	Wed May 15 14:07:01 2013	(r41632)
@@ -23,7 +23,7 @@
 	  	want to try these or any other channels on IRC, it is nonetheless
 	        at your own risk and any complaints about conduct on those channels
 		should not be directed to the FreeBSD project.  See also
-		<a href="&base;/doc/en_US.ISO8859-1/books/faq/support.html#IRC">the FAQ entry</a> for
+		<a href="&base;/doc/en_US.ISO8859-1/books/faq/support.html#irc">the FAQ entry</a> for
 	more information.</p>
 
 

Modified: projects/xml-tools/en_US.ISO8859-1/htdocs/community/webresources.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/htdocs/community/webresources.xml	Wed May 15 13:42:25 2013	(r41631)
+++ projects/xml-tools/en_US.ISO8859-1/htdocs/community/webresources.xml	Wed May 15 14:07:01 2013	(r41632)
@@ -37,7 +37,7 @@
 
 		  <li><a href="http://www.FreeBSD-fr.org/">French</a></li>
 
-		  <li><a href="http://www.hu.FreeBSD.org/hu/">Hungarian</a></li>
+		  <li><a href="http://bsd.hu/">Hungarian</a></li>
 
 		  <li><a href="http://www.FreeBSD.or.id">Indonesian</a></li>
 

Modified: projects/xml-tools/en_US.ISO8859-1/htdocs/docproj/Makefile
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/htdocs/docproj/Makefile	Wed May 15 13:42:25 2013	(r41631)
+++ projects/xml-tools/en_US.ISO8859-1/htdocs/docproj/Makefile	Wed May 15 14:07:01 2013	(r41632)
@@ -11,7 +11,6 @@ DOCS=   current.xml
 DOCS+=	doc-set.xml
 DOCS+=	handbook.xml
 DOCS+=	handbook3.xml
-DOCS+=  sgml.xml
 DOCS+=  submitting.xml
 DOCS+=  who.xml
 DOCS+=  translations.xml

Modified: projects/xml-tools/en_US.ISO8859-1/htdocs/docproj/docproj.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/htdocs/docproj/docproj.xml	Wed May 15 13:42:25 2013	(r41631)
+++ projects/xml-tools/en_US.ISO8859-1/htdocs/docproj/docproj.xml	Wed May 15 14:07:01 2013	(r41632)
@@ -65,12 +65,6 @@
     <p>This page outlines the components of the FreeBSD Documentation Set, and
       the sort of work that the Documentation Project does with them.</p>
 
-    <h2><a href="sgml.html">SGML and the Documentation Project</a></h2>
-
-    <p>The project uses SGML for the documentation. This page
-      outlines how this is accomplished, and directs the interested reader to
-      further SGML resources.</p>
-
     <h2><a href="submitting.html">Submitting Documentation</a></h2>
 
     <p>Submitting documentation is the best way to become a part of the

Modified: projects/xml-tools/en_US.ISO8859-1/htdocs/features.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/htdocs/features.xml	Wed May 15 13:42:25 2013	(r41631)
+++ projects/xml-tools/en_US.ISO8859-1/htdocs/features.xml	Wed May 15 14:07:01 2013	(r41632)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html PUBLIC "-//FreeBSD//DTD XHTML 1.0 Transitional-Based Extension//EN"
 "http://www.FreeBSD.org/XML/doc/share/xml/xhtml10-freebsd.dtd" [
-<!ENTITY title "About FreeBSD's Technological Advances">
+<!ENTITY title "About &os;'s Technological Advances">
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -63,8 +63,8 @@
 	  per-process, per-jail, and per-login class resource
 	  accounting information.  Note that this is neither built nor
 	  installed by default.  To build and install this, specify
-	  options RACCT in the kernel configuration file and rebuild
-	  the base system as described in the FreeBSD Handbook</li>
+	  the option RACCT in the kernel configuration file and rebuild
+	  the base system as described in the &os; Handbook.</li>
 
 	<li><b>Resource-limiting API:</b> has been implemented.
 	  It works in conjunction with the RACCT resource accounting
@@ -74,9 +74,9 @@
 	  rules in userland.  Note that this is neither  built nor
 	  installed by default.</li>
 
-	<li><b>Usb:</b> subsystem now supports USB packet filter.
+	<li><b>USB:</b> subsystem now supports USB packet filter.
 	  This allows capturing packets which go through each USB
-	  host rchitecture of the packet filter is similar to that of
+	  host.  The architecture of the packet filter is similar to that of
 	  bpf.  The userland program usbdump(8) has been
 	  added.</li>
 
@@ -102,9 +102,9 @@
 	  for background fsck(8) even on unclean shutdowns.</li>
       </ul>
 
-      <p><b>&os;&nbsp;8.x</b> brought many new
+      <p><b>&os;&nbsp;8.X</b> brought many new
 	features and performance enhancements.  With special focus on
-	a new USB stack, &os;-8.x also shipped with experimental support
+	a new USB stack, &os;&nbsp;8.X also shipped with experimental support
 	for NFSv4.  A new TTY layer was introduced, which improves
 	scalability and resources handling in SMP enabled systems.</p>
 
@@ -126,10 +126,10 @@
 
 	<li><b>Linux emulation:</b> layer has been updated to version
 	  2.6.16 and the default Linux infrastructure port is now
-	  emulators/linux_base-f10 (Fedora 10)</li>
+	  emulators/linux_base-f10 (Fedora 10).</li>
 
 	<li><b>Network Virtualization:</b> A container ("vimage") has
-	  been implemented, extending the FreeBSD kernel to maintain
+	  been implemented, extending the &os; kernel to maintain
 	  multiple independent instances of networking state.
 	  Vimage facilities can be used independently to create fully
 	  virtualized network topologies, and jail(8) can directly

Modified: projects/xml-tools/en_US.ISO8859-1/htdocs/news/status/Makefile
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/htdocs/news/status/Makefile	Wed May 15 13:42:25 2013	(r41631)
+++ projects/xml-tools/en_US.ISO8859-1/htdocs/news/status/Makefile	Wed May 15 14:07:01 2013	(r41632)
@@ -58,6 +58,7 @@ XMLDOCS+=	report-2012-01-2012-03
 XMLDOCS+=	report-2012-04-2012-06
 XMLDOCS+=	report-2012-07-2012-09
 XMLDOCS+=	report-2012-10-2012-12
+XMLDOCS+=	report-2013-01-2013-03
 
 XSLT.DEFAULT=	report.xsl
 

Copied: projects/xml-tools/en_US.ISO8859-1/htdocs/news/status/report-2013-01-2013-03.xml (from r41631, head/en_US.ISO8859-1/htdocs/news/status/report-2013-01-2013-03.xml)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/xml-tools/en_US.ISO8859-1/htdocs/news/status/report-2013-01-2013-03.xml	Wed May 15 14:07:01 2013	(r41632, copy of r41631, head/en_US.ISO8859-1/htdocs/news/status/report-2013-01-2013-03.xml)
@@ -0,0 +1,1662 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<!DOCTYPE report PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Status Report//EN" "http://www.FreeBSD.org/XML/www/share/xml/statusreport.dtd" >
+<!-- $FreeBSD$ -->
+<report>
+  <date>
+    <month>January-March</month>
+
+    <year>2013</year>
+  </date>
+
+  <section>
+    <title>Introduction</title>
+
+    <p>This report covers &os;-related projects between January and
+      March 2013. This is the first of four reports planned for 2013.</p>
+
+    <p>Highlights from this status report include the busy preparations
+      of 8.4-RELEASE, restoration of binary package building, steady
+      progress of several porting efforts, like work on the &os; ports
+      of xorg, GNOME, KDE, and Xfce, bringing &os; to Cubieboard and
+      Hackberry boards, development of ARM and AMD GPU support,
+      improving performance of UFS/FFS and callouts, and introducing a
+      multipath TCP implementation for the network stack.</p>
+
+    <p>Thanks to all the reporters for the excellent work!  This report
+      contains 31 entries and we hope you enjoy reading it.</p>
+
+    <p>The deadline for submissions covering the period between April
+      and June 2013 is July 7th, 2013.</p>
+  </section>
+
+  <category>
+    <name>proj</name>
+
+    <description>Projects</description>
+  </category>
+
+  <category>
+    <name>team</name>
+
+    <description>&os; Team Reports</description>
+  </category>
+
+  <category>
+    <name>kern</name>
+
+    <description>Kernel</description>
+  </category>
+
+  <category>
+    <name>docs</name>
+
+    <description>Documentation</description>
+  </category>
+
+  <category>
+    <name>arch</name>
+
+    <description>Architectures</description>
+  </category>
+
+  <category>
+    <name>ports</name>
+
+    <description>Ports</description>
+  </category>
+
+  <category>
+    <name>misc</name>
+
+    <description>Miscellaneous</description>
+  </category>
+
+  <project cat='team'>
+    <title>&os; Core Team</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Core Team</given>
+	</name>
+	<email>core@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links/>
+
+    <body>
+      <p>At the end of 2012, the Core Team approved using Google
+	Analytics on the Project web site to enable the Documentation
+	Engineering Team to collect statistics on its usage for better
+	profiling.  In the first quarter of 2013, the Core Team worked
+	with the Documentation Engineering Team to finalize the
+	associated policies.</p>
+
+      <p>Due to some debates around the political correctness of quotes
+	added for the fortune(6) utility, the corresponding data file
+	has been removed from the base system in -CURRENT.</p>
+
+      <p>In light of the security incident, the liaison role between the
+	Core Team and the Security Team has been restored, with Gavin
+	Atkinson assuming this role.  The Core Team work hard on
+	resolving the current situation of the binary package building
+	cluster and the associated security problems in tight
+	cooperation with the Ports Management Team, Cluster
+	Administators, and the &os; Foundation Board.  The <a
+	  href="http://www.FreeBSD.org/news/2012-compromise.html">compromise page</a>
+	is kept updated on the results.</p>
+
+      <p>The &os; Project submitted an application for Google Summer of
+	Code this year again.</p>
+
+      <p>There was access granted for 2 new committers and 1 commit bit
+	was taken for safekeeping in this quarter.</p>
+    </body>
+  </project>
+
+  <project cat='team'>
+    <title>&os; Port Managers</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Thomas</given>
+	  <common>Abthorpe</common>
+	</name>
+	<email>portmgr-secretary@FreeBSD.org</email>
+      </person>
+
+      <person>
+	<name>
+	  <given>Port</given>
+	  <common>Management Team</common>
+	</name>
+	<email>portmgr@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="http://www.FreeBSD.org/ports/"/>
+      <url href="http://www.freebsd.org/doc/en/articles/contributing-ports/"/>
+      <url href="http://portsmon.freebsd.org/"/>
+      <url href="http://www.freebsd.org/portmgr/"/>
+      <url href="http://blogs.freebsdish.org/portmgr/"/>
+      <url href="http://www.twitter.com/freebsd_portmgr/"/>
+      <url href="http://www.facebook.com/portmgr"/>
+    </links>
+
+    <body>
+      <p>The ports tree contains approximately 24,300 ports, while the
+	PR count still is close to 1600.</p>
+
+      <p>In the first quarter we added 4 new committers, took in 1
+	commit bit for safe keeping, and re-instated 1 commit bit.</p>
+
+      <p>In February, Mark Linimon (linimon) stepped down from his
+	duties in the team.  Mark had been the longest serving member of
+	the team.  Mark had spent many long hours refactoring and
+	documenting the portbuild software to ensure that pointyhat
+	services could be restored.</p>
+
+      <p>After a security review, redports.org was turned back on,
+	restoring Tinderbox services to contributors, along with post
+	commit QATs.  In addition, pointyhat infrastructure had also
+	undergone a review and work begain on restoring the package
+	build system.</p>
+
+      <p>Erwin Lansing (erwin) and Martin Wilke (miwi) took on the
+	principle roles of getting the portbuild software installed and
+	running on pointyhat.  As a result of all their hard work,
+	portmgr@ was finally able to resume doing -exp runs, preparing
+	packages for the upcoming 8.4 release, as well as getting a set
+	of 9.1 packages retroactively prepared.</p>
+
+      <p>After many long years of being the defacto standard for the
+	Project, CVS support for the ports tree officially ended on
+	February 28.</p>
+
+      <p>The ports tree was tagged with <tt>RELEASE_7_EOL</tt>, to
+	coincide with the end of life for &os;&nbsp;7.X.</p>
+
+      <p>Beat Gaetzi (beat) stepped down from his duties on portmgr@ in
+	March.  Among his notable contributions, was the task of migrating
+	the Ports Tree from the old CVS repo to Subversion.</p>
+
+      <p>Bryan Drewery (bdrewery) joined the Ports Management team in
+	March, bringing with him his wealth of knowledge and skill from
+	maintaining portupgrade, portmaster, assisting with pkgng, as
+	well as co-developing poudriere.</p>
+    </body>
+
+    <help>
+      <task>Most ports PRs are assigned, we now need to focus on
+	testing, committing and closing.</task>
+    </help>
+  </project>
+
+  <project cat='docs'>
+    <title>The &os; Japanese Documentation Project</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Hiroki</given>
+	  <common>Sato</common>
+	</name>
+	<email>hrs@FreeBSD.org</email>
+      </person>
+
+      <person>
+	<name>
+	  <given>Ryusuke</given>
+	  <common>Suzuki</common>
+	</name>
+	<email>ryusuke@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="http://www.FreeBSD.org/ja/">Japanese &os; Web Page</url>
+      <url href="http://www.jp.FreeBSD.org/doc-jp/">The &os; Japanese Documentation Project Web Page</url>
+    </links>
+
+    <body>
+      <p>Web page (<tt>htdocs</tt>): Newsflash and some other updates in
+	the English version have been translated to keep them up-to-date.
+	Specifically, the release related contents were updated in this
+	period.</p>
+
+      <p>Books: &os; Handbook has constantly been updated since the last
+	report; particularly, "ports", "desktop" section were largely
+	updated.  Some progress has been made in the
+	"advanced-networking" section, contributed by a new
+	translator.</p>
+
+      <p><q>Writing &os; Problem Reports</q> article is now in sync with
+	the English version.</p>
+    </body>
+
+    <help>
+      <task>Further translation work of outdated documents in
+	ja_JP.eucJP subtree.</task>
+    </help>
+  </project>
+
+  <project cat='arch'>
+    <title>&os; on Cubieboard</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Ganbold</given>
+	  <common>Tsagaankhuu</common>
+	</name>
+	<email>ganbold@FreeBSD.org</email>
+      </person>
+
+      <person>
+	<name>
+	  <given>Oleksandr</given>
+	  <common>Tymoshenko</common>
+	</name>
+	<email>gonzo@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links/>
+
+    <body>
+      <p>Initial support of Allwinner A10 SoC is committed to -CURRENT.
+	&os; is now running on boards such as Cubieboard, Hackberry and
+	it supports following peripherals:</p>
+
+      <ul>
+	<li>USB EHCI</li>
+	<li>GPIO</li>
+      </ul>
+    </body>
+
+    <help>
+      <task>Get EMAC Ethernet driver working.  Need more help from
+	network driver experts.</task>
+      <task>Implement more drivers.</task>
+    </help>
+  </project>
+
+  <project cat='kern'>
+    <title>Multipath TCP (MPTCP) for &os;</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Nigel</given>
+	  <common>Williams</common>
+	</name>
+	<email>njwilliams@swin.edu.au</email>
+      </person>
+
+      <person>
+	<name>
+	  <given>Lawrence</given>
+	  <common>Stewart</common>
+	</name>
+	<email>lastewart@swin.edu.au</email>
+      </person>
+
+      <person>
+	<name>
+	  <given>Grenville</given>
+	  <common>Armitage</common>
+	</name>
+	<email>garmitage@swin.edu.au</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="http://caia.swin.edu.au/urp/newtcp/mptcp/tools.html"/>
+      <url href="http://caia.swin.edu.au/newtcp/mptcp/"/>
+      <url href="http://caia.swin.edu.au/reports/130424A/CAIA-TR-130424A.pdf"/>
+      <url href="https://pub.allbsd.org/FreeBSD-snapshots/"/>
+    </links>
+
+    <body>
+      <p>We have been working to create a BSD-licensed implementation of
+	Multipath TCP &mdash; a set of TCP extensions that allow for
+	transparent multipath operation with multiple IP addresses as
+	specified in experimental RFC6824.</p>
+
+      <p>We made our first v0.1 public release on 2013-03-11 and
+	recently released v0.3 on 2013-04-16.  The code is currently
+	considered to be of alpha quality.  We are working towards
+	pushing the code into a &os; Subversion repository project
+	branch to continue the on-going development effort in a more
+	publicly accessible location.  As part of this move, we hope to
+	begin releasing regular snapshot installer ISOs of the MPTCP
+	project branch courtesy of Hiroki Sato and the allbsd.org daily
+	snapshot infrastructure.</p>
+
+      <p>We are about to release a CAIA technical report 130424A
+	entitled <q>Design Overview of Multipath TCP version 0.3 for
+	&os;&nbsp;10</q> on 2013-04-24 which provides a high-level
+	design and architecture overview of the v0.3 code release.</p>
+
+      <p>Going forward, we expect to continue development and release
+	additional technical reports and academic papers covering topics
+	such as performance analysis and multipath congestion
+	control/scheduling.</p>
+    </body>
+
+    <help>
+      <task>The code is currently of alpha quality so we welcome all
+	testing feedback, but please familiarize yourself with the README
+	file and "Known Limitations" section in particular before
+	jumping in.</task>
+    </help>
+  </project>
+
+  <project cat='kern'>
+    <title>TCP-AO Authentication Option</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Andr&eacute;</given>
+	  <common>Oppermann</common>
+	</name>
+	<email>andre@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="http://svnweb.freebsd.org/base/user/andre/tcp-ao/">SVN branch</url>
+    </links>
+
+    <body>
+      <p>Work is under way to implement TCP-AO (TCP Authentication
+	Option) according to RFC5925 and RFC5926.  TCP-AO is an
+	extension to TCP-MD5 signatures commonly used in routers to
+	secure BGP routing protocol sessions against spoofing attacks.
+	The work is under contract and sponsored by Juniper
+	Networks.</p>
+    </body>
+  </project>
+
+  <project cat='kern'>
+    <title>Atomic "close-on-exec"</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Jilles</given>
+	  <common>Tjoelker</common>
+	</name>
+	<email>jilles@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="https://wiki.freebsd.org/AtomicCloseOnExec"/>
+    </links>
+
+    <body>
+      <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
+	problems (if the child process has lower privilege).  One
+	solution is various new APIs that set the <q>close-on-exec</q>
+	flag atomically with allocating a file descriptor.  Some
+	existing software will use the new features if present or will
+	even refuse to compile without them.</p>
+
+      <p>Various parts have been present for some time.</p>
+
+      <p>In first quarter of 2013, extensions to <tt>recvmsg()</tt>,
+	<tt>socket()</tt>, <tt>socketpair()</tt> and
+	<tt>posix_openpt()</tt> have been added.</p>
+    </body>
+  </project>
+
+  <project cat='misc'>
+    <title>BXR.SU &mdash; Super User's BSD Cross Reference</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Constantine A.</given>
+	  <common>Murenin</common>
+	</name>
+	<email>cnst++@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="http://bxr.su/">BXR.SU &mdash; Super User's BSD Cross Reference</url>
+      <url href="http://lists.freebsd.org/pipermail/freebsd-hackers/2013-April/042334.html"/>
+    </links>
+
+    <body>
+      <p>Super User's BSD Cross Reference (BXR.SU) is a new source-code
+	search engine that covers the complete kernel and non-GNU
+	userland source trees of &os;, NetBSD, OpenBSD, and DragonFly
+	BSD.</p>
+
+      <p>BXR.SU is optimised to be very fast, has daily updates of all
+	the trees, and also acts as a deterministic URL shortener.</p>
+
+      <p>BXR.SU is based on an OpenGrok fork, but it is more than just
+	OpenGrok.  We have fixed a number of annoyances, eliminated
+	features that just never worked right from the outright, and
+	provided integration with tools like CVSweb (including great
+	mirrors like allbsd.org), &os;'s ViewVC (SVN), as well as GitHub
+	and Gitweb from <tt>git.freebsd.your.org</tt>, plus a tad of
+	other improvements, including a complete rewrite of an mdoc
+	parser.  Last, but definitely not least, is an extensive set of
+	nginx rewrite rules that makes it a breeze to use BXR.SU as a
+	deterministic URL compactor for referencing BSD source code.
+	For example, the <tt>http://bxr.su/f/kern/sched_ule.c</tt> URL
+	will automatically redirect to
+	<tt>http://bxr.su/FreeBSD/sys/kern/sched_ule.c</tt> through
+	nginx.</p>
+
+      <p>Note that according to the release schedule of BXR.SU, there is
+	no IPv4 glue until 2013-04-24; otherwise, the service is available
+	via both IPv4 and IPv6.  See the 2013-04-01 announcement on the
+	freebsd-hackers mailing list for more details.</p>
+    </body>
+
+    <help>
+      <task>Find up-to-date git repositories (served with Gitweb) of
+	NetBSD and OpenBSD.</task>
+      <task>Find a Gitweb mirror of &os; that is faster than GitHub and
+	Gitorious.</task>
+    </help>
+  </project>
+
+  <project cat='team'>
+    <title>&os; Postmaster Team</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>David</given>
+	  <common>Wolfskill</common>
+	</name>
+	<email>postmaster@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links/>
+
+    <body>
+      <p>In the first quarter of 2013, the &os; Postmaster Team has
+	implemented the following items that may be interest of the
+	general public:</p>
+
+      <ul>
+	<li>Changes in configuration of Mailman-managed lists: allow to
+	  accept the <tt>application/pkcs7-signature</tt> MIME type (in
+	  addition to the <tt>application/x-pkcs7-signature</tt> MIME
+	  type), thus permitting S/MIME signatures on list mail.</li>
+
+	<li>New lists: <tt>freebsd-ops-announce</tt> &mdash;
+	  announcements of infrastructure issues, and <tt>freebsd-pkg</tt>
+	  &mdash; discussion of binary package management and package
+	  tools.</li>
+      </ul>
+    </body>
+  </project>
+
+  <project cat='team'>
+    <title>&os; Bugmeister Team</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Eitan</given>
+	  <common>Adler</common>
+	</name>
+	<email>eadler@FreeBSD.org</email>
+      </person>
+
+      <person>
+	<name>
+	  <given>Gavin</given>
+	  <common>Atkinson</common>
+	</name>
+	<email>gavin@FreeBSD.org</email>
+      </person>
+
+      <person>
+	<name>
+	  <given>Oleksandr</given>
+	  <common>Tymoshenko</common>
+	</name>
+	<email>gonzo@FreeBSD.org</email>
+      </person>
+    </contact>
+
+  <links/>
+
+  <body>
+    <p>The &os; Bugmeister Team are continuing to evaluate options for
+	alternate bug trackers and have narrowed their choices to two
+	possibilities: Bugzilla and roundup.</p>
+
+    <p>The number of non-ports PRs have remained relatively static over
+	the last three months, with as many coming in as being closed.
+	The number of ports PRs have increased recently, largely due to
+	the ports freeze for the upcoming 8.4-RELEASE.</p>
+
+    <p>The Bugmeister team continue work on trying to make the contents
+	of the GNATS PR database cleaner, more accessible and easier for
+	committers to find and resolve PRs, by tagging PRs to indicate
+	the areas involved, and by ensuring that there is sufficient
+	info within each PR to resolve each issue.</p>
+
+    <p>As always, anybody interested in helping out with the PR queue is
+	welcome to join us in <tt>#freebsd-bugbusters</tt> on EFnet.  We
+	are always looking for additional help, whether your interests
+	lie in triaging incoming PRs, generating patches to resolve
+	existing problems, or simply helping with the database
+	housekeeping (identifying duplicate PRs, ones that have already
+	been resolved, etc).  This is a great way of getting more
+	involved with &os;!</p>
+    </body>
+
+    <help>
+      <task>Finalize the decision of which new bug tracker to
+	use.</task>
+
+      <task>Get more users involved with triaging PRs as they come
+	in.</task>
+
+      <task>Assist committers with closing PRs.</task>
+    </help>
+  </project>
+
+  <project cat='kern'>
+    <title>callout(9) Improvements</title>
+
+    <contact>
+      <person>
+	<name>
+	  <given>Davide</given>
+	  <common>Italiano</common>
+	</name>
+	<email>davide@FreeBSD.org</email>
+      </person>
+
+      <person>
+	<name>
+	  <given>Alexander</given>
+	  <common>Motin</common>
+	</name>
+	<email>mav@FreeBSD.org</email>
+      </person>
+    </contact>
+
+    <links>
+      <url href="http://people.freebsd.org/~davide/asia/callout_paper.pdf"/>
+      <url href="http://people.freebsd.org/~davide/asia/calloutng.pdf"/>
+      <url href="http://svnweb.freebsd.org/base?view=revision&amp;revision=247777"/>
+    </links>
+
+    <body>
+      <p>In &os;, timers are provided by the callout facility, which
+	allows to register a function with an argument to be called at
+	specified future time.  The subsystem suffered of some problems,
+	such as the impossibility of handling high-resolution events or
+	its inherent periodic structure, which may lead to spurious
+	wakeups and higher power consumption.  Some consumers, such as
+	high-speed networking, VoIP and other real-time applications
+	need a better precision than the one currently allowed.  Also,
+	especially with the ubiquity of laptops in the last years, the

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

From owner-svn-doc-projects@FreeBSD.ORG  Fri May 17 16:02:27 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 677F74A6;
 Fri, 17 May 2013 16:02:27 +0000 (UTC)
 (envelope-from trhodes@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 497C78DD;
 Fri, 17 May 2013 16:02:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4HG2Q3u014101;
 Fri, 17 May 2013 16:02:26 GMT (envelope-from trhodes@svn.freebsd.org)
Received: (from trhodes@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4HG2Qn7014100;
 Fri, 17 May 2013 16:02:26 GMT (envelope-from trhodes@svn.freebsd.org)
Message-Id: <201305171602.r4HG2Qn7014100@svn.freebsd.org>
From: Tom Rhodes <trhodes@FreeBSD.org>
Date: Fri, 17 May 2013 16:02:26 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41639 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/mac
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 May 2013 16:02:27 -0000

Author: trhodes
Date: Fri May 17 16:02:26 2013
New Revision: 41639
URL: http://svnweb.freebsd.org/changeset/doc/41639

Log:
  Fix bad titles (<sect2> tags) by replacing them with
  a bullet list containing the procedure items.
  
  Done to shut up: bcr

Modified:
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/mac/chapter.xml

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/mac/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/mac/chapter.xml	Fri May 17 14:11:38 2013	(r41638)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/mac/chapter.xml	Fri May 17 16:02:26 2013	(r41639)
@@ -1807,14 +1807,11 @@ setpmac biba/10\(10-10\) /usr/local/etc/
 
     <para>This section discusses common configuration issues.</para>
 
-    <sect2>
-      <title><option>multilabel</option> cannot be enabled on
-	<filename>/</filename></title>
-
-      <para>The<option>multilabel</option> flag does not stay
+    <itemizedlist>
+      <listitem>
+      <para>The <option>multilabel</option> flag does not stay
 	enabled on my root (<filename>/</filename>) partition!</para>
 
-
       <para>The following steps may resolve this transient
 	error:</para>
 
@@ -1853,12 +1850,9 @@ setpmac biba/10\(10-10\) /usr/local/etc/
 	    root file system.</para>
 	</step>
       </procedure>
-    </sect2>
-
-    <sect2>
-      <title>Xorg Server Will Not Start After
-	<acronym>MAC</acronym></title>
+    </listitem>
 
+    <listitem>
       <para>After establishing a secure environment with
 	<acronym>MAC</acronym>, I am no longer able to start
 	Xorg!</para>
@@ -1892,15 +1886,14 @@ setpmac biba/10\(10-10\) /usr/local/etc/
 	    the &a.questions; mailing list.</para>
 	</step>
       </procedure>
-    </sect2>
+    </listitem>
 
-    <sect2>
-      <title>Error: &man..secure.path.3; cannot stat
-	<filename>.login_conf</filename></title>
+    <listitem>
+      <para>The error: <errorname>_secure_path: unable to stat .login_conf</errorname> shows up.</para>
 
       <para>When a user attempts to switch from the
 	<username>root</username> user to another user in the system,
-	the error message <errorname>_secure_path: unable to state
+	the error message <errorname>_secure_path: unable to stat
 	  .login_conf</errorname> appears.</para>
 
       <para>This message is usually shown when the user has a higher
@@ -1915,10 +1908,11 @@ setpmac biba/10\(10-10\) /usr/local/etc/
 	the Biba integrity model will not permit
 	<username>root</username> to view objects set at a lower
 	integrity level.</para>
-    </sect2>
+    </listitem>
 
-    <sect2>
-      <title>The <username>root</username> username is broken!</title>
+    <listitem>
+      <para>The system no longer recognizes the
+      <username>root</username> user.</para>
 
       <para>In normal or even single user mode, the
 	<username>root</username> is not recognized,
@@ -1942,6 +1936,7 @@ setpmac biba/10\(10-10\) /usr/local/etc/
 	system and access would be blocked as the file has inherited
 	the new label.  Disable the policy using &man.sysctl.8; and
 	everything should return to normal.</para>
-    </sect2>
+    </listitem>
+  </itemizedlist>
   </sect1>
 </chapter>

From owner-svn-doc-projects@FreeBSD.ORG  Fri May 17 17:26:21 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 5CD19256;
 Fri, 17 May 2013 17:26:21 +0000 (UTC)
 (envelope-from trhodes@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4F4ECCD3;
 Fri, 17 May 2013 17:26:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4HHQLJI042958;
 Fri, 17 May 2013 17:26:21 GMT (envelope-from trhodes@svn.freebsd.org)
Received: (from trhodes@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4HHQLwc042957;
 Fri, 17 May 2013 17:26:21 GMT (envelope-from trhodes@svn.freebsd.org)
Message-Id: <201305171726.r4HHQLwc042957@svn.freebsd.org>
From: Tom Rhodes <trhodes@FreeBSD.org>
Date: Fri, 17 May 2013 17:26:21 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41640 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/mac
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 May 2013 17:26:21 -0000

Author: trhodes
Date: Fri May 17 17:26:20 2013
New Revision: 41640
URL: http://svnweb.freebsd.org/changeset/doc/41640

Log:
  Whitespace love after previous commit.

Modified:
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/mac/chapter.xml

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/mac/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/mac/chapter.xml	Fri May 17 16:02:26 2013	(r41639)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/mac/chapter.xml	Fri May 17 17:26:20 2013	(r41640)
@@ -1809,134 +1809,135 @@ setpmac biba/10\(10-10\) /usr/local/etc/
 
     <itemizedlist>
       <listitem>
-      <para>The <option>multilabel</option> flag does not stay
-	enabled on my root (<filename>/</filename>) partition!</para>
+	<para>The <option>multilabel</option> flag does not stay
+	  enabled on my root (<filename>/</filename>) partition!</para>
 
-      <para>The following steps may resolve this transient
-	error:</para>
+	<para>The following steps may resolve this transient
+	  error:</para>
 
-      <procedure>
-	<step>
-	  <para>Edit <filename>/etc/fstab</filename> and set the root
-	    partition to <option>ro</option> for read-only.</para>
-	</step>
-
-	<step>
-	  <para>Reboot into single user mode.</para>
-	</step>
+        <procedure>
+	  <step>
+	    <para>Edit <filename>/etc/fstab</filename> and set the root
+	      partition to <option>ro</option> for read-only.</para>
+	  </step>
+
+	  <step>
+	    <para>Reboot into single user mode.</para>
+	  </step>
 
-	<step>
-	  <para>Run <command>tunefs</command> <option>-l
+	  <step>
+	    <para>Run <command>tunefs</command> <option>-l
 	      enable</option>
-	    on <filename>/</filename>.</para>
-	</step>
+	      on <filename>/</filename>.</para>
+	  </step>
 
-	<step>
-	  <para>Reboot the system.</para>
-	</step>
-
-	<step>
-	  <para>Run <command>mount</command> <option>-urw</option>
-	    <filename>/</filename> and change the <option>ro</option>
-	    back to <option>rw</option> in
-	    <filename>/etc/fstab</filename> and reboot the system
-	    again.</para>
-	</step>
-
-	<step>
-	  <para>Double-check the output from
-	    <command>mount</command> to ensure that
-	    <option>multilabel</option> has been properly set on the
-	    root file system.</para>
-	</step>
-      </procedure>
-    </listitem>
-
-    <listitem>
-      <para>After establishing a secure environment with
-	<acronym>MAC</acronym>, I am no longer able to start
-	Xorg!</para>
-
-      <para>This could be caused by the <acronym>MAC</acronym>
-	<literal>partition</literal> policy or by a mislabeling in
-	one of the <acronym>MAC</acronym> labeling policies.  To
-	debug, try the following:</para>
-
-      <procedure>
-	<step>
-	  <para>Check the error message; if the user is in the
-	    <literal>insecure</literal> class, the
-	    <literal>partition</literal> policy may be the culprit.
-	    Try setting the user's class back to the
-	    <literal>default</literal> class and rebuild the database
-	    with <command>cap_mkdb</command>.  If this does not
-	    alleviate the problem, go to step two.</para>
-	</step>
-
-	<step>
-	  <para>Double-check the label policies.  Ensure that the
-	    policies are set correctly for the user, the Xorg
-	    application, and the <filename
-	      class="directory">/dev</filename> entries.</para>
-	</step>
-
-	<step>
-	  <para>If neither of these resolve the problem, send the
-	    error message and a description of the environment to
-	    the &a.questions; mailing list.</para>
-	</step>
-      </procedure>
-    </listitem>
-
-    <listitem>
-      <para>The error: <errorname>_secure_path: unable to stat .login_conf</errorname> shows up.</para>
-
-      <para>When a user attempts to switch from the
-	<username>root</username> user to another user in the system,
-	the error message <errorname>_secure_path: unable to stat
+	  <step>
+	    <para>Reboot the system.</para>
+	  </step>
+
+	  <step>
+	    <para>Run <command>mount</command> <option>-urw</option>
+	      <filename>/</filename> and change the <option>ro</option>
+	      back to <option>rw</option> in
+	      <filename>/etc/fstab</filename> and reboot the system
+	      again.</para>
+	  </step>
+
+	  <step>
+	    <para>Double-check the output from
+	      <command>mount</command> to ensure that
+	      <option>multilabel</option> has been properly set on the
+	      root file system.</para>
+	  </step>
+	</procedure>
+      </listitem>
+
+      <listitem>
+        <para>After establishing a secure environment with
+	  <acronym>MAC</acronym>, I am no longer able to start
+	  Xorg!</para>
+
+        <para>This could be caused by the <acronym>MAC</acronym>
+	  <literal>partition</literal> policy or by a mislabeling in
+	  one of the <acronym>MAC</acronym> labeling policies.  To
+	  debug, try the following:</para>
+
+	<procedure>
+	  <step>
+	      <para>Check the error message; if the user is in the
+	      <literal>insecure</literal> class, the
+	      <literal>partition</literal> policy may be the culprit.
+	      Try setting the user's class back to the
+	      <literal>default</literal> class and rebuild the database
+	      with <command>cap_mkdb</command>.  If this does not
+	      alleviate the problem, go to step two.</para>
+	  </step>
+
+	  <step>
+	    <para>Double-check the label policies.  Ensure that the
+	      policies are set correctly for the user, the Xorg
+	      application, and the <filename
+		class="directory">/dev</filename> entries.</para>
+	  </step>
+
+	  <step>
+	    <para>If neither of these resolve the problem, send the
+	      error message and a description of the environment to
+	      the &a.questions; mailing list.</para>
+	  </step>
+	</procedure>
+      </listitem>
+
+      <listitem>
+	<para>The error: <errorname>_secure_path: unable to stat
+	  .login_conf</errorname> shows up.</para>
+
+        <para>When a user attempts to switch from the
+	  <username>root</username> user to another user in the system,
+	  the error message <errorname>_secure_path: unable to stat
 	  .login_conf</errorname> appears.</para>
 
-      <para>This message is usually shown when the user has a higher
-	label setting than that of the user they are attempting to
-	become.  For instance, <username>joe</username> has a default
-	label of <option>biba/low</option>.  The
-	<username>root</username> user, who has a label of
-	<option>biba/high</option>, cannot view
-	<username>joe</username>'s home directory.  This will happen
-	whether or not <username>root</username> has used
-	<command>su</command> to become <username>joe</username> as
-	the Biba integrity model will not permit
-	<username>root</username> to view objects set at a lower
-	integrity level.</para>
-    </listitem>
-
-    <listitem>
-      <para>The system no longer recognizes the
-      <username>root</username> user.</para>
-
-      <para>In normal or even single user mode, the
-	<username>root</username> is not recognized,
-	<command>whoami</command> returns 0 (zero), and
-	<command>su</command> returns <errorname>who are
+	<para>This message is usually shown when the user has a higher
+	  label setting than that of the user they are attempting to
+	  become.  For instance, <username>joe</username> has a default
+	  label of <option>biba/low</option>.  The
+	  <username>root</username> user, who has a label of
+	  <option>biba/high</option>, cannot view
+	  <username>joe</username>'s home directory.  This will happen
+	  whether or not <username>root</username> has used
+	  <command>su</command> to become <username>joe</username> as
+	  the Biba integrity model will not permit
+	  <username>root</username> to view objects set at a lower
+	  integrity level.</para>
+      </listitem>
+
+      <listitem>
+	<para>The system no longer recognizes the
+	  <username>root</username> user.</para>
+
+	<para>In normal or even single user mode, the
+	  <username>root</username> is not recognized,
+	  <command>whoami</command> returns 0 (zero), and
+	  <command>su</command> returns <errorname>who are
 	  you?</errorname>.</para>
 
-      <para>This can happen if a labeling policy has been disabled,
-	either by a &man.sysctl.8; or the policy module was unloaded.
-	If the policy is disabled, the login capabilities database
-	needs to be reconfigured with <option>label</option> removed.
-	Double check <filename>login.conf</filename> to ensure that
-	all <option>label</option> options have been removed and
-	rebuild the database with <command>cap_mkdb</command>.</para>
-
-      <para>This may also happen if a policy restricts access to
-	<filename>master.passwd</filename>.  This is usually caused by
-	an administrator altering the file under a label which
-	conflicts with the general policy being used by the system.
-	In these cases, the user information would be read by the
-	system and access would be blocked as the file has inherited
-	the new label.  Disable the policy using &man.sysctl.8; and
-	everything should return to normal.</para>
-    </listitem>
-  </itemizedlist>
+	<para>This can happen if a labeling policy has been disabled,
+	  either by a &man.sysctl.8; or the policy module was unloaded.
+	  If the policy is disabled, the login capabilities database
+	  needs to be reconfigured with <option>label</option> removed.
+	  Double check <filename>login.conf</filename> to ensure that
+	  all <option>label</option> options have been removed and
+	  rebuild the database with <command>cap_mkdb</command>.</para>
+
+	<para>This may also happen if a policy restricts access to
+	  <filename>master.passwd</filename>.  This is usually caused by
+	  an administrator altering the file under a label which
+	  conflicts with the general policy being used by the system.
+	  In these cases, the user information would be read by the
+	  system and access would be blocked as the file has inherited
+	  the new label.  Disable the policy using &man.sysctl.8; and
+	  everything should return to normal.</para>
+      </listitem>
+    </itemizedlist>
   </sect1>
 </chapter>

From owner-svn-doc-projects@FreeBSD.ORG  Fri May 17 17:27:34 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 12BD729C;
 Fri, 17 May 2013 17:27:34 +0000 (UTC)
 (envelope-from trhodes@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0595FCDB;
 Fri, 17 May 2013 17:27:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4HHRXuB043191;
 Fri, 17 May 2013 17:27:33 GMT (envelope-from trhodes@svn.freebsd.org)
Received: (from trhodes@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4HHRXB7043190;
 Fri, 17 May 2013 17:27:33 GMT (envelope-from trhodes@svn.freebsd.org)
Message-Id: <201305171727.r4HHRXB7043190@svn.freebsd.org>
From: Tom Rhodes <trhodes@FreeBSD.org>
Date: Fri, 17 May 2013 17:27:33 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41641 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/security
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 May 2013 17:27:34 -0000

Author: trhodes
Date: Fri May 17 17:27:33 2013
New Revision: 41641
URL: http://svnweb.freebsd.org/changeset/doc/41641

Log:
  Add a section on rctl(8).
  
  Requested by:	someone (bcr?  dru?)

Modified:
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/security/chapter.xml

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/security/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/security/chapter.xml	Fri May 17 17:26:20 2013	(r41640)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/security/chapter.xml	Fri May 17 17:27:33 2013	(r41641)
@@ -89,6 +89,11 @@
 	<para>What Process Accounting is and how to enable it on
 	  &os;.</para>
       </listitem>
+
+      <listitem>
+	<para>Understand the resource limits database and
+	  how to utilize it to control user resources.</para>
+      </listitem>
     </itemizedlist>
 
     <para>Before reading this chapter, you should:</para>
@@ -3691,4 +3696,119 @@ VII. References <co id="co-ref"/></progr
 	&man.lastcomm.1;, &man.acct.5;, and &man.sa.8;.</para>
     </sect2>
   </sect1>
+
+  <sect1 id="security-resourcelimits">
+    <sect1info>
+      <authorgroup>
+       <author>
+         <firstname>Tom</firstname>
+         <surname>Rhodes</surname>
+         <contrib>Contributed by </contrib>
+       </author>
+      </authorgroup>
+    </sect1info>
+
+    <title>Resource Limits</title>
+
+    <indexterm>
+      <primary>Resource limits</primary>
+    </indexterm>
+
+    <para>For years, &os; has used a resource limits
+      database controlled through a flat file,
+      <filename>/etc/login.conf</filename>.  While it has
+      been discussed previously and is still supported, it
+      is not the most optimal method of controlling resources.
+      The flat file requires users to be divided into various
+      group labels known as classes, which require changes not
+      only to this flat file but also the password database.
+      Potentially a single, more constrained user would require
+      an additional label added, the resource database needs to be
+      built using <command>cap_mkdb</command>, edits made to
+      the <filename>/etc/master.passwd</filename> file.  In
+      addition, the password database must be rebuilt using
+      <command>pwd_mkdb</command>.  This multi-step process could be
+      very time consuming depending on how many users must be
+      singled out.</para>
+
+    <para>A new command in &os;, &man.rctl.8;, allows for a more
+      fine grained method of controlling resources limits for
+      users.  This command will support much more than users,
+      it will also set resource constraints on processes, jails,
+      and the original login class.  These advanced features
+      provide administrators and users with methods to control
+      resources through the command line and set rules on
+      system initialization using a configuration
+      file.</para>
+
+    <para>To enable this feature, add these lines to
+      <filename>GENERIC</filename>, or the custom kernel
+      configuration file, and rebuild.:</para>
+
+    <programlisting>options         RACCT
+options         RCTL</programlisting>
+
+    <para>The entire system will need rebuilt.  See <xref
+        linkend="kernelconfig"/>, which will provide instructions for
+      the process.  Once this is complete, the <command>rctl</command>
+      may be used to set rules for the system.</para>
+
+    <para>Rule syntax is simple, controlled through the use of
+      a <emphasis>subject</emphasis>, a <emphasis>subject-id</emphasis>,
+      <emphasis>resource</emphasis>, and <emphasis>action</emphasis>.
+      Take the following example rule:</para>
+
+    <programlisting>user:trhodes:<literal>maxproc</literal>:<literal>deny</literal>=10/user</programlisting>
+
+    <para>This rule shows a basic premise of a rule, here the
+      subject is <literal>user</literal> and the subject-id
+      is <literal>trhodes</literal>.  The maxproc is, of course,
+      max number of processes, which is considered the action.
+      The action here is set to <literal>deny</literal>, which blocks
+      any new processes from being created.  In the previous example,
+      the user, <literal>trhodes</literal> will be constrained
+      to <literal>10</literal> (ten) processes and no greater.
+      Other actions are available and could be log to the console,
+      pass a notification to &man.devd.8;, or
+      send a sigterm to the process.</para>
+
+    <para>Some care must be taken while adding rules.  The one above
+      will unfortunately block my user from doing the most simple tasks
+      after I have logged in and executed a <command>screen</command>
+      session.  When a resource limit has been hit, an error will
+      be printed, as in this example:</para>
+
+    <screen>&prompt.user; <userinput>man test</userinput>
+    /usr/bin/man: Cannot fork: Resource temporarily unavailable
+eval: Cannot fork: Resource temporarily unavailable</screen>
+
+    <para>For another example, &man.rctl.8; can be used to prevent
+      a jail from exceeding a memory limit.  This rule could be
+      written as:</para>
+
+    <screen>&prompt.root; <userinput>rctl -a jail:httpd:memoryuse:deny=2G/jail</userinput></screen>
+
+    <para>Rules may also persist across reboots if they have been
+      added to <filename>/etc/rctl.conf</filename> file.  The
+      format is a rule, without the preceding command.  For example,
+      the previous rule could be added like the following:</para>
+
+    <programlisting># Block jail from using more than 2G memory:
+jail:httpd:memoryuse:deny=2G/jail</programlisting>
+
+    <para>To remove a rule, just ask <command>rctl</command> to
+      remove it from the list:</para>
+
+    <screen>&prompt.root; <userinput>rctl -r user:trhodes:maxproc:deny=10/user</userinput></screen>
+
+    <para>The manual page shows a method for removing all rules;
+      however, if removing all rules for a single user is required,
+      this command may be issued:</para>
+
+    <screen>&prompt.root; <userinput>rctl -r user:trhodes</userinput></screen>
+
+    <para>Many other resources exist which can be used to excert
+      additional control over various <literal>subjects</literal>.
+      See &man.rctl.8; to learn about them.</para>
+  </sect1>
 </chapter>

From owner-svn-doc-projects@FreeBSD.ORG  Fri May 17 18:05:44 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id DFB38CA5;
 Fri, 17 May 2013 18:05:44 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D148CE2F;
 Fri, 17 May 2013 18:05:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4HI5iPF056943;
 Fri, 17 May 2013 18:05:44 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4HI5i1b056936;
 Fri, 17 May 2013 18:05:44 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201305171805.r4HI5i1b056936@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 17 May 2013 18:05:44 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41643 - in projects/xml-tools: en_US.ISO8859-1/books/faq
 en_US.ISO8859-1/books/fdp-primer/writing-style
 en_US.ISO8859-1/htdocs/news/status share/pgpkeys share/xml
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 May 2013 18:05:44 -0000

Author: gabor
Date: Fri May 17 18:05:43 2013
New Revision: 41643
URL: http://svnweb.freebsd.org/changeset/doc/41643

Log:
  - MFH

Modified:
  projects/xml-tools/en_US.ISO8859-1/books/faq/book.xml
  projects/xml-tools/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
  projects/xml-tools/en_US.ISO8859-1/htdocs/news/status/report-2013-01-2013-03.xml
  projects/xml-tools/share/pgpkeys/philip.key
  projects/xml-tools/share/xml/header.ent
  projects/xml-tools/share/xml/navibar.ent
Directory Properties:
  projects/xml-tools/   (props changed)
  projects/xml-tools/en_US.ISO8859-1/   (props changed)
  projects/xml-tools/share/   (props changed)

Modified: projects/xml-tools/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/books/faq/book.xml	Fri May 17 17:57:13 2013	(r41642)
+++ projects/xml-tools/en_US.ISO8859-1/books/faq/book.xml	Fri May 17 18:05:43 2013	(r41643)
@@ -1732,8 +1732,7 @@
 	  </question>
 
 	  <answer>
-	    <para>&os; supports SCSI and QIC-36 (with a QIC-02
-	      interface).</para>
+	    <para>&os; supports all standard SCSI tape interfaces.</para>
 	  </answer>
 	</qandaentry>
 

Modified: projects/xml-tools/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml	Fri May 17 17:57:13 2013	(r41642)
+++ projects/xml-tools/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml	Fri May 17 18:05:43 2013	(r41643)
@@ -479,6 +479,10 @@ GB.  Hardware compression &hellip;</lite
       </listitem>
 
       <listitem>
+	<para>read-only</para>
+      </listitem>
+
+      <listitem>
 	<para>web server</para>
       </listitem>
     </itemizedlist>

Modified: projects/xml-tools/en_US.ISO8859-1/htdocs/news/status/report-2013-01-2013-03.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/htdocs/news/status/report-2013-01-2013-03.xml	Fri May 17 17:57:13 2013	(r41642)
+++ projects/xml-tools/en_US.ISO8859-1/htdocs/news/status/report-2013-01-2013-03.xml	Fri May 17 18:05:43 2013	(r41643)
@@ -620,7 +620,7 @@
     </body>
 
     <help>
-      <task>Evaluating if it is worth to migrate any of the other
+      <task>Evaluating if it is worthwhile to migrate any of the other
 	callout(9) consumers to the new interface.</task>
       <task>Move callout consumers still using the legacy
 	timeout()/untimeout() interface to callout_*() in order to get
@@ -1096,7 +1096,7 @@
       <p>The project progressed well since February:</p>
 
       <ul>
-	<li>Konstantin committed is TTM port to 10-CURRENT.</li>
+	<li>Konstantin committed his TTM port to 10-CURRENT.</li>
 
 	<li>With the help of John Baldwin (jhb) and Andriy Gapon (avg),
 	  the Video BIOS situation greatly improved: the
@@ -1121,17 +1121,17 @@
 	 the VM folks.</li>
       </ul>
 
-      <p><a href="http://www.yakaz.com/">Yakaz</a> lended
+      <p><a href="http://www.yakaz.com/">Yakaz</a> loaned
 	Jean-S&eacute;bastien a computer which allows him to test a
 	RV630-based discrete card and, in the future, other PCIe cards.
 	Several users already kindly tested the driver.  Big thanks to
 	all those contributors!</p>
 
-      <p>In its current state, the driver allows to have a simple X
+      <p>In its current state, the driver allows a simple X
 	session (no OpenGL), run common applications, watch movies,
 	change the resolution and enable additional monitors with
 	<tt>xrandr(1)</tt>.  The most blocking issue now is the OpenGL
-	deadlock which prevents to run modern compositors/desktop
+	deadlock which prevents running modern compositors/desktop
 	environment, games and WebGL demos.  We are not ready for a
 	"Call For Testers" yet.</p>
     </body>

Modified: projects/xml-tools/share/pgpkeys/philip.key
==============================================================================
--- projects/xml-tools/share/pgpkeys/philip.key	Fri May 17 17:57:13 2013	(r41642)
+++ projects/xml-tools/share/pgpkeys/philip.key	Fri May 17 18:05:43 2013	(r41643)
@@ -10,8 +10,8 @@ uid                  Philip Paeps <phili
 uid                  Philip Paeps <philip@fosdem.org>
 uid                  Philip Paeps <philip@freebsd.org>
 uid                  Philip Paeps <philip@pub.telenet.be>
-sub   1024D/035EFC58 2006-10-22 [expires: 2010-10-13]
-sub   2048g/6E5FD7D6 2006-10-22 [expires: 2010-10-14]
+sub   1024D/035EFC58 2006-10-22
+sub   2048g/6E5FD7D6 2006-10-22
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -550,2146 +550,2999 @@ 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
-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
-7+GIRgQTEQIABgUCReNPuQAKCRCMJe4PDcC31mALAKC6vjgCJiOi08bYlK6wJIuB
-Ob1I+wCbBTIQK/GoP4pP/WQElaspEI9uJl6IRgQTEQIABgUCRerf2wAKCRBB3ByQ
-ckSXC5QqAJ9ic1QAEQxO4Us8nb7XDma0mgpc0gCgpug02QF2GHfWZcd1uRPyytIE
-CaqISgQQEQIACgUCRVSzOgMFA3gACgkQXyyEoT62BG3o2QCeP3ANQeCZqkeYOY76
-KBkmb8mvJYgAn282Syns2QBXaRdh32CSowOjVUK2iI0EEBECAE0FAkXxgyVGFIAA
-AAAADgAvIGZhbGNvQG00eC5vcmdodHRwOi8vZmFsY2FsLm5ldC9ncGcvMHgwMjFD
-NUJEMi0weEM1RDM0RDA1LmFzYwAKCRCnfEveAhxb0gWyAJ9Dvb+0THnTnzjpujK4
-6qx3w4GjbgCgk7+1sjtvEacRzzsFXpRB1GtRNmWIvAQQAQIABgUCRe++kgAKCRDt
-oh6UtWVxbx41BP9qnNahfVcdoIUx+SW0qgniCvpkqJe+MEZkW+Uctmc1MHMd0Isf
-mvLwsNJLVSKvbsnWhroGpHKas+L+IQ4/c/InfQ+2cgU2lYueqfJNQeL5KXVWvfuw
-8TsLDO89WNWRaxqPAmh8zmq0g3SMvZeYGHfUoTamCbGIFdP6JTtD/7Jr5u0A/VQ1
-NtHFOnKnyQeLxKiUE6VcqkCrHwZDU0+kNc3RiPUEEBECALUFAkU+WgyHFIAAAAAA
-EABuc2lnbm90ZXNAZ3JlcC5iZSJodHRwOi8vd3d3LmdyZXAuYmUvZ3BnLzQyNjcx
-MDEzRjk0QTBBQkVCNENFOUI2RDNERkMyQzYyQUY3OUQyOUUvMzU2QkFFMDI0NzYz
-RjczOTJGQTJFNDM4MjY0OUU2MjhDNUQzNEQwNS5hc2MiJhpodHRwOi8vd3d3Lmdy
-ZXAuYmUvZ3BnL2NlcnQtcG9saWN5LXYyAAoJED38LGKvedKe8vgAoJUZ/vyqJjh9
-O9J8v3WCn8OuBvUfAJsGpOOA7zm+c1tUK/ThAJ1LA6YPH4kBHAQQAQIABgUCRTy8
-LAAKCRCC0vbqxLuen3zTCACCuWXUoJQqS+pX4CX6gflKWf9Z4aHfHojtaJlo7tPQ
-re3dO2YB+5UpByiYIVNggrk8Im0nHnL4Cwt5OEmWBl1Ux766NH1IuWQWg4wwBOMt
-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
-Y29AbTR4Lm9yZ2h0dHA6Ly9mYWxjYWwubmV0L2dwZy8weDAyMUM1QkQyLTB4QzVE
-MzREMDUuYXNjAAoJEKd8S94CHFvSjMwAoJKRUhYm3g3GQc7Ax5Mvie9Mos/cAKCJ
-Ht3BGEU4sXrZQcq46mb8/z/p4Ij1BBARAgC1BQJFPloMhxSAAAAAABAAbnNpZ25v
-dGVzQGdyZXAuYmUiaHR0cDovL3d3dy5ncmVwLmJlL2dwZy80MjY3MTAxM0Y5NEEw
-QUJFQjRDRTlCNkQzREZDMkM2MkFGNzlEMjlFLzM1NkJBRTAyNDc2M0Y3MzkyRkEy
-RTQzODI2NDlFNjI4QzVEMzREMDUuYXNjIiYaaHR0cDovL3d3dy5ncmVwLmJlL2dw
-Zy9jZXJ0LXBvbGljeS12MgAKCRA9/Cxir3nSnia6AJ9WPIdOlKIIwOeSCBx0uYlM
-UM2tQACfQKbqhzbKM8RyO3QXO4XE3CybJ8aJARwEEAECAAYFAkU8vCwACgkQgtL2
-6sS7np+53Af/RSNZhaUC0B+D06crMIfkqfA2c2K6EJatcm9c7mXH5VLXKkkqjH7x
-80wOtDi3GKzZLOwCkwlk6d88eISpx9dBMipxUUlJqYC+a9FMWMaZgcLd7EPuDTuq
-kHfCHQLpPkMDXFIj+XP8T4pt3pdG1a+eoGUdz00KypSz2Fk64ylznd1XHEdexlW/
-I4E1ZAlWEmcLENobjarXiIHzcvJJj9GQXLCxO+b6H9Mew0OBLxcJZJzrurclo7Nh
-Nwh0JSEwkoB7xS6jerfSndbeKg6mJ1fGmmhkyvhe08/zv4ZyzP3rtArBqJq4sPJ3
-zCX/gqqkfm6Q4OMD8scaCCs59x6fdubPT4kBHAQQAQIABgUCRVdNPAAKCRAu1F1m
-YaBz6WyGB/9TroL46iD2Ya35k+/eQVEJzpRtNXZZ6BkSismkWY11psNGiYFyTJuK
-B72s8g+BAij8XmXnywrZYukz7IdHwWa0avkMGQ7kne5ATn2629UTbvQy9/ceStTZ
-mWjqTP1+g2ERDMmXM834cSimbFJBCW1SZllRBqchTBBtSrBLRomBOquEha+wffpe
-mMRG7F7d3ARGFsXG4oWgOV3BiKs+J+PV8ajolC1jDq7Tnrdy+FbOZJunkwdGmvKH
-GU1QnjzZV69+g0dzOif3gKi1gsrirce3YMQTpayINt3DZKdZw9ki3DCrizqTJU5h
-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

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

From owner-svn-doc-projects@FreeBSD.ORG  Fri May 17 19:23:19 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id D3E7AA7C;
 Fri, 17 May 2013 19:23:19 +0000 (UTC)
 (envelope-from trhodes@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B65C6176;
 Fri, 17 May 2013 19:23:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4HJNJIs085909;
 Fri, 17 May 2013 19:23:19 GMT (envelope-from trhodes@svn.freebsd.org)
Received: (from trhodes@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4HJNJH8085908;
 Fri, 17 May 2013 19:23:19 GMT (envelope-from trhodes@svn.freebsd.org)
Message-Id: <201305171923.r4HJNJH8085908@svn.freebsd.org>
From: Tom Rhodes <trhodes@FreeBSD.org>
Date: Fri, 17 May 2013 19:23:19 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41647 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/multimedia
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 May 2013 19:23:19 -0000

Author: trhodes
Date: Fri May 17 19:23:19 2013
New Revision: 41647
URL: http://svnweb.freebsd.org/changeset/doc/41647

Log:
  Axe the mythtv depends section and migrate it
  into the introduction area.  Slight wording
  tweaks for grammar.

Modified:
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml	Fri May 17 18:54:21 2013	(r41646)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml	Fri May 17 19:23:19 2013	(r41647)
@@ -1437,6 +1437,26 @@ bktr0: Pinnacle/Miro TV, Philips SECAM t
 	url="http://www.mythtv.org/wiki/">MythTV wiki</ulink> for
       more information on how to use MythTV.</para>
 
+      <para>MythTV requires a frontend and a backend; however,
+	it allows the user to have the frontend and backend on
+	different machines.</para>
+
+      <para>For the frontend, <filename
+	  role="package">multimedia/mythtv-frontend</filename> is
+	required, as well as an X server, which can be found in
+	<filename role="package">x11/xorg</filename>.  Ideally, the
+	frontend computer also has a video card that supports <acronym
+	  role="X-Video Motion Compensation">XvMC</acronym> and,
+	optionally, a <acronym role="Linux Infrared Remote
+	  Control">LIRC</acronym>-compatible remote.</para>
+
+      <para>For the backend, <filename
+	  role="package">multimedia/mythtv</filename> is required,
+	along with the &mysql; database server.  Optionally a tuner
+	and storage for any recorded data.  The &mysql; package should
+	be automatically installed as a dependency when installing
+	<filename role="package">multimedia/mythtv</filename>.</para>
+
     <sect2>
       <title>Hardware</title>
 
@@ -1469,29 +1489,6 @@ bktr0: Pinnacle/Miro TV, Philips SECAM t
     </sect2>
 
     <sect2>
-      <title>Dependencies</title>
-
-      <para>Being flexible and modular, MythTV allows the user to
-	have the frontend and backend on different machines.</para>
-
-      <para>For the frontend, <filename
-	  role="package">multimedia/mythtv-frontend</filename> is
-	required, as well as an X server, which can be found in
-	<filename role="package">x11/xorg</filename>.  Ideally, the
-	frontend computer also has a video card that supports <acronym
-	  role="X-Video Motion Compensation">XvMC</acronym> and,
-	optionally, a <acronym role="Linux Infrared Remote
-	  Control">LIRC</acronym>-compatible remote.</para>
-
-      <para>For the backend, <filename
-	  role="package">multimedia/mythtv</filename> is required,
-	as well as a &mysql; database, and optionally a tuner and
-	storage for recordings.  The &mysql; package should be
-	automatically installed as a dependency when installing
-	<filename role="package">multimedia/mythtv</filename>.</para>
-    </sect2>
-
-    <sect2>
       <title>Setting up MythTV</title>
 
       <para>To install the MythTV port:</para>

From owner-svn-doc-projects@FreeBSD.ORG  Fri May 17 20:08:12 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 14E53EDA;
 Fri, 17 May 2013 20:08:12 +0000 (UTC)
 (envelope-from trhodes@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E19F0325;
 Fri, 17 May 2013 20:08:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4HK8BAe001540;
 Fri, 17 May 2013 20:08:11 GMT (envelope-from trhodes@svn.freebsd.org)
Received: (from trhodes@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4HK8BDu001539;
 Fri, 17 May 2013 20:08:11 GMT (envelope-from trhodes@svn.freebsd.org)
Message-Id: <201305172008.r4HK8BDu001539@svn.freebsd.org>
From: Tom Rhodes <trhodes@FreeBSD.org>
Date: Fri, 17 May 2013 20:08:11 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41650 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/disks
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 May 2013 20:08:12 -0000

Author: trhodes
Date: Fri May 17 20:08:11 2013
New Revision: 41650
URL: http://svnweb.freebsd.org/changeset/doc/41650

Log:
  Axe the "why encrypt swap" mini-section and migrate
  the useful stuff into the section introduction.
  Re-word some sentences and a section name.
  
  Reviewed by:	bcr (quick look)

Modified:
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/disks/chapter.xml

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/disks/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/disks/chapter.xml	Fri May 17 19:56:43 2013	(r41649)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/disks/chapter.xml	Fri May 17 20:08:11 2013	(r41650)
@@ -3830,27 +3830,22 @@ geli_da2_flags="-p -k /root/da2.key"</pr
       <secondary>encrypting</secondary>
     </indexterm>
 
-    <para>Swap encryption in &os; is easy to configure.  Depending on
-      which version of &os; is being used, different options are
-      available and configuration can vary slightly.  The &man.gbde.8;
-      or &man.geli.8; encryption systems can be used for swap
-      encryption.  Both systems use the <filename>encswap</filename>
+    <para>Like the encryption of disk partitions, encryption of swap
+      space is used to protect sensitive information.  Consider an
+      application that deals with passwords.  As long as these
+      passwords stay in physical memory, these passwords will not
+      be written to disk and be cleared after a reboot.  If &os;
+      starts swapping out memory pages to free
+      space for other applications, the passwords may be written to
+      the disk platters unencrypted.  Encrypting swap space can be a
+      solution for this scenario.</para>
+
+    <para>The &man.gbde.8; or &man.geli.8; encryption systems may be
+      used for swap encryption.  Both systems use the
+      <filename>encswap</filename>
       <link linkend="configtuning-rcd">rc.d</link> script.</para>
 
     <sect2>
-      <title>Why Should Swap be Encrypted?</title>
-
-      <para>Like the encryption of disk partitions, encryption of swap
-	space is used to protect sensitive information.  Consider an
-	application that deals with passwords.  As long as these
-	passwords stay in physical memory, all is well.  However, if
-	the operating system starts swapping out memory pages to free
-	space for other applications, the passwords may be written to
-	the disk platters unencrypted.  Encrypting swap space can be a
-	solution for this scenario.</para>
-    </sect2>
-
-    <sect2>
       <title>Preparation</title>
 
       <note>
@@ -3907,7 +3902,7 @@ geli_da2_flags="-p -k /root/da2.key"</pr
     </sect2>
 
     <sect2>
-      <title>Verifying That it Works</title>
+      <title>Encrypted Swap Verification</title>
 
       <para>Once the system has rebooted, proper operation of the
 	encrypted swap can be verified using

From owner-svn-doc-projects@FreeBSD.ORG  Fri May 17 20:21:58 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 75C893ED;
 Fri, 17 May 2013 20:21:58 +0000 (UTC)
 (envelope-from trhodes@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4F4F438A;
 Fri, 17 May 2013 20:21:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4HKLvLD007798;
 Fri, 17 May 2013 20:21:57 GMT (envelope-from trhodes@svn.freebsd.org)
Received: (from trhodes@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4HKLvhD007797;
 Fri, 17 May 2013 20:21:57 GMT (envelope-from trhodes@svn.freebsd.org)
Message-Id: <201305172021.r4HKLvhD007797@svn.freebsd.org>
From: Tom Rhodes <trhodes@FreeBSD.org>
Date: Fri, 17 May 2013 20:21:57 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41652 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/disks
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 May 2013 20:21:58 -0000

Author: trhodes
Date: Fri May 17 20:21:57 2013
New Revision: 41652
URL: http://svnweb.freebsd.org/changeset/doc/41652

Log:
  Migrate the encypted swap preparation section into
  the introduction and do some wording tweaks to
  remove redundancy.

Modified:
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/disks/chapter.xml

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/disks/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/disks/chapter.xml	Fri May 17 20:12:00 2013	(r41651)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/disks/chapter.xml	Fri May 17 20:21:57 2013	(r41652)
@@ -3845,22 +3845,18 @@ geli_da2_flags="-p -k /root/da2.key"</pr
       <filename>encswap</filename>
       <link linkend="configtuning-rcd">rc.d</link> script.</para>
 
-    <sect2>
-      <title>Preparation</title>
-
-      <note>
-	<para>For the remainder of this section,
-	  <devicename>ad0s1b</devicename> will be the swap
-	  partition.</para>
-      </note>
-
-      <para>By default, swap is unencrypted.  It is possible that it
-	contains passwords or other sensitive data in cleartext.  To
-	rectify this, the data on the swap partition should be
-	overwritten with random garbage:</para>
+    <note>
+      <para>For the remainder of this section,
+	<devicename>ad0s1b</devicename> will be the swap
+	partition.</para>
+    </note>
+
+    <para>Swap partitions are not encrypted by default and should
+      be cleared of any sensitive data before continuing.  To
+      overwrite the current swap parition with random garbage,
+      execute the following command:</para>
 
-      <screen>&prompt.root; <userinput>dd if=/dev/random of=/dev/ad0s1b bs=1m</userinput></screen>
-    </sect2>
+    <screen>&prompt.root; <userinput>dd if=/dev/random of=/dev/<replaceable>ad0s1b</replaceable> bs=1m</userinput></screen>
 
     <sect2>
       <title>Swap Encryption with &man.gbde.8;</title>

From owner-svn-doc-projects@FreeBSD.ORG  Fri May 17 21:00:40 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 4D071C4F;
 Fri, 17 May 2013 21:00:40 +0000 (UTC)
 (envelope-from trhodes@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 25AEC6DD;
 Fri, 17 May 2013 21:00:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4HL0dna021286;
 Fri, 17 May 2013 21:00:39 GMT (envelope-from trhodes@svn.freebsd.org)
Received: (from trhodes@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4HL0dUQ021285;
 Fri, 17 May 2013 21:00:39 GMT (envelope-from trhodes@svn.freebsd.org)
Message-Id: <201305172100.r4HL0dUQ021285@svn.freebsd.org>
From: Tom Rhodes <trhodes@FreeBSD.org>
Date: Fri, 17 May 2013 21:00:39 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41655 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/multimedia
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 May 2013 21:00:40 -0000

Author: trhodes
Date: Fri May 17 21:00:39 2013
New Revision: 41655
URL: http://svnweb.freebsd.org/changeset/doc/41655

Log:
  Refactor a bit so we don't jump from a <sect1> right
  into a <sect2> with no introduction text.

Modified:
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml	Fri May 17 20:55:56 2013	(r41654)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/multimedia/chapter.xml	Fri May 17 21:00:39 2013	(r41655)
@@ -1529,24 +1529,20 @@ bktr0: Pinnacle/Miro TV, Philips SECAM t
       <primary>image scanners</primary>
     </indexterm>
 
-    <sect2>
-      <title>Introduction</title>
-
-      <para>In &os;, access to image scanners is provided by the
-	<application>SANE</application> (Scanner Access Now Easy)
-	<acronym role="Application Programming
-	Interface">API</acronym> available through the &os; Ports
-	Collection.  <application>SANE</application> will also use
-	some &os; device drivers to provide access to the scanner
-	hardware.</para>
-
-      <para>&os; supports both SCSI and USB scanners.  Be sure the
-	scanner is supported by <application>SANE</application> prior
-	to performing any configuration.  Refer to the <ulink
-	  url="http://www.sane-project.org/sane-supported-devices.html">supported
-	devices list</ulink> for more information about supported
-	scanners.</para>
-    </sect2>
+    <para>In &os;, access to image scanners is provided by the
+      <application>SANE</application> (Scanner Access Now Easy)
+      <acronym role="Application Programming
+      Interface">API</acronym> available through the &os; Ports
+      Collection.  <application>SANE</application> will also use
+      some &os; device drivers to provide access to the scanner
+      hardware.</para>
+
+    <para>&os; supports both SCSI and USB scanners.  Be sure the
+      scanner is supported by <application>SANE</application> prior
+      to performing any configuration.  Refer to the <ulink
+        url="http://www.sane-project.org/sane-supported-devices.html">
+      supported devices list</ulink> for more information about supported
+      scanners.</para>
 
     <sect2>
       <title>Kernel Configuration</title>

From owner-svn-doc-projects@FreeBSD.ORG  Fri May 17 21:01:18 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id D1665CA8;
 Fri, 17 May 2013 21:01:18 +0000 (UTC)
 (envelope-from trhodes@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C3CB26EC;
 Fri, 17 May 2013 21:01:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4HL1I3h021483;
 Fri, 17 May 2013 21:01:18 GMT (envelope-from trhodes@svn.freebsd.org)
Received: (from trhodes@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4HL1I4M021482;
 Fri, 17 May 2013 21:01:18 GMT (envelope-from trhodes@svn.freebsd.org)
Message-Id: <201305172101.r4HL1I4M021482@svn.freebsd.org>
From: Tom Rhodes <trhodes@FreeBSD.org>
Date: Fri, 17 May 2013 21:01:18 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41656 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 May 2013 21:01:18 -0000

Author: trhodes
Date: Fri May 17 21:01:18 2013
New Revision: 41656
URL: http://svnweb.freebsd.org/changeset/doc/41656

Log:
  Mark up "crontab" in <filename>.

Modified:
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config/chapter.xml

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config/chapter.xml	Fri May 17 21:00:39 2013	(r41655)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config/chapter.xml	Fri May 17 21:01:18 2013	(r41656)
@@ -472,11 +472,13 @@ run_rc_command "$1"</programlisting>
       supposed to perform at certain times.</para>
 
     <para>Two different types of configuration files are used by
-      &man.cron.8;: the system crontab and user crontabs.  These
-      formats only differ in the sixth field and later.  In the
-      system crontab, &man.cron.8; runs the command as the user
-      specified in the sixth field.  In a user crontab, all commands
-      run as the user who created the crontab, so the sixth field
+      &man.cron.8;: the system <filename>crontab</filename> and user
+      <filename>crontab</filename>s.  These formats only differ in
+      the sixth field and later.  In the system
+      <filename>crontab</filename>, &man.cron.8; runs the command as
+      the user specified in the sixth field.  In a user
+      <filename>crontab</filename>, all commands run as the user who
+      created the <filename>crontab</filename>, so the sixth field
       is the last field; this is an important security feature.
       The final field is always the command to run.</para>
 
@@ -486,13 +488,15 @@ run_rc_command "$1"</programlisting>
 	Commands in a user's crontab run with the permissions of the
 	user who owns the crontab.</para>
 
-      <para>The <username>root</username> user can have a user crontab
-	just like any other user.  The <username>root</username> user
-	crontab is separate from the system crontab,
-	<filename>/etc/crontab</filename>.
-	Because the system crontab invokes the specified commands as
+      <para>The <username>root</username> user can have a user
+	<filename>crontab</filename> just like any other user.  The
+	<username>root</username> user <filename>crontab</filename>
+	is separate from the system <filename>crontab</filename>,
+	<filename>/etc/crontab</filename>.  Because the system
+	<filename>crontab</filename> invokes the specified commands as
 	<username>root</username>, there is usually no need to create
-	a user crontab for <username>root</username>.</para>
+	a user <filename>crontab</filename> for
+	<username>root</username>.</para>
     </note>
 
     <para>Here is a sample entry from
@@ -580,7 +584,7 @@ PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin 
 
       <important>
 	<para>Do not use the procedure described here to edit and
-	  install the system crontab,
+	  install the system <filename>crontab</filename>,
 	  <filename>/etc/crontab</filename>.  Instead, use an
 	  editor and &man.cron.8; will notice that the file has
 	  changed and immediately begin using the updated version.
@@ -602,11 +606,12 @@ PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin 
       <para>To list installed &man.crontab.5; files, pass
 	<option>-l</option> to &man.crontab.1;.</para>
 
-      <para>Users who wish to begin their own crontab file from
-	scratch, without the use of a template, can use
-	<command>crontab -e</command>.  This will invoke the default
-	editor with an empty file.  When the file is saved, it will
-	be automatically installed by &man.crontab.1;.</para>
+      <para>Users who wish to begin their own
+	<filename>crontab</filename> file from scratch, without the
+	use of a template, can use <command>crontab -e</command>.  This
+	will invoke the default editor with an empty file.  When this
+	file is saved, it will be automatically installed by
+	&man.crontab.1;.</para>
 
       <para>In order to remove a user &man.crontab.5; completely,
 	use <command>crontab -r</command>.</para>

From owner-svn-doc-projects@FreeBSD.ORG  Fri May 17 21:24:42 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 0D3A3E69;
 Fri, 17 May 2013 21:24:42 +0000 (UTC)
 (envelope-from trhodes@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id F3F868CB;
 Fri, 17 May 2013 21:24:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4HLOf8b029392;
 Fri, 17 May 2013 21:24:41 GMT (envelope-from trhodes@svn.freebsd.org)
Received: (from trhodes@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4HLOfEt029391;
 Fri, 17 May 2013 21:24:41 GMT (envelope-from trhodes@svn.freebsd.org)
Message-Id: <201305172124.r4HLOfEt029391@svn.freebsd.org>
From: Tom Rhodes <trhodes@FreeBSD.org>
Date: Fri, 17 May 2013 21:24:41 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41658 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/basics
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 May 2013 21:24:42 -0000

Author: trhodes
Date: Fri May 17 21:24:41 2013
New Revision: 41658
URL: http://svnweb.freebsd.org/changeset/doc/41658

Log:
  Add a note about fs acls
  
  PR:		160445

Modified:
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/basics/chapter.xml

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/basics/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Fri May 17 21:24:10 2013	(r41657)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Fri May 17 21:24:41 2013	(r41658)
@@ -310,6 +310,13 @@ console none                            
       belongs to, and one for everyone else.  This numerical
       representation works like this:</para>
 
+    <note>
+      <para>This section will discuss the traditional &unix;
+	permissions.  For finer grained file system access
+	control, see the <link linkend="fs-acl">File System
+	Access Control Lists</link> section.</para>
+    </note>
+
     <indexterm><primary>permissions</primary></indexterm>
     <indexterm>
       <primary>file permissions</primary>

From owner-svn-doc-projects@FreeBSD.ORG  Sat May 18 17:29:31 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 33C1FE3A;
 Sat, 18 May 2013 17:29:31 +0000 (UTC)
 (envelope-from trhodes@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0AE05A7C;
 Sat, 18 May 2013 17:29:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4IHTUiw048361;
 Sat, 18 May 2013 17:29:30 GMT (envelope-from trhodes@svn.freebsd.org)
Received: (from trhodes@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4IHTUcI048360;
 Sat, 18 May 2013 17:29:30 GMT (envelope-from trhodes@svn.freebsd.org)
Message-Id: <201305181729.r4IHTUcI048360@svn.freebsd.org>
From: Tom Rhodes <trhodes@FreeBSD.org>
Date: Sat, 18 May 2013 17:29:30 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41661 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ports
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 May 2013 17:29:31 -0000

Author: trhodes
Date: Sat May 18 17:29:30 2013
New Revision: 41661
URL: http://svnweb.freebsd.org/changeset/doc/41661

Log:
  Remove a one line section, fix up the introduction a
  bit.

Modified:
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ports/chapter.xml

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ports/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Sat May 18 01:56:17 2013	(r41660)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Sat May 18 17:29:30 2013	(r41661)
@@ -337,22 +337,19 @@ Info:   Lists information about open fil
 
     <title>Using Binary Packages</title>
 
-    <para>There are several different tools used to manage packages on
-      &os;:</para>
-
-    <itemizedlist>
-      <listitem>
-	<para>The <command>sysinstall</command> utility can be invoked
-	  on a running system to install, delete, and list available
-	  and installed packages.  For more information, see
-	  <xref linkend="packages"/>.</para>
-      </listitem>
-
-      <listitem>
-	<para>The package management command line tools, which are
-	  the subject of the rest of this section.</para>
-      </listitem>
-    </itemizedlist>
+    <para>At the present time, &os; is transitioning toward a new
+      method of package management.  Users of the latest releases
+      may wish to investigate the benefits of using
+      <link linkend="pkgng-intro">PKGng</link> to manage third
+      party software on &os;.  For those not yet migrated to the
+      <application>pkgng</application> tool, the tools discussed
+      here may be used for managing the package database.  For
+      simplicity, the <command>sysinstall</command> utility is
+      also available post-install for package management.</para>
+
+    <para>All package installation files are stored in the
+      package database directory,
+      <filename role="directory">/var/db/pkg</filename>.</para>
 
     <sect2>
       <title>Installing a Package</title>
@@ -569,14 +566,6 @@ docbook                     =
       <para>in this case, all packages whose names start with
 	<literal>xchat</literal> will be deleted.</para>
     </sect2>
-
-    <sect2>
-      <title>Miscellaneous</title>
-
-      <para>All package information, including the file list and
-	descriptions of each installed package is stored within the
-	<filename>/var/db/pkg</filename> directory.</para>
-    </sect2>
   </sect1>
 
   <sect1 id="pkgng-intro">

From owner-svn-doc-projects@FreeBSD.ORG  Sat May 18 18:09:00 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id AF08AAEB;
 Sat, 18 May 2013 18:09:00 +0000 (UTC)
 (envelope-from trhodes@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 912FEBEC;
 Sat, 18 May 2013 18:09:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4II90Hl062396;
 Sat, 18 May 2013 18:09:00 GMT (envelope-from trhodes@svn.freebsd.org)
Received: (from trhodes@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4II90dV062395;
 Sat, 18 May 2013 18:09:00 GMT (envelope-from trhodes@svn.freebsd.org)
Message-Id: <201305181809.r4II90dV062395@svn.freebsd.org>
From: Tom Rhodes <trhodes@FreeBSD.org>
Date: Sat, 18 May 2013 18:09:00 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41662 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ports
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 May 2013 18:09:00 -0000

Author: trhodes
Date: Sat May 18 18:09:00 2013
New Revision: 41662
URL: http://svnweb.freebsd.org/changeset/doc/41662

Log:
  Alter the title name here, it's bad (though I doubt my
  re-word is much of an improvement).  Add information on
  where documentation is actually installed rather than
  just recommend a user read it.  Add some <replaceable>
  tags.  More coming.

Modified:
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ports/chapter.xml

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ports/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Sat May 18 17:29:30 2013	(r41661)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Sat May 18 18:09:00 2013	(r41662)
@@ -1778,17 +1778,25 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/
   </sect1>
 
   <sect1 id="ports-nextsteps">
-    <title>Post-installation Activities</title>
+    <title>Working With Installed Ports</title>
 
-    <para>After installing a new application you will normally want to
-      read any documentation it may have included, edit any
-      required configuration files, and ensure that the
-      application's service starts at boot time.</para>
-
-    <para>The exact steps you need to take to configure each
-      application will obviously be different.  However, if you have
-      just installed a new application and are wondering
-      <quote>What now?</quote> these tips might help:</para>
+    <para>Most third party applications will need some level of
+      configuration after they were installed.  This may be a simple
+      configuration file alteration, or perhaps the application will
+      just generate a configuration file.  Most applications will
+      have documentation installed into
+      <filename role="directory">/usr/local/share/doc</filename> and
+      manual pages.  This documentation should be consulted before
+      continuing.  Some applications run services which must be added
+      to the <filename>/etc/rc.conf</filename> file before
+      starting.</para>
+
+    <para>The following list contains useful information for
+      post-install port management.  In several cases, finding
+      the location of binaries if they were installed outside
+      of the <envar>PATH</envar>.  Users of &man.csh.1; should run
+      the <command>rehash</command> to rebuild the known binary
+      list in the shells <envar>PATH</envar>.</para>
 
     <itemizedlist>
       <listitem>
@@ -1796,7 +1804,7 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/
 	  installed, and where.  For example, if you have just
 	  installed FooPackage version 1.0.0, then this command</para>
 
-	<screen>&prompt.root; <userinput>pkg_info -L foopackage-1.0.0 | less</userinput></screen>
+	<screen>&prompt.root; <userinput>pkg_info -L <replaceable>foopackage-1.0.0</replaceable> | less</userinput></screen>
 
 	<para>will show all the files installed by the package.  Pay
 	  special attention to files located in

From owner-svn-doc-projects@FreeBSD.ORG  Sat May 18 18:24:12 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 0EE42D47;
 Sat, 18 May 2013 18:24:12 +0000 (UTC)
 (envelope-from trhodes@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E4123CC6;
 Sat, 18 May 2013 18:24:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4IIOBSp068567;
 Sat, 18 May 2013 18:24:11 GMT (envelope-from trhodes@svn.freebsd.org)
Received: (from trhodes@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4IIOBcm068566;
 Sat, 18 May 2013 18:24:11 GMT (envelope-from trhodes@svn.freebsd.org)
Message-Id: <201305181824.r4IIOBcm068566@svn.freebsd.org>
From: Tom Rhodes <trhodes@FreeBSD.org>
Date: Sat, 18 May 2013 18:24:11 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41663 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ports
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 May 2013 18:24:12 -0000

Author: trhodes
Date: Sat May 18 18:24:11 2013
New Revision: 41663
URL: http://svnweb.freebsd.org/changeset/doc/41663

Log:
  Reword to avoid "you" in the ports after install
  section (which is where I performed work in the
  previous commit).

Modified:
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ports/chapter.xml

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ports/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Sat May 18 18:09:00 2013	(r41662)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ports/chapter.xml	Sat May 18 18:24:11 2013	(r41663)
@@ -1800,18 +1800,18 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/
 
     <itemizedlist>
       <listitem>
-	<para>Use &man.pkg.info.1; to find out which files were
-	  installed, and where.  For example, if you have just
-	  installed FooPackage version 1.0.0, then this command</para>
+	<para>The &man.pkg.info.1; will print all installed
+	  files and their location.  For example, if the FooPackage
+	  version 1.0.0 was just installed, then the following
+	  command will show all the files installed with the
+	  package.</para>
 
 	<screen>&prompt.root; <userinput>pkg_info -L <replaceable>foopackage-1.0.0</replaceable> | less</userinput></screen>
 
-	<para>will show all the files installed by the package.  Pay
-	  special attention to files located in
-	  <filename>man/</filename>, which will be manual pages,
-	  <filename>etc/</filename>, which will be configuration
-	  files, and <filename>doc/</filename>, which will be more
-	  comprehensive documentation.</para>
+	<para>Configuration files are always installed in the
+	  <filename role="directory">/usr/local/etc</filename>
+	  and should definitely be consulted before attempting
+	  to use the new application.</para>
 
 	<para>To determine which version of the application was
 	  installed:</para>
@@ -1825,17 +1825,18 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/
       </listitem>
 
       <listitem>
-	<para>Once you have identified where the application's manual
-	  pages have been installed, review them using &man.man.1;.
-	  Review the sample configuration files and any additional
-	  documentation that may have been provided.</para>
+	<para>These commands will also show the names of any manual
+	  pages installed with the application.  This additional
+	  documentation will now be available to the &man.man.1;
+	  command.</para>
       </listitem>
 
       <listitem>
-	<para>If the application has a web site, check it for
-	  additional documentation, frequently asked questions, and so
-	  forth.  If you are not sure of the web site address it may
-	  be listed in the output from</para>
+	<para>If the application has a web site, consult it for
+	  additional documentation, frequently asked questions, or
+	  a forum.  If the website is unknown, the following command
+	  will be useful to print out this information if it's
+	  available.</para>
 
 	<screen>&prompt.root; <userinput>pkg_info <replaceable>foopackage-1.0.0</replaceable></userinput></screen>
 

From owner-svn-doc-projects@FreeBSD.ORG  Sat May 18 19:56:00 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id B1F808DF;
 Sat, 18 May 2013 19:56:00 +0000 (UTC)
 (envelope-from trhodes@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 944EB9D;
 Sat, 18 May 2013 19:56:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4IJu0Xi001538;
 Sat, 18 May 2013 19:56:00 GMT (envelope-from trhodes@svn.freebsd.org)
Received: (from trhodes@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4IJu0kK001534;
 Sat, 18 May 2013 19:56:00 GMT (envelope-from trhodes@svn.freebsd.org)
Message-Id: <201305181956.r4IJu0kK001534@svn.freebsd.org>
From: Tom Rhodes <trhodes@FreeBSD.org>
Date: Sat, 18 May 2013 19:56:00 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41664 - in
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook: config
 network-servers
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 May 2013 19:56:00 -0000

Author: trhodes
Date: Sat May 18 19:55:59 2013
New Revision: 41664
URL: http://svnweb.freebsd.org/changeset/doc/41664

Log:
  Mark up syslogd and newsyslogd in <command> tags in the
  section titles.
  Add an introduction to the tuning disks chapter.

Modified:
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config/chapter.xml
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config/chapter.xml	Sat May 18 18:24:11 2013	(r41663)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/config/chapter.xml	Sat May 18 19:55:59 2013	(r41664)
@@ -1362,7 +1362,7 @@ ifconfig_fxp0_alias7="inet 202.0.75.20 n
     </sect1info>
 
     <title>Configuring the System Logger,
-      &man.syslogd.8;</title>
+      <command>syslogd</command></title>
 
     <indexterm><primary>system logging</primary></indexterm>
     <indexterm><primary>syslog</primary></indexterm>
@@ -1383,7 +1383,7 @@ ifconfig_fxp0_alias7="inet 202.0.75.20 n
 	linkend="network-syslogd"/>.</para>
 
     <sect2>
-      <title>Using &man.syslogd.8;</title>
+      <title>Using <command>syslogd</command></title>
 
       <para>In the default &os; configuration, &man.syslogd.8; is
 	started at boot.  This is controlled by the variable
@@ -1401,7 +1401,7 @@ ifconfig_fxp0_alias7="inet 202.0.75.20 n
     </sect2>
 
     <sect2>
-      <title>Configuring &man.syslogd.8;</title>
+      <title>Configuring <command>syslogd</command></title>
 
       <indexterm><primary>syslog.conf</primary></indexterm>
 
@@ -1541,7 +1541,7 @@ cron.*                                  
 
     <sect2>
       <title>Log Management and Rotation with
-	&man.newsyslog.8;</title>
+	<command>newsyslog</command></title>
 
       <indexterm><primary>newsyslog</primary></indexterm>
       <indexterm><primary>newsyslog.conf</primary></indexterm>
@@ -1563,7 +1563,7 @@ cron.*                                  
 
       <sect3>
 	<title>Configuring
-	  &man.newsyslog.8;</title>
+	  <command>newsyslog</command></title>
 
 	<para>To know which actions to take, &man.newsyslog.8; reads
 	  its configuration file, by default
@@ -1959,6 +1959,19 @@ device_probe_and_attach: cbb0 attach ret
   <sect1 id="configtuning-disk">
     <title>Tuning Disks</title>
 
+    <para>The following section will discuss various tuning
+      mechanisms and options which may be applied to disk
+      devices.  In many cases, disks with mechanical parts,
+      such as <acronym>SCSI</acronym> drives, will be the bottle
+      neck driving down the overall system performance.  While
+      a solution is to install a drive without mechanical parts,
+      such as a solid state drive, mechanical drives are not
+      going away anytime in the near future.  When tuning disks,
+      it is advisable to utilize the features of the &man.iostat.8;
+      command to test various changes to the system.  This
+      command will allow the user to obtain valuable information
+      on system <acronym>IO</acronym>.</para>
+
     <sect2>
       <title>Sysctl Variables</title>
 

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Sat May 18 18:24:11 2013	(r41663)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Sat May 18 19:55:59 2013	(r41664)
@@ -5682,7 +5682,7 @@ driftfile /var/db/ntp.drift</programlist
 
     <para>Centralized logging to a specific logging host can reduce
       some of the administrative burden of log file administration.
-      Log file aggregation, merging and rotation can be configured in
+      Log file aggregation, merging and rotation may be configured in
       one location, using the native tools of &os;, such as
       &man.syslogd.8; and &man.newsyslog.8;.  In the following example
       configuration, host <hostid>A</hostid>, named <hostid
@@ -5716,15 +5716,15 @@ driftfile /var/db/ntp.drift</programlist
 	</listitem>
 
 	<listitem>
-	  <para>syslogd has been configured to accept remote messages
-	    from client machines;</para>
+	  <para><command>syslogd</command> has been configured to
+	    accept remote messages from client machines;</para>
 	</listitem>
 
 	<listitem>
-	  <para>The syslogd server and all client machines must have
-	    valid entries for both forward and reverse
-	    <acronym>DNS</acronym>, or be properly configured in
-	    <filename>/etc/hosts</filename>.</para>
+	  <para>The <command>syslogd</command> server and all client
+	    machines must have valid entries for both forward and
+	    reverse <acronym>DNS</acronym>, or be properly configured
+	    in <filename>/etc/hosts</filename>.</para>
 	</listitem>
       </itemizedlist>
 
@@ -5770,13 +5770,14 @@ syslogd_flags="-a logclient.example.com 
 	does not matter, but &man.touch.1; works great for situations
 	such as this:</para>
 
-      <screen>&prompt.root; <userinput>touch <filename>/var/log/logclient.log</filename></userinput></screen>
+      <screen>&prompt.root; <userinput><command>touch</command>
+        <filename>/var/log/logclient.log</filename></userinput></screen>
 
       <para>At this point, the <command>syslogd</command> daemon
 	should be restarted and verified:</para>
 
-      <screen>&prompt.root; <userinput>service syslogd restart</userinput>
-&prompt.root; <userinput>pgrep syslog</userinput></screen>
+      <screen>&prompt.root; <userinput>service <command>syslogd</command> restart</userinput>
+&prompt.root; <userinput><command>pgrep</command> syslog</userinput></screen>
 
       <para>If a <acronym>PID</acronym> is returned, the server has
 	been restarted successfully, and client configuration may
@@ -5851,13 +5852,14 @@ syslogd_flags="-s -v -v"</programlisting
       <para>Once added, <command>syslogd</command> must be restarted
 	for the changes to take effect:</para>
 
-      <screen>&prompt.root; <userinput>service syslogd restart</userinput></screen>
+      <screen>&prompt.root; <userinput>service <command>syslogd</command> restart</userinput></screen>
 
       <para>To test that log messages are being sent across the
 	network, use &man.logger.1; on the client to send a message to
 	<command>syslogd</command>:</para>
 
-      <screen>&prompt.root; <userinput>logger "<replaceable>Test message from logclient</replaceable>"</userinput></screen>
+      <screen>&prompt.root; <userinput><command>logger</command>
+        "<replaceable>Test message from logclient</replaceable>"</userinput></screen>
 
       <para>This message should now exist both in
 	<filename>/var/log/messages</filename> on the client, and
@@ -5888,7 +5890,7 @@ syslogd_flags="-s -v -v"</programlisting
 
       <programlisting>syslogd_flags="-d -a logclien.example.com -v -v"</programlisting>
 
-      <screen>&prompt.root; <userinput>service syslogd restart</userinput></screen>
+      <screen>&prompt.root; <userinput>service <command>syslogd</command> restart</userinput></screen>
 
       <para>Debugging data similar to the following will flash on the
 	screen immediately after the restart:</para>
@@ -5913,7 +5915,7 @@ rejected in rule 0 due to name mismatch.
 	<literal>logclien</literal>.  After the proper alterations
 	are made, a restart is issued with expected results:</para>
 
-      <screen>&prompt.root; <userinput>service syslogd restart</userinput>
+      <screen>&prompt.root; <userinput>service <command>syslogd</command> restart</userinput>
 logmsg: pri 56, flags 4, from logserv.example.com, msg syslogd: restart
 syslogd: restarted
 logmsg: pri 6, flags 4, from logserv.example.com, msg syslogd: kernel boot file is /boot/kernel/kernel