svn commit: r42402 - in head/en_US.ISO8859-1: articles/contributing books/arch-handbook/scsi books/arch-handbook/sound books/developers-handbook/policies books/handbook/boot books/handbook/cutting-...

From: Gabor Kovesdan <gabor_at_FreeBSD.org>
Date: Tue, 23 Jul 2013 18:55:22 +0000 (UTC)
Author: gabor
Date: Tue Jul 23 18:55:22 2013
New Revision: 42402
URL: http://svnweb.freebsd.org/changeset/doc/42402

Log:
  - Fix misplaced indexterms.

Modified:
  head/en_US.ISO8859-1/articles/contributing/article.xml
  head/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml
  head/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml
  head/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml
  head/en_US.ISO8859-1/books/handbook/boot/chapter.xml
  head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
  head/en_US.ISO8859-1/books/handbook/install/chapter.xml
  head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
  head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
  head/en_US.ISO8859-1/books/handbook/mail/chapter.xml
  head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
  head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
  head/en_US.ISO8859-1/books/handbook/printing/chapter.xml
  head/en_US.ISO8859-1/books/handbook/security/chapter.xml
  head/en_US.ISO8859-1/books/handbook/serialcomms/chapter.xml
  head/en_US.ISO8859-1/books/handbook/users/chapter.xml

Modified: head/en_US.ISO8859-1/articles/contributing/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/contributing/article.xml	Tue Jul 23 17:26:10 2013	(r42401)
+++ head/en_US.ISO8859-1/articles/contributing/article.xml	Tue Jul 23 18:55:22 2013	(r42402)
_at__at_ -412,9 +412,7 _at__at_
 
       <orderedlist>
 	<listitem>
-	  <indexterm><primary>BSD copyright</primary></indexterm>
-
-	  <para>The BSD copyright.  This copyright is most preferred
+	  <para>The BSD copyright<indexterm><primary>BSD copyright</primary></indexterm>.  This copyright is most preferred
 	    due to its <quote>no strings attached</quote> nature and
 	    general attractiveness to commercial enterprises.  Far
 	    from discouraging such commercial use, the FreeBSD Project
_at__at_ -424,6 +422,7 _at__at_
 	</listitem>
 
 	<listitem>
+	  <para>
 	  <indexterm>
 	    <primary>GPL</primary>
 	    <see>GNU General Public License</see>
_at__at_ -432,8 +431,7 _at__at_
 	  <indexterm>
 	    <primary>GNU General Public License</primary>
 	  </indexterm>
-
-	  <para>The GNU General Public License, or <quote>GPL</quote>.
+	  The GNU General Public License, or <quote>GPL</quote>.
 	    This license is not quite as popular with us due to the
 	    amount of extra effort demanded of anyone using the code
 	    for commercial purposes, but given the sheer quantity of

Modified: head/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml	Tue Jul 23 17:26:10 2013	(r42401)
+++ head/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.xml	Tue Jul 23 18:55:22 2013	(r42402)
_at__at_ -155,8 +155,7 _at__at_
       free the <structname>devq</structname> also because we can do
       nothing else with it and we want to conserve memory.</para>
 
-    <indexterm><primary>SCSI</primary><secondary>bus</secondary></indexterm>
-    <para>If a SCSI card has multiple SCSI buses on it then each bus
+    <para>If a SCSI card has multiple SCSI buses<indexterm><primary>SCSI</primary><secondary>bus</secondary></indexterm> on it then each bus
       requires its own <structname>cam_sim</structname>
       structure.</para>
 
_at__at_ -227,9 +226,8 _at__at_
           adapter.</para></listitem>
       </itemizedlist>
 
-    <indexterm><primary>SCSI</primary><secondary>adapter</secondary></indexterm>
     <para>Finally we register the SCSI buses associated with our SCSI
-      adapter:</para>
+      adapter<indexterm><primary>SCSI</primary><secondary>adapter</secondary></indexterm>:</para>
 
 <programlisting>    if(xpt_bus_register(sim, bus_number) != CAM_SUCCESS) {
         cam_sim_free(sim, /*free_devq*/ TRUE);
_at__at_ -606,10 +604,8 _at__at_
         return;
     }</programlisting>
 
-      <indexterm><primary>hardware control block</primary></indexterm>
-
       <para>Then allocate whatever data structures (such as
-        card-dependent hardware control block) we need to process this
+        card-dependent hardware control block<indexterm><primary>hardware control block</primary></indexterm>) we need to process this
         request. If we can not then freeze the SIM queue and remember
         that we have a pending operation, return the CCB back and ask
         CAM to re-queue it. Later when the resources become available
_at__at_ -1236,10 +1232,8 _at__at_ of the union ccb:</para>
       are set then the existing drivers return the current
       settings). Set all the bits in the valid field.</para>
 
-    <indexterm><primary>BIOS</primary></indexterm>
-
     <para><emphasis>XPT_CALC_GEOMETRY</emphasis> - calculate logical
-      (BIOS) geometry of the disk</para>
+      (BIOS)<indexterm><primary>BIOS</primary></indexterm> geometry of the disk</para>
 
     <para>The arguments are transferred in the instance <quote>struct
       ccb_calc_geometry ccg</quote> of the union ccb:</para>
_at__at_ -1263,9 +1257,8 _at__at_ of the union ccb:</para>
 
     </itemizedlist>
 
-    <indexterm><primary>SCSI</primary><secondary>BIOS</secondary></indexterm>
     <para>If the returned geometry differs much enough from what the
-      SCSI controller BIOS thinks and a disk on this SCSI controller
+      SCSI controller BIOS<indexterm><primary>SCSI</primary><secondary>BIOS</secondary></indexterm> thinks and a disk on this SCSI controller
       is used as bootable the system may not be able to boot. The
       typical calculation example taken from the aic7xxx driver
       is:</para>

Modified: head/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml	Tue Jul 23 17:26:10 2013	(r42401)
+++ head/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml	Tue Jul 23 18:55:22 2013	(r42402)
_at__at_ -122,8 +122,7 _at__at_
           DRIVER_MODULE(snd_xxxpci, pci, xxx_driver, pcm_devclass, 0, 0);
           MODULE_DEPEND(snd_xxxpci, snd_pcm, PCM_MINVER, PCM_PREFVER,PCM_MAXVER);</programlisting>
 
-       <indexterm><primary>device drivers</primary><secondary>sound</secondary></indexterm>
-        <para>Most sound drivers need to store additional private
+        <para>Most sound drivers<indexterm><primary>device drivers</primary><secondary>sound</secondary></indexterm> need to store additional private
           information about their device.  A private data structure is
           usually allocated in the attach routine.  Its address is
           passed to <devicename>pcm</devicename> by the calls to

Modified: head/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml	Tue Jul 23 17:26:10 2013	(r42401)
+++ head/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml	Tue Jul 23 18:55:22 2013	(r42402)
_at__at_ -454,14 +454,12 _at__at_
 
         <orderedlist>
           <listitem>
-            <indexterm><primary>core team</primary></indexterm>
-            <para>The <ulink url="&url.base;/administration.html#t-core">Core team</ulink> decides if
+            <para>The <ulink url="&url.base;/administration.html#t-core">Core team</ulink><indexterm><primary>core team</primary></indexterm> decides if
               the code should be part of <command>make world</command>.</para>
           </listitem>
 
           <listitem>
-            <indexterm><primary>release engineering</primary></indexterm>
-            <para>The <ulink url="&url.base;/administration.html#t-re">Release Engineering</ulink>
+            <para>The <ulink url="&url.base;/administration.html#t-re">Release Engineering</ulink><indexterm><primary>release engineering</primary></indexterm>
               decides if it goes into the release.</para>
           </listitem>
         </orderedlist>

Modified: head/en_US.ISO8859-1/books/handbook/boot/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/boot/chapter.xml	Tue Jul 23 17:26:10 2013	(r42401)
+++ head/en_US.ISO8859-1/books/handbook/boot/chapter.xml	Tue Jul 23 18:55:22 2013	(r42402)
_at__at_ -504,10 +504,8 _at__at_ boot:</screen>
 	<para>Here are some practical examples of loader usage:</para>
 
 	<itemizedlist>
-	  <indexterm><primary>single-user mode</primary></indexterm>
-
 	  <listitem>
-	    <para>To boot the usual kernel in single-user mode:</para>
+	    <para>To boot the usual kernel in single-user mode<indexterm><primary>single-user mode</primary></indexterm>:</para>
 
 	    <screen><userinput>boot -s</userinput></screen>
 	  </listitem>
_at__at_ -516,16 +514,12 _at__at_ boot:</screen>
 	    <para>To unload the usual kernel and modules, and then
 	      load the previous or another kernel:</para>
 
-	    <indexterm>
-	      <primary><filename>kernel.old</filename></primary>
-	    </indexterm>
-
 	    <screen><userinput>unload</userinput>
 <userinput>load <replaceable>kernel.old</replaceable></userinput></screen>
 
 	    <para>Use <filename>kernel.GENERIC</filename> to refer to
 	      the default kernel that comes with an installation, or
-	      <filename>kernel.old</filename> to refer to the
+	      <filename>kernel.old</filename><indexterm><primary><filename>kernel.old</filename></primary></indexterm> to refer to the
 	      previously installed kernel before a system upgrade or
 	      before configuring a custom kernel.</para>
 

Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Jul 23 17:26:10 2013	(r42401)
+++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Tue Jul 23 18:55:22 2013	(r42402)
_at__at_ -1333,27 +1333,8 _at__at_ Fetching 133 new ports or files... done.
 	      one of the following methods:</para>
 
 	    <orderedlist>
-	      <indexterm>
-		<primary>Subversion</primary>
-	      </indexterm>
-	      <indexterm>
-		<primary><command>cron</command></primary>
-	      </indexterm>
-	      <indexterm>
-		<primary>-CURRENT</primary>
-		<secondary>Syncing with
-		  <application>Subversion</application>
-		</secondary>
-	      </indexterm>
-	      <indexterm>
-		<primary>-CURRENT</primary>
-		<secondary>Syncing with
-		  <application>CTM</application>
-		</secondary>
-	      </indexterm>
-
 	      <listitem>
-		<para>Use <link linkend="svn">svn</link> to check out
+		<para>Use <link linkend="svn">svn</link><indexterm><primary>Subversion</primary></indexterm><indexterm><primary>-CURRENT</primary><secondary>Syncing with <application>Subversion</application></secondary></indexterm> to check out
 		  the desired development or release branch.  This is
 		  the recommended method, providing access to &os;
 		  development as it occurs.  Checkout the -CURRENT
_at__at_ -1365,13 +1346,8 _at__at_ Fetching 133 new ports or files... done.
 	      </listitem>
 
 	      <listitem>
-		<indexterm>
-		  <primary>-CURRENT</primary>
-		  <secondary>Syncing with CTM</secondary>
-		</indexterm>
-
 		<para>Use the <application><link
-		      linkend="ctm">CTM</link></application> facility.
+		      linkend="ctm">CTM</link></application><indexterm><primary>-CURRENT</primary><secondary>Syncing with CTM</secondary></indexterm> facility.
 		  If you have bad connectivity such as high price
 		  connections or only email access,
 		  <application>CTM</application> is an option, but it
_at__at_ -1393,11 +1369,7 _at__at_ Fetching 133 new ports or files... done.
 	      compile just a subset is almost guaranteed to cause
 	      problems.</para>
 
-	    <indexterm>
-	      <primary>-CURRENT</primary>
-	      <secondary>compiling</secondary>
-	    </indexterm>
-	    <para>Before compiling &os.current;, read
+	    <para>Before compiling &os.current;<indexterm><primary>-CURRENT</primary><secondary>compiling</secondary></indexterm>, read
 	      <filename>/usr/src/Makefile</filename> very carefully.
 	      <link linkend="makeworld">Install a new kernel and
 	      rebuild the world</link> the first time through as part
_at__at_ -1524,27 +1496,15 _at__at_ Fetching 133 new ports or files... done.
 	      already running a previous release of &os;:</para>
 
 	    <orderedlist>
-	      <indexterm>
-		<primary>Subversion</primary>
-	      </indexterm>
-	      <indexterm>
-		<primary><command>cron</command></primary>
-	      </indexterm>
-	      <indexterm>
-		<primary>-STABLE</primary>
-		<secondary>syncing with
-		  <application>Subversion</application></secondary>
-	      </indexterm>
-
 	      <listitem>
-		<para>Use <link linkend="svn">svn</link> to check out
+		<para>Use <link linkend="svn">svn</link><indexterm><primary>Subversion</primary></indexterm> to check out
 		  the desired development or release branch.  This is
 		  the recommended method, providing access to &os;
 		  development as it occurs.  Branch names include
 		  <literal>head</literal> for the current development
 		  head, and branches identified in <ulink
 		    url="&url.base;/releng/">the release engineering
-		    page</ulink>, such as <literal>stable/9</literal>
+		    page</ulink>, such as <literal>stable/9</literal><indexterm><primary>-STABLE</primary><secondary>syncing with <application>Subversion</application></secondary></indexterm>
 		  or <literal>releng/9.0</literal>.  URL prefixes for
 		  <application>Subversion</application> checkout of
 		  the base system are shown in <link
_at__at_ -1556,25 +1516,15 _at__at_ Fetching 133 new ports or files... done.
 	      </listitem>
 
 	      <listitem>
-		<indexterm>
-		  <primary>-STABLE</primary>
-		  <secondary>syncing with CTM</secondary>
-		</indexterm>
-
 		<para>Consider using <application><link
-		      linkend="ctm">CTM</link></application> if you do
+		      linkend="ctm">CTM</link></application><indexterm><primary>-STABLE</primary><secondary>syncing with CTM</secondary></indexterm> if you do
 		  not have a fast connection to the Internet.</para>
 	      </listitem>
 	    </orderedlist>
 	  </listitem>
 
 	  <listitem>
-	    <indexterm>
-	      <primary>-STABLE</primary>
-	      <secondary>compiling</secondary>
-	    </indexterm>
-
-	    <para>Before compiling &os.stable;, read
+	    <para>Before compiling &os.stable;<indexterm><primary>-STABLE</primary><secondary>compiling</secondary></indexterm>, read
 	      <filename>/usr/src/Makefile</filename> carefully.  <link
 		linkend="makeworld">Install a new kernel and rebuild
 	      the world</link> the first time through as part of the

Modified: head/en_US.ISO8859-1/books/handbook/install/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/install/chapter.xml	Tue Jul 23 17:26:10 2013	(r42401)
+++ head/en_US.ISO8859-1/books/handbook/install/chapter.xml	Tue Jul 23 18:55:22 2013	(r42402)
_at__at_ -2292,13 +2292,8 _at__at_ Mounting root from ufs:/dev/md0c
 	      firewall</guimenuitem></term>
 
 	  <listitem>
-	    <indexterm>
-	      <primary>FTP</primary>
-	      <secondary>passive mode</secondary>
-	    </indexterm>
-
 	    <para>This option instructs &man.sysinstall.8;
-	      to use passive mode for all FTP
+	      to use passive mode<indexterm><primary>FTP</primary><secondary>passive mode</secondary></indexterm> for all FTP
 	      operations.
 	      This allows the user to pass through firewalls
 	      that do not allow incoming connections on random TCP ports.
_at__at_ -2311,11 +2306,6 _at__at_ Mounting root from ufs:/dev/md0c
 	      through a http proxy</guimenuitem></term>
 
 	  <listitem>
-	    <indexterm>
-	      <primary>FTP</primary>
-	      <secondary>via a HTTP proxy</secondary>
-	    </indexterm>
-
 	    <para>This option instructs &man.sysinstall.8;
 	      to use the HTTP
 	      protocol to connect to a proxy
_at__at_ -2323,7 +2313,7 _at__at_ Mounting root from ufs:/dev/md0c
 	      the requests and send them to the FTP server.
 	      This allows the user to pass through firewalls
 	      that do not allow FTP, but offer a HTTP
-	      proxy.
+	      proxy<indexterm><primary>FTP</primary><secondary>via a HTTP proxy</secondary></indexterm>.
 	      In this case, specify the proxy in
 	      addition to the FTP server.</para>
 	  </listitem>

Modified: head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml	Tue Jul 23 17:26:10 2013	(r42401)
+++ head/en_US.ISO8859-1/books/handbook/introduction/chapter.xml	Tue Jul 23 18:55:22 2013	(r42402)
_at__at_ -78,20 +78,14 _at__at_
 
       <itemizedlist>
 	<listitem>
-	  <indexterm><primary>preemptive
-	      multitasking</primary></indexterm>
-
-	  <para><emphasis>Preemptive multitasking</emphasis> with
+	  <para><emphasis>Preemptive multitasking</emphasis><indexterm><primary>preemptive multitasking</primary></indexterm> with
 	    dynamic priority adjustment to ensure smooth and fair
 	    sharing of the computer between applications and users,
 	    even under the heaviest of loads.</para>
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>multi-user
-	      facilities</primary></indexterm>
-
-	  <para><emphasis>Multi-user facilities</emphasis> which allow
+	  <para><emphasis>Multi-user facilities</emphasis><indexterm><primary>multi-user facilities</primary></indexterm> which allow
 	    many people to use a &os; system simultaneously for a
 	    variety of things.  This means, for example, that system
 	    peripherals such as printers and tape drives are properly
_at__at_ -101,9 +95,7 _at__at_
 	    over-use.</para>
 	</listitem>
 	<listitem>
-	  <indexterm><primary>TCP/IP networking</primary></indexterm>
-
-	  <para>Strong <emphasis>TCP/IP networking</emphasis> with
+	  <para>Strong <emphasis>TCP/IP networking</emphasis><indexterm><primary>TCP/IP networking</primary></indexterm> with
 	    support for industry standards such as SCTP, DHCP, NFS,
 	    NIS, PPP, SLIP, IPsec, and IPv6.  This means that your
 	    &os; machine can interoperate easily with other systems as
_at__at_ -114,26 +106,21 _at__at_
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>memory protection</primary></indexterm>
-
-	  <para><emphasis>Memory protection</emphasis> ensures that
+	  <para><emphasis>Memory protection</emphasis><indexterm><primary>memory protection</primary></indexterm> ensures that
 	    applications (or users) cannot interfere with each other.
 	    One application crashing will not affect others in any
 	    way.</para>
 	</listitem>
 
 	<listitem>
-	  <indexterm>
-	    <primary>X Window System</primary>
-	  </indexterm>
-
 	  <para>The industry standard <emphasis>X Window
-	      System</emphasis> (X11R7) provides a graphical user
+	      System</emphasis><indexterm><primary>X Window System</primary></indexterm> (X11R7) provides a graphical user
 	    interface (GUI) for the cost of a common VGA card and
 	    monitor and comes with full sources.</para>
 	</listitem>
 
 	<listitem>
+	  <para>
 	  <indexterm>
 	    <primary>binary compatibility</primary>
 	    <secondary>Linux</secondary>
_at__at_ -154,8 +141,7 _at__at_
 	    <primary>binary compatibility</primary>
 	    <secondary>NetBSD</secondary>
 	  </indexterm>
-
-	  <para><emphasis>Binary compatibility</emphasis> with many
+	  <emphasis>Binary compatibility</emphasis> with many
 	    programs built for Linux, SCO, SVR4, BSDI and
 	    NetBSD.</para>
 	</listitem>
_at__at_ -177,9 +163,7 _at__at_
 	    compile.</para>
 	</listitem>
 	<listitem>
-	  <indexterm><primary>virtual memory</primary></indexterm>
-
-	  <para>Demand paged <emphasis>virtual memory</emphasis> and
+	  <para>Demand paged <emphasis>virtual memory</emphasis><indexterm><primary>virtual memory</primary></indexterm> and
 	    <quote>merged VM/buffer cache</quote> design efficiently
 	    satisfies applications with large appetites for memory
 	    while still maintaining interactive response to other
_at__at_ -187,15 +171,12 _at__at_
 	</listitem>
 
 	<listitem>
-	  <indexterm>
-	    <primary>Symmetric Multi-Processing (SMP)</primary>
-	  </indexterm>
-
-	  <para><emphasis>SMP</emphasis> support for machines with
+	  <para><emphasis>SMP</emphasis><indexterm><primary>Symmetric Multi-Processing (SMP)</primary></indexterm> support for machines with
 	    multiple CPUs.</para>
 	</listitem>
 
 	<listitem>
+	  <para>
 	  <indexterm>
 	    <primary>compilers</primary>
 	    <secondary>C</secondary>
_at__at_ -204,8 +185,7 _at__at_
 	    <primary>compilers</primary>
 	    <secondary>C++</secondary>
 	  </indexterm>
-
-	  <para>A full complement of <emphasis>C</emphasis>
+	    A full complement of <emphasis>C</emphasis>
 	    and <emphasis>C++</emphasis>
 	    development tools.
 	    Many additional languages for advanced research
_at__at_ -214,9 +194,7 _at__at_
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>source code</primary></indexterm>
-
-	  <para><emphasis>Source code</emphasis> for the entire system
+	  <para><emphasis>Source code</emphasis><indexterm><primary>source code</primary></indexterm> for the entire system
 	    means you have the greatest degree of control over your
 	    environment.  Why be locked into a proprietary solution
 	    at the mercy of your vendor when you can have a truly open
_at__at_ -233,13 +211,8 _at__at_
 	</listitem>
       </itemizedlist>
 
-      <indexterm><primary>4.4BSD-Lite</primary></indexterm>
-      <indexterm>
-	<primary>Computer Systems Research Group (CSRG)</primary>
-      </indexterm>
-      <indexterm><primary>U.C. Berkeley</primary></indexterm>
-      <para>&os; is based on the 4.4BSD-Lite release from Computer
-	Systems Research Group (CSRG) at the University of California
+      <para>&os; is based on the 4.4BSD-Lite<indexterm><primary>4.4BSD-Lite</primary></indexterm> release from Computer
+	Systems Research Group (CSRG)<indexterm><primary>Computer Systems Research Group (CSRG)</primary></indexterm> at the University of California
 	at Berkeley, and carries on the distinguished tradition of BSD
 	systems development.  In addition to the fine work provided by
 	CSRG, the &os;&nbsp;Project has put in many thousands of hours
_at__at_ -278,15 +251,11 _at__at_
 
 	  <itemizedlist>
 	    <listitem>
-	      <indexterm><primary>FTP servers</primary></indexterm>
-
-	      <para>FTP servers</para>
+	      <para>FTP servers<indexterm><primary>FTP servers</primary></indexterm></para>
 	    </listitem>
 
 	    <listitem>
-	      <indexterm><primary>web servers</primary></indexterm>
-
-	      <para>World Wide Web servers (standard or secure
+	      <para>World Wide Web servers<indexterm><primary>web servers</primary></indexterm> (standard or secure
 		[SSL])</para>
 	    </listitem>
 
_at__at_ -295,15 +264,12 _at__at_
 	    </listitem>
 
 	    <listitem>
-	      <indexterm><primary>firewall</primary></indexterm>
-
-	      <indexterm><primary>NAT</primary></indexterm>
-
-	      <para>Firewalls and NAT (<quote>IP masquerading</quote>)
+	      <para>Firewalls<indexterm><primary>firewall</primary></indexterm> and NAT<indexterm><primary>NAT</primary></indexterm> (<quote>IP masquerading</quote>)
 		gateways</para>
 	    </listitem>
 
 	    <listitem>
+	      <para>
 	      <indexterm>
 		<primary>electronic mail</primary>
 		<see>email</see>
_at__at_ -311,14 +277,11 _at__at_
 	      <indexterm>
 		<primary>email</primary>
 	      </indexterm>
-
-	      <para>Electronic Mail servers</para>
+	      Electronic Mail servers</para>
 	    </listitem>
 
 	    <listitem>
-	      <indexterm><primary>USENET</primary></indexterm>
-
-	      <para>USENET News or Bulletin Board Systems</para>
+	      <para>USENET<indexterm><primary>USENET</primary></indexterm> News or Bulletin Board Systems</para>
 	    </listitem>
 
 	    <listitem>
_at__at_ -356,18 +319,15 _at__at_
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>router</primary></indexterm>
-
-	  <indexterm><primary>DNS Server</primary></indexterm>
-
-	  <para><emphasis>Networking:</emphasis>  Need a new router?
-	    A name server (DNS)? A firewall to keep people out of your
+	  <para><emphasis>Networking:</emphasis>  Need a new router?<indexterm><primary>router</primary></indexterm>
+	    A name server (DNS)?<indexterm><primary>DNS Server</primary></indexterm> A firewall to keep people out of your
 	    internal network?  &os; can easily turn that unused 386 or
 	    486 PC sitting in the corner into an advanced router with
 	    sophisticated packet-filtering capabilities.</para>
 	</listitem>
 
 	<listitem>
+	  <para>
 	  <indexterm>
 	    <primary>X Window System</primary>
 	  </indexterm>
_at__at_ -375,8 +335,7 _at__at_
 	    <primary>X Window System</primary>
 	    <secondary>Accelerated-X</secondary>
 	  </indexterm>
-
-	  <para><emphasis>X Window workstation:</emphasis> &os; is a
+	  <emphasis>X Window workstation:</emphasis> &os; is a
 	    fine choice for an inexpensive X terminal solution,
 	    using the freely available X11 server.
 	    Unlike an X terminal, &os; allows many applications to
_at__at_ -387,12 +346,9 _at__at_
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>GNU Compiler
-	      Collection</primary></indexterm>
-
 	  <para><emphasis>Software Development:</emphasis>  The basic
 	    &os; system comes with a full complement of development
-	    tools including the renowned GNU C/C++ compiler and
+	    tools including the renowned GNU C/C++<indexterm><primary>GNU Compiler Collection</primary></indexterm> compiler and
 	    debugger.</para>
 	</listitem>
       </itemizedlist>
_at__at_ -416,15 +372,13 _at__at_
 
       <itemizedlist>
 	<listitem>
-	  <indexterm><primary>Apple</primary></indexterm>
 	  <para><ulink
-	      url="http://www.apple.com/">Apple</ulink></para>
+	      url="http://www.apple.com/">Apple</ulink><indexterm><primary>Apple</primary></indexterm></para>
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>Cisco</primary></indexterm>
 	  <para><ulink
-	      url="http://www.cisco.com/">Cisco</ulink></para>
+	      url="http://www.cisco.com/">Cisco</ulink><indexterm><primary>Cisco</primary></indexterm></para>
 	</listitem>
 
 	<listitem>
_at__at_ -433,9 +387,8 _at__at_
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>NetApp</primary></indexterm>
 	  <para><ulink
-	      url="http://www.netapp.com/">NetApp</ulink></para>
+	      url="http://www.netapp.com/">NetApp</ulink><indexterm><primary>NetApp</primary></indexterm></para>
 	</listitem>
       </itemizedlist>
 
_at__at_ -444,81 +397,62 _at__at_
 
       <itemizedlist>
 	<listitem>
-	  <indexterm><primary>Yahoo!</primary></indexterm>
 	  <para><ulink
-	      url="http://www.yahoo.com/">Yahoo!</ulink></para>
+	      url="http://www.yahoo.com/">Yahoo!</ulink><indexterm><primary>Yahoo!</primary></indexterm></para>
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>Yandex</primary></indexterm>
 	  <para><ulink
-	      url="http://www.yandex.ru/">Yandex</ulink></para>
+	      url="http://www.yandex.ru/">Yandex</ulink><indexterm><primary>Yandex</primary></indexterm></para>
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>Apache</primary></indexterm>
 	  <para><ulink
-	      url="http://www.apache.org/">Apache</ulink></para>
+	      url="http://www.apache.org/">Apache</ulink><indexterm><primary>Apache</primary></indexterm></para>
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>Rambler</primary></indexterm>
 	  <para><ulink
-	      url="http://www.rambler.ru/">Rambler</ulink></para>
+	      url="http://www.rambler.ru/">Rambler</ulink><indexterm><primary>Rambler</primary></indexterm></para>
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>Sina</primary></indexterm>
-	  <para><ulink url="http://www.sina.com/">Sina</ulink></para>
+	  <para><ulink url="http://www.sina.com/">Sina</ulink><indexterm><primary>Sina</primary></indexterm></para>
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>Pair Networks</primary></indexterm>
-
 	  <para><ulink
-	      url="http://www.pair.com/">Pair Networks</ulink></para>
+	      url="http://www.pair.com/">Pair Networks</ulink><indexterm><primary>Pair Networks</primary></indexterm></para>
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>Sony Japan</primary></indexterm>
-
 	  <para><ulink
-	      url="http://www.sony.co.jp/">Sony Japan</ulink></para>
+	      url="http://www.sony.co.jp/">Sony Japan</ulink><indexterm><primary>Sony Japan</primary></indexterm></para>
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>Netcraft</primary></indexterm>
-
 	  <para><ulink
-	      url="http://www.netcraft.com/">Netcraft</ulink></para>
+	      url="http://www.netcraft.com/">Netcraft</ulink><indexterm><primary>Netcraft</primary></indexterm></para>
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>NetEase</primary></indexterm>
-
 	  <para><ulink
-	      url="http://www.163.com/">NetEase</ulink></para>
+	      url="http://www.163.com/">NetEase</ulink><indexterm><primary>NetEase</primary></indexterm></para>
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>Weathernews</primary></indexterm>
-
 	  <para><ulink
-	      url="http://www.weathernews.com/">Weathernews</ulink></para>
+	      url="http://www.weathernews.com/">Weathernews</ulink><indexterm><primary>Weathernews</primary></indexterm></para>
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>TELEHOUSE America</primary></indexterm>
-
 	  <para><ulink url="http://www.telehouse.com/">TELEHOUSE
-	      America</ulink></para>
+	      America</ulink><indexterm><primary>TELEHOUSE America</primary></indexterm></para>
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>Experts Exchange</primary></indexterm>
-
 	  <para><ulink url="http://www.experts-exchange.com/">Experts
-	      Exchange</ulink></para>
+	      Exchange</ulink><indexterm><primary>Experts Exchange</primary></indexterm></para>
 	</listitem>
       </itemizedlist>
 
_at__at_ -734,6 +668,7 _at__at_
 	  <term>The SVN repositories<anchor
 	    id="development-cvs-repository"/></term>
 	  <listitem>
+	    <para>
 	    <indexterm>
 	      <primary>CVS</primary>
 	    </indexterm>
_at__at_ -759,8 +694,7 _at__at_
 	      <primary>SVN</primary>
 	      <see>Subversion</see>
 	    </indexterm>
-
-	    <para>For several years, the central source tree for &os;
+	    For several years, the central source tree for &os;
 	      was maintained by
 	      <ulink url="http://www.nongnu.org/cvs/">CVS</ulink>
 	      (Concurrent Versions System), a freely available source
_at__at_ -790,9 +724,7 _at__at_
 	    id="development-committers"/></term>
 
 	  <listitem>
-	    <indexterm><primary>committers</primary></indexterm>
-
-	    <para>The <firstterm>committers</firstterm>
+	    <para>The <firstterm>committers</firstterm><indexterm><primary>committers</primary></indexterm>
 	      are the people who have <emphasis>write</emphasis>
 	      access to the Subversion tree, and are authorized to
 	      make modifications to the &os; source (the term
_at__at_ -811,9 +743,7 _at__at_
 	      id="development-core"/></term>
 
 	  <listitem>
-	    <indexterm><primary>core team</primary></indexterm>
-
-	    <para>The <firstterm>&os; core team</firstterm>
+	    <para>The <firstterm>&os; core team</firstterm><indexterm><primary>core team</primary></indexterm>
 	      would be equivalent to the board of directors if the
 	      &os;&nbsp;Project were a company.  The primary task of
 	      the core team is to make sure the project, as a whole,
_at__at_ -851,8 +781,6 _at__at_
 	  <term>Outside contributors</term>
 
 	  <listitem>
-	    <indexterm><primary>contributors</primary></indexterm>
-
 	    <para>Last, but definitely not least, the largest group of
 	      developers are the users themselves who provide feedback
 	      and bug fixes to us on an almost constant basis.  The
_at__at_ -864,7 +792,7 _at__at_
 
 	    <para><citetitle><ulink
 		  url="&url.articles.contributors;/article.html">The
-		&os; Contributors List</ulink></citetitle> is a long
+		&os; Contributors List</ulink></citetitle><indexterm><primary>contributors</primary></indexterm> is a long
 	      and growing one, so why not join it by contributing
 	      something back to &os; today?</para>
 

Modified: head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml	Tue Jul 23 17:26:10 2013	(r42401)
+++ head/en_US.ISO8859-1/books/handbook/l10n/chapter.xml	Tue Jul 23 18:55:22 2013	(r42402)
_at__at_ -253,9 +253,8 _at__at_
 	variables in their configuration files:</para>
 
       <itemizedlist>
-	<indexterm><primary>POSIX</primary></indexterm>
 	<listitem>
-	  <para><envar>LANG</envar> for &posix; &man.setlocale.3;
+	  <para><envar>LANG</envar> for &posix;<indexterm><primary>POSIX</primary></indexterm> &man.setlocale.3;
 	    family functions</para>
 	</listitem>
 

Modified: head/en_US.ISO8859-1/books/handbook/mail/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/mail/chapter.xml	Tue Jul 23 17:26:10 2013	(r42401)
+++ head/en_US.ISO8859-1/books/handbook/mail/chapter.xml	Tue Jul 23 18:55:22 2013	(r42402)
_at__at_ -1102,10 +1102,9 _at__at_ www.example.org</programlisting>
 	a host, one of these two must be configured:</para>
 
       <itemizedlist>
-	<indexterm><primary>MX record</primary></indexterm>
 	<listitem>
 	  <para>Make sure that the lowest-numbered
-	    <acronym>MX</acronym> record in
+	    <acronym>MX</acronym><indexterm><primary>MX record</primary></indexterm> record in
 	    <acronym>DNS</acronym> points to the host's static IP
 	    address.</para>
 	</listitem>

Modified: head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Tue Jul 23 17:26:10 2013	(r42401)
+++ head/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml	Tue Jul 23 18:55:22 2013	(r42402)
_at__at_ -1332,12 +1332,8 _at__at_ Exports list on foobar:
 	<title>Machine Types</title>
 
 	<itemizedlist>
-	  <indexterm>
-	    <primary>NIS</primary>
-	    <secondary>master server</secondary>
-	  </indexterm>
 	  <listitem>
-	    <para>A <emphasis>NIS master server</emphasis>.  This
+	    <para>A <emphasis>NIS master server</emphasis><indexterm><primary>NIS</primary><secondary>master server</secondary></indexterm>.  This
 	      server, analogous to a &windowsnt; primary domain
 	      controller, maintains the files used by all of the NIS
 	      clients.  The <filename>passwd</filename>,
_at__at_ -1352,12 +1348,7 _at__at_ Exports list on foobar:
 	  </listitem>
 
 	  <listitem>
-	    <indexterm>
-	      <primary>NIS</primary>
-	      <secondary>slave server</secondary>
-	    </indexterm>
-
-	    <para><emphasis>NIS slave servers</emphasis>.  Similar to
+	    <para><emphasis>NIS slave servers</emphasis><indexterm><primary>NIS</primary><secondary>slave server</secondary></indexterm>.  Similar to
 	      the &windowsnt; backup domain controllers, NIS slave
 	      servers maintain copies of the NIS master's data files.
 	      NIS slave servers provide the redundancy, which is
_at__at_ -1368,12 +1359,7 _at__at_ Exports list on foobar:
 	  </listitem>
 
 	  <listitem>
-	    <indexterm>
-	      <primary>NIS</primary>
-	      <secondary>client</secondary>
-	    </indexterm>
-
-	    <para><emphasis>NIS clients</emphasis>.  NIS clients, like
+	    <para><emphasis>NIS clients</emphasis><indexterm><primary>NIS</primary><secondary>client</secondary></indexterm>.  NIS clients, like
 	      most &windowsnt; workstations, authenticate against the
 	      NIS server (or the &windowsnt; domain controller in the
 	      &windowsnt; workstations case) to log on.</para>

Modified: head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Tue Jul 23 17:26:10 2013	(r42401)
+++ head/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml	Tue Jul 23 18:55:22 2013	(r42402)
_at__at_ -148,15 +148,9 _at__at_
 	<para>This document assumes you have the following:</para>
 
 	<itemizedlist>
-	  <indexterm id="ppp-isp">
-	    <primary>ISP</primary>
-	  </indexterm>
-	  <indexterm id="ppp-ppp2">
-	    <primary>PPP</primary>
-	  </indexterm>
 	  <listitem>
-	    <para>An account with an Internet Service Provider (ISP)
-	      which you connect to using PPP.</para>
+	    <para>An account with an Internet Service Provider (ISP)<indexterm id="ppp-isp"><primary>ISP</primary></indexterm>
+	      which you connect to using PPP<indexterm id="ppp-ppp2"><primary>PPP</primary></indexterm>.</para>
 	  </listitem>
 
 	  <listitem>
_at__at_ -170,32 +164,13 _at__at_
 	  </listitem>
 
 	  <listitem>
-	    <indexterm id="ppp-pap">
-	      <primary>PAP</primary>
-	    </indexterm>
-	    <indexterm id="ppp-chap">
-	      <primary>CHAP</primary>
-	    </indexterm>
-	    <indexterm id="ppp-unix">
-	      <primary>UNIX</primary>
-	    </indexterm>
-	    <indexterm id="ppp-login">
-	      <primary>login name</primary>
-	    </indexterm>
-	    <indexterm id="ppp-password">
-	      <primary>password</primary>
-	    </indexterm>
-	    <para>Your login name and password.  (Either a
-	      regular &unix; style login and password pair, or a PAP
-	      or CHAP login and password pair).</para>
+	    <para>Your login name<indexterm id="ppp-login"><primary>login name</primary></indexterm> and password<indexterm id="ppp-password"><primary>password</primary></indexterm>.  (Either a
+	      regular &unix;<indexterm id="ppp-unix"><primary>UNIX</primary></indexterm> style login and password pair, or a PAP<indexterm id="ppp-pap"><primary>PAP</primary></indexterm>
+	      or CHAP<indexterm id="ppp-chap"><primary>CHAP</primary></indexterm> login and password pair).</para>
 	  </listitem>
 
 	  <listitem>
-	    <indexterm id="ppp-nameserver">
-	      <primary>nameserver</primary>
-	    </indexterm>
-
-	    <para>The IP address of one or more name servers.
+	    <para>The IP address of one or more name servers<indexterm id="ppp-nameserver"><primary>nameserver</primary></indexterm>.
 	      Normally, you will be given two IP addresses by your
 	      ISP to use for this.  If they have not given you at
 	      least one, then you can use the <command>enable
_at__at_ -384,12 +359,7 _at__at_
 	      <term>Line 6 &amp; 7:</term>
 
 	      <listitem>
-		<indexterm>
-		  <primary>PPP</primary>
-		  <secondary>user PPP</secondary>
-		</indexterm>
-
-		<para>The dial string.  User PPP uses an expect-send
+		<para>The dial string.  User PPP<indexterm><primary>PPP</primary><secondary>user PPP</secondary></indexterm> uses an expect-send
 		  syntax similar to the &man.chat.8; program.  Refer
 		  to the manual page for information on the features
 		  of this language.</para>
_at__at_ -484,9 +454,7 _at__at_
 	      <term>Line 15:</term>
 
 	      <listitem>
-		<indexterm><primary>PAP</primary></indexterm>
-		<indexterm><primary>CHAP</primary></indexterm>
-		<para>If you are using PAP or CHAP, there will be no
+		<para>If you are using PAP<indexterm><primary>PAP</primary></indexterm> or CHAP<indexterm><primary>CHAP</primary></indexterm>, there will be no
 		  login at this point, and this line should be
 		  commented out or removed.  See <link
 		    linkend="userppp-PAPnCHAP">PAP and CHAP
_at__at_ -514,9 +482,7 _at__at_ protocol: ppp</screen>
 	      <term>Line 16:</term>
 
 	      <listitem>
-		<indexterm><primary>timeout</primary></indexterm>
-
-		<para>Sets the default idle timeout (in seconds) for
+		<para>Sets the default idle timeout<indexterm><primary>timeout</primary></indexterm> (in seconds) for
 		  the connection.  Here, the connection will be closed
 		  automatically after 300 seconds of inactivity.  If
 		  you never want to timeout, set this value to zero
_at__at_ -528,11 +494,9 _at__at_ protocol: ppp</screen>
 	    <varlistentry>
 	      <term>Line 17:</term>
 	      <listitem>
-		<indexterm><primary>ISP</primary></indexterm>
-
 		<para>Sets the interface addresses.  The string
 		  <replaceable>x.x.x.x</replaceable> should be
-		  replaced by the IP address that your provider has
+		  replaced by the IP address that your provider<indexterm><primary>ISP</primary></indexterm> has
 		  allocated to you.  The string
 		  <replaceable>y.y.y.y</replaceable> should be
 		  replaced by the IP address that your ISP indicated
_at__at_ -1063,9 +1027,7 _at__at_ set nbns 203.14.100.5</programlisting>
 	    <varlistentry>
 	      <term>Line 14:</term>
 	      <listitem>
-		<indexterm><primary>password</primary></indexterm>
-
-		<para>This line specifies your PAP/CHAP password.
+		<para>This line specifies your PAP/CHAP password<indexterm><primary>password</primary></indexterm>.
 		  You will need to insert the correct value for
 		  <replaceable>MyPassword</replaceable>.  You may
 		  want to add an additional line, such as:</para>

Modified: head/en_US.ISO8859-1/books/handbook/printing/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/handbook/printing/chapter.xml	Tue Jul 23 17:26:10 2013	(r42401)
+++ head/en_US.ISO8859-1/books/handbook/printing/chapter.xml	Tue Jul 23 18:55:22 2013	(r42402)
_at__at_ -128,10 +128,8 _at__at_
       </listitem>
 
       <listitem>
-	<indexterm><primary>print jobs</primary></indexterm>
-
 	<para>It enables users to submit files to be printed; these
-	  submissions are known as <emphasis>jobs</emphasis>.</para>
+	  submissions are known as <emphasis>jobs</emphasis><indexterm><primary>print jobs</primary></indexterm>.</para>
       </listitem>
 
       <listitem>
_at__at_ -189,11 +187,9 _at__at_
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>&tex;</primary></indexterm>
-
 	  <para><application>LPD</application> can conveniently run
 	    a job to be printed through filters to add date/time
-	    headers or convert a special file format (such as a &tex;
+	    headers or convert a special file format (such as a &tex;<indexterm><primary>&tex;</primary></indexterm>
 	    DVI file) into a format the printer will understand.
 	    You will not have to do these steps manually.</para>
 	</listitem>
_at__at_ -290,12 +286,7 _at__at_
 
 	  <itemizedlist>
 	    <listitem>
-	      <indexterm>
-		<primary>printers</primary>
-		<secondary>serial</secondary>
-	      </indexterm>
-
-	      <para><emphasis>Serial</emphasis> interfaces, also known
+	      <para><emphasis>Serial</emphasis><indexterm><primary>printers</primary><secondary>serial</secondary></indexterm> interfaces, also known
 		as RS-232 or COM ports, use a serial port
 		on your computer to send data to the printer.  Serial
 		interfaces are common in the computer industry and
_at__at_ -309,12 +300,7 _at__at_
 	    </listitem>
 
 	    <listitem>
-	      <indexterm>
-		<primary>printers</primary>
-		<secondary>parallel</secondary>
-	      </indexterm>
-
-	      <para><emphasis>Parallel</emphasis> interfaces use a
+	      <para><emphasis>Parallel</emphasis><indexterm><primary>printers</primary><secondary>parallel</secondary></indexterm> interfaces use a
 		parallel port on your computer to send data to the
 		printer.  Parallel interfaces are common in the PC
 		market and are faster than RS-232 serial.  Cables are
_at__at_ -323,22 +309,13 _at__at_
 		with parallel interfaces, making their configuration
 		exceedingly simple.</para>
 
-	      <indexterm>
-		<primary>centronics</primary>
-		<see>parallel printers</see>
-	      </indexterm>
 	      <para>Parallel interfaces are sometimes known as
-		<quote>Centronics</quote> interfaces, named after the
+		<quote>Centronics</quote><indexterm><primary>centronics</primary><see>parallel printers</see></indexterm> interfaces, named after the
 		connector type on the printer.</para>
 	    </listitem>
 
 	    <listitem>
-	      <indexterm>
-		<primary>printers</primary>
-		<secondary>USB</secondary>
-	      </indexterm>
-
-	      <para>USB interfaces, named for the Universal Serial
+	      <para>USB<indexterm><primary>printers</primary><secondary>USB</secondary></indexterm> interfaces, named for the Universal Serial
 		Bus, can run at even faster speeds than parallel or
 		RS-232 serial interfaces.  Cables are simple and
 		cheap.  USB is superior to RS-232 Serial and to
_at__at_ -423,10 +400,7 _at__at_
 	    </listitem>
 

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Received on Tue Jul 23 2013 - 18:55:25 UTC