svn commit: r44072 - in projects/relnotes-restructure: en_US.ISO8859-1/articles/committers-guide en_US.ISO8859-1/articles/contributors en_US.ISO8859-1/articles/nanobsd en_US.ISO8859-1/books/faq en_...

Wed Feb 26 04:16:31 UTC 2014

Author: gjb
Date: Wed Feb 26 04:16:27 2014
New Revision: 44072
URL: http://svnweb.freebsd.org/changeset/doc/44072

Log:
  MFH up to r44071.
  Pull mergeinfo to top-level directory.
  
  Approved by:	doceng (implicit)
  Sponsored by:	The FreeBSD Foundation

Added:
  projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/appendices/
     - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/appendices/
  projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/chapters.ent
     - copied unchanged from r44071, head/ru_RU.KOI8-R/books/porters-handbook/chapters.ent
  projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/keeping-up/
     - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/keeping-up/
  projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/makefiles/
     - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/makefiles/
  projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/new-port/
     - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/new-port/
  projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/pkg-files/
     - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/pkg-files/
  projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/plist/
     - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/plist/
  projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/porting-dads/
     - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/porting-dads/
  projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/porting-samplem/
     - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/porting-samplem/
  projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/porting-why/
     - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/porting-why/
  projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/quick-porting/
     - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/quick-porting/
  projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/security/
     - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/security/
  projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/slow-porting/
     - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/slow-porting/
  projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/special/
     - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/special/
  projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/testing/
     - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/testing/
  projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/upgrading/
     - copied from r44071, head/ru_RU.KOI8-R/books/porters-handbook/upgrading/
  projects/relnotes-restructure/share/pgpkeys/truckman.key
     - copied unchanged from r44071, head/share/pgpkeys/truckman.key
Modified:
  projects/relnotes-restructure/en_US.ISO8859-1/articles/committers-guide/article.xml
  projects/relnotes-restructure/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml
  projects/relnotes-restructure/en_US.ISO8859-1/articles/nanobsd/article.xml
  projects/relnotes-restructure/en_US.ISO8859-1/books/faq/book.xml
  projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
  projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
  projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml
  projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml
  projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml
  projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml
  projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml
  projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml
  projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/working-copy/chapter.xml
  projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml
  projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
  projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml
  projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
  projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/disks/chapter.xml
  projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml
  projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml
  projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/ports/chapter.xml
  projects/relnotes-restructure/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
  projects/relnotes-restructure/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml
  projects/relnotes-restructure/en_US.ISO8859-1/books/porters-handbook/quick-porting/chapter.xml
  projects/relnotes-restructure/en_US.ISO8859-1/books/porters-handbook/security/chapter.xml
  projects/relnotes-restructure/en_US.ISO8859-1/books/porters-handbook/slow-porting/chapter.xml
  projects/relnotes-restructure/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
  projects/relnotes-restructure/en_US.ISO8859-1/books/porters-handbook/testing/chapter.xml
  projects/relnotes-restructure/en_US.ISO8859-1/books/porters-handbook/uses.xml
  projects/relnotes-restructure/en_US.ISO8859-1/books/porters-handbook/versions.xml
  projects/relnotes-restructure/en_US.ISO8859-1/htdocs/cgi/man.cgi
  projects/relnotes-restructure/en_US.ISO8859-1/htdocs/developers/cvs.xml
  projects/relnotes-restructure/en_US.ISO8859-1/htdocs/docs/books.xml
  projects/relnotes-restructure/en_US.ISO8859-1/htdocs/donations/donors.xml
  projects/relnotes-restructure/en_US.ISO8859-1/htdocs/features.xml
  projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/Makefile
  projects/relnotes-restructure/en_US.ISO8859-1/htdocs/releases/index.xml
  projects/relnotes-restructure/fr_FR.ISO8859-1/share/xml/l10n.ent
  projects/relnotes-restructure/ja_JP.eucJP/articles/contributors/Makefile
  projects/relnotes-restructure/ja_JP.eucJP/articles/contributors/article.xml
  projects/relnotes-restructure/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.xml
  projects/relnotes-restructure/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
  projects/relnotes-restructure/ja_JP.eucJP/books/handbook/mirrors/chapter.xml
  projects/relnotes-restructure/ja_JP.eucJP/books/handbook/ports/chapter.xml
  projects/relnotes-restructure/ja_JP.eucJP/books/handbook/preface/preface.xml
  projects/relnotes-restructure/ja_JP.eucJP/htdocs/developers/cvs.xml
  projects/relnotes-restructure/ja_JP.eucJP/htdocs/docs/books.xml
  projects/relnotes-restructure/ja_JP.eucJP/htdocs/ports/installing.xml
  projects/relnotes-restructure/ja_JP.eucJP/share/xml/libcommon.xsl
  projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/Makefile
  projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/book.xml
  projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/uses.xml
  projects/relnotes-restructure/ru_RU.KOI8-R/books/porters-handbook/versions.xml
  projects/relnotes-restructure/ru_RU.KOI8-R/htdocs/releases/index.xml
  projects/relnotes-restructure/ru_RU.KOI8-R/share/xml/l10n.ent
  projects/relnotes-restructure/share/misc/docbook.css
  projects/relnotes-restructure/share/pgpkeys/lioux.key
  projects/relnotes-restructure/share/pgpkeys/pgpkeys-developers.xml
  projects/relnotes-restructure/share/pgpkeys/pgpkeys.ent
  projects/relnotes-restructure/share/tools/webupdate   (contents, props changed)
  projects/relnotes-restructure/share/tools/webupdate.wrapper
  projects/relnotes-restructure/share/xml/commercial.consult.xml
  projects/relnotes-restructure/share/xml/commercial.isp.xml
  projects/relnotes-restructure/share/xml/libcommon.xsl
  projects/relnotes-restructure/share/xml/man-refs.ent
  projects/relnotes-restructure/share/xml/mirrors.xml
Directory Properties:
  projects/relnotes-restructure/   (props changed)
  projects/relnotes-restructure/en_US.ISO8859-1/   (props changed)
  projects/relnotes-restructure/fr_FR.ISO8859-1/   (props changed)
  projects/relnotes-restructure/ja_JP.eucJP/   (props changed)
  projects/relnotes-restructure/ru_RU.KOI8-R/   (props changed)
  projects/relnotes-restructure/share/   (props changed)

Modified: projects/relnotes-restructure/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================

--- projects/relnotes-restructure/en_US.ISO8859-1/articles/committers-guide/article.xml	Wed Feb 26 04:13:22 2014	(r44071)
+++ projects/relnotes-restructure/en_US.ISO8859-1/articles/committers-guide/article.xml	Wed Feb 26 04:16:27 2014	(r44072)
@@ -446,18 +446,6 @@ You need a Passphrase to protect your se
 	The first real <acronym>SVN</acronym> commit is
 	<emphasis>r300894</emphasis>.</para>
 
-      <para>There are mechanisms in place to automatically merge
-	changes back from the Subversion <literal>src</literal>
-	repository to the <acronym>CVS</acronym> repository for
-	some &os; branches (<literal>releng/6</literal> through
-	<literal>releng/9</literal>), however this is purely to
-	support pre-existing end-user installs and should not be
-	relied upon, recommended or advertised.  Future branches
-	will not be exported to CVS at all.  The
-	<literal>ports</literal> repository was exported to CVS
-	for a period of time to aid end user migration, but as of
-	28th February 2013 is no longer exported.</para>
-
       <para>Subversion is not that different from
 	<acronym>CVS</acronym> when it comes to daily use, but there
 	are differences.  Subversion has a number of features that
@@ -2118,9 +2106,6 @@ U    stable/9/share/man/man4/netmap.4
       <para>In commit logs etc., <quote>rev 179872</quote> should be
 	spelled <quote>r179872</quote> as per convention.</para>
 
-      <para>Do not remove and re-add the same file in a single commit
-	as this will break the CVS exporter.</para>
-
       <para>Speeding up svn is possible by adding the following to
 	<filename>~/.ssh/config</filename>:</para>
 

Modified: projects/relnotes-restructure/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml
==============================================================================
--- projects/relnotes-restructure/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml	Wed Feb 26 04:13:22 2014	(r44071)
+++ projects/relnotes-restructure/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml	Wed Feb 26 04:16:27 2014	(r44072)
@@ -40,7 +40,7 @@
       <para>&a.itojun.email; (1997 - 2001; RIP 2008)</para>
       <para>Known to everyone as
         <link xlink:href="http://astralblue.livejournal.com/350702.html">itojun</link>,
-	Jun-ichiro Hagino was was a core researcher at the
+	Jun-ichiro Hagino was a core researcher at the
 	<link xlink:href="http://www.kame.net/">KAME Project</link>,
 	which aimed to provide IPv6 and IPsec technology in freely
 	redistributable form.   Much of this code was incorporated

Modified: projects/relnotes-restructure/en_US.ISO8859-1/articles/nanobsd/article.xml
==============================================================================
--- projects/relnotes-restructure/en_US.ISO8859-1/articles/nanobsd/article.xml	Wed Feb 26 04:13:22 2014	(r44071)
+++ projects/relnotes-restructure/en_US.ISO8859-1/articles/nanobsd/article.xml	Wed Feb 26 04:16:27 2014	(r44072)
@@ -350,37 +350,36 @@ NANO_KERNEL=MYKERNEL
 NANO_IMAGES=2
 
 CONF_BUILD='
-NO_KLDLOAD=YES
-NO_NETGRAPH=YES
-NO_PAM=YES
+WITHOUT_KLDLOAD=YES
+WITHOUT_NETGRAPH=YES
+WITHOUT_PAM=YES
 '
 
 CONF_INSTALL='
-NO_ACPI=YES
-NO_BLUETOOTH=YES
-NO_CVS=YES
-NO_FORTRAN=YES
-NO_HTML=YES
-NO_LPR=YES
-NO_MAN=YES
-NO_SENDMAIL=YES
-NO_SHAREDOCS=YES
-NO_EXAMPLES=YES
-NO_INSTALLLIB=YES
-NO_CALENDAR=YES
-NO_MISC=YES
-NO_SHARE=YES
+WITHOUT_ACPI=YES
+WITHOUT_BLUETOOTH=YES
+WITHOUT_FORTRAN=YES
+WITHOUT_HTML=YES
+WITHOUT_LPR=YES
+WITHOUT_MAN=YES
+WITHOUT_SENDMAIL=YES
+WITHOUT_SHAREDOCS=YES
+WITHOUT_EXAMPLES=YES
+WITHOUT_INSTALLLIB=YES
+WITHOUT_CALENDAR=YES
+WITHOUT_MISC=YES
+WITHOUT_SHARE=YES
 '
 
 CONF_WORLD='
-NO_BIND=YES
-NO_MODULES=YES
-NO_KERBEROS=YES
-NO_GAMES=YES
-NO_RESCUE=YES
-NO_LOCALES=YES
-NO_SYSCONS=YES
-NO_INFO=YES
+WITHOUT_BIND=YES
+WITHOUT_MODULES=YES
+WITHOUT_KERBEROS=YES
+WITHOUT_GAMES=YES
+WITHOUT_RESCUE=YES
+WITHOUT_LOCALES=YES
+WITHOUT_SYSCONS=YES
+WITHOUT_INFO=YES
 '
 
 FlashDevice SanDisk 1G

Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- projects/relnotes-restructure/en_US.ISO8859-1/books/faq/book.xml	Wed Feb 26 04:13:22 2014	(r44071)
+++ projects/relnotes-restructure/en_US.ISO8859-1/books/faq/book.xml	Wed Feb 26 04:16:27 2014	(r44072)
@@ -2,25 +2,26 @@
 <!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
 	"http://www.FreeBSD.org/XML/share/xml/freebsd50.dtd" [
 <!ENTITY bibliography SYSTEM "../../../share/xml/bibliography.xml">
-<!ENTITY rel.numbranch "3">  <!-- number of branches that follow in this list -->
-<!ENTITY rel.head "<emphasis xmlns='http://docbook.org/ns/docbook'>10-CURRENT</emphasis>">
-<!ENTITY rel.head.relx "10.<replaceable xmlns='http://docbook.org/ns/docbook'>X</replaceable>">
+<!ENTITY rel.numbranch "4">  <!-- number of branches that follow in this list -->
+<!ENTITY rel.head "<emphasis xmlns='http://docbook.org/ns/docbook'>11-CURRENT</emphasis>">
+<!ENTITY rel.head.relx "11.<replaceable xmlns='http://docbook.org/ns/docbook'>X</replaceable>">
 <!ENTITY rel.head.releng "<symbol xmlns='http://docbook.org/ns/docbook'>head/</symbol>">
-<!ENTITY rel.head.packages "packages-10-current">
-<!ENTITY rel.relx "9.<replaceable xmlns='http://docbook.org/ns/docbook'>X</replaceable>">
-<!ENTITY rel.stable "<emphasis xmlns='http://docbook.org/ns/docbook'>9-STABLE</emphasis>">
-<!ENTITY rel.releng "<symbol xmlns='http://docbook.org/ns/docbook'>stable/9/</symbol>">
-<!ENTITY rel.relengdate "September 2011">
-<!ENTITY rel.packages "packages-9-stable">
-<!ENTITY rel2.relx "8.<replaceable xmlns='http://docbook.org/ns/docbook'>X</replaceable>">
-<!ENTITY rel2.stable "<emphasis xmlns='http://docbook.org/ns/docbook'>8-STABLE</emphasis>">
-<!ENTITY rel2.releng "<symbol xmlns='http://docbook.org/ns/docbook'>stable/8/</symbol>">
-<!ENTITY rel2.relengdate "August 2009">
-<!ENTITY rel2.packages "packages-8-stable">
+<!ENTITY rel.relx "10.<replaceable xmlns='http://docbook.org/ns/docbook'>X</replaceable>">
+<!ENTITY rel.stable "<emphasis xmlns='http://docbook.org/ns/docbook'>10-STABLE</emphasis>">
+<!ENTITY rel.releng "<symbol xmlns='http://docbook.org/ns/docbook'>stable/10/</symbol>">
+<!ENTITY rel.relengdate "January 2014">
+<!ENTITY rel2.relx "9.<replaceable xmlns='http://docbook.org/ns/docbook'>X</replaceable>">
+<!ENTITY rel2.stable "<emphasis xmlns='http://docbook.org/ns/docbook'>9-STABLE</emphasis>">
+<!ENTITY rel2.releng "<symbol xmlns='http://docbook.org/ns/docbook'>stable/9/</symbol>">
+<!ENTITY rel2.relengdate "September 2011">
+<!ENTITY rel3.relx "8.<replaceable xmlns='http://docbook.org/ns/docbook'>X</replaceable>">
+<!ENTITY rel3.stable "<emphasis xmlns='http://docbook.org/ns/docbook'>8-STABLE</emphasis>">
+<!ENTITY rel3.releng "<symbol xmlns='http://docbook.org/ns/docbook'>stable/8/</symbol>">
+<!ENTITY rel3.relengdate "August 2009">
 ]>
 <book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en">
   <info><title>Frequently Asked Questions for &os;
-      &rel2.relx;, &rel.relx; and &rel.head.relx;</title>
+      &rel3.relx;, &rel2.relx; and &rel.relx;</title>
     
 
     <author><orgname>The &os; Documentation Project</orgname></author>
@@ -45,6 +46,7 @@
       <year>2011</year>
       <year>2012</year>
       <year>2013</year>
+      <year>2014</year>
       <holder>The &os; Documentation Project</holder>
     </copyright>
 
@@ -68,7 +70,7 @@
     <releaseinfo>$FreeBSD$</releaseinfo>
 
     <abstract>
-      <para>This is the FAQ for &os; versions &rel2.relx; and
+      <para>This is the FAQ for &os; versions &rel3.relx;, &rel2.relx; and
 	&rel.relx;.  Every effort has been made to make this FAQ as
 	informative as possible; if you have any suggestions as to how
 	it may be improved, please feel free to mail them to the
@@ -2381,7 +2383,7 @@ kern.timecounter.hardware: TSC -> i82
 	    periodic updates on new entries.</para>
 
 	  <para>Most ports should work on the
-	    &rel2.relx;, and &rel.relx; branches.
+	    &rel3.relx;, &rel2.relx;, and &rel.relx; branches.
 	    Each time a &os;
 	    release is made, a snapshot of the ports tree at the time of
 	    release in also included in the <filename>ports/</filename>
@@ -2395,40 +2397,13 @@ kern.timecounter.hardware: TSC -> i82
 	    to know the gory details of which files it includes.</para>
 
 	  <para>Use
-	    &man.pkg.add.1; on the specific package files
+	    &man.pkg.7; on the specific package files
 	    you are interested in installing.  Package files can usually
-	    be identified by their <filename>.tbz</filename> suffix and
+	    be identified by their <filename>.txz</filename> suffix and
 	    CD-ROM distribution people will have a
 	    <filename>packages/All</filename> directory on their CD
 	    which contains such files.  They can also be downloaded over
-	    the net for various versions of &os; at the following
-	    locations:</para>
-
-	  <variablelist>
-	    <varlistentry>
-	      <term>for &rel2.relx; -RELEASE/&rel2.stable;</term>
-
-	      <listitem>
-		<para><link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel2.packages;/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel2.packages;</link></para>
-	      </listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term>for &rel.relx; -RELEASE/&rel.stable;</term>
-
-	      <listitem>
-		<para><link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel.packages;/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel.packages;</link></para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-
-	  <para>or your nearest local mirror site.</para>
-
-	  <para>Note that all ports may not be available as packages
-	    since new ones are constantly being added.  It is always a
-	    good idea to check back periodically to see which packages
-	    are available at the <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/">ftp.FreeBSD.org</link>
-	    master site.</para>
+	    the net for various versions of &os;.</para>
 	</answer>
       </qandaentry>
 
@@ -7653,6 +7628,11 @@ hint.sio.7.irq="12"</programlisting>
 
 	  <itemizedlist>
 	    <listitem>
+	      <para>&rel3.releng; AKA
+		&rel3.stable;</para>
+	    </listitem>
+
+	    <listitem>
 	      <para>&rel2.releng; AKA
 		&rel2.stable;</para>
 	    </listitem>

Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml
==============================================================================
--- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml	Wed Feb 26 04:13:22 2014	(r44071)
+++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.xml	Wed Feb 26 04:16:27 2014	(r44072)
@@ -92,7 +92,7 @@
 	<para><link linkend="make-includes"><application>Make</application>
 	  includes</link> are the glue that perform the document
 	  production, and are usually of the form
-	  <filename>doc.xxx.mk</filename>.</para>
+	  <filename>doc.<replaceable>xxx</replaceable>.mk</filename>.</para>
       </listitem>
     </itemizedlist>
 
@@ -338,9 +338,9 @@ PRI_LANG?=	en_US.ISO8859-1
 	<title>Targets and Macros</title>
 
 	<para>Dependencies are described by
-	  <literal>target:
-	      dependency1 dependency2
-	      ...</literal> tuples, where to build
+	  <literal><replaceable>target</replaceable>:
+	      <replaceable>dependency1 dependency2
+	      ...</replaceable></literal> tuples, where to build
 	  <literal>target</literal>, the given
 	  dependencies must be built first.</para>
 

Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml
==============================================================================
--- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml	Wed Feb 26 04:13:22 2014	(r44071)
+++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/docbook-markup/chapter.xml	Wed Feb 26 04:16:27 2014	(r44072)
@@ -196,7 +196,7 @@
 	    </row>
 
 	    <row>
-	      <entry><literal>&man.command.sectionnumber;</literal></entry>
+	      <entry><literal>&man.<replaceable>command</replaceable>.<replaceable>sectionnumber</replaceable>;</literal></entry>
 	      <entry><emphasis>link to
 		  <replaceable>command</replaceable> manual page in
 		  section
@@ -232,7 +232,7 @@
 	    </row>
 
 	    <row>
-	      <entry><literal>&a.listname;</literal></entry>
+	      <entry><literal>&a.<replaceable>listname</replaceable>;</literal></entry>
 	      <entry><emphasis>link to
 		  <replaceable>listname</replaceable></emphasis></entry>
 	      <entry>Entities are defined for all the <link
@@ -261,7 +261,7 @@
 	    </row>
 
 	    <row>
-	      <entry><literal>&url.books.bookname;</literal></entry>
+	      <entry><literal>&url.books.<replaceable>bookname</replaceable>;</literal></entry>
 	      <entry><emphasis>relative path to
 		  <replaceable>bookname</replaceable></emphasis></entry>
 	      <entry>Entities are defined for all the <link
@@ -279,7 +279,7 @@
 	    </row>
 
 	    <row>
-	      <entry><literal>&url.articles.articlename;</literal></entry>
+	      <entry><literal>&url.articles.<replaceable>articlename</replaceable>;</literal></entry>
 	      <entry><emphasis>relative path to
 		  <replaceable>articlename</replaceable></emphasis></entry>
 	      <entry>Entities are defined for all the <link
@@ -1468,7 +1468,7 @@ This is the file called 'foo2'</screen>
 	<link linkend="xml-primer-general-entities">general
 	  entities</link> have been created to make this easier.
 	Each entity takes the form
-	<literal>&man.manual-page.manual-section;</literal>.</para>
+	<literal>&man.<replaceable>manual-page</replaceable>.<replaceable>manual-section</replaceable>;</literal>.</para>
 
       <para>The file that contains these entities is in
 	<filename>doc/share/xml/man-refs.ent</filename>, and can be
@@ -1497,7 +1497,7 @@ This is the file called 'foo2'</screen>
 
       <para>When referring to the same command multiple times in
 	close proximity, it is preferred to use the
-	<literal>&man.command.section;</literal>
+	<literal>&man.<replaceable>command</replaceable>.<replaceable>section</replaceable>;</literal>
 	notation to markup the first reference and use
 	<tag>command</tag> to markup subsequent references.
 	This makes the generated output, especially
@@ -1549,7 +1549,7 @@ This is the file called 'foo2'</screen>
 
       <note>
 	<para>Notice how the
-	  <literal>&man.command.section;</literal>
+	  <literal>&man.<replaceable>command</replaceable>.<replaceable>section</replaceable>;</literal>
 	  notation is easier to follow.</para>
       </note>
     </sect2>
@@ -1980,7 +1980,7 @@ This is the file called 'foo2'</screen>
 	<para>Appearance:</para>
 
 	<para>The
-	  <literal>maxusers n</literal>
+	  <literal>maxusers <replaceable>n</replaceable></literal>
 	  line in the kernel configuration file determines the size
 	  of many system tables, and is a rough guide to how many
 	  simultaneous logins the system will support.</para>

Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml
==============================================================================
--- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml	Wed Feb 26 04:13:22 2014	(r44071)
+++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml	Wed Feb 26 04:16:27 2014	(r44072)
@@ -117,7 +117,7 @@ color ,yellow "^(.{71})|(TAB.{63})|(TAB{
       <para>Specify additional helpful options when running the
 	editor:</para>
 
-      <screen>&prompt.user; <userinput>nano -AKipwz -r 70 -T8 chapter.xml</userinput></screen>
+      <screen>&prompt.user; <userinput>nano -AKipwz -r 70 -T8 <replaceable>chapter.xml</replaceable></userinput></screen>
 
       <para>Users of &man.csh.1; can define an alias in
 	<filename>~/.cshrc</filename> to automate these
@@ -128,7 +128,7 @@ color ,yellow "^(.{71})|(TAB.{63})|(TAB{
       <para>After the alias is defined, the options will be added
 	automatically:</para>
 
-      <screen>&prompt.user; <userinput>nano chapter.xml</userinput></screen>
+      <screen>&prompt.user; <userinput>nano <replaceable>chapter.xml</replaceable></userinput></screen>
     </sect2>
   </sect1>
 </chapter>

Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml
==============================================================================
--- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml	Wed Feb 26 04:13:22 2014	(r44071)
+++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/examples/appendix.xml	Wed Feb 26 04:16:27 2014	(r44072)
@@ -171,7 +171,7 @@
     -c /usr/local/share/xml/docbook/catalog \
     -c /usr/local/share/xml/jade/catalog \
     -d /usr/local/share/xml/docbook/dsssl/modular/html/docbook.dsl \<co xml:id="examples-co-jade-1-dsssl"/>
-    -t sgml <co xml:id="examples-co-jade-1-transform"/> file.xml > file.html <co xml:id="examples-co-jade-1-filename"/></userinput></screen>
+    -t sgml <co xml:id="examples-co-jade-1-transform"/> <replaceable>file</replaceable>.xml > <replaceable>file</replaceable>.html <co xml:id="examples-co-jade-1-filename"/></userinput></screen>
 
 	<calloutlist>
 	  <callout arearefs="examples-co-jade-1-nochunks">
@@ -226,7 +226,7 @@
     -c /usr/local/share/xml/docbook/catalog \
     -c /usr/local/share/xml/jade/catalog \
     -d /usr/local/share/xml/docbook/dsssl/modular/html/docbook.dsl \<co xml:id="examples-co-jade-2-dsssl"/>
-    -t sgml <co xml:id="examples-co-jade-2-transform"/> file.xml <co xml:id="examples-co-jade-2-filename"/></userinput></screen>
+    -t sgml <co xml:id="examples-co-jade-2-transform"/> <replaceable>file</replaceable>.xml <co xml:id="examples-co-jade-2-filename"/></userinput></screen>
 
 	<calloutlist>
 	  <callout arearefs="examples-co-jade-2-catalog">
@@ -283,7 +283,7 @@
     -c /usr/local/share/xml/docbook/catalog \
     -c /usr/local/share/xml/jade/catalog \
     -d /usr/local/share/xml/docbook/dsssl/modular/print/docbook.dsl \<co xml:id="examples-co-jade-3-dsssl"/>
-    -t tex <co xml:id="examples-co-jade-3-tex"/> file.xml</userinput></screen>
+    -t tex <co xml:id="examples-co-jade-3-tex"/> <replaceable>file</replaceable>.xml</userinput></screen>
 
 	<calloutlist>
 	  <callout arearefs="examples-co-jade-3-tex-backend">
@@ -319,7 +319,7 @@
 	  run through <command>tex</command>, specifying the
 	  <literal>&jadetex</literal> macro package.</para>
 
-	<screen>&prompt.user; <userinput>tex "&jadetex" file.tex</userinput></screen>
+	<screen>&prompt.user; <userinput>tex "&jadetex" <replaceable>file</replaceable>.tex</userinput></screen>
 
 	<para><command>tex</command> commands must be run
 	  <emphasis>at least</emphasis> three times.  The first run
@@ -341,12 +341,12 @@
 	  necessary.</para>
 
 	<para>The output from this stage will be
-	  <filename>file.dvi</filename>.</para>
+	  <filename><replaceable>file</replaceable>.dvi</filename>.</para>
 
 	<para>Finally, run <command>dvips</command> to convert the
 	  <filename>.dvi</filename> file to &postscript;.</para>
 
-	<screen>&prompt.user; <userinput>dvips -o file.ps file.dvi</userinput></screen>
+	<screen>&prompt.user; <userinput>dvips -o <replaceable>file</replaceable>.ps <replaceable>file.dvi</replaceable></userinput></screen>
       </example>
 
       <example>
@@ -361,12 +361,12 @@
 	  However, use the <literal>&pdfjadetex</literal> macro
 	  package instead.</para>
 
-	<screen>&prompt.user; <userinput>pdftex "&pdfjadetex" file.tex</userinput></screen>
+	<screen>&prompt.user; <userinput>pdftex "&pdfjadetex" <replaceable>file</replaceable>.tex</userinput></screen>
 
 	<para>Again, run this command three times.</para>
 
 	<para>This will generate
-	  <filename>file.pdf</filename>,
+	  <filename><replaceable>file</replaceable>.pdf</filename>,
 	  which does not need to be processed any further.</para>
       </example>
     </sect2>

Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml
==============================================================================
--- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml	Wed Feb 26 04:13:22 2014	(r44071)
+++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/overview/chapter.xml	Wed Feb 26 04:16:27 2014	(r44072)
@@ -156,7 +156,7 @@
 	  <filename>~/doc</filename> (see
 	  <xref linkend="working-copy"/>).</para>
 
-	<screen>&prompt.user; <userinput>svn checkout https://svn0.us-west.FreeBSD.org/doc/head ~/doc</userinput></screen>
+	<screen>&prompt.user; <userinput>svn checkout https://<replaceable>svn0.us-west.FreeBSD.org</replaceable>/doc/head <replaceable>~/doc</replaceable></userinput></screen>
       </step>
 
       <step>
@@ -184,7 +184,7 @@
       <step>
 	<para>Update the local working copy:</para>
 
-	<screen>&prompt.user; <userinput>svn up ~/doc</userinput></screen>
+	<screen>&prompt.user; <userinput>svn up <replaceable>~/doc</replaceable></userinput></screen>
       </step>
 
       <step>
@@ -224,7 +224,7 @@
 	  <quote>diff file</quote>:</para>
 
 	<screen>&prompt.user; <userinput>cd /usr/doc</userinput>
-&prompt.user; <userinput>svn diff > bsdinstall.diff.txt</userinput></screen>
+&prompt.user; <userinput>svn diff > <replaceable>bsdinstall</replaceable>.diff.txt</userinput></screen>
 
 	<para>Give the diff file a descriptive name.  In the example
 	  above, changes have been made to the

Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml
==============================================================================
--- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml	Wed Feb 26 04:13:22 2014	(r44071)
+++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/structure/chapter.xml	Wed Feb 26 04:16:27 2014	(r44072)
@@ -94,7 +94,8 @@
 	  </row>
 
 	  <row>
-	    <entry valign="top"><filename>lang.encoding</filename></entry>
+	    <entry valign="top"><filename
+		class="directory"><replaceable>lang</replaceable>.<replaceable>encoding</replaceable></filename></entry>
 
 	    <entry>One directory exists for each available translation
 	      and encoding of the documentation, for example
@@ -114,7 +115,7 @@
 
   <sect1 xml:id="structure-locale">
     <title>The
-      <filename>lang.encoding/</filename>
+      <filename><replaceable>lang</replaceable>.<replaceable>encoding</replaceable>/</filename>
       Directories</title>
 
     <para>These directories contain the documents themselves.  The
@@ -158,7 +159,7 @@
 	      <filename>man</filename></entry>
 
 	    <entry>For translations of the system manual pages.  This
-	      directory will contain one or more <filename>mann</filename>
+	      directory will contain one or more <filename role="directory">man<replaceable>n</replaceable></filename>
 	      directories, corresponding to the sections that have
 	      been translated.</entry>
 	  </row>
@@ -166,7 +167,7 @@
       </tgroup>
     </informaltable>
 
-    <para>Not every <filename>lang.encoding</filename>
+    <para>Not every <filename role="directory"><replaceable>lang</replaceable>.<replaceable>encoding</replaceable></filename>
       directory will have all of these subdirectories.  It depends
       on how much translation has been accomplished by that
       translation team.</para>
@@ -236,7 +237,7 @@
 	</sect4>
 
 	<sect4>
-	  <title><filename>directory/chapter.xml</filename></title>
+	  <title><filename role="directory"><replaceable>directory</replaceable>/chapter.xml</filename></title>
 
 	  <para>Each chapter in the Handbook is stored in a file
 	    called <filename>chapter.xml</filename> in a separate

Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml
==============================================================================
--- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml	Wed Feb 26 04:13:22 2014	(r44071)
+++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.xml	Wed Feb 26 04:16:27 2014	(r44072)
@@ -38,7 +38,7 @@
 
     <para>Having obtained the documentation and web site source files,
       the web site can be built.  In this example, the build directory
-      is <filename>~/doc</filename>
+      is <filename role="directory"><replaceable>~/doc</replaceable></filename>
       and all the required files are already in place.</para>
 
     <para>The web site is built from the
@@ -76,7 +76,7 @@
       <systemitem class="username">jru</systemitem> in their home directory, <filename>/usr/home/jru/doc</filename>.</para>
 
     <screen>&prompt.root; <userinput>cd /home/jru/doc/en_US.ISO8859-1/htdocs</userinput>
-&prompt.root; <userinput>env DESTDIR=/usr/local/www make install</userinput></screen>
+&prompt.root; <userinput>env DESTDIR=<replaceable>/usr/local/www</replaceable> make install</userinput></screen>
 
     <para>The install process will not delete any old or outdated
       files that existed previously in the same directory.  If a new
@@ -84,7 +84,7 @@
       will find and delete all files that have not been updated in
       three days.</para>
 
-    <screen>&prompt.root; <userinput>find /usr/local/www -ctime 3 -delete</userinput></screen>
+    <screen>&prompt.root; <userinput>find <replaceable>/usr/local/www</replaceable> -ctime 3 -delete</userinput></screen>
   </sect1>
 
   <sect1 xml:id="the-website-env">
@@ -129,7 +129,7 @@
 
 	<listitem>
 	  <para>If set, build or install only for the languages
-	    specified by this variable inside the <filename>~/doc</filename>
+	    specified by this variable inside the <filename role="directory"><replaceable>~/doc</replaceable></filename>
 	    directory.  All other languages except English will be
 	    ignored. E.g.:</para>
 

Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml
==============================================================================
--- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml	Wed Feb 26 04:13:22 2014	(r44071)
+++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/translations/chapter.xml	Wed Feb 26 04:16:27 2014	(r44072)
@@ -135,7 +135,7 @@
 	  copy of the FreeBSD Subversion repository (at least the
 	  documentation part).  This can be done by running:</para>
 
-	<screen>&prompt.user; <userinput>svn checkout https://svn0.us-east.FreeBSD.org/doc/head/ head</userinput></screen>
+	<screen>&prompt.user; <userinput>svn checkout <replaceable>https://svn0.us-east.FreeBSD.org</replaceable>/doc/head/ head</userinput></screen>
 
 	<para><link xlink:href="https://svn0.us-east.FreeBSD.org/">svn0.us-east.FreeBSD.org</link>
 	is a public <literal>SVN</literal> server.
@@ -158,7 +158,7 @@
 	  <filename>en_US.ISO8859-1/books/fdp-primer/book.xml</filename>,
 	  run:</para>
 
-	<screen>&prompt.user; <userinput>svn diff -r33733:33734 en_US.ISO8859-1/books/fdp-primer/book.xml</userinput></screen>
+	<screen>&prompt.user; <userinput>svn diff -r<replaceable>33733</replaceable>:<replaceable>33734</replaceable> en_US.ISO8859-1/books/fdp-primer/book.xml</userinput></screen>
       </answer>
     </qandaentry>
 
@@ -284,7 +284,7 @@
 
 	<para><literal>sv_SE.ISO8859-1</literal> is the name of the
 	  translation, in
-	  <filename>lang.encoding</filename>
+	  <filename><replaceable>lang</replaceable>.<replaceable>encoding</replaceable></filename>
 	  form.  Note the two Makefiles, which will be used to build
 	  the documentation.</para>
 
@@ -465,7 +465,7 @@
 	<para>Your translated documents should include their own
 	  $FreeBSD$ line, and change the
 	  <literal>FreeBSD Documentation Project</literal> line to
-	  <literal>The FreeBSD language
+	  <literal>The FreeBSD <replaceable>language</replaceable>
 	    Documentation Project</literal>.</para>
 
 	<para>In addition, you should add a third line which indicates

Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/working-copy/chapter.xml
==============================================================================
--- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/working-copy/chapter.xml	Wed Feb 26 04:13:22 2014	(r44071)
+++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/working-copy/chapter.xml	Wed Feb 26 04:16:27 2014	(r44072)
@@ -98,12 +98,12 @@
       copy of the latest version (<literal>head</literal>) of
       the main documentation tree:</para>
 
-    <screen>&prompt.user; <userinput>svn checkout https://svn0.us-west.FreeBSD.org/doc/head ~/doc</userinput></screen>
+    <screen>&prompt.user; <userinput>svn checkout <replaceable>https://svn0.us-west.FreeBSD.org/doc/head</replaceable> <replaceable>~/doc</replaceable></userinput></screen>
 
     <para>A checkout of the source code to work on manual pages is
       very similar:</para>
 
-    <screen>&prompt.user; <userinput>svn checkout https://svn0.us-west.FreeBSD.org/base/head ~/src</userinput></screen>
+    <screen>&prompt.user; <userinput>svn checkout <replaceable>https://svn0.us-west.FreeBSD.org/base/head</replaceable> <replaceable>~/src</replaceable></userinput></screen>
   </sect1>
 
   <sect1 xml:id="working-copy-updating">
@@ -118,7 +118,7 @@
       <command>svn update</command> on the directory containing the
       local working copy:</para>
 
-    <screen>&prompt.user; <userinput>svn update ~/doc</userinput></screen>
+    <screen>&prompt.user; <userinput>svn update <replaceable>~/doc</replaceable></userinput></screen>
 
     <para>Get in the protective habit of using
       <command>svn update</command> before editing document files.
@@ -152,8 +152,8 @@
       by redirecting the output of <command>svn diff</command> into a
       file:</para>
 
-    <screen>&prompt.user; <userinput>cd ~/doc</userinput>
-&prompt.user; <userinput>svn diff > doc-fix-spelling.diff</userinput></screen>
+    <screen>&prompt.user; <userinput>cd <replaceable>~/doc</replaceable></userinput>
+&prompt.user; <userinput>svn diff > <replaceable>doc-fix-spelling.diff</replaceable></userinput></screen>
 
     <para>Give the file a meaningful name that identifies the
       contents.  The example above is for spelling fixes to the whole
@@ -172,8 +172,8 @@
       be submitted yet, provide a list of only the files that are to
       be included:</para>
 
-    <screen>&prompt.user; <userinput>cd ~/doc</userinput>
-&prompt.user; <userinput>svn diff disks/chapter.xml printers/chapter.xml > disks-printers.diff</userinput></screen>
+    <screen>&prompt.user; <userinput>cd <replaceable>~/doc</replaceable></userinput>
+&prompt.user; <userinput>svn diff <replaceable>disks/chapter.xml printers/chapter.xml</replaceable> > <replaceable>disks-printers.diff</replaceable></userinput></screen>
   </sect1>
 
   <sect1 xml:id="working-copy-subversion-references">

Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml
==============================================================================
--- projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml	Wed Feb 26 04:13:22 2014	(r44071)
+++ projects/relnotes-restructure/en_US.ISO8859-1/books/fdp-primer/xml-primer/chapter.xml	Wed Feb 26 04:16:27 2014	(r44072)
@@ -312,7 +312,7 @@
     <para>An element's attributes are written
       <emphasis>inside</emphasis> the start tag for that element, and
       take the form
-      <literal>attribute-name="attribute-value"</literal>.</para>
+      <literal><replaceable>attribute-name</replaceable>="<replaceable>attribute-value</replaceable>"</literal>.</para>
 
     <para>In <acronym>XHTML</acronym>, the <tag>p</tag>
       element has an attribute called
@@ -615,9 +615,9 @@ example.xml:5: element head: validity er
 	      superset) of <acronym>XML</acronym>.</para>
 
 	    <para>Otherwise, this string will either look like
-	      <literal>-//Owner</literal>
+	      <literal>-//<replaceable>Owner</replaceable></literal>
 	      or
-	      <literal>+//Owner</literal>
+	      <literal>+//<replaceable>Owner</replaceable></literal>
 	      (notice the only difference is the leading
 	      <literal>+</literal> or <literal>-</literal>).</para>
 
@@ -898,7 +898,7 @@ example.xml:5: element head: validity er
 
       <para>To include the text of a general entity in the document,
 	include
-	<literal>&entity-name;</literal>
+	<literal>&<replaceable>entity-name</replaceable>;</literal>
 	in the text.  For example, consider a general entity called
 	<literal>current.version</literal> which expands to the
 	current version number of a product.  To use it in the
@@ -962,7 +962,7 @@ example.xml:5: element head: validity er
       <para>Parameter entity definitons are similar to those for
 	general entities.  However, parameter entries are included
 	with
-	<literal>%entity-name;</literal>.
+	<literal>%<replaceable>entity-name</replaceable>;</literal>.
 	The definition also includes the <literal>%</literal> between
 	the <literal>ENTITY</literal> keyword and the name of the
 	entity.</para>
@@ -1226,7 +1226,7 @@ example.xml:5: element head: validity er
 	  <step>
 	    <para>Load <filename>example.html</filename> into the web
 	      browser and confirm that the
-	      <filename>paran.xml</filename>
+	      <filename>para<replaceable>n</replaceable>.xml</filename>
 	      files have been included in
 	      <filename>example.html</filename>.</para>
 	  </step>
@@ -1287,7 +1287,7 @@ example.xml:5: element head: validity er
 	  <step>
 	    <para>Load <filename>example.html</filename> into the web
 	      browser and confirm that the
-	      <filename>paran.xml</filename>
+	      <filename>para<replaceable>n</replaceable>.xml</filename>
 	      files have been included in
 	      <filename>example.html</filename>.</para>
 	  </step>

Modified: projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml
==============================================================================
--- projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml	Wed Feb 26 04:13:22 2014	(r44071)
+++ projects/relnotes-restructure/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.xml	Wed Feb 26 04:16:27 2014	(r44072)
@@ -4,7 +4,10 @@
 
      $FreeBSD$
 -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="advanced-networking">
+<chapter xmlns="http://docbook.org/ns/docbook"
+  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xml:id="advanced-networking">
+
   <title>Advanced Networking</title>
 
   <sect1 xml:id="advanced-networking-synopsis">
@@ -89,15 +92,26 @@
     <info>
       <title>Gateways and Routes</title>
 
-    <authorgroup>
-	<author><personname><firstname>Coranth</firstname><surname>Gryphon</surname></personname><contrib>Contributed
-	  by </contrib></author>
+      <authorgroup>
+	<author>
+	  <personname>
+	    <firstname>Coranth</firstname>
+	    <surname>Gryphon</surname>
+	  </personname>
+	  <contrib>Contributed by </contrib>
+	</author>
       </authorgroup>
     </info>
 
-    <indexterm><primary>routing</primary></indexterm>
-    <indexterm><primary>gateway</primary></indexterm>
-    <indexterm><primary>subnet</primary></indexterm>
+    <indexterm>
+      <primary>routing</primary>
+    </indexterm>
+    <indexterm>
+      <primary>gateway</primary>
+    </indexterm>
+    <indexterm>
+      <primary>subnet</primary>
+    </indexterm>
 
     <para>For one machine to be able to find another over a network,
       there must be a mechanism in place to describe how to get from
@@ -135,12 +149,18 @@ host2            0:e0:a8:37:8:1e    UHLW
 host2.example.com link#1             UC          0        0
 224              link#1             UC          0        0</screen>
 
-      <indexterm><primary>default route</primary></indexterm>
+      <indexterm>
+	<primary>default route</primary>
+      </indexterm>
+
       <para>The first two lines specify the default route, described
 	in more detail in <xref linkend="network-routing-default"/>,
 	and the <systemitem>localhost</systemitem> route.</para>
 
-      <indexterm><primary>loopback device</primary></indexterm>
+      <indexterm>
+	<primary>loopback device</primary>
+      </indexterm>
+
       <para>The interface (<literal>Netif</literal> column) that this
 	routing table specifies to use for
 	<literal>localhost</literal> is <filename>lo0</filename>,
@@ -152,6 +172,7 @@ host2.example.com link#1             UC 
 	<primary>Ethernet</primary>
 	<secondary>MAC address</secondary>
       </indexterm>
+
       <para>The addresses beginning with <systemitem
 	  class="etheraddress">0:e0:</systemitem> are Ethernet
 	hardware addresses, also known as <acronym>MAC</acronym>
@@ -167,7 +188,9 @@ host2.example.com link#1             UC 
 	calculates routes to local hosts based upon a shortest path
 	determination.</para>
 
-      <indexterm><primary>subnet</primary></indexterm>
+      <indexterm>
+	<primary>subnet</primary>
+      </indexterm>
 
       <para>&os; will add subnet routes for the local subnet.
 	<systemitem class="ipaddress">10.20.30.255</systemitem> is the
@@ -263,7 +286,9 @@ host2.example.com link#1             UC 
     <sect2 xml:id="network-routing-default">
       <title>Default Routes</title>
 
-      <indexterm><primary>default route</primary></indexterm>
+      <indexterm>
+	<primary>default route</primary>
+      </indexterm>
 
       <para>When the local system needs to make a connection to a
 	remote host, it checks the routing table to determine if a
@@ -400,9 +425,11 @@ host2.example.com link#1             UC 
     <sect2 xml:id="network-dual-homed-hosts">
       <title>Dual Homed Hosts</title>
 
-      <indexterm><primary>dual homed hosts</primary></indexterm>
+      <indexterm>
+	<primary>dual homed hosts</primary>
+      </indexterm>
 
-      <para>A a dual-homed system is a host which resides on two
+      <para>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
@@ -428,7 +455,9 @@ host2.example.com link#1             UC 
     <sect2 xml:id="network-dedicated-router">
       <title>Building a Router</title>
 
-      <indexterm><primary>router</primary></indexterm>
+      <indexterm>
+	<primary>router</primary>
+      </indexterm>
 
       <para>A network router is a system that forwards packets from
 	one interface to another.  Internet standards and good
@@ -444,9 +473,16 @@ host2.example.com link#1             UC 
 	<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>
+      <indexterm>
+	<primary>BGP</primary>
+      </indexterm>
+      <indexterm>
+	<primary>RIP</primary>
+      </indexterm>
+      <indexterm>
+	<primary>OSPF</primary>
+      </indexterm>
+
       <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
@@ -463,8 +499,13 @@ host2.example.com link#1             UC 
 	<title>Setting Up Static Routes</title>
 
 	<authorgroup>
-	  <author><personname><firstname>Al</firstname><surname>Hoang</surname></personname><contrib>Contributed
-	    by </contrib></author>
+	  <author>
+	    <personname>
+	      <firstname>Al</firstname>
+	      <surname>Hoang</surname>
+	    </personname>
+	    <contrib>Contributed by </contrib>
+	  </author>
 	</authorgroup>
       </info>
       <!-- Feb 2004 -->
@@ -641,6 +682,7 @@ route_net2="-net 192.168.1.0/24 192.168.
 	<primary>kernel options</primary>
 	<secondary>MROUTING</secondary>
       </indexterm>
+
       <para>&os; natively supports both multicast applications and
 	multicast routing.  Multicast applications do not require any
 	special configuration of &os;; as applications will generally
@@ -672,15 +714,29 @@ route_net2="-net 192.168.1.0/24 192.168.
       <title>Wireless Networking</title>
 
       <authorgroup>
-	<author><personname><othername>Loader</othername></personname></author>
-
-	<author><personname><firstname>Marc</firstname><surname>Fonvieille</surname></personname></author>
-
-	<author><personname><firstname>Murray</firstname><surname>Stokely</surname></personname></author>
+	<author>
+	  <personname>
+	    <othername>Loader</othername>
+	  </personname>
+	</author>
+	<author>
+	  <personname>
+	    <firstname>Marc</firstname>
+	    <surname>Fonvieille</surname>
+	  </personname>
+	</author>
+	<author>
+	  <personname>
+	    <firstname>Murray</firstname>
+	    <surname>Stokely</surname>
+	  </personname>
+	</author>
       </authorgroup>
     </info>
 
-    <indexterm><primary>wireless networking</primary></indexterm>
+    <indexterm>
+      <primary>wireless networking</primary>
+    </indexterm>
     <indexterm>
       <primary>802.11</primary>
       <see>wireless networking</see>
@@ -2239,7 +2295,9 @@ freebsdap       00:11:95:c3:0d:ac    1  
       <title>USB Tethering</title>
     </info>
 
-    <indexterm><primary>tether</primary></indexterm>
+    <indexterm>
+      <primary>tether</primary>
+    </indexterm>
 
     <para>Many cellphones provide the option to share their data
       connection over USB (often called "tethering").  This feature
@@ -2264,14 +2322,21 @@ freebsdap       00:11:95:c3:0d:ac    1  
       <title>Bluetooth</title>
 
       <authorgroup>
-	<author><personname><firstname>Pav</firstname><surname>Lucistnik</surname></personname><contrib>Written
-	    by </contrib><affiliation>
-	    <address><email>pav at FreeBSD.org</email></address>
-	  </affiliation></author>
+	<author>
+	  <personname>
+	    <firstname>Pav</firstname>
+	    <surname>Lucistnik</surname>
+	  </personname>
+	  <contrib>Written by </contrib>
+	  <email>pav at FreeBSD.org</email>
+	</author>
       </authorgroup>
     </info>
 
-    <indexterm><primary>Bluetooth</primary></indexterm>
+    <indexterm>
+      <primary>Bluetooth</primary>
+    </indexterm>
+
     <sect2>
       <title>Introduction</title>
 
@@ -2343,7 +2408,9 @@ Number of SCO packets: 8</screen>
       <title>Host Controller Interface
 	(<acronym>HCI</acronym>)</title>
 
-      <indexterm><primary>HCI</primary></indexterm>
+      <indexterm>
+	<primary>HCI</primary>
+      </indexterm>
 
       <para>The Host Controller Interface (<acronym>HCI</acronym>)
 	provides a command interface to the baseband controller and
@@ -2404,8 +2471,8 @@ Name: Pav's T39</screen>
 
       <para>If an inquiry is performed on a remote Bluetooth device,
 	it will find the computer as
-	<quote>your.host.name (ubt0)</quote>. The name assigned to the
-	local device can be changed at any time.</para>
+	<quote>your.host.name (ubt0)</quote>.  The name assigned to
+	the local device can be changed at any time.</para>
 
       <para>The Bluetooth system provides a point-to-point connection
 	between two Bluetooth units, or a point-to-multipoint
@@ -2437,7 +2504,9 @@ Reason: Connection terminated by local h
       <title>Logical Link Control and Adaptation Protocol
 	(<acronym>L2CAP</acronym>)</title>
 
-      <indexterm><primary>L2CAP</primary></indexterm>
+      <indexterm>
+	<primary>L2CAP</primary>
+      </indexterm>
 
       <para>The Logical Link Control and Adaptation Protocol
 	(<acronym>L2CAP</acronym>) provides connection-oriented and
@@ -2611,7 +2680,9 @@ hcsecd[16484]: Sending PIN_Code_Reply to
       <title>Service Discovery Protocol
 	(<acronym>SDP</acronym>)</title>
 
-      <indexterm><primary>SDP</primary></indexterm>
+      <indexterm>
+	<primary>SDP</primary>
+      </indexterm>
 
       <para>The Service Discovery Protocol (<acronym>SDP</acronym>)
 	provides the means for client applications to discover the
@@ -2795,7 +2866,10 @@ Bluetooth Profile Descriptor List:
       <title><acronym>OBEX</acronym> Object Push
 	(<acronym>OPUSH</acronym>) Profile</title>
 
-      <indexterm><primary>OBEX</primary></indexterm>
+      <indexterm>
+	<primary>OBEX</primary>
+      </indexterm>
+
       <para><acronym>OBEX</acronym> is a widely used protocol for
 	simple file transfers between mobile devices.  Its main use
 	is in infrared communication, where it is used for generic
@@ -2915,17 +2989,26 @@ rfcomm_sppd[94692]: Starting on /dev/tty
       <title>Bridging</title>
 
       <authorgroup>
-	<author><personname><firstname>Andrew</firstname><surname>Thompson</surname></personname><contrib>Written
-	  by </contrib></author>
+	<author>
+	  <personname>
+	    <firstname>Andrew</firstname>
+	    <surname>Thompson</surname>
+	  </personname>
+	  <contrib>Written by </contrib>
+	</author>
       </authorgroup>
     </info>
 
     <sect2>
       <title>Introduction</title>
 
-      <indexterm><primary><acronym>IP</acronym>
-	  subnet</primary></indexterm>
-      <indexterm><primary>bridge</primary></indexterm>
+      <indexterm>
+	<primary><acronym>IP</acronym> subnet</primary>
+      </indexterm>

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