From owner-svn-doc-head@FreeBSD.ORG  Wed Jul 24 12:31:15 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 64EF3429;
 Wed, 24 Jul 2013 12:31:15 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 53BE82D4A;
 Wed, 24 Jul 2013 12:31:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6OCVF9l053678;
 Wed, 24 Jul 2013 12:31:15 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6OCVCrK053661;
 Wed, 24 Jul 2013 12:31:12 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201307241231.r6OCVCrK053661@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 24 Jul 2013 12:31:12 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r42416 - in head: hu_HU.ISO8859-2/books/handbook/l10n
 hu_HU.ISO8859-2/books/handbook/mail
 hu_HU.ISO8859-2/books/handbook/ppp-and-slip
 it_IT.ISO8859-15/books/handbook/boot it_IT.ISO8859-...
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Jul 2013 12:31:15 -0000

Author: gabor
Date: Wed Jul 24 12:31:12 2013
New Revision: 42416
URL: http://svnweb.freebsd.org/changeset/doc/42416

Log:
  - Fix misplaced indexterms

Modified:
  head/hu_HU.ISO8859-2/books/handbook/l10n/chapter.xml
  head/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml
  head/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml
  head/it_IT.ISO8859-15/books/handbook/boot/chapter.xml
  head/it_IT.ISO8859-15/books/handbook/mail/chapter.xml
  head/it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml
  head/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml
  head/ja_JP.eucJP/books/handbook/boot/chapter.xml
  head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
  head/ja_JP.eucJP/books/handbook/mail/chapter.xml
  head/nl_NL.ISO8859-1/articles/contributing/article.xml
  head/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml
  head/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml
  head/nl_NL.ISO8859-1/books/handbook/l10n/chapter.xml
  head/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml
  head/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.xml
  head/nl_NL.ISO8859-1/books/handbook/ppp-and-slip/chapter.xml
  head/nl_NL.ISO8859-1/books/handbook/printing/chapter.xml

Modified: head/hu_HU.ISO8859-2/books/handbook/l10n/chapter.xml
==============================================================================
--- head/hu_HU.ISO8859-2/books/handbook/l10n/chapter.xml	Wed Jul 24 11:21:16 2013	(r42415)
+++ head/hu_HU.ISO8859-2/books/handbook/l10n/chapter.xml	Wed Jul 24 12:31:12 2013	(r42416)
@@ -336,18 +336,14 @@
 	konfigurációs állományokban:</para>
 
       <itemizedlist>
-	<indexterm><primary>POSIX</primary></indexterm>
-
 	<listitem>
-	  <para>A <envar>LANG</envar> változót a &posix;
+	  <para>A <envar>LANG</envar> változót a &posix;<indexterm><primary>POSIX</primary></indexterm>
 	    &man.setlocale.3; családjának</para>
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>MIME</primary></indexterm>
-
 	  <para>A <envar>MM_CHARSET</envar> változót az
-	    alkalmazás MIME
+	    alkalmazás MIME<indexterm><primary>MIME</primary></indexterm>
 	    karakterkészletéhez</para>
 	</listitem>
       </itemizedlist>

Modified: head/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml
==============================================================================
--- head/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml	Wed Jul 24 11:21:16 2013	(r42415)
+++ head/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml	Wed Jul 24 12:31:12 2013	(r42416)
@@ -1515,11 +1515,10 @@ www.minta.org</programlisting>
 	közül az egyik mindenképpen kelleni fog:</para>
 
       <itemizedlist>
-	<indexterm><primary>MX rekord</primary></indexterm>
 	<listitem>
 	  <para>Gondoskodjunk róla, hogy a hozzánk
 	    tartozó DNS-ben (legkisebb sorszámú) MX
-	    rekord a gépünk IP-címére
+	    rekord<indexterm><primary>MX rekord</primary></indexterm> a gépünk IP-címére
 	    mutat.</para>
 	</listitem>
 

Modified: head/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml
==============================================================================
--- head/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml	Wed Jul 24 11:21:16 2013	(r42415)
+++ head/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.xml	Wed Jul 24 12:31:12 2013	(r42416)
@@ -194,13 +194,8 @@
 	  rendelkezünk a következõkkel:</para>
 
 	<itemizedlist>
-	  <indexterm
-	    id="ppp-isp"><primary>internet-szolgáltató</primary></indexterm>
-	  <indexterm id="ppp-ppp2"><primary>PPP
-	    kapcsolat</primary></indexterm>
-
 	  <listitem>
-	    <para>Olyan internet-elõfizetés, ahol PPP-n
+	    <para>Olyan internet-elõfizetés, ahol PPP-n<indexterm id="ppp-ppp2"><primary>PPP kapcsolat</primary></indexterm>
 	      keresztül csatlakozunk</para>
 	  </listitem>
 
@@ -208,7 +203,7 @@
 	    <para>Egy modem vagy más olyan
 	      rendszerünkhöz csatlakozó eszköz,
 	      amelyen keresztül el tudjuk érni az
-	      internet-szolgáltatónkat</para>
+	      internet-szolgáltatónkat<indexterm id="ppp-isp"><primary>internet-szolgáltató</primary></indexterm></para>
 	  </listitem>
 
 	  <listitem>
@@ -218,26 +213,16 @@
 	  </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>bejelentkezési
-	    név</primary></indexterm>
-	  <indexterm
-	    id="ppp-password"><primary>jelszó</primary></indexterm>
-
-	    <para>A bejelentkezési nevünk és
-	      jelszavunk.  (Vagy a megszokott &unix;-os
+	    <para>A bejelentkezési nevünk<indexterm id="ppp-login"><primary>bejelentkezési név</primary></indexterm> és
+	      jelszavunk<indexterm id="ppp-password"><primary>jelszó</primary></indexterm>.  (Vagy a megszokott &unix;-os<indexterm id="ppp-unix"><primary>UNIX</primary></indexterm>
 	      felhasználói név és
-	      jelszó páros, vagy egy PAP esetleg CHAP
+	      jelszó páros, vagy egy PAP<indexterm id="ppp-pap"><primary>PAP</primary></indexterm> esetleg CHAP<indexterm id="ppp-chap"><primary>CHAP</primary></indexterm>
 	      bejelentkezési név és
 	      jelszó.)</para>
 	  </listitem>
 
 	  <listitem>
-	    <indexterm id="ppp-nameserver"><primary>névszerver</primary></indexterm>
-
-	    <para>Egy vagy több névszerver IP-címe.
+	    <para>Egy vagy több névszerver<indexterm id="ppp-nameserver"><primary>névszerver</primary></indexterm> IP-címe.
 	      Ehhez az internet-szolgáltatók
 	      általában két IP-címet adnak
 	      meg.  Ha egyet sem kaptunk, akkor a
@@ -288,11 +273,8 @@
 	  </listitem>
 
 	  <listitem>
-	    <indexterm id="ppp-static-ip"><primary>statikus
-	      IP-cím</primary></indexterm>
-
 	    <para>Ha a szolgáltatónk statikus
-	      IP-címet és rögzített
+	      IP-címet<indexterm id="ppp-static-ip"><primary>statikus IP-cím</primary></indexterm> és rögzített
 	      hálózati nevet is biztosít
 	      nekünk, ezt is megadhatjuk.  Minden más
 	      esetben egyszerûen csak hagyjuk, hogy a rendszer
@@ -476,13 +458,8 @@
 	      <term>6. és 7. sorok:</term>
 
 	      <listitem>
-		<indexterm>
-		  <primary>PPP</primary>
-		  <secondary>felhasználói PPP</secondary>
-		</indexterm>
-
 		<para>A híváshoz használt
-		  karakterlánc.  A felhasználói PPP
+		  karakterlánc.  A felhasználói PPP<indexterm><primary>PPP</primary><secondary>felhasználói PPP</secondary></indexterm>
 		  a &man.chat.8; programhoz hasonló
 		  <quote>küldök-várok</quote>
 		  típusú szerkesztést alkalmaz.  A
@@ -612,10 +589,7 @@
 	      <term>15. sor:</term>
 
 	      <listitem>
-		<indexterm><primary>PAP</primary></indexterm>
-		<indexterm><primary>CHAP</primary></indexterm>
-
-		<para>Ha a PAP vagy CHAP protokollok valamelyikét
+		<para>Ha a PAP<indexterm><primary>PAP</primary></indexterm> vagy CHAP<indexterm><primary>CHAP</primary></indexterm> protokollok valamelyikét
 		  használjuk, akkor nem lesz
 		  szükségünk a login
 		  változóra, ezért ezt
@@ -659,11 +633,9 @@ protocol: ppp</screen>
 	      <term>16. sor:</term>
 
 	      <listitem>
-		<indexterm><primary>idõkorlát</primary></indexterm>
-
 		<para>Beállítjuk a kapcsolathoz
 		  tartozó alapértelmezett
-		  idõkorlátot (másodpercben).  Itt a
+		  idõkorlátot<indexterm><primary>idõkorlát</primary></indexterm> (másodpercben).  Itt a
 		  kapcsolat automatikusan lezárul
 		  300&nbsp;másodperc tétlenséget
 		  követõen.  Ha nem akarunk ilyen
@@ -679,12 +651,10 @@ protocol: ppp</screen>
 	      <term>17. sor:</term>
 
 	      <listitem>
-		<indexterm><primary>internet-szolgáltató</primary></indexterm>
-
 		<para>A felülethez tartozó címeket
 		  állítja be.  A
 		  <replaceable>x.x.x.x</replaceable> helyére a
-		  szolgáltató által kiosztott
+		  szolgáltató<indexterm><primary>internet-szolgáltató</primary></indexterm> által kiosztott
 		  IP-címet kell beírnunk.  A
 		  <replaceable>y.y.y.y</replaceable> helyett pedig a
 		  szolgáltató
@@ -1358,9 +1328,7 @@ set nbns 203.14.100.5</programlisting>
 	      <term>14. sor:</term>
 
 	      <listitem>
-		<indexterm><primary>jelszó</primary></indexterm>
-
-		<para>Ebben a sorban adjuk meg a PAP/CHAP jelszavunkat,
+		<para>Ebben a sorban adjuk meg a PAP/CHAP jelszavunkat<indexterm><primary>jelszó</primary></indexterm>,
 		  <replaceable>AJelszavam</replaceable> helyett.
 		  Szándénkunk
 		  egyértelmûsítése
@@ -1771,15 +1739,10 @@ ifconfig_tun0=</programlisting>
 	</listitem>
 
 	<listitem>
-	  <indexterm>
-	    <primary>PPP</primary>
-	    <secondary>szerver</secondary>
-	  </indexterm>
-
 	  <para><quote>szerverként</quote> &mdash; a
 	    számítógépünk egy
 	    hálózat része, ahol a többieket a
-	    PPP használatával kapcsoljuk össze</para>
+	    PPP<indexterm><primary>PPP</primary><secondary>szerver</secondary></indexterm> használatával kapcsoljuk össze</para>
 	</listitem>
       </orderedlist>
 
@@ -3293,10 +3256,8 @@ tun0: flags=8051&lt;UP,POINTOPOINT,RUNNI
 	      </listitem>
 
 	      <listitem>
-		<indexterm><primary>default route</primary></indexterm>
-
 		<para>Az alapértelmezett
-		  átjárót az alábbi sor
+		  átjárót<indexterm><primary>default route</primary></indexterm> az alábbi sor
 		  módosításával tudjuk
 		  beállítani úgy, hogy a</para>
 

Modified: head/it_IT.ISO8859-15/books/handbook/boot/chapter.xml
==============================================================================
--- head/it_IT.ISO8859-15/books/handbook/boot/chapter.xml	Wed Jul 24 11:21:16 2013	(r42415)
+++ head/it_IT.ISO8859-15/books/handbook/boot/chapter.xml	Wed Jul 24 12:31:12 2013	(r42416)
@@ -491,13 +491,9 @@ boot:</screen>
         <para>Qui ci sono alcuni esempi pratici sull'uso del loader:</para>
 
         <itemizedlist>
-          <indexterm>
-            <primary>modalità singolo utente</primary>
-          </indexterm>
-
           <listitem>
             <para>Per avviare semplicemente il vostro kernel abituale,
-            ma in modalità singolo utente:</para>
+            ma in modalità singolo utente:<indexterm><primary>modalità singolo utente</primary></indexterm></para>
 
             <screen><userinput>boot -s</userinput></screen>
           </listitem>
@@ -506,16 +502,12 @@ boot:</screen>
             <para>Per scaricare dalla memoria i moduli e il kernel usuali,
               e poi caricare solo il vecchio (o un altro) kernel:</para>
 
-            <indexterm>
-              <primary><filename>kernel.old</filename></primary>
-            </indexterm>
-
             <screen><userinput>unload</userinput>
 <userinput>load <replaceable>kernel.old</replaceable></userinput></screen>
 
             <para>Puoi usare <filename>kernel.GENERIC</filename> per riferirti
               al kernel generico che viene fornito nel disco d'installazione, o
-              <filename>kernel.old</filename> per riferirti al kernel installato
+              <filename>kernel.old</filename><indexterm><primary><filename>kernel.old</filename></primary></indexterm> per riferirti al kernel installato
               precedentemente (quando hai aggiornato o configurato il kernel, ad
               esempio).</para>
 

Modified: head/it_IT.ISO8859-15/books/handbook/mail/chapter.xml
==============================================================================
--- head/it_IT.ISO8859-15/books/handbook/mail/chapter.xml	Wed Jul 24 11:21:16 2013	(r42415)
+++ head/it_IT.ISO8859-15/books/handbook/mail/chapter.xml	Wed Jul 24 12:31:12 2013	(r42416)
@@ -1211,10 +1211,8 @@ www.example.org</programlisting>
         queste due cose:</para>
 
       <itemizedlist>
-        <indexterm><primary>record MX</primary></indexterm>
-
         <listitem>
-          <para>Assicurati che il record MX (con il numero più basso)
+          <para>Assicurati che il record MX<indexterm><primary>record MX</primary></indexterm> (con il numero più basso)
             relativo al tuo host nel tuo DNS punti all'indirizzo IP del tuo
             host.</para>
         </listitem>

Modified: head/it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml
==============================================================================
--- head/it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml	Wed Jul 24 11:21:16 2013	(r42415)
+++ head/it_IT.ISO8859-15/books/handbook/network-servers/chapter.xml	Wed Jul 24 12:31:12 2013	(r42416)
@@ -1489,13 +1489,8 @@ Exports list on foobar:
         <title>Tipi di macchine</title>
 
         <itemizedlist>
-          <indexterm>
-            <primary>NIS</primary>
-            <secondary>master server</secondary>
-          </indexterm>
-
           <listitem>
-            <para>Un <emphasis>server master NIS</emphasis>. Questo
+            <para>Un <emphasis>server master NIS</emphasis><indexterm><primary>NIS</primary><secondary>master server</secondary></indexterm>. Questo
               server, analogamente a primary domain controller
               &windowsnt; , mantiene i file usati da tutti i client
               NIS.  Il file <filename>passwd</filename>,
@@ -1513,12 +1508,7 @@ Exports list on foobar:
           </listitem>
 
           <listitem>
-	    <indexterm>
-	      <primary>NIS</primary>
-	      <secondary>slave server</secondary>
-	    </indexterm>
-
-            <para><emphasis>NIS slave server</emphasis>.  Analogamente
+            <para><emphasis>NIS slave server</emphasis><indexterm><primary>NIS</primary><secondary>slave server</secondary></indexterm>.  Analogamente
               a backup domain controller &windowsnt;, i server
               slave NIS mantengono copie dei file di dati
               del server master NIS.  I server slave NIS garantiscono
@@ -1530,12 +1520,7 @@ Exports list on foobar:
           </listitem>
 
           <listitem>
-	    <indexterm>
-	      <primary>NIS</primary>
-	      <secondary>client</secondary>
-	    </indexterm>
-
-            <para><emphasis>NIS client</emphasis>.  I client NIS,
+            <para><emphasis>NIS client</emphasis><indexterm><primary>NIS</primary><secondary>client</secondary></indexterm>.  I client NIS,
               come la maggior parte delle workstation &windowsnt;
               , si autenticano nei confronti del NIS server
               (o del domain controller &windowsnt; nel caso di
@@ -5193,14 +5178,10 @@ AddModule mod_php5.c
             <term><literal>passdb backend</literal></term>
 
             <listitem>
-	      <indexterm><primary>NIS+</primary></indexterm>
-	      <indexterm><primary>LDAP</primary></indexterm>
-	      <indexterm><primary>SQL database</primary></indexterm>
-
               <para><application>Samba</application> ha molti
                 modelli diversi di backend di autenticazione.
-                Puoi autenticare i client con LDAP, NIS+, un
-                database SQL, o un file di password modificato.
+                Puoi autenticare i client con LDAP<indexterm><primary>LDAP</primary></indexterm>, NIS+<indexterm><primary>NIS+</primary></indexterm>, un
+                database SQL<indexterm><primary>SQL database</primary></indexterm>, o un file di password modificato.
                 Il metodo di autenticazione di default
                 è <literal>smbpasswd</literal>, e questo
                 sarà l'unico coperto qui.</para>

Modified: head/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml	Wed Jul 24 11:21:16 2013	(r42415)
+++ head/ja_JP.eucJP/books/handbook/advanced-networking/chapter.xml	Wed Jul 24 12:31:12 2013	(r42416)
@@ -3578,13 +3578,8 @@ ISDN BRI ¥é¥¤¥ó</literallayout>
 	<title>¥Þ¥·¥ó¤ÎʬÎà</title>
 
 	<itemizedlist>
-	  <indexterm>
-	    <primary>NIS</primary>
-	    <secondary>¥Þ¥¹¥¿¥µ¡¼¥Ð</secondary>
-	  </indexterm>
-
 	  <listitem>
-	    <para><emphasis>NIS ¥Þ¥¹¥¿¡¼¥µ¡¼¥Ð</emphasis>¡£
+	    <para><emphasis>NIS ¥Þ¥¹¥¿¡¼¥µ¡¼¥Ð</emphasis><indexterm><primary>NIS</primary><secondary>¥Þ¥¹¥¿¥µ¡¼¥Ð</secondary></indexterm>¡£
 	      ¤³¤Î¥µ¡¼¥Ð¤Ï &windowsnt;
 	      ¤Ç¸À¤¦¤È¤³¤í¤Î¥×¥é¥¤¥Þ¥ê¥É¥á¥¤¥ó¥³¥ó¥È¥í¡¼¥é¤Ë¤¢¤¿¤ê¤Þ¤¹¡£
 	      ¤¹¤Ù¤Æ¤Î NIS ¥¯¥é¥¤¥¢¥ó¥È¤ÇÍøÍѤµ¤ì¤ë¥Õ¥¡¥¤¥ë¤òÊݼ餷¤Þ¤¹¡£
@@ -3599,12 +3594,7 @@ ISDN BRI ¥é¥¤¥ó</literallayout>
 	  </listitem>
 
 	  <listitem>
-	    <indexterm>
-	      <primary>NIS</primary>
-	      <secondary>¥¹¥ì¡¼¥Ö¥µ¡¼¥Ð</secondary>
-	    </indexterm>
-
-	    <para><emphasis>NIS ¥¹¥ì¡¼¥Ö¥µ¡¼¥Ð</emphasis>¡£
+	    <para><emphasis>NIS ¥¹¥ì¡¼¥Ö¥µ¡¼¥Ð</emphasis><indexterm><primary>NIS</primary><secondary>¥¹¥ì¡¼¥Ö¥µ¡¼¥Ð</secondary></indexterm>¡£
 	      &windowsnt; ¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¥É¥á¥¤¥ó¥³¥ó¥È¥í¡¼¥é¤Ë»÷¤¿¤â¤Î¤Ç¡¢
 	      NIS ¥¹¥ì¡¼¥Ö¥µ¡¼¥Ð¤Ï NIS
 	      ¥Þ¥¹¥¿¡¼¥µ¡¼¥Ð¤Î¥Ç¡¼¥¿¥Õ¥¡¥¤¥ë¤Î¥³¥Ô¡¼¤òÊÝ»ý¤·¤Þ¤¹¡£
@@ -3616,12 +3606,7 @@ ISDN BRI ¥é¥¤¥ó</literallayout>
 	  </listitem>
 
 	  <listitem>
-	    <indexterm>
-	      <primary>NIS</primary>
-	      <secondary>¥¯¥é¥¤¥¢¥ó¥È</secondary>
-	    </indexterm>
-
-	    <para><emphasis>NIS ¥¯¥é¥¤¥¢¥ó¥È</emphasis>¡£
+	    <para><emphasis>NIS ¥¯¥é¥¤¥¢¥ó¥È</emphasis><indexterm><primary>NIS</primary><secondary>¥¯¥é¥¤¥¢¥ó¥È</secondary></indexterm>¡£
 	      NIS ¥¯¥é¥¤¥¢¥ó¥È¤ÏÂçÉôʬ¤Î &windowsnt;
 	      ¥ï¡¼¥¯¥¹¥Æ¡¼¥·¥ç¥ó¤Î¤è¤¦¤Ë¡¢¥í¥°¥ª¥ó¤ËºÝ¤·¤Æ
 	      NIS ¥µ¡¼¥Ð (&windowsnt; ¥ï¡¼¥¯¥¹¥Æ¡¼¥·¥ç¥ó¤Î¾ì¹ç¤Ï

Modified: head/ja_JP.eucJP/books/handbook/boot/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/boot/chapter.xml	Wed Jul 24 11:21:16 2013	(r42415)
+++ head/ja_JP.eucJP/books/handbook/boot/chapter.xml	Wed Jul 24 12:31:12 2013	(r42416)
@@ -526,9 +526,8 @@ boot:</screen>
       <para>¼¡¤Ë¤¢¤²¤ë¤Î¤Ï¡¢¥í¡¼¥À¤Î¼ÂÁ©Åª¤Ê»ÈÍÑÎã¤Ç¤¹¡£</para>
 
       <itemizedlist>
-	<indexterm><primary>¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É</primary></indexterm>
 	<listitem>
-	  <para>ÉáÃʻȤäƤ¤¤ë¥«¡¼¥Í¥ë¤ò¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤Çµ¯Æ°¤·¤Þ¤¹¡£</para>
+	  <para>ÉáÃʻȤäƤ¤¤ë¥«¡¼¥Í¥ë¤ò¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É<indexterm><primary>¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É</primary></indexterm>¤Çµ¯Æ°¤·¤Þ¤¹¡£</para>
 
 	  <screen><userinput>boot -s</userinput></screen>
 	</listitem>
@@ -536,9 +535,6 @@ boot:</screen>
 	<listitem>
 	  <para>ÉáÃʻȤäƤ¤¤ë¥«¡¼¥Í¥ë¤È¥â¥¸¥å¡¼¥ë¤ò¥¢¥ó¥í¡¼¥É¤·¡¢
 	    ¸Å¤¤ (¤â¤·¤¯¤ÏÊ̤Î) ¥«¡¼¥Í¥ë¤ò¥í¡¼¥É¤·¤Þ¤¹¡£</para>
-    <indexterm>
-      <primary><filename>kernel.old</filename></primary>
-    </indexterm>
 
 	  <screen><userinput>unload</userinput>
 <userinput>load <replaceable>kernel.old</replaceable></userinput></screen>
@@ -549,7 +545,7 @@ boot:</screen>
 	    ¤Þ¤¿¡¢Ä¾Á°¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤¿¥«¡¼¥Í¥ë (¤¿¤È¤¨¤Ð¡¢
 	    ¥«¡¼¥Í¥ë¤ò¼«Ê¬¤ÇÀßÄꤷ¤¿¤ê¡¢
 	    ¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤¿¤ê¤·¤¿¾ì¹ç) ¤ò»ØÄꤹ¤ë¤Ë¤Ï
-	    <filename>kernel.old</filename> ¤È¤·¤Þ¤¹¡£</para>
+	    <filename>kernel.old</filename><indexterm><primary><filename>kernel.old</filename></primary></indexterm> ¤È¤·¤Þ¤¹¡£</para>
 
 	  <note>
 	    <para>ÉáÃʤΥ«¡¼¥Í¥ë¤Ç»È¤Ã¤Æ¤¤¤ë¥â¥¸¥å¡¼¥ë¤ò

Modified: head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	Wed Jul 24 11:21:16 2013	(r42415)
+++ head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	Wed Jul 24 12:31:12 2013	(r42416)
@@ -1325,13 +1325,9 @@ Fetching 133 new ports or files... done.
       <sect3>
 	<title>&os.current; ¤ò»È¤¦</title>
 
-	<indexterm>
-	  <primary>-CURRENT</primary>
-	  <secondary>»ÈÍÑ</secondary>
-	</indexterm>
         <orderedlist>
           <listitem>
-	    <para>&a.current.name; ¤È &a.svn-src-head.name; ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È
+	    <para>&a.current.name; ¤È &a.svn-src-head.name;<indexterm><primary>-CURRENT</primary><secondary>»ÈÍÑ</secondary></indexterm> ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È
               ¤Ë²Ã¤ï¤Ã¤Æ¤¯¤À¤µ¤¤¡£
 	      ¤µ¤Þ¤¶¤Þ¤Ê¿Í¤¬¥·¥¹¥Æ¥à¤Î¸½ºß¤Î¾õÂ֤ˤĤ¤¤Æ½Ò¤Ù¤Æ¤¤¤ë¥³¥á¥ó¥È¤ò¸«¤¿¤ê¡¢
 	      ¥·¥¹¥Æ¥à¤òÀµ¾ï¤ËÊݤĤ¿¤á¤Î½ÅÍפʾðÊó¤ò¸«Æ¨¤µ¤Ê¤¤¤¿¤á¤Ë¡¢
@@ -1356,41 +1352,21 @@ Fetching 133 new ports or files... done.
 	      ¤«¤é¥½¡¼¥¹¤ÎÆþ¼ê¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ê¤¤¤¯¤Ä¤«¤ÎÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£</para>
 
             <orderedlist>
-              <indexterm>
-		<primary>Subversion</primary>
-	      </indexterm>
-	      <indexterm>
-                <primary><command>cron</command></primary>
-              </indexterm>
-              <indexterm>
-	        <primary>-CURRENT</primary>
-		<secondary><application>Subversion</application> ¤ò»È¤Ã¤¿Æ±´ü</secondary>
-	      </indexterm>
-              <indexterm>
-	        <primary>-CURRENT</primary>
-		<secondary><application>CTM</application> ¤ò»È¤Ã¤¿Æ±´ü</secondary>
-	      </indexterm>
-
 	      <listitem>
-		<para><link linkend="svn">svn</link> ¤ò»È¤Ã¤Æ¡¢
+		<para><link linkend="svn">svn</link><indexterm><primary>Subversion</primary></indexterm> ¤ò»È¤Ã¤Æ¡¢
 		  ´õ˾¤¹¤ë³«È¯¥Ö¥é¥ó¥Á¡¢
 		  ¤â¤·¤¯¤Ï¥ê¥ê¡¼¥¹¥Ö¥é¥ó¥Á¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤·¤Æ¤¯¤À¤µ¤¤¡£
 		  ¤³¤ÎÊýË¡¤Ï¡¢³«È¯Ãæ¤Î &os; ¥ê¥Ý¥¸¥È¥ê¤Ø¤Î¥¢¥¯¥»¥¹¤òÄ󶡤·¤Æ¤ª¤ê¡¢
 		  ¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 		  <link linkend="svn-mirrors">Subversion ¥ß¥é¡¼¥µ¥¤¥È</link>
 		  ¤Î¤Ò¤È¤Ä¤Î <literal>head</literal> ¥Ö¥é¥ó¥Á¤«¤é
-		  -CURRENT ¥³¡¼¥É¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤·¤Æ¤¯¤À¤µ¤¤¡£
+		  -CURRENT<indexterm><primary>-CURRENT</primary><secondary><application>Subversion</application> ¤ò»È¤Ã¤¿Æ±´ü</secondary></indexterm> ¥³¡¼¥É¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤·¤Æ¤¯¤À¤µ¤¤¡£
 		  ¥ê¥Ý¥¸¥È¥ê¥µ¥¤¥º¤Î´ÑÅÀ¤«¤é¡¢
 		  ´õ˾¤¹¤ë¥µ¥Ö¥Ä¥ê¡¼¤Î¤ß¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤¹¤ë¤³¤È¤¬¿ä¾©¤µ¤ì¤Þ¤¹¡£</para>
 	      </listitem>
 
               <listitem>
-		<indexterm>
-		  <primary>-CURRENT</primary>
-		  <secondary>CTM ¤ò»È¤Ã¤¿Æ±´ü</secondary>
-		</indexterm>
-
-                <para><application><link linkend="ctm">CTM</link></application>¤òÍѤ¤¤ë¡£
+                <para><application><link linkend="ctm">CTM</link></application><indexterm><primary>-CURRENT</primary><secondary>CTM ¤ò»È¤Ã¤¿Æ±´ü</secondary></indexterm>¤òÍѤ¤¤ë¡£
 		  ÀܳÎÁ¤¬¹â³Û¤À¤Ã¤¿¤ê¡¢email ¤Ç¤Î¥¢¥¯¥»¥¹¤·¤«¤Ç¤­¤Ê¤¤¤è¤¦¤Ê¡¢
                   ¤¢¤Þ¤êÎɼÁ¤Ç¤Ê¤¤ TCP/IP Àܳ¤Î¾ì¹ç¤Ë¤Ï¡¢<application>CTM</application>
 		  ¤òÍøÍѤ¹¤ë¤ÈÎɤ¤¤Ç¤·¤ç¤¦¡£¤¿¤À¤·¡¢<application><link
@@ -1413,11 +1389,7 @@ Fetching 133 new ports or files... done.
               °ìÉô¤Î¤ß¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤è¤¦¤È¤¹¤ë¤È¡¢
               ¤Û¤Ü´Ö°ã¤¤¤Ê¤¯ÌäÂ꤬µ¯¤­¤Þ¤¹¡£</para>
 
-	  <indexterm>
-	    <primary>-CURRENT</primary>
-	    <secondary>¥³¥ó¥Ñ¥¤¥ë</secondary>
-	  </indexterm>
-            <para>&os.current; ¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ëÁ°¤Ë
+            <para>&os.current; ¤ò¥³¥ó¥Ñ¥¤¥ë<indexterm><primary>-CURRENT</primary><secondary>¥³¥ó¥Ñ¥¤¥ë</secondary></indexterm>¤¹¤ëÁ°¤Ë
 	      <filename>/usr/src/Makefile</filename>
 	      ¤òÃí°Õ¿¼¤¯Æɤó¤Ç¤¯¤À¤µ¤¤¡£
 	      ¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î½èÍý¤Î°ìÉô¤È¤·¤Æ¡¢ºÇ½é¤Ë
@@ -1546,21 +1518,9 @@ Fetching 133 new ports or files... done.
 	      ¤«¤é¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¤Ë¤Ï¡¢
 	      °Ê²¼¤Î¤è¤¦¤Ê¤¤¤¯¤Ä¤«¤ÎÊýË¡¤¬¤¢¤ê¤Þ¤¹¡£</para>
 
-            <orderedlist>
-	      <indexterm>
-		<primary>Subversion</primary>
-	      </indexterm>
-	      <indexterm>
-		<primary><command>cron</command></primary>
-	      </indexterm>
-	      <indexterm>
-	        <primary>-STABLE</primary>
-		<secondary><application>Subversion</application>
-		  ¤ò»È¤Ã¤¿Æ±´ü</secondary>
-	      </indexterm>
-
+	    <orderedlist>
 	      <listitem>
-		<para><link linkend="svn">svn</link> ¤ò»È¤Ã¤Æ¡¢
+		<para><link linkend="svn">svn</link><indexterm><primary>Subversion</primary></indexterm> ¤ò»È¤Ã¤Æ¡¢
 		  ´õ˾¤¹¤ë³«È¯¥Ö¥é¥ó¥Á¡¢
 		  ¤â¤·¤¯¤Ï¥ê¥ê¡¼¥¹¥Ö¥é¥ó¥Á¤ò¥Á¥§¥Ã¥¯¥¢¥¦¤·¤Æ¤¯¤À¤µ¤¤¡£
 		  ¤³¤ÎÊýË¡¤Ï¡¢³«È¯Ãæ¤Î &os; ¥ê¥Ý¥¸¥È¥ê¤Ø¤Î¥¢¥¯¥»¥¹¤òÄ󶡤·¤Æ¤ª¤ê¡¢
@@ -1571,7 +1531,7 @@ Fetching 133 new ports or files... done.
 		  ¤ÎÆÃÄê¤Î¥Ö¥é¥ó¥Á¤Ç¤Ï
                   <literal>stable/9</literal>¡¢¤Þ¤¿¤Ï
                   <literal>releng/9.0</literal> ¤È¤Ê¤ê¤Þ¤¹¡£
-		  <application>Subversion</application>
+		  <application>Subversion</application><indexterm><primary>-STABLE</primary><secondary><application>Subversion</application> ¤ò»È¤Ã¤¿Æ±´ü</secondary></indexterm>
 		  ¤ò»È¤Ã¤Æ¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤¹¤ëºÝ¤Î
 		  URL ¤Î¥×¥ì¥Õ¥£¥Ã¥¯¥¹¤Ï¡¢<link
 		    linkend="svn-mirrors">Subversion ¥ß¥é¡¼¥µ¥¤¥È</link>
@@ -1581,25 +1541,15 @@ Fetching 133 new ports or files... done.
 	      </listitem>
 
 	      <listitem>
-		<indexterm>
-		  <primary>-STABLE</primary>
-		  <secondary>CTM ¤ò»È¤Ã¤ÆƱ´ü¤¹¤ë</secondary>
-		</indexterm>
-
 		<para>¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤Ø¤ÎÀܳ¤Ë¹â®¤Ê²óÀþ¤òÍøÍѤǤ­¤Ê¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢
-		  <application><link linkend="ctm">CTM</link></application>
+		  <application><link linkend="ctm">CTM</link></application><indexterm><primary>-STABLE</primary><secondary>CTM ¤ò»È¤Ã¤ÆƱ´ü¤¹¤ë</secondary></indexterm>
 		  ¤ò¸¡Æ¤¤·¤Æ¤ß¤Þ¤·¤ç¤¦¡£</para>
 	      </listitem>
 	   </orderedlist>
 	 </listitem>
 
           <listitem>
-	    <indexterm>
-	      <primary>-STABLE</primary>
-	      <secondary>¹½ÃÛ¡¢¥³¥ó¥Ñ¥¤¥ë</secondary>
-	    </indexterm>
-
-	    <para>&os.stable; ¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ëÁ°¤Ë¡¢
+	    <para>&os.stable;<indexterm><primary>-STABLE</primary><secondary>¹½ÃÛ¡¢¥³¥ó¥Ñ¥¤¥ë</secondary></indexterm> ¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ëÁ°¤Ë¡¢
 	      <filename>/usr/src/Makefile</filename> ¤ò¤è¤¯Æɤó¤Ç¤¯¤À¤µ¤¤¡£
               ¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î½èÍý¤Î°ìÉô¤È¤·¤ÆºÇ½é¤Ë
 	      <link linkend="makeworld">¿·¤·¤¤¥«¡¼¥Í¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¡¢

Modified: head/ja_JP.eucJP/books/handbook/mail/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/mail/chapter.xml	Wed Jul 24 11:21:16 2013	(r42415)
+++ head/ja_JP.eucJP/books/handbook/mail/chapter.xml	Wed Jul 24 12:31:12 2013	(r42416)
@@ -1012,10 +1012,9 @@ www.example.org</programlisting>
 	¼¡¤ÎÆó¤Ä¤Î¤¦¤Á¤Î¤É¤Á¤é¤«¤¬¤Ç¤­¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <itemizedlist>
-	<indexterm><primary>MX ¥ì¥³¡¼¥É</primary></indexterm>
 	<listitem>
 	  <para>¼«Ê¬¤Î¥É¥á¥¤¥ó¤Ç¤Î
-	    (°ìÈÖÃͤµ¤¤) MX ¥ì¥³¡¼¥É¤¬¼«Ê¬¤Î¥Û¥¹¥È¤Î
+	    (°ìÈÖÃͤµ¤¤) MX ¥ì¥³¡¼¥É<indexterm><primary>MX ¥ì¥³¡¼¥É</primary></indexterm>¤¬¼«Ê¬¤Î¥Û¥¹¥È¤Î
 	    IP ¥¢¥É¥ì¥¹¤òº¹¤·¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤¹¤ë¡£</para>
 	</listitem>
 

Modified: head/nl_NL.ISO8859-1/articles/contributing/article.xml
==============================================================================
--- head/nl_NL.ISO8859-1/articles/contributing/article.xml	Wed Jul 24 11:21:16 2013	(r42415)
+++ head/nl_NL.ISO8859-1/articles/contributing/article.xml	Wed Jul 24 12:31:12 2013	(r42416)
@@ -431,10 +431,8 @@
 	zijn:</para>
 
       <orderedlist>
-	<indexterm><primary>BSD-copyright</primary></indexterm>
-
 	<listitem>
-	  <para>Het BSD-copyright.  Dit copyright wordt het meeste
+	  <para>Het BSD-copyright<indexterm><primary>BSD-copyright</primary></indexterm>.  Dit copyright wordt het meeste
 	    verkozen wegens zijn natuur van <quote>geen
 	      voorwaarden</quote> en de algemene aantrekkelijkheid voor
 	    commerciële ondernemingen.  Ver van het ontmoedigen van
@@ -445,15 +443,7 @@
 	</listitem>
 
 	<listitem>
-	  <indexterm>
-	    <primary>GPL</primary>
-
-	    <see>GNU General Public License</see>
-	  </indexterm>
-
-	  <indexterm><primary>GNU General Public License</primary></indexterm>
-
-	  <para>De GNU General Public License, of <quote>GPL</quote>.
+	  <para>De GNU General Public License<indexterm><primary>GNU General Public License</primary></indexterm>, of <quote>GPL</quote><indexterm><primary>GPL</primary><see>GNU General Public License</see></indexterm>.
 	    Deze licentie is niet zo populair bij ons wegens de extra
 	    hoeveelheid moeite die gevraagd wordt van iedereen die de
 	    code voor commerciële doeleinden gebruikt, maar vanwege
@@ -561,11 +551,9 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
       <sect3>
 	<title>Hardware doneren</title>
 
-	<indexterm><primary>donaties</primary></indexterm>
-
 	<para>Het &os; Project accepteert graag hardwaredonaties die het
 	  goed kan gebruiken.  Als u geïnteresseerd bent in het
-	  doneren van hardware, neem dan contact op met het <ulink
+	  doneren<indexterm><primary>donaties</primary></indexterm> van hardware, neem dan contact op met het <ulink
 	    url="&url.base;/donations/">Donations Liaison
 	    Office</ulink>.</para>
       </sect3>

Modified: head/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Wed Jul 24 11:21:16 2013	(r42415)
+++ head/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Wed Jul 24 12:31:12 2013	(r42416)
@@ -1390,20 +1390,9 @@ Fetching 133 new ports or files... done.
 	      de volgende twee manieren:</para>
 
 	    <orderedlist>
-	      <indexterm><primary><command>cvsup</command></primary></indexterm>
-
-	      <indexterm><primary><command>cron</command></primary></indexterm>
-
-	      <indexterm>
-		<primary>-CURRENT</primary>
-
-		<secondary>Synchroniseren met
-		  <application>CVSup</application></secondary>
-	      </indexterm>
-
 	      <listitem>
 		<para>Gebruik het programma <link
-		    linkend="cvsup">cvsup</link> met de
+		    linkend="cvsup">cvsup</link><indexterm><primary><command>cvsup</command></primary></indexterm> met de
 		  <filename>supfile</filename> genaamd
 		  <filename>standard-supfile</filename> uit
 		  <filename>/usr/share/examples/cvsup</filename>.  Dit
@@ -1411,10 +1400,10 @@ Fetching 133 new ports or files... done.
 		  in één keer wordt binnengehaald en
 		  daarna alleen hetgeen wat gewijzigd is.  Veel mensen
 		  draaien <command>cvsup</command> vanuit de
-		  <command>cron</command> en houden daarmee hun
+		  <command>cron</command><indexterm><primary><command>cron</command></primary></indexterm> en houden daarmee hun
 		  broncode automatisch bijgewerkt.  De voorbeeld
 		  <filename>supfile</filename> dient aangepast te
-		  worden om <link linkend="cvsup">cvsup</link> in te
+		  worden om <link linkend="cvsup">cvsup</link><indexterm><primary>-CURRENT</primary><secondary>Synchroniseren met <application>CVSup</application></secondary></indexterm> in te
 		  stellen voor uw omgeving.</para>
 
 		<note>
@@ -1614,28 +1603,17 @@ Fetching 133 new ports or files... done.
 	      manieren:</para>
 
 	    <orderedlist>
-	      <indexterm><primary><command>cvsup</command></primary></indexterm>
-
-	      <indexterm><primary><command>cron</command></primary></indexterm>
-
-	      <indexterm>
-		<primary>&os.stable;</primary>
-
-		<secondary>synchroniseren met
-		  <application>CVSup</application></secondary>
-	      </indexterm>
-
 	      <listitem>
 		<para>Gebruik het programma <link
-		    linkend="cvsup">cvsup</link> met de
+		    linkend="cvsup">cvsup</link><indexterm><primary><command>cvsup</command></primary></indexterm> met de
 		  <filename>supfile</filename>
-		  <filename>stable-supfile</filename> uit de map
+		  <filename>stable-supfile</filename><indexterm><primary>&os.stable;</primary><secondary>synchroniseren met <application>CVSup</application></secondary></indexterm> uit de map
 		  <filename>/usr/share/examples/cvsup</filename>.
 		  Dit is de aanbevolen methode omdat het hiermee
 		  mogelijk is de volledige collectie te downloaden en
 		  daarna alleen hetgeen wat veranderd is.  Veel mensen
 		  draaien <command>cvsup</command> vanuit de
-		  <command>cron</command> om de broncodes automatisch
+		  <command>cron</command><indexterm><primary><command>cron</command></primary></indexterm> om de broncodes automatisch
 		  bij te werken.  Het voorbeeld van de
 		  <filename>supfile</filename> dient aangepast en
 		  ingesteld te worden voor de omgeving waarin het
@@ -1643,14 +1621,8 @@ Fetching 133 new ports or files... done.
 	      </listitem>
 
 	      <listitem>
-		<indexterm>
-		  <primary>&os.stable;</primary>
-
-		  <secondary>synchroniseren met CTM</secondary>
-		</indexterm>
-
 		<para>Gebruik <application><link
-		      linkend="ctm">CTM</link></application> als er geen
+		      linkend="ctm">CTM</link></application><indexterm><primary>&os.stable;</primary><secondary>synchroniseren met CTM</secondary></indexterm> als er geen
 		  snelle, goedkope verbinding is met internet.  Dan is
 		  dit de methode om te gebruiken.</para>
 	      </listitem>
@@ -1665,13 +1637,7 @@ Fetching 133 new ports or files... done.
 	  </listitem>
 
 	  <listitem>
-	    <indexterm>
-	      <primary>&os.stable;</primary>
-
-	      <secondary>compileren</secondary>
-	    </indexterm>
-
-	    <para>Lees alvorens &os.stable; te compileren goed de
+	    <para>Lees alvorens &os.stable; te compileren<indexterm><primary>&os.stable;</primary><secondary>compileren</secondary></indexterm> goed de
 	      <filename>Makefile</filename> in
 	      <filename>/usr/src</filename>.  Het is handig om de
 	      eerste keer op zijn minst <link linkend="makeworld">de
@@ -1737,9 +1703,7 @@ Fetching 133 new ports or files... done.
       doen, maar <application>anonieme CVS</application> is makkelijker
       in het gebruik.</para>
 
-    <indexterm><primary><application>CTM</application></primary></indexterm>
-
-    <para><application>CTM</application> aan de andere kant maakt geen
+    <para><application>CTM</application><indexterm><primary><application>CTM</application></primary></indexterm> aan de andere kant maakt geen
       vergelijking tussen de aanwezige bronnen en die op de master
       server.  In plaats daarvan wordt een script uitgevoerd dat
       wijzigingen in bestanden ziet sinds de vorige keer dat is

Modified: head/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml
==============================================================================
--- head/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml	Wed Jul 24 11:21:16 2013	(r42415)
+++ head/nl_NL.ISO8859-1/books/handbook/introduction/chapter.xml	Wed Jul 24 12:31:12 2013	(r42416)
@@ -87,20 +87,16 @@
 	Hier zijn er enkele op een rij gezet:</para>
 
       <itemizedlist>
-	<indexterm><primary>preemptive multitasking</primary></indexterm>
-
 	<listitem>
-	  <para><emphasis>Preemptive multitasking</emphasis> zorgt
+	  <para><emphasis>Preemptive multitasking</emphasis><indexterm><primary>preemptive multitasking</primary></indexterm> zorgt
 	    ervoor dat meerdere programma's en gebruikers op dezelfde
 	    computer kunnen werken, zonder dat de systeemrespons of
 	    stabiliteit beïnvloed wordt.</para>
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>Meerdere gebruikers</primary></indexterm>
-
 	  <para>Ondersteuning voor <emphasis>meerdere
-	      gebruikers</emphasis> maakt het mogelijk dat
+	      gebruikers</emphasis><indexterm><primary>Meerdere gebruikers</primary></indexterm> maakt het mogelijk dat
 	    verschillende mensen een &os; systeem tegelijkertijd
 	    kunnen gebruiken voor een groot aantal taken.  Dit
 	    betekent bijvoorbeeld dat randapparaten als printers en
@@ -112,10 +108,8 @@
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>TCP/IP netwerken</primary></indexterm>
-
 	  <para>Krachtige mogelijkheden voor <emphasis>TCP/IP
-	      netwerken</emphasis> met ondersteuning voor
+	      netwerken</emphasis><indexterm><primary>TCP/IP netwerken</primary></indexterm> met ondersteuning voor
 	    industriestandaarden als SCTP, DHCP, NFS, NIS, PPP, SLIP,
 	    IPsec en IPv6.  Dit betekent dat een &os;-systeem makkelijk
 	    kan samenwerken met andere systemen en dat het kan
@@ -126,9 +120,7 @@
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>Geheugenbeveiliging</primary></indexterm>
-
-	  <para><emphasis>Geheugenbeveiliging</emphasis> garandeert dat
+	  <para><emphasis>Geheugenbeveiliging</emphasis><indexterm><primary>Geheugenbeveiliging</primary></indexterm> garandeert dat
 	    applicaties (of gebruikers) elkaar niet kunnen storen.  Een
 	    crashende applicatie heeft totaal geen effect op andere
 	    applicaties.</para>
@@ -142,49 +134,19 @@
 	</listitem>
 
 	<listitem>
-	  <indexterm>
-	    <primary>X Window systeem</primary>
-	  </indexterm>
-
-	  <para>Het <emphasis>X Window systeem</emphasis>
+	  <para>Het <emphasis>X Window systeem</emphasis><indexterm><primary>X Window systeem</primary></indexterm>
 	    (X11R7), een industriële standaard, biedt een
 	    grafische gebruikersinterface (GUI) met als enige
 	    benodigdheden een VGA-kaart en een beeldscherm.</para>
 	</listitem>
 
 	<listitem>
-	  <indexterm>
-	    <primary>binaire compatibiliteit</primary>
-
-	    <secondary>Linux</secondary>
-	  </indexterm>
-
-	  <indexterm>
-	    <primary>binaire compatibiliteit</primary>
-
-	    <secondary>SCO</secondary>
-	  </indexterm>
-
-	  <indexterm>
-	    <primary>binaire compatibiliteit</primary>
-
-	    <secondary>SVR4</secondary>
-	  </indexterm>
-
-	  <indexterm>
-	    <primary>binaire compatibiliteit</primary>
-
-	    <secondary>BSD/OS</secondary>
-	  </indexterm>
-
-	  <indexterm>
-	    <primary>binaire compatibiliteit</primary>
-
-	    <secondary>NetBSD</secondary>
-	  </indexterm>
-
 	  <para>Door <emphasis>binaire compatibiliteit</emphasis> met
-	    veel programma's voor &linux;, SCO, SVR4, BSDI en NetBSD
+	    veel programma's voor &linux;<indexterm><primary>binaire compatibiliteit</primary><secondary>Linux</secondary></indexterm>,
+	    SCO<indexterm><primary>binaire compatibiliteit</primary><secondary>SCO</secondary></indexterm>,
+	    SVR4<indexterm><primary>binaire compatibiliteit</primary><secondary>SVR4</secondary></indexterm>,
+	    BSDI<indexterm><primary>binaire compatibiliteit</primary><secondary>BSD/OS</secondary></indexterm> en
+	    NetBSD<indexterm><primary>binaire compatibiliteit</primary><secondary>NetBSD</secondary></indexterm>
 	    is het mogelijk om deze programma's zonder snelheidsverlies
 	    op &os; te draaien.</para>
 	</listitem>
@@ -206,9 +168,7 @@
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>Virtueel geheugen</primary></indexterm>
-
-	  <para>Het demand-paged <emphasis>virtueel geheugen</emphasis>
+	  <para>Het demand-paged <emphasis>virtueel geheugen</emphasis><indexterm><primary>Virtueel geheugen</primary></indexterm>
 	    en de <quote>gecombineerde VM/buffer cache</quote> van &os;
 	    zorgen ervoor dat applicaties met grote geheugenbehoeften
 	    niets te kort komen, terwijl de systeemrespons niet
@@ -216,29 +176,13 @@
 	</listitem>
 
 	<listitem>
-	  <indexterm>
-	    <primary>Symmetric Multi-Processing (SMP)</primary>
-	  </indexterm>
-
-	  <para><emphasis>SMP</emphasis>-ondersteuning voor computers
+	  <para><emphasis>SMP</emphasis>-ondersteuning<indexterm><primary>Symmetric Multi-Processing (SMP)</primary></indexterm> voor computers
 	    met meerdere processoren.</para>
 	</listitem>
 
 	<listitem>
-	  <indexterm>
-	    <primary>compilers</primary>
-
-	    <secondary>C</secondary>
-	  </indexterm>
-
-	  <indexterm>
-	    <primary>compilers</primary>
-
-	    <secondary>C++</secondary>
-	  </indexterm>
-
-	  <para>Een volledige <emphasis>C</emphasis> en
-	    <emphasis>C++</emphasis>
+	  <para>Een volledige <emphasis>C</emphasis><indexterm><primary>compilers</primary><secondary>C</secondary></indexterm> en
+	    <emphasis>C++</emphasis><indexterm><primary>compilers</primary><secondary>C++</secondary></indexterm>
 
 	    ontwikkelomgeving.  Vele andere
 	    programmeertalen, te gebruiken voor onderzoek of
@@ -247,9 +191,7 @@
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>broncode</primary></indexterm>
-
-	  <para>De <emphasis>broncode</emphasis> van het hele
+	  <para>De <emphasis>broncode</emphasis><indexterm><primary>broncode</primary></indexterm> van het hele
 	    systeem is beschikbaar, zodat gebruikers de volledige
 	    controle over het systeem in handen hebben.  Waarom
 	    genoegen nemen met alleen het erewoord van de
@@ -314,15 +256,11 @@
 
 	  <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>webservers</primary></indexterm>
-
-	      <para>World Wide Webservers (standaard of beveiligd
+	      <para>World Wide Webservers<indexterm><primary>webservers</primary></indexterm> (standaard of beveiligd
 		[SSL]);</para>
 	    </listitem>
 
@@ -331,30 +269,16 @@
 	    </listitem>
 
 	    <listitem>
-	      <indexterm><primary>firewall</primary></indexterm>
-
-	      <indexterm><primary>NAT</primary></indexterm>
-
-	      <para>Firewalls en NAT (<quote>IP-maskering</quote>)
+	      <para>Firewalls<indexterm><primary>firewall</primary></indexterm> en NAT<indexterm><primary>NAT</primary></indexterm> (<quote>IP-maskering</quote>)
 		gateways;</para>
 	    </listitem>
 
 	    <listitem>
-	      <indexterm>
-		<primary>elektronische mail</primary>
-
-		<see>e-mail</see>
-	      </indexterm>
-
-	      <indexterm><primary>e-mail</primary></indexterm>
-
-	      <para>E-mail servers;</para>
+	      <para>E-mail servers;<indexterm><primary>e-mail</primary></indexterm></para>
 	    </listitem>
 
 	    <listitem>
-	      <indexterm><primary>USENET</primary></indexterm>
-
-	      <para>USENET nieuws of Bulletin Board (BBS)
+	      <para>USENET<indexterm><primary>USENET</primary></indexterm> nieuws of Bulletin Board (BBS)
 		systemen;</para>
 	    </listitem>
 
@@ -395,12 +319,8 @@
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>router</primary></indexterm>
-
-	  <indexterm><primary>DNS Server</primary></indexterm>
-
-	  <para><emphasis>Netwerken:</emphasis>  nieuwe router nodig?
-	    Of een nameserver (DNS)? Een firewall om een intern netwerk
+	  <para><emphasis>Netwerken:</emphasis>  nieuwe router<indexterm><primary>router</primary></indexterm> nodig?
+	    Of een nameserver (DNS)<indexterm><primary>DNS Server</primary></indexterm>? Een firewall om een intern netwerk
 	    te beschermen?  &os; kan die ongebruikte 486 of Pentium PC
 	    die nog ergens in een hoekje ligt gemakkelijk omtoveren tot
 	    een geavanceerde router met uitgebreide pakketfilter
@@ -408,11 +328,7 @@
 	</listitem>
 
 	<listitem>
-	  <indexterm>
-	    <primary>X Window systeem</primary>
-	  </indexterm>
-
-	  <para><emphasis>X Window werkstation:</emphasis> &os; is een
+	  <para><emphasis>X Window werkstation:</emphasis><indexterm><primary>X Window systeem</primary></indexterm> &os; is een
 	    prima keuze als goedkope X terminal oplossing, door
 	    gebruik te maken van de gratis beschikbare X11 server.  In
 	    tegenstelling tot een pure X terminal kan &os; ook
@@ -434,14 +350,10 @@
 	</listitem>
 
 	<listitem>
-	  <indexterm>
-	    <primary>GNU Compiler Collection</primary>
-	  </indexterm>
-
 	  <para><emphasis>Software Ontwikkeling:</emphasis> bij het
 	    standaard &os;-systeem zit al een volledige verzameling van
 	    ontwikkelgereedschappen, inclusief de bekende
-	    GNU&nbsp;C/C++ compiler en debugger.</para>
+	    GNU&nbsp;C/C++ compiler<indexterm><primary>GNU Compiler Collection</primary></indexterm> en debugger.</para>
 	</listitem>
       </itemizedlist>
 
@@ -464,27 +376,19 @@
 
       <itemizedlist>
 	<listitem>
-	  <indexterm><primary>Apple</primary></indexterm>
-
-	  <para><ulink url="http://www.apple.com/">Apple</ulink></para>
+	  <para><ulink 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>
+	  <para><ulink url="http://www.cisco.com/">Cisco</ulink><indexterm><primary>Cisco</primary></indexterm></para>
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>Juniper</primary></indexterm>
-
-	  <para><ulink url="http://www.juniper.net/">Juniper</ulink></para>
+	  <para><ulink url="http://www.juniper.net/">Juniper</ulink><indexterm><primary>Juniper</primary></indexterm></para>
 	</listitem>
 
 	<listitem>
-	  <indexterm><primary>NetApp</primary></indexterm>
-
-	  <para><ulink url="http://www.netapp.com/">NetApp</ulink></para>
+	  <para><ulink url="http://www.netapp.com/">NetApp</ulink><indexterm><primary>NetApp</primary></indexterm></para>
 	</listitem>
       </itemizedlist>
 
@@ -493,83 +397,59 @@
 
       <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>
+	  <para><ulink url="http://www.yandex.ru/">Yandex</ulink><indexterm><primary>Yandex</primary></indexterm></para>
 	</listitem>
 

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