diff --git a/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index 1a3ebf10a3..7f65abd17a 100644
--- a/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -3011,10 +3011,8 @@ Script done, &hellip;</screen>
 
 	<qandaentry>
 	  <question>
-	    <indexterm><primary>Signal 11</primary></indexterm>
-
 	    <para>Der Bau bricht mit vielen
-	      <errorname>Signal 11</errorname>-Fehlern (oder anderen
+	      <errorname>Signal 11</errorname>-Fehlern<indexterm><primary>Signal 11</primary></indexterm> (oder anderen
 	      Signalnummern) ab.  Was ist da passiert?</para>
 	  </question>
 
diff --git a/de_DE.ISO8859-1/books/handbook/install/chapter.xml b/de_DE.ISO8859-1/books/handbook/install/chapter.xml
index 46232bc007..b56af41c35 100644
--- a/de_DE.ISO8859-1/books/handbook/install/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/install/chapter.xml
@@ -4698,15 +4698,10 @@ Please press any key to reboot.</screen>
 
 	<qandaentry>
 	  <question>
-	    <indexterm>
-	      <primary>Farben</primary>
-	      <secondary>Kontrast</secondary>
-	    </indexterm>
-
 	    <para>Wenn ich <application>sysinstall</application> aus
 	      einen X-Terminal starte, ist die gelbe Schritt auf dem
 	      grauen Hintergrund nur schwer zu erkennen.  Gibt es
-	      eine M�glichkeit, den Kontrast f�r dieses
+	      eine M�glichkeit, den Kontrast<indexterm><primary>Farben</primary><secondary>Kontrast</secondary></indexterm> f�r dieses
 	      Programm zu erh�hen?</para>
 	  </question>
 
diff --git a/de_DE.ISO8859-1/books/handbook/mail/chapter.xml b/de_DE.ISO8859-1/books/handbook/mail/chapter.xml
index be3fbc3bca..ddf14d79bb 100644
--- a/de_DE.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/de_DE.ISO8859-1/books/handbook/mail/chapter.xml
@@ -985,10 +985,6 @@ purgestat	/usr/local/supermailer/bin/purgestat-compat</programlisting>
 
       <qandaentry>
 	<question>
-	  <indexterm>
-	    <primary>MX-Eintrag</primary>
-	  </indexterm>
-
 	  <para>Warum meldet Sendmail
 	    <errorname>mail loops back to myself</errorname>?</para>
 	</question>
@@ -1003,7 +999,7 @@ purgestat	/usr/local/supermailer/bin/purgestat-compat</programlisting>
 
 	Wie kann ich dieses Problem l�sen?
 
-        Sie haben durch die Benutzung eines MX-Eintrags eingestellt, dass
+        Sie haben durch die Benutzung eines MX-Eintrags<indexterm><primary>MX-Eintrag</primary></indexterm> eingestellt, dass
         Mail f�r die Dom�ne (z.B. domain.net) an einen speziellen
         Host (in diesem Fall relay.domain.net) weitergeleitet wird,
         aber der Relay-Host erkennt sich selbst nicht als
@@ -1030,10 +1026,8 @@ purgestat	/usr/local/supermailer/bin/purgestat-compat</programlisting>
 
       <qandaentry>
         <question>
-	  <indexterm><primary>PPP</primary></indexterm>
-
 	  <para>Wie kann ich einen E-Mail-Server auf einem
-	    Anwahl-PPP Rechner betreiben?</para>
+	    Anwahl-PPP<indexterm><primary>PPP</primary></indexterm> Rechner betreiben?</para>
 	</question>
 
 	<answer>
@@ -1042,15 +1036,11 @@ purgestat	/usr/local/supermailer/bin/purgestat-compat</programlisting>
 	  <foreignphrase>Gateway</foreignphrase> f�r das LAN.
           Die PPP-Verbindung ist keine Standleitung.</para>
 
-	<indexterm>
-	  <primary>MX-Eintrag</primary>
-	</indexterm>
-
 	<para>Es gibt mindestens zwei Wege um dies zu tun.  Einer davon ist
 	  UUCP zu verwenden.</para>
 
 	<para>Ein anderer Weg ist, von einem immer mit dem Internet
-	  verbundenen Server einen sekund�ren MX-Dienst f�r Ihre
+	  verbundenen Server einen sekund�ren MX-Dienst<indexterm><primary>MX-Eintrag</primary></indexterm> f�r Ihre
 	  Dom�ne zur Verf�gung gestellt zu bekommen.  Wenn die
 	  Dom�ne Ihrer Firma
 	  <hostid role="domainname">example.com</hostid> ist, und Ihr
diff --git a/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.xml b/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.xml
index 2989c85826..255257c5aa 100644
--- a/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/cutting-edge/chapter.xml
@@ -3043,13 +3043,11 @@ Script done, &hellip;</screen>
 
 	<qandaentry>
 	  <question>
-	    <para>� ������������ ��� ������� �� ������ ��������� signal 11
+	    <para>� ������������ ��� ������� �� ������ ��������� signal 11<indexterm><primary>signal 11</primary></indexterm>
 	      (� ���� �� ���� ������).  �� ���� ������;</para>
 	  </question>
 
 	  <answer>
-	    <indexterm><primary>signal 11</primary></indexterm>
-
 	    <para>���� ������� ������� ���������� ������.  � ����������
 	      ������������� ��� ������� ���������� ����� ���� ���������������
 	      ������ �� ���������� �� ����� ��� ��� ���� ���, ��� ����� ��
diff --git a/el_GR.ISO8859-7/books/handbook/install/chapter.xml b/el_GR.ISO8859-7/books/handbook/install/chapter.xml
index 8af797331d..ef88387829 100644
--- a/el_GR.ISO8859-7/books/handbook/install/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/install/chapter.xml
@@ -4452,15 +4452,10 @@ Please press any key to reboot.</screen>
 
 	<qandaentry>
 	  <question>
-	    <indexterm>
-	      <primary>color</primary>
-	      <secondary>contrast</secondary>
-	    </indexterm>
-
 	    <para>���� ��������������� ��
 	      <application>sysinstall</application> �� ��� ��������� X11, �
 	      ������� ������������� ���� ��� ������� ���� ����� �����
-	      ������������.  ������� ������ �� ��������� � �������� �� ����
+	      ������������.  ������� ������ �� ��������� � �������� <indexterm><primary>color</primary><secondary>contrast</secondary></indexterm> �� ����
 	      ��� ��������;</para>
 	  </question>
 
diff --git a/el_GR.ISO8859-7/books/handbook/mail/chapter.xml b/el_GR.ISO8859-7/books/handbook/mail/chapter.xml
index 6779668675..3137c9127c 100644
--- a/el_GR.ISO8859-7/books/handbook/mail/chapter.xml
+++ b/el_GR.ISO8859-7/books/handbook/mail/chapter.xml
@@ -928,8 +928,7 @@ purgestat	/usr/local/supermailer/bin/purgestat-compat</programlisting>
 	      role="fqdn">mumble.bar.edu</hostid>, ���� ��� �����
 	    <hostid>mumble</hostid>.</para>
 
-	  <indexterm><primary>BIND</primary></indexterm>
-	  <para>�����������, ���� ����������� ��� ���� DNS resolvers ��� BIND.
+	  <para>�����������, ���� ����������� ��� ���� DNS resolvers ��� BIND<indexterm><primary>BIND</primary></indexterm>.
 	    ������, � �������� ������ ��� <application>BIND</application> ���
 	    �������������� ��� &os;, ��� ������� ����� ������������ ���
 	    ��-����� ������� ������, ����� ��� ��� ����� ���� ����� ���������.
@@ -959,10 +958,6 @@ purgestat	/usr/local/supermailer/bin/purgestat-compat</programlisting>
 
       <qandaentry>
 	<question>
-	  <indexterm>
-	    <primary>MX record</primary>
-	  </indexterm>
-
 	  <para>�� <application>sendmail</application> ����� �� ������
 	    <errorname>mail loops back to myself</errorname> (�� mail
 	    ���������� ���� ����� ���)</para>
@@ -981,7 +976,7 @@ purgestat	/usr/local/supermailer/bin/purgestat-compat</programlisting>
 
 ����� ������� �� mail ���� ��� ����� (�.�. �� domain.net) ��
 ���������� ���� ��� ������������ ���������� (���� ��������� ����
-�� relay.domain.net) ��������������� ��� ������� MX, ���� ��
+�� relay.domain.net) ��������������� ��� ������� MX<indexterm><primary>MX record</primary></indexterm>, ���� ��
 �������� ������������ (relay) ��� ����������� ��� ����� ��� ��
 domain.net.  ��������� �� domain.net ��� /etc/mail/local-host-names
 [����� ������ �� /etc/sendmail.cw ���� ��� ������ 8.10]
@@ -998,10 +993,8 @@ domain.net.  
 
       <qandaentry>
 	<question>
-	  <indexterm><primary>PPP</primary></indexterm>
-
 	  <para>��� ����� �� �������� ����������� mail �� ���������� ���
-	    ��������� ���� ���������� �������� PPP;</para>
+	    ��������� ���� ���������� �������� PPP<indexterm><primary>PPP</primary></indexterm>;</para>
 	</question>
 
 	<answer>
@@ -1009,13 +1002,8 @@ domain.net.  
 	    (LAN) ��� Internet.  �� &os; �������� �� ����� ���� ������������
 	    ��� �� LAN.  � ������� PPP ��� ����� ������������.</para>
 
-	  <indexterm><primary>UUCP</primary></indexterm>
-	  <indexterm>
-	    <primary>MX record</primary>
-	  </indexterm>
-
 	  <para>�������� ����������� ��� ������ ��� �� �� ������ ����.  � ����
-	    ����� �� �� ����� UUCP.</para>
+	    ����� �� �� ����� UUCP<indexterm><primary>UUCP</primary></indexterm>.</para>
 
 	  <para>���� ����� ������ ����� �� ������ ��� ����������� Internet �
 	    ������ ���� ������ �������, �� ��� ������� �������� �������������
@@ -1023,7 +1011,7 @@ domain.net.  
 	    ��� ����� <hostid role="domainname">example.com</hostid> ��� �
 	    �������� ��� Internet ���� ������ ��
 	    <hostid role="domainname">example.net</hostid> �� �������
-	    ��������� ������������� MX ��� ��� ����� ���:</para>
+	    ��������� ������������� MX<indexterm><primary>MX record</primary></indexterm> ��� ��� ����� ���:</para>
 
 	  <programlisting>example.com.          MX        10      example.com.
                       MX        20      example.net.</programlisting>
diff --git a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index c7c9a97104..84e98394dc 100644
--- a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -2817,13 +2817,11 @@ Script done, &hellip;</screen>
 
 	<qandaentry>
 	  <question>
-	    <para>My compile failed with lots of signal 11 (or other
+	    <para>My compile failed with lots of signal 11<indexterm><primary>signal 11</primary></indexterm> (or other
 	      signal number) errors.  What happened?</para>
 	  </question>
 
 	  <answer>
-	    <indexterm><primary>signal 11</primary></indexterm>
-
 	    <para>This normally indicates hardware problems.
 	      (Re)making world is an effective way to stress test
 	      hardware, and will frequently throw up memory
diff --git a/en_US.ISO8859-1/books/handbook/install/chapter.xml b/en_US.ISO8859-1/books/handbook/install/chapter.xml
index b98ebd28c9..030a80dd66 100644
--- a/en_US.ISO8859-1/books/handbook/install/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/install/chapter.xml
@@ -4275,15 +4275,11 @@ Please press any key to reboot.</screen>
 	<qandaentry>
 
 	  <question>
-	  <indexterm>
-	    <primary>color</primary>
-	    <secondary>contrast</secondary>
-	  </indexterm>
 	    <para>When &man.sysinstall.8; is used
 	      in an <application>&xorg;</application> terminal, the
 	      yellow font is difficult to read
 	      against the light gray background.  Is there a way to
-	      provide higher contrast for this application?</para>
+	      provide higher contrast<indexterm><primary>color</primary><secondary>contrast</secondary></indexterm> for this application?</para>
 	  </question>
 	  <answer>
 	    <para>If the default
diff --git a/en_US.ISO8859-1/books/handbook/mail/chapter.xml b/en_US.ISO8859-1/books/handbook/mail/chapter.xml
index 308d952042..8a26e26154 100644
--- a/en_US.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/mail/chapter.xml
@@ -860,9 +860,8 @@ purgestat	/usr/local/supermailer/bin/purgestat-compat</programlisting>
 		  role="fqdn">mumble.bar.edu</hostid>, instead of just
 		<hostid>mumble</hostid>.</para>
 
-	      <indexterm><primary>BIND</primary></indexterm>
 	      <para>This is because the version of
-		<application>BIND</application> which ships with
+		<application>BIND</application><indexterm><primary>BIND</primary></indexterm> which ships with
 		&os; no longer provides default abbreviations
 		for non-FQDNs other than the local domain.  An
 		unqualified host such as
@@ -933,12 +932,8 @@ to /etc/mail/sendmail.cf.</programlisting>
 	<para>Connect to a &os; mail gateway on the LAN.  The PPP
 	  connection is non-dedicated.</para>
 
-	<indexterm>
-	  <primary>MX record</primary>
-	</indexterm>
-
 	<para>One way to do this is to get a full-time Internet server
-	  to provide secondary <acronym>MX</acronym> services for the
+	  to provide secondary <acronym>MX</acronym><indexterm><primary>MX record</primary></indexterm> services for the
 	  domain.  In this example, the domain is <hostid
 	    role="domainname">example.com</hostid> and the ISP has
 	  configured <hostid
diff --git a/es_ES.ISO8859-1/books/handbook/mail/chapter.xml b/es_ES.ISO8859-1/books/handbook/mail/chapter.xml
index 50590ba2e0..c55b1defb8 100755
--- a/es_ES.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/es_ES.ISO8859-1/books/handbook/mail/chapter.xml
@@ -970,9 +970,8 @@ purgestat	/usr/local/supermailer/bin/purgestat-compat</programlisting>
           caso <hostid role="fqdn">mumble.bar.edu</hostid> en lugar de
           referirse a ella simplemente como <hostid>mumble</hostid>.</para>
 
-	<indexterm><primary>BIND</primary></indexterm>
 	<para>Tradicionalmente, la referencia incompleta era posible
-          utilizando <quote>resolvers</quote> de BSD BIND.
+          utilizando <quote>resolvers</quote> de BSD BIND<indexterm><primary>BIND</primary></indexterm>.
 	  No obstante la versi�n de <application>BIND</application>
           que en la actualidad se ofrece con FreeBSD ya no permite por defecto
           el uso de dichas abreviaturas salvo para aquellas m�quinas
@@ -1009,10 +1008,6 @@ purgestat	/usr/local/supermailer/bin/purgestat-compat</programlisting>
 
       <qandaentry>
 	<question>
-	  <indexterm>
-	    <primary>MX record</primary>
-	  </indexterm>
-
 	<para><application>sendmail</application> dice <errorname>mail
 	  loops back to myself</errorname> (el correo vuelve a mis manos)</para>
 	</question>
@@ -1031,7 +1026,7 @@ purgestat	/usr/local/supermailer/bin/purgestat-compat</programlisting>
 Usted ha especificado que el correo para el dominio (por ejemplo,
 para el dominio dominio.net) sea reenviado a una m�quina determinada
 (en este caso relay.dominio.net), para lo que se utiliza un registro
-de DNS de tipo MX, pero la m�quina que act�a de relay no se
+de DNS de tipo MX<indexterm><primary>MX record</primary></indexterm>, pero la m�quina que act�a de relay no se
 reconoce a s� misma como perteneciente al dominio dominio.net.
 Se debe a�adir dominio.net al fichero /etc/mail/local-host-names,
 que recibe el nombre de /etc/sendmail.cw en versiones de sendmail previas
@@ -1052,7 +1047,6 @@ al fichero <filename>/etc/mail/sendmail.cf</filename>
 
       <qandaentry>
         <question>
-	  <indexterm><primary>PPP</primary></indexterm>
 	<para>?C�mo puedo ejecutar un servidor de correo
           utilizando una m�quina que se conecta a internet
               mediante modem anal�gico (dial-up) ?</para>
@@ -1061,16 +1055,11 @@ al fichero <filename>/etc/mail/sendmail.cf</filename>
 	<answer>
 	<para>Se quiere conectar una m�quina FreeBSD dentro de una LAN a
 	  Internet.  La m�quina FreeBSD ser� una pasarela de
-          correo para dicha LAN.  La conexi�n mediante PPP no es
+          correo para dicha LAN.  La conexi�n mediante PPP<indexterm><primary>PPP</primary></indexterm> no es
 	  dedicada.</para>
 
-	<indexterm><primary>UUCP</primary></indexterm>
-	<indexterm>
-	  <primary>MX record</primary>
-	</indexterm>
-
 	<para>Existen al menos dos formas distintas de hacerlo.  Una de ellas
-          consiste en utilizar UUCP.</para>
+          consiste en utilizar UUCP<indexterm><primary>UUCP</primary></indexterm>.</para>
 
 	<para>Otra forma consiste en hacerse con un servidor de internet a
           tiempo completo para proporcionar servicios de agente de transporte
@@ -1101,7 +1090,7 @@ al fichero <filename>/etc/mail/sendmail.cf</filename>
           La aplicaci�n <application>sendmail</application>
           autom�ticamente entregar� el correo al servidor
           especificado como agente de transporte de correo secundario
-          (segundo registro MX), es decir, entregar� el correo a
+          (segundo registro MX)<indexterm><primary>MX record</primary></indexterm>, es decir, entregar� el correo a
           nuestro proveedor de servicios de internet (<hostid
           role="domainname">ejemplo.net</hostid>).  El sitio MX secundario
           tratar� de conectarse con nuestra m�quina de una forma
diff --git a/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index 89bc6c7eb8..04600cc690 100644
--- a/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -2460,13 +2460,11 @@ Script done, &hellip;</screen>
 	<qandaentry>
 	  <question>
 	    <para>Ma compilation �choue avec de nombreuses erreurs
-	      &ldquo;signal 11&rdquo; (ou tout autre num�ro de
+	      &ldquo;signal 11&rdquo;<indexterm><primary>signal 11</primary></indexterm> (ou tout autre num�ro de
 	      signal).  Que s'est-il pass�?</para>
 	  </question>
 
 	  <answer>
-	    <indexterm><primary>signal 11</primary></indexterm>
-
 	    <para>Cela indique g�n�ralement un probl�me
 	      mat�riel.  (Re)compiler le syst�me est un bon
 	      moyen de mettre votre mat�riel sous pression, et
diff --git a/fr_FR.ISO8859-1/books/handbook/install/chapter.xml b/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
index af90cbfd80..482170a118 100644
--- a/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/install/chapter.xml
@@ -5004,16 +5004,11 @@ Please press any key to reboot.</screen>
 	<qandaentry>
 
 	  <question>
-	    <indexterm>
-	      <primary>couleur</primary>
-	      <secondary>contraste</secondary>
-	    </indexterm>
-
 	    <para>Quand <application>sysinstall</application> est
 	      utilis� dans un terminal X11, la police de
 	      caract�res jaune sur fond gris-clair peut
 	      �tre difficile &agrave; lire.  Existe-t-il un
-	      moyen d'obtenir un contraste plus �lev�
+	      moyen d'obtenir un contraste<indexterm><primary>couleur</primary><secondary>contraste</secondary></indexterm> plus �lev�
 	      pour cette application?</para>
 	  </question>
 
diff --git a/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml b/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml
index 470cc45db8..74642aa2ad 100644
--- a/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/fr_FR.ISO8859-1/books/handbook/mail/chapter.xml
@@ -1019,9 +1019,8 @@ purgestat	/usr/local/supermailer/bin/purgestat-compat</programlisting>
 	  <hostid role="fqdn">mumble.bar.edu</hostid>, au lieu de
 	  juste <hostid>mumble</hostid>.</para>
 
-	<indexterm><primary>BIND</primary></indexterm>
 	<para>C'�tait traditionnellement autoris� par les
-	  r�solveurs <application>BIND</application> BSD.
+	  r�solveurs <application>BIND</application><indexterm><primary>BIND</primary></indexterm> BSD.
 	  N�anmoins, la version de <application>BIND</application>
 	  qui est maintenant livr�e avec FreeBSD ne sait pas
 	  compl�ter les noms de machines abr�g�s autrement
@@ -1055,10 +1054,6 @@ purgestat	/usr/local/supermailer/bin/purgestat-compat</programlisting>
 
       <qandaentry>
 	<question>
-	  <indexterm>
-	    <primary>MX record</primary>
-	  </indexterm>
-
 	<para><application>sendmail</application> affiche le message
 	  <errorname>mail loops back to myself</errorname></para>
 	</question>
@@ -1076,7 +1071,7 @@ Comment puis-je r
 
 Vous avez demand� que le courrier pour un domaine (e.g., domain.net)
 soit transmis &agrave; une machine donn�e (dans ce cas pr�cis, relay.domain.net)
-en utilisant un enregistrement MX, mais la machine relais ne se
+en utilisant un enregistrement MX<indexterm><primary>MX record</primary></indexterm>, mais la machine relais ne se
 conna�t pas elle-m�me comme domain.net.  Ajoutez domain.net &agrave;
 /etc/mail/local-host-names [connu sous le nom /etc/sendmail.cw dans les versionsant�rieure &agrave; 8.10] (si vous utilisez FEATURE(use_cw_file))
 ou ajoutez &ldquo;Cw domain.net&rdquo; &agrave;
@@ -1092,11 +1087,9 @@ ou ajoutez &ldquo;Cw domain.net&rdquo; &agrave;
 
       <qandaentry>
         <question>
-	  <indexterm><primary>PPP</primary></indexterm>
-
 	<para>Comment puis-je faire tourner un serveur de courrier
 	  �lectronique avec une connexion
-	  t�l�phonique PPP</para>
+	  t�l�phonique PPP<indexterm><primary>PPP</primary></indexterm></para>
 	</question>
 
 	<answer>
@@ -1105,13 +1098,8 @@ ou ajoutez &ldquo;Cw domain.net&rdquo; &agrave;
 	  courrier �lectronique pour le r�seau local.
 	  La connexion PPP n'est pas d�di�e.</para>
 
-	<indexterm><primary>UUCP</primary></indexterm>
-	<indexterm>
-	  <primary>MX record</primary>
-	</indexterm>
-
 	<para>Il y a au moins deux fa�ons de faire.  L'une d'elle
-	  est d'utiliser UUCP.</para>
+	  est d'utiliser UUCP<indexterm><primary>UUCP</primary></indexterm>.</para>
 
 	<para>L'autre m�thode �tant d'obtenir un serveur Internet
 	  constamment connect� pour qu'il vous fournisse les services
@@ -1137,7 +1125,7 @@ ou ajoutez &ldquo;Cw domain.net&rdquo; &agrave;
 	  probablement par d�passement de d�lai puisque
 	  vous n'�tes pas en ligne.  Le programme
 	  <application>sendmail</application> enverra automatiquement
-	  le courrier au site MX secondaire, i.e. votre fournisseur
+	  le courrier au site MX secondaire<indexterm><primary>MX record</primary></indexterm>, i.e. votre fournisseur
 	  d'acc�s (<hostid role="domainname">exemple.net</hostid>).
 	  Le site MX secondaire essayera p�riodiquement de se
 	  connecter &agrave; votre machine pour exp�dier le
diff --git a/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.xml b/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.xml
index 15b45b2f54..3a49ca15fd 100644
--- a/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.xml
@@ -3987,10 +3987,8 @@ Script done, &hellip;</screen>
 
 	<qandaentry>
 	  <question>
-	    <indexterm><primary>signal 11</primary></indexterm>
-
 	    <para>A ford�t� rengeteg 11-es jelz�st
-	      (signal 11) (vagy m�sfajta jelz�seket) dob
+	      (signal 11)<indexterm><primary>signal 11</primary></indexterm> (vagy m�sfajta jelz�seket) dob
 	      hib�val.  Mi t�rt�nhetett?</para>
 	  </question>
 
diff --git a/hu_HU.ISO8859-2/books/handbook/install/chapter.xml b/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
index 38b1fab9c7..326188b239 100644
--- a/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/install/chapter.xml
@@ -6171,17 +6171,12 @@ Please press any key to reboot.</screen>
 
 	<qandaentry>
 	  <question>
-	    <indexterm>
-	      <primary>sz�nek</primary>
-	      <secondary>kontraszt</secondary>
-	    </indexterm>
-
 	    <para>Amikor a <application>sysinstall</application>
 	      programot egy X11 termin�lban futtatom, a
 	      s�rga sz�n� bet�ket viszonylag
 	      neh�z olvasni a vil�gossz�rke
 	      h�tt�rrel.  Esetleg lehet valahogy
-	      n�velni a kontrasztot az alkalmaz�s
+	      n�velni a kontrasztot<indexterm><primary>sz�nek</primary><secondary>kontraszt</secondary></indexterm> az alkalmaz�s
 	      haszn�latakor?</para>
 	  </question>
 
diff --git a/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml b/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml
index d616070a3a..7e40883705 100644
--- a/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml
+++ b/hu_HU.ISO8859-2/books/handbook/mail/chapter.xml
@@ -1135,10 +1135,8 @@ purgestat	/usr/local/<replaceable>kedvenclevelez
 	    kell r� hivatkoznunk, nem pedig egyszer�en csak
 	    <hostid>vagyis</hostid> n�ven.</para>
 
-	  <indexterm><primary>BIND</primary></indexterm>
-
 	  <para>R�gebben egy�bk�nt ezt a
-	    BSD-t�pus� BIND n�vfelold�k
+	    BSD-t�pus� BIND<indexterm><primary>BIND</primary></indexterm> n�vfelold�k
 	    megengedt�k.  A &os; jelenlegi v�ltozatai
 	    azonban m�r olyan <application>BIND</application>
 	    verzi�t tartalmaznak, amelyek
@@ -1184,8 +1182,6 @@ purgestat	/usr/local/<replaceable>kedvenclevelez
 
       <qandaentry>
 	<question>
-	  <indexterm><primary>MX rekord</primary></indexterm>
-
 	  <para>A <application>sendmail</application> szerint <quote>a
 	    lev�l a saj�t fark�ba
 	    harap</quote></para>
@@ -1205,7 +1201,7 @@ purgestat	/usr/local/<replaceable>kedvenclevelez
 Hogyan oldhat� meg ez a probl�ma?
 
 Azt k�rt�k, hogy a tartom�nyba (p�ld�ul <replaceable>tartom�ny.net</replaceable>) k�ld�tt lev�l
-az MX rekord felhaszn�l�s�val egy adott g�pre legyen �tir�ny�tva
+az MX<indexterm><primary>MX rekord</primary></indexterm> rekord felhaszn�l�s�val egy adott g�pre legyen �tir�ny�tva
 (ebben az esetben ez a <replaceable>fel�.tartom�ny.net</replaceable>), de a tov�bb�t�st v�gz� g�p
 nem ismeri fel mag�t a <replaceable>tartom�ny.net</replaceable> c�men. Vegy�k fel a <replaceable>tartom�ny.net</replaceable>
 tartom�nyt az /etc/mail/local-host-names �llom�nyba [melyet a 8.10 el�tti
@@ -1225,10 +1221,8 @@ FEATURE(use_cw_file) be
 
       <qandaentry>
 	<question>
-	  <indexterm><primary>PPP</primary></indexterm>
-
 	  <para>Hogyan tudok levelez� szervert futtatni egy
-	    bet�rcs�z�s PPP kapcsolat
+	    bet�rcs�z�s PPP<indexterm><primary>PPP</primary></indexterm> kapcsolat
 	    eset�ben?</para>
 	</question>
 
@@ -1240,13 +1234,8 @@ FEATURE(use_cw_file) be
 	    �tj�r�ja.  A PPP kapcsolat nem
 	    dedik�lt.</para>
 
-	  <indexterm><primary>UUCP</primary></indexterm>
-	  <indexterm>
-	    <primary>MX record</primary>
-	  </indexterm>
-
 	  <para>Legal�bb k�t m�don meg tudjuk
-	    oldani.  Az egyik m�dszer szerint az UUCP
+	    oldani.  Az egyik m�dszer szerint az UUCP<indexterm><primary>UUCP</primary></indexterm>
 	    haszn�lat�ra lesz
 	    sz�ks�g�nk.</para>
 
@@ -1260,7 +1249,7 @@ FEATURE(use_cw_file) be
 	    �s az internet-szolg�ltat�nk a <hostid
 	    role="domainname"><replaceable>szolg�ltat�.net</replaceable></hostid>
 	    n�vre be�ll�totta a
-	    tartom�nyunkhoz a m�sodlagos MX
+	    tartom�nyunkhoz a m�sodlagos MX<indexterm><primary>MX record</primary></indexterm>
 	    rekordokat:</para>
 
 	  <programlisting><replaceable>c�g.hu</replaceable>.          MX        10      <replaceable>c�g.hu</replaceable>.
diff --git a/it_IT.ISO8859-15/books/handbook/install/chapter.xml b/it_IT.ISO8859-15/books/handbook/install/chapter.xml
index 634d056073..d59e7fb79f 100644
--- a/it_IT.ISO8859-15/books/handbook/install/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/install/chapter.xml
@@ -4812,17 +4812,13 @@ Please press any key to reboot.</screen>
       <qandaset>
         <qandaentry>
           <question>
-            <para>Posso avviare dalla console ARC o da quella del BIOS
-              Alpha?</para>
+            <para>Posso avviare dalla console ARC<indexterm><primary>ARC</primary></indexterm> o da quella del BIOS
+              Alpha<indexterm><primary>Alpha BIOS</primary></indexterm>?</para>
           </question>
 
 	  <answer>
-          <indexterm><primary>ARC</primary></indexterm>
-          <indexterm><primary>Alpha BIOS</primary></indexterm>
-          <indexterm><primary>SRM</primary></indexterm>
-
             <para>No.  &os;, come Compaq Tru64 e VMS, non si avviano dalla
-              console SRM.</para>
+              console SRM<indexterm><primary>SRM</primary></indexterm>.</para>
           </answer>
         </qandaentry>
 
diff --git a/it_IT.ISO8859-15/books/handbook/mail/chapter.xml b/it_IT.ISO8859-15/books/handbook/mail/chapter.xml
index c82eea6e8a..0d411da36f 100644
--- a/it_IT.ISO8859-15/books/handbook/mail/chapter.xml
+++ b/it_IT.ISO8859-15/books/handbook/mail/chapter.xml
@@ -954,9 +954,7 @@ purgestat   /usr/local/supermailer/bin/purgestat-compat</programlisting>
               role="fqdn">mumble.bar.edu</hostid>, invece del solo
             <hostid>mumble</hostid>.</para>
 
-          <indexterm><primary>BIND</primary></indexterm>
-
-          <para>Tradizionalmente, questo era permesso dai resolver BIND di
+          <para>Tradizionalmente, questo era permesso dai resolver BIND<indexterm><primary>BIND</primary></indexterm> di
             BSD.  Tuttavia la versione corrente di
             <application>BIND</application> equipaggiata con FreeBSD non
             prevede pi� l'abbreviazione di default per nomi di dominio
@@ -985,8 +983,6 @@ purgestat   /usr/local/supermailer/bin/purgestat-compat</programlisting>
 
       <qandaentry>
         <question>
-	  <indexterm><primary>record MX</primary></indexterm>
-
           <para><application>sendmail</application> riporta l'errore
             <errorname>mail loops back to myself</errorname></para>
         </question>
@@ -1004,7 +1000,7 @@ Come posso risolvere questo problema?
 
 Hai chiesto che la posta per il dominio (es., domain.net) sia inoltrata
 a un host specifico (in questo caso, relay.domain.net) attraverso l'uso di
-un record MX, ma la macchina di inoltro non si riconosce appartenente a
+un record MX<indexterm><primary>record MX</primary></indexterm>, ma la macchina di inoltro non si riconosce appartenente a
 domain.net. Aggiungi domain.net in /etc/mail/local-host-names
 [chiamato /etc/sendmail.cw nelle versioni precedenti alla 8.10]
 (se stai usando FEATURE(use_cw_file)) oppure aggiungi <quote>Cw domain.net</quote>
@@ -1019,10 +1015,8 @@ in /etc/mail/sendmail.cf.</programlisting>
 
       <qandaentry>
         <question>
-	  <indexterm><primary>PPP</primary></indexterm>
-
           <para>Come posso eseguire un server di posta su un host connesso in
-            dial-up tramite PPP?</para>
+            dial-up tramite PPP<indexterm><primary>PPP</primary></indexterm>?</para>
         </question>
 
         <answer>
@@ -1031,15 +1025,11 @@ in /etc/mail/sendmail.cf.</programlisting>
             LAN.  La connessione PPP non � molto indicata per questo
             scopo.</para>
 
-          <indexterm><primary>UUCP</primary></indexterm>
-
-          <indexterm><primary>record MX</primary></indexterm>
-
           <para>Esistono almeno due modi per far questo. Un modo �
-            usare UUCP.</para>
+            usare UUCP<indexterm><primary>UUCP</primary></indexterm>.</para>
 
           <para>L'altro � trovare un server Internet a tempo pieno
-            che fornisca un servizio MX secondario per il tuo dominio.
+            che fornisca un servizio MX<indexterm><primary>record MX</primary></indexterm> secondario per il tuo dominio.
             Per esempio, se il dominio della tua societ� �
             <hostid role="domainname">example.com</hostid> e il tuo fornitore
             di servizi Internet ha attivato <hostid
diff --git a/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml b/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
index 8a814f5f08..56cb19efec 100644
--- a/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
@@ -2885,13 +2885,11 @@ Script done, &hellip;</screen>
 
 	<qandaentry>
 	  <question>
-	    <para>signal 11 (�⤷����¾�Υ����ʥ��ֹ�) �Υ��顼����������Ф�
+	    <para>signal 11<indexterm><primary>signal 11</primary></indexterm> (�⤷����¾�Υ����ʥ��ֹ�) �Υ��顼����������Ф�
 	      ����ѥ��뤬���Ԥ��ޤ������������äƤ����Ǥ��礦��?</para>
 	  </question>
 
 	  <answer>
-	    <indexterm><primary>signal 11</primary></indexterm>
-
 	    <para>������̾�ϡ��ɥ����������꤬���뤳�Ȥ򼨤��Ƥ��ޤ���
               �����ƥ�κƹ��ۤϡ��ϡ��ɥ��������Ф�������ѵ׻��Ԥʤ������
               ͭ���ʼ��ʤΰ�Ĥǡ�����˴ط��������꤬�褯��𤵤�ޤ���
diff --git a/ja_JP.eucJP/books/handbook/install/chapter.xml b/ja_JP.eucJP/books/handbook/install/chapter.xml
index 3463cf6cc2..281abbaeba 100644
--- a/ja_JP.eucJP/books/handbook/install/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/install/chapter.xml
@@ -4341,14 +4341,9 @@ Please press any key to reboot.</screen>
 	<qandaentry>
 
 	  <question>
-	  <indexterm>
-	    <primary>color</primary>
-	    <secondary>contrast</secondary>
-	  </indexterm>
-
 	    <para>X11 ü������ <application>sysinstall</application> ��Ȥ��ȡ�
 	      �饤�ȥ��졼���طʤ˥ե���Ȥ�������ɽ�����졢�ɤߤ��餤�Ǥ���
-	      ���Υ��ץꥱ�������Υ���ȥ饹�Ȥ�⤯���뤳�ȤϤǤ��ޤ���?</para>
+	      ���Υ��ץꥱ�������Υ���ȥ饹�Ȥ�⤯���뤳�ȤϤǤ��ޤ���<indexterm><primary>color</primary><secondary>contrast</secondary></indexterm>?</para>
 	  </question>
 	  <answer>
 	    <para>���Ǥ� X11 �򥤥󥹥ȡ��뤷�Ƥ��ơ�&man.xterm.1; �� &man.rxvt.1;
diff --git a/ja_JP.eucJP/books/handbook/mail/chapter.xml b/ja_JP.eucJP/books/handbook/mail/chapter.xml
index 1ed5b554a8..bb811adc12 100644
--- a/ja_JP.eucJP/books/handbook/mail/chapter.xml
+++ b/ja_JP.eucJP/books/handbook/mail/chapter.xml
@@ -745,8 +745,7 @@ purgestat   /usr/local/supermailer/bin/purgestat-compat</programlisting>
 	    ���λ���ñ�� <hostid>mumble</hostid> �ǤϤʤ�
 	    <hostid role="fqdn">mumble.bar.edu</hostid> �� FQDN �ǻ��Ȥ��ʤ���Фʤ�ޤ���</para>
 
-	  <indexterm><primary>BIND</primary></indexterm>
-	  <para>���⤽�⡢BSD BIND �Υ꥾��С� (resolver) �ǤϤ��Τ褦�ʤ��Ȥ���ǽ�Ǥ�������
+	  <para>���⤽�⡢BSD BIND<indexterm><primary>BIND</primary></indexterm> �Υ꥾��С� (resolver) �ǤϤ��Τ褦�ʤ��Ȥ���ǽ�Ǥ�������
 	    FreeBSD �����äƤ���ǿ��Ǥ� <application>BIND</application>
 	    �Ǥϼ�ʬ�Υɥᥤ��ʳ����Ф��� FQDN �Ǥʤ���ά���ϵ�����ޤ���
 	    ���äƥۥ��Ȥ� <hostid>mumble</hostid> ��ۣ��˻��ꤷ������
@@ -812,9 +811,7 @@ FEATURE(use_cw_file) 
       <qandaentry>
 
 	<question>
-	  <indexterm><primary>PPP</primary></indexterm>
-
-	  <para>�������륢�å� PPP �ۥ��Ȥǥ᡼�륵���Ф�¹Ԥ���ˤϤɤ������餤����?</para>
+	  <para>�������륢�å� PPP<indexterm><primary>PPP</primary></indexterm> �ۥ��Ȥǥ᡼�륵���Ф�¹Ԥ���ˤϤɤ������餤����?</para>
 	</question>
 
 	<answer>
@@ -823,9 +820,8 @@ FEATURE(use_cw_file) 
 	    LAN �ǤΥ᡼�륲���ȥ������ˤʤ�ޤ���FreeBSD
 	    �ޥ������������³�ǤϤ���ޤ��� (����: �������륢�å���³�ʤ�)��</para>
 
-	  <indexterm><primary>UUCP</primary></indexterm>
 	  <para>����ˤϡ����ʤ��Ȥ���Ĥ���ˡ������ޤ���
-	    ��Ĥ� UUCP ��Ȥ����ȤǤ���</para>
+	    ��Ĥ� UUCP<indexterm><primary>UUCP</primary></indexterm> ��Ȥ����ȤǤ���</para>
 
 	  <para>�⤦��Ĥ���ˡ�ϡ����ʤ��Υɥᥤ����Ф��륻�������
 	    MX �����ӥ����󶡤�������Ư�Υ��󥿡��ͥåȥ����Ф��Ѱդ��뤳�ȤǤ���
diff --git a/mn_MN.UTF-8/books/handbook/cutting-edge/chapter.xml b/mn_MN.UTF-8/books/handbook/cutting-edge/chapter.xml
index 331db39e75..20d9912bcd 100644
--- a/mn_MN.UTF-8/books/handbook/cutting-edge/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/cutting-edge/chapter.xml
@@ -2608,9 +2608,7 @@ Script done, &hellip;</screen>
 
 	<qandaentry>
 	  <question>
-	    <indexterm><primary>дохио 11</primary></indexterm>
-
-	    <para>Миний эмхэтгэл маш олон дохио 11 (эсвэл бусад дохионы дугаар)
+	    <para>Миний эмхэтгэл маш олон дохио 11<indexterm><primary>дохио 11</primary></indexterm> (эсвэл бусад дохионы дугаар)
 		алдаагаар амжилтгүй болсон. Юу болсон юм бол?</para>
 	  </question>
 
diff --git a/mn_MN.UTF-8/books/handbook/install/chapter.xml b/mn_MN.UTF-8/books/handbook/install/chapter.xml
index f9708964a8..0c115585f5 100644
--- a/mn_MN.UTF-8/books/handbook/install/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/install/chapter.xml
@@ -3996,14 +3996,9 @@ Please press any key to reboot.</screen>
 
 	<qandaentry>
 	  <question>
-	    <indexterm>
-	      <primary>color</primary>
-	      <secondary>contrast</secondary>
-	    </indexterm>
-
 	    <para><application>sysinstall</application>-ийг X11 терминал дээр
 	      ашигласан тохиолдолд цайвар саарал дээр шар фонтыг уншихад
-	      хэцүү байдаг. Энэ програмын хувьд илүү өндөр нягтралтай
+	      хэцүү байдаг<indexterm><primary>color</primary><secondary>contrast</secondary></indexterm>. Энэ програмын хувьд илүү өндөр нягтралтай
 	      үзүүлэх боломж бий юу?</para>
 	  </question>
 	  <answer>
diff --git a/mn_MN.UTF-8/books/handbook/mail/chapter.xml b/mn_MN.UTF-8/books/handbook/mail/chapter.xml
index 8fa6f74eff..521e41ea60 100644
--- a/mn_MN.UTF-8/books/handbook/mail/chapter.xml
+++ b/mn_MN.UTF-8/books/handbook/mail/chapter.xml
@@ -821,8 +821,7 @@ role="domainname">bar.edu</hostid> домэйнд байгаа <hostid>mumble</h
 <hostid role="fqdn">mumble.bar.edu</hostid> гэсэн fully-qualified domain name буюу бүрэн-баталгаажсан
 домэйн нэрээр нь заах хэрэгтэй.</para>
 
-	<indexterm><primary>BIND</primary></indexterm>
-	<para>Урьд нь, BSD BIND тайлагчийн хувьд дээрх шиг хэрэглэж болдог байсан.
+	<para>Урьд нь, BSD BIND<indexterm><primary>BIND</primary></indexterm> тайлагчийн хувьд дээрх шиг хэрэглэж болдог байсан.
 Гэвч FreeBSD-тэй хамт ирдэг <application>BIND</application>-н одоогийн хувилбар дээр
 өөрийн оршин байгаа домэйноос бусад бүрэн баталгаажаагүй домэйн нэрийн хувьд
 анхдагч товчилсон нэрүүдийг хэрэглэж болохгүй болсон. Тиймээс баталгаажаагүй
@@ -890,15 +889,10 @@ to /etc/mail/sendmail.cf.</programlisting>
 Энэ FreeBSD машин тухайн LAN-ий хувьд захидлын гарц байх болно. PPP холболт бол тусгайлан
 бий болгосон зориулагдсан холболт биш юм.</para>
 
-	<indexterm><primary>UUCP</primary></indexterm>
-	<indexterm>
-	  <primary>MX бичлэг</primary>
-	</indexterm>
-
-	<para>Үүний тулд хоёр арга байна. Нэг арга нь UUCP ашиглах юм.</para>
+	<para>Үүний тулд хоёр арга байна. Нэг арга нь UUCP<indexterm><primary>UUCP</primary></indexterm> ашиглах юм.</para>
 
 	<para>Нөгөө арга нь таны домэйны хувьд хоёрдогч
-MX үйлчилгээг үзүүлэх байнгын холболттой Интернэт сервертэй болох явдал юм.
+MX<indexterm><primary>MX бичлэг</primary></indexterm> үйлчилгээг үзүүлэх байнгын холболттой Интернэт сервертэй болох явдал юм.
 Жишээлбэл, хэрэв танай байгууллагын
 домэйн нэр <hostid role="domainname">example.com</hostid> бөгөөд танай Интернэтийн үйлчилгээ
 үзүүлэгч танай домэйны хувьд хоёрдогч MX үйлчилгээг үзүүлэхээр
diff --git a/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index f297267cee..7bcdcdf62d 100644
--- a/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -2889,10 +2889,8 @@ Script done, &hellip;</screen>
 
 	<qandaentry>
 	  <question>
-	    <indexterm><primary>signal 11</primary></indexterm>
-
 	    <para>Het compileren gaat fout met veel meldingen van
-	      signal 11 (of andere signalnummers).  Wat is er aan de
+	      signal 11<indexterm><primary>signal 11</primary></indexterm> (of andere signalnummers).  Wat is er aan de
 	      hand?</para>
 	  </question>
 
diff --git a/nl_NL.ISO8859-1/books/handbook/install/chapter.xml b/nl_NL.ISO8859-1/books/handbook/install/chapter.xml
index beb8925e23..dd3a3c8b13 100644
--- a/nl_NL.ISO8859-1/books/handbook/install/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/install/chapter.xml
@@ -4483,16 +4483,10 @@ Please press any key to reboot.</screen>
 
 	<qandaentry>
 	  <question>
-	    <indexterm>
-	      <primary>kleur</primary>
-
-	      <secondary>contrast</secondary>
-	    </indexterm>
-
 	    <para>Wanneer <application>sysinstall</application> in een
 	      X11-terminal wordt gebruikt, is het moeilijk om het gele
 	      font op de lichtgrijze achtergrond te lezen.  Is er een
-	      manier om het contrast van deze applicatie te
+	      manier om het contrast<indexterm><primary>kleur</primary><secondary>contrast</secondary></indexterm> van deze applicatie te
 	      verhogen?</para>
 	  </question>
 
diff --git a/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml b/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml
index cfb397a143..a69c25715c 100644
--- a/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/nl_NL.ISO8859-1/books/handbook/mail/chapter.xml
@@ -875,9 +875,7 @@ purgestat	/usr/local/supermailer/bin/purgestat-compat</programlisting>
 	    verwijzen, <hostid role="fqdn">mompel.bar.edu</hostid>, in
 	    plaats van slechts <hostid>mompel</hostid>.</para>
 
-	  <indexterm><primary>BIND</primary></indexterm>
-
-	  <para>Traditioneel werd dit door BSD BIND resolvers toegestaan.  De
+	  <para>Traditioneel werd dit door BSD BIND<indexterm><primary>BIND</primary></indexterm> resolvers toegestaan.  De
 	    huidige versie van <application>BIND</application> die
 	    met &os; wordt geleverd levert niet langer standaard
 	    afkortingen voor onvolledig gekwalificeerde domeinnamen
@@ -950,15 +948,11 @@ eerder dan 8.10] (als FEATURE(use_cw_file) gebruikt wordt) of voeg
 	    Internet te verbinden.  De &os;-computer zal en mail-gateway
 	    voor het LAN zijn.  De PPP-verbinding is niet toegewijd.</para>
 
-	  <indexterm><primary>UUCP</primary></indexterm>
-
-	  <indexterm><primary>MX-regel</primary></indexterm>
-
 	  <para>Er zijn minstens twee manieren om dit te doen.
-	    E�n manier is om UUCP te gebruiken.</para>
+	    E�n manier is om UUCP<indexterm><primary>UUCP</primary></indexterm> te gebruiken.</para>
 
 	  <para>Een andere manier is ervoor te zorgen dat een server die
-	    altijd met het Internet verbonden is secundaire MX-diensten
+	    altijd met het Internet verbonden is secundaire MX-diensten<indexterm><primary>MX-regel</primary></indexterm>
 	    voor het domein biedt.  Als het domein bijvoorbeeld <hostid
 	      role="domainname">example.com</hostid> is en de
 	    internetprovider <hostid role="domainname">example.net
diff --git a/pl_PL.ISO8859-2/books/handbook/cutting-edge/chapter.xml b/pl_PL.ISO8859-2/books/handbook/cutting-edge/chapter.xml
index 4e6c02ba0f..d174d0eb4b 100644
--- a/pl_PL.ISO8859-2/books/handbook/cutting-edge/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/cutting-edge/chapter.xml
@@ -1389,9 +1389,7 @@ Script done, &hellip;</screen>
 
 	<qandaentry>
 	  <question>
-	    <indexterm><primary>signal 11</primary></indexterm>
-
-	    <para>My compile failed with lots of signal 11 (or other signal
+	    <para>My compile failed with lots of signal 11<indexterm><primary>signal 11</primary></indexterm> (or other signal
 	      number) errors.  What has happened?</para>
 	  </question>
 
diff --git a/pl_PL.ISO8859-2/books/handbook/install/chapter.xml b/pl_PL.ISO8859-2/books/handbook/install/chapter.xml
index 511862cb9c..45aa8a7649 100644
--- a/pl_PL.ISO8859-2/books/handbook/install/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/install/chapter.xml
@@ -4693,16 +4693,12 @@ Please press any key to reboot.</screen>
       <qandaset>
 	<qandaentry>
 	  <question>
-	    <indexterm><primary>ARC</primary></indexterm>
-	    <indexterm><primary>Alpha BIOS</primary></indexterm>
-	    <indexterm><primary>SRM</primary></indexterm>
-
-            <para>Czy mog� �adowa� system z konsoli ARC lub Alpha BIOS?</para>
+            <para>Czy mog� �adowa� system z konsoli ARC<indexterm><primary>ARC</primary></indexterm> lub Alpha BIOS<indexterm><primary>Alpha BIOS</primary></indexterm>?</para>
 	  </question>
 
 	  <answer>
             <para>Nie. &os;, podobnie jak Compaq Tru64 i VMS, mo�e by�
-              �adowany tylko z konsoli SRM.</para>
+              �adowany tylko z konsoli SRM<indexterm><primary>SRM</primary></indexterm>.</para>
 	  </answer>
 	</qandaentry>
 
diff --git a/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml b/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml
index 7edc1659c9..4beb1be9e5 100644
--- a/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml
+++ b/pl_PL.ISO8859-2/books/handbook/mail/chapter.xml
@@ -929,8 +929,7 @@ purgestat	/usr/local/supermailer/bin/purgestat-compat</programlisting>
 	  role="fqdn">mumble.bar.edu</hostid>, instead of just
 	  <hostid>mumble</hostid>.</para>
 
-	<indexterm><primary>BIND</primary></indexterm>
-	<para>Traditionally, this was allowed by BSD BIND resolvers.
+	<para>Traditionally, this was allowed by BSD BIND<indexterm><primary>BIND</primary></indexterm> resolvers.
 	  However the current version of <application>BIND</application>
 	  that ships with FreeBSD no longer provides default abbreviations
 	  for non-fully qualified domain names other than the domain you
@@ -963,9 +962,6 @@ purgestat	/usr/local/supermailer/bin/purgestat-compat</programlisting>
 
       <qandaentry>
 	<question>
-	<indexterm>
-	  <primary>MX record</primary>
-	</indexterm>
 
 	<para><application>sendmail</application> says <errorname>mail
 	  loops back to myself</errorname></para>
@@ -984,7 +980,7 @@ How can I solve this problem?
 
 You have asked mail to the domain (e.g., domain.net) to be
 forwarded to a specific host (in this case, relay.domain.net)
-by using an MX record, but the relay machine does not recognize
+by using an MX<indexterm><primary>MX record</primary></indexterm> record, but the relay machine does not recognize
 itself as domain.net. Add domain.net to /etc/mail/local-host-names
 [known as /etc/sendmail.cw prior to version 8.10]
 (if you are using FEATURE(use_cw_file)) or add <quote>Cw domain.net</quote>
@@ -999,9 +995,8 @@ to /etc/mail/sendmail.cf.</programlisting>
 
       <qandaentry>
         <question>
-	<indexterm><primary>PPP</primary></indexterm>
 
-	<para>How can I run a mail server on a dial-up PPP host?</para>
+	<para>How can I run a mail server on a dial-up PPP<indexterm><primary>PPP</primary></indexterm> host?</para>
 	</question>
 
 	<answer>
@@ -1009,15 +1004,10 @@ to /etc/mail/sendmail.cf.</programlisting>
 	  Internet.  The FreeBSD box will be a mail gateway for the LAN.
 	  The PPP connection is non-dedicated.</para>
 
-	<indexterm><primary>UUCP</primary></indexterm>
-	<indexterm>
-	  <primary>MX record</primary>
-	</indexterm>
-
 	<para>There are at least two ways to do this.  One way is to use
-	  UUCP.</para>
+	  UUCP<indexterm><primary>UUCP</primary></indexterm>.</para>
 
-	<para>Another way is to get a full-time Internet server to provide secondary MX
+	<para>Another way is to get a full-time Internet server to provide secondary MX<indexterm><primary>MX record</primary></indexterm>
 	  services for your domain.  For example, if your company's domain is
 	  <hostid role="domainname">example.com</hostid> and your Internet service provider has
 	  set <hostid role="domainname">example.net</hostid> up to provide secondary MX services
diff --git a/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml b/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml
index 06f16c3d71..1c21be7e0b 100644
--- a/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml
@@ -2006,13 +2006,11 @@ Script done, &hellip;
 	<qandaentry>
 	  <question>
 	    <para>���������� ����������� � ������� ����������� ������ ��
-	      ������� 11 (��� � ������ ������� �������).  ���
+	      ������� 11<indexterm><primary>������ 11</primary></indexterm> (��� � ������ ������� �������).  ���
 	      ���������?</para>
 	  </question>
 
 	  <answer>
-	    <indexterm><primary>������ 11</primary></indexterm>
-
 	    <para>��� �������, ��� ������� � ��������� � �������������.
 	      (����)���������� ������� �������� ����������� ������-������ ���
 	      ������ ������������ � ��������� �������� �������� � �������.
diff --git a/ru_RU.KOI8-R/books/handbook/install/chapter.xml b/ru_RU.KOI8-R/books/handbook/install/chapter.xml
index d66301ddc6..b3011dd188 100644
--- a/ru_RU.KOI8-R/books/handbook/install/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/install/chapter.xml
@@ -4253,14 +4253,9 @@ Please press any key to reboot.</screen>
 
 	<qandaentry>
 	  <question>
-	    <indexterm>
-	      <primary>color</primary>
-	      <secondary>contrast</secondary>
-	    </indexterm>
-
 	    <para>����� <application>sysinstall</application> �������
 	      � ��������� X11, �� ������ ����� �� ������ ����� ���� �����������
-	      �� ��������.  ���� �� ������ ���������� ������ �������� ���
+	      �� ��������.  ���� �� ������ ���������� ������ ��������<indexterm><primary>color</primary><secondary>contrast</secondary></indexterm> ���
 	      ����� ����������?</para>
 	  </question>
 
diff --git a/ru_RU.KOI8-R/books/handbook/mail/chapter.xml b/ru_RU.KOI8-R/books/handbook/mail/chapter.xml
index dd3a517fd5..9f6409a877 100644
--- a/ru_RU.KOI8-R/books/handbook/mail/chapter.xml
+++ b/ru_RU.KOI8-R/books/handbook/mail/chapter.xml
@@ -929,11 +929,7 @@ purgestat	/usr/local/supermailer/bin/purgestat-compat</programlisting>
 	    �������� ���, <hostid role="fqdn">mumble.bar.edu</hostid>, � ��
 	    ������ <hostid>mumble</hostid>.</para>
 
-	  <indexterm>
-	    <primary>BIND</primary>
-	  </indexterm>
-
-	  <para>�����������, ��������� ���������� ���� BSD BIND ��������� ���
+	  <para>�����������, ��������� ���������� ���� BSD BIND<indexterm><primary>BIND</primary></indexterm> ��������� ���
 	    ������.  ������, ������� ������ <application>BIND</application>,
 	    ������������ � FreeBSD, ������ �� ��������� ����� �������,
 	    ������������ �� ����, � ������� �� ����������, ��� �� ���������
@@ -1009,19 +1005,11 @@ FETURE(use_cw_file)) 
 	    � ��������� ����.  ��������� � FreeBSD ����� �������� ������
 	    ��� ��������� ����.  PPP ���������� �� ����������.</para>
 
-	  <indexterm>
-	    <primary>UUCP</primary>
-	  </indexterm>
-
-	  <indexterm>
-	    <primary>MX record</primary>
-	  </indexterm>
-
 	  <para>���������� ��� ������� ��� ����, ����� ������� ���.  ����
-	    ������ ��� ������������� UUCP.</para>
+	    ������ ��� ������������� UUCP<indexterm><primary>UUCP</primary></indexterm>.</para>
 
 	  <para>������ ������ ��� ������������� ��������� ����������� ��������
-	    ������� ��� ����������� ���������� MX ������� ������ ������.
+	    ������� ��� ����������� ���������� MX<indexterm><primary>MX record</primary></indexterm> ������� ������ ������.
 	    ��������, ����� ����� �������� <hostid
 	    role="domainname">example.com</hostid>, � ��������� ��������
 	    �������� <hostid role="domainname">example.net</hostid>
diff --git a/share/xml/freebsd.sch b/share/xml/freebsd.sch
index 7fd9fae788..1b44e0217e 100644
--- a/share/xml/freebsd.sch
+++ b/share/xml/freebsd.sch
@@ -74,6 +74,15 @@
     </rule>
   </pattern>
 
+  <pattern name="Check indexes">
+    <rule context="//question">
+      <report test="./indexterm">Indexterm is not allowed directly in question, place it into a concrete paragraph (in section <xsl:value-of select="(ancestor::sect5[last()]|ancestor::sect4[last()]|ancestor::sect3[last()]|ancestor::sect2[last()]|ancestor::sect1[last()]|ancestor::chapter[last()])[last()]/@id"/>).</report>
+    </rule>
+    <rule context="//answer">
+      <report test="./indexterm">Indexterm is not allowed directly in answer, place it into a concrete paragraph (in section <xsl:value-of select="(ancestor::sect5[last()]|ancestor::sect4[last()]|ancestor::sect3[last()]|ancestor::sect2[last()]|ancestor::sect1[last()]|ancestor::chapter[last()])[last()]/@id"/>).</report>
+    </rule>
+  </pattern>
+
 <!--
 	Backported constraints from DocBook 5.0
 -->
diff --git a/zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml b/zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml
index 111054dd17..0c4794d575 100644
--- a/zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/cutting-edge/chapter.xml
@@ -2388,9 +2388,7 @@ Script done, &hellip;</screen>
 
 	<qandaentry>
 	  <question>
-	    <indexterm><primary>�ź� 11</primary></indexterm>
-
-	    <para>�ҵı���ʧ�ܣ������������� 11
+	    <para>�ҵı���ʧ�ܣ������������� 11<indexterm><primary>�ź� 11</primary></indexterm>
 	      (��������������Ϣ) �Ŵ�������ô����ѽ��</para>
 	  </question>
 
diff --git a/zh_CN.GB2312/books/handbook/install/chapter.xml b/zh_CN.GB2312/books/handbook/install/chapter.xml
index ae349ee96d..3ae815441e 100644
--- a/zh_CN.GB2312/books/handbook/install/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/install/chapter.xml
@@ -3856,14 +3856,9 @@ Please press any key to reboot.</screen>
 
 	<qandaentry>
 	  <question>
-	    <indexterm>
-	      <primary>color</primary>
-	      <secondary>contrast</secondary>
-	    </indexterm>
-
             <para>���� X11 �ն������� <application>sysinstall</application>
               ��ʱ�� ��ɫ�����������dz��ɫ�ı�����������Ķ���
-              ��û��ʲô�������Ӧ�ó����ṩ�߶Աȶȵķ�����</para>
+              ��û��ʲô�������Ӧ�ó����ṩ�߶Աȶȵķ�����<indexterm><primary>color</primary><secondary>contrast</secondary></indexterm></para>
 	  </question>
 	  <answer>
             <para>������Ѿ���װ�� X11 ���� <application>sysinstall</application>
diff --git a/zh_CN.GB2312/books/handbook/mail/chapter.xml b/zh_CN.GB2312/books/handbook/mail/chapter.xml
index ad7284ae93..49c7e32835 100644
--- a/zh_CN.GB2312/books/handbook/mail/chapter.xml
+++ b/zh_CN.GB2312/books/handbook/mail/chapter.xml
@@ -765,8 +765,7 @@ purgestat	/usr/local/supermailer/bin/purgestat-compat</programlisting>
 	  <hostid role="fqdn">mumble.bar.edu</hostid>����������
 	  <hostid>mumble</hostid>��</para>
 
-	<indexterm><primary>BIND</primary></indexterm>
-	<para>��ͳ�ϣ����� BSD BIND resolvers ���ǿ��еġ�
+	<para>��ͳ�ϣ����� BSD BIND<indexterm><primary>BIND</primary></indexterm> resolvers ���ǿ��еġ�
 	  Ȼ��Ŀǰ�� FreeBSD ������ <application>BIND</application>
 	  �Ѳ�Ϊͬһ�����ṩ��д�������ԣ������������������
 	  <hostid>mumble</hostid> ������ <hostid
@@ -796,9 +795,6 @@ purgestat	/usr/local/supermailer/bin/purgestat-compat</programlisting>
 
       <qandaentry>
 	<question>
-	  <indexterm>
-	    <primary>MX record</primary>
-	  </indexterm>
 
 	<para><application>sendmail</application> ��ʾ��Ϣ <errorname>mail
 	  loops back to myself</errorname></para>
@@ -820,7 +816,7 @@ purgestat	/usr/local/supermailer/bin/purgestat-compat</programlisting>
 ����̨����������Ϊ���Լ��� domain.net����� domain.net ���ӵ�
 /etc/mail/local-host-names �ļ��� [�� 8.10 ��֮ǰ�� /etc/sendmail.cw]
 (�����ʹ�� FEATURE(use_cw_file) �Ļ�) ������ /etc/mail/sendmail.cf
-������<quote>Cw domain.net</quote>��</programlisting>
+������<quote>Cw domain.net</quote>��<indexterm><primary>MX record</primary></indexterm></programlisting>
 
         <para><application>sendmail</application> �� FAQ ������
 	  <ulink url="http://www.sendmail.org/faq/"></ulink> �ҵ���
@@ -831,9 +827,8 @@ purgestat	/usr/local/supermailer/bin/purgestat-compat</programlisting>
 
       <qandaentry>
         <question>
-	  <indexterm><primary>PPP</primary></indexterm>
 
-	<para>�������һ����������������һ���ʼ�����</para>
+	<para>�������һ����������������һ���ʼ�����<indexterm><primary>PPP</primary></indexterm></para>
 	</question>
 
 	<answer>
@@ -841,12 +836,7 @@ purgestat	/usr/local/supermailer/bin/purgestat-compat</programlisting>
 	  FreeBSD ���������Ϊ������������ʼ����أ�
 	  ����������Ӳ���һֱ����������״̬��</para>
 
-	<indexterm><primary>UUCP</primary></indexterm>
-	<indexterm>
-	  <primary>MX record</primary>
-	</indexterm>
-
-	<para>���������ַ���������������Ҫ��һ�ַ�������ʹ�� UUCP��</para>
+	<para>���������ַ���������������Ҫ��һ�ַ�������ʹ�� UUCP<indexterm><primary>UUCP</primary></indexterm>��</para>
 
 	<para>��һ�ַ������ҵ�һ��רְ�ķ�������Ϊ�������ṩ�� MX ��������
 	  ���磬�������˾��������
@@ -865,7 +855,7 @@ purgestat	/usr/local/supermailer/bin/purgestat-compat</programlisting>
 	  ���᳢��ͨ�� modem ���ӵ��� (<hostid role="domainname">example.com</hostid>)��
 	  ��Ϊ���������ߣ��������ǻ�õ�һ����ʱ�Ĵ���
 	  <application>sendmail</application> ������ʼ����͵���
-	  MX ������Ҳ����˵�����Ļ����������ṩ��
+	  MX<indexterm><primary>MX record</primary></indexterm> ������Ҳ����˵�����Ļ����������ṩ��
 	  (<hostid role="domainname">example.net</hostid>)����
 	  MX �����������Եij������Ӳ������ʼ�����������
 	  (<hostid role="domainname">example.com</hostid>)��</para>
diff --git a/zh_TW.Big5/books/handbook/cutting-edge/chapter.xml b/zh_TW.Big5/books/handbook/cutting-edge/chapter.xml
index 11534ff2c8..2ec3fa594b 100644
--- a/zh_TW.Big5/books/handbook/cutting-edge/chapter.xml
+++ b/zh_TW.Big5/books/handbook/cutting-edge/chapter.xml
@@ -1282,9 +1282,7 @@ Script done, &hellip;</screen>
 
 	<qandaentry>
 	  <question>
-	    <indexterm><primary>signal 11</primary></indexterm>
-
-	    <para>My compile failed with lots of signal 11 (or other signal
+	    <para>My compile failed with lots of signal 11<indexterm><primary>signal 11</primary></indexterm> (or other signal
 	      number) errors.  What has happened?</para>
 	  </question>
 
diff --git a/zh_TW.Big5/books/handbook/mail/chapter.xml b/zh_TW.Big5/books/handbook/mail/chapter.xml
index 5fba76a507..3b1c0020bb 100644
--- a/zh_TW.Big5/books/handbook/mail/chapter.xml
+++ b/zh_TW.Big5/books/handbook/mail/chapter.xml
@@ -923,8 +923,7 @@ purgestat	/usr/local/supermailer/bin/purgestat-compat</programlisting>
 	  role="fqdn">mumble.bar.edu</hostid>, instead of just
 	  <hostid>mumble</hostid>.</para>
 
-	<indexterm><primary>BIND</primary></indexterm>
-	<para>Traditionally, this was allowed by BSD BIND resolvers.
+	<para>Traditionally, this was allowed by BSD BIND<indexterm><primary>BIND</primary></indexterm> resolvers.
 	  However the current version of <application>BIND</application>
 	  that ships with FreeBSD no longer provides default abbreviations
 	  for non-fully qualified domain names other than the domain you
@@ -957,9 +956,6 @@ purgestat	/usr/local/supermailer/bin/purgestat-compat</programlisting>
 
       <qandaentry>
 	<question>
-	  <indexterm>
-	    <primary>MX record</primary>
-	  </indexterm>
 
 	<para><application>sendmail</application> says <errorname>mail
 	  loops back to myself</errorname></para>
@@ -978,7 +974,7 @@ How can I solve this problem?
 
 You have asked mail to the domain (e.g., domain.net) to be
 forwarded to a specific host (in this case, relay.domain.net)
-by using an MX record, but the relay machine does not recognize
+by using an MX<indexterm><primary>MX record</primary></indexterm> record, but the relay machine does not recognize
 itself as domain.net. Add domain.net to /etc/mail/local-host-names
 [known as /etc/sendmail.cw prior to version 8.10]
 (if you are using FEATURE(use_cw_file)) or add <quote>Cw domain.net</quote>
@@ -993,9 +989,7 @@ to /etc/mail/sendmail.cf.</programlisting>
 
       <qandaentry>
         <question>
-	  <indexterm><primary>PPP</primary></indexterm>
-
-	<para>How can I run a mail server on a dial-up PPP host?</para>
+	<para>How can I run a mail server on a dial-up PPP<indexterm><primary>PPP</primary></indexterm> host?</para>
 	</question>
 
 	<answer>
@@ -1003,15 +997,10 @@ to /etc/mail/sendmail.cf.</programlisting>
 	  Internet.  The FreeBSD box will be a mail gateway for the LAN.
 	  The PPP connection is non-dedicated.</para>
 
-	<indexterm><primary>UUCP</primary></indexterm>
-	<indexterm>
-	  <primary>MX record</primary>
-	</indexterm>
-
 	<para>There are at least two ways to do this.  One way is to use
-	  UUCP.</para>
+	  UUCP<indexterm><primary>UUCP</primary></indexterm>.</para>
 
-	<para>Another way is to get a full-time Internet server to provide secondary MX
+	<para>Another way is to get a full-time Internet server to provide secondary MX<indexterm><primary>MX record</primary></indexterm>
 	  services for your domain.  For example, if your company's domain is
 	  <hostid role="domainname">example.com</hostid> and your Internet service provider has
 	  set <hostid role="domainname">example.net</hostid> up to provide secondary MX services