From owner-svn-doc-projects@FreeBSD.ORG  Mon May  6 11:53:22 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 EB86FEBB;
 Mon,  6 May 2013 11:53:22 +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 DCDA7EB3;
 Mon,  6 May 2013 11:53:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r46BrMS9069788;
 Mon, 6 May 2013 11:53:22 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r46BrMX7069787;
 Mon, 6 May 2013 11:53:22 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201305061153.r46BrMX7069787@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Mon, 6 May 2013 11:53:22 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41554 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/install
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, 06 May 2013 11:53:23 -0000

Author: dru
Date: Mon May  6 11:53:22 2013
New Revision: 41554
URL: http://svnweb.freebsd.org/changeset/doc/41554

Log:
  First pass to cleanup this chapter:
  
  - &os; and "you"
  
  - dir tags and some (not all) acronyms
  
  - fixes broken URLs, grammos, typos, outdated info
  
  - removes 3.13.5 which assumes a boot floppy
  
  - removes references to deprecated utilities partition magic,
   xcopy, fdimage, doublespace
  
  - removes unrecommended tip in Q&A
  
  - removes 3.13.3 as floppies were covered earlier for pc98
  
  Approved by:  bcr (mentor)

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

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/install/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/install/chapter.xml	Mon May  6 11:34:28 2013	(r41553)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/install/chapter.xml	Mon May  6 11:53:22 2013	(r41554)
@@ -27,39 +27,40 @@
     <!-- January 2000 -->
   </chapterinfo>
 
-  <title>Installing &os;&nbsp;8.<replaceable>X</replaceable> and Earlier</title>
+  <title>Installing &os;&nbsp;8.<replaceable>X</replaceable></title>
 
   <sect1 id="install-synopsis">
     <title>Synopsis</title>
 
     <indexterm><primary>installation</primary></indexterm>
 
-    <para>FreeBSD is provided with a text-based, easy to use installation
+    <para>&os; provides a text-based, easy to use installation
       program.  &os; 9.0-RELEASE and later use the installation program
-      known as <application>bsdinstall</application>, with releases prior
-      to 9.0-RELEASE using <application>sysinstall</application> for
-      installation.  This chapter describes the use of <application>sysinstall</application>
-      to install &os;.  The use of <application>bsdinstall</application>
+      known as &man.bsdinstall.8;
+      while &os;&nbsp;8.<replaceable>X</replaceable> uses
+      &man.sysinstall.8;.  This chapter describes
+      how to use &man.sysinstall.8;.
+      The use of &man.bsdinstall.8;
       is covered in <xref linkend="bsdinstall"/>.</para>
 
     <para>After reading this chapter, you will know:</para>
 
     <itemizedlist>
       <listitem>
-	<para>How to create the FreeBSD installation disks.</para>
+	<para>How to create the &os; installation media.</para>
       </listitem>
 
       <listitem>
-	<para>How FreeBSD refers to, and subdivides, your hard disks.</para>
+	<para>How &os; refers to and subdivides hard disks.</para>
       </listitem>
 
       <listitem>
-	<para>How to start <application>sysinstall</application>.</para>
+	<para>How to start &man.sysinstall.8;.</para>
       </listitem>
 
       <listitem>
-	<para>The questions <application>sysinstall</application> will ask
-	  you, what they mean, and how to answer them.</para>
+	<para>The questions &man.sysinstall.8; asks,
+	  what they mean, and how to answer them.</para>
       </listitem>
     </itemizedlist>
 
@@ -68,19 +69,18 @@
     <itemizedlist>
       <listitem>
 	<para>Read the supported hardware list that shipped with the version
-	  of FreeBSD you are installing, and verify that your hardware is
+	  of &os; to install, and verify that the system's hardware is
 	  supported.</para>
       </listitem>
     </itemizedlist>
 
     <note>
       <para>In general, these installation instructions are written
-	for &i386; (<quote>PC compatible</quote>) architecture
-	computers.  Where applicable, instructions specific to other
-	platforms will be listed.  Although this
-	guide is kept as up to date as possible, you may find minor
-	differences between the installer and what is shown here.  It is
-	suggested that you use this chapter as a general guide rather
+	for the &i386; and &os;/&arch.amd64; architectures.
+	Where applicable, instructions specific to other
+	platforms will be listed.  There may be minor
+	differences between the installer and what is shown here.
+	This chapter should be used as a general guide rather
 	than a literal installation manual.</para>
     </note>
 
@@ -96,23 +96,24 @@
 	&os; version and the hardware architecture.</para>
 
       <para>A summary of this information is given in the following sections.
-	Depending on the method you choose to install &os;, you may
-	also need a floppy drive, a supported CDROM drive, and in some
-	case a network adapter.  This will be covered by the <xref
-	linkend="install-boot-media"/>.</para>
+	Depending on the method chosen to install &os;,
+	a floppy drive, CDROM drive, or
+	network adapter may be needed.  Instructions on how to
+	prepare the installation media can be found in
+	<xref linkend="install-boot-media"/>.</para>
 
       <sect3>
 	<title>&os;/&arch.i386; and &os;/&arch.pc98;</title>
 
 	<para>Both &os;/&arch.i386; and &os;/&arch.pc98; require a 486 or
-	  better processor and at least 24&nbsp;MB of RAM.  You will
-	  need at least 150&nbsp;MB of free hard drive space for the
+	  better processor, at least 24&nbsp;MB of RAM, and at
+	  least 150&nbsp;MB of free hard drive space for the
 	  most minimal installation.</para>
 
 	<note>
-	  <para>In case of old configurations, most of time, getting
-	    more RAM and more hard drive space is more important than
-	    getting a faster processor.</para>
+	  <para>In the case of older hardware, installing more RAM and
+	    more hard drive space is often more important than
+	    a faster processor.</para>
 	</note>
       </sect3>
 
@@ -122,33 +123,32 @@
 	<para>There are two classes of processors capable of running
 	  &os;/&arch.amd64;.  The first are AMD64 processors,
 	  including the &amd.athlon;64,
-	  &amd.athlon;64-FX, &amd.opteron; or better
+	  &amd.athlon;64-FX, and &amd.opteron; or better
 	  processors.</para>
 
-	<para>The second class of processors that can use
-	  &os;/&arch.amd64; includes those using the &intel; EM64T
+	<para>The second class of processors
+	  includes those using the &intel; EM64T
 	  architecture.  Examples of these processors include the
 	  &intel;&nbsp;&core;&nbsp;2 Duo, Quad, Extreme processor
 	  families, and the &intel;&nbsp;&xeon; 3000, 5000, and 7000
 	  sequences of processors.</para>
 
-	<para>If you have a machine based on an nVidia nForce3
-	  Pro-150, you <emphasis>must</emphasis> use the BIOS setup to
-	  disable the IO APIC.  If you do not have an option to do
-	  this, you will likely have to disable ACPI instead.  There
-	  are bugs in the Pro-150 chipset that we have not found a
-	  workaround for yet.</para>
+	<para>If the machine is based on an nVidia nForce3
+	  Pro-150, the BIOS setup <emphasis>must</emphasis> be used to
+	  disable the IO APIC.  If this option does not exist,
+	  disable ACPI instead as there
+	  are bugs in the Pro-150 chipset.</para>
       </sect3>
 
       <sect3>
 	<title>&os;/&arch.sparc64;</title>
 
-	<para>To install &os;/&arch.sparc64;, you will need a supported
+	<para>To install &os;/&arch.sparc64;, use a supported
 	  platform (see <xref
 	  linkend="install-hardware-supported"/>).</para>
 
-	<para>You will need a dedicated disk for &os;/&arch.sparc64;.  It
-	  is not possible to share a disk with another operating
+	<para>A dedicated disk is needed for &os;/&arch.sparc64; as
+	  it is not possible to share a disk with another operating
 	  system at this time.</para>
       </sect3>
     </sect2>
@@ -159,14 +159,14 @@
       <para>A list of supported hardware is provided with each &os;
 	release in the &os; Hardware Notes.  This document can usually
 	be found in a file named <filename>HARDWARE.TXT</filename>, in
-	the top-level directory of a CDROM or FTP distribution or in
-	<application>sysinstall</application>'s documentation menu.
-	It lists, for a given architecture, what hardware devices are
+	the top-level directory of a CDROM or FTP distribution, or in
+	&man.sysinstall.8;'s documentation menu.
+	It lists, for a given architecture, which hardware devices are
 	known to be supported by each release of &os;.  Copies of the
 	supported hardware list for various releases and architectures
 	can also be found on the <ulink
 	url="http://www.FreeBSD.org/releases/index.html">Release
-	Information</ulink> page of the &os; Web site.</para>
+	Information</ulink> page of the &os; website.</para>
     </sect2>
   </sect1>
 
@@ -174,28 +174,35 @@
     <title>Pre-installation Tasks</title>
 
     <sect2 id="install-inventory">
-      <title>Inventory Your Computer</title>
+      <title>Inventory the Computer</title>
 
-      <para>Before installing &os; you should attempt to inventory the
-	components in your computer.  The &os; installation routines will
-	show you the components (hard disks, network cards, CDROM drives, and
-	so forth) with their model number and manufacturer.  &os; will also
+      <para>Before installing &os; it is recommended to inventory the
+	components in the computer.  The &os; installation routines
+	will show components such as hard disks, network cards,
+	and CDROM drives with their model number and manufacturer.
+	&os; will also
 	attempt to determine the correct configuration for these devices,
-	which includes information about IRQ and IO port usage.  Due to the
-	vagaries of PC hardware this process is not always completely
-	successful, and you may need to correct &os;'s determination of
-	your configuration.</para>
-
-      <para>If you already have another operating system installed, such as
-	&windows; or Linux, it is a good idea to use the facilities provided
-	by those operating systems to see how your hardware is already
-	configured.  If you are not sure what settings an expansion
-	card is using, you may find it printed on the card itself.  Popular IRQ
-	numbers are 3, 5, and 7, and IO port addresses are normally written as
-	hexadecimal numbers, such as 0x330.</para>
+	including information about IRQ and I/O port usage.  Due
+	to the
+	vagaries of computer hardware, this process is not always
+	completely
+	successful, and &os; may need some manual
+	configuration.</para>
 
-      <para>We recommend you print or write down this information before
-	installing &os;.  It may help to use a table, like this:</para>
+      <para>If another operating system is already installed,
+	use the facilities provided
+	by that operating systems to view the hardware configuration.
+	If the settings of an expansion
+	card are not obvious, check if they are printed on the
+	card itself.  Popular IRQ
+	numbers are 3, 5, and 7, and I/O port addresses are normally
+	written as
+	hexadecimal numbers, such as <literal>0x330</literal>.</para>
+
+      <para>It is recommended to print or write down this information
+	before
+	installing &os;.  It may help to use a table, as seen in this
+	example:</para>
 
       <table pgwide="1" frame="none">
 	<title>Sample Device Inventory</title>
@@ -211,7 +218,7 @@
 
 	      <entry>IRQ</entry>
 
-	      <entry>IO port(s)</entry>
+	      <entry>I/O port(s)</entry>
 
 	      <entry>Notes</entry>
 	    </row>
@@ -285,43 +292,44 @@
 	</tgroup>
       </table>
 
-      <para>Once the inventory of the components in your computer is
-	done, you have to check if they match the hardware
-	requirements of the &os; release you want to install.</para>
+      <para>Once the inventory of the components in the computer is
+	complete, check if it matches the hardware
+	requirements of the &os; release to install.</para>
     </sect2>
 
     <sect2>
-      <title>Backup Your Data</title>
+      <title>Make a Backup</title>
 
-      <para>If the computer you will be installing &os; on contains
-	valuable data, then ensure you have it backed up, and that you have
-	tested the backups before installing &os;.  The &os;
-	installation routine will prompt you before writing any
-	data to your disk, but once that process has started it cannot be
+      <para>If the computer contains
+	valuable data, ensure it is backed up, and that the backup
+	has been
+	tested before installing &os;.  The &os;
+	installer will prompt before writing any
+	data to disk, but once that process has started, it cannot be
 	undone.</para>
     </sect2>
 
     <sect2 id="install-where">
       <title>Decide Where to Install &os;</title>
 
-      <para>If you want &os; to use your entire hard disk, then there is nothing
-	more to concern yourself with at this point &mdash; you can skip this
+      <para>If &os; is to be installed on the entire hard disk,
+	skip this
 	section.</para>
 
-      <para>However, if you need &os; to co-exist with other operating
-	systems then you need to have a rough understanding of how data is
-	laid out on the disk, and how this affects you.</para>
+      <para>However, if &os; will co-exist with other operating
+	systems, a rough understanding of how data is
+	laid out on the disk is useful.</para>
 
       <sect3 id="install-where-i386">
 	<title>Disk Layouts for &os;/&arch.i386;</title>
 
-      <para>A PC disk can be divided into discrete chunks.  These chunks are
-	called <firstterm>partitions</firstterm>. Since
-	&os; internally also has partitions, the naming
-	can become confusing very quickly, therefore these
-	disk chunks are referred to as disk slices or simply slices
-	in &os; itself.  For example, the &os; utility
-	<command>fdisk</command> which operates on the PC disk partitions,
+      <para>A PC disk can be divided into discrete chunks known as
+	<firstterm>partitions</firstterm>. Since
+	&os; also has partitions, naming
+	can quickly become confusing.  Therefore, these
+	disk chunks are referred to as slices
+	in &os;.  For example, the &os; version of
+	&man.fdisk.8;
 	refers to slices instead of partitions.  By design, the PC only
 	supports four partitions per disk.  These partitions are called
 	<firstterm>primary partitions</firstterm>.  To work around this
@@ -335,74 +343,71 @@
 	a number used to identify the type of data on the partition.  &os;
 	partitions have the partition ID of <literal>165</literal>.</para>
 
-      <para>In general, each operating system that you use will identify
-	partitions in a particular way.  For example, &ms-dos;, and its
-	descendants, like &windows;, assign each primary and logical partition a
+      <para>In general, each operating system will identify
+	partitions in a particular way.  For example,
+	&windows;, assigns each primary and logical partition a
 	<firstterm>drive letter</firstterm>, starting with
 	<devicename>C:</devicename>.</para>
 
-      <para>&os; must be installed into a primary partition.  &os; can
-	keep all its data, including any files that you create, on this one
-	partition.  However, if you have multiple disks, then you can create a
-	&os; partition on all, or some, of them.  When you install &os;,
-	you must have one partition available.  This might be a blank
-	partition that you have prepared, or it might be an existing partition
-	that contains data that you no longer care about.</para>
-
-      <para>If you are already using all the partitions on all your disks, then
-	you will have to free one of them for &os; using the tools
-	provided by the other operating systems you use (e.g.,
-	<command>fdisk</command> on &ms-dos; or &windows;).</para>
-
-      <para>If you have a spare partition then you can use that.  However, you
-	may need to shrink one or more of your existing partitions
-	first.</para>
+      <para>&os; must be installed into a primary partition.  If
+	there are multiple disks, a &os;
+	partition can be created
+	on all, or some, of them.  When &os; is installed, at least
+	one partition must be available.  This might be a blank
+	partition or it might be an existing partition whose
+	data can be overwritten.</para>
+
+      <para>If all the partitions on all the disks are in use,
+	free one of them for &os; using the tools
+	provided by an existing operating system, such as &windows;
+	<command>fdisk</command>.</para>
+
+      <para>If there is a spare partition, use that.  If it is too
+	small,
+	shrink one or more existing partitions to create more
+	available space.</para>
 
       <para>A minimal installation of &os; takes as little as 100&nbsp;MB
 	of disk
 	space.  However, that is a <emphasis>very</emphasis> minimal install,
-	leaving almost no space for your own files.  A more realistic minimum
+	leaving almost no space for files.  A more realistic minimum
 	is 250&nbsp;MB without a graphical environment, and 350&nbsp;MB or
-	more if you
-	want a graphical user interface.  If you intend to install a lot of
-	third-party software as well, then you will need more space.</para>
-
-      <para>You can use a commercial tool such as <application>&partitionmagic;</application>,
-	or a free tool such as <application>GParted</application>,
-	to resize your partitions and make space for
-	&os;.  Both
-	<application>&partitionmagic;</application> and
-	<application>GParted</application> are known to work on
-	<acronym>NTFS</acronym>.  <application>GParted</application>
-	is available on a number of Live CD Linux distributions, such as
-	<ulink url="http://www.sysresccd.org/">SystemRescueCD</ulink>.</para>
-
-      <para>Problems have been reported resizing &microsoft; Vista
-	partitions.  Having a Vista installation CDROM handy when
-	attempting such an operation is recommended.  As with all
-	such disk maintenance tasks, a current set of backups is
-	also strongly advised.</para>
+	more for
+	a graphical user interface.  If other
+	third-party software will be installed,
+	even more space is needed.</para>
+
+      <para>Use a tool such as <ulink
+	  url="http://gparted.sourceforge.net/">GParted</ulink>
+	to resize the partitions and make space for
+	&os;.  When resizing &microsoft; partitions, having a
+	&windows; installation disc handy is recommended.  As with all
+	disk maintenance tasks, a current set of backups is also
+	strongly advised.</para>
 
       <warning>
-	<para>Incorrect use of these tools can delete the data on your disk.
-	  Be sure that you have recent, working backups before using
-	  them.</para>
+	<para>Incorrect use of a shrinking tool can delete the data
+	  on the disk.
+	  Always have a recent, working backup before using this
+	  type of tool.</para>
       </warning>
 
       <example>
 	<title>Using an Existing Partition Unchanged</title>
 
-	<para>Suppose that you have a computer with a single 4&nbsp;GB disk
+	<para>Consider a computer with a single 4&nbsp;GB disk
 	  that
-	  already has a version of &windows; installed, and you have split the
-	  disk into two drive letters, <devicename>C:</devicename> and
+	  already has a version of &windows; installed, where the
+	  disk has been split into two drive letters,
+	  <devicename>C:</devicename> and
 	  <devicename>D:</devicename>, each of which is 2&nbsp;GB in size.
-	  You have 1&nbsp;GB of data on <devicename>C:</devicename>, and
+	  There is 1&nbsp;GB of data on <devicename>C:</devicename>,
+	  and
 	  0.5&nbsp;GB of data on
 	  <devicename>D:</devicename>.</para>
 
-	<para>This means that your disk has two partitions on it, one per
-	  drive letter.  You can copy all your existing data from
+	<para>This disk has two partitions, one per
+	  drive letter.  Copy all existing data from
 	  <devicename>D:</devicename> to <devicename>C:</devicename>, which
 	  will free up the second partition, ready for &os;.</para>
       </example>
@@ -410,25 +415,28 @@
       <example>
 	<title>Shrinking an Existing Partition</title>
 
-	<para>Suppose that you have a computer with a single 4&nbsp;GB disk
-	  that already has a version of &windows; installed.  When you installed
-	  &windows; you created one large partition, giving you a
-	  <devicename>C:</devicename> drive that is 4&nbsp;GB in size.  You are
-	  currently using 1.5&nbsp;GB of space, and want &os; to have 2&nbsp;GB
+	<para>Consider a computer with a single 4&nbsp;GB disk
+	  that already has a version of &windows; installed.  When
+	  &windows; was installed, it created one large partition,
+	  a
+	  <devicename>C:</devicename> drive that is 4&nbsp;GB in size.
+	  Currently, 1.5&nbsp;GB of space is used, and &os; should
+	  have 2&nbsp;GB
 	  of space.</para>
 
-	<para>In order to install &os; you will need to either:</para>
+	<para>In order to install &os;, either:</para>
 
 	<orderedlist>
 	  <listitem>
-	    <para>Backup your &windows; data, and then reinstall &windows;,
+	    <para>Backup the &windows; data and then reinstall
+	      &windows;,
 	      asking for a 2&nbsp;GB partition at install time.</para>
 	  </listitem>
 
 	  <listitem>
-	    <para>Use one of the tools such as <application>&partitionmagic;</application>,
-	      described above, to shrink your &windows;
-		partition.</para>
+	    <para>Use a tool
+	      to shrink the &windows;
+	      partition.</para>
 	  </listitem>
 	</orderedlist>
       </example>
@@ -437,21 +445,24 @@
     </sect2>
 
     <sect2>
-      <title>Collect Your Network Configuration Details</title>
+      <title>Collect the Network Configuration Details</title>
 
-      <para>If you intend to connect to a network as part of your &os;
-	installation (for example, if you will be installing from an FTP
+      <para>Before
+	installing from an FTP
 	site or an
-	NFS server), then you need to know your network configuration.  You
-	will be prompted for this information during the installation so that
-	&os; can connect to the network to complete the install.</para>
+	<acronym>NFS</acronym> server, make note of the network
+	configuration.  The
+	installer
+	will prompt for this information so that
+	it can connect to the network to complete the
+	installation.</para>
 
       <sect3>
 	<title>Connecting to an Ethernet Network or Cable/DSL Modem</title>
 
-	<para>If you connect to an Ethernet network, or you have an Internet
-	  connection using an Ethernet adapter via cable or DSL, then you will
-	  need the following information:</para>
+	<para>If using an Ethernet network or an Internet
+	  connection using an Ethernet adapter via cable or DSL, the
+	  following information is needed:</para>
 
 	<orderedlist>
 	  <listitem>
@@ -475,32 +486,35 @@
 	  </listitem>
 	</orderedlist>
 
-	<para>If you do not know this information, then ask your system
-	  administrator or service provider.  They may say that this
-	  information is assigned automatically, using
-	  <firstterm>DHCP</firstterm>.  If so, make a note of this.</para>
+	<para>If this information is unknown, ask the system
+	  administrator or service provider.  Make note if this
+	  information is assigned automatically using
+	  <firstterm>DHCP</firstterm>.</para>
       </sect3>
 
       <sect3>
 	<title>Connecting Using a Modem</title>
 
-	<para>If you dial up to an ISP using a regular modem then you can
-	  still install &os; over the Internet, it will just take a very
+	<para>If using a dialup modem,
+	  &os; can still be installed over the Internet, it will just
+	  take a very
 	  long time.</para>
 
 	<para>You will need to know:</para>
 
 	<orderedlist>
 	  <listitem>
-	    <para>The phone number to dial for your ISP</para>
+	    <para>The phone number to dial the Internet Service
+	      Provider (<acronym>ISP</acronym>)</para>
 	  </listitem>
 
 	  <listitem>
-	    <para>The COM: port your modem is connected to</para>
+	    <para>The COM: port the modem is connected to</para>
 	  </listitem>
 
 	  <listitem>
-	    <para>The username and password for your ISP account</para>
+	    <para>The username and password for the
+	      <acronym>ISP</acronym> account</para>
 	  </listitem>
 	</orderedlist>
       </sect3>
@@ -508,28 +522,30 @@
     <sect2>
       <title>Check for &os; Errata</title>
 
-      <para>Although the &os; project strives to ensure that each release
+      <para>Although the &os; Project strives to ensure that each
+	release
 	of &os; is as stable as possible, bugs do occasionally creep into
-	the process.  On very rare occasions those bugs affect the
+	the process.  On rare occasions those bugs affect the
 	installation process.  As these problems are discovered and fixed, they
 	are noted in the <ulink url="http://www.FreeBSD.org/releases/&rel.current;R/errata.html">&os; Errata</ulink>,
-	which is found on the &os; web site.  You
-	should check the errata before installing to make sure that there are
-	no late-breaking problems which you should be aware of.</para>
+	which is found on the &os; website.
+	Check the errata before installing to make sure that there are
+	no late-breaking problems to be aware of.</para>
 
-      <para>Information about all the releases, including the errata for each
+      <para>Information about all releases, including the errata for
+	each
 	release, can be found on the
 	<ulink
 	url="&url.base;/releases/index.html">release
 	information</ulink> section of the
 	<ulink
-	  url="&url.base;/index.html">&os; web site</ulink>.</para>
+	  url="&url.base;/index.html">&os; website</ulink>.</para>
     </sect2>
 
     <sect2>
       <title>Obtain the &os; Installation Files</title>
 
-      <para>The &os; installation process can install &os; from files
+      <para>The &os; installer can install &os; from files
 	located in any of the following places:</para>
 
       <itemizedlist>
@@ -548,11 +564,7 @@
 	</listitem>
 
 	<listitem>
-	  <para>A SCSI or QIC tape</para>
-	</listitem>
-
-	<listitem>
-	  <para>Floppy disks</para>
+	  <para>Floppy disks (&os;/&arch.pc98; only)</para>
 	</listitem>
       </itemizedlist>
 
@@ -560,8 +572,8 @@
 	<title>Network</title>
 
 	<listitem>
-	  <para>An FTP site, going through a firewall, or using an HTTP proxy,
-	    as necessary</para>
+	  <para>An FTP site through a firewall or using an HTTP
+	    proxy</para>
 	</listitem>
 
 	<listitem>
@@ -573,14 +585,14 @@
 	</listitem>
       </itemizedlist>
 
-      <para>If you have purchased &os; on CD or DVD then you already have
-	everything you need, and should proceed to the next section
-	(<xref linkend="install-boot-media"/>).</para>
+      <para>If installing from a purchased &os; CD/DVD,
+	skip ahead to
+	<xref linkend="install-boot-media"/>.</para>
 
-      <para>If you have not obtained the &os; installation files you should
+      <para>To obtain the &os; installation files,
 	skip ahead to <xref linkend="install-diff-media"/> which explains how
-	to prepare to install &os; from any of the above.  After reading
-	that section, you should come back here, and read on to
+	to prepare the installation media.  After reading
+	that section, come back here and read on to
 	<xref linkend="install-boot-media"/>.</para>
     </sect2>
 
@@ -588,18 +600,19 @@
       <title>Prepare the Boot Media</title>
 
       <para>The &os; installation process is started by booting the
-	computer into the &os; installer&mdash;it is not a program you run
+	computer into the &os; installer.  It is not a program that
+	can be run
 	within another operating system.  The computer normally boots
 	using the operating system installed on the hard disk, but it
 	can also be configured to boot from a CDROM or from a USB
 	disk.</para>
 
       <tip>
-	<para>If you have &os; on CDROM or DVD (either one you purchased
-	  or you prepared yourself), and your computer allows you to boot from
-	  the CDROM or DVD (typically a BIOS option called <quote>Boot
-	    Order</quote> or similar), then you can skip this section.  The
-	  &os; CDROM and DVD images are bootable and can be used to install
+	<para>If installing from a CD/DVD to a
+	  computer whose BIOS supports booting from
+	  the CD/DVD, skip this section.  The
+	  &os; CD/DVD images are bootable and can be used to
+	  install
 	  &os; without any other special preparation.</para>
       </tip>
 
@@ -611,36 +624,38 @@
 	  <title>Acquire the Memory Stick Image</title>
 
 	  <para>Memory stick images for
-	    &os;&nbsp;8.<replaceable>X</replaceable> and earlier can be downloaded from
+	    &os;&nbsp;8.<replaceable>X</replaceable> can be downloaded
+	    from
 	    the <filename class="directory">ISO-IMAGES/</filename>
 	    directory at
 	    <literal>ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/<replaceable>arch</replaceable>/ISO-IMAGES/<replaceable>version</replaceable>/&os;-<replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-memstick.img</literal>.
 	    Replace <replaceable>arch</replaceable> and
 	    <replaceable>version</replaceable> with the
-	    architecture and the version number which you want to
-	    install, respectively.  For example, the memory stick
+	    architecture and the version number to
+	    install.  For example, the memory stick
 	    images for &os;/&arch.i386;&nbsp;&rel2.current;-RELEASE are
 	    available from <ulink
 	      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/&arch.i386;/ISO-IMAGES/&rel2.current;/&os;-&rel2.current;-RELEASE-&arch.i386;-memstick.img"></ulink>.</para>
 
 	  <tip>
 	    <para>A different directory path is used for
-	      &os;&nbsp;9.0-RELEASE and later versions.  Details of
-	      download and installation of &os;&nbsp;9.0-RELEASE and
-	      later is covered in <xref linkend="bsdinstall"/>.</para>
+	      &os;&nbsp;9.0-RELEASE and later versions.  How to
+	      download and install
+	      &os;&nbsp;9.<replaceable>X</replaceable>
+	      is covered in <xref linkend="bsdinstall"/>.</para>
 	  </tip>
 
 	  <para>The memory stick image has a <filename>.img</filename>
 	    extension.  The <filename
 	    class="directory">ISO-IMAGES/</filename> directory
-	    contains a number of different images, and the one you
-	    will need to use will depend on the version of &os; you
-	    are installing, and in some cases, the hardware you are
-	    installing to.</para>
+	    contains a number of different images and the one to
+	    use depends on the version of &os; and the
+	    type of media supported by the hardware being installed
+	    to.</para>
 
 	  <important>
 	    <para>Before proceeding, <emphasis>back up</emphasis> the
-	      data you currently have on your USB stick, as this
+	      data on the USB stick, as this
 	      procedure will <emphasis>erase</emphasis> it.</para>
 	  </important>
 	</step>
@@ -653,29 +668,32 @@
 
 	    <warning>
 	      <para>The example below
-		lists <filename class="devicefile">/dev/da0</filename> as the
-		target device where the image will be written. Be very careful
-		that you have the correct device as the output target, or you
-		may destroy your existing data.</para>
+		uses <filename class="devicefile">/dev/da0</filename>
+		as the
+		target device where the image will be written.  Be
+		<emphasis>very</emphasis> careful
+		to use the correct device as the output target, as
+		the data on that device will be destroyed.</para>
 	    </warning>
 
 	    <step>
 	      <title>Writing the Image with &man.dd.1;</title>
 
 	      <para>The <filename>.img</filename> file
-		is <emphasis>not</emphasis> a regular file you copy to the
+		is <emphasis>not</emphasis> a regular file that can
+		just be copied to the
 		memory stick.  It is an image of the complete contents of the
-		disk.  This means that you <emphasis>cannot</emphasis> simply
-		copy files from one disk to another.  Instead, you must use
-		&man.dd.1; to write the image directly to the disk:</para>
+		disk.  This means that
+		&man.dd.1; must be used to write the image directly to
+		the disk:</para>
 
 	      <screen>&prompt.root; <userinput>dd if=&os;-&rel2.current;-RELEASE-&arch.i386;-memstick.img of=/dev/<replaceable>da0</replaceable> bs=64k</userinput></screen>
 
 	      <para>If an
 		<computeroutput>Operation not permitted</computeroutput>
 		error is displayed, make certain that the target device
-		is not in use, mounted, or being automounted by some
-		well-intentioned utility program.  Then try
+		is not in use, mounted, or being automounted by
+		another program.  Then try
 		again.</para>
 	    </step>
 	  </procedure>
@@ -684,8 +702,10 @@
 	    <title>Using &windows; To Write the Image</title>
 
 	    <warning>
-	      <para>Make sure you use the correct drive letter as the output
-		target, or you may overwrite and destroy existing data.</para>
+	      <para>Make sure to use the correct drive letter as the
+		output
+		target, as this command will overwrite and destroy
+		any existing data on the specified device.</para>
 	    </warning>
 
 	    <step>
@@ -740,29 +760,32 @@
 	    <literal>kern*</literal>.</para>
 
 	  <important>
-	    <para>Your FTP program must use <emphasis>binary mode</emphasis>
-	      to download these disk images.  Some web browsers have been
-	      known to use <emphasis>text</emphasis> (or
-	      <emphasis>ASCII</emphasis>) mode, which will be apparent if you
-	      cannot boot from the disks.</para>
+	    <para>The FTP program must use <emphasis>binary
+		mode</emphasis>
+	      to download these disk images.  Some web browsers
+	      use <emphasis>text</emphasis> or
+	      <emphasis>ASCII</emphasis> mode, which will be apparent
+	      if
+	      the disks are not bootable.</para>
 	  </important>
 	</step>
 
 	<step>
 	  <title>Prepare the Floppy Disks</title>
 
-	  <para>Prepare one floppy disk per image file you had to
-	    download.  It is imperative that these disks are free from
-	    defects.  The easiest way to test this is to format the disks
-	    for yourself.  Do not trust pre-formatted floppies.  The format
+	  <para>Prepare one floppy disk per downloaded image file.
+	    It is imperative that these disks are free from
+	    defects.  The easiest way to test this is to reformat the
+	    disks.
+	    Do not trust pre-formatted floppies.  The format
 	    utility in &windows; will not tell about the presence of
 	    bad blocks, it simply marks them as <quote>bad</quote>
-	    and ignores them.  It is advised that you use brand new
-	    floppies if choosing this installation route.</para>
+	    and ignores them.  It is advised to use brand new
+	    floppies.</para>
 
 	  <important>
-	    <para>If you try to install &os; and the installation
-	      program crashes, freezes, or otherwise misbehaves, one of
+	    <para>If the installer
+	      crashes, freezes, or otherwise misbehaves, one of
 	      the first things to suspect is the floppies.  Write
 	      the floppy image files to new disks and try
 	      again.</para>
@@ -773,47 +796,44 @@
 	  <title>Write the Image Files to the Floppy Disks</title>
 
 	  <para>The <filename>.flp</filename> files are
-	    <emphasis>not</emphasis> regular files you copy to the disk.
+	    <emphasis>not</emphasis> regular files that can be copied
+	    to the disk.
 	    They are images of the complete contents of the
-	    disk.  This means that you <emphasis>cannot</emphasis> simply
-	    copy files from one disk to another.
-	    Instead, you must use specific tools to write the
+	    disk.
+	    Specific tools must be used to write the
 	    images directly to the disk.</para>
 
 	  <indexterm><primary>DOS</primary></indexterm>
-	  <para>If you are creating the floppies on a computer running
-	    &ms-dos; / &windows;, then we provide a tool to do
-	    this called <command>fdimage</command>.</para>
-
-	  <para>If you are using the floppies from the CDROM, and your
-	    CDROM is the <devicename>E:</devicename> drive, then you would
-	    run this:</para>
+	  <para>&os; provides a tool called
+	    <command>rawrite</command> for creating the floppies on a
+	    computer running
+	    &windows;.  This tool can be downloaded from
+	    <literal>ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/pc98/<replaceable>
+	      version</replaceable>-RELEASE/tools/</literal>
+	    on the &os; FTP site.  Download this tool, insert a
+	    floppy, then specify the filename to write to the floppy
+	    drive:</para>
 
-	  <screen><prompt>E:\&gt;</prompt> <userinput>tools\fdimage floppies\boot.flp A:</userinput></screen>
+	  <screen><prompt>C:\&gt;</prompt> <userinput>rawrite boot.flp A:</userinput></screen>
 
 	  <para>Repeat this command for each <filename>.flp</filename>
 	    file, replacing the floppy disk each time, being sure to label
-	    the disks with the name of the file that you copied to them.
-	    Adjust the command line as necessary, depending on where you have
-	    placed the <filename>.flp</filename> files.  If you do not have
-	    the CDROM, then <command>fdimage</command> can be downloaded from
-	    the <ulink
-	    url="ftp://ftp.FreeBSD.org/pub/FreeBSD/tools/"><filename class="directory">tools</filename>
-	    directory</ulink> on the &os; FTP site.</para>
-
-	  <para>If you are writing the floppies on a &unix; system (such as
-	    another &os; system) you can use the &man.dd.1; command to
-	    write the image files directly to disk.  On &os;, you would
+	    the disks with the name of the file.
+	    Adjust the command line as necessary, depending on where
+	    the <filename>.flp</filename> files are located.</para>
+
+	  <para>When writing the floppies on a &unix;-like system,
+	    such as
+	    another &os; system, use &man.dd.1; to
+	    write the image files directly to disk.  On &os;,
 	    run:</para>
 
 	  <screen>&prompt.root; <userinput>dd if=boot.flp of=/dev/fd0</userinput></screen>
 
 	  <para>On &os;, <filename>/dev/fd0</filename> refers to the
-	    first floppy disk (the <devicename>A:</devicename> drive).
-	    <filename>/dev/fd1</filename> would be the
-	    <devicename>B:</devicename> drive, and so on.  Other &unix;
+	    first floppy disk.  Other &unix;
 	    variants might have different names for the floppy disk
-	    devices, and you will need to check the documentation for the
+	    device, so check the documentation for the
 	    system as necessary.</para>
 	</step>
       </procedure>
@@ -826,8 +846,9 @@
     <title>Starting the Installation</title>
 
     <important>
-      <para>By default, the installation will not make any changes to your
-	disk(s) until you see the following message:</para>
+      <para>By default, the installer will not make any changes to
+	the
+	disk(s) until after the following message:</para>
 
       <literallayout class="monospaced">Last Chance: Are you SURE you want continue the installation?
 
@@ -836,10 +857,12 @@ STRONGLY ENCOURAGE YOU TO MAKE PROPER BA
 
 We can take no responsibility for lost disk contents!</literallayout>
 
-      <para>The install can be exited at any time prior to the final
-	warning without changing the contents of the hard drive.  If you are
-	concerned that you have configured something incorrectly you can just
-	turn the computer off before this point, and no damage will be
+      <para>The install can be exited at any time prior to this final
+	warning without changing the contents of the hard drive.  If
+	there is a
+	concern that something is configured incorrectly,
+	turn the computer off before this point, and no damage
+	will be
 	done.</para>
     </important>
 
@@ -851,10 +874,6 @@ We can take no responsibility for lost d
 
       <procedure>
 	<step>
-	  <para>Start with your computer turned off.</para>
-	</step>
-
-	<step>
 	  <para>Turn on the computer.  As it starts it should display an
 	    option to enter the system set up menu, or BIOS, commonly reached
 	    by keys like <keycap>F2</keycap>, <keycap>F10</keycap>,
@@ -863,9 +882,10 @@ We can take no responsibility for lost d
 	      <keycap>Alt</keycap>
 	      <keycap>S</keycap>
 	    </keycombo>.  Use whichever keystroke is indicated on screen.  In
-	    some cases your computer may display a graphic while it starts.
+	    some cases the computer may display a graphic while it
+	    starts.
 	    Typically, pressing <keycap>Esc</keycap> will dismiss the graphic
-	    and allow you to see the necessary messages.</para>
+	    and display the boot messages.</para>
 	</step>
 
 	<step>
@@ -875,11 +895,10 @@ We can take no responsibility for lost d
 	    <literal>Floppy</literal>, <literal>CDROM</literal>,
 	    <literal>First Hard Disk</literal>, and so on.</para>
 
-	  <para>If you are booting from the CDROM then make sure that
-	    the CDROM is selected.  If you are booting from a USB disk or
-	    a floppy disk then
-	    make sure that is selected instead.  In case of doubt, you
-	    should consult the manual that came with your computer, and/or its
+	  <para>If booting from the CD/DVD, make sure that
+	    the CDROM drive is selected.  If booting from a USB disk,
+	    make sure that it is selected instead.  When in doubt,
+	    consult the manual that came with the computer or its
 	    motherboard.</para>
 
 	  <para>Make the change, then save and exit.  The computer should now
@@ -887,12 +906,13 @@ We can take no responsibility for lost d
 	</step>
 
 	<step>
-	  <para>If you prepared a <quote>bootable</quote> USB stick, as described in
-	    <xref linkend="install-boot-media"/>, then plug in your USB
+	  <para>If using a prepared a <quote>bootable</quote> USB
+	    stick, as described in
+	    <xref linkend="install-boot-media"/>, plug in the USB
 	    stick before turning on the computer.</para>
 
-	  <para>If you are booting from CDROM, then you will need to turn on
-	    the computer, and insert the CDROM at the first
+	  <para>If booting from CD/DVD, turn on
+	    the computer, and insert the CD/DVD at the first
 	    opportunity.</para>
 
 	  <note>
@@ -904,32 +924,33 @@ We can take no responsibility for lost d
 	      installer.</para>
 	  </note>
 
-	  <para>If your computer starts up as normal and loads your existing
+	  <para>If the computer starts up as normal and loads the
+	    existing
 	    operating system, then either:</para>
 
 	  <orderedlist>
 	    <listitem>
 	      <para>The disks were not inserted early enough in the boot
-		process.  Leave them in, and try restarting your
+		process.  Leave them in, and try restarting the
 		computer.</para>
 	    </listitem>
 
 	    <listitem>
-	      <para>The BIOS changes earlier did not work correctly.  You
-		should redo that step until you get the right option.</para>
+	      <para>The BIOS changes did not work correctly.
+		Redo that step until the right option is
+		selected.</para>
 	    </listitem>
 
 	    <listitem>
-	      <para>Your particular BIOS does not support booting from
+	      <para>That particular BIOS does not support booting from
 		the desired media.</para>
 	    </listitem>
 	</orderedlist>
 	</step>
 

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

From owner-svn-doc-projects@FreeBSD.ORG  Tue May  7 10:02:49 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 4EC442E1;
 Tue,  7 May 2013 10:02:49 +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 4137DD30;
 Tue,  7 May 2013 10:02:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r47A2nbW041707;
 Tue, 7 May 2013 10:02:49 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r47A2nBT041706;
 Tue, 7 May 2013 10:02:49 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201305071002.r47A2nBT041706@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Tue, 7 May 2013 10:02:49 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41558 - 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: Tue, 07 May 2013 10:02:49 -0000

Author: gabor
Date: Tue May  7 10:02:48 2013
New Revision: 41558
URL: http://svnweb.freebsd.org/changeset/doc/41558

Log:
  - Work around overflowing images

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

Modified: projects/xml-tools/share/mk/doc.docbook.mk
==============================================================================
--- projects/xml-tools/share/mk/doc.docbook.mk	Tue May  7 06:28:47 2013	(r41557)
+++ projects/xml-tools/share/mk/doc.docbook.mk	Tue May  7 10:02:48 2013	(r41558)
@@ -453,6 +453,9 @@ ${DOC}.tex: ${SRCS} ${LOCAL_IMAGES_EPS} 
 		${DOC}.parsed.xml
 	${JADE} -V tex-backend ${PRINTOPTS} \
 		${JADEOPTS} -t tex -o ${.TARGET} ${XMLDECL} ${DOC}.parsed.xml
+	${SED} -i '' -e 's|{1}\\def\\ScaleY%|{0.5}\\def\\ScaleY%|g' \
+		-e 's|{1}\\def\\EntitySystemId%|{0.5}\\def\\EntitySystemId%|g' \
+		${.TARGET}
 
 .if !target(${DOC}.dvi)
 ${DOC}.dvi: ${DOC}.tex ${LOCAL_IMAGES_EPS}

From owner-svn-doc-projects@FreeBSD.ORG  Tue May  7 10:20:26 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 66588646;
 Tue,  7 May 2013 10:20:26 +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 56D15DED;
 Tue,  7 May 2013 10:20:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r47AKQBu047136;
 Tue, 7 May 2013 10:20:26 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r47AKKSx047093;
 Tue, 7 May 2013 10:20:20 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201305071020.r47AKKSx047093@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Tue, 7 May 2013 10:20:20 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41559 - in projects/xml-tools: de_DE.ISO8859-1/share/xml
 en_US.ISO8859-1/articles en_US.ISO8859-1/articles/committers-guide
 en_US.ISO8859-1/articles/cvsup-advanced en_US.ISO8859-1/arti...
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: Tue, 07 May 2013 10:20:26 -0000

Author: gabor
Date: Tue May  7 10:20:20 2013
New Revision: 41559
URL: http://svnweb.freebsd.org/changeset/doc/41559

Log:
  - MFH

Deleted:
  projects/xml-tools/en_US.ISO8859-1/articles/cvsup-advanced/
  projects/xml-tools/fr_FR.ISO8859-1/articles/cvsup-advanced/
  projects/xml-tools/ru_RU.KOI8-R/articles/cvsup-advanced/
Modified:
  projects/xml-tools/de_DE.ISO8859-1/share/xml/news.xml
  projects/xml-tools/en_US.ISO8859-1/articles/Makefile
  projects/xml-tools/en_US.ISO8859-1/articles/committers-guide/article.xml
  projects/xml-tools/en_US.ISO8859-1/articles/p4-primer/article.xml
  projects/xml-tools/en_US.ISO8859-1/articles/portbuild/article.xml
  projects/xml-tools/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml
  projects/xml-tools/en_US.ISO8859-1/books/faq/book.xml
  projects/xml-tools/en_US.ISO8859-1/books/handbook/geom/chapter.xml
  projects/xml-tools/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
  projects/xml-tools/en_US.ISO8859-1/books/handbook/printing/chapter.xml
  projects/xml-tools/en_US.ISO8859-1/books/porters-handbook/book.xml
  projects/xml-tools/en_US.ISO8859-1/htdocs/cgi/man.cgi
  projects/xml-tools/en_US.ISO8859-1/htdocs/cgi/monthly.cgi
  projects/xml-tools/en_US.ISO8859-1/htdocs/community/mailinglists.xml
  projects/xml-tools/en_US.ISO8859-1/htdocs/java/index.xml
  projects/xml-tools/en_US.ISO8859-1/htdocs/java/news.xml
  projects/xml-tools/en_US.ISO8859-1/htdocs/news/2012-compromise.xml
  projects/xml-tools/en_US.ISO8859-1/htdocs/releases/index.xml
  projects/xml-tools/en_US.ISO8859-1/htdocs/security/reporting.xml
  projects/xml-tools/en_US.ISO8859-1/share/xml/mailing-lists.ent
  projects/xml-tools/fr_FR.ISO8859-1/articles/Makefile
  projects/xml-tools/ja_JP.eucJP/htdocs/releases/index.xml
  projects/xml-tools/ja_JP.eucJP/htdocs/security/reporting.xml   (contents, props changed)
  projects/xml-tools/ja_JP.eucJP/share/xml/news.xml
  projects/xml-tools/mn_MN.UTF-8/books/handbook/geom/chapter.xml
  projects/xml-tools/ru_RU.KOI8-R/articles/Makefile
  projects/xml-tools/share/pgpkeys/itetcu.key
  projects/xml-tools/share/xml/events2013.xml
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/fr_FR.ISO8859-1/   (props changed)
  projects/xml-tools/ja_JP.eucJP/   (props changed)
  projects/xml-tools/mn_MN.UTF-8/   (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/share/xml/news.xml
==============================================================================
--- projects/xml-tools/de_DE.ISO8859-1/share/xml/news.xml	Tue May  7 10:02:48 2013	(r41558)
+++ projects/xml-tools/de_DE.ISO8859-1/share/xml/news.xml	Tue May  7 10:20:20 2013	(r41559)
@@ -4,7 +4,7 @@
 <!--
      $FreeBSD$
      $FreeBSDde$
-     basiert auf: r41484
+     basiert auf: r41524
 -->
 
 <!-- Simple schema for FreeBSD Project news.
@@ -42,9 +42,32 @@
       <name>4</name>
 
       <day>
+	<name>29</name>
+
+	<event>
+	  <title>Neuer technischer Mitarbeiter für die &os; Foundation:
+	    Edward Tomasz Napiera&#322;a</title>
+
+	  <p>Die &os;&nbsp;Foundation freut sich, bekanntgeben zu dürfen,
+	    dass mit Edward Tomasz Napiera&#322;a ein weiterer
+	    technischer Mitarbeiter in Vollzeit für die Foundation tätig
+	    sein wird.  Damit setzt die Foundation die für 2013 geplanten
+	    Investitionen in Personal fort.</p>
+	    
+	  <p>Weitere Informationen hierzu finden Sie <a
+	      href="http://freebsdfoundation.blogspot.com/2013/04/freebsd-foundation-announces-second.html">hier</a>.</p>
+	</event>
+      </day>
+      
+      <day>
 	<name>24</name>
 
 	<event>
+	  <p>Neuer Committer: <a
+	    href="mailto:asomers@FreeBSD.org">Alan Somers</a> (src)</p>
+	</event>
+
+	<event>
 	  <title>Das FreeBSD Project nimmt am Google Summer of
 	    Code 2013 teil</title>
 

Modified: projects/xml-tools/en_US.ISO8859-1/articles/Makefile
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/articles/Makefile	Tue May  7 10:02:48 2013	(r41558)
+++ projects/xml-tools/en_US.ISO8859-1/articles/Makefile	Tue May  7 10:20:20 2013	(r41559)
@@ -13,7 +13,6 @@ SUBDIR+= contributors
 SUBDIR+= cups
 SUBDIR+= custom-gcc
 SUBDIR+= cvs-freebsd
-SUBDIR+= cvsup-advanced
 SUBDIR+= explaining-bsd
 SUBDIR+= fbsd-from-scratch
 SUBDIR+= filtering-bridges

Modified: projects/xml-tools/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/articles/committers-guide/article.xml	Tue May  7 10:02:48 2013	(r41558)
+++ projects/xml-tools/en_US.ISO8859-1/articles/committers-guide/article.xml	Tue May  7 10:20:20 2013	(r41559)
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-	"../../../share/xml/freebsd45.dtd">
+	"../../../share/xml/freebsd45.dtd" [
+<!ENTITY ga "Google Analytics">
+]>
 
 <article lang='en'>
   <articleinfo>
@@ -4149,6 +4151,73 @@ bak/packages  packages from last complet
 
   </sect1>
 
+  <sect1 id="google-analytics">
+    <title>Information about &ga;</title>
+
+    <para>As of December 12, 2012, &ga; was enabled on the
+      &os;&nbsp;Project website to collect anonymized usage statistics
+      regarding usage of the site.  The information collected is
+      valuable to the &os;&nbsp;Documentation Project, in order to
+      identify various problems on the &os; website.</para>
+
+    <sect2 id="google-analytics-policy">
+      <title>&ga; General Policy</title>
+
+      <para>The &os;&nbsp;Project takes visitor privacy very
+       seriously.  As such, the &os;&nbsp;Project website honors the
+       <quote>Do Not Track</quote> header <emphasis>before</emphasis>
+       fetching the tracking code from Google.  For more information,
+       please see the <ulink
+	 url="http://www.FreeBSD.org/privacy.html">&os; Privacy
+	 Policy</ulink>.</para>
+
+      <para>&ga; access is <emphasis>not</emphasis> arbitrarily
+	allowed &mdash; access must be requested, voted on by the
+	&a.doceng;, and explicitly granted.</para>
+
+      <para>Requests for &ga; data must include a specific purpose.
+	For example, a valid reason for requesting access would be
+	<quote>to see the most frequently used web browsers when
+	  viewing &os; web pages to ensure page rendering speeds are
+	  acceptable.</quote></para>
+
+      <para>Conversely, <quote>to see what web browsers are most
+	  frequently used</quote> (without stating
+	<emphasis>why</emphasis>) would be rejected.</para>
+
+      <para>All requests must include the timeframe for which the data
+	would be required.  For example, it must be explicitly stated
+	if the requested data would be needed for a timeframe covering
+	a span of 3 weeks, or if the request would be one-time
+	only.</para>
+
+      <para>Any request for &ga; data without a clear, reasonable
+	reason beneficial to the &os;&nbsp;Project will be
+	rejected.</para>
+    </sect2>
+
+    <sect2 id="google-analytics-data">
+      <title>Data Available Through &ga;</title>
+
+      <para>A few examples of the types of &ga; data available
+	include:</para>
+
+      <itemizedlist>
+	<listitem>
+	  <para>Commonly used web browsers</para>
+	</listitem>
+
+	<listitem>
+	  <para>Page load times</para>
+	</listitem>
+
+	<listitem>
+	  <para>Site access by language</para>
+	</listitem>
+      </itemizedlist>
+    </sect2>
+  </sect1>
+
   <sect1 id="perks">
     <title>Perks of the Job</title>
 

Modified: projects/xml-tools/en_US.ISO8859-1/articles/p4-primer/article.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/articles/p4-primer/article.xml	Tue May  7 10:02:48 2013	(r41558)
+++ projects/xml-tools/en_US.ISO8859-1/articles/p4-primer/article.xml	Tue May  7 10:20:20 2013	(r41559)
@@ -331,7 +331,7 @@
     with &os;.  Frequent submits of changes to the server are also
     encouraged.</para>
 
-  <para>sSimilar to <application>Subversion</application>, the
+  <para>Similar to <application>Subversion</application>, the
     <application>Perforce</application> repository (the
     <quote>depot</quote>)  is a single flat tree.  Every file, whether
     a unique creation or a derivative from a branch, is accessible via

Modified: projects/xml-tools/en_US.ISO8859-1/articles/portbuild/article.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/articles/portbuild/article.xml	Tue May  7 10:02:48 2013	(r41558)
+++ projects/xml-tools/en_US.ISO8859-1/articles/portbuild/article.xml	Tue May  7 10:20:20 2013	(r41559)
@@ -69,7 +69,7 @@
 	to specify the build branch (e.g., 7, 7-exp, 8, 8-exp, 9, 9-exp, 10, 10-exp).
 	The set of branches that <username>portmgr</username> currently
 	supports is the same as those that the &os;
-	<ulink url="http://www.freebsd.org/security/index.html#supported-branches">security team</ulink>
+	<ulink url="http://www.freebsd.org/security/index.html#sup">security team</ulink>
 	supports.
       </para>
 
@@ -2338,7 +2338,7 @@ zfs destroy -r a/snap/src-<replaceable>o
       <literal>packages-8-stable</literal> should be built from 8.1.</para>
 
     <para>As releases go End-Of-Life (see
-      <ulink url="http://www.freebsd.org/security/index.html#supported-branches">chart</ulink>),
+      <ulink url="http://www.freebsd.org/security/index.html#sup">chart</ulink>),
       a full (not incremental!) package build should be done and uploaded.</para>
 
     <para>The procedure is as follows:</para>

Modified: projects/xml-tools/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml	Tue May  7 10:02:48 2013	(r41558)
+++ projects/xml-tools/en_US.ISO8859-1/books/developers-handbook/testing/chapter.xml	Tue May  7 10:20:20 2013	(r41559)
@@ -318,7 +318,7 @@
 		  <itemizedlist>
 		    <listitem>
 		      <para>Call <function>success()</function> to
-			detemine the outcome of the build.</para>
+			determine the outcome of the build.</para>
 		    </listitem>
 		    <listitem>
 		      <para>Output the modification size.</para>
@@ -376,7 +376,7 @@
 	</listitem>
       </itemizedlist>
 
-      <para>Tthis means that <literal>HEAD</literal> always ranks
+      <para>This means that <literal>HEAD</literal> always ranks
 	highest, and <literal>RELENG</literal> branches are ranked in
 	numerical order, with each <literal>STABLE</literal> branch
 	ranking higher than the release branches forked off of it.

Modified: projects/xml-tools/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/books/faq/book.xml	Tue May  7 10:02:48 2013	(r41558)
+++ projects/xml-tools/en_US.ISO8859-1/books/faq/book.xml	Tue May  7 10:20:20 2013	(r41559)
@@ -3262,7 +3262,7 @@ kern.sched.name: ULE</screen>
 	      <listitem>
 		<para>&os; supports <literal>ext2fs</literal> and
 		  <literal>ext3fs</literal> partitions.  See
-		  &man.mount.ext2fs.8; for more information.</para>
+		  &man.ext2fs.5; for more information.</para>
 	      </listitem>
 	    </varlistentry>
 

Modified: projects/xml-tools/en_US.ISO8859-1/books/handbook/geom/chapter.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/books/handbook/geom/chapter.xml	Tue May  7 10:02:48 2013	(r41558)
+++ projects/xml-tools/en_US.ISO8859-1/books/handbook/geom/chapter.xml	Tue May  7 10:20:20 2013	(r41559)
@@ -1310,7 +1310,7 @@ ufsid/486b6fc16926168e     N/A  ad4s1f</
 
     <screen>&prompt.root; <userinput>newfs -O 2 -J /dev/da4.journal</userinput></screen>
 
-    <para>This command will creates a <acronym>UFS</acronym>2 file
+    <para>This command will create a <acronym>UFS</acronym>2 file
       system on the journaled device.</para>
 
     <para><command>mount</command> the device at the desired point

Modified: projects/xml-tools/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml	Tue May  7 10:02:48 2013	(r41558)
+++ projects/xml-tools/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml	Tue May  7 10:20:20 2013	(r41559)
@@ -235,7 +235,7 @@
 
       <para>Subscribe to one of the
 	<application>CTM</application> distribution lists.
-	&a.ctm-cvs-cur.name; supports the entire CVS tree.
+	&a.ctm-src-cur.name; supports the entire Subversion tree.
 	&a.ctm-src-cur.name; supports the head of the development
 	branch.  &a.ctm-src-9.name; supports the 9.X release branch,
 	etc..  (If you do not know how to subscribe yourself to a

Modified: projects/xml-tools/en_US.ISO8859-1/books/handbook/printing/chapter.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/books/handbook/printing/chapter.xml	Tue May  7 10:02:48 2013	(r41558)
+++ projects/xml-tools/en_US.ISO8859-1/books/handbook/printing/chapter.xml	Tue May  7 10:20:20 2013	(r41559)
@@ -40,7 +40,7 @@
 
     <para>&os; can also be configured to act as a print server on a
       network; in this capacity &os; can receive print jobs from a
-      varietyof other computers, including other &os; computers,
+      variety of other computers, including other &os; computers,
       &windows; and &macos; hosts.  &os; will ensure that one job
       at a time is printed, and can keep statistics on which users
       and machines are doing the most printing, produce
@@ -4879,11 +4879,11 @@ cfA013rose dequeued</screen>
 
     <variablelist>
       <varlistentry>
-	<term>It worked, after awhile; or, it did not eject a full
+	<term>It worked, after a while; or, it did not eject a full
 	  sheet.</term>
 
 	<listitem>
-	  <para>The printer printed the above, but it sat for awhile
+	  <para>The printer printed the above, but it sat for a while
 	    and did nothing.  In fact, you might have needed to press
 	    a PRINT REMAINING or FORM FEED button on the printer to
 	    get any results to appear.</para>

Modified: projects/xml-tools/en_US.ISO8859-1/books/porters-handbook/book.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/books/porters-handbook/book.xml	Tue May  7 10:02:48 2013	(r41558)
+++ projects/xml-tools/en_US.ISO8859-1/books/porters-handbook/book.xml	Tue May  7 10:20:20 2013	(r41559)
@@ -6295,6 +6295,16 @@ USE_XORG=	x11 xpm</programlisting>
 	    files.</para>
 	</sect3>
 
+	<sect3 id="updating-desktop-database">
+	  <title>Updating desktop database</title>
+
+	  <para>If a port has a MimeType entry in its
+	    <filename><replaceable>portname</replaceable>.desktop</filename>,
+	    the desktop database must
+	    be updated after install and deinstall.  To do this,
+	    define <makevar>USES</makevar>= desktop-file-utils.</para>
+	</sect3>
+
 	<sect3 id="desktop-entries-macro">
 	  <title>Creating Desktop Entries with the
 	    <makevar>DESKTOP_ENTRIES</makevar> Macro</title>

Modified: projects/xml-tools/en_US.ISO8859-1/htdocs/cgi/man.cgi
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/htdocs/cgi/man.cgi	Tue May  7 10:02:48 2013	(r41558)
+++ projects/xml-tools/en_US.ISO8859-1/htdocs/cgi/man.cgi	Tue May  7 10:20:20 2013	(r41559)
@@ -147,6 +147,7 @@ $sectionpath = {
     'OpenBSD 5.0' => { 'path' => '1:2:3:3p:4:5:6:7:8:9', },
     'OpenBSD 5.1' => { 'path' => '1:2:3:3p:4:5:6:7:8:9', },
     'OpenBSD 5.2' => { 'path' => '1:2:3:3p:4:5:6:7:8:9', },
+    'OpenBSD 5.3' => { 'path' => '1:2:3:3p:4:5:6:7:8:9', },
 
     'CentOS Linux/i386 3.9' => { 'path' => '1:2:3:3p:4:5:6:7:8:9:n', },
     'CentOS Linux/i386 4.8' => { 'path' => '1:1p:2:3:3p:4:5:6:7:8:9:n:0p', },
@@ -381,6 +382,7 @@ $manPathDefault = 'FreeBSD 9.1-RELEASE';
     'OpenBSD 5.0', "$manLocalDir/OpenBSD-5.0",
     'OpenBSD 5.1', "$manLocalDir/OpenBSD-5.1",
     'OpenBSD 5.2', "$manLocalDir/OpenBSD-5.2",
+    'OpenBSD 5.3', "$manLocalDir/OpenBSD-5.3",
 
     #'NetBSD 0.9',            "$manLocalDir/NetBSD-0.9",
     'NetBSD 1.0',   "$manLocalDir/NetBSD-1.0",
@@ -594,6 +596,7 @@ my %arch = ( 
 'OpenBSD 5.0' => { 'arch' => [qw/alpha amd64 armish aviion hp300 hppa hppa64 i386 landisk loongson luna88k mac68k macppc mvme68k mvme88k mvmeppc palm sgi socppc sparc sparc64 vax zaurus/] }, 
 'OpenBSD 5.1' => { 'arch' => [qw/alpha amd64 armish aviion hp300 hppa hppa64 i386 landisk loongson luna88k mac68k macppc mvme68k mvme88k mvmeppc palm sgi socppc sparc sparc64 vax zaurus/] }, 
 'OpenBSD 5.2' => { 'arch' => [qw/alpha amd64 armish aviion hp300 hppa hppa64 i386 landisk loongson luna88k mac68k macppc mvme68k mvme88k mvmeppc palm sgi socppc sparc sparc64 vax zaurus/] }, 
+'OpenBSD 5.3' => { 'arch' => [qw/alpha amd64 armish aviion hp300 hppa hppa64 i386 landisk loongson luna88k mac68k macppc mvme68k mvme88k mvmeppc palm sgi socppc sparc sparc64 vax zaurus/] }, 
 );
 
 # delete not existing releases
@@ -636,7 +639,7 @@ while ( ( $key, $val ) = each %manPath )
     'macosx',     'Darwin 8.0.1/ppc',
 
     'netbsd',        'NetBSD 6.0',
-    'openbsd',       'OpenBSD 5.2',
+    'openbsd',       'OpenBSD 5.3',
     'v7',            'Unix Seventh Edition',
     'v7man',         'Unix Seventh Edition',
     'x11',           'X11R7.4',

Modified: projects/xml-tools/en_US.ISO8859-1/htdocs/cgi/monthly.cgi
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/htdocs/cgi/monthly.cgi	Tue May  7 10:02:48 2013	(r41558)
+++ projects/xml-tools/en_US.ISO8859-1/htdocs/cgi/monthly.cgi	Tue May  7 10:20:20 2013	(r41559)
@@ -1,4 +1,5 @@
 #!/usr/bin/perl -w
+# $FreeBSD$
 
 require "./cgi-style.pl";
 
@@ -23,11 +24,11 @@ sub xml
 
 	my($Tag, $Etc) = split(' ', $TagEtc, 2);
 
-	my $Spaces = " " x ($Indent*3);
+	my $Spaces = " " x ($Indent*2);
 	if (!@Text)
 	{
 		# No text in the tag
-		return ("$Spaces<$TagEtc >\n");
+		return ("$Spaces<$TagEtc />\n");
 	}
 	elsif (@Text == 1)
 	{
@@ -137,6 +138,7 @@ if ($Submit)
 	my @info = split("\n", $info);
 
 	my $title = "FreeBSD project submission output";
+	my $tasks = xml(1, "help", "", @tasks) if @tasks;
 
 	my @contents = xml(0, "project cat=\'$Category\'",
 	    xml(1, "title", $Project),
@@ -148,11 +150,11 @@ if ($Submit)
             xml(1, "body",
                 xml(2, "p", "", xmltext(3, @info))),
             "\n",
-            xml(1, "help", "", @tasks),
+            $tasks,
         );
 	my $contents = join('', @contents);
 
-	$contents = "<!-- Mail to: monthly\@freebsd.org -->\n$contents";
+	$contents = "<!-- Mail as an attachment to: monthly\@freebsd.org -->\n$contents";
 
 	if (!$errors)
 	{

Modified: projects/xml-tools/en_US.ISO8859-1/htdocs/community/mailinglists.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/htdocs/community/mailinglists.xml	Tue May  7 10:02:48 2013	(r41558)
+++ projects/xml-tools/en_US.ISO8859-1/htdocs/community/mailinglists.xml	Tue May  7 10:20:20 2013	(r41559)
@@ -58,9 +58,9 @@
 	or <a href="http://www.FreeBSD-fr.org/">WWW</a>.</li>
 
       <li><strong>Hungarian</strong> -- <a
-	  href="mailto:bsd@hu.FreeBSD.org">bsd@hu.FreeBSD.org</a>, <a
-	  href="https://lists.hu.FreeBSD.org/mailman/listinfo/bsd/">Administration</a>
-	or <a href="http://lists.hu.FreeBSD.org/pipermail/bsd/">Search</a>.</li>
+	  href="mailto:bsd@lista.bsd.hu">bsd@lista.bsd.hu</a>, <a
+	  href="http://lista.bsd.hu/">Administration</a>
+	or <a href="http://datacast.hu/pipermail/bsd/">Search</a>.</li>
 
       <li><strong>Indonesian</strong> -- <a
 	  href="mailto:id-freebsd-subscribe@egroups.com">id-freebsd-subscribe@egroups.com</a></li>

Modified: projects/xml-tools/en_US.ISO8859-1/htdocs/java/index.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/htdocs/java/index.xml	Tue May  7 10:02:48 2013	(r41558)
+++ projects/xml-tools/en_US.ISO8859-1/htdocs/java/index.xml	Tue May  7 10:20:20 2013	(r41559)
@@ -31,7 +31,7 @@
 
   <p>Further information about downloading the unsupported binaries is
     available from the
-    <a href="http://www.FreeBSDFoundation.org/downloads/java.shtml">FreeBSD
+    <a href="http://www.FreeBSDFoundation.org/java">FreeBSD
     Foundation &java; Downloads</a> page.</p>
 
   <h2>News</h2>

Modified: projects/xml-tools/en_US.ISO8859-1/htdocs/java/news.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/htdocs/java/news.xml	Tue May  7 10:02:48 2013	(r41558)
+++ projects/xml-tools/en_US.ISO8859-1/htdocs/java/news.xml	Tue May  7 10:20:20 2013	(r41559)
@@ -280,7 +280,7 @@
 	    1.6 and JRE 1.6.  For more details, see the <a
 	      href="http://www.freebsdfoundation.org/press/2008Jul-newsletter.shtml">
 	    Foundation newsletter</a> and the <a
-	      href="http://www.freebsdfoundation.org/downloads/java.shtml">download
+	      href="http://www.freebsdfoundation.org/java">download
 	    page</a>.</p>
 	</event>
       </day>
@@ -473,7 +473,7 @@
 	    1.5 and JRE 1.5.  For more details, see the <a
 	      href="http://www.freebsdfoundation.org/press/20060405-PRrelease.shtml">press
 	    release</a> and <a
-	      href="http://www.freebsdfoundation.org/downloads/java.shtml">download
+	      href="http://www.freebsdfoundation.org/java">download
 	    page</a>.</p>
 	</event>
       </day>

Modified: projects/xml-tools/en_US.ISO8859-1/htdocs/news/2012-compromise.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/htdocs/news/2012-compromise.xml	Tue May  7 10:02:48 2013	(r41558)
+++ projects/xml-tools/en_US.ISO8859-1/htdocs/news/2012-compromise.xml	Tue May  7 10:20:20 2013	(r41559)
@@ -62,6 +62,7 @@
 
     <ul>
       <li><a href="#announce">Announcement</a></li>
+      <li><a href="#update20130430">Update: 30th April 2013</a></li>
       <li><a href="#update20130323">Update: 23rd March 2013</a></li>
       <li><a href="#update20130303">Update: 3rd March 2013</a></li>
       <li><a href="#update20121229">Update: 29th December 2012</a></li>
@@ -74,6 +75,30 @@
       <li><a href="#recommend">Recommendations</a></li>
     </ul>
 
+    <h1><a name="update20130430">Update: April 30th, 2013</a></h1>
+
+    <p>Port managers and cluster administrators have completed the
+      restoration of binary package building in the last few weeks.
+      This has brought us back the continuous updates for the old-style
+      binary packages on the 8.x and 9.x -STABLE branches.  Note that,
+      as beneficial consequences, Release Candidate builds for the 8.4
+      release cycle can now include binary packages on the install
+      media, and the Project was able to add the missing binary packages
+      retroactively for 9.1-RELEASE on i386 and amd64 platforms.</p>
+
+    <p>Port managers are currently working on introducing new-style (as
+      known as <q>pkgng</q>) binary packages in the coming months,
+      please check the <a
+	href="http://lists.freebsd.org/mailman/listinfo/freebsd-ports-announce/">
+	&os; ports announcements list</a> for further gradual status
+      updates.</p>
+
+    <p>This is planned to be the last status update to this page.  An
+      official announcement will be sent to the <a
+	href="http://lists.freebsd.org/mailman/listinfo/freebsd-announce/">
+	&os; announcements mailing list</a> with the further details
+      soon.</p>
+
     <h1><a name="update20130323">Update: March 23rd, 2013</a></h1>
 
     <p>Port managers have successfully restored some of the Project's
@@ -85,12 +110,6 @@
       preparations required for providing binary packages for the
       upcoming 8.4 and further releases.</p>
 
-    <p>Unless there are any other major changes, this is planned to be
-      the last status update to this page.  An email will be sent to
-      the <a href="http://lists.freebsd.org/mailman/listinfo/freebsd-announce">
-	FreeBSD announcements mailing list</a> when the package build
-      infrastructure is online and packages are once again available.</p>
-
     <h1><a name="update20130302">Update: March 3rd, 2013</a></h1>
 
     <p>Redports underwent a full security audit, and as a result could

Modified: projects/xml-tools/en_US.ISO8859-1/htdocs/releases/index.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/htdocs/releases/index.xml	Tue May  7 10:02:48 2013	(r41558)
+++ projects/xml-tools/en_US.ISO8859-1/htdocs/releases/index.xml	Tue May  7 10:20:20 2013	(r41559)
@@ -97,7 +97,7 @@
     <p>Complete historical information about the release date, the
       classification type, and the effective End-Of-Life (EOL) for
       these releases may be found on the <a
-	href="&base;/security/security.html#unsup">Unsupported
+	href="&base;/security/unsupported.html">Unsupported
 	Releases</a> section of the <a
 	href="&base;/security/security.html">FreeBSD Security
 	Information</a> page.</p>

Modified: projects/xml-tools/en_US.ISO8859-1/htdocs/security/reporting.xml
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/htdocs/security/reporting.xml	Tue May  7 10:02:48 2013	(r41558)
+++ projects/xml-tools/en_US.ISO8859-1/htdocs/security/reporting.xml	Tue May  7 10:20:20 2013	(r41559)
@@ -20,8 +20,8 @@
 	<li><a href="#how">How and where to report a FreeBSD security issue</a></li>
  	<li><a href="#sec">Information about the FreeBSD Security Officer</a></li>
  	<li><a href="#pol">Information handling policies</a></li>
- 	<li><a href="#sup">Supported FreeBSD Releases</a></li>
- 	<li><a href="#unsup">Unsupported FreeBSD Releases</a></li>
+ 	<li><a href="security.html#sup">Supported FreeBSD Releases</a></li>
+ 	<li><a href="unsupported.html">Unsupported FreeBSD Releases</a></li>
       </ul>
 
       <a name="how"></a>

Modified: projects/xml-tools/en_US.ISO8859-1/share/xml/mailing-lists.ent
==============================================================================
--- projects/xml-tools/en_US.ISO8859-1/share/xml/mailing-lists.ent	Tue May  7 10:02:48 2013	(r41558)
+++ projects/xml-tools/en_US.ISO8859-1/share/xml/mailing-lists.ent	Tue May  7 10:20:20 2013	(r41559)
@@ -86,10 +86,6 @@
 <!ENTITY a.ctm-announce "<ulink url='&a.ctm-announce.url;'>CTM announcements</ulink>">
 <!ENTITY a.ctm-announce.name "<ulink url='&a.ctm-announce.url;'>ctm-announce</ulink>">
 
-<!ENTITY a.ctm-cvs-cur.url "&a.mailman.listinfo;/ctm-cvs-cur">
-<!ENTITY a.ctm-cvs-cur "<ulink url='&a.ctm-cvs-cur.url;'>CTM distribution of CVS files</ulink>">
-<!ENTITY a.ctm-cvs-cur.name "<ulink url='&a.ctm-cvs-cur.url;'>ctm-cvs-cur</ulink>">
-
 <!ENTITY a.ctm-src-4.url "&a.mailman.listinfo;/ctm-src-4">
 <!ENTITY a.ctm-src-4 "<ulink url='&a.ctm-src-4.url;'>CTM 4-STABLE src branch distribution mailing list</ulink>">
 <!ENTITY a.ctm-src-4.name "<ulink url='&a.ctm-src-4.url;'>ctm-src-4</ulink>">

Modified: projects/xml-tools/fr_FR.ISO8859-1/articles/Makefile
==============================================================================
--- projects/xml-tools/fr_FR.ISO8859-1/articles/Makefile	Tue May  7 10:02:48 2013	(r41558)
+++ projects/xml-tools/fr_FR.ISO8859-1/articles/Makefile	Tue May  7 10:20:20 2013	(r41559)
@@ -11,7 +11,6 @@ SUBDIR+= committers-guide
 SUBDIR+= contributing
 SUBDIR+= contributing-ports
 SUBDIR+= contributors
-SUBDIR+= cvsup-advanced
 SUBDIR+= explaining-bsd
 SUBDIR+= filtering-bridges
 SUBDIR+= fonts

Modified: projects/xml-tools/ja_JP.eucJP/htdocs/releases/index.xml
==============================================================================
--- projects/xml-tools/ja_JP.eucJP/htdocs/releases/index.xml	Tue May  7 10:02:48 2013	(r41558)
+++ projects/xml-tools/ja_JP.eucJP/htdocs/releases/index.xml	Tue May  7 10:20:20 2013	(r41559)
@@ -5,7 +5,7 @@
 ]>
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r41117 -->
+<!-- Original revision: r41543 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -97,7 +97,7 @@
     <p>¤³¤ì¤Þ¤Ç¤Î¥ê¥ê¡¼¥¹¤Î¥ê¥ê¡¼¥¹Æü¡¢Ê¬Îà¡¢Êݼ齪λÆü (End-Of-Life (EOL))
       ¤Î´°Á´¤Ê¾ðÊó¤Ï¡¢<a href="&base;/security/security.html">FreeBSD
       ¥»¥­¥å¥ê¥Æ¥£¾ðÊó</a> ¤Î
-      <a href="&base;/security/security.html#unsup">¥µ¥Ý¡¼¥È¤¬½ªÎ»¤·¤¿¥ê¥ê¡¼¥¹</a>
+      <a href="&base;/security/unsupported.html">¥µ¥Ý¡¼¥È¤¬½ªÎ»¤·¤¿¥ê¥ê¡¼¥¹</a>
       ¤Ë¤Þ¤È¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡£</p>
 
     <ul>

Modified: projects/xml-tools/ja_JP.eucJP/htdocs/security/reporting.xml
==============================================================================
Binary file (source and/or target). No diff available.

Modified: projects/xml-tools/ja_JP.eucJP/share/xml/news.xml
==============================================================================
--- projects/xml-tools/ja_JP.eucJP/share/xml/news.xml	Tue May  7 10:02:48 2013	(r41558)
+++ projects/xml-tools/ja_JP.eucJP/share/xml/news.xml	Tue May  7 10:20:20 2013	(r41559)
@@ -20,7 +20,7 @@
      the contents of <title> will be preferred over <p>.
 
      $FreeBSD$
-     Original revision: r41495
+     Original revision: r41524
 -->
 <news>
     <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
@@ -34,6 +34,23 @@
       <name>4</name>
 
       <day>
+	<name>29</name>
+
+	<event>
+	  <title>¿· &os; Foundation ¥Æ¥¯¥Ë¥«¥ë¥¹¥¿¥Ã¥Õ: Edward
+	    Tomasz Napiera&#322;a</title>
+
+	  <p>The &os;&nbsp;Foundation ¤Ï¡¢
+	    Edward Tomasz Napiera&#322;a ¤¬Æó¿ÍÌܤΥƥ¯¥Ë¥«¥ë¥¹¥¿¥Ã¥Õ¤Ë²Ã¤ï¤Ã¤¿¤³¤È¤ò¤ªÃΤ餻¤·¤Þ¤¹¡£
+	    ¤³¤ì¤Ï¡¢2013 ǯ¤Ë Foundation
+	    ¤¬·Ñ³¤·¤Æ¹Ô¤Ã¤Æ¤¤¤ë¥¹¥¿¥Ã¥Õ¤Ø¤ÎÅê»ñ¤Ë¤è¤ë¤â¤Î¤Ç¤¹¡£</p>
+
+	  <p><a
+	      href="http://freebsdfoundation.blogspot.com/2013/04/freebsd-foundation-announces-second.html">³¤­¤òÆɤà</a></p>
+	</event>
+      </day>
+
+      <day>
 	<name>24</name>
 
 	<event>

Modified: projects/xml-tools/mn_MN.UTF-8/books/handbook/geom/chapter.xml
==============================================================================
--- projects/xml-tools/mn_MN.UTF-8/books/handbook/geom/chapter.xml	Tue May  7 10:02:48 2013	(r41558)
+++ projects/xml-tools/mn_MN.UTF-8/books/handbook/geom/chapter.xml	Tue May  7 10:20:20 2013	(r41559)
@@ -2,7 +2,7 @@
 <!--
      The FreeBSD Mongolian Documentation Project
 
-     Original revision 39988
+     Original revision 40951
 
      $FreeBSD$
 -->
@@ -44,10 +44,10 @@
       	role="Redundant Array of Inexpensive Disks">RAID</acronym>
 	х�нагч х�р�г�лүүдийг багтаадаг. Эн� бүл�г нь I/O, доор нь байгаа д�д
 	�и�тем, ��в�л кодыг GEOM х�рх�н зохицуулж ��в�л х�надаг талаар гүнзгий
-	х�л�лц�хгүй. Эн�хүү м�д��л�л нь &man.geom.4; гарын авлагын хууда� болон
-	төрөл бүрийн SEE ALSO баримтуудын ту�ламжтай хангагддаг. Ба� �н� бүл�г нь
-	<acronym>RAID</acronym> тохиргоонуудын д�лг�р�нгүй заавар биш юм.
-	Зөвхөн GEOM-д�мжигд��н <acronym>RAID</acronym> ангиллуудын талаар
+	х�л�лц�хгүй. Эн�хүү м�д��л�л нь &man.geom.4; болон
+	төрөл бүрийн <literal>SEE ALSO</literal> баримтуудын ту�ламжтай хангагддаг. Ба� �н� бүл�г нь
+	<acronym>RAID</acronym> тохиргоонуудын д�лг�р�нгүй заавар биш бөгөөд
+	зөвхөн GEOM-д�мжигд��н <acronym>RAID</acronym> ангиллуудын талаар
 	х�л�лц�х болно.</para>
 
     <para>Эн� бүлгийг унш�аны дараа, та дараах зүйл�ийг м�д�х болно:</para>
@@ -77,13 +77,13 @@
 
     <itemizedlist>
       <listitem>
-	<para>&os; ди�к төхөөрөмжүүдийг х�рх�н үзд�г талаар ойлгох
-	(<xref linkend="disks"/>).</para>
+	<para>&os; <link linkend="disks">ди�к төхөөрөмжүүдийг</link>
+	х�рх�н үзд�г талаар ойлгох.</para>
       </listitem>
 
       <listitem>
-	<para>Шин� &os; цөм х�рх�н тохируулж �уулгах талаар м�д�х
-	  (<xref linkend="kernelconfig"/>).</para>
+	<para>Шин� <link linkend="kernelconfig">&os; цөм</link> 
+	  х�рх�н тохируулж �уулгах талаар м�д�х.</para>
       </listitem>
     </itemizedlist>
   </sect1>
@@ -132,7 +132,7 @@
       <primary>Судал үү�г�х</primary>
     </indexterm>
 
-    <para>Судал үү�г�х нь х�д х�д�н ди�кнүүдийг н�г �зл�хүүн болгодог арга юм.
+    <para>Судал үү�г�х нь х�д х�д�н ди�кнүүдийг н�гтг�ж н�г �зл�хүүн болгодог.
 	Олон тохиолдолд �н� нь тоног төхөөрөмжийн х�нагчуудыг ашиглан хийгдд�г.
 	GEOM д�д �и�тем нь ди�к �удал үү�г�х г�ж ба� н�рл�гдд�г
 	<acronym>RAID</acronym>0-д зориул�ан програмыг хангаж өгдөг.</para>
@@ -211,9 +211,8 @@ Done.</screen>
 
   <para>Эн� �удал үү�г���н файлын �и�темд�� ачаалах үед автоматаар холболт хийхийн
 	тулд �зл�хүүний м�д��ллийг <filename>/etc/fstab</filename> файлд
-	хийг��р�й. For this purpose, a permanent mount
-    point, named <filename class="directory">stripe</filename>, is
-    created:</para>
+	хийг��р�й. Эн� жиш��н д��р <filename class="directory">stripe</filename> 
+	г���н байнгын холбох ц�гийг үү�г�ж байна:</para>
 
   <screen>&prompt.root; <userinput>mkdir /stripe</userinput>
 &prompt.root; <userinput>echo "/dev/stripe/st0a /stripe ufs rw 2 2" \</userinput>
@@ -388,7 +387,7 @@ Done.</screen>
 &prompt.root; <userinput>newfs -U /dev/mirror/gm0s1e</userinput>
 &prompt.root; <userinput>newfs -U /dev/mirror/gm0s1f</userinput></screen>
 
-      <para>Эх ди�к (<devicename>ada0</devicename>) д��рх файлын 
+      <para>Эх ди�к <devicename>ada0</devicename> д��рх файлын 
       �и�темийг толин ту�гал руу &man.dump.8; ба &man.restore.8;
       тушаалыг ашиглан хуулж болно.</para>
 
@@ -508,7 +507,7 @@ Done.</screen>
       за�варлах х�р�гт�й. Уг процедурыг дараа тайлбарлах болно.</para>
 
       <para>�ль ч тохиолдолд анхдагч ди�к д��рх хуваалтын 
-      хү�н�гтүүдийг �х�лж хуулах х�р�гт�й. Үүнийг &man.gpart.8;
+      хү�н�гтүүдийг �х�лж хуулах х�р�гт�й бөгөөд &man.gpart.8;
 	<command>backup</command> ба <command>restore</command> д�д тушаалуудыг 
 	ашиглан гүйц�тг�н�.</para>
 
@@ -533,9 +532,9 @@ BSD 8
 6  freebsd-ufs  130023424  838860800
 7  freebsd-ufs  968884224  984640881</screen>
 
-      <para>Х�р�в &man.gpart.8;	<command>show</command> тушаалын 
-      гаралтад бүт�н ди�к ашиглагдаж байгаа бол �дг��р хуваалтын 
-      хү�н�гтүүд д��рх багтаамжийг н�г �ектороор бага�гах х�р�гт�й.
+      <para>Х�р�в <command>gpart show</command> тушаал ди�кний төг�гөлд 
+      зай байхгүй байгааг харуулж байгаа бол зү�м�л болон �үүлийн хуваалтыг
+      н�г �ектороор бага�гах х�р�гт�й.
       Зү�м�л болон �үүлийн хуваалтын зайг н�г��р бага�ган хоёр 
       файлыг за�варлах х�р�гт�й. Эдг��р нь жаг�аалт бүрийн �үүлийн 
       тоонууд юм.</para>
@@ -557,12 +556,12 @@ BSD 8
       байгаа бол �дг��р хоёр файлыг за�варлалгүйг��р ашиглаж болно.</para>
 
       <para>Одоо хуваалтын хү�н�гтийг 
-      <devicename>mirror/gm0</devicename> руу ��рг��н�.</para>
+      <devicename>mirror/gm0</devicename> руу ��рг��н�:</para>
 
       <screen>&prompt.root; <userinput>gpart restore mirror/gm0 &lt; table.ada0</userinput>
 &prompt.root; <userinput>gpart restore mirror/gm0s1 &lt; table.ada0s1</userinput></screen>
 
-      <para>&man.gpart.8; <command>show</command> тушаалаар 
+      <para><command>gpart show</command> тушаалаар 
       хуваалтын хү�н�гтийг шалгана.  Эн� жиш�� нь 
 	<devicename>gm0s1a</devicename>-г <filename>/</filename>,
 	<devicename>gm0s1d</devicename>-г <filename>/var</filename>,
@@ -717,9 +716,9 @@ mirror/gm0  COMPLETE  ada1 (ACTIVE)
 
 	  <para>BIOS тохиргоог шин��р толин ту�гал болго�он 
 	  ди�кнүүдийн аль н�гн��� ачаалахаар болгож тохируулах
-	  х�р�гт�й байж магадгүй юм. �ль ч ди�кийг ачаалахад 
-	  ашиглаж болно. Толин ту�галын н�г х���г учраа� т�дг��р нь 
-	  ижил өгөгдөлт�й байдаг.</para>
+	  х�р�гт�й байж магадгүй юм. Толин ту�галын н�г х���г учраа� т�дг��р нь 
+	  ижил өгөгдөлт�й байдаг бөгөөд аль ч ди�кийг ачаалахад 
+	  ашиглаж болно.</para>
 	</sect4>
 
 	<sect4>
@@ -753,7 +752,7 @@ mountroot&gt;</screen>
            <para><filename>geom_mirror</filename> модулийг
 	   <filename>/boot/loader.conf</filename>-т оруулж дуудахаа
 	   март�ан бол �н� а�уудал гарна. Үүнийг за�ахын тулд 
-	   &os;-9 ��в�л түүн��� хойшхи хувилбарын CD ��в�л USB ди�кн��� 
+	   &os;&nbsp;9.0 ��в�л түүн��� хойшхи хувилбарын CD ��в�л USB ди�кн��� 
 	   ачаалаад �хний а�уулт д��р <literal>Shell</literal>-г 
 	   �онгох х�р�гт�й. Дараа нь толин ту�галын модулийг дуудаж 
 	   толин ту�гал төхөөрөмжийг холбох х�р�гт�й:</para>
@@ -771,7 +770,7 @@ mountroot&gt;</screen>
 
 	  <para><literal>error 19</literal> гаргаж байгаа 
 	  бу�ад а�уудлуудыг за�варлахад илүү хүч зарах 
-	  шаардлагатай. ��ууж лавлах д�лг�ц д��р 
+	  шаардлагатай. �чаалах үеийн а�ууж лавлах д�лг�ц д��р 
 	  <literal>ufs:/dev/ada0s1a</literal> г�ж оруулж өгнө. 
 	  Си�тем х�дийг��р <devicename>ada0</devicename>-� 
 	  ачаалах ё�той боловч бүрхүүл �онгох а�ууж лавлах д�лг�ц 
@@ -793,13 +792,10 @@ mountroot&gt;</screen>
     <sect2>
       <title>Ди�к ажиллахаа болиход ��рг��х</title>
 
-      <para>Толин ту�галын гайхамшигтай тал бол аль н�г ди�к ажиллахаа 
+      <para>Толин ту�галын ашигтай тал бол аль н�г ди�к ажиллахаа 
       байхад толин ту�гал д��рх өгөгдөл алдагддаггүй �вдал 
-      юм.</para>
-
-      <para><devicename>ada0</devicename> нь д��рх жиш��н д��р толин ту�гал 
-      үү�г�ж байгаа ди�кнүүдийн н�г юм. Х�р�в <devicename>ada0</devicename>
-      ажиллахаа боливол нөгөө ажиллаж байгаа ди�к болох <devicename>ada1</devicename>-� 
+      юм. Д��рх жиш��н д��р <devicename>ada0</devicename> ажиллахаа 
+      болиход ажиллаж байгаа ди�к болох <devicename>ada1</devicename>-� 
       өгөгдлөө өгөн толин ту�гал ажилла�ан х�в��р байх болно.</para>
 
       <para>�жиллахаа боль�он ди�кийг �олихын тулд компьютерыг 
@@ -962,10 +958,6 @@ Done.</screen>
 	  <para>Д�лг�ц д��гүүр олон тоо ур�ах бөгөөд
 	    х���г хугацааны дараа проце�� дуу�ах болно. Эзл�хүүн
 	    үү�ч холбох боломжтой болно.</para>
-	</step>
-
-	<step>
-	  <para>Сүүлийн алхам бол файлын �и�темийг холбох �вдал юм:</para>
 
 	  <screen>&prompt.root; <userinput>mount /dev/raid3/gr0p1 /multimedia/</userinput></screen>
 
@@ -1004,7 +996,7 @@ Done.</screen>
     <title>GEOM Хаалга Сүлж��ний Төхөөрөмжүүд</title>
 
     <para>GEOM нь хаалга х�р�г�лүүдийг ашиглан ди�кнүүд, CD-ROM-ууд,
-	файлууд г�х м�т төхөөрөмжүүдийг ал�аа� ашиглахыг д�мжд�г.
+	файлуудыг ал�аа� ашиглахыг д�мжд�г.
 	Эн� нь <acronym>NFS</acronym>-т�й адил юм.</para>
 
     <para>Эк�портын файл �х�лж үү�г�х шаардлагатай. Эн� файл нь
@@ -1025,14 +1017,14 @@ Done.</screen>
 
     <screen>&prompt.root; <userinput>ggated</userinput></screen>
 
-    <para>Х�р�гл�х машинаа� уг �к�портлогд�он төхөөрөмжид <command>холболт</command> хийхд��
+    <para>Х�р�гл�х машинаа� уг �к�портлогд�он төхөөрөмжид <command>mount</command> хийхд��
 	дараах тушаалыг өгнө үү:</para>
 
     <screen>&prompt.root; <userinput>ggatec create -o rw 192.168.1.1 /dev/da0s4d</userinput>
 ggate0
 &prompt.root; <userinput>mount /dev/ggate0 /mnt</userinput></screen>
 
-    <para>Энд��� �хл�н төхөөрөмжид <filename class="directory">/mnt</filename>
+    <para>Одоо төхөөрөмжид <filename class="directory">/mnt</filename>
 	холболтын ц�гийг ашиглан хандаж болно.</para>
 
     <note>
@@ -1060,12 +1052,12 @@ ggate0
 	н�м�гд��н бол �ах в�? Фл�ш төхөөрөмжид <devicename>da0</devicename> г���н
 	төхөөрөмжийн н�р өгөгдөж хуучин бай�ан <devicename>da0</devicename> нь
 	<devicename>da1</devicename> болж өөрчлөгдөх болов уу. Эн� нь х�р�в
-	файлын �и�темүүд <filename>/etc/fstab</filename>-д жаг�аагд�ан
+	файлын �и�темүүд <filename>/etc/fstab</filename>-д ор�он
 	бол т�дг��рийг холбоход а�уудал гаргах бөгөөд бүр �и�темийг ачаалахгүй
 	байдалд хүрг�ж болох юм.</para>
 
-    <para>Эн� а�уудлын н�г шийд�л нь <acronym>SCSI</acronym> карт руу н�м�гд��н
-	шин� төхөөрөмжид төхөөрөмжийн ашиглагдаагүй дугаарууд өгөгдөхөөр болгож
+    <para>��г шийд�л нь <acronym>SCSI</acronym> карт руу н�м�гд��н
+	шин� төхөөрөмжид төхөөрөмжийн ашиглагдаагүй дугаарууд өгч
 	<acronym>SCSI</acronym> төхөөрөмжүүдийг гинжин цуваа болгох �вдал юм.
 	Г�хд�� анхдагч <acronym>SCSI</acronym> ди�кийг �ольж болзошгүй
 	<acronym>USB</acronym> төхөөрөмжүүдийн хувьд �ах в�? Яагаад г�в�л <acronym>USB</acronym>
@@ -1076,8 +1068,8 @@ ggate0
 	<filename>/etc/fstab</filename> файлд х�з�� ч жаг�аахгүй байх тийм
 	шийд�л байж болох юм.</para>
 
-    <para>Илүү �айн шийд�л байдаг. <command>glabel</command> х�р�г��л ашиглан
-	админи�тратор ��в�л х�р�гл�гч өөр�дийн ди�кний төхөөрөмжүүдийг ха�глаж �дг��р
+    <para>Илүү �айн шийд�л нь <command>glabel</command> х�р�г��л ашиглан
+	ди�кний төхөөрөмжүүдийг ха�глаж �дг��р
 	ха�г/шошгонуудыг <filename>/etc/fstab</filename> файлд ашиглаж болох
 	юм. <command>glabel</command> нь өгөгд�өн үзүүл�гчийн �үүлийн �екторт
 	ха�г/шошгыг хадгалдаг болохоор ха�г/шошго нь дахин ачаалахад х�в��р байх
@@ -1086,9 +1078,9 @@ ggate0
 	юм.</para>
 
     <note>
-      <para>Ха�г/шошгыг байнгын болгохыг �нд дурд�ангүй. <command>glabel</command>
-	х�р�г��л нь түр зуурын болон байнгын ха�г/шошгыг үү�г�х�д ашиглагдаж болно.
-	Зөвхөн байнгын ха�г/шошго нь дахин ачаалахад х�в��р үлд�х болно. Ха�г/шошгонуудын
+      <para><command>glabel</command>
+	х�р�г��л нь түр зуурын болон байнгын ха�г/шошгыг үү�г�ж чадна.
+	Ха�г/шошгонуудын
 	�лгаануудын тухай д�лг�р�нгүй м�д��ллийг &man.glabel.8; гарын авлагын хууда�наа�
 	үзн� үү.</para>
     </note>
@@ -1096,22 +1088,21 @@ ggate0
     <sect2>
       <title>Ха�г/шошгоны төрлүүд болон жиш��нүүд</title>
 
-      <para>Ерөнхий ба файлын �и�темийн г���н хоёр төрлийн ха�г/шошго байдаг.
-	Ха�г, шошгонууд нь байнгын ��в�л түр зуурын байж болно. Байнгын ха�гийг
+      <para>Байнгын ха�г нь ердийн ба файлын �и�темийн г���н хоёр төрлийн байдаг.
+	Файлын �и�темийн байнгын ха�гийг
 	&man.tunefs.8; ��в�л &man.newfs.8; тушаалаар үү�г�ж болно. Эдг��р
-	ха�г/шошгонуудад т�дг��рийн файлын �и�темийн төрөл д��р �уурил�ан н�р
-	бүхий ту�гай �ан <filename class="directory">/dev</filename>
-	�ан дотор үү�г�гдд�г. Жиш�� нь <acronym>UFS</acronym>2 файлын �и�темийн
+	ха�г/шошгонуудын төрлүүд <filename class="directory">/dev</filename> �ангийн 
+	д�д �анд үү�г�гдд�г бөгөөд файлын �и�темийн төрлийн дагуу н�рт�й байна.
+	Жиш�� нь <acronym>UFS</acronym>2 файлын �и�темийн
 	ха�г/шошгонууд <filename class="directory">/dev/ufs</filename> �анд
-	үү�г�гдд�г. Байнгын ха�гийг ба� <command>glabel label</command> тушаалаар
+	үү�г�гдд�г. Ердийн ха�гийг <command>glabel label</command> тушаалаар
 	үү�г�ж болдог. Эдг��р нь файлын �и�темт�й хамааралгүй бөгөөд <filename
 	  class="directory">/dev/label</filename> �анд үү�г�гд�х болно.</para>
 
       <para>Түр зуурын ха�г/шошго нь дараагийн удаа ачаалахад арилдаг. Эдг��р ха�г/шошгонууд
 	нь <filename class="directory">/dev/label</filename> �анд үү�г�гд�х
-	бөгөөд туршилтад �айн тохир�он байдаг. Түр зуурын ха�гийг <command>glabel create</command>
-	тушаалаар үү�г�ж болно. Д�лг�р�нгүй м�д��ллийг &man.glabel.8;-ийн гарын авлагын
-	хууда�наа� уншина уу.</para>
+	бөгөөд туршилтад тохир�он байдаг. Түр зуурын ха�гийг <command>glabel create</command>
+	тушаалаар үү�г�ж болно.</para>
 
 <!-- XXXTR: How do you create a file system label without running newfs
             or when there is no newfs (e.g.: cd9660)? -->
@@ -1123,9 +1114,7 @@ ggate0
 
       <warning>
 	<para>Х�р�в файлын �и�тем дүүр�н бол �н� нь өгөгдлийн �вдр�лд хүрг�ж
-	болох юм; г�хд�� х�р�в файлын �и�тем дүүр�н бол гол зорилго нь
-	хуучир�ан файлуудыг у�тгаж ха�г/шошгонуудыг н�м�хгүй байх
-	�вдал юм.</para>
+	болох юм.</para>
       </warning>
 
       <para>Ха�г/шошго одоо <filename class="directory">/dev/ufs</filename> �анд
@@ -1139,7 +1128,7 @@ ggate0
 	холбох ё�гүй.</para>
       </note>
 
-      <para>Одоо файлын �и�темийг ердийнхөөрөө холбож болно:</para>
+      <para>Одоо файлын �и�темийг холбож болно:</para>
 
       <screen>&prompt.root; <userinput>mount /home</userinput></screen>
 
@@ -1151,7 +1140,7 @@ ggate0
 
       <para>Файлын �и�тем нь <command>newfs</command> тушаалд
 	өгөгд�өн <option>-L</option> тугны ту�ламжтайгаар анхдагч ха�г/шошготой
-	үү�г�гд�ж ба� болно. Д�лг�р�нгүй м�д��ллийг &man.newfs.8; гарын авлагын хууда�наа�
+	үү�г�гд�ж ба� болно. Д�лг�р�нгүй м�д��ллийг &man.newfs.8;-�
 	үзн� үү.</para>
 
       <para>Доор дурд�ан тушаалыг ха�г/шошгыг у�тгахдаа ашиглаж болно:</para>
@@ -1172,7 +1161,7 @@ ggate0
 	  Ба� <filename class="directory">/</filename>,
 	  <filename class="directory">/var</filename>,
 	  <filename class="directory">/usr</filename> ба
-	  <filename class="directory">/tmp</filename> файлын �и�темүүд
+	  <filename class="directory">/tmp</filename>
 	  болон swap хуваалттай &os;-ийн �тандарт хуваалтын х�лб�рийг
 	  ашиглаж байгаа болно.</para>
 
@@ -1263,17 +1252,17 @@ ufsid/486b6fc16926168e     N/A  ad4s1f</
       <primary>Journaling</primary>
     </indexterm>
 
-    <para>&os;&nbsp;7.0 хувилбар гар�наар удаан хү��н хүл����н
-	journals буюу т�мд�гл�лийн боломж бүрд��н бил��.
-	Эн�хүү шийд�л нь өөрөө <acronym>GEOM</acronym> д�д �и�темийн
+    <para>&os;&nbsp;7.0 хувилбараа� �хл��д UFS journals буюу 
+        т�мд�гл�лийн боломж бүрд��н бил��.
+	Эн�хүү шийд�л нь <acronym>GEOM</acronym> д�д �и�темийн
 	ту�ламжтайгаар хийгд��н бөгөөд &man.gjournal.8; х�р�г�лийн
 	ту�ламжтай х�лбар тохируулж болдог.</para>
 
-    <para>Journaling буюу т�мд�гл�л г�ж юу в�?  Т�мд�гл�х чадвар
-	нь файлын �и�темийн шилжүүлгүүдийн бүртг�лийг хадгалдаг, өөрөөр
-	х�лб�л мета өгөгдөл болон файлын бичилтүүд ди�к�нд зөвөөр хийгд�х���
-	өмнө ди�кний бүр�н гүйц�д бичих үйлдлийг бүт��д�г өөрчлөлтүүдийн
-	бүртг�лийг хадгалдаг. Файлын �и�темийн бүр�н бу� байдлаа�
+    <para>Journaling буюу т�мд�гл�х чадвар нь мета өгөгдөл болон 
+        файлын бичилтүүд ди�к�нд зөвөөр хийгд�х��� өмнө ди�кний 
+	бүр�н гүйц�д бичих үйлдлийг бүт��д�г өөрчлөлтүүдийн
+	бүртг�л з�р�г файлын �и�темийн шилжүүлгүүдийн бүртг�лийг 
+	хадгалдаг. Файлын �и�темийн бүр�н бу� байдлаа�
 	хамгаалахын тулд файлын �и�темийн шилжүүлгүүдийг дахин гүйц�тг�хийн
 	тулд �н�хүү шилжүүлгүүдийн бүртг�лийг дараа нь дахин
 	ажиллуулж болдог.</para>
@@ -1287,8 +1276,8 @@ ufsid/486b6fc16926168e     N/A  ad4s1f</
 
     <para>Өөр бу�ад файлын �и�темийн т�мд�гл�лийн шийдлүүд��� �лгаатай нь
 	<command>gjournal</command> арга нь блок д��р тулгуурла�ан бөгөөд
-	файлын �и�темийн х���г болж хийгд��гүй, зөвхөн <acronym>GEOM</acronym>
-	өргөтгөлийн хүр��нд хийгд��н.</para>
+	файлын �и�темийн х���г болж хийгд��гүй. Эн� нь <acronym>GEOM</acronym>
+	өргөтгөл юм.</para>
 
     <para><command>gjournal</command>-д зориул�ан д�мжл�гийг ид�вхжүүл�хийн
 	тулд &os; цөм нь 7.0 болон түүн��� хойшхи �и�темүүд д��р анхдагчаар байдаг доор дурд�ан
@@ -1308,10 +1297,10 @@ ufsid/486b6fc16926168e     N/A  ad4s1f</
 
     <programlisting>options	GEOM_JOURNAL</programlisting>
 
-    <para><devicename>da4</devicename> нь шин� <acronym>SCSI</acronym> ди�к
-	г�ж тооцвол чөлөөт�й файлын �и�тем д��р т�мд�гл�л үү�г�хийн тулд
+    <para>Чөлөөт�й файлын �и�тем д��р т�мд�гл�л үү�г�хийн тулд
 	одоо доор дурд�ан алхмуудыг ашиглан хийж
-	болно:</para>
+	болно. Эн� жиш��н д��р <devicename>da4</devicename> нь шин� <acronym>SCSI</acronym> ди�к
+	байна:</para>
 
     <screen>&prompt.root; <userinput>gjournal load</userinput>
       &prompt.root; <userinput>gjournal label /dev/da4</userinput></screen>
@@ -1323,8 +1312,8 @@ ufsid/486b6fc16926168e     N/A  ad4s1f</
 
     <screen>&prompt.root; <userinput>newfs -O 2 -J /dev/da4.journal</userinput></screen>
 
-    <para>Өмнө ажиллуул�ан тушаал <acronym>UFS</acronym>2
-	файлын �и�темийг т�мд�гд�л ид�вхж��н төхөөрөмж д��р үү�г�х
+    <para>Эн� тушаал <acronym>UFS</acronym>2
+	файлын �и�темийг т�мд�гл�л ид�вхж��н төхөөрөмж д��р үү�г�х
 	болно.</para>
 
     <para>Төхөөрөмжийг хү���н ц�гт�� доор дурд�ан тушаалаар
@@ -1339,13 +1328,13 @@ ufsid/486b6fc16926168e     N/A  ad4s1f</
 	<devicename>ad4s1.journal</devicename> болон <devicename>ad4s2.journal</devicename> үү�г�х болно.</para>
     </note>
 
-    <para>Хурдан ажиллагаатай байхын тулд т�мд�гл�лийг өөр ди�к д��р байлгах нь
-	зүйт�й байдаг. Эн� тохиолдолд т�мд�гл�л хангагч ��в�л
+    <para>Хурдан ажиллагаатай байхын тулд т�мд�гл�лийг өөр ди�к д��р 
+        байлгаж болно. Эн� тохиолдолд т�мд�гл�л хангагч ��в�л
 	хадгалалтын төхөөрөмж нь т�мд�гл�лийг ид�вхжүүл�хийн тулд
 	уг төхөөрөмжийнхөө дараа жаг�аагдах ё�той. <command>tunefs</command>
 	тушаал ашиглан тухайн байгаа файлын �и�тем д��р т�мд�гл�лийг
-	ид�вхжүүлж болдог; г�хд�� файлын �и�темийг өөрчлөхөө�өө өмнө
-	нөөц үрг�лж хийж байх х�р�гт�й. Их�нх тохиолдолд
+	ид�вхжүүлж болдог. Г�хд�� файлын �и�темийг өөрчлөхөө�өө өмнө
+	нөөц <emphasis>үрг�лж</emphasis> хийж байх х�р�гт�й. Их�нх тохиолдолд
 	<command>gjournal</command> нь �г т�мд�гл�лийг үү�г�ж
 	чадаагүй бол амжилтгүй болох бөгөөд г�хд�� �н� нь
 	<command>tunefs</command>-ийг буруугаар ашигла�наа� болоод

Modified: projects/xml-tools/ru_RU.KOI8-R/articles/Makefile
==============================================================================
--- projects/xml-tools/ru_RU.KOI8-R/articles/Makefile	Tue May  7 10:02:48 2013	(r41558)
+++ projects/xml-tools/ru_RU.KOI8-R/articles/Makefile	Tue May  7 10:20:20 2013	(r41559)
@@ -15,7 +15,6 @@ SUBDIR+= contributing
 SUBDIR+= cups
 SUBDIR+= custom-gcc
 SUBDIR+= cvs-freebsd
-SUBDIR+= cvsup-advanced
 SUBDIR+= explaining-bsd
 SUBDIR+= fbsd-from-scratch
 #SUBDIR+= filtering-bridges

Modified: projects/xml-tools/share/pgpkeys/itetcu.key
==============================================================================
--- projects/xml-tools/share/pgpkeys/itetcu.key	Tue May  7 10:02:48 2013	(r41558)
+++ projects/xml-tools/share/pgpkeys/itetcu.key	Tue May  7 10:20:20 2013	(r41559)
@@ -1,74 +1,63 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh itetcu F0808380;
+sh addkey.sh itetcu 29597D20;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub   4096R/F0808380 2012-11-19 [expires: 2014-11-19]
-      Key fingerprint = BAEC BFED 67D8 7529 5B53  C636 C922 F9F4 F080 8380
-uid                  Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
-sub   4096R/54B3FFA0 2012-11-19 [expires: 2014-11-19]
+pub   4096R/29597D20 2013-05-02
+      Key fingerprint = AB6F 39B6 605D E6B7 0D54  ED3D BCA2 129A 2959 7D20
+uid                  Ion-Mihai Tetcu (FreeBSD Committer key) <itetcu@FreeBSD.org>
+sub   4096R/EC9E17E3 2013-05-02
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQINBFCqY88BEADC4PsjeErkHL2ZzVDqQ1pWaQ3GMcqt43lws6RvSlMG8tBAEyb/
-tJlZEoEmLpPirSPk0exFQtscONTtNKVnLzjt4UXJX/tKtKE51EID2TZ+4fPPZeUn
-8B76Pqm69m0XPQQpcuQ9aykQ1wTXljFk8FFjh7D0XAcqezo5o++NEcluqJ69FJyI
-zwfCvzG7IdO+y5TkIgfeauqeYw/53lMv1KCIOkYfxNMCPbTO4+grfKOOL4WLJeTu
-PDjjd3BpgEFmbgJAmyuxJsVNWSWmDlquS78qrdNXbMSudb6jBZWP4fgK7ycQnYbE
-Lp27KORrUwrwLdthz/5ZBTo6hGehs/d5aGor7F+12Lwl3Vp0eHsEhklP3cmel+20
-i3RrOsuc8ijrkbLT6V/A3urz0t/qV4ijs1lYMLlq++YMuG4AZ08QBWiWGAKn4ust
-3DD/XFfogYiON7Mm4JwuGrQi8TuJXDNjZ6J9bdZPIwD9rmad6XjlcObF3BgZz9sN
-w92CDxwnlK+Jvex74c3tau2xPjGTPFe+Ld56cs1TcYNp7utg0DFe9FrZ4Cx3FpLU
-YDLQLHRbf4pbNz5KTK7swInkzsDUc4ZwPEnpSYiK0cCb0yGjx6P4nslQjS4zEeN3
-OeKbYIiQx7saZvGjmbcQ7A+wh6Qxg1DAoZa4HQ2hMtEWRLDJ6U8rBGNeNwARAQAB
-tCxJb24tTWloYWkgIklPbnV0IiBUZXRjdSA8aXRldGN1QEZyZWVCU0Qub3JnPokC
-PgQTAQIAKAUCUKpjzwIbLwUJA8JnAAYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AA
-CgkQySL59PCAg4DWkBAAiuYdL+cwFcsfUPXvNjNTURh91AnCJiU7MPev9nu6nqyk
-YWowa171FTcWZAm2JPvKqGEpqZr2sJtGDA1jgrtKpapN2u3S4E5ANDcMQSDjAdJ6
-XzmWhGW/62pZNtvZAkvxwsWNcXeRxLcTFZmPXKkNBMkFx/Q2Ww/m9nR6qtMkrOaE
-llVd92wXOviCrMLtnRsPmMSrZACM/lVTC2L+c+QUfggyAG/KQfiuuttmFqGnqKr6
-Ym3qYVkVWMiPrbauC5aHV0I4RmpaEaYBkxx85U+2sV5pAQZjeDiyqjuMirlgVMsF
-NcQ9jjjbHSVTHpFbvo6eAYritts0mYKnrqrb0pBuC9C5b3FQIIGSy0z0dPXz3d0q
-VFIIP7DMOJLr/WWzjRqOobQ7nH3P2nvQiZc9TnkgFPG5hKMBWAqaM5gZS7HJC10S
-PUvTL2P3f2UZJ+9poHB9O/AewUZCt/gmXa6GoQEUCZgQLGCu7YhtIkKf8duDaIPw
-6myVMU8tiwz6dYo635rUBA21amjcMR3SF6LgipF9+8Ul9fISrHLjNan3Yz4PCgc7
-mIc71wW2LYGvAq+cw2NBkgkxDPFj97CUkXljjdy/zsbnR19mKDwM0MTiAGmFs3BV
-bkF1KTlnw/tGj2T7mntY6+hNei/kjOgbpX5h7VArR8bgLouD5ce3p/tVl1DJxCu5
-Ag0EUKpjzwEQAKefY+dwYoax3I9GT+xcd86k0rExqXFJGEDM74UeQ9C02aegdSsP
-qB89WNW5UWS0RifjfBb+9gyc9hVCrrZV2GEeACRJDitoUhMa/sM0R5n41w3poBqw
-sf6PBkzu0UGs0JURFDGsWNV32wdD5n0swqEplWpAsLkT1GNeIxI0h9rA+h7jInTK
-u6yvoUxKu2fTwEjQQuPi7iJ3tooaBgfGs3YDpOgxqiiK81X1gSJVSONFawtTglwI
-xV4cuaug3PeYj7/dKV4Z/PRzzUd/KsXWPn2P95sr/7lVimYT6wAZfmUuCE7qQPsZ
-HQgNaRBlJ6p5HjbP1B0aZ3hVvlkn9su0Vo3MinZkaPjwbRu90DKxEryYQcrjjWMz
-+pXFUfi0Qzd1E9/b6vT87cHAOh/WhLN5oBYQl2aZUuVTwtGtJpLSOeKXk8f7QRHC
-wx0OO81S/Q1hkHRgUSzuNdsbfSnk/Jum8GED9E9kGPOS/PFJq+Ut2/JGMvGhkEWx
-s3UWFXB3hP+hFutqeq1EESeOFKBvTirWaKeLxPZnDI2zUumCZQDtZLrZL0q9f92S
-3w/mJr2jWJhfiFnZDewNOyucOrAzEDEiniRWIlY++HLUwxPTSKQ9cyU+8IVUkpwV
-n3DhJ86h53YY6XKxhD+0fKLLuhcu5phVc1oBpy2p96AtIVtBZQjn5Uu5ABEBAAGJ

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

From owner-svn-doc-projects@FreeBSD.ORG  Tue May  7 14:33:39 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 2F2157EB;
 Tue,  7 May 2013 14:33:39 +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 08B8CC18;
 Tue,  7 May 2013 14:33:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r47EXcbg037288;
 Tue, 7 May 2013 14:33:38 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r47EXcqA037286;
 Tue, 7 May 2013 14:33:38 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201305071433.r47EXcqA037286@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Tue, 7 May 2013 14:33:38 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41561 - in projects/xml-tools/share: mk 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: Tue, 07 May 2013 14:33:39 -0000

Author: gabor
Date: Tue May  7 14:33:38 2013
New Revision: 41561
URL: http://svnweb.freebsd.org/changeset/doc/41561

Log:
  - Use absolute URLs in printed formats

Modified:
  projects/xml-tools/share/mk/doc.docbook.mk
  projects/xml-tools/share/xml/urls.ent

Modified: projects/xml-tools/share/mk/doc.docbook.mk
==============================================================================
--- projects/xml-tools/share/mk/doc.docbook.mk	Tue May  7 13:05:59 2013	(r41560)
+++ projects/xml-tools/share/mk/doc.docbook.mk	Tue May  7 14:33:38 2013	(r41561)
@@ -204,7 +204,7 @@ LOCAL_CSS_SHEET= ${.OBJDIR}/${CSS_SHEET:
 LOCAL_CSS_SHEET= ${CSS_SHEET:T}
 .endif
 
-CLEANFILES+= ${DOC}.parsed.xml
+CLEANFILES+= ${DOC}.parsed.xml ${DOC}.parsed.print.xml
 
 .for _curformat in ${FORMATS}
 _cf=${_curformat}
@@ -360,6 +360,8 @@ ${DOC}.parsed.xml: ${SRCS}
 	${RM} ${.TARGET}.tmp
 .else
 	${MV} ${.TARGET}.tmp ${.TARGET}
+	${SED} 's|@@URL_RELPREFIX@@|http://www.FreeBSD.org|g' < ${.TARGET} > ${DOC}.parsed.print.xml
+	${SED} -i '' 's|@@URL_RELPREFIX@@|../../../..|g' ${.TARGET}
 .endif
 
 # XHTML -------------------------------------------------------------
@@ -452,7 +454,7 @@ ${DOC}.tex: ${SRCS} ${LOCAL_IMAGES_EPS} 
 		${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_EN} \
 		${DOC}.parsed.xml
 	${JADE} -V tex-backend ${PRINTOPTS} \
-		${JADEOPTS} -t tex -o ${.TARGET} ${XMLDECL} ${DOC}.parsed.xml
+		${JADEOPTS} -t tex -o ${.TARGET} ${XMLDECL} ${DOC}.parsed.print.xml
 	${SED} -i '' -e 's|{1}\\def\\ScaleY%|{0.5}\\def\\ScaleY%|g' \
 		-e 's|{1}\\def\\EntitySystemId%|{0.5}\\def\\EntitySystemId%|g' \
 		${.TARGET}
@@ -489,8 +491,8 @@ ${DOC}.pdf:
 .endif
 
 .elif ${RENDERENGINE} == "fop"
-${DOC}.fo: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
-	${XSLTPROC} ${XSLTPROCOPTS} ${XSLFO} ${DOC}.parsed.xml > ${.TARGET}
+${DOC}.fo: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} ${DOC}.parsed.xml
+	${XSLTPROC} ${XSLTPROCOPTS} ${XSLFO} ${DOC}.parsed.print.xml > ${.TARGET}
 
 ${DOC}.pdf: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
 	${FOP} ${FOPOPTS} ${DOC}.fo ${.TARGET}

Modified: projects/xml-tools/share/xml/urls.ent
==============================================================================
--- projects/xml-tools/share/xml/urls.ent	Tue May  7 13:05:59 2013	(r41560)
+++ projects/xml-tools/share/xml/urls.ent	Tue May  7 14:33:38 2013	(r41561)
@@ -6,10 +6,7 @@
 
 <!ENTITY url.relprefix "../../../..">
 
-<![ %freebsd.urls.absolute; [
-<!ENTITY url.base "http://www.FreeBSD.org">
-]]>
-<!ENTITY url.base "&url.relprefix;">
+<!ENTITY url.base "@@URL_RELPREFIX@@">
 
 <!-- XXX: This will be removed soon -->
 <!ENTITY url.main "&url.base;">

From owner-svn-doc-projects@FreeBSD.ORG  Tue May  7 18:39: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 6AD49E11;
 Tue,  7 May 2013 18:39: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 5D31BAC4;
 Tue,  7 May 2013 18:39: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 r47IdpE2022191;
 Tue, 7 May 2013 18:39:51 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r47Idp6K022190;
 Tue, 7 May 2013 18:39:51 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201305071839.r47Idp6K022190@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Tue, 7 May 2013 18:39:51 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41562 -
 projects/xml-tools/ja_JP.eucJP/articles/fbsd-from-scratch
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: Tue, 07 May 2013 18:39:51 -0000

Author: gabor
Date: Tue May  7 18:39:50 2013
New Revision: 41562
URL: http://svnweb.freebsd.org/changeset/doc/41562

Log:
  - Fix build

Modified:
  projects/xml-tools/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml

Modified: projects/xml-tools/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml
==============================================================================
--- projects/xml-tools/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml	Tue May  7 14:33:38 2013	(r41561)
+++ projects/xml-tools/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml	Tue May  7 18:39:50 2013	(r41562)
@@ -431,7 +431,7 @@ Do you wish to delete what is left of /v
     </warning>
 
 <programlisting>
-<xi:include href="stage_1.conf.default" parse="text"/>
+<xi:include href="stage_1.conf.default" parse="text" encoding="euc-jp"/>
 </programlisting>
 
     <para>¥À¥¦¥ó¥í¡¼¥É: <ulink
@@ -539,7 +539,7 @@ news inn-stable CONFIGURE_ARGS="--enable
       ¤È¤¤¤¦Ì¾Á°¤Î¥í¥°¥Õ¥¡¥¤¥ë¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£</para>
 
 <programlisting>
-<xi:include href="stage_2.conf.default" parse="text"/>
+<xi:include href="stage_2.conf.default" parse="text" encoding="euc-jp"/>
 </programlisting>
 
      <para>¥À¥¦¥ó¥í¡¼¥É: <ulink
@@ -677,7 +677,7 @@ fi
       ¥¹¥¯¥ê¥×¥È¤Ç¤¹¡£ÆâÍƤòÊѹ¹¤¹¤ëɬÍפϤʤ¤¤Ç¤·¤ç¤¦¡£</para>
 
 <programlisting>
-<xi:include href="stage_1.sh" parse="text"/>
+<xi:include href="stage_1.sh" parse="text" encoding="euc-jp"/>
 </programlisting>
 
     <para>¥À¥¦¥ó¥í¡¼¥É: <ulink
@@ -688,7 +688,7 @@ fi
       ¥¹¥¯¥ê¥×¥È¤Ç¤¹¡£ºÇ½é¤ÎÉôʬ¤Ë¤¢¤ëÊÑ¿ô¤òÊѹ¹¤·¤Þ¤·¤ç¤¦¡£</para>
 
 <programlisting>
-<xi:include href="stage_2.sh" parse="text"/>
+<xi:include href="stage_2.sh" parse="text" encoding="euc-jp"/>
 </programlisting>
 
     <para>¥À¥¦¥ó¥í¡¼¥É: <ulink
@@ -699,7 +699,7 @@ fi
       ÀßÄê¤ò¼«Æ°Åª¤Ë¤ª¤³¤Ê¤¦¤¿¤á¤Î¼ê½ç¤ò¡¢¤³¤³¤ËÆþ¤ì¤Þ¤¹¡£</para>
 
 <programlisting>
-<xi:include href="stage_3.mk" parse="text"/>
+<xi:include href="stage_3.mk" parse="text" encoding="euc-jp"/>
 </programlisting>
 
     <para>¥À¥¦¥ó¥í¡¼¥É: <ulink

From owner-svn-doc-projects@FreeBSD.ORG  Wed May  8 09:27: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 F1112F32;
 Wed,  8 May 2013 09:27: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 E45D0E4;
 Wed,  8 May 2013 09:27: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 r489Rwc7033781;
 Wed, 8 May 2013 09:27:58 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r489Rw7M033780;
 Wed, 8 May 2013 09:27:58 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201305080927.r489Rw7M033780@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 8 May 2013 09:27:58 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41564 - 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: Wed, 08 May 2013 09:27:59 -0000

Author: gabor
Date: Wed May  8 09:27:58 2013
New Revision: 41564
URL: http://svnweb.freebsd.org/changeset/doc/41564

Log:
  - Fix rendering of the last modified text.
  - We have our own complete CSS file so do not generate one with XSLT

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	Wed May  8 01:35:31 2013	(r41563)
+++ projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl	Wed May  8 09:27:58 2013	(r41564)
@@ -25,6 +25,7 @@
   <xsl:param name="admon.style"/>
   <xsl:param name="make.year.ranges" select="1"/>
   <xsl:param name="make.single.year.ranges" select="1"/>
+  <xsl:param name="docbook.css.source" select="''"/>
 
   <xsl:param name="make.valid.html" select="1"/>
   <xsl:param name="html.cleanup" select="1"/>
@@ -272,14 +273,13 @@
       <xsl:with-param name="key" select="'on'"/>
     </xsl:call-template>
     <xsl:call-template name="gentext.space"/>
-    Last modified on <xsl:value-of select="$pubdate"/>
+    <xsl:value-of select="$pubdate"/>
     <xsl:if test="$committer">
       <xsl:call-template name="gentext.space"/>
-      <xsl:value-of select="$committer"/>
-      <xsl:call-template name="gentext.space"/>
       <xsl:call-template name="gentext">
 	<xsl:with-param name="key" select="'by'"/>
       </xsl:call-template>
+      <xsl:value-of select="$committer"/>
     </xsl:if>
     <xsl:text>.</xsl:text>
   </xsl:template>

From owner-svn-doc-projects@FreeBSD.ORG  Wed May  8 12:10:30 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 4E0CBF80;
 Wed,  8 May 2013 12:10:30 +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 4050AA9B;
 Wed,  8 May 2013 12:10:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r48CAUgX091896;
 Wed, 8 May 2013 12:10:30 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r48CAUZL091895;
 Wed, 8 May 2013 12:10:30 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201305081210.r48CAUZL091895@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 8 May 2013 12:10:30 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41565 - 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: Wed, 08 May 2013 12:10:30 -0000

Author: gabor
Date: Wed May  8 12:10:29 2013
New Revision: 41565
URL: http://svnweb.freebsd.org/changeset/doc/41565

Log:
  - Add a missing space.

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	Wed May  8 09:27:58 2013	(r41564)
+++ projects/xml-tools/share/xsl/freebsd-xhtml-common.xsl	Wed May  8 12:10:29 2013	(r41565)
@@ -279,6 +279,7 @@
       <xsl:call-template name="gentext">
 	<xsl:with-param name="key" select="'by'"/>
       </xsl:call-template>
+      <xsl:call-template name="gentext.space"/>
       <xsl:value-of select="$committer"/>
     </xsl:if>
     <xsl:text>.</xsl:text>

From owner-svn-doc-projects@FreeBSD.ORG  Wed May  8 21:39: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 818E2B70;
 Wed,  8 May 2013 21:39:52 +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 73339ECA;
 Wed,  8 May 2013 21:39: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 r48Ldq8t095497;
 Wed, 8 May 2013 21:39:52 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r48LdqAJ095496;
 Wed, 8 May 2013 21:39:52 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201305082139.r48LdqAJ095496@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Wed, 8 May 2013 21:39:52 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41571 -
 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: Wed, 08 May 2013 21:39:52 -0000

Author: dru
Date: Wed May  8 21:39:52 2013
New Revision: 41571
URL: http://svnweb.freebsd.org/changeset/doc/41571

Log:
  This patch addresses the following:
  
  - you
  
  - replace command/app tags with entities
  
  - fix xref tags
  
  - fix some acronyms
  
  Approved by:  gjb (mentor)

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	Wed May  8 17:55:10 2013	(r41570)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Wed May  8 21:39:52 2013	(r41571)
@@ -57,7 +57,7 @@
       </listitem>
 
       <listitem>
-	<para>What a shell is, and how to change your default login
+	<para>What a shell is, and how to change the default login
 	  environment.</para>
       </listitem>
 
@@ -87,10 +87,10 @@
 
     <para>&os; can be used in various ways.  One of them is typing
       commands to a text terminal.  A lot of the flexibility and power
-      of a &unix; operating system is readily available at your hands
+      of a &unix; operating system is readily available
       when using &os; this way.  This section describes what
       <quote>terminals</quote> and <quote>consoles</quote> are, and
-      how you can use them in &os;.</para>
+      how to use them in &os;.</para>
 
     <sect2 id="consoles-intro">
       <title>The Console</title>
@@ -144,8 +144,9 @@ login:</screen>
 
       <screen>login:</screen>
 
-      <para>Type the username that was configured during <link
-	  linkend="bsdinstall-addusers">system installation</link> and
+      <para>Type the username that was configured during system
+	installation, as described in <xref
+	  linkend="bsdinstall-addusers"/>, and
 	press <keycap>Enter</keycap>.  Then enter the password
 	associated with the username and press <keycap>Enter</keycap>.
 	The password is <emphasis>not echoed</emphasis> for security
@@ -165,8 +166,8 @@ login:</screen>
       <para>&os; can be configured to provide many virtual consoles
 	for inputting commands.  Each virtual console has its own
 	login prompt and output channel, and &os; takes care of
-	properly redirecting keyboard input and monitor output as you
-	switch between virtual consoles.</para>
+	properly redirecting keyboard input and monitor output as
+	switching occurs between virtual consoles.</para>
 
       <para>Special key combinations have been reserved by &os; for
 	switching consoles.<footnote>
@@ -228,7 +229,7 @@ ttyv8   "/usr/X11R6/bin/xdm -nodaemon"  
       <title>Single User Mode Console</title>
 
       <para>A detailed description of <quote>single user mode</quote>
-	can be found <link linkend="boot-singleuser">here</link>.
+	can be found in <xref linkend="boot-singleuser"/>.
 	There is only one console when &os; is in single user mode as
 	no other virtual consoles are available in this mode.  The
 	settings for single user mode are found in this section of
@@ -249,8 +250,9 @@ console none                            
 	  without prompting for a password.</para>
 
 	<para><emphasis>Be careful when changing this setting to
-	    <literal>insecure</literal></emphasis>.  If you ever
-	  forget the <username>root</username> password, booting into
+	    <literal>insecure</literal></emphasis>.  If
+	  the <username>root</username> password is forgotten, booting
+	  into
 	  single user mode is still possible, but may be difficult for
 	  someone who is not comfortable with the &os; booting
 	  process.</para>
@@ -375,7 +377,7 @@ console none                            
       </tgroup>
     </informaltable>
     <indexterm>
-      <primary><command>ls</command></primary>
+      <primary>&man.ls.1;</primary>
     </indexterm>
     <indexterm><primary>directories</primary></indexterm>
 
@@ -418,7 +420,7 @@ total 530
       directory has a slightly different meaning than that of files.
       When a directory is marked executable, it means it is possible
       to change into that directory using
-      <application>cd</application>.  This also means that it is
+      &man.cd.1;.  This also means that it is
       possible to access the files within that directory, subject to
       the permissions on the files themselves.</para>
 
@@ -662,7 +664,7 @@ total 530
       <para>Note that a <literal>s</literal> is now part of the
 	permission set designated for the file owner, replacing the
 	executable bit.  This allows utilities which need elevated
-	permissions, such as <command>passwd</command>.</para>
+	permissions, such as &man.passwd.1;.</para>
 
       <note>
 	<para>The <literal>nosuid</literal> &man.mount.8; option will
@@ -673,10 +675,10 @@ total 530
       </note>
 
       <para>To view this in real time, open two terminals.  On
-	one, start the <command>passwd</command> process as a normal
+	one, type <command>passwd</command> as a normal
 	user.  While it waits for a new password, check the process
 	table and look at the user information for
-	<command>passwd</command>:</para>
+	&man.passwd.1;:</para>
 
       <para>In terminal A:</para>
 
@@ -690,8 +692,8 @@ Old Password:</screen>
       <screen>trhodes  5232  0.0  0.2  3420  1608   0  R+    2:10AM   0:00.00 grep passwd
 root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
-      <para>As stated above, the <command>passwd</command> is run
-	by a normal user, but is using the effective
+      <para>Although &man.passwd.1; is run
+	as a normal user, it is using the effective
 	<acronym>UID</acronym> of <username>root</username>.</para>
 
       <para>The <literal>setgid</literal> permission performs the
@@ -702,7 +704,7 @@ root     5211  0.0  0.2  3620  1724   2 
 	user who started the process.</para>
 
       <para>To set the <literal>setgid</literal> permission on a
-	file, provide <command>chmod</command> with a leading two
+	file, provide &man.chmod.1; with a leading two
 	(2):</para>
 
       <screen>&prompt.root; <userinput>chmod 2755 sgidexample.sh</userinput></screen>
@@ -848,8 +850,7 @@ root     5211  0.0  0.2  3620  1724   2 
 	    <row>
 	      <entry><filename
 		  class="directory">/etc/namedb/</filename></entry>
-	      <entry><command>named</command> configuration files.
-		Refer to &man.named.8; for details.</entry>
+	      <entry>&man.named.8; configuration files.</entry>
 	    </row>
 
 	    <row>
@@ -863,8 +864,7 @@ root     5211  0.0  0.2  3620  1724   2 
 	    <row>
 	      <entry><filename
 		  class="directory">/etc/ppp/</filename></entry>
-	      <entry><command>ppp</command> configuration files as
-		described in &man.ppp.8;.</entry>
+	      <entry>&man.ppp.8; configuration files.</entry>
 	    </row>
 
 	    <row>
@@ -1071,7 +1071,7 @@ root     5211  0.0  0.2  3620  1724   2 
 
     <para>Files are stored in directories.  A directory may contain no
       files, or it may contain many hundreds of files.  A directory
-      can also contain other directories, allowing you to build up a
+      can also contain other directories, allowing a
       hierarchy of directories within one another in order to organize
       data.</para>
 
@@ -1087,7 +1087,7 @@ root     5211  0.0  0.2  3620  1724   2 
       different from &windows; which uses
       <literal>\</literal> to separate file and directory
       names.  &os; does not use drive letters, or other drive names in
-      the path.  For example, you would not type
+      the path.  For example, one would not type
       <filename>c:/foo/bar/readme.txt</filename> on &os;.</para>
 
     <para>Directories and files are stored in a file system.  Each
@@ -1097,11 +1097,11 @@ root     5211  0.0  0.2  3620  1724   2 
       directories.  One file system is designated the
       <firstterm>root file system</firstterm> or <literal>/</literal>.
       Every other file system is <firstterm>mounted</firstterm> under
-      the root file system.  No matter how many disks you have on your
+      the root file system.  No matter how many disks are on the
       &os; system, every directory appears to be part of the same
       disk.</para>
 
-    <para>Suppose you have three file systems, called
+    <para>Consider three file systems, called
       <literal>A</literal>, <literal>B</literal>, and
       <literal>C</literal>.  Each file system has one root directory,
       which contains two other directories, called
@@ -1109,9 +1109,9 @@ root     5211  0.0  0.2  3620  1724   2 
       <literal>B1</literal>, <literal>B2</literal> and
       <literal>C1</literal>, <literal>C2</literal>).</para>
 
-    <para>Call <literal>A</literal> the root file system.  If you used
-      <command>ls</command> to view the contents of this directory you
-      would see two subdirectories, <literal>A1</literal> and
+    <para>Call <literal>A</literal> the root file system.  If
+      &man.ls.1; is used to view the contents of this directory,
+      it will show two subdirectories, <literal>A1</literal> and
       <literal>A2</literal>.  The directory tree looks like
       this:</para>
 
@@ -1248,9 +1248,9 @@ root     5211  0.0  0.2  3620  1724   2 
     <para>This is similar, although not identical, to a &ms-dos;
       <command>join</command>.</para>
 
-    <para>Typically you create file systems when installing &os;
-      and decide where to mount them, and then never change them
-      unless you add a new disk.</para>
+    <para>Typically file systems are created when installing &os;
+      and never change
+      unless a new disk is added.</para>
 
     <para>It is entirely possible to have one large root file system,
       and not need to create any others.  There are some drawbacks to
@@ -1283,8 +1283,9 @@ root     5211  0.0  0.2  3620  1724   2 
       </listitem>
 
       <listitem>
-	<para>&os;'s file systems are very robust should you lose
-	  power.  However, a power loss at a critical point could
+	<para>&os;'s file systems are robust if
+	  power is lost.  However, a power loss at a critical point
+	  could
 	  still damage the structure of the file system.  By splitting
 	  data over multiple file systems it is more likely that the
 	  system will still come up, making it easier to restore from
@@ -1361,8 +1362,9 @@ root     5211  0.0  0.2  3620  1724   2 
 	    <entry>Normally the same size as the enclosing slice.
 	      This allows utilities that need to work on the entire
 	      slice, such as a bad block scanner, to work on the
-	      <literal>c</literal> partition.  You would not normally
-	      create a file system on this partition.</entry>
+	      <literal>c</literal> partition.  A file system would not
+	      normally be
+	      created on this partition.</entry>
 	  </row>
 
 	  <row>
@@ -1390,7 +1392,7 @@ root     5211  0.0  0.2  3620  1724   2 
       <literal>s</literal>, starting at 1.  So
       <quote>da0<emphasis>s1</emphasis></quote> is the first slice on
       the first SCSI drive.  There can only be four physical slices on
-      a disk, but you can have logical slices inside physical slices
+      a disk, but there can be logical slices inside physical slices
       of the appropriate type.  These extended slices are numbered
       starting at 5, so <quote>ad0<emphasis>s5</emphasis></quote> is
       the first extended slice on the first IDE disk.  These devices
@@ -1410,7 +1412,7 @@ root     5211  0.0  0.2  3620  1724   2 
     <para>Finally, each disk on the system is identified.  A disk name
       starts with a code that indicates the type of disk, and then a
       number, indicating which disk it is.  Unlike slices, disk
-      numbering starts at 0.  Common codes that you will see are
+      numbering starts at 0.  Common codes are
       listed in <xref linkend="basics-dev-codes"/>.</para>
 
     <para>When referring to a partition, include the disk name,
@@ -1586,8 +1588,9 @@ root     5211  0.0  0.2  3620  1724   2 
 
     <para>Another common reason to contain certain directory trees on
       other file systems is if they are to be housed on separate
-      physical disks, or are separate virtual disks, such as
-      <link linkend="network-nfs">Network File System</link> mounts,
+      physical disks, or are separate virtual disks, such as Network
+      File System  mounts, described in
+      <xref linkend="network-nfs"/>,
       or CDROM drives.</para>
 
     <sect2 id="disks-fstab">
@@ -1598,7 +1601,7 @@ root     5211  0.0  0.2  3620  1724   2 
 	<secondary>mounted with fstab</secondary>
       </indexterm>
 
-      <para>During the <link linkend="boot">boot process</link>,
+      <para>During the boot process (<xref linkend="boot"/>),
 	file systems listed in <filename>/etc/fstab</filename> are
 	automatically mounted except for the entries containing
 	<option>noauto</option>.  This file contains entries in the
@@ -1681,7 +1684,7 @@ root     5211  0.0  0.2  3620  1724   2 
     </sect2>
 
     <sect2 id="disks-mount">
-      <title>The <command>mount</command> Command</title>
+      <title>Using &man.mount.8;</title>
 
       <indexterm>
 	<primary>file systems</primary>
@@ -1808,14 +1811,14 @@ root     5211  0.0  0.2  3620  1724   2 
     </sect2>
 
     <sect2 id="disks-umount">
-      <title>The <command>umount</command> Command</title>
+      <title>Using &man.umount.8;</title>
 
       <indexterm>
 	<primary>file systems</primary>
 	<secondary>unmounting</secondary>
       </indexterm>
 
-      <para>To unmount a filesystem use &man.umount.8;.  This command
+      <para>To unmount a file system use &man.umount.8;.  This command
 	takes one parameter which can be a mountpoint, device name,
 	<option>-a</option> or <option>-A</option>.</para>
 
@@ -1843,7 +1846,7 @@ root     5211  0.0  0.2  3620  1724   2 
 
     <para>Each process is uniquely identified by a number called a
       <firstterm>process ID</firstterm>
-      (<firstterm>PID</firstterm>).  Similar to files, each process
+      (<acronym>PID</acronym>).  Similar to files, each process
       has one owner and group, and the owner and group permissions are
       used to determine which files and devices the process can open.
       Most processes also have a parent process that started them.
@@ -1851,17 +1854,18 @@ root     5211  0.0  0.2  3620  1724   2 
       the shell is a process which has the shell as its parent
       process.  The exception is a special process called
       &man.init.8; which is always the first process to start at boot
-      time and which always has a PID of 1.</para>
+      time and which always has a <acronym>PID</acronym> of 1.</para>
 
     <para>To see the processes on the system, use &man.ps.1; and
       &man.top.1;.   To display a static list of the currently running
-      processes, their PIDs, how much memory they are using, and the
-      command they were started with, use <command>ps</command>.  To
+      processes, their <acronym>PID</acronym>s, how much memory they
+      are using, and the
+      command they were started with, use &man.ps.1;.  To
       display all the running processes and update the display every
-      few seconds so that you can interactively see what the computer
-      is doing, use <command>top</command>.</para>
+      few seconds in order to interactively see what the computer
+      is doing, use &man.top.1;.</para>
 
-    <para>By default, <command>ps</command> only shows the commands
+    <para>By default, &man.ps.1; only shows the commands
       that are running and owned by the user.  For example:</para>
 
     <screen>&prompt.user; <userinput>ps</userinput>
@@ -1883,8 +1887,10 @@ root     5211  0.0  0.2  3620  1724   2 
 
     <para>The output from &man.ps.1; is organized into a number of
       columns.  The <literal>PID</literal> column displays the process
-      ID.  PIDs are assigned starting at 1, go up to 99999, then wrap
-      around back to the beginning.  However, a PID is not reassigned
+      ID.  <acronym>PID</acronym>s are assigned starting at 1, go up
+      to 99999, then wrap
+      around back to the beginning.  However, a <acronym>PID</acronym>
+      is not reassigned
       if it is already in use.  The <literal>TT</literal> column shows
       the tty the program is running on and <literal>STAT</literal>
       shows the program's state.  <literal>TIME</literal> is the
@@ -1926,7 +1932,8 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 ...</screen>
 
     <para>The output is split into two sections.  The header (the
-      first five lines) shows the PID of the last process to run, the
+      first five lines) shows the <acronym>PID</acronym> of the last
+      process to run, the
       system load averages (which are a measure of how busy the system
       is), the system uptime (time since the last reboot) and the
       current time.  The other figures in the header relate to how
@@ -1935,7 +1942,8 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       spending in different CPU states.</para>
 
     <para>Below the header is a series of columns containing similar
-      information to the output from &man.ps.1;, such as the PID,
+      information to the output from &man.ps.1;, such as the
+      <acronym>PID</acronym>,
       username, amount of CPU time, and the command that started the
       process.  By default, &man.top.1; also displays the amount of
       memory space taken by the process.  This is split into two
@@ -1973,13 +1981,13 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       daemons with a trailing <quote>d</quote>.
       <application>BIND</application> is the Berkeley Internet Name
       Domain, but the actual program that executes is
-      <command>named</command>.  The <application>Apache</application>
+      &man.named.8;.  The <application>Apache</application>
       web server program is <command>httpd</command> and the
-      line printer spooling daemon is <command>lpd</command>.  This is
+      line printer spooling daemon is &man.lpd.8;.  This is
       only a naming convention.  For example, the main mail daemon for
       the <application>Sendmail</application> application is
-      <command>sendmail</command>, and not
-      <command>maild</command>.</para>
+      &man.sendmail.8;, and not
+      <literal>maild</literal>.</para>
 
     <para>One way to communicate with a daemon, or any running
       process, is to send a <firstterm>signal</firstterm> using
@@ -2041,14 +2049,16 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       <title>Sending a Signal to a Process</title>
 
       <para>This example shows how to send a signal to &man.inetd.8;.
-	The <command>inetd</command> configuration file is
+	The &man.inetd.8; configuration file is
 	<filename>/etc/inetd.conf</filename>, and
-	<command>inetd</command> will re-read this configuration file
+	&man.inetd.8; will re-read this configuration file
 	when it is sent a <literal>SIGHUP</literal>.</para>
 
       <step>
-	<para>Find the PID of the process you want to send the signal
-	  to using &man.pgrep.1;.  In this example, the PID for
+	<para>Find the <acronym>PID</acronym> of the process to send
+	  the signal
+	  to using &man.pgrep.1;.  In this example, the
+	  <acronym>PID</acronym> for
 	  &man.inetd.8; is 198:</para>
 
 	<screen>&prompt.user; <userinput>pgrep -l inetd</userinput>
@@ -2066,12 +2076,14 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 &prompt.root; <userinput>/bin/kill -s HUP 198</userinput></screen>
 
 	<para>Like most &unix; commands, &man.kill.1; will not print
-	  any output if it is successful.  If you send a signal to a
-	  process that you do not own, you will instead see
+	  any output if it is successful.  If a signal is sent to a
+	  process not owned by that user, the message
 	  <errorname>kill: <replaceable>PID</replaceable>: Operation
-	    not permitted</errorname>.  Mistyping the PID will either
+	    not permitted</errorname> will be displayed.  Mistyping
+	  the <acronym>PID</acronym> will either
 	  send the signal to the wrong process, which could have
-	  negative results, or will send the signal to a PID that is
+	  negative results, or will send the signal to a
+	  <acronym>PID</acronym> that is
 	  not currently in use, resulting in the error
 	  <errorname>kill: <replaceable>PID</replaceable>: No such
 	    process</errorname>.</para>
@@ -2098,7 +2110,8 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 
     <important>
       <para>Killing a random process on the system can be a bad idea.
-	In particular, &man.init.8;, PID 1, is special.  Running
+	In particular, &man.init.8;, <acronym>PID</acronym> 1, is
+	special.  Running
 	<command>/bin/kill -s KILL 1</command> is a quick, and
 	unrecommended, way to shutdown the system.
 	<emphasis>Always</emphasis> double check the arguments to
@@ -2118,14 +2131,15 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       them.  Many shells provide built in functions to help with
       everyday tasks such as file management, file globbing, command
       line editing, command macros, and environment variables.  &os;
-      comes with several shells, including <command>sh</command>, the
-      Bourne Shell, and <command>tcsh</command>, the improved C-shell.
+      comes with several shells, including the
+      Bourne shell (&man.sh.1;) and the extended C shell
+      (&man.tcsh.1;).
       Other shells are available from the &os; Ports Collection, such
       as <command>zsh</command> and <command>bash</command>.</para>
 
     <para>The shell that is used is really a matter of taste.  A C
       programmer might feel more comfortable with a C-like shell such
-      as <command>tcsh</command>.  A Linux user might prefer
+      as &man.tcsh.1;.  A &linux; user might prefer
       <command>bash</command>.  Each shell has unique properties that
       may or may not work with a user's preferred working environment,
       which is why there is a choice of which shell to use.</para>
@@ -2182,7 +2196,8 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 
 	  <row>
 	    <entry><envar>DISPLAY</envar></entry>
-	    <entry>Network name of the <application>Xorg</application>
+	    <entry>Network name of the
+	      <application>&xorg;</application>
 	      display to connect to, if available.</entry>
 	  </row>
 
@@ -2237,13 +2252,13 @@ Swap: 256M Total, 38M Used, 217M Free, 1
     <indexterm><primary>Bourne shells</primary></indexterm>
 
     <para>How to set an environment variable differs between shells.
-      In <command>tcsh</command> and <command>csh</command>, use
+      In &man.tcsh.1; and &man.csh.1;, use
       <command>setenv</command> to set environment variables.  In
-      <command>sh</command> and <command>bash</command>, use
+      &man.sh.1; and <command>bash</command>, use
       <command>export</command> to set the current environment
       variables.  This example sets the default <envar>EDITOR</envar>
       to <filename>/usr/local/bin/emacs</filename> for the
-      <command>tcsh</command> shell:</para>
+      &man.tcsh.1; shell:</para>
 
     <screen>&prompt.user; <userinput>setenv EDITOR /usr/local/bin/emacs</userinput></screen>
 
@@ -2264,8 +2279,8 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       represents any number of characters in a filename.
       Meta-characters can be used to perform filename globbing.  For
       example, <command>echo *</command> is equivalent to
-      <command>ls</command> because the shell takes all the files that
-      match <literal>*</literal> and <command>echo</command> lists
+      &man.ls.1; because the shell takes all the files that
+      match <literal>*</literal> and &man.echo.1; lists
       them on the command line.</para>
 
     <para>To prevent the shell from interpreting a special character,
@@ -2282,7 +2297,7 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 	to use <command>chsh</command>.  Running this command will
 	open the editor that is configured in the
 	<envar>EDITOR</envar> environment variable, which by default
-	is set to <command>vi</command>.  Change
+	is set to &man.vi.1;.  Change
 	the <quote>Shell:</quote> line to the full path of the
 	new shell.</para>
 
@@ -2295,15 +2310,16 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       <note>
 	<para>The new shell <emphasis>must</emphasis> be present in
 	  <filename>/etc/shells</filename>.  If the shell was
-	  installed from the &os; <link linkend="ports">Ports
-	    Collection</link>, it should be automatically added to
+	  installed from the &os; Ports
+	  Collection as described in <xref linkend="ports"/>, it
+	  should be automatically added to
 	  this file.  If it is missing, add it using this
 	  command, replacing the path with the path of the
 	  shell:</para>
 
 	<screen>&prompt.root; <userinput>echo <replaceable>/usr/local/bin/bash</replaceable> &gt;&gt; /etc/shells</userinput></screen>
 
-	<para>Then rerun <command>chsh</command>.</para>
+	<para>Then rerun &man.chsh.1;.</para>
       </note>
     </sect2>
   </sect1>
@@ -2324,10 +2340,10 @@ Swap: 256M Total, 38M Used, 217M Free, 1
     </indexterm>
     <indexterm>
       <primary>editors</primary>
-      <secondary><command>ee</command></secondary>
+      <secondary>&man.ee.1;</secondary>
     </indexterm>
 
-    <para>A simple editor to learn is <application>ee</application>,
+    <para>A simple editor to learn is &man.ee.1;,
       which stands for easy editor.  To start this editor, type
       <command>ee <replaceable>filename</replaceable></command> where
       <replaceable>filename</replaceable> is the name of the file to
@@ -2337,18 +2353,18 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       <keycap>Ctrl</keycap>, so <literal>^e</literal> expands to
       <keycombo
 	action="simul"><keycap>Ctrl</keycap><keycap>e</keycap></keycombo>.
-      To leave <application>ee</application>, press
+      To leave &man.ee.1;, press
       <keycap>Esc</keycap>, then choose the <quote>leave
 	editor</quote> option from the main menu.  The editor will
-      prompt you to save any changes if the file has been
+      prompt to save any changes if the file has been
       modified.</para>
 
     <indexterm>
-      <primary><command>vi</command></primary>
+      <primary>&man.vi.1;</primary>
     </indexterm>
     <indexterm>
       <primary>editors</primary>
-      <secondary><command>vi</command></secondary>
+      <secondary>&man.vi.1;</secondary>
     </indexterm>
     <indexterm>
       <primary><command>emacs</command></primary>
@@ -2358,8 +2374,8 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       <secondary><command>emacs</command></secondary>
     </indexterm>
 
-    <para>&os; also comes with more powerful text editors such as
-      <application>vi</application> as part of the base system.
+    <para>&os; also comes with more powerful text editors, such as
+      &man.vi.1;, as part of the base system.
       Other editors, like <filename
 	role="package">editors/emacs</filename> and
       <filename role="package">editors/vim</filename>, are part of the
@@ -2372,8 +2388,7 @@ Swap: 256M Total, 38M Used, 217M Free, 1
     <para>Many applications which modify files or require typed input
       will automatically open a text editor.  To alter the default
       editor used, set the <envar>EDITOR</envar> environment
-      variable as described in the <link
-	linkend="shells">shells</link> section.</para>
+      variable as described in <xref linkend="shells"/>.</para>
   </sect1>
 
   <sect1 id="basics-devices">
@@ -2529,7 +2544,7 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       cross compilers and plugging in different formats.  Those who
       wanted to build cross compilers targeting &os; were out of luck
       since the older sources that &os; had for
-      <application>as</application> and <application>ld</application>
+      &man.as.1; and &man.ld.1;
       were not up to the task.  The new GNU tools chain
       (<application>binutils</application>) supports cross
       compiling, <acronym>ELF</acronym>, shared libraries, and C++
@@ -2568,8 +2583,8 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       <screen>&prompt.user; <userinput>man <replaceable>command</replaceable></userinput></screen>
 
       <para>where <replaceable>command</replaceable> is the name of
-	the command you wish to learn about.  For example, to learn
-	more about <command>ls</command>, type:</para>
+	the command to learn about.  For example, to learn
+	more about &man.ls.1;, type:</para>
 
       <screen>&prompt.user; <userinput>man ls</userinput></screen>
 
@@ -2616,21 +2631,21 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 
       <para>In some cases, the same topic may appear in more than one
 	section of the online manual.  For example, there is a
-	<command>chmod</command> user command and a
+	&man.chmod.1; user command and a
 	<function>chmod()</function> system call.  To tell
-	<command>man</command> which section to display, specify the
+	&man.man.1; which section to display, specify the
 	section number:</para>
 
       <screen>&prompt.user; <userinput>man 1 chmod</userinput></screen>
 
       <para>This will display the manual page for the user command
-	<command>chmod</command>.  References to a particular section
+	&man.chmod.1;.  References to a particular section
 	of the online manual are traditionally placed in parenthesis
 	in written documentation, so &man.chmod.1; refers to the
-	<command>chmod</command> user command and &man.chmod.2; refers
+	user command and &man.chmod.2; refers
 	to the system call.</para>
 
-      <para>If you do not know the command name, use <command>man
+      <para>If the command name is unknown, use <command>man
 	  -k</command> to search for keywords in the command
 	descriptions:</para>
 
@@ -2665,7 +2680,7 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 	by the Free Software Foundation (FSF).  In addition to manual
 	pages, these programs may include hypertext documents called
 	<literal>info</literal> files.  These can be viewed using
-	<command>info</command> or, if <filename
+	&man.info.1; or, if <filename
 	  role="package">editors/emacs</filename> is installed, the
 	info mode of <application>emacs</application>.</para>
 

From owner-svn-doc-projects@FreeBSD.ORG  Thu May  9 16:23:02 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 9E5E3B1F;
 Thu,  9 May 2013 16:23:02 +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 7F7B7FF4;
 Thu,  9 May 2013 16:23:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r49GN2Zb038935;
 Thu, 9 May 2013 16:23:02 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r49GN2pV038934;
 Thu, 9 May 2013 16:23:02 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201305091623.r49GN2pV038934@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 9 May 2013 16:23:02 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41576 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/boot
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: Thu, 09 May 2013 16:23:02 -0000

Author: dru
Date: Thu May  9 16:23:02 2013
New Revision: 41576
URL: http://svnweb.freebsd.org/changeset/doc/41576

Log:
  This patch addresses the following:
  
  - fix command/app tags which should be entities
  
  - fix link tags
  
  - add acronym tags
  
  A subsequent patch will fix the white space.
  
  Approved by: bcr (mentor)

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

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/boot/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/boot/chapter.xml	Thu May  9 13:39:38 2013	(r41575)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/boot/chapter.xml	Thu May  9 16:23:02 2013	(r41576)
@@ -73,47 +73,60 @@
       to the mechanism used to load the operating system, which has
       become shortened to <quote>booting</quote>.</para>
 
-    <indexterm><primary>BIOS</primary></indexterm>
+    <indexterm><primary><acronym>BIOS</acronym></primary></indexterm>
 
     <indexterm>
       <primary>Basic Input/Output System</primary>
-      <see>BIOS</see>
+      <see><acronym>BIOS</acronym></see>
     </indexterm>
 
-    <para>On x86 hardware the Basic Input/Output System (BIOS) is
+    <para>On x86 hardware the Basic Input/Output System
+      (<acronym>BIOS</acronym>) is
       responsible for loading the operating system.  To do this, the
-      BIOS looks on the hard disk for the Master Boot Record (MBR),
-      which must be located on a specific place on the disk.  The BIOS
-      has enough knowledge to load and run the MBR, and assumes that
-      the MBR can then carry out the rest of the tasks involved in
+      <acronym>BIOS</acronym> looks on the hard disk for the Master
+      Boot Record (<acronym>MBR</acronym>),
+      which must be located on a specific place on the disk.  The
+      <acronym>BIOS</acronym>
+      has enough knowledge to load and run the <acronym>MBR</acronym>,
+      and assumes that
+      the <acronym>MBR</acronym> can then carry out the rest of the
+      tasks involved in
       loading the operating system, possibly with the help of the
-      BIOS.</para>
+      <acronym>BIOS</acronym>.</para>
 
-    <indexterm><primary>Master Boot Record (MBR)</primary></indexterm>
+    <indexterm><primary>Master Boot Record
+	<acronym>MBR</acronym>)</primary></indexterm>
 
     <indexterm><primary>Boot Manager</primary></indexterm>
 
     <indexterm><primary>Boot Loader</primary></indexterm>
 
-    <para>The code within the MBR is usually referred to as a
+    <para>The code within the <acronym>MBR</acronym> is usually
+      referred to as a
       <emphasis>boot manager</emphasis>, especially when it interacts
-      with the user.  In this case the boot manager usually has more
+      with the user.  In this case, the boot manager usually has more
       code in the first <emphasis>track</emphasis> of the disk or
-      within some OS's file system.  (A boot manager is sometimes also
+      within the file system of some operating systems.  A boot
+      manager is sometimes also
       called a <emphasis>boot loader</emphasis>, but &os; uses that
-      term for a later stage of booting.) Popular boot managers
-      include <application>boot0</application> (aka
+      term for a later stage of booting.  Popular boot managers
+      include <application>boot0</application>, also called
       <application>Boot Easy</application>, the standard &os; boot
-      manager), <application>Grub</application>,
+      manager, <application>Grub</application>,
       <application>GAG</application>, and
-      <application>LILO</application>.  (Only
-      <application>boot0</application> fits within the MBR.)</para>
-
-    <para>If only one operating system is installed, a standard PC MBR
-      will suffice.  This MBR searches for the first bootable (active)
+      <application>LILO</application>.  Only
+      <application>boot0</application> fits within the
+      <acronym>MBR</acronym>.</para>
+
+    <para>If only one operating system is installed, a standard PC
+      <acronym>MBR</acronym>
+      will suffice.  This <acronym>MBR</acronym> searches for the
+      first bootable (active)
       slice on the disk, and then runs the code on that slice to load
-      the remainder of the operating system.  By default, the MBR
-      installed by &man.fdisk.8; is such an MBR and is based on
+      the remainder of the operating system.  By default, the
+      <acronym>MBR</acronym>
+      installed by &man.fdisk.8; is such an <acronym>MBR</acronym> and
+      is based on
       <filename>/boot/mbr</filename>.</para>
 
     <para>If multiple operating systems are present, a different boot
@@ -122,7 +135,8 @@
       boot managers are discussed in the next subsection.</para>
 
     <para>The remainder of the &os; bootstrap system is divided
-      into three stages.  The first stage is run by the MBR, which
+      into three stages.  The first stage is run by the
+      <acronym>MBR</acronym>, which
       knows just enough to get the computer into a specific state and
       run the second stage.  The second stage can do a little bit
       more, before running the third stage.  The third stage finishes
@@ -133,7 +147,7 @@
       loader.</para>
 
     <indexterm><primary>kernel</primary></indexterm>
-    <indexterm><primary><command>init</command></primary></indexterm>
+    <indexterm><primary>&man.init.8;</primary></indexterm>
 
     <para>The kernel is then started and it begins to probe for
       devices and initialize them for use.  Once the kernel boot
@@ -154,9 +168,10 @@
       <title>The Boot Manager</title>
 
       <indexterm><primary>Master Boot Record
-	  (MBR)</primary></indexterm>
+	  (<acronym>MBR</acronym>)</primary></indexterm>
 
-      <para>The code in the MBR or boot manager is sometimes referred
+      <para>The code in the <acronym>MBR</acronym> or boot manager is
+	sometimes referred
 	to as <emphasis>stage zero</emphasis> of the boot process.
 	This section discusses two boot managers:
 	<application>boot0</application> and
@@ -166,12 +181,13 @@
 	<title>The <application>boot0</application> Boot
 	  Manager:</title>
 
-	<para>The MBR installed by &os;'s installer or
+	<para>The <acronym>MBR</acronym> installed by &os;'s installer
+	  or
 	  &man.boot0cfg.8; is based on
 	  <filename>/boot/boot0</filename>.  The size and capability
 	  of <application>boot0</application> is restricted to 446
 	  bytes due to the slice table and <literal>0x55AA</literal>
-	  identifier at the end of the MBR.  If
+	  identifier at the end of the <acronym>MBR</acronym>.  If
 	  <application>boot0</application> and multiple operating
 	  systems are installed, a message similar to this example
 	  will be displayed at boot time:</para>
@@ -187,18 +203,25 @@ Default: F2</screen>
       </example>
 
       <para>Other operating systems, in particular &windows;, will
-	overwrite an existing MBR if they are installed after &os;.
-	If this happens, or you want to replace the existing MBR
-	with the &os; MBR, use the following command:</para>
+	overwrite an existing <acronym>MBR</acronym> if they are
+	installed after &os;.
+	If this happens, or to replace the existing
+	<acronym>MBR</acronym>
+	with the &os; <acronym>MBR</acronym>, use the following
+	command:</para>
 
       <screen>&prompt.root; <userinput>fdisk -B -b /boot/boot0 <replaceable>device</replaceable></userinput></screen>
 
       <para>where <replaceable>device</replaceable> is the boot disk,
-	such as <devicename>ad0</devicename> for the first IDE disk,
-	<devicename>ad2</devicename> for the first IDE disk on a
-	second IDE controller, or <devicename>da0</devicename>
-	for the first SCSI disk.  To create a custom configuration of
-	the MBR, refer to &man.boot0cfg.8;.</para>
+	such as <devicename>ad0</devicename> for the first
+	<acronym>IDE</acronym> disk,
+	<devicename>ad2</devicename> for the first
+	<acronym>IDE</acronym> disk on a
+	second <acronym>IDE</acronym> controller, or
+	<devicename>da0</devicename>
+	for the first <acronym>SCSI</acronym> disk.  To create a
+	custom configuration of
+	the <acronym>MBR</acronym>, refer to &man.boot0cfg.8;.</para>
 
       <formalpara>
 	<title>The LILO Boot Manager:</title>
@@ -235,11 +258,11 @@ label=FreeBSD</programlisting>
 	constraints, they have been split into two, but are always
 	installed together.  They are copied from the combined
 	<filename>/boot/boot</filename> by the installer or
-	<application>bsdlabel</application>.</para>
+	&man.bsdlabel.8;.</para>
 
       <para>They are located outside file systems, in the first track
 	of the boot slice, starting with the first sector.  This is
-	where <link linkend="boot-boot0">boot0</link>, or any other
+	where boot0 (<xref linkend="boot-boot0"/>), or any other
 	boot manager, expects to find a program to run which will
 	continue the boot process.  The number of sectors used is
 	easily determined from the size of
@@ -256,7 +279,7 @@ label=FreeBSD</programlisting>
 	can provide a simple interface to choose the kernel or loader
 	to run.</para>
 
-      <para><link linkend="boot-loader">loader</link> is much more
+      <para>However, &man.loader.8; is much more
 	sophisticated and provides a boot configuration which is run
 	by <filename>boot2</filename>.</para>
 
@@ -276,7 +299,8 @@ boot:</screen>
 
       <para>where <replaceable>diskslice</replaceable> is the disk and
 	slice to boot from, such as <devicename>ad0s1</devicename>
-	for the first slice on the first IDE disk.</para>
+	for the first slice on the first <acronym>IDE</acronym>
+	disk.</para>
 
       <warning>
 	<title>Dangerously Dedicated Mode</title>
@@ -557,8 +581,8 @@ boot:</screen>
 	  first is the default legacy virtual console command line
 	  environment.  After the system finishes booting, a console
 	  login prompt is presented.  The second environment is the
-	  graphical environment provided by
-	  <link linkend="x11">Xorg</link>.  Refer to that chapter for
+	  graphical environment as described in
+	  <xref linkend="x11"/>.  Refer to that chapter for
 	  more information on how to install and configure a graphical
 	  display manager and a graphical login manager.</para>
 
@@ -574,8 +598,8 @@ boot:</screen>
 
 	  <para>To use larger images, up to the maximum resolution of
 	    1024 by 768 pixels, load the <acronym>VESA</acronym>
-	    module during system boot.  For a <ulink
-	      url="kernelconfig">custom kernel</ulink>, include the
+	    module during system boot.  For a custom kernel, as
+	    described in <xref linkend="kernelconfig"/>, include the
 	    <literal>VESA</literal> kernel configuration option.
 	    Loading <acronym>VESA</acronym> support provides the
 	    ability to display a splash screen image that fills the
@@ -710,10 +734,10 @@ bitmap_name="<replaceable>/boot/splash.b
       <secondary>boot interaction</secondary>
     </indexterm>
 
-    <para>Once the kernel is loaded by either the default <link
-	linkend="boot-loader">loader</link> or by <link
-	linkend="boot-boot1">boot2</link> which bypasses the loader,
-      it examines its boot flags, if any, and adjusts its behavior as
+    <para>Once the kernel is loaded by either the default loader
+      (<xref linkend="boot-loader"/>) or by boot2 (<xref
+	linkend="boot-boot1"/>), which bypasses the loader,
+      it examines any boot flags and adjusts its behavior as
       necessary.</para>
 
     <sect2 id="boot-kernel-bootflags">
@@ -807,8 +831,9 @@ bitmap_name="<replaceable>/boot/splash.b
       <quote>device hints</quote>.  These <quote>device hints</quote>
       are used by device drivers for device configuration.</para>
 
-    <para>Device hints may also be specified at the <link
-	linkend="boot-loader"> Stage 3 boot loader</link> prompt.
+    <para>Device hints may also be specified at the Stage 3 boot
+      loader prompt, as demonstrated in <xref
+	linkend="boot-loader"/>.
       Variables can be added using <command>set</command>, removed
       with <command>unset</command>, and viewed
       <command>show</command>.  Variables set in
@@ -882,7 +907,7 @@ bitmap_name="<replaceable>/boot/splash.b
     <title>Init: Process Control Initialization</title>
 
     <indexterm>
-      <primary><command>init</command></primary>
+      <primary>&man.init.8;</primary>
     </indexterm>
 
     <para>Once the kernel has finished booting, it passes control to
@@ -897,8 +922,8 @@ bitmap_name="<replaceable>/boot/splash.b
       <para>The automatic reboot sequence makes sure that the file
 	systems available on the system are consistent.  If they are
 	not, and &man.fsck.8; cannot fix the inconsistencies of a UFS
-	file system, &man.init.8; drops the system into
-	<link linkend="boot-singleuser">single-user mode</link> so
+	file system, &man.init.8; drops the system into single-user
+	mode (<xref linkend="boot-singleuser"/>) so
 	that the system administrator can resolve the problem
 	directly.</para>
     </sect2>
@@ -909,14 +934,14 @@ bitmap_name="<replaceable>/boot/splash.b
       <indexterm><primary>single-user mode</primary></indexterm>
       <indexterm><primary>console</primary></indexterm>
 
-      <para>This mode can be reached through the <link
-	  linkend="boot-autoreboot">automatic reboot sequence</link>,
+      <para>This mode can be reached through the automatic reboot
+	sequence (<xref linkend="boot-autoreboot"/>),
 	the user booting with <option>-s</option>, or by setting
 	the <envar>boot_single</envar> variable in
-	<command>loader</command>.</para>
+	&man.loader.8;.</para>
 
       <para>It can also be reached by calling &man.shutdown.8; from
-	<link linkend="boot-multiuser">multi-user mode</link> without
+	multi-user mode (<xref linkend="boot-multiuser"/>) without
 	including <option>-r</option> or <option>-h</option>.</para>
 
       <para>If the system <literal>console</literal> is set to
@@ -952,8 +977,8 @@ console none                            
       <indexterm><primary>multi-user mode</primary></indexterm>
 
       <para>If &man.init.8; finds the file systems to be in order, or
-	once the user has finished their commands in <link
-	  linkend="boot-singleuser">single-user mode</link>, the
+	once the user has finished their commands in single-user
+	mode (<xref linkend="boot-singleuser"/>), the
 	system enters multi-user mode, in which it starts the
 	resource configuration of the system.</para>
 
@@ -983,7 +1008,7 @@ console none                            
     <title>Shutdown Sequence</title>
 
     <indexterm>
-      <primary><command>shutdown</command></primary>
+      <primary>&man.shutdown.8;</primary>
     </indexterm>
 
     <para>Upon controlled shutdown using &man.shutdown.8;,
@@ -997,8 +1022,8 @@ console none                            
       that support power management, use <command>shutdown -p
 	now</command> to turn the power off immediately.  To reboot a
       &os; system, use <command>shutdown -r now</command>.  One must
-      be <username>root</username> or a member of the
-      <groupname>operator</groupname> group in order to run
+      be <username>root</username> or a member of
+      <groupname>operator</groupname> in order to run
       &man.shutdown.8;.  One can also use &man.halt.8; and
       &man.reboot.8;.  Refer to their manual pages and to
       &man.shutdown.8; for more information.</para>

From owner-svn-doc-projects@FreeBSD.ORG  Thu May  9 16:48: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 [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 778A299B;
 Thu,  9 May 2013 16:48: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 6668B3CB;
 Thu,  9 May 2013 16:48: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 r49Gm4Fv046811;
 Thu, 9 May 2013 16:48:04 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r49Gm4VU046810;
 Thu, 9 May 2013 16:48:04 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201305091648.r49Gm4VU046810@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 9 May 2013 16:48:04 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41578 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ppp-and-slip
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: Thu, 09 May 2013 16:48:04 -0000

Author: dru
Date: Thu May  9 16:48:04 2013
New Revision: 41578
URL: http://svnweb.freebsd.org/changeset/doc/41578

Log:
  This patch addresses the following:
  
  - we/our
  
  - rest of acronyms
  
  - xref
  
  - removed obsolete mpd config and reworded to match current port
   version
  
  - pppoe port is broken, remove first reference but leave second
   one which references its documentation as it isn't available on
   the port's website; that whole section may have to be pulled as
   obsolete
  
  - fix dial-up to dialup
  
  A subsequent patch will fix white space.
  
  Approved by:  bcr (mentor)

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

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Thu May  9 16:28:04 2013	(r41577)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Thu May  9 16:48:04 2013	(r41578)
@@ -17,7 +17,7 @@
     </authorgroup>
   </chapterinfo>
 
-  <title>PPP and SLIP</title>
+  <title><acronym>PPP</acronym> and <acronym>SLIP</acronym></title>
 
   <sect1 id="ppp-and-slip-synopsis">
     <title>Synopsis</title>
@@ -25,12 +25,9 @@
     <indexterm id="ppp-ppp">
       <primary>PPP</primary>
     </indexterm>
-    <indexterm id="ppp-slip">
-      <primary>SLIP</primary>
-    </indexterm>
 
     <para>&os; has a number of ways to link one computer to another.
-      To establish a network or Internet connection through a dial-up
+      To establish a network or Internet connection through a dialup
       modem, or to allow others to do so through that modem, requires
       the use of <acronym>PPP</acronym>.  This chapter details how
       to set up modem-based communication services.</para>
@@ -136,7 +133,7 @@
 	  </listitem>
 
 	  <listitem>
-	    <para>The dial-up number(s) of the
+	    <para>The dialup number(s) of the
 	      <acronym>ISP</acronym>.</para>
 	  </listitem>
 
@@ -156,9 +153,11 @@
 	    <indexterm id="ppp-password">
 	      <primary>password</primary>
 	    </indexterm>
-	    <para>A login name and password.  (Either a
-	      regular &unix; style login and password pair, or a PAP
-	      or CHAP login and password pair).</para>
+	    <para>Either a
+	      regular &unix; style login and password pair, or a
+	      <acronym>PAP</acronym>
+	      or <acronym>CHAP</acronym> login and password
+	      pair.</para>
 	  </listitem>
 
 	  <listitem>
@@ -166,9 +165,11 @@
 	      <primary>nameserver</primary>
 	    </indexterm>
 
-	    <para>The IP address of one or more name servers.
-	      Normally, the <acronym>ISP</acronym> will provide two
-	      IP addresses.  If it has not provided any IP addresses,
+	    <para>The <acronym>IP</acronym> address of one or more
+	      name servers.
+	      Normally, the <acronym>ISP</acronym> will provide the
+	      addresses for two 
+	      <acronym>DNS</acronym> servers.  If it has not,
 	      include <command>enable dns</command> in
 	      <filename>ppp.conf</filename> and
 	      &man.ppp.8; will set the name servers.  This
@@ -184,7 +185,8 @@
 
 	<itemizedlist>
 	  <listitem>
-	    <para>The IP address of the <acronym>ISP</acronym>'s
+	    <para>The <acronym>IP</acronym> address of the
+	      <acronym>ISP</acronym>'s
 	      gateway.  The gateway is the machine to connect to
 	      and will be set up as the <emphasis>default
 		route</emphasis>.  When in doubt, make one up and the
@@ -192,7 +194,7 @@
 	      will set the correct value during connection
 	      setup.</para>
 
-	    <para>This IP number is referred to as
+	    <para>This <acronym>IP</acronym> number is referred to as
 	      <literal>HISADDR</literal> by
 	      &man.ppp.8;.</para>
 	  </listitem>
@@ -205,12 +207,13 @@
 
 	  <listitem>
 	    <indexterm id="ppp-static-ip">
-	      <primary>static IP address</primary>
+	      <primary>static <acronym>IP</acronym> address</primary>
 	    </indexterm>
 
-	    <para>If the <acronym>ISP</acronym> provides a static IP
+	    <para>If the <acronym>ISP</acronym> provides a static
+	      <acronym>IP</acronym>
 	      address and hostname, enter it.  Otherwise, let the peer
-	      assign whatever IP address it sees fit.</para>
+	      assign the <acronym>IP</acronym> address.</para>
 	  </listitem>
 	</itemizedlist>
 
@@ -245,16 +248,18 @@
 
 	<para>Configuring &man.ppp.8; requires a number of
 	  files to be edited, depending on the requirements and
-	  whether the <acronym>ISP</acronym> allocates IP addresses
+	  whether the <acronym>ISP</acronym> allocates
+	  <acronym>IP</acronym> addresses
 	  statically or dynamically.</para>
 
 	<sect4 id="userppp-staticIP">
-	  <title><acronym>PPP</acronym> and Static IP
-	    Addresses</title>
+	  <title><acronym>PPP</acronym> and Static
+	    <acronym>IP</acronym> Addresses</title>
 
 	  <indexterm>
 	    <primary>PPP</primary>
-	    <secondary>with static IP addresses</secondary>
+	    <secondary>with static <acronym>IP</acronym>
+	      addresses</secondary>
 	  </indexterm>
 
 	  <para>Edit <filename>/etc/ppp/ppp.conf</filename> so that it
@@ -445,7 +450,9 @@
 		  connecting using a &unix; style login prompt, these
 		  values are referred to by the <command>set
 		    login</command> command using the \U and \P
-		  variables.  When connecting using PAP or CHAP, these
+		  variables.  When connecting using
+		  <acronym>PAP</acronym>
+		  or <acronym>CHAP</acronym>, these
 		  values are used at authentication time.</para>
 	      </listitem>
 	    </varlistentry>
@@ -456,10 +463,12 @@
 	      <listitem>
 		<indexterm><primary>PAP</primary></indexterm>
 		<indexterm><primary>CHAP</primary></indexterm>
-		<para>When using PAP or CHAP, there will be no login
+		<para>When using <acronym>PAP</acronym> or
+		  <acronym>CHAP</acronym>,
+		  there will be no login
 		  and this line should be commented out or removed.
-		  See <link linkend="userppp-PAPnCHAP">PAP and CHAP
-		    authentication</link> for further details.</para>
+		  See <xref linkend="userppp-PAPnCHAP"/> for further
+		  details.</para>
 
 		<para>The login string is of the same chat-like
 		  syntax as the dial string.  In this example, the
@@ -501,19 +510,19 @@ protocol: ppp</screen>
 
 		<para>Sets the interface addresses.  The string
 		  <replaceable>x.x.x.x</replaceable> should be
-		  replaced by the IP address the provider has
+		  replaced by the <acronym>IP</acronym> address the
+		  provider has
 		  allocated.  The string
 		  <replaceable>y.y.y.y</replaceable> should be
-		  replaced by the IP address of the
+		  replaced by the <acronym>IP</acronym> address of the
 		  <acronym>ISP</acronym>'s gateway.  If the ISP has
 		  not provided a gateway address, use <hostid
 		  role="netmask">10.0.0.2/0</hostid>.  When using a
 		  <quote>guessed</quote> address, make sure to create
 		  an entry in
 		  <filename>/etc/ppp/ppp.linkup</filename> as per the
-		  instructions for <link
-		  linkend="userppp-dynamicIP"><acronym>PPP</acronym>
-		  and Dynamic IP addresses</link>.  If this line is
+		  instructions in <xref linkend="userppp-dynamicIP"/>.
+		  If this line is
 		  omitted, &man.ppp.8; cannot run in
 		  <option>-auto</option> mode.</para>
 	      </listitem>
@@ -540,7 +549,7 @@ protocol: ppp</screen>
 
 	  <para>It is not necessary to add an entry to
 	    <filename>ppp.linkup</filename> when using a static
-	    IP address with &man.ppp.8; in
+	    <acronym>IP</acronym> address with &man.ppp.8; in
 	    <option>-auto</option> mode as the routing table entries
 	    are already correct before a connection is established. 
 	    However, an entry can be created to invoke programs after
@@ -554,27 +563,32 @@ protocol: ppp</screen>
 	</sect4>
 
 	<sect4 id="userppp-dynamicIP">
-	  <title><acronym>PPP</acronym> and Dynamic IP
-	    Addresses</title>
+	  <title><acronym>PPP</acronym> and Dynamic
+	    <acronym>IP</acronym> Addresses</title>
 
 	  <indexterm>
 	    <primary>PPP</primary>
-	    <secondary>with dynamic IP addresses</secondary>
+	    <secondary>with dynamic <acronym>IP</acronym>
+	      addresses</secondary>
 	  </indexterm>
 
 	  <indexterm>
 	    <primary>IPCP</primary>
 	  </indexterm>
 
-	  <para>If the service provider does not assign static IP
+	  <para>If the service provider does not assign static
+	    <acronym>IP</acronym>
 	    addresses, &man.ppp.8; can be configured to
 	    negotiate the local and remote addresses.  This is done by
-	    <quote>guessing</quote> an IP address and allowing
-	    &man.ppp.8; to set it up correctly using the IP
-	    Configuration Protocol (IPCP) after connecting.  The
+	    <quote>guessing</quote> an <acronym>IP</acronym> address
+	    and allowing
+	    &man.ppp.8; to set it up correctly using the
+	    <acronym>IP</acronym>
+	    Configuration Protocol (<acronym>IPCP</acronym>) after
+	    connecting.  The
 	    <filename>ppp.conf</filename> configuration is the same as
-	    <link linkend="userppp-staticIP"><acronym>PPP</acronym>
-	    and Static IP Addresses</link>, with the following
+	    that described in <xref linkend="userppp-staticIP"/>, with
+	    the following
 	    change:</para>
 
 	  <programlisting>17      set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.255 0.0.0.0</programlisting>
@@ -591,7 +605,8 @@ protocol: ppp</screen>
 		<para>The number after the <literal>/</literal>
 		  character is the number of bits of the address that
 		  &man.ppp.8; will insist on.  These
-		  IP numbers can be replaced, but the above example
+		  <acronym>IP</acronym> numbers can be replaced, but
+		  the above example
 		  will always work.</para>
 
 		<para>The last argument (<literal>0.0.0.0</literal>)
@@ -627,11 +642,11 @@ protocol: ppp</screen>
 		<para>On establishing a connection,
 		  &man.ppp.8; will look for an entry in
 		  <filename>ppp.linkup</filename> according to the
-		  following rules: First, try to match the same label
-		  as we used in <filename>ppp.conf</filename>.  If
-		  that fails, look for an entry for the IP address of
-		  our gateway.  This entry is a four-octet IP style
-		  label.  If we still have not found an entry, look
+		  following rules. First, try to match the same label
+		  used in <filename>ppp.conf</filename>.  If
+		  that fails, look for an entry for the four-octet
+		  <acronym>IP</acronym> address of
+		  the gateway.  If an entry is still not found, look
 		  for the <literal>MYADDR</literal> entry.</para>
 	      </listitem>
 	    </varlistentry>
@@ -644,8 +659,9 @@ protocol: ppp</screen>
 		  default route that points to
 		  <literal>HISADDR</literal>.
 		  <literal>HISADDR</literal> will be replaced with the
-		  IP number of the gateway as negotiated by the
-		  IPCP.</para>
+		  <acronym>IP</acronym> number of the gateway as
+		  negotiated by
+		  <acronym>IPCP</acronym>.</para>
 	      </listitem>
 	    </varlistentry>
 	  </variablelist>
@@ -666,9 +682,12 @@ protocol: ppp</screen>
 	  </indexterm>
 
 	  <para>When configuring &man.ppp.8; to receive
-	    incoming calls on a machine connected to a LAN, decide if
-	    packets should be forwarded to the LAN.  If so, allocate
-	    the peer an IP number from the LAN's subnet and use
+	    incoming calls on a machine connected to a
+	    <acronym>LAN</acronym>, decide if
+	    packets should be forwarded to the local network.
+	    If so, allocate
+	    the peer an <acronym>IP</acronym> number from the local
+	    subnet and use
 	    <command>enable proxy</command> in
 	    <filename>/etc/ppp/ppp.conf</filename>.  Also, confirm
 	    that <filename>/etc/rc.conf</filename> contains the
@@ -678,17 +697,18 @@ protocol: ppp</screen>
 	</sect4>
 
 	<sect4>
-	  <title>Which getty?</title>
+	  <title>Which &man.getty.8;?</title>
 
-	  <para><link linkend="dialup">Configuring &os; for
-	      Dial-up Services</link> provides a good description
-	    on enabling dial-up services using &man.getty.8;.</para>
+	  <para><xref linkend="dialup"/> provides a good description
+	    on enabling dialup services using &man.getty.8;.</para>
 
 	  <para>An alternative to &man.getty.8; is <ulink
-	      url="http://mgetty.greenie.net/">mgetty</ulink> (from
-	    <filename role="package">comms/mgetty+sendfax</filename>
-	    port), a smarter version of &man.getty.8;
-	    designed with dial-up lines in mind.</para>
+	      url="http://mgetty.greenie.net/">mgetty</ulink>, a
+	    smarter version of &man.getty.8;
+	    designed with dialup lines in mind.  It can be installed
+	    from the <filename
+	      role="package">comms/mgetty+sendfax</filename> package
+	    or port.</para>
 
 	  <para>The advantages of using &man.getty.8; is
 	    that it actively <emphasis>talks</emphasis> to modems.
@@ -696,13 +716,13 @@ protocol: ppp</screen>
 	    <filename>/etc/ttys</filename>, the modem will not answer
 	    the phone.</para>
 
-	  <para>Later versions of &man.getty.8; (from
-	    0.99beta onwards) also support the automatic detection of
+	  <para>The &os; version of &man.getty.8;
+	    supports the automatic detection of
 	    <acronym>PPP</acronym> streams, allowing clients
 	    scriptless access to the server.</para>
 
-	  <para>Refer to <link linkend="userppp-mgetty">Mgetty and
-	      AutoPPP</link> for more information on
+	  <para>Refer to <xref linkend="userppp-mgetty"/>
+	      for more information on
 	    &man.getty.8;.</para>
 	</sect4>
 
@@ -717,8 +737,8 @@ protocol: ppp</screen>
 	    <filename>/etc/group</filename>.</para>
 
 	  <para>Then, give the account access to one or more sections
-	    of the configuration file using the
-	    <command>allow</command> command:</para>
+	    of the configuration file using
+	    <command>allow</command>, as seen in this example:</para>
 
 	  <programlisting>allow users fred mary</programlisting>
 
@@ -728,7 +748,8 @@ protocol: ppp</screen>
 	</sect4>
 
 	<sect4>
-	  <title><acronym>PPP</acronym> Shells for Dynamic-IP
+	  <title><acronym>PPP</acronym> Shells for
+	    Dynamic-<acronym>IP</acronym>
 	    Users</title>
 
 	  <indexterm>
@@ -781,16 +802,17 @@ exec /usr/sbin/ppp -direct $IDENT</progr
 	  </sect4>
 
 	  <sect4>
-	    <title><acronym>PPP</acronym> Shells for Static-IP
+	    <title><acronym>PPP</acronym> Shells for
+	      Static-<acronym>IP</acronym>
 	      Users</title>
 
 	    <indexterm>
 	      <primary>PPP shells</primary>
 	    </indexterm>
 
-	    <para>Create the <filename>ppp-shell</filename> file as
-	      above, and for each account with statically assigned
-	      IPs create a symbolic link to
+	    <para>Create <filename>ppp-shell</filename> as described
+	      above, and for each account with a statically assigned
+	      <acronym>IP</acronym>, create a symbolic link to
 	      <filename>ppp-shell</filename>.</para>
 
 	    <para>Consider three dialup customers,
@@ -810,10 +832,10 @@ exec /usr/sbin/ppp -direct $IDENT</progr
 
 	  <sect4>
 	    <title>Setting Up <filename>ppp.conf</filename> for
-	      Dynamic-IP Users</title>
+	      Dynamic-<acronym>IP</acronym> Users</title>
 
-	    <para>The <filename>/etc/ppp/ppp.conf</filename> file
-	      should contain something along the lines of:</para>
+	    <para>Here is a sample
+	      <filename>/etc/ppp/ppp.conf</filename>:</para>
 
 	    <programlisting>default:
   set debug phase lcp chat
@@ -835,13 +857,14 @@ ttyu1:
 	      for each session.  For each dialup line enabled in
 	      <filename>/etc/ttys</filename> create an entry similar
 	      to the one for <literal>ttyu0:</literal> above.  Each
-	      line should get a unique IP address from the pool of
-	      IP addresses for dynamic users.</para>
+	      line should get a unique <acronym>IP</acronym> address
+	      from the pool of
+	      <acronym>IP</acronym> addresses for dynamic users.</para>
 	  </sect4>
 
 	  <sect4>
 	    <title>Setting Up <filename>ppp.conf</filename> for
-	      Static-IP Users</title>
+	      Static-<acronym>IP</acronym> Users</title>
 
 	    <para>Along with the contents of the sample
 	      <filename>/usr/share/examples/ppp/ppp.conf</filename>
@@ -859,7 +882,8 @@ mary:
 
 	    <para>The file <filename>/etc/ppp/ppp.linkup</filename>
 	      should also contain routing information for each static
-	      IP user if required.  The line below would add a route
+	      <acronym>IP</acronym> user if required.  The line below
+	      would add a route
 	      for the <hostid role="ipaddr">203.14.101.0/24</hostid>
 	      network via the client's <acronym>PPP</acronym>
 	      link.</para>
@@ -897,7 +921,8 @@ mary:
 	    automatically spawn off a &man.ppp.8; shell.
 	    However, since the default login/password sequence does
 	    not occur it is necessary to authenticate users using
-	    either PAP or CHAP.</para>
+	    either <acronym>PAP</acronym> or
+	    <acronym>CHAP</acronym>.</para>
 
 	  <para>This section assumes the user has successfully
 	    compiled, and installed the <filename
@@ -923,9 +948,7 @@ exec /usr/sbin/ppp -direct pap$IDENT</pr
 
 	  <para>For each dialup line enabled in
 	    <filename>/etc/ttys</filename>, create a corresponding
-	    entry in <filename>/etc/ppp/ppp.conf</filename>.  This
-	    will happily co-exist with the definitions we created
-	    above.</para>
+	    entry in <filename>/etc/ppp/ppp.conf</filename>.</para>
 
 	  <programlisting>pap:
   enable pap
@@ -934,14 +957,15 @@ exec /usr/sbin/ppp -direct pap$IDENT</pr
 
 	  <para>Each user logging in with this method will need to
 	    have a username/password in
-	    <filename>/etc/ppp/ppp.secret</filename> file, or
-	    alternatively add the following option to authenticate
-	    users via PAP from the <filename>/etc/passwd</filename>
-	    file.</para>
+	    <filename>/etc/ppp/ppp.secret</filename>.
+	    Alternatively, add the following option to authenticate
+	    users via <acronym>PAP</acronym> from
+	    <filename>/etc/passwd</filename>:</para>
 
 	  <programlisting>enable passwdauth</programlisting>
 
-	  <para>To assign some users a static IP, specify the IP
+	  <para>To assign some users a static <acronym>IP</acronym>,
+	    specify the <acronym>IP</acronym>
 	    address as the third argument in
 	    <filename>/etc/ppp/ppp.secret</filename>.  See
 	    <filename>/usr/share/examples/ppp/ppp.secret.sample</filename>
@@ -995,29 +1019,32 @@ set nbns 203.14.100.5</programlisting>
 	</sect4>
 
 	<sect4 id="userppp-PAPnCHAP">
-	  <title>PAP and CHAP Authentication</title>
+	  <title><acronym>PAP</acronym> and <acronym>CHAP</acronym>
+	    Authentication</title>
 
 	  <indexterm><primary>PAP</primary></indexterm>
 	  <indexterm><primary>CHAP</primary></indexterm>
 	  <para>Some <acronym>ISP</acronym>s set their system up so
 	    that the authentication part of the connection is done
-	    using either the PAP or CHAP authentication mechanism.  If
+	    using either the <acronym>PAP</acronym> or
+	    <acronym>CHAP</acronym>
+	    authentication mechanism.  If
 	    this is the case, the <acronym>ISP</acronym> will not give
 	    a <prompt>login:</prompt> during connection, but will
 	    start talking <acronym>PPP</acronym>
 	    immediately.</para>
 
-	  <para>PAP is less secure than CHAP, but security is not
-	    normally an issue here as passwords, although being sent
-	    as plain text with PAP, are being transmitted down a
+	  <para>While <acronym>PAP</acronym> is less secure than
+	    <acronym>CHAP</acronym>,
+	    security is not
+	    normally an issue as the clear text passwords are
+	    transmitted down a
 	    serial line only.  There is not much room for crackers
 	    to <quote>eavesdrop</quote>.</para>
 
-	  <para>Referring back to the <link
-	      linkend="userppp-staticIP"><acronym>PPP</acronym> and
-	    Static IP addresses</link> or <link
-	      linkend="userppp-dynamicIP"><acronym>PPP</acronym> and
-	    Dynamic IP addresses</link> sections, the following
+	  <para>Referring back to <xref
+	      linkend="userppp-staticIP"/> and <xref
+	      linkend="userppp-dynamicIP"/>, the following
 	    alterations must be made:</para>
 
 	  <programlisting>13      set authname <replaceable>MyUserName</replaceable>
@@ -1029,7 +1056,8 @@ set nbns 203.14.100.5</programlisting>
 	      <term>Line 13:</term>
 
 	      <listitem>
-		<para>This line specifies the PAP/CHAP user name.
+		<para>This line specifies the
+		  <acronym>PAP/CHAP</acronym> user name.
 		  Insert the correct value for
 		  <replaceable>MyUserName</replaceable>.</para>
 	      </listitem>
@@ -1040,7 +1068,9 @@ set nbns 203.14.100.5</programlisting>
 	      <listitem>
 		<indexterm><primary>password</primary></indexterm>
 
-		<para>This line specifies the PAP/CHAP password.
+		<para>This line specifies the
+		  <acronym>PAP/CHAP</acronym>
+		  password.
 		  Insert the correct value for
 		  <replaceable>MyPassword</replaceable>.  An
 		  additional line can be added, such as:</para>
@@ -1052,7 +1082,10 @@ set nbns 203.14.100.5</programlisting>
 		<programlisting>16      accept CHAP</programlisting>
 
 		<para>to make it obvious that this is the intention,
-		  but PAP and CHAP are both accepted by
+		  but <acronym>PAP</acronym> and
+		  <acronym>CHAP</acronym>
+		  are both accepted
+		  by
 		  default.</para>
 	      </listitem>
 	    </varlistentry>
@@ -1062,8 +1095,10 @@ set nbns 203.14.100.5</programlisting>
 
 	      <listitem>
 		<para>The <acronym>ISP</acronym> will not normally
-		  require a login into the server when using PAP or
-		  CHAP.  Therefore, disable the <quote>set
+		  require a login into the server when using
+		  <acronym>PAP</acronym> or
+		  <acronym>CHAP</acronym>.  Therefore, disable the
+		  <quote>set
 		    login</quote> string.</para>
 	      </listitem>
 	    </varlistentry>
@@ -1143,7 +1178,8 @@ nat port tcp 10.0.0.2:http http</program
 
 	<programlisting>hostname="foo.example.com"</programlisting>
 
-	<para>If the <acronym>ISP</acronym> has supplied a static IP
+	<para>If the <acronym>ISP</acronym> has supplied a static
+	  <acronym>IP</acronym>
 	  address and name, it is recommended to use this name as the
 	  host name.</para>
 
@@ -1167,7 +1203,7 @@ ifconfig_tun0=</programlisting>
 	  <para>This script is executed at network configuration time,
 	    starting the &man.ppp.8; daemon in
 	    <option>-auto</option> mode.  If the machine functions as
-	    a gateway for a LAN, consider using the
+	    a gateway for a <acronym>LAN</acronym>, consider using the
 	    <option>-alias</option> switch.  Refer to the manual page
 	    for details.</para>
 	</note>
@@ -1188,8 +1224,8 @@ ifconfig_tun0=</programlisting>
 	  &man.ppp.8;.</para>
 
 	<para>It is probably a good idea to ensure that the
-	  <literal>sendmail_flags</literal> line does not include the
-	  <option>-q</option> option, otherwise
+	  <literal>sendmail_flags</literal> line does not include
+	  <option>-q</option>; otherwise,
 	  &man.sendmail.8; will attempt to do a network
 	  lookup every now and then, possibly causing the machine
 	  to dial out.  Try this command instead:</para>
@@ -1205,7 +1241,7 @@ ifconfig_tun0=</programlisting>
 
 	<screen>&prompt.root; <userinput>/usr/sbin/sendmail -q</userinput></screen>
 
-	<para>To automatically use the <command>!bg</command> command
+	<para>To automatically use <command>!bg</command>
 	  in <filename>ppp.linkup</filename>:</para>
 
 	<programlisting>1     provider:
@@ -1264,7 +1300,8 @@ ifconfig_tun0=</programlisting>
 	  </step>
 
 	  <step>
-	    <para>When using a dynamic IP address, create an entry in
+	    <para>When using a dynamic <acronym>IP</acronym> address,
+	      create an entry in
 	      <filename>/etc/ppp/ppp.linkup</filename>.</para>
 	  </step>
 
@@ -1300,9 +1337,9 @@ ifconfig_tun0=</programlisting>
 	  </step>
 
 	  <step>
-	    <para>Create a profile in this users home directory that
-	      runs <command>ppp -direct direct-server</command> or
-	      similar.</para>
+	    <para>Create a profile in this user's home directory that
+	      runs <command>ppp -direct
+		direct-server</command>.</para>
 	  </step>
 
 	  <step>
@@ -1411,7 +1448,7 @@ ifconfig_tun0=</programlisting>
 
       <screen>ppp ON example&gt; <userinput>enable dns</userinput></screen>
 
-      <para>Switch to <quote>terminal</quote> mode so that we can
+      <para>Switch to <quote>terminal</quote> mode to
 	manually control the modem.</para>
 
       <screen>ppp ON example&gt; <userinput>term</userinput></screen>
@@ -1429,9 +1466,10 @@ OK
 
       <screen>CONNECT</screen>
 
-      <para>Confirmation of the connection, if we are going to have
-	any connection problems, unrelated to hardware, here is where
-	we will attempt to resolve them.</para>
+      <para>This message confirms the connection.  If there are
+	any connection problems, unrelated to hardware, this is the
+	time to
+	attempt to resolve them.</para>
 
       <screen>ISP Login:<userinput>myusername</userinput></screen>
 
@@ -1441,41 +1479,43 @@ OK
 
       <screen>ISP Pass:<userinput>mypassword</userinput></screen>
 
-      <para>This time we are prompted for a password, just
-	reply with the password that was provided by the
+      <para>At this password prompt,
+	enter the password that was provided by the
 	<acronym>ISP</acronym>.  Just like logging into
 	&os;, the password will not echo.</para>
 
       <screen>Shell or PPP:<userinput>ppp</userinput></screen>
 
       <para>Depending on the <acronym>ISP</acronym>, this prompt
-	may never appear.  Here we are being asked if we wish to
-	use a shell on the provider, or to start
-	&man.ppp.8;.  In this example, we have chosen
-	to use &man.ppp.8; as we want an Internet
+	may never appear.  If it does, it provides a choice to
+	use a shell on the provider or to start
+	&man.ppp.8;.  This example chooses
+	to use &man.ppp.8; in order to create an Internet
 	connection.</para>
 
       <screen>Ppp ON example&gt;</screen>
 
-      <para>Notice that in this example the first <option>p</option>
-	has been capitalized.  This shows that we have successfully
-	connected to the <acronym>ISP</acronym>.</para>
+      <para>In this example, the first <option>p</option>
+	has been capitalized.  This indicates a successful
+	connection to the <acronym>ISP</acronym>.</para>
 
       <screen>PPp ON example&gt;</screen>
 
-      <para>We have successfully authenticated with our
-	<acronym>ISP</acronym> and are waiting for the
-	assigned <acronym>IP</acronym> address.</para>
+      <para>This indicates successful authentication with the
+	<acronym>ISP</acronym> but the
+	<acronym>IP</acronym> address has not been assigned
+	yet.</para>
 
       <screen>PPP ON example&gt;</screen>
 
-      <para>We have made an agreement on an <acronym>IP</acronym>
-	address and successfully completed our connection.</para>
+      <para>This indicates an <acronym>IP</acronym>
+	address has been assigned and the
+	connection has successfully completed.</para>
 
       <screen>PPP ON example&gt;<userinput>add default HISADDR</userinput></screen>
 
-      <para>Here we add our default route, we need to do this before
-	we can talk to the outside world as currently the only
+      <para>This adds a default route which is needed for successful
+	communication.  Until this is added, the only
 	established connection is with the peer.  If this fails due to
 	existing routes, put a bang character
 	(<literal>!</literal>) in front of the <option>add</option>.
@@ -1500,8 +1540,8 @@ OK
 	<para>For a direct line that cannot seem to make a connection,
 	  turn hardware flow <acronym>CTS/RTS</acronym> to off with
 	  <option>set ctsrts off</option>.  This can occur when
-	  connected to some <application>PPP</application> capable
-	  terminal servers as <application>PPP</application> hangs
+	  connected to some <acronym>PPP</acronym> capable
+	  terminal servers as &man.ppp.8; hangs
 	  when it tries to write data to the communication link and
 	  then waits for a Clear To Send (<acronym>CTS</acronym>)
 	  signal which may never come.  When using this option,
@@ -1518,11 +1558,11 @@ OK
 	  <acronym>ISP</acronym>s.  This option may be needed for
 	  the Compuserve <acronym>ISP</acronym>.</para>
 
-	<para><application>PPP</application> may not return to the
+	<para>&man.ppp.8; may not return to the
 	  command mode, which is usually a negotiation error where
 	  the <acronym>ISP</acronym> is waiting for your side to start
-	  negotiating.  At this point, using the <command>~p</command>
-	  command will force &man.ppp.8; to start
+	  negotiating.  At this point, using <command>~p</command>
+	  will force &man.ppp.8; to start
 	  sending the configuration information.</para>
 
 	<para>If a login prompt never appears, try using
@@ -1530,7 +1570,7 @@ OK
 	  authentication instead of the &unix; style in the example
 	  above.  To use <acronym>PAP</acronym> or
 	  <acronym>CHAP</acronym>, add the following options to
-	  <application>PPP</application> before going into terminal
+	  &man.ppp.8; before going into terminal
 	  mode:</para>
 
 	<screen>ppp ON example&gt; <userinput>set authname <replaceable>myusername</replaceable></userinput></screen>
@@ -1566,7 +1606,7 @@ nameserver <replaceable>y.y.y.y</replace
 	  <acronym>ISP</acronym>'s DNS servers.</para>
 
 	<para>To configure &man.syslog.3; to log
-	  <application>PPP</application> connections, add:</para>
+	  &man.ppp.8; connections, add:</para>
 
 	<programlisting>!ppp
 *.*     /var/log/ppp.log</programlisting>
@@ -1684,9 +1724,9 @@ ppp_profile="name_of_service_provider"</
 
       <para>The profile name (service tag) will be used in the
 	<acronym>PPPoE</acronym> configuration entry in
-	<filename>ppp.conf</filename> as the provider part of the
-	<command>set device</command> command (refer to &man.ppp.8;
-	for details).  It should look like
+	<filename>ppp.conf</filename> as the provider part of
+	<command>set device</command>, as described in &man.ppp.8;.
+	It should look like
 	this:</para>
 
       <programlisting>set device PPPoE:<replaceable>xl1</replaceable>:<replaceable>ISP</replaceable></programlisting>
@@ -1696,30 +1736,23 @@ ppp_profile="name_of_service_provider"</
       <para>Do not forget to change <replaceable>ISP</replaceable>
 	to the profile found above.</para>
 
-      <para>For additional information, see:</para>
-
-      <itemizedlist>
-	<listitem>
-	  <para><ulink
+      <para>For additional information, see <ulink
 	      url="http://renaud.waldura.com/doc/freebsd/pppoe/">Cheaper
-	    Broadband with &os; on DSL</ulink> by Renaud
-	    Waldura.</para>
-	</listitem>
-      </itemizedlist>
+	      Broadband with &os; on
+	      <acronym>DSL</acronym></ulink>.</para>
     </sect2>
 
     <sect2 id="ppp-3com">
 
       <title><acronym>PPPoE</acronym> with a &tm.3com;
-	<trademark class="registered">HomeConnect</trademark> ADSL
+	<trademark class="registered">HomeConnect</trademark>
+	<acronym>ADSL</acronym>
 	Modem Dual Link</title>
 
       <para>This modem does not follow <ulink
-	  url="http://www.faqs.org/rfcs/rfc2516.html">RFC 2516</ulink>
-	(<emphasis>A Method for transmitting <acronym>PPP</acronym>
-	over Ethernet (<acronym>PPPoE</acronym>)</emphasis>, written
-	by L. Mamakos, K. Lidl, J. Evarts, D. Carrel, D. Simone, and
-	R. Wheeler).  Instead, different packet type codes have been
+	  url="http://www.faqs.org/rfcs/rfc2516.html">RFC
+	  2516</ulink>.
+	Instead, different packet type codes have been
 	used for the Ethernet frames.  Please complain to <ulink
 	  url="http://www.3com.com/">3Com</ulink> if you think it
 	should comply with the <acronym>PPPoE</acronym>
@@ -1739,8 +1772,9 @@ ppp_profile="name_of_service_provider"</
       <para>Unfortunately, because this is a system-wide setting,
 	it is not possible to talk to a normal
 	<acronym>PPPoE</acronym> client or server and a &tm.3com;
-	<trademark class="registered">HomeConnect</trademark> ADSL
-	Modem at the same time.</para>
+	<trademark class="registered">HomeConnect</trademark>
+	<acronym>ADSL</acronym>
+	modem at the same time.</para>
 
     </sect2>
   </sect1>
@@ -1761,30 +1795,19 @@ ppp_profile="name_of_service_provider"</
 
     <para>The following describes how to set up <acronym>PPP</acronym>
       over ATM (<acronym>PPPoA</acronym>).  <acronym>PPPoA</acronym>
-      is a popular choice among European DSL providers.</para>
+      is a popular choice among European <acronym>DSL</acronym>
+      providers.</para>
 
     <sect2>
       <title>Using <acronym>PPPoA</acronym> with the Alcatel
 	&speedtouch; USB</title>
 
-      <para><acronym>PPPoA</acronym> support for this device is
-	supplied as a port in &os; because the firmware is distributed
-	under <ulink
-	url="http://www.speedtouchdsl.com/disclaimer_lx.htm">Alcatel's
-	license agreement</ulink> and can not be redistributed freely
-	with the base system of &os;.</para>
-
-      <para>To install the software, simply use the <link
-	  linkend="ports">Ports Collection</link>. Install the
-	<filename role="package">net/pppoa</filename> port and follow
-	the instructions provided with it.</para>
-
       <para>Like many USB devices, the Alcatel &speedtouch; USB needs
 	to download firmware from the host computer to operate
 	properly.  It is possible to automate this process in &os;
 	so that this transfer takes place whenever the device is
 	plugged into a USB port.  The following information can be
-	added to the <filename>/etc/usbd.conf</filename> file to
+	added to <filename>/etc/usbd.conf</filename> to
 	enable this automatic firmware transfer.  This file must be
 	edited as the <username>root</username> user.</para>
 
@@ -1816,103 +1839,35 @@ ppp_profile="adsl"</programlisting>
     </sect2>
 
     <sect2>
-      <title>Using mpd</title>
+      <title>Using <application>mpd</application></title>
 
       <para><application>mpd</application> can be used to connect to a
-	variety of services, in particular PPTP services.  
-	<application>mpd</application> can be installed from the Ports
-	Collection, <filename role="package">net/mpd</filename>.  Many
-	ADSL modems require that a PPTP tunnel is created between the
-	modem and computer, one such modem is the Alcatel &speedtouch;
+	variety of services, in particular <acronym>passwd</acronym>
+	services.
+	<application>mpd</application> can be installed from the
+	<filename role="package">net/mpd5</filename> package or port.
+	Many
+	<acronym>ADSL</acronym> modems require a
+	<acronym>PPTP</acronym> tunnel between the
+	modem and computer.  One such modem is the Alcatel
+	&speedtouch;
 	Home.</para>
 
-      <para>After installing the port, configure
-	<application>mpd</application> to suit the requirements and
-	provider settings.  The port places a set of sample
-	configuration files which are well documented in <filename
-	  class="directory">/usr/local/etc/mpd/</filename>.  A
-	complete guide to configure <application>mpd</application>
-	is available in HTML format once the port has been installed.
-	It is placed in <filename
-	  class="directory">/usr/local/share/doc/mpd/</filename>.
-	Here is a sample configuration for connecting to an ADSL
-	service with <application>mpd</application>. The configuration
-	is spread over two files, first the
-	<filename>mpd.conf</filename>:</para>
-
-      <note>
-	<para>This example of the <filename>mpd.conf</filename> file
-	  only works with <application>mpd</application> 4.x.</para>
-      </note>
-
-      <programlisting>default:
-    load adsl
-
-adsl:
-    new -i ng0 adsl adsl
-    set bundle authname <replaceable>username</replaceable> <co
-    id="co-mpd-ex-user"/>
-    set bundle password <replaceable>password</replaceable> <co
-    id="co-mpd-ex-pass"/>
-    set bundle disable multilink
-
-    set link no pap acfcomp protocomp
-    set link disable chap
-    set link accept chap
-    set link keep-alive 30 10
-
-    set ipcp no vjcomp
-    set ipcp ranges 0.0.0.0/0 0.0.0.0/0
-
-    set iface route default
-    set iface disable on-demand
-    set iface enable proxy-arp
-    set iface idle 0
-
-    open</programlisting>
-
-    <calloutlist>
-      <callout arearefs="co-mpd-ex-user">
-	<para>The username used to authenticate with the
-	  <acronym>ISP</acronym>.</para>
-      </callout>
-      <callout arearefs="co-mpd-ex-pass">
-	<para>The password used to authenticate with the
-	  <acronym>ISP</acronym>.</para>
-      </callout>
-    </calloutlist>
-
-    <para>The <filename>mpd.links</filename> file contains information
-      about the link, or links, to establish.  This
-      <filename>mpd.links</filename> would accompany the above
-      example:</para>
-
-    <programlisting>adsl:
-    set link type pptp
-    set pptp mode active
-    set pptp enable originate outcall
-    set pptp self <replaceable>10.0.0.1</replaceable> <co
-    id="co-mpd-ex-self"/>
-    set pptp peer <replaceable>10.0.0.138</replaceable> <co
-    id="co-mpd-ex-peer"/></programlisting>
-
-    <calloutlist>
-      <callout arearefs="co-mpd-ex-self">
-	<para>The IP address of the &os; computer running
-	  <application>mpd</application>.</para>
-      </callout>
-      <callout arearefs="co-mpd-ex-peer">
-	<para>The IP address of the ADSL modem.  For the Alcatel
-	  &speedtouch; Home this address defaults to <hostid
-	    role="ipaddr">10.0.0.138</hostid>.</para>
-      </callout>
-    </calloutlist>
+      <para>The installation of the port places a set of well
+	commented, sample
+	configuration files in <filename
+	  class="directory">/usr/local/etc/mpd5/</filename>.  Copy
+	<filename>mpd.conf.sample</filename>, removing the
+	<literal>.sample</literal> extension, and edit it to suit the
+	requirements and provider settings.  A complete configuration
+	guide in HTML format is installed to <filename
+	  class="directory">/usr/local/share/doc/mpd5/</filename>.</para>
 
-    <para>It is possible to initialize the connection easily by
-      issuing the following command as
+    <para>After saving the edits,
+      initialize the connection as
       <username>root</username>:</para>
 
-    <screen>&prompt.root; <userinput>mpd -b <replaceable>adsl</replaceable></userinput></screen>
+    <screen>&prompt.root; <userinput>service mpd5 start</userinput></screen>
 
     <para>To see the status of the connection, use:</para>
 
@@ -1921,19 +1876,21 @@ ng0: flags=88d1&lt;UP,POINTOPOINT,RUNNIN
      inet 216.136.204.117 --> 204.152.186.171 netmask 0xffffffff</screen>
 
     <para>Using <application>mpd</application> is the recommended
-      way to connect to an ADSL service with &os;.</para>
+      way to connect to an <acronym>ADSL</acronym> service with
+      &os;.</para>
 
   </sect2>
 
   <sect2>
-    <title>Using pptpclient</title>
+    <title>Using <application>pptpclient</application></title>
 
     <para>It is also possible to use &os; to connect to other
       <acronym>PPPoA</acronym> services using <filename
 	role="package">net/pptpclient</filename>.</para>
 
     <para>To use <filename role="package">net/pptpclient</filename>
-      to connect to a DSL service, install the port or package and
+      to connect to a <acronym>DSL</acronym> service, install the port
+      or package and
       edit <filename>/etc/ppp/ppp.conf</filename> as
       <username>root</username>.  An example section of
       <filename>ppp.conf</filename> is given below.  For further
@@ -1951,7 +1908,8 @@ ng0: flags=88d1&lt;UP,POINTOPOINT,RUNNIN
 
     <calloutlist>
       <callout arearefs="co-pptp-ex-user">
-	<para>The username of the account with the DSL
+	<para>The username of the account with the
+	  <acronym>DSL</acronym>
 	  provider.</para>
       </callout>
 
@@ -1973,8 +1931,11 @@ ng0: flags=88d1&lt;UP,POINTOPOINT,RUNNIN
       </warning>
 
       <para>This will open a tunnel for a <acronym>PPP</acronym>
-	session to the DSL router.  Ethernet DSL modems have a
-	preconfigured LAN IP address to connect to.  In the case of
+	session to the <acronym>DSL</acronym> router.  Ethernet
+	<acronym>DSL</acronym> modems have a
+	preconfigured <acronym>LAN</acronym> <acronym>IP</acronym>
+	address to connect to.

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

From owner-svn-doc-projects@FreeBSD.ORG  Thu May  9 20:51:47 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 4F2CDF3;
 Thu,  9 May 2013 20:51:47 +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 3F608131;
 Thu,  9 May 2013 20:51:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r49Kpkgm035674;
 Thu, 9 May 2013 20:51:46 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r49Kpk2U035673;
 Thu, 9 May 2013 20:51:46 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201305092051.r49Kpk2U035673@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 9 May 2013 20:51:46 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41582 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ppp-and-slip
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: Thu, 09 May 2013 20:51:47 -0000

Author: dru
Date: Thu May  9 20:51:46 2013
New Revision: 41582
URL: http://svnweb.freebsd.org/changeset/doc/41582

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/ppp-and-slip/chapter.xml

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Thu May  9 18:37:36 2013	(r41581)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Thu May  9 20:51:46 2013	(r41582)
@@ -122,7 +122,7 @@
 	  </indexterm>
 	  <listitem>
 	    <para>An account with an Internet Service Provider
-	    (<acronym>ISP</acronym>) for connecting using
+	      (<acronym>ISP</acronym>) for connecting using
 	      <acronym>PPP</acronym>.</para>
 	  </listitem>
 
@@ -166,16 +166,14 @@
 	    </indexterm>
 
 	    <para>The <acronym>IP</acronym> address of one or more
-	      name servers.
-	      Normally, the <acronym>ISP</acronym> will provide the
-	      addresses for two 
+	      name servers.  Normally, the <acronym>ISP</acronym>
+	      will provide the addresses for two
 	      <acronym>DNS</acronym> servers.  If it has not,
 	      include <command>enable dns</command> in
-	      <filename>ppp.conf</filename> and
-	      &man.ppp.8; will set the name servers.  This
-	      feature requires the <acronym>ISP</acronym>'s
-	      <acronym>PPP</acronym> implementation to support DNS
-	      negotiation.</para>
+	      <filename>ppp.conf</filename> and &man.ppp.8; will set
+	      the name servers.  This feature requires the
+	      <acronym>ISP</acronym>'s <acronym>PPP</acronym>
+	      implementation to support DNS negotiation.</para>
 	  </listitem>
 	</itemizedlist>
 
@@ -186,17 +184,15 @@
 	<itemizedlist>
 	  <listitem>
 	    <para>The <acronym>IP</acronym> address of the
-	      <acronym>ISP</acronym>'s
-	      gateway.  The gateway is the machine to connect to
-	      and will be set up as the <emphasis>default
-		route</emphasis>.  When in doubt, make one up and the
-	      <acronym>ISP</acronym>'s <acronym>PPP</acronym> server
-	      will set the correct value during connection
-	      setup.</para>
+	      <acronym>ISP</acronym>'s gateway.  The gateway is the
+	      machine to connect to and will be set up as the
+	      <emphasis>default route</emphasis>.  When in doubt,
+	      make one up and the <acronym>ISP</acronym>'s
+	      <acronym>PPP</acronym> server will set the correct
+	      value during connection setup.</para>
 
 	    <para>This <acronym>IP</acronym> number is referred to as
-	      <literal>HISADDR</literal> by
-	      &man.ppp.8;.</para>
+	      <literal>HISADDR</literal> by &man.ppp.8;.</para>
 	  </listitem>
 
 	  <listitem>
@@ -211,9 +207,9 @@
 	    </indexterm>
 
 	    <para>If the <acronym>ISP</acronym> provides a static
-	      <acronym>IP</acronym>
-	      address and hostname, enter it.  Otherwise, let the peer
-	      assign the <acronym>IP</acronym> address.</para>
+	      <acronym>IP</acronym> address and hostname, enter it.
+	      Otherwise, let the peer assign the <acronym>IP</acronym>
+	      address.</para>
 	  </listitem>
 	</itemizedlist>
 
@@ -242,15 +238,13 @@
 
 	<para>Several files located in <filename
 	    class="directory">/etc/ppp</filename> are used to
-	  configure &man.ppp.8;.
-	  Examples can be found in <filename
+	  configure &man.ppp.8;.  Examples can be found in <filename
 	    class="directory">/usr/share/examples/ppp/</filename>.</para>
 
-	<para>Configuring &man.ppp.8; requires a number of
-	  files to be edited, depending on the requirements and
-	  whether the <acronym>ISP</acronym> allocates
-	  <acronym>IP</acronym> addresses
-	  statically or dynamically.</para>
+	<para>Configuring &man.ppp.8; requires a number of files to
+	  be edited, depending on the requirements and whether the
+	  <acronym>ISP</acronym> allocates <acronym>IP</acronym>
+	  addresses statically or dynamically.</para>
 
 	<sect4 id="userppp-staticIP">
 	  <title><acronym>PPP</acronym> and Static
@@ -297,9 +291,8 @@
 
 	      <listitem>
 		<para>Identifies the default entry.  Commands in this
-		  entry are executed automatically when
-		  &man.ppp.8; is
-		  run.</para>
+		  entry are executed automatically when &man.ppp.8;
+		  is run.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -337,9 +330,7 @@
 		<para>Identifies the device to which the modem is
 		  connected.  <devicename>COM1</devicename> is
 		  <filename class="devicefile">/dev/cuau0</filename>
-		  and
-		  <devicename>COM2</devicename> is
-		  <filename
+		  and <devicename>COM2</devicename> is <filename
 		    class="devicefile">/dev/cuau1</filename>.</para>
 	      </listitem>
 	    </varlistentry>
@@ -451,9 +442,9 @@
 		  values are referred to by the <command>set
 		    login</command> command using the \U and \P
 		  variables.  When connecting using
-		  <acronym>PAP</acronym>
-		  or <acronym>CHAP</acronym>, these
-		  values are used at authentication time.</para>
+		  <acronym>PAP</acronym> or
+		  <acronym>CHAP</acronym>, these values are used at
+		  authentication time.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -464,8 +455,7 @@
 		<indexterm><primary>PAP</primary></indexterm>
 		<indexterm><primary>CHAP</primary></indexterm>
 		<para>When using <acronym>PAP</acronym> or
-		  <acronym>CHAP</acronym>,
-		  there will be no login
+		  <acronym>CHAP</acronym>, there will be no login
 		  and this line should be commented out or removed.
 		  See <xref linkend="userppp-PAPnCHAP"/> for further
 		  details.</para>
@@ -511,19 +501,17 @@ protocol: ppp</screen>
 		<para>Sets the interface addresses.  The string
 		  <replaceable>x.x.x.x</replaceable> should be
 		  replaced by the <acronym>IP</acronym> address the
-		  provider has
-		  allocated.  The string
+		  provider has allocated.  The string
 		  <replaceable>y.y.y.y</replaceable> should be
 		  replaced by the <acronym>IP</acronym> address of the
 		  <acronym>ISP</acronym>'s gateway.  If the ISP has
 		  not provided a gateway address, use <hostid
-		  role="netmask">10.0.0.2/0</hostid>.  When using a
+		    role="netmask">10.0.0.2/0</hostid>.  When using a
 		  <quote>guessed</quote> address, make sure to create
 		  an entry in
 		  <filename>/etc/ppp/ppp.linkup</filename> as per the
 		  instructions in <xref linkend="userppp-dynamicIP"/>.
-		  If this line is
-		  omitted, &man.ppp.8; cannot run in
+		  If this line is omitted, &man.ppp.8; cannot run in
 		  <option>-auto</option> mode.</para>
 	      </listitem>
 	    </varlistentry>
@@ -551,7 +539,7 @@ protocol: ppp</screen>
 	    <filename>ppp.linkup</filename> when using a static
 	    <acronym>IP</acronym> address with &man.ppp.8; in
 	    <option>-auto</option> mode as the routing table entries
-	    are already correct before a connection is established. 
+	    are already correct before a connection is established.
 	    However, an entry can be created to invoke programs after
 	    connection.  This is explained later with the sendmail
 	    example.</para>
@@ -577,18 +565,16 @@ protocol: ppp</screen>
 	  </indexterm>
 
 	  <para>If the service provider does not assign static
-	    <acronym>IP</acronym>
-	    addresses, &man.ppp.8; can be configured to
-	    negotiate the local and remote addresses.  This is done by
-	    <quote>guessing</quote> an <acronym>IP</acronym> address
-	    and allowing
-	    &man.ppp.8; to set it up correctly using the
+	    <acronym>IP</acronym> addresses, &man.ppp.8; can be
+	    configured to negotiate the local and remote addresses.
+	    This is done by <quote>guessing</quote> an
+	    <acronym>IP</acronym> address and allowing &man.ppp.8;
+	    to set it up correctly using the
 	    <acronym>IP</acronym>
 	    Configuration Protocol (<acronym>IPCP</acronym>) after
-	    connecting.  The
-	    <filename>ppp.conf</filename> configuration is the same as
-	    that described in <xref linkend="userppp-staticIP"/>, with
-	    the following
+	    connecting.  The <filename>ppp.conf</filename>
+	    configuration is the same as that described in <xref
+	      linkend="userppp-staticIP"/>, with the following
 	    change:</para>
 
 	  <programlisting>17      set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.255 0.0.0.0</programlisting>
@@ -606,8 +592,7 @@ protocol: ppp</screen>
 		  character is the number of bits of the address that
 		  &man.ppp.8; will insist on.  These
 		  <acronym>IP</acronym> numbers can be replaced, but
-		  the above example
-		  will always work.</para>
+		  the above example will always work.</para>
 
 		<para>The last argument (<literal>0.0.0.0</literal>)
 		  tells <acronym>PPP</acronym> to start negotiations
@@ -626,10 +611,9 @@ protocol: ppp</screen>
 	    create an entry in
 	    <filename>/etc/ppp/ppp.linkup</filename>.
 	    <filename>ppp.linkup</filename> is used after a connection
-	    has been established.  At this point,
-	    &man.ppp.8; will have assigned the interface
-	    addresses and it will now be possible to add the routing
-	    table entries:</para>
+	    has been established.  At this point, &man.ppp.8; will
+	    have assigned the interface addresses and it will now be
+	    possible to add the routing table entries:</para>
 
 	  <programlisting>1     provider:
 2      add default HISADDR</programlisting>
@@ -639,15 +623,15 @@ protocol: ppp</screen>
 	      <term>Line 1:</term>
 
 	      <listitem>
-		<para>On establishing a connection,
-		  &man.ppp.8; will look for an entry in
-		  <filename>ppp.linkup</filename> according to the
-		  following rules. First, try to match the same label
-		  used in <filename>ppp.conf</filename>.  If
-		  that fails, look for an entry for the four-octet
-		  <acronym>IP</acronym> address of
-		  the gateway.  If an entry is still not found, look
-		  for the <literal>MYADDR</literal> entry.</para>
+		<para>On establishing a connection, &man.ppp.8; will
+		  look for an entry in <filename>ppp.linkup</filename>
+		  according to the following rules.  First, try to
+		  match the same label used in
+		  <filename>ppp.conf</filename>.  If that fails, look
+		  for an entry for the four-octet
+		  <acronym>IP</acronym> address of the gateway.  If
+		  an entry is still not found, look for the
+		  <literal>MYADDR</literal> entry.</para>
 	      </listitem>
 	    </varlistentry>
 
@@ -655,13 +639,11 @@ protocol: ppp</screen>
 	      <term>Line 2:</term>
 
 	      <listitem>
-		<para>This line tells &man.ppp.8; to add a
-		  default route that points to
-		  <literal>HISADDR</literal>.
+		<para>This line tells &man.ppp.8; to add a default
+		  route that points to <literal>HISADDR</literal>.
 		  <literal>HISADDR</literal> will be replaced with the
 		  <acronym>IP</acronym> number of the gateway as
-		  negotiated by
-		  <acronym>IPCP</acronym>.</para>
+		  negotiated by <acronym>IPCP</acronym>.</para>
 	      </listitem>
 	    </varlistentry>
 	  </variablelist>
@@ -681,14 +663,12 @@ protocol: ppp</screen>
 	    <secondary>receiving incoming calls</secondary>
 	  </indexterm>
 
-	  <para>When configuring &man.ppp.8; to receive
-	    incoming calls on a machine connected to a
-	    <acronym>LAN</acronym>, decide if
-	    packets should be forwarded to the local network.
-	    If so, allocate
+	  <para>When configuring &man.ppp.8; to receive incoming
+	    calls on a machine connected to a
+	    <acronym>LAN</acronym>, decide if packets should be
+	    forwarded to the local network.  If so, allocate
 	    the peer an <acronym>IP</acronym> number from the local
-	    subnet and use
-	    <command>enable proxy</command> in
+	    subnet and use <command>enable proxy</command> in
 	    <filename>/etc/ppp/ppp.conf</filename>.  Also, confirm
 	    that <filename>/etc/rc.conf</filename> contains the
 	    following:</para>
@@ -704,36 +684,32 @@ protocol: ppp</screen>
 
 	  <para>An alternative to &man.getty.8; is <ulink
 	      url="http://mgetty.greenie.net/">mgetty</ulink>, a
-	    smarter version of &man.getty.8;
-	    designed with dialup lines in mind.  It can be installed
-	    from the <filename
+	    smarter version of &man.getty.8; designed with dialup
+	    lines in mind.  It can be installed from the <filename
 	      role="package">comms/mgetty+sendfax</filename> package
 	    or port.</para>
 
-	  <para>The advantages of using &man.getty.8; is
-	    that it actively <emphasis>talks</emphasis> to modems.
-	    If the port is turned off in
+	  <para>The advantages of using &man.getty.8; is that it
+	    actively <emphasis>talks</emphasis> to modems.  If the
+	    port is turned off in
 	    <filename>/etc/ttys</filename>, the modem will not answer
 	    the phone.</para>
 
-	  <para>The &os; version of &man.getty.8;
-	    supports the automatic detection of
-	    <acronym>PPP</acronym> streams, allowing clients
-	    scriptless access to the server.</para>
-
-	  <para>Refer to <xref linkend="userppp-mgetty"/>
-	      for more information on
-	    &man.getty.8;.</para>
+	  <para>The &os; version of &man.getty.8; supports the
+	    automatic detection of <acronym>PPP</acronym> streams,
+	    allowing clients scriptless access to the server.</para>
+
+	  <para>Refer to <xref linkend="userppp-mgetty"/> for more
+	    information on &man.getty.8;.</para>
 	</sect4>
 
 	<sect4>
 	  <title><acronym>PPP</acronym> Permissions</title>
 
-	  <para>Typically, &man.ppp.8; is
-	    run as the <username>root</username> user.  To give a
-	    user permission to run &man.ppp.8; in server
-	    mode, add their user account to the
-	    <groupname>network</groupname> group in
+	  <para>Typically, &man.ppp.8; is run as the
+	    <username>root</username> user.  To give a user permission
+	    to run &man.ppp.8; in server mode, add their user account
+	    to the <groupname>network</groupname> group in
 	    <filename>/etc/group</filename>.</para>
 
 	  <para>Then, give the account access to one or more sections
@@ -749,8 +725,7 @@ protocol: ppp</screen>
 
 	<sect4>
 	  <title><acronym>PPP</acronym> Shells for
-	    Dynamic-<acronym>IP</acronym>
-	    Users</title>
+	    Dynamic-<acronym>IP</acronym> Users</title>
 
 	  <indexterm>
 	    <primary>PPP shells</primary>
@@ -803,8 +778,7 @@ exec /usr/sbin/ppp -direct $IDENT</progr
 
 	  <sect4>
 	    <title><acronym>PPP</acronym> Shells for
-	      Static-<acronym>IP</acronym>
-	      Users</title>
+	      Static-<acronym>IP</acronym> Users</title>
 
 	    <indexterm>
 	      <primary>PPP shells</primary>
@@ -858,8 +832,8 @@ ttyu1:
 	      <filename>/etc/ttys</filename> create an entry similar
 	      to the one for <literal>ttyu0:</literal> above.  Each
 	      line should get a unique <acronym>IP</acronym> address
-	      from the pool of
-	      <acronym>IP</acronym> addresses for dynamic users.</para>
+	      from the pool of <acronym>IP</acronym> addresses for
+	      dynamic users.</para>
 	  </sect4>
 
 	  <sect4>
@@ -883,10 +857,9 @@ mary:
 	    <para>The file <filename>/etc/ppp/ppp.linkup</filename>
 	      should also contain routing information for each static
 	      <acronym>IP</acronym> user if required.  The line below
-	      would add a route
-	      for the <hostid role="ipaddr">203.14.101.0/24</hostid>
-	      network via the client's <acronym>PPP</acronym>
-	      link.</para>
+	      would add a route for the <hostid
+		role="ipaddr">203.14.101.0/24</hostid> network via
+	      the client's <acronym>PPP</acronym> link.</para>
 
 	    <programlisting>fred:
   add 203.14.101.0 netmask 255.255.255.0 HISADDR
@@ -916,13 +889,12 @@ mary:
 	  <para>By default the <filename
 	      role="package">comms/mgetty+sendfax</filename> port
 	    comes with the <literal>AUTO_PPP</literal> option enabled
-	    allowing &man.getty.8; to detect the LCP
-	    phase of <acronym>PPP</acronym> connections and
-	    automatically spawn off a &man.ppp.8; shell.
-	    However, since the default login/password sequence does
-	    not occur it is necessary to authenticate users using
-	    either <acronym>PAP</acronym> or
-	    <acronym>CHAP</acronym>.</para>
+	    allowing &man.getty.8; to detect the LCP phase of
+	    <acronym>PPP</acronym> connections and automatically
+	    spawn off a &man.ppp.8; shell.  However, since the default
+	    login/password sequence does not occur it is necessary
+	    to authenticate users using either <acronym>PAP</acronym>
+	    or <acronym>CHAP</acronym>.</para>
 
 	  <para>This section assumes the user has successfully
 	    compiled, and installed the <filename
@@ -965,9 +937,9 @@ exec /usr/sbin/ppp -direct pap$IDENT</pr
 	  <programlisting>enable passwdauth</programlisting>
 
 	  <para>To assign some users a static <acronym>IP</acronym>,
-	    specify the <acronym>IP</acronym>
-	    address as the third argument in
-	    <filename>/etc/ppp/ppp.secret</filename>.  See
+	    specify the <acronym>IP</acronym> address as the third
+	    argument in <filename>/etc/ppp/ppp.secret</filename>.
+	    See
 	    <filename>/usr/share/examples/ppp/ppp.secret.sample</filename>
 	    for examples.</para>
 	</sect4>
@@ -1027,18 +999,15 @@ set nbns 203.14.100.5</programlisting>
 	  <para>Some <acronym>ISP</acronym>s set their system up so
 	    that the authentication part of the connection is done
 	    using either the <acronym>PAP</acronym> or
-	    <acronym>CHAP</acronym>
-	    authentication mechanism.  If
+	    <acronym>CHAP</acronym> authentication mechanism.  If
 	    this is the case, the <acronym>ISP</acronym> will not give
 	    a <prompt>login:</prompt> during connection, but will
 	    start talking <acronym>PPP</acronym>
 	    immediately.</para>
 
 	  <para>While <acronym>PAP</acronym> is less secure than
-	    <acronym>CHAP</acronym>,
-	    security is not
-	    normally an issue as the clear text passwords are
-	    transmitted down a
+	    <acronym>CHAP</acronym>, security is not normally an
+	    issue as the clear text passwords are transmitted down a
 	    serial line only.  There is not much room for crackers
 	    to <quote>eavesdrop</quote>.</para>
 
@@ -1057,8 +1026,8 @@ set nbns 203.14.100.5</programlisting>
 
 	      <listitem>
 		<para>This line specifies the
-		  <acronym>PAP/CHAP</acronym> user name.
-		  Insert the correct value for
+		  <acronym>PAP/CHAP</acronym> user name.  Insert the
+		  correct value for
 		  <replaceable>MyUserName</replaceable>.</para>
 	      </listitem>
 	    </varlistentry>
@@ -1069,9 +1038,8 @@ set nbns 203.14.100.5</programlisting>
 		<indexterm><primary>password</primary></indexterm>
 
 		<para>This line specifies the
-		  <acronym>PAP/CHAP</acronym>
-		  password.
-		  Insert the correct value for
+		  <acronym>PAP/CHAP</acronym> password.  Insert the
+		  correct value for
 		  <replaceable>MyPassword</replaceable>.  An
 		  additional line can be added, such as:</para>
 
@@ -1083,9 +1051,7 @@ set nbns 203.14.100.5</programlisting>
 
 		<para>to make it obvious that this is the intention,
 		  but <acronym>PAP</acronym> and
-		  <acronym>CHAP</acronym>
-		  are both accepted
-		  by
+		  <acronym>CHAP</acronym> are both accepted by
 		  default.</para>
 	      </listitem>
 	    </varlistentry>
@@ -1098,8 +1064,7 @@ set nbns 203.14.100.5</programlisting>
 		  require a login into the server when using
 		  <acronym>PAP</acronym> or
 		  <acronym>CHAP</acronym>.  Therefore, disable the
-		  <quote>set
-		    login</quote> string.</para>
+		  <quote>set login</quote> string.</para>
 	      </listitem>
 	    </varlistentry>
 	  </variablelist>
@@ -1109,10 +1074,10 @@ set nbns 203.14.100.5</programlisting>
 	  <title>Changing the &man.ppp.8; Configuration
 	    on the Fly</title>
 
-	  <para>It is possible to talk to &man.ppp.8;
-	    while it is running in the background, but only
-	    if a suitable diagnostic port has been set up.  To do
-	    this, add the following line to the configuration:</para>
+	  <para>It is possible to talk to &man.ppp.8; while it is
+	    running in the background, but only if a suitable
+	    diagnostic port has been set up.  To do this, add the
+	    following line to the configuration:</para>
 
 	  <programlisting>set server /var/run/ppp-tun<replaceable>%d</replaceable> DiagnosticPassword 0177</programlisting>
 
@@ -1169,8 +1134,8 @@ nat port tcp 10.0.0.2:http http</program
 	  <primary>PPP</primary><secondary>configuration</secondary>
 	</indexterm>
 
-	<para>Now that &man.ppp.8; is configured, there are
-	  a few more things to edit in
+	<para>Now that &man.ppp.8; is configured, there are a few
+	  more things to edit in
 	  <filename>/etc/rc.conf</filename>.</para>
 
 	<para>Working from the top down in this file, make sure the
@@ -1179,9 +1144,8 @@ nat port tcp 10.0.0.2:http http</program
 	<programlisting>hostname="foo.example.com"</programlisting>
 
 	<para>If the <acronym>ISP</acronym> has supplied a static
-	  <acronym>IP</acronym>
-	  address and name, it is recommended to use this name as the
-	  host name.</para>
+	  <acronym>IP</acronym> address and name, it is recommended
+	  to use this name as the host name.</para>
 
 	<para>Look for the <literal>network_interfaces</literal>
 	  variable.  To configure the system to dial the
@@ -1218,31 +1182,30 @@ ifconfig_tun0=</programlisting>
 	  <primary><application>routed</application></primary>
 	</indexterm>
 
-	<para>It is important that the &man.routed.8;
-	  daemon is not started, as &man.routed.8; tends
-	  to delete the default routing table entries created by
-	  &man.ppp.8;.</para>
+	<para>It is important that the &man.routed.8; daemon is not
+	  started, as &man.routed.8; tends to delete the default
+	  routing table entries created by &man.ppp.8;.</para>
 
 	<para>It is probably a good idea to ensure that the
 	  <literal>sendmail_flags</literal> line does not include
-	  <option>-q</option>; otherwise,
-	  &man.sendmail.8; will attempt to do a network
-	  lookup every now and then, possibly causing the machine
-	  to dial out.  Try this command instead:</para>
+	  <option>-q</option>; otherwise, &man.sendmail.8; will
+	  attempt to do a network lookup every now and then, possibly
+	  causing the machine to dial out.  Try this command
+	  instead:</para>
 
 	<programlisting>sendmail_flags="-bd"</programlisting>
 
 	<indexterm>
 	  <primary><application>Sendmail</application></primary>
 	</indexterm>
-	<para>The downside is that &man.sendmail.8; must be
-	  forced to re-examine the mail queue whenever the
+	<para>The downside is that &man.sendmail.8; must be forced
+	  to re-examine the mail queue whenever the
 	  <acronym>PPP</acronym> link is up by typing:</para>
 
 	<screen>&prompt.root; <userinput>/usr/sbin/sendmail -q</userinput></screen>
 
-	<para>To automatically use <command>!bg</command>
-	  in <filename>ppp.linkup</filename>:</para>
+	<para>To automatically use <command>!bg</command> in
+	  <filename>ppp.linkup</filename>:</para>
 
 	<programlisting>1     provider:
 2       delete ALL
@@ -1264,8 +1227,8 @@ ifconfig_tun0=</programlisting>
 
 	<para>and then <command>dial provider</command> to start the
 	  <acronym>PPP</acronym> session, or, to configure
-	  &man.ppp.8; to establish sessions automatically
-	  when there is outbound traffic and there is no existing
+	  &man.ppp.8; to establish sessions automatically when there
+	  is outbound traffic and there is no existing
 	  <filename>start_if.tun0</filename> script, type:</para>
 
 	<screen>&prompt.root; <userinput>ppp -auto provider</userinput></screen>
@@ -1324,8 +1287,7 @@ ifconfig_tun0=</programlisting>
 	  </step>
 
 	  <step>
-	    <para>Ensure that the
-	      <filename
+	    <para>Ensure that the <filename
 		class="devicefile">tun<replaceable>N</replaceable></filename>
 	      device file is available in the <filename
 		class="directory">/dev</filename> directory.</para>
@@ -1384,12 +1346,11 @@ ifconfig_tun0=</programlisting>
       using <acronym>PPP</acronym> over a modem connection.  Some
       <acronym>ISP</acronym>s present the
       <literal>ssword</literal> prompt, and others will present
-      <literal>password</literal>; if the &man.ppp.8;
-      script is not written accordingly, the login attempt will
-      fail.  The most common way to debug &man.ppp.8;
-      connections is by connecting manually.  The following
-      information walks through a manual connection step by
-      step.</para>
+      <literal>password</literal>; if the &man.ppp.8; script is not
+      written accordingly, the login attempt will fail.  The most
+      common way to debug &man.ppp.8; connections is by connecting
+      manually.  The following information walks through a manual
+      connection step by step.</para>
 
     <sect2>
       <title>Check the Device Nodes</title>
@@ -1401,9 +1362,8 @@ ifconfig_tun0=</programlisting>
 
       <para>The <devicename>uart</devicename> device is already
 	included in the <literal>GENERIC</literal> kernel, so no
-	additional steps are necessary in this case.  Just
-	check the &man.dmesg.8; output for the modem
-	device with:</para>
+	additional steps are necessary in this case.  Just check the
+	&man.dmesg.8; output for the modem device with:</para>
 
       <screen>&prompt.root; <userinput>dmesg | grep uart</userinput></screen>
 
@@ -1420,19 +1380,18 @@ ifconfig_tun0=</programlisting>
       <title>Connecting Manually</title>
 
       <para>Connecting to the Internet by manually controlling
-	&man.ppp.8; is quick, easy, and a great way to
-	debug a connection or just get information on how the
+	&man.ppp.8; is quick, easy, and a great way to debug a
+	connection or just get information on how the
 	<acronym>ISP</acronym> treats &man.ppp.8; client
 	connections.  The following examples use
 	<emphasis>example</emphasis> as the hostname of the
-	machine running &man.ppp.8;.  To start
-	&man.ppp.8;:</para>
+	machine running &man.ppp.8;.  To start &man.ppp.8;:</para>
 
       <screen>&prompt.root; <userinput>ppp</userinput></screen>
 
       <para>This sets the modem device to
 	<devicename>cuau1</devicename>:</para>
-	
+
       <screen>ppp ON example&gt; <userinput>set device <filename class="devicefile">/dev/cuau1</filename></userinput></screen>
 
       <para>This sets the connection speed to 115,200
@@ -1440,16 +1399,15 @@ ifconfig_tun0=</programlisting>
 
       <screen>ppp ON example&gt; <userinput>set speed 115200</userinput></screen>
 
-      <para>This tells &man.ppp.8; to configure the
-	resolver and add the nameserver lines to
-	<filename>/etc/resolv.conf</filename>.  If
-	&man.ppp.8; cannot determine the hostname, it can
-	manually be set later.</para>
+      <para>This tells &man.ppp.8; to configure the resolver and add
+	the nameserver lines to
+	<filename>/etc/resolv.conf</filename>.  If &man.ppp.8; cannot
+	determine the hostname, it can manually be set later.</para>
 
       <screen>ppp ON example&gt; <userinput>enable dns</userinput></screen>
 
-      <para>Switch to <quote>terminal</quote> mode to
-	manually control the modem.</para>
+      <para>Switch to <quote>terminal</quote> mode to manually
+	control the modem.</para>
 
       <screen>ppp ON example&gt; <userinput>term</userinput></screen>
 
@@ -1460,16 +1418,15 @@ type '~h' for help</programlisting>
 OK
 <userinput>atdt<replaceable>123456789</replaceable></userinput></screen>
 
-      <para>Use &man.at.1; to initialize the modem,
-	then type <command>atdt</command> and the number for the
+      <para>Use &man.at.1; to initialize the modem, then type
+	<command>atdt</command> and the number for the
 	<acronym>ISP</acronym> to begin the dial in process.</para>
 
       <screen>CONNECT</screen>
 
       <para>This message confirms the connection.  If there are
 	any connection problems, unrelated to hardware, this is the
-	time to
-	attempt to resolve them.</para>
+	time to attempt to resolve them.</para>
 
       <screen>ISP Login:<userinput>myusername</userinput></screen>
 
@@ -1479,25 +1436,23 @@ OK
 
       <screen>ISP Pass:<userinput>mypassword</userinput></screen>
 
-      <para>At this password prompt,
-	enter the password that was provided by the
-	<acronym>ISP</acronym>.  Just like logging into
-	&os;, the password will not echo.</para>
+      <para>At this password prompt, enter the password that was
+	provided by the <acronym>ISP</acronym>.  Just like logging
+	into &os;, the password will not echo.</para>
 
       <screen>Shell or PPP:<userinput>ppp</userinput></screen>
 
       <para>Depending on the <acronym>ISP</acronym>, this prompt
 	may never appear.  If it does, it provides a choice to
-	use a shell on the provider or to start
-	&man.ppp.8;.  This example chooses
-	to use &man.ppp.8; in order to create an Internet
-	connection.</para>
+	use a shell on the provider or to start &man.ppp.8;.  This
+	example chooses to use &man.ppp.8; in order to create an
+	Internet connection.</para>
 
       <screen>Ppp ON example&gt;</screen>
 
-      <para>In this example, the first <option>p</option>
-	has been capitalized.  This indicates a successful
-	connection to the <acronym>ISP</acronym>.</para>
+      <para>In this example, the first <option>p</option> has been
+	capitalized.  This indicates a successful connection to the
+	<acronym>ISP</acronym>.</para>
 
       <screen>PPp ON example&gt;</screen>
 
@@ -1508,15 +1463,14 @@ OK
 
       <screen>PPP ON example&gt;</screen>
 
-      <para>This indicates an <acronym>IP</acronym>
-	address has been assigned and the
-	connection has successfully completed.</para>
+      <para>This indicates an <acronym>IP</acronym> address has been
+	assigned and the connection has successfully completed.</para>
 
       <screen>PPP ON example&gt;<userinput>add default HISADDR</userinput></screen>
 
       <para>This adds a default route which is needed for successful
-	communication.  Until this is added, the only
-	established connection is with the peer.  If this fails due to
+	communication.  Until this is added, the only established
+	connection is with the peer.  If this fails due to
 	existing routes, put a bang character
 	(<literal>!</literal>) in front of the <option>add</option>.
 	Alternatively, set this before making the actual connection
@@ -1529,8 +1483,8 @@ OK
 	<keycap>z</keycap></keycombo>.  If
 	<literal>PPP</literal> instead returns to
 	<literal>ppp</literal>, the connection has been lost.  An
-	uppercase <literal>P</literal> indicates a
-	connection to the <acronym>ISP</acronym> and a lowercase
+	uppercase <literal>P</literal> indicates a connection to the
+	<acronym>ISP</acronym> and a lowercase
 	<literal>p</literal> indicates that the connection has been
 	lost.  &man.ppp.8; only has these 2 states.</para>
 
@@ -1541,12 +1495,12 @@ OK
 	  turn hardware flow <acronym>CTS/RTS</acronym> to off with
 	  <option>set ctsrts off</option>.  This can occur when
 	  connected to some <acronym>PPP</acronym> capable
-	  terminal servers as &man.ppp.8; hangs
-	  when it tries to write data to the communication link and
-	  then waits for a Clear To Send (<acronym>CTS</acronym>)
-	  signal which may never come.  When using this option,
-	  include <option>set accmap</option>, which may be required
-	  to defeat hardware which is dependent on passing certain
+	  terminal servers as &man.ppp.8; hangs when it tries to
+	  write data to the communication link and then waits for a
+	  Clear To Send (<acronym>CTS</acronym>) signal which may
+	  never come.  When using this option, include
+	  <option>set accmap</option>, which may be required to
+	  defeat hardware which is dependent on passing certain
 	  characters from end to end, such as XON/XOFF.  See
 	  &man.ppp.8; for more information on how this option is
 	  used.</para>
@@ -1558,20 +1512,19 @@ OK
 	  <acronym>ISP</acronym>s.  This option may be needed for
 	  the Compuserve <acronym>ISP</acronym>.</para>
 
-	<para>&man.ppp.8; may not return to the
-	  command mode, which is usually a negotiation error where
-	  the <acronym>ISP</acronym> is waiting for your side to start
+	<para>&man.ppp.8; may not return to the command mode, which
+	  is usually a negotiation error where the
+	  <acronym>ISP</acronym> is waiting for your side to start
 	  negotiating.  At this point, using <command>~p</command>
-	  will force &man.ppp.8; to start
-	  sending the configuration information.</para>
+	  will force &man.ppp.8; to start sending the configuration
+	  information.</para>
 
 	<para>If a login prompt never appears, try using
 	  <acronym>PAP</acronym> or <acronym>CHAP</acronym>
 	  authentication instead of the &unix; style in the example
 	  above.  To use <acronym>PAP</acronym> or
 	  <acronym>CHAP</acronym>, add the following options to
-	  &man.ppp.8; before going into terminal
-	  mode:</para>
+	  &man.ppp.8; before going into terminal mode:</para>
 
 	<screen>ppp ON example&gt; <userinput>set authname <replaceable>myusername</replaceable></userinput></screen>
 
@@ -1605,8 +1558,8 @@ nameserver <replaceable>y.y.y.y</replace
 	  the <acronym>IP</acronym> address of the
 	  <acronym>ISP</acronym>'s DNS servers.</para>
 
-	<para>To configure &man.syslog.3; to log
-	  &man.ppp.8; connections, add:</para>
+	<para>To configure &man.syslog.3; to log &man.ppp.8;
+	  connections, add:</para>
 
 	<programlisting>!ppp
 *.*     /var/log/ppp.log</programlisting>
@@ -1726,34 +1679,33 @@ ppp_profile="name_of_service_provider"</
 	<acronym>PPPoE</acronym> configuration entry in
 	<filename>ppp.conf</filename> as the provider part of
 	<command>set device</command>, as described in &man.ppp.8;.
-	It should look like
-	this:</para>
+	It should look like this:</para>
 
       <programlisting>set device PPPoE:<replaceable>xl1</replaceable>:<replaceable>ISP</replaceable></programlisting>
 
       <para>Do not forget to change <replaceable>xl1</replaceable>
 	to the proper device for the Ethernet card.</para>
+
       <para>Do not forget to change <replaceable>ISP</replaceable>
 	to the profile found above.</para>
 
       <para>For additional information, see <ulink
-	      url="http://renaud.waldura.com/doc/freebsd/pppoe/">Cheaper
-	      Broadband with &os; on
-	      <acronym>DSL</acronym></ulink>.</para>
+	  url="http://renaud.waldura.com/doc/freebsd/pppoe/">Cheaper
+	  Broadband with &os; on
+	  <acronym>DSL</acronym></ulink>.</para>
     </sect2>
 
     <sect2 id="ppp-3com">
 
       <title><acronym>PPPoE</acronym> with a &tm.3com;
 	<trademark class="registered">HomeConnect</trademark>
-	<acronym>ADSL</acronym>
-	Modem Dual Link</title>
+	<acronym>ADSL</acronym> Modem Dual Link</title>
 
       <para>This modem does not follow <ulink
 	  url="http://www.faqs.org/rfcs/rfc2516.html">RFC
 	  2516</ulink>.
-	Instead, different packet type codes have been
-	used for the Ethernet frames.  Please complain to <ulink
+	Instead, different packet type codes have been used for the
+	Ethernet frames.  Please complain to <ulink
 	  url="http://www.3com.com/">3Com</ulink> if you think it
 	should comply with the <acronym>PPPoE</acronym>
 	specification.</para>
@@ -1773,8 +1725,7 @@ ppp_profile="name_of_service_provider"</
 	it is not possible to talk to a normal
 	<acronym>PPPoE</acronym> client or server and a &tm.3com;
 	<trademark class="registered">HomeConnect</trademark>
-	<acronym>ADSL</acronym>
-	modem at the same time.</para>
+	<acronym>ADSL</acronym> modem at the same time.</para>
 
     </sect2>
   </sect1>
@@ -1807,9 +1758,9 @@ ppp_profile="name_of_service_provider"</
 	properly.  It is possible to automate this process in &os;
 	so that this transfer takes place whenever the device is
 	plugged into a USB port.  The following information can be
-	added to <filename>/etc/usbd.conf</filename> to
-	enable this automatic firmware transfer.  This file must be
-	edited as the <username>root</username> user.</para>
+	added to <filename>/etc/usbd.conf</filename> to enable this
+	automatic firmware transfer.  This file must be edited as
+	the <username>root</username> user.</para>
 
       <programlisting>device "Alcatel SpeedTouch USB"
     devname "ugen[0-9]+"
@@ -1823,9 +1774,8 @@ ppp_profile="name_of_service_provider"</
 
       <programlisting>usbd_enable="YES"</programlisting>
 
-      <para>It is also possible to set up
-	&man.ppp.8; to dial up at startup.  To do
-	this add the following lines to
+      <para>It is also possible to set up &man.ppp.8; to dial up at
+	startup.  To do this add the following lines to
 	<filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>ppp_enable="YES"
@@ -1843,19 +1793,14 @@ ppp_profile="adsl"</programlisting>
 
       <para><application>mpd</application> can be used to connect to a
 	variety of services, in particular <acronym>passwd</acronym>
-	services.
-	<application>mpd</application> can be installed from the
-	<filename role="package">net/mpd5</filename> package or port.
-	Many
-	<acronym>ADSL</acronym> modems require a
-	<acronym>PPTP</acronym> tunnel between the
-	modem and computer.  One such modem is the Alcatel
-	&speedtouch;
-	Home.</para>
+	services.  <application>mpd</application> can be installed
+	from the <filename role="package">net/mpd5</filename> package
+	or port.  Many <acronym>ADSL</acronym> modems require a
+	<acronym>PPTP</acronym> tunnel between the modem and computer.
+	One such modem is the Alcatel &speedtouch; Home.</para>
 
       <para>The installation of the port places a set of well
-	commented, sample
-	configuration files in <filename
+	commented, sample configuration files in <filename
 	  class="directory">/usr/local/etc/mpd5/</filename>.  Copy
 	<filename>mpd.conf.sample</filename>, removing the
 	<literal>.sample</literal> extension, and edit it to suit the
@@ -1863,8 +1808,7 @@ ppp_profile="adsl"</programlisting>
 	guide in HTML format is installed to <filename
 	  class="directory">/usr/local/share/doc/mpd5/</filename>.</para>
 
-    <para>After saving the edits,
-      initialize the connection as
+    <para>After saving the edits, initialize the connection as
       <username>root</username>:</para>
 
     <screen>&prompt.root; <userinput>service mpd5 start</userinput></screen>
@@ -1909,8 +1853,7 @@ ng0: flags=88d1&lt;UP,POINTOPOINT,RUNNIN
     <calloutlist>
       <callout arearefs="co-pptp-ex-user">
 	<para>The username of the account with the
-	  <acronym>DSL</acronym>
-	  provider.</para>
+	  <acronym>DSL</acronym> provider.</para>
       </callout>
 
       <callout arearefs="co-pptp-ex-pass">
@@ -1932,15 +1875,14 @@ ng0: flags=88d1&lt;UP,POINTOPOINT,RUNNIN
 
       <para>This will open a tunnel for a <acronym>PPP</acronym>
 	session to the <acronym>DSL</acronym> router.  Ethernet
-	<acronym>DSL</acronym> modems have a
-	preconfigured <acronym>LAN</acronym> <acronym>IP</acronym>
-	address to connect to.
-	In the case of
-	the Alcatel &speedtouch; Home, this address is <hostid
-	  role="ipaddr">10.0.0.138</hostid>.  The router
-	documentation should indicate which address the device
-	uses.  To open the tunnel and start a <acronym>PPP</acronym>
-	session execute the following command:</para>
+	<acronym>DSL</acronym> modems have a preconfigured
+	<acronym>LAN</acronym> <acronym>IP</acronym> address to
+	connect to.  In the case of the Alcatel &speedtouch; Home,
+	this address is <hostid role="ipaddr">10.0.0.138</hostid>.
+	The router documentation should indicate which address the
+	device uses.  To open the tunnel and start a
+	<acronym>PPP</acronym> session execute the following
+	command:</para>
 
       <screen>&prompt.root; <userinput>pptp <replaceable>address</replaceable> <replaceable>adsl</replaceable></userinput></screen>
 
@@ -1953,10 +1895,10 @@ ng0: flags=88d1&lt;UP,POINTOPOINT,RUNNIN
 
       <para>A <devicename>tun</devicename> virtual tunnel device
 	will be created for interaction between the
-	<application>pptp</application> and
-	&man.ppp.8; processes.  Once the prompt is
-	returned, or the <application>pptp</application> process has
-	confirmed a connection, examine the tunnel:</para>
+	<application>pptp</application> and &man.ppp.8; processes.
+	Once the prompt is returned, or the
+	<application>pptp</application> process has confirmed a
+	connection, examine the tunnel:</para>
 
       <screen>&prompt.user; <userinput>ifconfig <replaceable>tun0</replaceable></userinput>
 tun0: flags=8051&lt;UP,POINTOPOINT,RUNNING,MULTICAST&gt; mtu 1500
@@ -1964,10 +1906,10 @@ tun0: flags=8051&lt;UP,POINTOPOINT,RUNNI
 	Opened by PID 918</screen>
 
       <para>If unable to connect, check the router configuration,
-	which is usually accessible via
-	&man.telnet.1; or a web browser.  Examine
-	the output of <command>pptp</command> and the contents of
-	<filename>/var/log/ppp.log</filename> for clues.</para>
+	which is usually accessible via &man.telnet.1; or a web
+	browser.  Examine the output of <command>pptp</command> and
+	the contents of <filename>/var/log/ppp.log</filename> for
+	clues.</para>
     </sect2>
   </sect1>
 </chapter>

From owner-svn-doc-projects@FreeBSD.ORG  Thu May  9 20:54: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 39F61157;
 Thu,  9 May 2013 20:54:52 +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 2945F147;
 Thu,  9 May 2013 20:54: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 r49Ksq7P036208;
 Thu, 9 May 2013 20:54:52 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r49Ksq3D036207;
 Thu, 9 May 2013 20:54:52 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201305092054.r49Ksq3D036207@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 9 May 2013 20:54:52 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41583 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/boot
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: Thu, 09 May 2013 20:54:52 -0000

Author: dru
Date: Thu May  9 20:54:51 2013
New Revision: 41583
URL: http://svnweb.freebsd.org/changeset/doc/41583

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/boot/chapter.xml

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/boot/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/boot/chapter.xml	Thu May  9 20:51:46 2013	(r41582)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/boot/chapter.xml	Thu May  9 20:54:51 2013	(r41583)
@@ -16,9 +16,9 @@
 
     <para>The process of starting a computer and loading the operating
       system is referred to as <quote>the bootstrap process</quote>,
-      or simply <quote>booting</quote>.  &os;'s boot process
-      provides a great deal of flexibility in customizing what happens
-      when the system starts, including the ability to select from
+      or simply <quote>booting</quote>.  &os;'s boot process provides
+      a great deal of flexibility in customizing what happens when
+      the system starts, including the ability to select from
       different operating systems installed on the same computer,
       different versions of the same operating system, or a different
       installed kernel.</para>
@@ -81,18 +81,15 @@
     </indexterm>
 
     <para>On x86 hardware the Basic Input/Output System
-      (<acronym>BIOS</acronym>) is
-      responsible for loading the operating system.  To do this, the
-      <acronym>BIOS</acronym> looks on the hard disk for the Master
-      Boot Record (<acronym>MBR</acronym>),
-      which must be located on a specific place on the disk.  The
-      <acronym>BIOS</acronym>
-      has enough knowledge to load and run the <acronym>MBR</acronym>,
-      and assumes that
-      the <acronym>MBR</acronym> can then carry out the rest of the
-      tasks involved in
-      loading the operating system, possibly with the help of the
-      <acronym>BIOS</acronym>.</para>
+      (<acronym>BIOS</acronym>) is responsible for loading the
+      operating system.  To do this, the <acronym>BIOS</acronym>
+      looks on the hard disk for the Master Boot Record
+      (<acronym>MBR</acronym>), which must be located on a specific
+      place on the disk.  The <acronym>BIOS</acronym> has enough
+      knowledge to load and run the <acronym>MBR</acronym>, and
+      assumes that the <acronym>MBR</acronym> can then carry out the
+      rest of the tasks involved in loading the operating system,
+      possibly with the help of the <acronym>BIOS</acronym>.</para>
 
     <indexterm><primary>Master Boot Record
 	<acronym>MBR</acronym>)</primary></indexterm>
@@ -102,14 +99,13 @@
     <indexterm><primary>Boot Loader</primary></indexterm>
 
     <para>The code within the <acronym>MBR</acronym> is usually
-      referred to as a
-      <emphasis>boot manager</emphasis>, especially when it interacts
-      with the user.  In this case, the boot manager usually has more
-      code in the first <emphasis>track</emphasis> of the disk or
-      within the file system of some operating systems.  A boot
-      manager is sometimes also
-      called a <emphasis>boot loader</emphasis>, but &os; uses that
-      term for a later stage of booting.  Popular boot managers
+      referred to as a <emphasis>boot manager</emphasis>, especially
+      when it interacts with the user.  In this case, the boot
+      manager usually has more code in the first
+      <emphasis>track</emphasis> of the disk or within the file
+      system of some operating systems.  A boot manager is sometimes
+      also called a <emphasis>boot loader</emphasis>, but &os; uses
+      that term for a later stage of booting.  Popular boot managers
       include <application>boot0</application>, also called
       <application>Boot Easy</application>, the standard &os; boot
       manager, <application>Grub</application>,
@@ -119,14 +115,12 @@
       <acronym>MBR</acronym>.</para>
 
     <para>If only one operating system is installed, a standard PC
-      <acronym>MBR</acronym>
-      will suffice.  This <acronym>MBR</acronym> searches for the
-      first bootable (active)
+      <acronym>MBR</acronym> will suffice.  This
+      <acronym>MBR</acronym> searches for the first bootable (active)
       slice on the disk, and then runs the code on that slice to load
       the remainder of the operating system.  By default, the
-      <acronym>MBR</acronym>
-      installed by &man.fdisk.8; is such an <acronym>MBR</acronym> and
-      is based on
+      <acronym>MBR</acronym> installed by &man.fdisk.8; is such an
+      <acronym>MBR</acronym> and is based on
       <filename>/boot/mbr</filename>.</para>
 
     <para>If multiple operating systems are present, a different boot
@@ -136,15 +130,14 @@
 
     <para>The remainder of the &os; bootstrap system is divided
       into three stages.  The first stage is run by the
-      <acronym>MBR</acronym>, which
-      knows just enough to get the computer into a specific state and
-      run the second stage.  The second stage can do a little bit
-      more, before running the third stage.  The third stage finishes
-      the task of loading the operating system.  The work is split
-      into three stages because PC standards put limits on the size of
-      the programs that can be run at stages one and two.  Chaining
-      the tasks together allows &os; to provide a more flexible
-      loader.</para>
+      <acronym>MBR</acronym>, which knows just enough to get the
+      computer into a specific state and run the second stage.  The
+      second stage can do a little bit more, before running the
+      third stage.  The third stage finishes the task of loading the
+      operating system.  The work is split into three stages because
+      PC standards put limits on the size of the programs that can
+      be run at stages one and two.  Chaining the tasks together
+      allows &os; to provide a more flexible loader.</para>
 
     <indexterm><primary>kernel</primary></indexterm>
     <indexterm><primary>&man.init.8;</primary></indexterm>
@@ -171,9 +164,8 @@
 	  (<acronym>MBR</acronym>)</primary></indexterm>
 
       <para>The code in the <acronym>MBR</acronym> or boot manager is
-	sometimes referred
-	to as <emphasis>stage zero</emphasis> of the boot process.
-	This section discusses two boot managers:
+	sometimes referred to as <emphasis>stage zero</emphasis> of
+	the boot process.  This section discusses two boot managers:
 	<application>boot0</application> and
 	<application>LILO</application>.</para>
 
@@ -182,8 +174,7 @@
 	  Manager:</title>
 
 	<para>The <acronym>MBR</acronym> installed by &os;'s installer
-	  or
-	  &man.boot0cfg.8; is based on
+	  or &man.boot0cfg.8; is based on
 	  <filename>/boot/boot0</filename>.  The size and capability
 	  of <application>boot0</application> is restricted to 446
 	  bytes due to the slice table and <literal>0x55AA</literal>
@@ -204,24 +195,21 @@ Default: F2</screen>
 
       <para>Other operating systems, in particular &windows;, will
 	overwrite an existing <acronym>MBR</acronym> if they are
-	installed after &os;.
-	If this happens, or to replace the existing
-	<acronym>MBR</acronym>
-	with the &os; <acronym>MBR</acronym>, use the following
-	command:</para>
+	installed after &os;.  If this happens, or to replace the
+	existing <acronym>MBR</acronym> with the &os;
+	<acronym>MBR</acronym>, use the following command:</para>
 
       <screen>&prompt.root; <userinput>fdisk -B -b /boot/boot0 <replaceable>device</replaceable></userinput></screen>
 
       <para>where <replaceable>device</replaceable> is the boot disk,
 	such as <devicename>ad0</devicename> for the first
-	<acronym>IDE</acronym> disk,
-	<devicename>ad2</devicename> for the first
-	<acronym>IDE</acronym> disk on a
-	second <acronym>IDE</acronym> controller, or
+	<acronym>IDE</acronym> disk, <devicename>ad2</devicename>
+	for the first <acronym>IDE</acronym> disk on a second
+	<acronym>IDE</acronym> controller, or
 	<devicename>da0</devicename>
 	for the first <acronym>SCSI</acronym> disk.  To create a
-	custom configuration of
-	the <acronym>MBR</acronym>, refer to &man.boot0cfg.8;.</para>
+	custom configuration of the <acronym>MBR</acronym>, refer to
+	&man.boot0cfg.8;.</para>
 
       <formalpara>
 	<title>The LILO Boot Manager:</title>
@@ -279,9 +267,9 @@ label=FreeBSD</programlisting>
 	can provide a simple interface to choose the kernel or loader
 	to run.</para>
 
-      <para>However, &man.loader.8; is much more
-	sophisticated and provides a boot configuration which is run
-	by <filename>boot2</filename>.</para>
+      <para>However, &man.loader.8; is much more sophisticated and
+	provides a boot configuration which is run by
+	<filename>boot2</filename>.</para>
 
       <example id="boot-boot2-example">
 	<title><filename>boot2</filename> Screenshot</title>
@@ -581,10 +569,10 @@ boot:</screen>
 	  first is the default legacy virtual console command line
 	  environment.  After the system finishes booting, a console
 	  login prompt is presented.  The second environment is the
-	  graphical environment as described in
-	  <xref linkend="x11"/>.  Refer to that chapter for
-	  more information on how to install and configure a graphical
-	  display manager and a graphical login manager.</para>
+	  graphical environment as described in <xref linkend="x11"/>.
+	  Refer to that chapter for more information on how to install
+	  and configure a graphical display manager and a graphical
+	  login manager.</para>
 
 	<sect4 id="boot-splash-function">
 	  <title>Splash Screen Function</title>
@@ -690,8 +678,8 @@ bitmap_name="<replaceable>/boot/splash.b
 	    or
 	    <filename><replaceable>bluewave</replaceable>.pcx</filename>.</para>
 
-	  <para>Other interesting
-	    <filename>loader.conf</filename> options include:</para>
+	  <para>Other interesting <filename>loader.conf</filename>
+	    options include:</para>
 
 	  <variablelist>
 	    <varlistentry>
@@ -736,8 +724,8 @@ bitmap_name="<replaceable>/boot/splash.b
 
     <para>Once the kernel is loaded by either the default loader
       (<xref linkend="boot-loader"/>) or by boot2 (<xref
-	linkend="boot-boot1"/>), which bypasses the loader,
-      it examines any boot flags and adjusts its behavior as
+	linkend="boot-boot1"/>), which bypasses the loader, it
+      examines any boot flags and adjusts its behavior as
       necessary.</para>
 
     <sect2 id="boot-kernel-bootflags">
@@ -923,9 +911,8 @@ bitmap_name="<replaceable>/boot/splash.b
 	systems available on the system are consistent.  If they are
 	not, and &man.fsck.8; cannot fix the inconsistencies of a UFS
 	file system, &man.init.8; drops the system into single-user
-	mode (<xref linkend="boot-singleuser"/>) so
-	that the system administrator can resolve the problem
-	directly.</para>
+	mode (<xref linkend="boot-singleuser"/>) so that the system
+	administrator can resolve the problem directly.</para>
     </sect2>
 
     <sect2 id="boot-singleuser">
@@ -935,10 +922,9 @@ bitmap_name="<replaceable>/boot/splash.b
       <indexterm><primary>console</primary></indexterm>
 
       <para>This mode can be reached through the automatic reboot
-	sequence (<xref linkend="boot-autoreboot"/>),
-	the user booting with <option>-s</option>, or by setting
-	the <envar>boot_single</envar> variable in
-	&man.loader.8;.</para>
+	sequence (<xref linkend="boot-autoreboot"/>), the user booting
+	with <option>-s</option>, or by setting the <envar>boot_
+	  single</envar> variable in &man.loader.8;.</para>
 
       <para>It can also be reached by calling &man.shutdown.8; from
 	multi-user mode (<xref linkend="boot-multiuser"/>) without
@@ -978,9 +964,9 @@ console none                            
 
       <para>If &man.init.8; finds the file systems to be in order, or
 	once the user has finished their commands in single-user
-	mode (<xref linkend="boot-singleuser"/>), the
-	system enters multi-user mode, in which it starts the
-	resource configuration of the system.</para>
+	mode (<xref linkend="boot-singleuser"/>), the system enters
+	multi-user mode, in which it starts the resource configuration
+	of the system.</para>
 
       <sect3 id="boot-rc">
 	<title>Resource Configuration (rc)</title>

From owner-svn-doc-projects@FreeBSD.ORG  Thu May  9 20:56:49 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 535711BC;
 Thu,  9 May 2013 20:56:49 +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 43D9015D;
 Thu,  9 May 2013 20:56:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r49KunSo036667;
 Thu, 9 May 2013 20:56:49 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r49KuncN036666;
 Thu, 9 May 2013 20:56:49 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201305092056.r49KuncN036666@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 9 May 2013 20:56:49 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41584 -
 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: Thu, 09 May 2013 20:56:49 -0000

Author: dru
Date: Thu May  9 20:56:48 2013
New Revision: 41584
URL: http://svnweb.freebsd.org/changeset/doc/41584

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/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	Thu May  9 20:54:51 2013	(r41583)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/basics/chapter.xml	Thu May  9 20:56:48 2013	(r41584)
@@ -87,8 +87,8 @@
 
     <para>&os; can be used in various ways.  One of them is typing
       commands to a text terminal.  A lot of the flexibility and power
-      of a &unix; operating system is readily available
-      when using &os; this way.  This section describes what
+      of a &unix; operating system is readily available when using
+      &os; this way.  This section describes what
       <quote>terminals</quote> and <quote>consoles</quote> are, and
       how to use them in &os;.</para>
 
@@ -146,14 +146,14 @@ login:</screen>
 
       <para>Type the username that was configured during system
 	installation, as described in <xref
-	  linkend="bsdinstall-addusers"/>, and
-	press <keycap>Enter</keycap>.  Then enter the password
-	associated with the username and press <keycap>Enter</keycap>.
-	The password is <emphasis>not echoed</emphasis> for security
+	  linkend="bsdinstall-addusers"/>, and press
+	<keycap>Enter</keycap>.  Then enter the password associated
+	with the username and press <keycap>Enter</keycap>.  The
+	password is <emphasis>not echoed</emphasis> for security
 	reasons.</para>
 
-      <para>Once the correct password is input, the message of
-	the day (<acronym>MOTD</acronym>) will be displayed followed
+      <para>Once the correct password is input, the message of the
+	day (<acronym>MOTD</acronym>) will be displayed followed
 	by a command prompt (a <literal>#</literal>,
 	<literal>$</literal>, or <literal>%</literal> character).  You
 	are now logged into the &os; console and ready to try the
@@ -229,10 +229,10 @@ ttyv8   "/usr/X11R6/bin/xdm -nodaemon"  
       <title>Single User Mode Console</title>
 
       <para>A detailed description of <quote>single user mode</quote>
-	can be found in <xref linkend="boot-singleuser"/>.
-	There is only one console when &os; is in single user mode as
-	no other virtual consoles are available in this mode.  The
-	settings for single user mode are found in this section of
+	can be found in <xref linkend="boot-singleuser"/>.  There is
+	only one console when &os; is in single user mode as no other
+	virtual consoles are available in this mode.  The settings
+	for single user mode are found in this section of
 	<filename>/etc/ttys</filename>:</para>
 
       <programlisting># name  getty                           type  status  comments
@@ -250,12 +250,11 @@ console none                            
 	  without prompting for a password.</para>
 
 	<para><emphasis>Be careful when changing this setting to
-	    <literal>insecure</literal></emphasis>.  If
-	  the <username>root</username> password is forgotten, booting
-	  into
-	  single user mode is still possible, but may be difficult for
-	  someone who is not comfortable with the &os; booting
-	  process.</para>
+	    <literal>insecure</literal></emphasis>.  If the
+	  <username>root</username> password is forgotten, booting
+	  into single user mode is still possible, but may be
+	  difficult for someone who is not comfortable with the &os;
+	  booting process.</para>
       </note>
     </sect2>
 
@@ -419,10 +418,10 @@ total 530
       write, and execute permissions.  The executable bit for a
       directory has a slightly different meaning than that of files.
       When a directory is marked executable, it means it is possible
-      to change into that directory using
-      &man.cd.1;.  This also means that it is
-      possible to access the files within that directory, subject to
-      the permissions on the files themselves.</para>
+      to change into that directory using &man.cd.1;.  This also
+      means that it is possible to access the files within that
+      directory, subject to the permissions on the files
+      themselves.</para>
 
     <para>In order to perform a directory listing, the read permission
       must be set on the directory.  In order to delete a file that
@@ -583,10 +582,9 @@ total 530
 
       <para>In addition to file permissions, &os; supports the use of
 	<quote>file flags</quote>.  These flags add an additional
-	level of security and control over files, but not
-	directories.  With file flags, even
-	<username>root</username> can be prevented from removing or
-	altering files.</para>
+	level of security and control over files, but not directories.
+	With file flags, even <username>root</username> can be
+	prevented from removing or altering files.</para>
 
       <para>File flags are modified using &man.chflags.1;.  For
 	example, to enable the system undeletable flag on the file
@@ -675,8 +673,8 @@ total 530
       </note>
 
       <para>To view this in real time, open two terminals.  On
-	one, type <command>passwd</command> as a normal
-	user.  While it waits for a new password, check the process
+	one, type <command>passwd</command> as a normal user.
+	While it waits for a new password, check the process
 	table and look at the user information for
 	&man.passwd.1;:</para>
 
@@ -692,9 +690,9 @@ Old Password:</screen>
       <screen>trhodes  5232  0.0  0.2  3420  1608   0  R+    2:10AM   0:00.00 grep passwd
 root     5211  0.0  0.2  3620  1724   2  I+    2:09AM   0:00.01 passwd</screen>
 
-      <para>Although &man.passwd.1; is run
-	as a normal user, it is using the effective
-	<acronym>UID</acronym> of <username>root</username>.</para>
+      <para>Although &man.passwd.1; is run as a normal user, it is
+	using the effective <acronym>UID</acronym> of
+	<username>root</username>.</para>
 
       <para>The <literal>setgid</literal> permission performs the
 	same function as the <literal>setuid</literal> permission;
@@ -704,8 +702,7 @@ root     5211  0.0  0.2  3620  1724   2 
 	user who started the process.</para>
 
       <para>To set the <literal>setgid</literal> permission on a
-	file, provide &man.chmod.1; with a leading two
-	(2):</para>
+	file, provide &man.chmod.1; with a leading two (2):</para>
 
       <screen>&prompt.root; <userinput>chmod 2755 sgidexample.sh</userinput></screen>
 
@@ -960,26 +957,26 @@ root     5211  0.0  0.2  3620  1724   2 
 	      <entry><filename
 		  class="directory">/usr/local/</filename></entry>
 	      <entry>Local executables and libraries.  Also used as
-		the default destination for the &os; ports
-		framework.  Within
-		<filename class="directory">/usr/local</filename>, the
+		the default destination for the &os; ports framework.
+		Within <filename
+		  class="directory">/usr/local</filename>, the
 		general layout sketched out by &man.hier.7; for
 		<filename class="directory">/usr</filename> should be
 		used.  Exceptions are the man directory, which is
-		directly under
-		<filename class="directory">/usr/local</filename>
-		rather than under
-		<filename class="directory">/usr/local/share</filename>,
-		and the ports documentation is in
-		<filename class="directory">share/doc/<replaceable>port</replaceable></filename>.</entry>
+		directly under <filename
+		  class="directory">/usr/local</filename>
+		rather than under <filename
+		  class="directory">/usr/local/share</filename>,
+		and the ports documentation is in <filename
+		  class="directory">share/doc/<replaceable>port</replaceable></filename>.</entry>
 	    </row>
 
 	    <row>
 	      <entry><filename
 		  class="directory">/usr/obj/</filename></entry>
 	      <entry>Architecture-specific target tree produced by
-		building the
-		<filename class="directory">/usr/src</filename>
+		building the <filename
+		  class="directory">/usr/src</filename>
 		tree.</entry>
 	    </row>
 
@@ -1044,8 +1041,8 @@ root     5211  0.0  0.2  3620  1724   2 
 	      <entry><filename
 		  class="directory">/var/tmp/</filename></entry>
 	      <entry>Temporary files which are usually preserved
-		across a system reboot, unless
-		<filename class="directory">/var</filename> is a
+		across a system reboot, unless <filename
+		  class="directory">/var</filename> is a
 		memory-based file system.</entry>
 	    </row>
 
@@ -1071,42 +1068,40 @@ root     5211  0.0  0.2  3620  1724   2 
 
     <para>Files are stored in directories.  A directory may contain no
       files, or it may contain many hundreds of files.  A directory
-      can also contain other directories, allowing a
-      hierarchy of directories within one another in order to organize
+      can also contain other directories, allowing a hierarchy of
+      directories within one another in order to organize
       data.</para>
 
     <para>Files and directories are referenced by giving the file or
       directory name, followed by a forward slash,
       <literal>/</literal>, followed by any other directory names that
-      are necessary.  For example, if the directory
-      <filename class="directory">foo</filename> contains a directory
+      are necessary.  For example, if the directory <filename
+	class="directory">foo</filename> contains a directory
       <filename class="directory">bar</filename> which contains the
       file <filename>readme.txt</filename>, the full name, or
       <firstterm>path</firstterm>, to the file is
       <filename>foo/bar/readme.txt</filename>.  Note that this is
-      different from &windows; which uses
-      <literal>\</literal> to separate file and directory
-      names.  &os; does not use drive letters, or other drive names in
-      the path.  For example, one would not type
-      <filename>c:/foo/bar/readme.txt</filename> on &os;.</para>
+      different from &windows; which uses <literal>\</literal> to
+      separate file and directory names.  &os; does not use drive
+      letters, or other drive names in the path.  For example, one
+      would not type <filename>c:/foo/bar/readme.txt</filename> on
+      &os;.</para>
 
     <para>Directories and files are stored in a file system.  Each
       file system contains exactly one directory at the very top
       level, called the <firstterm>root directory</firstterm> for that
-      file system.  This root directory can contain other
-      directories.  One file system is designated the
-      <firstterm>root file system</firstterm> or <literal>/</literal>.
-      Every other file system is <firstterm>mounted</firstterm> under
-      the root file system.  No matter how many disks are on the
-      &os; system, every directory appears to be part of the same
-      disk.</para>
-
-    <para>Consider three file systems, called
-      <literal>A</literal>, <literal>B</literal>, and
-      <literal>C</literal>.  Each file system has one root directory,
-      which contains two other directories, called
-      <literal>A1</literal>, <literal>A2</literal> (and likewise
-      <literal>B1</literal>, <literal>B2</literal> and
+      file system.  This root directory can contain other directories.
+      One file system is designated the <firstterm>root file
+	system</firstterm> or <literal>/</literal>.  Every other file
+      system is <firstterm>mounted</firstterm> under the root file
+      system.  No matter how many disks are on the &os; system, every
+      directory appears to be part of the same disk.</para>
+
+    <para>Consider three file systems, called <literal>A</literal>,
+      <literal>B</literal>, and <literal>C</literal>.  Each file
+      system has one root directory, which contains two other
+      directories, called <literal>A1</literal>, <literal>A2</literal>
+      (and likewise <literal>B1</literal>, <literal>B2</literal> and
       <literal>C1</literal>, <literal>C2</literal>).</para>
 
     <para>Call <literal>A</literal> the root file system.  If
@@ -1130,11 +1125,11 @@ root     5211  0.0  0.2  3620  1724   2 
     </mediaobject>
 
     <para>A file system must be mounted on to a directory in another
-      file system.  When mounting file system
-      <literal>B</literal> on to the directory <literal>A1</literal>,
-      the root directory of <literal>B</literal> replaces
-      <literal>A1</literal>, and the directories in
-      <literal>B</literal> appear accordingly:</para>
+      file system.  When mounting file system <literal>B</literal>
+      on to the directory <literal>A1</literal>, the root directory
+      of <literal>B</literal> replaces <literal>A1</literal>, and
+      the directories in <literal>B</literal> appear
+      accordingly:</para>
 
     <mediaobject>
       <imageobject>
@@ -1156,10 +1151,9 @@ root     5211  0.0  0.2  3620  1724   2 
 
     <para>Any files that are in the <literal>B1</literal> or
       <literal>B2</literal> directories can be reached with the path
-      <filename class="directory">/A1/B1</filename> or
-      <filename class="directory">/A1/B2</filename> as
-      necessary.  Any files that were in
-      <filename class="directory">/A1</filename> have
+      <filename class="directory">/A1/B1</filename> or <filename
+	class="directory">/A1/B2</filename> as necessary.  Any files
+      that were in <filename class="directory">/A1</filename> have
       been temporarily hidden.  They will reappear if
       <literal>B</literal> is <firstterm>unmounted</firstterm> from
       <literal>A</literal>.</para>
@@ -1187,9 +1181,8 @@ root     5211  0.0  0.2  3620  1724   2 
     </mediaobject>
 
     <para>and the paths would be
-      <filename class="directory">/A2/B1</filename> and
-      <filename class="directory">/A2/B2</filename>
-      respectively.</para>
+      <filename class="directory">/A2/B1</filename> and <filename
+	class="directory">/A2/B2</filename> respectively.</para>
 
     <para>File systems can be mounted on top of one another.
       Continuing the last example, the <literal>C</literal> file
@@ -1264,9 +1257,9 @@ root     5211  0.0  0.2  3620  1724   2 
 	  <firstterm>mount options</firstterm>.  For example, the root
 	  file system can be mounted read-only, making it impossible
 	  for users to inadvertently delete or edit a critical file.
-	  Separating user-writable file systems, such as
-	  <filename class="directory">/home</filename>, from other
-	  file systems allows them to be mounted
+	  Separating user-writable file systems, such as <filename
+	    class="directory">/home</filename>, from other file
+	  systems allows them to be mounted
 	  <firstterm>nosuid</firstterm>.  This option prevents the
 	  <firstterm>suid</firstterm>/<firstterm>guid</firstterm> bits
 	  on executables stored on the file system from taking effect,
@@ -1283,10 +1276,9 @@ root     5211  0.0  0.2  3620  1724   2 
       </listitem>
 
       <listitem>
-	<para>&os;'s file systems are robust if
-	  power is lost.  However, a power loss at a critical point
-	  could
-	  still damage the structure of the file system.  By splitting
+	<para>&os;'s file systems are robust if power is lost.
+	  However, a power loss at a critical point could still
+	  damage the structure of the file system.  By splitting
 	  data over multiple file systems it is more likely that the
 	  system will still come up, making it easier to restore from
 	  backup as necessary.</para>
@@ -1379,10 +1371,10 @@ root     5211  0.0  0.2  3620  1724   2 
     </informaltable>
 
     <para>Each partition-that-contains-a-file-system is stored in what
-      &os; calls a <firstterm>slice</firstterm>.  Slice is
-      &os;'s term for what the common call partitions, and again,
-      this is because of &os;'s &unix; background.  Slices are
-      numbered, starting at 1, through to 4.</para>
+      &os; calls a <firstterm>slice</firstterm>.  Slice is &os;'s
+      term for what the common call partitions, and again, this is
+      because of &os;'s &unix; background.  Slices are numbered,
+      starting at 1, through to 4.</para>
 
     <indexterm><primary>slices</primary></indexterm>
     <indexterm><primary>partitions</primary></indexterm>
@@ -1403,17 +1395,18 @@ root     5211  0.0  0.2  3620  1724   2 
       <firstterm>partitions</firstterm>, which are represented as
       letters from <literal>a</literal> to <literal>h</literal>.  This
       letter is appended to the device name, so
-      <quote>da0<emphasis>a</emphasis></quote> is the <literal>a</literal> partition on
-      the first <literal>da</literal> drive, which is <quote>dangerously
-      dedicated</quote>. <quote>ad1s3<emphasis>e</emphasis></quote> is
-      the fifth partition in the third slice of the second IDE disk
-      drive.</para>
+      <quote>da0<emphasis>a</emphasis></quote> is the
+      <literal>a</literal> partition on the first
+      <literal>da</literal> drive, which is <quote>dangerously
+	dedicated</quote>.  <quote>ad1s3<emphasis>e</emphasis></quote>
+      is the fifth partition in the third slice of the second IDE
+      disk drive.</para>
 
     <para>Finally, each disk on the system is identified.  A disk name
       starts with a code that indicates the type of disk, and then a
       number, indicating which disk it is.  Unlike slices, disk
-      numbering starts at 0.  Common codes are
-      listed in <xref linkend="basics-dev-codes"/>.</para>
+      numbering starts at 0.  Common codes are listed in <xref
+	linkend="basics-dev-codes"/>.</para>
 
     <para>When referring to a partition, include the disk name,
       <literal>s</literal>, the slice number, and then the partition
@@ -1567,12 +1560,11 @@ root     5211  0.0  0.2  3620  1724   2 
 
     <para>The file system is best visualized as a tree,
       rooted, as it were, at <filename class="directory">/</filename>.
-      <filename class="directory">/dev</filename>,
-      <filename class="directory">/usr</filename>, and the
-      other directories in the root directory are branches, which may
-      have their own branches, such as
-      <filename class="directory">/usr/local</filename>, and so
-      on.</para>
+      <filename class="directory">/dev</filename>, <filename
+	class="directory">/usr</filename>, and the other directories
+      in the root directory are branches, which may have their own
+      branches, such as <filename
+	class="directory">/usr/local</filename>, and so on.</para>
 
     <indexterm><primary>root file system</primary></indexterm>
     <para>There are various reasons to house some of these
@@ -1582,15 +1574,13 @@ root     5211  0.0  0.2  3620  1724   2 
       <filename class="directory">spool/</filename>, and various types
       of temporary files, and as such, may get filled up.  Filling up
       the root file system is not a good idea, so splitting <filename
-	class="directory">/var</filename> from
-      <filename class="directory">/</filename> is often
-      favorable.</para>
+	class="directory">/var</filename> from <filename
+	class="directory">/</filename> is often favorable.</para>
 
     <para>Another common reason to contain certain directory trees on
       other file systems is if they are to be housed on separate
       physical disks, or are separate virtual disks, such as Network
-      File System  mounts, described in
-      <xref linkend="network-nfs"/>,
+      File System  mounts, described in <xref linkend="network-nfs"/>,
       or CDROM drives.</para>
 
     <sect2 id="disks-fstab">
@@ -1641,8 +1631,8 @@ root     5211  0.0  0.2  3620  1724   2 
 	  <term><literal>options</literal></term>
 
 	  <listitem>
-	    <para>Either <option>rw</option> for read-write
-	      file systems, or <option>ro</option> for read-only file
+	    <para>Either <option>rw</option> for read-write file
+	      systems, or <option>ro</option> for read-only file
 	      systems, followed by any other options that may be
 	      needed.  A common option is <option>noauto</option> for
 	      file systems not normally mounted during the boot
@@ -1845,28 +1835,27 @@ root     5211  0.0  0.2  3620  1724   2 
       processes that are run by &os;.</para>
 
     <para>Each process is uniquely identified by a number called a
-      <firstterm>process ID</firstterm>
-      (<acronym>PID</acronym>).  Similar to files, each process
-      has one owner and group, and the owner and group permissions are
-      used to determine which files and devices the process can open.
-      Most processes also have a parent process that started them.
-      For example, the shell is a process, and any command started in
-      the shell is a process which has the shell as its parent
-      process.  The exception is a special process called
-      &man.init.8; which is always the first process to start at boot
-      time and which always has a <acronym>PID</acronym> of 1.</para>
+      <firstterm>process ID</firstterm> (<acronym>PID</acronym>).
+      Similar to files, each process has one owner and group, and
+      the owner and group permissions are used to determine which
+      files and devices the process can open.  Most processes also
+      have a parent process that started them.  For example, the
+      shell is a process, and any command started in the shell is a
+      process which has the shell as its parent process.  The
+      exception is a special process called &man.init.8; which is
+      always the first process to start at boot time and which always
+      has a <acronym>PID</acronym> of 1.</para>
 
     <para>To see the processes on the system, use &man.ps.1; and
       &man.top.1;.   To display a static list of the currently running
       processes, their <acronym>PID</acronym>s, how much memory they
-      are using, and the
-      command they were started with, use &man.ps.1;.  To
-      display all the running processes and update the display every
-      few seconds in order to interactively see what the computer
-      is doing, use &man.top.1;.</para>
+      are using, and the command they were started with, use
+      &man.ps.1;.  To display all the running processes and update
+      the display every few seconds in order to interactively see
+      what the computer is doing, use &man.top.1;.</para>
 
-    <para>By default, &man.ps.1; only shows the commands
-      that are running and owned by the user.  For example:</para>
+    <para>By default, &man.ps.1; only shows the commands that are
+      running and owned by the user.  For example:</para>
 
     <screen>&prompt.user; <userinput>ps</userinput>
   PID  TT  STAT      TIME COMMAND
@@ -1888,16 +1877,15 @@ root     5211  0.0  0.2  3620  1724   2 
     <para>The output from &man.ps.1; is organized into a number of
       columns.  The <literal>PID</literal> column displays the process
       ID.  <acronym>PID</acronym>s are assigned starting at 1, go up
-      to 99999, then wrap
-      around back to the beginning.  However, a <acronym>PID</acronym>
-      is not reassigned
-      if it is already in use.  The <literal>TT</literal> column shows
-      the tty the program is running on and <literal>STAT</literal>
-      shows the program's state.  <literal>TIME</literal> is the
-      amount of time the program has been running on the CPU.  This is
-      usually not the elapsed time since the program was started, as
-      most programs spend a lot of time waiting for things to happen
-      before they need to spend time on the CPU.  Finally,
+      to 99999, then wrap around back to the beginning.  However, a
+      <acronym>PID</acronym> is not reassigned if it is already in
+      use.  The <literal>TT</literal> column shows the tty the program
+      is running on and <literal>STAT</literal> shows the program's
+      state.  <literal>TIME</literal> is the amount of time the
+      program has been running on the CPU.  This is usually not the
+      elapsed time since the program was started, as most programs
+      spend a lot of time waiting for things to happen before they
+      need to spend time on the CPU.  Finally,
       <literal>COMMAND</literal> is the command that was used to start
       the program.</para>
 
@@ -1933,26 +1921,24 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 
     <para>The output is split into two sections.  The header (the
       first five lines) shows the <acronym>PID</acronym> of the last
-      process to run, the
-      system load averages (which are a measure of how busy the system
-      is), the system uptime (time since the last reboot) and the
-      current time.  The other figures in the header relate to how
-      many processes are running (47 in this case), how much memory
-      and swap space has been used, and how much time the system is
-      spending in different CPU states.</para>
+      process to run, the system load averages (which are a measure
+      of how busy the system is), the system uptime (time since the
+      last reboot) and the current time.  The other figures in the
+      header relate to how many processes are running (47 in this
+      case), how much memory and swap space has been used, and how
+      much time the system is spending in different CPU states.</para>
 
     <para>Below the header is a series of columns containing similar
       information to the output from &man.ps.1;, such as the
-      <acronym>PID</acronym>,
-      username, amount of CPU time, and the command that started the
-      process.  By default, &man.top.1; also displays the amount of
-      memory space taken by the process.  This is split into two
-      columns: one for total size and one for resident size.  Total
-      size is how much memory the application has needed and the
-      resident size is how much it is actually using at the moment.
-      In this example, <application>mutt</application> has
-      required almost 8&nbsp;MB of RAM, but is currently only using
-      5&nbsp;MB.</para>
+      <acronym>PID</acronym>, username, amount of CPU time, and the
+      command that started the process.  By default, &man.top.1; also
+      displays the amount of memory space taken by the process.
+      This is split into two columns: one for total size and one for
+      resident size.  Total size is how much memory the application
+      has needed and the resident size is how much it is actually
+      using at the moment.  In this example,
+      <application>mutt</application> has required almost 8&nbsp;MB
+      of RAM, but is currently only using 5&nbsp;MB.</para>
 
     <para>&man.top.1; automatically updates the display every two
       seconds.  A different interval can be specified with
@@ -1980,13 +1966,12 @@ Swap: 256M Total, 38M Used, 217M Free, 1
     <para>There is a convention to name programs that normally run as
       daemons with a trailing <quote>d</quote>.
       <application>BIND</application> is the Berkeley Internet Name
-      Domain, but the actual program that executes is
-      &man.named.8;.  The <application>Apache</application>
-      web server program is <command>httpd</command> and the
-      line printer spooling daemon is &man.lpd.8;.  This is
-      only a naming convention.  For example, the main mail daemon for
-      the <application>Sendmail</application> application is
-      &man.sendmail.8;, and not
+      Domain, but the actual program that executes is &man.named.8;.
+      The <application>Apache</application> web server program is
+      <command>httpd</command> and the line printer spooling daemon
+      is &man.lpd.8;.  This is only a naming convention.  For example,
+      the main mail daemon for the <application>Sendmail</application>
+      application is &man.sendmail.8;, and not
       <literal>maild</literal>.</para>
 
     <para>One way to communicate with a daemon, or any running
@@ -2050,16 +2035,14 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 
       <para>This example shows how to send a signal to &man.inetd.8;.
 	The &man.inetd.8; configuration file is
-	<filename>/etc/inetd.conf</filename>, and
-	&man.inetd.8; will re-read this configuration file
-	when it is sent a <literal>SIGHUP</literal>.</para>
+	<filename>/etc/inetd.conf</filename>, and &man.inetd.8; will
+	re-read this configuration file when it is sent a
+	<literal>SIGHUP</literal>.</para>
 
       <step>
 	<para>Find the <acronym>PID</acronym> of the process to send
-	  the signal
-	  to using &man.pgrep.1;.  In this example, the
-	  <acronym>PID</acronym> for
-	  &man.inetd.8; is 198:</para>
+	  the signal to using &man.pgrep.1;.  In this example, the
+	  <acronym>PID</acronym> for &man.inetd.8; is 198:</para>
 
 	<screen>&prompt.user; <userinput>pgrep -l inetd</userinput>
 198  inetd -wW</screen>
@@ -2080,10 +2063,9 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 	  process not owned by that user, the message
 	  <errorname>kill: <replaceable>PID</replaceable>: Operation
 	    not permitted</errorname> will be displayed.  Mistyping
-	  the <acronym>PID</acronym> will either
-	  send the signal to the wrong process, which could have
-	  negative results, or will send the signal to a
-	  <acronym>PID</acronym> that is
+	  the <acronym>PID</acronym> will either send the signal to
+	  the wrong process, which could have negative results, or
+	  will send the signal to a <acronym>PID</acronym> that is
 	  not currently in use, resulting in the error
 	  <errorname>kill: <replaceable>PID</replaceable>: No such
 	    process</errorname>.</para>
@@ -2111,9 +2093,8 @@ Swap: 256M Total, 38M Used, 217M Free, 1
     <important>
       <para>Killing a random process on the system can be a bad idea.
 	In particular, &man.init.8;, <acronym>PID</acronym> 1, is
-	special.  Running
-	<command>/bin/kill -s KILL 1</command> is a quick, and
-	unrecommended, way to shutdown the system.
+	special.  Running <command>/bin/kill -s KILL 1</command> is
+	a quick, and unrecommended, way to shutdown the system.
 	<emphasis>Always</emphasis> double check the arguments to
 	&man.kill.1; <emphasis>before</emphasis> pressing
 	<keycap>Return</keycap>.</para>
@@ -2131,11 +2112,10 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       them.  Many shells provide built in functions to help with
       everyday tasks such as file management, file globbing, command
       line editing, command macros, and environment variables.  &os;
-      comes with several shells, including the
-      Bourne shell (&man.sh.1;) and the extended C shell
-      (&man.tcsh.1;).
-      Other shells are available from the &os; Ports Collection, such
-      as <command>zsh</command> and <command>bash</command>.</para>
+      comes with several shells, including the Bourne shell
+      (&man.sh.1;) and the extended C shell (&man.tcsh.1;).  Other
+      shells are available from the &os; Ports Collection, such as
+      <command>zsh</command> and <command>bash</command>.</para>
 
     <para>The shell that is used is really a matter of taste.  A C
       programmer might feel more comfortable with a C-like shell such
@@ -2275,13 +2255,12 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 
     <para>Shells treat special characters, known as meta-characters,
       as special representations of data.  The most common
-      meta-character is <literal>*</literal>, which
-      represents any number of characters in a filename.
-      Meta-characters can be used to perform filename globbing.  For
-      example, <command>echo *</command> is equivalent to
-      &man.ls.1; because the shell takes all the files that
-      match <literal>*</literal> and &man.echo.1; lists
-      them on the command line.</para>
+      meta-character is <literal>*</literal>, which represents any
+      number of characters in a filename.  Meta-characters can be
+      used to perform filename globbing.  For example, <command>echo
+	*</command> is equivalent to &man.ls.1; because the shell
+      takes all the files that match <literal>*</literal> and
+      &man.echo.1; lists them on the command line.</para>
 
     <para>To prevent the shell from interpreting a special character,
       escape it from the shell by starting it with a backslash
@@ -2297,9 +2276,8 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 	to use <command>chsh</command>.  Running this command will
 	open the editor that is configured in the
 	<envar>EDITOR</envar> environment variable, which by default
-	is set to &man.vi.1;.  Change
-	the <quote>Shell:</quote> line to the full path of the
-	new shell.</para>
+	is set to &man.vi.1;.  Change the <quote>Shell:</quote> line
+	to the full path of the new shell.</para>
 
       <para>Alternately, use <command>chsh -s</command> which will set
 	the specified shell without opening an editor.  For example,
@@ -2310,10 +2288,9 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       <note>
 	<para>The new shell <emphasis>must</emphasis> be present in
 	  <filename>/etc/shells</filename>.  If the shell was
-	  installed from the &os; Ports
-	  Collection as described in <xref linkend="ports"/>, it
-	  should be automatically added to
-	  this file.  If it is missing, add it using this
+	  installed from the &os; Ports Collection as described in
+	  <xref linkend="ports"/>, it should be automatically added
+	  to this file.  If it is missing, add it using this
 	  command, replacing the path with the path of the
 	  shell:</para>
 
@@ -2343,9 +2320,9 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       <secondary>&man.ee.1;</secondary>
     </indexterm>
 
-    <para>A simple editor to learn is &man.ee.1;,
-      which stands for easy editor.  To start this editor, type
-      <command>ee <replaceable>filename</replaceable></command> where
+    <para>A simple editor to learn is &man.ee.1;, which stands for
+      easy editor.  To start this editor, type <command>ee
+	<replaceable>filename</replaceable></command> where
       <replaceable>filename</replaceable> is the name of the file to
       be edited.  Once inside the editor, all of the commands for
       manipulating the editor's functions are listed at the top of the
@@ -2353,10 +2330,9 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       <keycap>Ctrl</keycap>, so <literal>^e</literal> expands to
       <keycombo
 	action="simul"><keycap>Ctrl</keycap><keycap>e</keycap></keycombo>.
-      To leave &man.ee.1;, press
-      <keycap>Esc</keycap>, then choose the <quote>leave
-	editor</quote> option from the main menu.  The editor will
-      prompt to save any changes if the file has been
+      To leave &man.ee.1;, press <keycap>Esc</keycap>, then choose
+      the <quote>leave editor</quote> option from the main menu.
+      The editor will prompt to save any changes if the file has been
       modified.</para>
 
     <indexterm>
@@ -2375,9 +2351,8 @@ Swap: 256M Total, 38M Used, 217M Free, 1
     </indexterm>
 
     <para>&os; also comes with more powerful text editors, such as
-      &man.vi.1;, as part of the base system.
-      Other editors, like <filename
-	role="package">editors/emacs</filename> and
+      &man.vi.1;, as part of the base system.  Other editors, like
+      <filename role="package">editors/emacs</filename> and
       <filename role="package">editors/vim</filename>, are part of the
       &os; Ports Collection.  These editors offer more functionality
       at the expense of being a more complicated to learn.  Learning a
@@ -2407,8 +2382,8 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       keyboard.</para>
 
     <para>Most devices in a &os; must be accessed through special
-      files called device nodes, which are located in
-      <filename class="directory">/dev</filename>.</para>
+      files called device nodes, which are located in <filename
+	class="directory">/dev</filename>.</para>
 
     <sect2>
       <title>Creating Device Nodes</title>
@@ -2482,8 +2457,8 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       the &man.a.out.5; format, a technology tried and proven through
       many generations of BSD releases, until the beginning of the 3.X
       branch.  Though it was possible to build and run native
-      <acronym>ELF</acronym> binaries and kernels on a &os;
-      system for some time before that, &os; initially resisted the
+      <acronym>ELF</acronym> binaries and kernels on a &os; system
+      for some time before that, &os; initially resisted the
       <quote>push</quote> to switch to <acronym>ELF</acronym> as the
       default format.  Why?  When Linux made its painful transition to
       <acronym>ELF</acronym>, it was due to their inflexible
@@ -2543,9 +2518,8 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       programs rewrote them and added simpler support for building
       cross compilers and plugging in different formats.  Those who
       wanted to build cross compilers targeting &os; were out of luck
-      since the older sources that &os; had for
-      &man.as.1; and &man.ld.1;
-      were not up to the task.  The new GNU tools chain
+      since the older sources that &os; had for &man.as.1; and
+      &man.ld.1; were not up to the task.  The new GNU tools chain
       (<application>binutils</application>) supports cross
       compiling, <acronym>ELF</acronym>, shared libraries, and C++
       extensions.  In addition, many vendors release
@@ -2583,8 +2557,8 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       <screen>&prompt.user; <userinput>man <replaceable>command</replaceable></userinput></screen>
 
       <para>where <replaceable>command</replaceable> is the name of
-	the command to learn about.  For example, to learn
-	more about &man.ls.1;, type:</para>
+	the command to learn about.  For example, to learn more about
+	&man.ls.1;, type:</para>
 
       <screen>&prompt.user; <userinput>man ls</userinput></screen>
 
@@ -2632,18 +2606,16 @@ Swap: 256M Total, 38M Used, 217M Free, 1
       <para>In some cases, the same topic may appear in more than one
 	section of the online manual.  For example, there is a
 	&man.chmod.1; user command and a
-	<function>chmod()</function> system call.  To tell
-	&man.man.1; which section to display, specify the
-	section number:</para>
+	<function>chmod()</function> system call.  To tell &man.man.1;
+	which section to display, specify the section number:</para>
 
       <screen>&prompt.user; <userinput>man 1 chmod</userinput></screen>
 
       <para>This will display the manual page for the user command
-	&man.chmod.1;.  References to a particular section
-	of the online manual are traditionally placed in parenthesis
-	in written documentation, so &man.chmod.1; refers to the
-	user command and &man.chmod.2; refers
-	to the system call.</para>
+	&man.chmod.1;.  References to a particular section of the
+	online manual are traditionally placed in parenthesis in
+	written documentation, so &man.chmod.1; refers to the user
+	command and &man.chmod.2; refers to the system call.</para>
 
       <para>If the command name is unknown, use <command>man
 	  -k</command> to search for keywords in the command
@@ -2655,8 +2627,8 @@ Swap: 256M Total, 38M Used, 217M Free, 1
 	keyword <quote>mail</quote> in their descriptions.  This is
 	equivalent to using &man.apropos.1;.</para>
 
-      <para>To determine what the commands in
-	<filename class="directory">/usr/bin</filename> do,
+      <para>To determine what the commands in <filename
+	  class="directory">/usr/bin</filename> do,
 	type:</para>
 
       <screen>&prompt.user; <userinput>cd /usr/bin</userinput>

From owner-svn-doc-projects@FreeBSD.ORG  Thu May  9 20:59:53 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 533F339F;
 Thu,  9 May 2013 20:59:53 +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 4467317F;
 Thu,  9 May 2013 20:59:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r49KxrWr037202;
 Thu, 9 May 2013 20:59:53 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r49KxrW3037201;
 Thu, 9 May 2013 20:59:53 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201305092059.r49KxrW3037201@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Thu, 9 May 2013 20:59:53 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41585 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/audit
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: Thu, 09 May 2013 20:59:53 -0000

Author: dru
Date: Thu May  9 20:59:52 2013
New Revision: 41585
URL: http://svnweb.freebsd.org/changeset/doc/41585

Log:
  This patch addresses the following:
  
  - fixes command/application tags with entities
  
  - fixes redundancy
  
  A subsequent patch will fix outstanding white space
  issues.
  
  Approved by:  bcr (mentor)

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

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/audit/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/audit/chapter.xml	Thu May  9 20:56:48 2013	(r41584)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/audit/chapter.xml	Thu May  9 20:59:52 2013	(r41585)
@@ -249,7 +249,7 @@ requirements. -->
 
       <listitem>
 	<para><filename>audit_warn</filename> - A customizable shell
-	  script used by <application>auditd</application> to generate
+	  script used by &man.auditd.8; to generate
 	  warning messages in exceptional situations, such as when
 	  space for audit records is running low or when the audit
 	  trail file has been rotated.</para>
@@ -460,9 +460,8 @@ requirements. -->
       <sect3 id="audit-auditcontrol">
 	<title>The <filename>audit_control</filename> File</title>
 
-	<para>The <filename>audit_control</filename> file specifies a
-	  number of defaults for the audit subsystem.  Viewing the
-	  contents of this file, we see the following:</para>
+	<para>A number of defaults for the audit subsystem are
+	  specified in <filename>audit_control</filename>:</para>
 
 	<programlisting>dir:/var/audit
 flags:lo
@@ -471,7 +470,7 @@ naflags:lo
 policy:cnt
 filesz:0</programlisting>
 
-	<para>The <option>dir</option> option is used to set one or
+	<para>The <option>dir</option> entry is used to set one or
 	  more directories where audit logs will be stored.  If more
 	  than one directory entry appears, they will be used in order
 	  as they fill.  It is common to configure audit so that audit
@@ -484,17 +483,17 @@ filesz:0</programlisting>
 	  example above, successful and failed login and logout events
 	  are audited for all users.</para>
 
-	<para>The <option>minfree</option> option defines the minimum
+	<para>The <option>minfree</option> entry defines the minimum
 	  percentage of free space for the file system where the audit
 	  trail is stored.  When this threshold is exceeded, a warning
 	  will be generated.  The above example sets the minimum free
 	  space to twenty percent.</para>
 
-	<para>The <option>naflags</option> option specifies audit
+	<para>The <option>naflags</option> specifies audit
 	  classes to be audited for non-attributed events, such as the
 	  login process and system daemons.</para>
 
-	<para>The <option>policy</option> option specifies a
+	<para>The <option>policy</option> entry specifies a
 	  comma-separated list of policy flags controlling various
 	  aspects of audit behavior.  The default
 	  <literal>cnt</literal> flag indicates that the system should
@@ -504,7 +503,7 @@ filesz:0</programlisting>
 	  to the &man.execve.2; system call to be audited as part of
 	  command execution.</para>
 
-	<para>The <option>filesz</option> option specifies the maximum
+	<para>The <option>filesz</option> entry specifies the maximum
 	  size in bytes to allow an audit trail file to grow to before
 	  automatically terminating and rotating the trail file.  The
 	  default, 0, disables automatic log rotation.  If the
@@ -516,9 +515,9 @@ filesz:0</programlisting>
       <sect3 id="audit-audituser">
 	<title>The <filename>audit_user</filename> File</title>
 
-	<para>The <filename>audit_user</filename> file permits the
-	  administrator to specify further audit requirements for
-	  specific users.  Each line configures auditing for a user
+	<para>The administrator can specify further audit requirements
+	  for specific users in <filename>audit_user</filename>.
+	  Each line configures auditing for a user
 	  via two fields: the first is the
 	  <literal>alwaysaudit</literal> field, which specifies a set
 	  of events that should always be audited for the user, and
@@ -527,14 +526,14 @@ filesz:0</programlisting>
 	  the user.</para>
 
 	<para>The following example <filename>audit_user</filename>
-	  file audits login/logout events and successful command
-	  execution for the <username>root</username> user, and audits
-	  file creation and successful command execution for the
-	  <username>www</username> user.  If used with the example
-	  <filename>audit_control</filename> file above, the
+	  audits login/logout events and successful command
+	  execution for <username>root</username>, and audits
+	  file creation and successful command execution for
+	  <username>www</username>.  If used with the above example
+	  <filename>audit_control</filename>, the
 	  <literal>lo</literal> entry for <username>root</username> is
 	  redundant, and login/logout events will also be audited for
-	  the <username>www</username> user.</para>
+	  <username>www</username>.</para>
 
 	<programlisting>root:lo,+ex:no
 www:fc,+ex:no</programlisting>
@@ -553,12 +552,13 @@ www:fc,+ex:no</programlisting>
 	&man.praudit.1; command converts trail files to a simple text
 	format; the &man.auditreduce.1; command may be used to reduce
 	the audit trail file for analysis, archiving, or printing
-	purposes.  <command>auditreduce</command> supports a variety
-	of selection parameters, including event type, event class,
+	purposes.  A variety of selection
+	parameters are supported by &man.auditreduce.1;,
+	including event type, event class,
 	user, date or time of the event, and the file path or object
 	acted on.</para>
 
-      <para>For example, the <command>praudit</command> utility will
+      <para>For example, &man.praudit.1; will
 	dump the entire contents of a specified audit log in plain
 	text:</para>
 
@@ -569,7 +569,7 @@ www:fc,+ex:no</programlisting>
 	the audit log to dump.</para>
 
       <para>Audit trails consist of a series of audit records made up
-	of tokens, which <command>praudit</command> prints
+	of tokens, which &man.praudit.1; prints
 	sequentially one per line.  Each token is of a specific type,
 	such as <literal>header</literal> holding an audit record
 	header, or <literal>path</literal> holding a file path from a
@@ -605,9 +605,10 @@ trailer,133</programlisting>
 	successful execution, and the <literal>trailer</literal>
 	concludes the record.</para>
 
-      <para><command>praudit</command> also supports
-	an XML output format, which can be selected using the
-	<option>-x</option> argument.</para>
+      <para><acronym>XML</acronym> output format is also supported by
+	&man.praudit.1;,
+	and can be selected using
+	<option>-x</option>.</para>
     </sect2>
 
     <sect2>
@@ -619,10 +620,9 @@ trailer,133</programlisting>
 
       <screen>&prompt.root; <userinput>auditreduce -u trhodes /var/audit/AUDITFILE | praudit</userinput></screen>
 
-      <para>This will select all audit records produced for the user
-	<username>trhodes</username> stored in the
-	<filename><replaceable>AUDITFILE</replaceable></filename>
-	file.</para>
+      <para>This will select all audit records produced for
+	<username>trhodes</username> stored in
+	<filename><replaceable>AUDITFILE</replaceable></filename>.</para>
     </sect2>
 
     <sect2>
@@ -674,7 +674,7 @@ trailer,133</programlisting>
 	  SSH session, then a continuous stream of audit events will
 	  be generated at a high rate, as each event being printed
 	  will generate another event.  It is advisable to run
-	  <command>praudit</command> on an audit pipe device from
+	  &man.praudit.1; on an audit pipe device from
 	  sessions without fine-grained I/O auditing in order to avoid
 	  this happening.</para>
       </warning>
@@ -685,10 +685,10 @@ trailer,133</programlisting>
 
       <para>Audit trails are written to only by the kernel, and
 	managed only by the audit daemon,
-	<application>auditd</application>.  Administrators should not
+	&man.auditd.8;.  Administrators should not
 	attempt to use &man.newsyslog.conf.5; or other tools to
 	directly rotate audit logs.  Instead, the
-	<command>audit</command> management tool may be used to shut
+	&man.audit.8; management tool may be used to shut
 	down auditing, reconfigure the audit system, and perform log
 	rotation.  The following command causes the audit daemon to
 	create a new audit log and signal the kernel to switch to
@@ -699,7 +699,7 @@ trailer,133</programlisting>
       <screen>&prompt.root; <userinput>audit -n</userinput></screen>
 
       <warning>
-	<para>If the <application>auditd</application> daemon is not
+	<para>If &man.auditd.8; is not
 	  currently running, this command will fail and an error
 	  message will be produced.</para>
       </warning>
@@ -714,7 +714,7 @@ trailer,133</programlisting>
 	new <filename>/etc/crontab</filename>.</para>
 
       <para>Automatic rotation of the audit trail file based on file
-	size is possible via the <option>filesz</option> option in
+	size is possible using <option>filesz</option> in
 	&man.audit.control.5;, and is described in the configuration
 	files section of this chapter.</para>
     </sect2>

From owner-svn-doc-projects@FreeBSD.ORG  Fri May 10 11:55:41 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 56132F6D;
 Fri, 10 May 2013 11:55:41 +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 47926341;
 Fri, 10 May 2013 11:55: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 r4ABtfZG053743;
 Fri, 10 May 2013 11:55:41 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4ABtfO6053742;
 Fri, 10 May 2013 11:55:41 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201305101155.r4ABtfO6053742@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Fri, 10 May 2013 11:55:41 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41589 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/audit
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, 10 May 2013 11:55:41 -0000

Author: dru
Date: Fri May 10 11:55:40 2013
New Revision: 41589
URL: http://svnweb.freebsd.org/changeset/doc/41589

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/audit/chapter.xml

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/audit/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/audit/chapter.xml	Fri May 10 11:40:22 2013	(r41588)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/audit/chapter.xml	Fri May 10 11:55:40 2013	(r41589)
@@ -60,8 +60,8 @@ requirements. -->
       </listitem>
 
       <listitem>
-	<para>How to configure Event Auditing on &os; for users
-	  and processes.</para>
+	<para>How to configure Event Auditing on &os; for users and
+	  processes.</para>
       </listitem>
 
       <listitem>
@@ -85,8 +85,8 @@ requirements. -->
       </listitem>
 
       <listitem>
-	<para>Have some familiarity with security and how it
-	  pertains to &os; (<xref linkend="security"/>).</para>
+	<para>Have some familiarity with security and how it pertains
+	  to &os; (<xref linkend="security"/>).</para>
       </listitem>
     </itemizedlist>
 
@@ -104,9 +104,9 @@ requirements. -->
 	Administrators should take into account disk space
 	requirements associated with high volume audit configurations.
 	For example, it may be desirable to dedicate a file system to
-	the <filename class="directory">/var/audit</filename> tree so that other file
-	systems are not affected if the audit file system becomes
-	full.</para>
+	the <filename class="directory">/var/audit</filename> tree
+	so that other file systems are not affected if the audit file
+	system becomes full.</para>
     </warning>
   </sect1>
 
@@ -133,9 +133,9 @@ requirements. -->
       <listitem>
 	<para><emphasis>class</emphasis>: Event classes are named sets
 	  of related events, and are used in selection expressions.
-	  Commonly used classes of events include
-	  <quote>file creation</quote> (fc), <quote>exec</quote> (ex)
-	  and <quote>login_logout</quote> (lo).</para>
+	  Commonly used classes of events include <quote>file
+	    creation</quote> (fc), <quote>exec</quote> (ex) and
+	  <quote>login_logout</quote> (lo).</para>
       </listitem>
 
       <listitem>
@@ -199,8 +199,8 @@ requirements. -->
     <programlisting>options	AUDIT</programlisting>
 
     <para>Rebuild and reinstall
-      the kernel via the normal process explained in
-      <xref linkend="kernelconfig"/>.</para>
+      the kernel via the normal process explained in <xref
+	linkend="kernelconfig"/>.</para>
 
     <para>Once an audit-enabled kernel is built, installed, and the
       system has been rebooted, enable the audit daemon by adding the
@@ -249,10 +249,10 @@ requirements. -->
 
       <listitem>
 	<para><filename>audit_warn</filename> - A customizable shell
-	  script used by &man.auditd.8; to generate
-	  warning messages in exceptional situations, such as when
-	  space for audit records is running low or when the audit
-	  trail file has been rotated.</para>
+	  script used by &man.auditd.8; to generate warning messages
+	  in exceptional situations, such as when space for audit
+	  records is running low or when the audit trail file has
+	  been rotated.</para>
       </listitem>
     </itemizedlist>
 
@@ -400,8 +400,8 @@ requirements. -->
       </itemizedlist>
 
       <para>These audit event classes may be customized by modifying
-	the <filename>audit_class</filename> and
-	<filename>audit_event</filename> configuration files.</para>
+	the <filename>audit_class</filename> and <filename>audit_
+	  event</filename> configuration files.</para>
 
       <para>Each audit class in the list is combined with a prefix
 	indicating whether successful/failed operations are matched,
@@ -451,11 +451,10 @@ requirements. -->
       <title>Configuration Files</title>
 
       <para>In most cases, administrators will need to modify only two
-	files when configuring the audit system:
-	<filename>audit_control</filename> and
-	<filename>audit_user</filename>.  The first controls
-	system-wide audit properties and policies; the second may be
-	used to fine-tune auditing by user.</para>
+	files when configuring the audit system: <filename>audit_
+	  control</filename> and <filename>audit_user</filename>.
+	The first controls system-wide audit properties and policies;
+	the second may be used to fine-tune auditing by user.</para>
 
       <sect3 id="audit-auditcontrol">
 	<title>The <filename>audit_control</filename> File</title>
@@ -489,9 +488,9 @@ filesz:0</programlisting>
 	  will be generated.  The above example sets the minimum free
 	  space to twenty percent.</para>
 
-	<para>The <option>naflags</option> specifies audit
-	  classes to be audited for non-attributed events, such as the
-	  login process and system daemons.</para>
+	<para>The <option>naflags</option> specifies audit classes
+	  to be audited for non-attributed events, such as the login
+	  process and system daemons.</para>
 
 	<para>The <option>policy</option> entry specifies a
 	  comma-separated list of policy flags controlling various
@@ -517,13 +516,12 @@ filesz:0</programlisting>
 
 	<para>The administrator can specify further audit requirements
 	  for specific users in <filename>audit_user</filename>.
-	  Each line configures auditing for a user
-	  via two fields: the first is the
-	  <literal>alwaysaudit</literal> field, which specifies a set
-	  of events that should always be audited for the user, and
-	  the second is the <literal>neveraudit</literal> field, which
-	  specifies a set of events that should never be audited for
-	  the user.</para>
+	  Each line configures auditing for a user via two fields:
+	  the first is the <literal>alwaysaudit</literal> field,
+	  which specifies a set of events that should always be
+	  audited for the user, and the second is the
+	  <literal>neveraudit</literal> field, which specifies a set
+	  of events that should never be audited for the user.</para>
 
 	<para>The following example <filename>audit_user</filename>
 	  audits login/logout events and successful command
@@ -552,15 +550,13 @@ www:fc,+ex:no</programlisting>
 	&man.praudit.1; command converts trail files to a simple text
 	format; the &man.auditreduce.1; command may be used to reduce
 	the audit trail file for analysis, archiving, or printing
-	purposes.  A variety of selection
-	parameters are supported by &man.auditreduce.1;,
-	including event type, event class,
+	purposes.  A variety of selection parameters are supported by
+	&man.auditreduce.1;, including event type, event class,
 	user, date or time of the event, and the file path or object
 	acted on.</para>
 
-      <para>For example, &man.praudit.1; will
-	dump the entire contents of a specified audit log in plain
-	text:</para>
+      <para>For example, &man.praudit.1; will dump the entire
+	contents of a specified audit log in plain text:</para>
 
       <screen>&prompt.root; <userinput>praudit /var/audit/AUDITFILE</userinput></screen>
 
@@ -569,11 +565,11 @@ www:fc,+ex:no</programlisting>
 	the audit log to dump.</para>
 
       <para>Audit trails consist of a series of audit records made up
-	of tokens, which &man.praudit.1; prints
-	sequentially one per line.  Each token is of a specific type,
-	such as <literal>header</literal> holding an audit record
-	header, or <literal>path</literal> holding a file path from a
-	name lookup.  The following is an example of an
+	of tokens, which &man.praudit.1; prints sequentially one per
+	line.  Each token is of a specific type, such as
+	<literal>header</literal> holding an audit record header, or
+	<literal>path</literal> holding a file path from a name
+	lookup.  The following is an example of an
 	<literal>execve</literal> event:</para>
 
       <programlisting>header,133,10,execve(2),0,Mon Sep 25 15:58:03 2006, + 384 msec
@@ -606,8 +602,7 @@ trailer,133</programlisting>
 	concludes the record.</para>
 
       <para><acronym>XML</acronym> output format is also supported by
-	&man.praudit.1;,
-	and can be selected using
+	&man.praudit.1;, and can be selected using
 	<option>-x</option>.</para>
     </sect2>
 
@@ -629,10 +624,10 @@ trailer,133</programlisting>
       <title>Delegating Audit Review Rights</title>
 
       <para>Members of the <groupname>audit</groupname> group are
-	given permission to read audit trails in
-	<filename class="directory">/var/audit</filename>; by default, this group is
-	empty, so only the <username>root</username> user may read
-	audit trails.  Users may be added to the
+	given permission to read audit trails in <filename
+	  class="directory">/var/audit</filename>; by default, this
+	group is empty, so only the <username>root</username> user
+	may read audit trails.  Users may be added to the
 	<groupname>audit</groupname> group in order to delegate audit
 	review rights to the user.  As the ability to track audit log
 	contents provides significant insight into the behavior of
@@ -674,9 +669,9 @@ trailer,133</programlisting>
 	  SSH session, then a continuous stream of audit events will
 	  be generated at a high rate, as each event being printed
 	  will generate another event.  It is advisable to run
-	  &man.praudit.1; on an audit pipe device from
-	  sessions without fine-grained I/O auditing in order to avoid
-	  this happening.</para>
+	  &man.praudit.1; on an audit pipe device from sessions
+	  without fine-grained I/O auditing in order to avoid this
+	  happening.</para>
       </warning>
     </sect2>
 
@@ -684,24 +679,23 @@ trailer,133</programlisting>
       <title>Rotating Audit Trail Files</title>
 
       <para>Audit trails are written to only by the kernel, and
-	managed only by the audit daemon,
-	&man.auditd.8;.  Administrators should not
-	attempt to use &man.newsyslog.conf.5; or other tools to
-	directly rotate audit logs.  Instead, the
-	&man.audit.8; management tool may be used to shut
-	down auditing, reconfigure the audit system, and perform log
-	rotation.  The following command causes the audit daemon to
-	create a new audit log and signal the kernel to switch to
-	using the new log.  The old log will be terminated and
-	renamed, at which point it may then be manipulated by the
-	administrator.</para>
+	managed only by the audit daemon, &man.auditd.8;.
+	Administrators should not attempt to use
+	&man.newsyslog.conf.5; or other tools to directly rotate
+	audit logs.  Instead, the &man.audit.8; management tool may
+	be used to shut down auditing, reconfigure the audit system,
+	and perform log rotation.  The following command causes the
+	audit daemon to create a new audit log and signal the kernel
+	to switch to using the new log.  The old log will be
+	terminated and renamed, at which point it may then be
+	manipulated by the administrator.</para>
 
       <screen>&prompt.root; <userinput>audit -n</userinput></screen>
 
       <warning>
-	<para>If &man.auditd.8; is not
-	  currently running, this command will fail and an error
-	  message will be produced.</para>
+	<para>If &man.auditd.8; is not currently running, this
+	  command will fail and an error message will be
+	  produced.</para>
       </warning>
 
       <para>Adding the following line to
@@ -710,8 +704,8 @@ trailer,133</programlisting>
 
       <programlisting>0     */12       *       *       *       root    /usr/sbin/audit -n</programlisting>
 
-      <para>The change will take effect once you have saved the
-	new <filename>/etc/crontab</filename>.</para>
+      <para>The change will take effect once you have saved the new
+	<filename>/etc/crontab</filename>.</para>
 
       <para>Automatic rotation of the audit trail file based on file
 	size is possible using <option>filesz</option> in

From owner-svn-doc-projects@FreeBSD.ORG  Fri May 10 12:13: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 E9FB15C6;
 Fri, 10 May 2013 12:13:42 +0000 (UTC) (envelope-from dru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id DC42060F;
 Fri, 10 May 2013 12:13:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4ACDg08060832;
 Fri, 10 May 2013 12:13:42 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4ACDgGF060831;
 Fri, 10 May 2013 12:13:42 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201305101213.r4ACDgGF060831@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Fri, 10 May 2013 12:13:42 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41590 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/boot
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, 10 May 2013 12:13:43 -0000

Author: dru
Date: Fri May 10 12:13:42 2013
New Revision: 41590
URL: http://svnweb.freebsd.org/changeset/doc/41590

Log:
  Fix grammo.
  
  Submitted by:  bjk
  Approved by:  bcr (mentor)

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

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/boot/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/boot/chapter.xml	Fri May 10 11:55:40 2013	(r41589)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/boot/chapter.xml	Fri May 10 12:13:42 2013	(r41590)
@@ -84,7 +84,7 @@
       (<acronym>BIOS</acronym>) is responsible for loading the
       operating system.  To do this, the <acronym>BIOS</acronym>
       looks on the hard disk for the Master Boot Record
-      (<acronym>MBR</acronym>), which must be located on a specific
+      (<acronym>MBR</acronym>), which must be located in a specific
       place on the disk.  The <acronym>BIOS</acronym> has enough
       knowledge to load and run the <acronym>MBR</acronym>, and
       assumes that the <acronym>MBR</acronym> can then carry out the

From owner-svn-doc-projects@FreeBSD.ORG  Fri May 10 14:00: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 [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 75569E73;
 Fri, 10 May 2013 14:00:18 +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 66CADB15;
 Fri, 10 May 2013 14:00: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 r4AE0I6s097270;
 Fri, 10 May 2013 14:00:18 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4AE0INV097269;
 Fri, 10 May 2013 14:00:18 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201305101400.r4AE0INV097269@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Fri, 10 May 2013 14:00:18 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41591 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/advanced-networking
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, 10 May 2013 14:00:18 -0000

Author: dru
Date: Fri May 10 14:00:18 2013
New Revision: 41591
URL: http://svnweb.freebsd.org/changeset/doc/41591

Log:
  First pass through first 1/2 of a huge chapter. Subsequent patches
  to follow. This patch addresses the following:
  
  - &os;, e.g., you
  
  - most acronyms
  
  - grammar fixes and general tightening
  
  - fixes command/app tags which should be entities
  
  Approved by:  bcr (mentor)

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

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml	Fri May 10 12:13:42 2013	(r41590)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml	Fri May 10 14:00:18 2013	(r41591)
@@ -11,7 +11,7 @@
   <sect1 id="advanced-networking-synopsis">
     <title>Synopsis</title>
 
-    <para>This chapter will cover a number of advanced networking
+    <para>This chapter covers a number of advanced networking
       topics.</para>
 
     <para>After reading this chapter, you will know:</para>
@@ -27,7 +27,7 @@
       </listitem>
 
       <listitem>
-	<para>How to make FreeBSD act as a bridge.</para>
+	<para>How to make &os; act as a bridge.</para>
       </listitem>
 
       <listitem>
@@ -36,8 +36,9 @@
       </listitem>
 
       <listitem>
-	<para>How to set up network PXE booting with an NFS root file
-	  system.</para>
+	<para>How to set up network <acronym>PXE</acronym> booting
+	  with an
+	  <acronym>NFS</acronym> root filesystem.</para>
       </listitem>
 
       <listitem>
@@ -45,16 +46,17 @@
       </listitem>
 
       <listitem>
-	<para>How to set up IPv6 on a FreeBSD machine.</para>
+	<para>How to set up IPv6 on a &os; machine.</para>
       </listitem>
 
       <listitem>
-	<para>How to configure ATM.</para>
+	<para>How to configure <acronym>ATM</acronym>.</para>
       </listitem>
 
       <listitem>
-	<para>How to enable and utilize the features of CARP, the
-	  Common Address Redundancy Protocol in &os;</para>
+	<para>How to enable and utilize the features of the
+	  Common Address Redundancy Protocol
+	  (<acronym>CARP</acronym>) in &os;.</para>
       </listitem>
     </itemizedlist>
 
@@ -71,7 +73,7 @@
       </listitem>
 
       <listitem>
-	<para>Know how to configure and install a new FreeBSD kernel
+	<para>Know how to configure and install a new &os; kernel
 	  (<xref linkend="kernelconfig"/>).</para>
       </listitem>
 
@@ -105,22 +107,21 @@
       one to the other.  This is called
       <firstterm>routing</firstterm>.  A <quote>route</quote> is a
       defined pair of addresses: a <quote>destination</quote> and a
-      <quote>gateway</quote>.  The pair indicates that if you are
+      <quote>gateway</quote>.  The pair indicates that when
       trying to get to this <emphasis>destination</emphasis>,
       communicate through this <emphasis>gateway</emphasis>.  There
       are three types of destinations: individual hosts, subnets, and
       <quote>default</quote>.  The <quote>default route</quote> is
-      used if none of the other routes apply.  We will talk a little
-      bit more about default routes later on.  There are also three
+      used if none of the other routes apply.  There are also three
       types of gateways: individual hosts, interfaces (also called
-      <quote>links</quote>), and Ethernet hardware addresses (MAC
-      addresses).</para>
+      <quote>links</quote>), and Ethernet hardware
+      (<acronym>MAC</acronym>) addresses.</para>
 
     <sect2>
       <title>An Example</title>
 
-      <para>To illustrate different aspects of routing, we will use
-	the following example from <command>netstat</command>:</para>
+      <para>This example &man.netstat.1; output illustrates several
+	aspects of routing:</para>
 
       <screen>&prompt.user; <userinput>netstat -r</userinput>
 Routing tables
@@ -138,9 +139,9 @@ host2.example.com link#1             UC 
 224              link#1             UC          0        0</screen>
 
       <indexterm><primary>default route</primary></indexterm>
-      <para>The first two lines specify the default route (which we
-	will cover in the
-	<link linkend="network-routing-default">next section</link>)
+      <para>The first two lines specify the default route,
+	described in more detail in 
+	<xref linkend="network-routing-default"/>,
 	and the <hostid>localhost</hostid> route.</para>
 
       <indexterm><primary>loopback device</primary></indexterm>
@@ -149,66 +150,65 @@ host2.example.com link#1             UC 
 	<literal>localhost</literal> is <devicename>lo0</devicename>,
 	also known as the loopback device.  This says to keep all
 	traffic for this destination internal, rather than sending it
-	out over the LAN, since it will only end up back where it
-	started.</para>
+	out over the network.</para>
 
       <indexterm>
 	<primary>Ethernet</primary>
 	<secondary>MAC address</secondary>
       </indexterm>
-      <para>The next thing that stands out are the addresses beginning
-	with <hostid role="mac">0:e0:</hostid>.  These are Ethernet
-	hardware addresses, which are also known as MAC addresses.
-	FreeBSD will automatically identify any hosts
-	(<hostid>test0</hostid> in the example) on the local Ethernet
-	and add a route for that host, directly to it over the
-	Ethernet interface, <devicename>ed0</devicename>.  There is
-	also a timeout (<literal>Expire</literal> column) associated
-	with this type of route, which is used if we fail to hear from
-	the host in a specific amount of time.  When this happens, the
+      <para>The addresses beginning
+	with <hostid role="mac">0:e0:</hostid> are Ethernet
+	hardware addresses, also known as <acronym>MAC</acronym>
+	addresses.
+	&os; will automatically identify any hosts,
+	<hostid>test0</hostid> in the example, on the local Ethernet
+	and add a route for that host over the
+	Ethernet interface, <devicename>ed0</devicename>.  This type
+	of route has a timeout, seen in the <literal>Expire</literal>
+	column, which is used if
+	the host does not respond in a specific amount of time.  When
+	this happens, the
 	route to this host will be automatically deleted.  These hosts
-	are identified using a mechanism known as RIP (Routing
-	Information Protocol), which figures out routes to local hosts
+	are identified using the Routing
+	Information Protocol (<acronym>RIP</acronym>), which
+	calculates routes to local hosts
 	based upon a shortest path determination.</para>
 
       <indexterm><primary>subnet</primary></indexterm>
 
-      <para>FreeBSD will also add subnet routes for the local subnet
-	(<hostid role="ipaddr">10.20.30.255</hostid> is the broadcast
+      <para>&os; will add subnet routes for the local subnet.
+	<hostid role="ipaddr">10.20.30.255</hostid> is the broadcast
 	address for the subnet
-	<hostid role="ipaddr">10.20.30</hostid>, and
+	<hostid role="ipaddr">10.20.30</hostid> and
 	<hostid role="domainname">example.com</hostid> is the domain
-	name associated with that subnet).  The designation
+	name associated with that subnet.  The designation
 	<literal>link#1</literal> refers to the first Ethernet card in
-	the machine.  You will notice no additional interface is
-	specified for those.</para>
+	the machine.</para>
 
-      <para>Both of these groups (local network hosts and local
-	subnets) have their routes automatically configured by a
-	daemon called <application>routed</application>.  If this is
-	not run, then only routes which are statically defined (i.e.,
-	entered explicitly) will exist.</para>
-
-      <para>The <literal>host1</literal> line refers to our host,
-	which it knows by Ethernet address.  Since we are the sending
-	host, FreeBSD knows to use the loopback interface
-	(<devicename>lo0</devicename>) rather than sending it out over
+      <para>Local network hosts and local
+	subnets have their routes automatically configured by a
+	daemon called &man.routed.8;.  If it is
+	not running, only routes which are statically defined
+	by the administrator will exist.</para>
+
+      <para>The <literal>host1</literal> line refers to the host
+	by its Ethernet address.  Since it is the sending
+	host, &os; knows to use the loopback interface
+	(<devicename>lo0</devicename>) rather than
 	the Ethernet interface.</para>
 
-      <para>The two <literal>host2</literal> lines are an example of
-	what happens when we use an &man.ifconfig.8; alias (see the
-	section on Ethernet for reasons why we would do this).  The
+      <para>The two <literal>host2</literal> lines represent aliases
+	which were created using &man.ifconfig.8;.  The
 	<literal>=&gt;</literal> symbol after the
-	<devicename>lo0</devicename> interface says that not only are
-	we using the loopback (since this address also refers to the
-	local host), but specifically it is an alias.  Such routes
+	<devicename>lo0</devicename> interface says that an alias
+	has been set in addition to the loopback address.  Such routes
 	only show up on the host that supports the alias; all other
-	hosts on the local network will simply have a
+	hosts on the local network will have a
 	<literal>link#1</literal> line for such routes.</para>
 
       <para>The final line (destination subnet
-	<hostid role="ipaddr">224</hostid>) deals with multicasting,
-	which will be covered in another section.</para>
+	<hostid role="ipaddr">224</hostid>) deals with
+	multicasting.</para>
 
       <para>Finally, various attributes of each route can be seen in
 	the <literal>Flags</literal> column.  Below is a short table
@@ -247,7 +247,7 @@ host2.example.com link#1             UC 
 	    <row>
 	      <entry>C</entry>
 	      <entry>Clone: Generates a new route based upon this
-		route for machines we connect to.  This type of route
+		route for machines to connect to.  This type of route
 		is normally used for local networks.</entry>
 	    </row>
 
@@ -276,25 +276,24 @@ host2.example.com link#1             UC 
       <para>When the local system needs to make a connection to a
 	remote host, it checks the routing table to determine if a
 	known path exists.  If the remote host falls into a subnet
-	that we know how to reach (Cloned routes), then the system
-	checks to see if it can connect along that interface.</para>
+	that it knows how to reach, the system
+	checks to see if it can connect using that interface.</para>
 
       <para>If all known paths fail, the system has one last option:
 	the <quote>default</quote> route.  This route is a special
 	type of gateway route (usually the only one present in the
 	system), and is always marked with a <literal>c</literal> in
 	the flags field.  For hosts on a local area network, this
-	gateway is set to whatever machine has a direct connection to
-	the outside world (whether via PPP link, DSL, cable modem, T1,
-	or another network interface).</para>
+	gateway is set to the system which has a direct connection to
+	the Internet.</para>
 
-      <para>If you are configuring the default route for a machine
+      <para>The default route for a machine
 	which itself is functioning as the gateway to the outside
-	world, then the default route will be the gateway machine at
-	your Internet Service Provider's (ISP) site.</para>
+	world, will be the gateway machine at
+	the Internet Service Provider (<acronym>ISP</acronym>).</para>
 
-      <para>Let us look at an example of default routes.  This is a
-	common configuration:</para>
+      <para>This example is a
+	common configuration for a default route:</para>
 
       <mediaobject>
 	<imageobject>
@@ -308,13 +307,15 @@ host2.example.com link#1             UC 
       </mediaobject>
 
       <para>The hosts <hostid>Local1</hostid> and
-	<hostid>Local2</hostid> are at your site.
-	<hostid>Local1</hostid> is connected to an ISP via a dial up
-	PPP connection.  This PPP server computer is connected through
+	<hostid>Local2</hostid> are on the local network.
+	<hostid>Local1</hostid> is connected to an
+	<acronym>ISP</acronym> using a
+	<acronym>PPP</acronym> connection.  This
+	<acronym>PPP</acronym> server is connected through
 	a local area network to another gateway computer through an
-	external interface to the ISPs Internet feed.</para>
+	external interface to the <acronym>ISP</acronym>.</para>
 
-      <para>The default routes for each of your machines will
+      <para>The default routes for each machine will
 	be:</para>
 
       <informaltable frame="none" pgwide="1">
@@ -343,25 +344,31 @@ host2.example.com link#1             UC 
 	</tgroup>
       </informaltable>
 
-      <para>A common question is <quote>Why (or how) would we set
-	  the <hostid>T1-GW</hostid> to be the default gateway for
-	  <hostid>Local1</hostid>, rather than the ISP server it is
+      <para>A common question is <quote>Why is
+	  <hostid>T1-GW</hostid> configured as the default gateway for
+	  <hostid>Local1</hostid>, rather than the
+	  <acronym>ISP</acronym> server it is
 	  connected to?</quote>.</para>
 
-      <para>Remember, since the PPP interface is using an address on
-	the ISP's local network for your side of the connection,
-	routes for any other machines on the ISP's local network will
-	be automatically generated.  Hence, you will already know how
+      <para>Since the <acronym>PPP</acronym> interface is using an
+	address on
+	the <acronym>ISP</acronym>'s local network for the local side
+	of the connection,
+	routes for any other machines on the <acronym>ISP</acronym>'s
+	local network will
+	be automatically generated.  The system already knows how
 	to reach the <hostid>T1-GW</hostid> machine, so there is no
-	need for the intermediate step of sending traffic to the ISP
+	need for the intermediate step of sending traffic to the
+	<acronym>ISP</acronym>'s
 	server.</para>
 
       <para>It is common to use the address
 	<hostid role="ipaddr">X.X.X.1</hostid> as the gateway address
-	for your local network.  So (using the same example), if your
-	local class-C address space was
-	<hostid role="ipaddr">10.20.30</hostid> and your ISP was using
-	<hostid role="ipaddr">10.9.9</hostid> then the default routes
+	for the local network.  So, if the
+	local class C address space is
+	<hostid role="ipaddr">10.20.30</hostid> and the
+	<acronym>ISP</acronym> is using
+	<hostid role="ipaddr">10.9.9</hostid>, the default routes
 	would be:</para>
 
       <informaltable frame="none" pgwide="1">
@@ -387,19 +394,19 @@ host2.example.com link#1             UC 
       </informaltable>
 
       <para>The default route can be easily defined in
-	<filename>/etc/rc.conf</filename>.  In our example, on
-	the <hostid>Local2</hostid> machine, we added the following
-	line in <filename>/etc/rc.conf</filename>:</para>
+	<filename>/etc/rc.conf</filename>.  In this example, on
+	<hostid>Local2</hostid>, add the following
+	line to <filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>defaultrouter="10.20.30.1"</programlisting>
 
-      <para>It is also possible to do it directly from the command
-	line with the &man.route.8; command:</para>
+      <para>It is also possible to add the route directly using
+	&man.route.8;:</para>
 
       <screen>&prompt.root; <userinput>route add default 10.20.30.1</userinput></screen>
 
       <para>For more information on manual manipulation of network
-	routing tables, consult the &man.route.8; manual page.</para>
+	routing tables, refer to &man.route.8;.</para>
     </sect2>
 
     <sect2 id="network-dual-homed-hosts">
@@ -407,32 +414,28 @@ host2.example.com link#1             UC 
 
       <indexterm><primary>dual homed hosts</primary></indexterm>
 
-      <para>There is one other type of configuration that we should
-	cover, and that is a host that sits on two different networks.
-	Technically, any machine functioning as a gateway (in the
-	example above, using a PPP connection) counts as a dual-homed
-	host.  But the term is really only used to refer to a machine
-	that sits on two local-area networks.</para>
-
-      <para>In one case, the machine has two Ethernet cards, each
-	having an address on the separate subnets.  Alternately, the
-	machine may only have one Ethernet card, and be using
+      <para>A a dual-homed system
+	is a host which resides on two different networks.</para>
+
+      <para>The dual-homed machine might have two Ethernet cards, each
+	having an address on a separate subnet.  Alternately, the
+	machine can have one Ethernet card and uses
 	&man.ifconfig.8; aliasing.  The former is used if two
-	physically separate Ethernet networks are in use, the latter
+	physically separate Ethernet networks are in use and the
+	latter
 	if there is one physical network segment, but two logically
 	separate subnets.</para>
 
       <para>Either way, routing tables are set up so that each subnet
 	knows that this machine is the defined gateway (inbound route)
 	to the other subnet.  This configuration, with the machine
-	acting as a router between the two subnets, is often used when
-	we need to implement packet filtering or firewall security in
+	acting as a router between the two subnets, is often used
+	to implement packet filtering or firewall security in
 	either or both directions.</para>
 
-      <para>If you want this machine to actually forward packets
-	between the two interfaces, you need to tell FreeBSD to enable
-	this ability.  See the next section for more details on how
-	to do this.</para>
+      <para>For this machine to forward packets
+	between the two interfaces, &os; must be configured as a
+	router, as demonstrated in the next section.</para>
     </sect2>
 
     <sect2 id="network-dedicated-router">
@@ -440,10 +443,10 @@ host2.example.com link#1             UC 
 
       <indexterm><primary>router</primary></indexterm>
 
-      <para>A network router is simply a system that forwards packets
+      <para>A network router is a system that forwards packets
 	from one interface to another.  Internet standards and good
-	engineering practice prevent the FreeBSD Project from enabling
-	this by default in FreeBSD.  You can enable this feature by
+	engineering practice prevent the &os; Project from enabling
+	this by default in &os;.  This feature can be enabled by
 	changing the following variable to <literal>YES</literal> in
 	&man.rc.conf.5;:</para>
 
@@ -451,23 +454,21 @@ host2.example.com link#1             UC 
 
       <para>This option will set the &man.sysctl.8; variable
 	<varname>net.inet.ip.forwarding</varname> to
-	<literal>1</literal>.  If you should need to stop routing
-	temporarily, you can reset this to <literal>0</literal>
-	temporarily.</para>
+	<literal>1</literal>.  To stop routing,
+	reset this to <literal>0</literal>.</para>
 
       <indexterm><primary>BGP</primary></indexterm>
       <indexterm><primary>RIP</primary></indexterm>
       <indexterm><primary>OSPF</primary></indexterm>
-      <para>Your new router will need routes to know where to send the
-	traffic.  If your network is simple enough you can use static
-	routes.  FreeBSD also comes with the standard BSD routing
-	daemon &man.routed.8;, which speaks RIP (both version 1 and
-	version 2) and IRDP.  Support for BGP v4, OSPF v2, and other
+      <para>The new router will need routes to know where to send the
+	traffic.  If the network is simple enough, static
+	routes can be used.  &os; comes with the standard BSD routing
+	daemon &man.routed.8;, which speaks <acronym>RIP</acronym>
+	versions 1 and 2, and <acronym>IRDP</acronym>.  Support for
+	<acronym>BGP</acronym>v4, <acronym>OSPF</acronym>v2, and other
 	sophisticated routing protocols is available with the
-	<filename role="package">net/zebra</filename> package.
-	Commercial products such as <application>&gated;</application>
-	are also available for more complex network routing
-	solutions.</para>
+	<filename role="package">net/zebra</filename> package or
+	port.</para>
     </sect2>
 
     <sect2 id="network-static-routes">
@@ -486,7 +487,7 @@ host2.example.com link#1             UC 
       <sect3>
 	<title>Manual Configuration</title>
 
-	<para>Let us assume we have a network as follows:</para>
+	<para>Consider the following network:</para>
 
 	<mediaobject>
 	  <imageobject>
@@ -520,21 +521,18 @@ host2.example.com link#1             UC 
 	  </textobject>
 	</mediaobject>
 
-	<para>In this scenario, <hostid>RouterA</hostid> is our &os;
+	<para>In this scenario, <hostid>RouterA</hostid> is a &os;
 	  machine that is acting as a router to the rest of the
 	  Internet.  It has a default route set to
 	  <hostid role="ipaddr">10.0.0.1</hostid> which allows it to
-	  connect with the outside world.  We will assume that
-	  <hostid>RouterB</hostid> is already configured properly and
-	  knows how to get wherever it needs to go.  (This is simple
-	  in this picture.  Just add a default route on
-	  <hostid>RouterB</hostid> using
+	  connect with the outside world.  <hostid>RouterB</hostid> is
+	  already configured properly as it
+	  uses
 	  <hostid role="ipaddr">192.168.1.1</hostid> as the
-	  gateway.)</para>
+	  gateway.</para>
 
-	<para>If we look at the routing table for
-	  <hostid>RouterA</hostid> we would see something like the
-	  following:</para>
+	<para>The routing table on
+	  <hostid>RouterA</hostid> looks something like this:</para>
 
 	<screen>&prompt.user; <userinput>netstat -nr</userinput>
 Routing tables
@@ -546,12 +544,12 @@ default            10.0.0.1           UG
 10.0.0.0/24        link#1             UC          0        0    xl0
 192.168.1.0/24     link#2             UC          0        0    xl1</screen>
 
-	<para>With the current routing table  <hostid>RouterA</hostid>
-	  will not be able to reach our Internal Net 2.  It does not
+	<para>With the current routing table, <hostid>RouterA</hostid>
+	  cannot reach Internal Net 2 as it does not
 	  have a route for
-	  <hostid role="ipaddr">192.168.2.0/24</hostid>.  One way to
-	  alleviate this is to manually add the route.  The following
-	  command would add the Internal Net 2 network to
+	  <hostid role="ipaddr">192.168.2.0/24</hostid>.  The
+	  following
+	  command adds the Internal Net 2 network to
 	  <hostid>RouterA</hostid>'s routing table using
 	  <hostid role="ipaddr">192.168.1.2</hostid> as the next
 	  hop:</para>
@@ -566,10 +564,10 @@ default            10.0.0.1           UG
       <sect3>
 	<title>Persistent Configuration</title>
 
-	<para>The above example is perfect for configuring a static
-	  route on a running system.  However, one problem is that the
-	  routing information will not persist if you reboot your &os;
-	  machine.  Additional static routes can be
+	<para>The above example configures a static
+	  route on a running system.  However, the
+	  routing information will not persist if the &os; system
+	  reboots.  Persistent static routes can be
 	  entered in <filename>/etc/rc.conf</filename>:</para>
 
 	<programlisting># Add Internal Net 2 as a static route
@@ -577,28 +575,25 @@ static_routes="internalnet2"
 route_internalnet2="-net 192.168.2.0/24 192.168.1.2"</programlisting>
 
 	<para>The <literal>static_routes</literal> configuration
-	  variable is a list of strings separated by a space.  Each
-	  string references to a route name.  In our above example we
-	  only have one string in <literal>static_routes</literal>.
-	  This string is <replaceable>internalnet2</replaceable>.  We
-	  then add a configuration variable called
+	  variable is a list of strings separated by a space, where
+	  each
+	  string references a route name.  This example
+	  only has one string in <literal>static_routes</literal>,
+	  <replaceable>internalnet2</replaceable>.  The variable
 	  <literal>route_<replaceable>internalnet2</replaceable></literal>
-	  where we put all of the configuration parameters we would
-	  give to the &man.route.8; command.  For our example above we
-	  would have used the command:</para>
+	  contains all of the configuration parameters
+	  to &man.route.8;.  This example is equivalent
+	  to the command:</para>
 
 	  <screen>&prompt.root; <userinput>route add -net 192.168.2.0/24 192.168.1.2</userinput></screen>
 
-	<para>so we need <literal>"-net 192.168.2.0/24
-	    192.168.1.2"</literal>.</para>
-
-	<para>As said above, we can have more than one string in
-	  <literal>static_routes</literal>.  This allows us to create
-	  multiple static routes.  The following lines shows an
+	<para>Using more than one string in
+	  <literal>static_routes</literal> creates
+	  multiple static routes.  The following shows an
 	  example of adding static routes for the
 	  <hostid role="ipaddr">192.168.0.0/24</hostid> and
-	  <hostid role="ipaddr">192.168.1.0/24</hostid> networks on an
-	  imaginary router:</para>
+	  <hostid role="ipaddr">192.168.1.0/24</hostid>
+	  networks:</para>
 
 	<programlisting>static_routes="net1 net2"
 route_net1="-net 192.168.0.0/24 192.168.0.1"
@@ -609,36 +604,26 @@ route_net2="-net 192.168.1.0/24 192.168.
     <sect2 id="network-routing-propagation">
       <title>Routing Propagation</title>
 
-      <indexterm><primary>routing propagation</primary></indexterm>
-      <para>We have already talked about how we define our routes to
-	the outside world, but not about how the outside world finds
-	us.</para>
-
-      <para>We already know that routing tables can be set up so that
-	all traffic for a particular address space (in our examples, a
-	class-C subnet) can be sent to a particular host on that
-	network, which will forward the packets inbound.</para>
-
-      <para>When you get an address space assigned to your site, your
-	service provider will set up their routing tables so that all
-	traffic for your subnet will be sent down your PPP link to
-	your site.  But how do sites across the country know to send
-	to your ISP?</para>
+      <para>When an address space is assigned to a network, the
+	service provider configures their routing tables so that all
+	traffic for the network will be sent to the link for the
+	site.  But how do external sites know to send their packets
+	to the network's <acronym>ISP</acronym>?</para>
 
-      <para>There is a system (much like the distributed DNS
-	information) that keeps track of all assigned address-spaces,
+      <para>There is a system
+	that keeps track of all assigned address spaces
 	and defines their point of connection to the Internet
-	Backbone.  The <quote>Backbone</quote> are the main trunk
-	lines that carry Internet traffic across the country, and
+	backbone, or the main trunk
+	lines that carry Internet traffic across the country and
 	around the world.  Each backbone machine has a copy of a
 	master set of tables, which direct traffic for a particular
 	network to a specific backbone carrier, and from there down
 	the chain of service providers until it reaches your
 	network.</para>
 
-      <para>It is the task of your service provider to advertise to
-	the backbone sites that they are the point of connection (and
-	thus the path inward) for your site.  This is known as route
+      <para>It is the task of the service provider to advertise to
+	the backbone sites that they are the point of connection, and
+	thus the path inward, for a site.  This is known as route
 	propagation.</para>
     </sect2>
 
@@ -646,23 +631,22 @@ route_net2="-net 192.168.1.0/24 192.168.
       <title>Troubleshooting</title>
 
       <indexterm>
-	<primary><command>traceroute</command></primary>
+	<primary>&man.traceroute.8;</primary>
       </indexterm>
 
-      <para>Sometimes, there is a problem with routing propagation,
-	and some sites are unable to connect to you.  Perhaps the most
+      <para>Sometimes, there is a problem with routing propagation
+	and some sites are unable to connect.  Perhaps the most
 	useful command for trying to figure out where routing is
-	breaking down is the &man.traceroute.8; command.  It is
-	equally useful if you cannot seem to make a connection to a
-	remote machine (i.e., &man.ping.8; fails).</para>
+	breaking down is &man.traceroute.8;.  It is
+	useful when &man.ping.8; fails.</para>
 
-      <para>The &man.traceroute.8; command is run with the name of the
-	remote host you are trying to connect to.  It will show the
+      <para>When using &man.traceroute.8;, include the name of the
+	remote host to connect to.  The output will show the
 	gateway hosts along the path of the attempt, eventually either
 	reaching the target host, or terminating because of a lack of
 	connection.</para>
 
-      <para>For more information, see the manual page for
+      <para>For more information, refer to
 	&man.traceroute.8;.</para>
     </sect2>
 
@@ -676,19 +660,20 @@ route_net2="-net 192.168.1.0/24 192.168.
 	<primary>kernel options</primary>
 	<secondary>MROUTING</secondary>
       </indexterm>
-      <para>FreeBSD supports both multicast applications and multicast
-	routing natively.  Multicast applications do not require any
-	special configuration of FreeBSD; applications will generally
+      <para>&os; natively supports both multicast applications and
+	multicast
+	routing.  Multicast applications do not require any
+	special configuration of &os;; as applications will generally
 	run out of the box.  Multicast routing
-	requires that support be compiled into the kernel:</para>
+	requires that support be compiled into a custom kernel:</para>
 
       <programlisting>options MROUTING</programlisting>
 
-      <para>In addition, the multicast routing daemon, &man.mrouted.8;
+      <para>The multicast routing daemon, &man.mrouted.8;,
 	must be configured to set up tunnels and
 	<acronym>DVMRP</acronym> via
 	<filename>/etc/mrouted.conf</filename>.  More details on
-	multicast configuration may be found in the manual page for
+	multicast configuration may be found in
 	&man.mrouted.8;.</para>
 
       <note>
@@ -735,38 +720,46 @@ route_net2="-net 192.168.1.0/24 192.168.
       <para>Most wireless networks are based on the &ieee; 802.11
 	standards.  A basic wireless network consists of multiple
 	stations communicating with radios that broadcast in either
-	the 2.4GHz or 5GHz band (though this varies according to the
+	the 2.4GHz or 5GHz band, though this varies according to the
 	locale and is also changing to enable communication in the
-	2.3GHz and 4.9GHz ranges).</para>
+	2.3GHz and 4.9GHz ranges.</para>
 
-      <para>802.11 networks are organized in two ways: in
-	<emphasis>infrastructure mode</emphasis> one station acts as a
-	master with all the other stations associating to it; the
-	network is known as a BSS and the master station is termed an
-	access point (AP).  In a BSS all communication passes through
-	the AP; even when one station wants to communicate with
-	another wireless station messages must go through the AP.  In
-	the second form of network there is no master and stations
-	communicate directly.  This form of network is termed an IBSS
+      <para>802.11 networks are organized in two ways.  In
+	<emphasis>infrastructure mode</emphasis>, one station acts as
+	a
+	master with all the other stations associating to it, the
+	network is known as a <acronym>BSS</acronym>, and the master
+	station is termed an
+	access point (<acronym>AP</acronym>).  In a
+	<acronym>BSS</acronym>, all communication passes through
+	the <acronym>AP</acronym>; even when one station wants to
+	communicate with
+	another wireless station, messages must go through the
+	<acronym>AP</acronym>.  In
+	the second form of network, there is no master and stations
+	communicate directly.  This form of network is termed an
+	<acronym>IBSS</acronym>
 	and is commonly known as an
 	<emphasis>ad-hoc network</emphasis>.</para>
 
       <para>802.11 networks were first deployed in the 2.4GHz band
 	using protocols defined by the &ieee; 802.11 and 802.11b
 	standard.  These specifications include the operating
-	frequencies, MAC layer characteristics including framing and
-	transmission rates (communication can be done at various
-	rates).  Later the 802.11a standard defined operation in the
-	5GHz band, including different signalling mechanisms and
-	higher transmission rates.  Still later the 802.11g standard
-	was defined to enable use of 802.11a signalling and
+	frequencies and the <acronym>MAC</acronym> layer
+	characteristics, including framing and
+	transmission rates, as communication can occur at various
+	rates.  Later, the 802.11a standard defined operation in the
+	5GHz band, including different signaling mechanisms and
+	higher transmission rates.  Still later, the 802.11g standard
+	defined the use of 802.11a signaling and
 	transmission mechanisms in the 2.4GHz band in such a way as to
 	be backwards compatible with 802.11b networks.</para>
 
-      <para>Separate from the underlying transmission techniques
+      <para>Separate from the underlying transmission techniques,
 	802.11 networks have a variety of security mechanisms.  The
 	original 802.11 specifications defined a simple security
-	protocol called WEP. This protocol uses a fixed pre-shared key
+	protocol called <acronym>WEP</acronym>.  This protocol uses a
+	fixed pre-shared key
 	and the RC4 cryptographic cipher to encode data transmitted on
 	a network.  Stations must all agree on the fixed key in order
 	to communicate.  This scheme was shown to be easily broken and
@@ -774,43 +767,57 @@ route_net2="-net 192.168.1.0/24 192.168.
 	joining networks.  Current security practice is given by the
 	&ieee; 802.11i specification that defines new cryptographic
 	ciphers and an additional protocol to authenticate stations to
-	an access point and exchange keys for doing data
-	communication.  Further, cryptographic keys are periodically
-	refreshed and there are mechanisms for detecting intrusion
-	attempts (and for countering intrusion attempts).  Another
+	an access point and exchange keys for data
+	communication.  Cryptographic keys are periodically
+	refreshed and there are mechanisms for detecting
+	and countering intrusion attempts.  Another
 	security protocol specification commonly used in wireless
-	networks is termed WPA.  This was a precursor to 802.11i
-	defined by an industry group as an interim measure while
-	waiting for 802.11i to be ratified.  WPA specifies a subset of
+	networks is termed <acronym>WPA</acronym>, which was a
+	precursor to 802.11i.  <acronym>WPA</acronym>
+	specifies a subset of
 	the requirements found in 802.11i and is designed for
-	implementation on legacy hardware.  Specifically WPA requires
-	only the TKIP cipher that is derived from the original WEP
-	cipher.  802.11i permits use of TKIP but also requires support
-	for a stronger cipher, AES-CCM, for encrypting data.  (The AES
-	cipher was not required in WPA because it was deemed too
+	implementation on legacy hardware.  Specifically,
+	<acronym>WPA</acronym> requires
+	only the <acronym>TKIP</acronym> cipher that is derived from
+	the original <acronym>WEP</acronym>
+	cipher.  802.11i permits use of <acronym>TKIP</acronym> but
+	also requires support
+	for a stronger cipher, AES-CCM, for encrypting data.  The
+	<acronym>AES</acronym>
+	cipher was not required in <acronym>WPA</acronym> because it
+	was deemed too
 	computationally costly to be implemented on legacy
-	hardware.)</para>
+	hardware.</para>
 
-      <para>Other than the above protocol standards the other
-	important standard to be aware of is 802.11e.  This defines
-	protocols for deploying multi-media applications such as
-	streaming video and voice over IP (VoIP) in an 802.11 network.
+      <para>The other
+	standard to be aware of is 802.11e.  It defines
+	protocols for deploying multimedia applications, such as
+	streaming video and voice over IP (<acronym>VoIP</acronym>),
+	in
+	an 802.11 network.
 	Like 802.11i, 802.11e also has a precursor specification
-	termed WME (later renamed WMM) that has been defined by an
+	termed <acronym>WME</acronym> (later renamed
+	<acronym>WMM</acronym>) that has been defined by an
 	industry group as a subset of 802.11e that can be deployed now
-	to enable multi-media applications while waiting for the final
+	to enable multimedia applications while waiting for the final
 	ratification of 802.11e.  The most important thing to know
-	about 802.11e and WME/WMM is that it enables prioritized
-	traffic use of a wireless network through Quality of Service
-	(QoS) protocols and enhanced media access protocols.  Proper
-	implementation of these protocols enable high speed bursting
+	about 802.11e and
+	<acronym>WME</acronym>/<acronym>WMM</acronym> is that it
+	enables prioritized
+	traffic over a wireless network through Quality of Service
+	(<acronym>QoS</acronym>) protocols and enhanced media access
+	protocols.  Proper
+	implementation of these protocols enables high speed bursting
 	of data and prioritized traffic flow.</para>
 
       <para>&os; supports networks that operate
-	using 802.11a, 802.11b, and 802.11g.  The WPA and 802.11i
+	using 802.11a, 802.11b, and 802.11g.  The
+	<acronym>WPA</acronym> and 802.11i
 	security protocols are likewise supported (in conjunction with
-	any of 11a, 11b, and 11g) and QoS and traffic prioritization
-	required by the WME/WMM protocols are supported for a limited
+	any of 11a, 11b, and 11g) and <acronym>QoS</acronym> and
+	traffic prioritization
+	required by the <acronym>WME</acronym>/<acronym>WMM</acronym>
+	protocols are supported for a limited
 	set of wireless devices.</para>
     </sect2>
 
@@ -820,63 +827,66 @@ route_net2="-net 192.168.1.0/24 192.168.
       <sect3>
 	<title>Kernel Configuration</title>
 
-	<para>To use wireless networking, you need a wireless
-	  networking card and to configure the kernel with the
-	  appropriate wireless networking support.  The latter is
-	  separated into multiple modules so that you only need to
-	  configure the software you are actually going to use.</para>
-
-	<para>The first thing you need is a wireless device.  The most
-	  commonly used devices are those that use parts made by
-	  Atheros.  These devices are supported by the &man.ath.4;
-	  driver and require the following line to be added to
+	<para>To use wireless networking, a wireless
+	  networking card is needed and the kernel needs to be
+	  configured with the
+	  appropriate wireless networking support.  The kernel is
+	  separated into multiple modules so that only the required
+	  support needs to be
+	  configured.</para>
+
+	<para>The most
+	  commonly used wireless devices are those that use parts made
+	  by
+	  Atheros.  These devices are supported by &man.ath.4;
+	  and require the following line to be added to
 	  <filename>/boot/loader.conf</filename>:</para>
 
 	<programlisting>if_ath_load="YES"</programlisting>
 
 	<para>The Atheros driver is split up into three separate
-	  pieces: the proper driver (&man.ath.4;), the hardware
+	  pieces: the driver (&man.ath.4;), the hardware
 	  support layer that handles chip-specific functions
-	  (&man.ath.hal.4;), and an algorithm for selecting which of
-	  several possible rates for transmitting frames
-	  (ath_rate_sample here).  When this support is loaded as
-	  kernel modules, these dependencies are automatically handled
-	  for you.  If, instead of an Atheros device, you had another
-	  device you would select the module for that device;
-	  e.g.:</para>
+	  (&man.ath.hal.4;), and an algorithm for selecting the
+	  rate for transmitting frames.
+	  When this support is loaded as
+	  kernel modules, any dependencies are automatically handled.
+	  To load support for a different type of wireless device,
+	  specify the module for that device.  This example is for
+	  devices based on the Intersil Prism parts (&man.wi.4;)
+	  driver:</para>
 
 	<programlisting>if_wi_load="YES"</programlisting>
 
-	<para>for devices based on the Intersil Prism parts
-	  (&man.wi.4; driver).</para>
-
 	<note>
-	  <para>In the rest of this document, we will use an
-	    &man.ath.4; device, the device name in the examples must
-	    be changed according to your configuration.  A list of
+	  <para>The examples in this section use an
+	    &man.ath.4; device and the device name in the examples
+	    must
+	    be changed according to the configuration.  A list of
 	    available wireless drivers and supported adapters can be
-	    found in the &os; Hardware Notes.  Copies of these notes
-	    for various releases and architectures are available on
+	    found in the &os; Hardware Notes, available on
 	    the <ulink
 	      url="http://www.FreeBSD.org/releases/index.html">Release
-	      Information</ulink> page of the &os; Web site.  If a
-	    native &os; driver for your wireless device does not
-	    exist, it may be possible to directly use the &windows;
+	      Information</ulink> page of the &os; website.  If a
+	    native &os; driver for the wireless device does not
+	    exist, it may be possible to use the &windows;
 	    driver with the help of the
 	    <link linkend="config-network-ndis">NDIS</link> driver
 	    wrapper.</para>
 	</note>
 
-	<para>With that, you will need the modules that implement
-	  cryptographic support for the security protocols you intend
-	  to use.  These are intended to be dynamically loaded on
-	  demand by the &man.wlan.4; module but for now they must be
+	<para>In addition, the modules that implement
+	  cryptographic support for the security protocols
+	  to use must be loaded.  These are intended to be dynamically
+	  loaded on
+	  demand by the &man.wlan.4; module, but for now they must be
 	  manually configured.  The following modules are available:
-	  &man.wlan.wep.4;, &man.wlan.ccmp.4; and &man.wlan.tkip.4;.
-	  Both &man.wlan.ccmp.4; and &man.wlan.tkip.4; drivers are
-	  only needed if you intend to use the WPA and/or 802.11i
-	  security protocols.  If your network does not use
-	  encryption, you will not need &man.wlan.wep.4; support.  To
+	  &man.wlan.wep.4;, &man.wlan.ccmp.4;, and &man.wlan.tkip.4;.
+	  The &man.wlan.ccmp.4; and &man.wlan.tkip.4; drivers are
+	  only needed when using the <acronym>WPA</acronym> or
+	  802.11i
+	  security protocols.  If the network does not use
+	  encryption, &man.wlan.wep.4; support is not needed.  To
 	  load these modules at boot time, add the following lines to
 	  <filename>/boot/loader.conf</filename>:</para>
 
@@ -884,17 +894,18 @@ route_net2="-net 192.168.1.0/24 192.168.
 wlan_ccmp_load="YES"
 wlan_tkip_load="YES"</programlisting>
 
-	<para>With this information in the system bootstrap
-	  configuration file (i.e.,
-	  <filename>/boot/loader.conf</filename>), you have to reboot
-	  your &os; box.  If you do not want to reboot your machine
-	  for the moment, you can load the modules by hand using
+	<para>Once this information has been added to
+	  <filename>/boot/loader.conf</filename>, reboot
+	  the &os; box.  Alternately,
+	  load the modules by hand using
 	  &man.kldload.8;.</para>
 
 	<note>
-	  <para>If you do not want to use modules, it is possible to
+	  <para>For users who do not want to use modules, it is
+	    possible to
 	    compile these drivers into the kernel by adding the
-	    following lines to your kernel configuration file:</para>
+	    following lines to a custom kernel configuration
+	    file:</para>
 
 	  <programlisting>device wlan              # 802.11 support
 device wlan_wep          # 802.11 WEP support
@@ -907,12 +918,13 @@ options AH_SUPPORT_AR5416 # enable AR541
 device ath_rate_sample   # SampleRate tx rate control for ath</programlisting>
 
 	  <para>With this information in the kernel configuration
-	    file, recompile the kernel and reboot your &os;
+	    file, recompile the kernel and reboot the &os;
 	    machine.</para>
 	</note>
 
-	<para>When the system is up, we could find some information
-	  about the wireless device in the boot messages, like
+	<para>Information
+	  about the wireless device should appear in the boot
+	  messages, like
 	  this:</para>
 
 	<screen>ath0: &lt;Atheros 5212&gt; mem 0x88000000-0x8800ffff irq 11 at device 0.0 on cardbus1
@@ -924,11 +936,12 @@ ath0: AR2413 mac 7.9 RF2413 phy 4.5</scr
     <sect2>
       <title>Infrastructure Mode</title>
 
-      <para>The infrastructure mode or BSS mode is the mode that is
+      <para>Infrastructure (<acronym>BSS</acronym>) mode is the
+	mode that is
 	typically used.  In this mode, a number of wireless access
 	points are connected to a wired network.  Each wireless
-	network has its own name, this name is called the SSID of the
-	network.  Wireless clients connect to the wireless access
+	network has its own name, called the <acronym>SSID</acronym>.
+	Wireless clients connect to the wireless access
 	points.</para>
 
       <sect3>
@@ -937,12 +950,12 @@ ath0: AR2413 mac 7.9 RF2413 phy 4.5</scr
 	<sect4>
 	  <title>How to Find Access Points</title>
 
-	  <para>To scan for networks, use the
-	    <command>ifconfig</command> command.  This request may
-	    take a few moments to complete as it requires that the
-	    system switches to each available wireless frequency and
-	    probes for available access points.  Only the super-user
-	    can initiate such a scan:</para>
+	  <para>To scan for available networks, use
+	    &man.ifconfig.8;.  This request may
+	    take a few moments to complete as it requires the
+	    system to switch to each available wireless frequency and
+	    probe for available access points.  Only the superuser
+	    can initiate a scan:</para>
 
 	  <screen>&prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> create wlandev <replaceable>ath0</replaceable></userinput>
 &prompt.root; <userinput>ifconfig <replaceable>wlan0</replaceable> up scan</userinput>
@@ -951,15 +964,17 @@ dlinkap         00:13:46:49:41:76   11  
 freebsdap       00:11:95:c3:0d:ac    1   54M -83:96   100 EPS  WPA</screen>
 
 	  <note>
-	    <para>You must mark the interface <option>up</option>
-	      before you can scan.  Subsequent scan requests do not
-	      require you to mark the interface up again.</para>

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

From owner-svn-doc-projects@FreeBSD.ORG  Fri May 10 16:53: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 DE0C5FEE;
 Fri, 10 May 2013 16:53:27 +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 D07668F7;
 Fri, 10 May 2013 16:53: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 r4AGrRWE061376;
 Fri, 10 May 2013 16:53:27 GMT (envelope-from dru@svn.freebsd.org)
Received: (from dru@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4AGrRw6061375;
 Fri, 10 May 2013 16:53:27 GMT (envelope-from dru@svn.freebsd.org)
Message-Id: <201305101653.r4AGrRw6061375@svn.freebsd.org>
From: Dru Lavigne <dru@FreeBSD.org>
Date: Fri, 10 May 2013 16:53:27 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r41592 -
 projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/audit
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, 10 May 2013 16:53:27 -0000

Author: dru
Date: Fri May 10 16:53:27 2013
New Revision: 41592
URL: http://svnweb.freebsd.org/changeset/doc/41592

Log:
  Fix grammo.
  
  Submitted by: bjk
  Approved by:  gjb (mentor)

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

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/audit/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/audit/chapter.xml	Fri May 10 14:00:18 2013	(r41591)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/audit/chapter.xml	Fri May 10 16:53:27 2013	(r41592)
@@ -488,7 +488,7 @@ filesz:0</programlisting>
 	  will be generated.  The above example sets the minimum free
 	  space to twenty percent.</para>
 
-	<para>The <option>naflags</option> specifies audit classes
+	<para>The <option>naflags</option> entry specifies audit classes
 	  to be audited for non-attributed events, such as the login
 	  process and system daemons.</para>