- Indexterms should not be embedded directly into a question or answer

element but into a deeper paragraph, optimally right after the
  referenced word without spaces even [1] but somehow the schema allows
  badly nested indexterms.  Correct such entires in the whole documentation
  set.
- Add constraints to check for invalid indexterm entries.

See also: http://www.sagehill.net/docbookxsl/GenerateIndex.html#Indexterms [1]

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>
 

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>
 

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

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>Αυτό συνήθως δείχνει προβλήματα υλικού.  Η διαδικασία
 	      μεταγλώττισης του βασικού συστήματος είναι ένας αποτελεσματικός
 	      τρόπος να δοκιμάσετε το υλικό σας στα όρια του, και συχνά θα

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>
 

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<indexterm><primary>BIND</primary></indexterm>.
-	  <para>ÐáñáäïóéáêÜ, áõôü åðéôñåðüôáí áðü ôïõò DNS resolvers ôïõ BIND.
 	    Ωστόσο, η τρέχουσα έκδοση του <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>

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

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

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

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

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

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>
 

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

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>
 

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>
 

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>.

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
+            <para>Posso avviare dalla console ARC<indexterm><primary>ARC</primary></indexterm> o da quella del BIOS
-              Alpha?</para>
+              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>
 

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<indexterm><primary>BIND</primary></indexterm> di
-
-          <para>Tradizionalmente, questo era permesso dai resolver BIND 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

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>これは通常、ハードウェアに問題があることを示しています。
               システムの再構築は、ハードウェアに対する負荷耐久試験を行なうための
               有効な手段の一つで、メモリに関係する問題がよく報告されます。

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;

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<indexterm><primary>BIND</primary></indexterm> のリゾルバー (resolver) ではこのようなことが可能でしたが、
-	  <para>そもそも、BSD BIND のリゾルバー (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<indexterm><primary>PPP</primary></indexterm> ホストでメールサーバを実行するにはどうしたらいいの?</para>
-
-	  <para>ダイアルアップ PPP ホストでメールサーバを実行するにはどうしたらいいの?</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 サービスを提供する常時稼働のインターネットサーバを用意することです。

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<indexterm><primary>дохио 11</primary></indexterm> (эсвэл бусад дохионы дугаар)
-
-	    <para>Миний эмхэтгэл маш олон дохио 11 (эсвэл бусад дохионы дугаар)
 		алдаагаар амжилтгүй болсон. Юу болсон юм бол?</para>
 	  </question>
 

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>

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<indexterm><primary>BIND</primary></indexterm> тайлагчийн хувьд дээрх шиг хэрэглэж болдог байсан.
-	<para>Урьд нь, BSD BIND тайлагчийн хувьд дээрх шиг хэрэглэж болдог байсан.
 Гэвч FreeBSD-тэй хамт ирдэг <application>BIND</application>-н одоогийн хувилбар дээр
 өөрийн оршин байгаа домэйноос бусад бүрэн баталгаажаагүй домэйн нэрийн хувьд
 анхдагч товчилсон нэрүүдийг хэрэглэж болохгүй болсон. Тиймээс баталгаажаагүй
@@ -890,15 +889,10 @@ to /etc/mail/sendmail.cf.</programlisting>
 Энэ FreeBSD машин тухайн LAN-ий хувьд захидлын гарц байх болно. PPP холболт бол тусгайлан
 бий болгосон зориулагдсан холболт биш юм.</para>
 
-	<indexterm><primary>UUCP</primary></indexterm>
+	<para>Үүний тулд хоёр арга байна. Нэг арга нь UUCP<indexterm><primary>UUCP</primary></indexterm> ашиглах юм.</para>
-	<indexterm>
-	  <primary>MX бичлэг</primary>
-	</indexterm>
-
-	<para>Үүний тулд хоёр арга байна. Нэг арга нь UUCP ашиглах юм.</para>
 
 	<para>Нөгөө арга нь таны домэйны хувьд хоёрдогч
-MX үйлчилгээг үзүүлэх байнгын холболттой Интернэт сервертэй болох явдал юм.
+MX<indexterm><primary>MX бичлэг</primary></indexterm> үйлчилгээг үзүүлэх байнгын холболттой Интернэт сервертэй болох явдал юм.
 Жишээлбэл, хэрэв танай байгууллагын
 домэйн нэр <hostid role="domainname">example.com</hostid> бөгөөд танай Интернэтийн үйлчилгээ
 үзүүлэгч танай домэйны хувьд хоёрдогч MX үйлчилгээг үзүүлэхээр

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>
 

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>
 

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<indexterm><primary>BIND</primary></indexterm> resolvers toegestaan.  De
-
-	  <para>Traditioneel werd dit door BSD BIND 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

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<indexterm><primary>signal 11</primary></indexterm> (or other signal
-
-	    <para>My compile failed with lots of signal 11 (or other signal
 	      number) errors.  What has happened?</para>
 	  </question>
 

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>
+            <para>Czy mogê ³adowaæ system z konsoli ARC<indexterm><primary>ARC</primary></indexterm> lub Alpha BIOS<indexterm><primary>Alpha BIOS</primary></indexterm>?</para>
-	    <indexterm><primary>Alpha BIOS</primary></indexterm>
-	    <indexterm><primary>SRM</primary></indexterm>
-
-            <para>Czy mogê ³adowaæ system z konsoli ARC lub Alpha BIOS?</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>
 

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<indexterm><primary>BIND</primary></indexterm> resolvers.
-	<para>Traditionally, this was allowed by BSD BIND 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

ru_RU.KOI8-R/books/handbook/cutting-edge/chapter.xml

@@ -2006,13 +2006,11 @@ Script done, …
 	<qandaentry>
 	  <question>
 	    <para>Компиляция прерывается с большим количеством ошибок по
-	      ÓÉÇÎÁÌÕ 11 (ÉÌÉ Ó ÄÒÕÇÉÍ ÎÏÍÅÒÏÍ ÓÉÇÎÁÌÁ).  þÔÏ
+	      ÓÉÇÎÁÌÕ 11<indexterm><primary>ÓÉÇÎÁÌ 11</primary></indexterm> (ÉÌÉ Ó ÄÒÕÇÉÍ ÎÏÍÅÒÏÍ ÓÉÇÎÁÌÁ).  þÔÏ
 	      случилось?</para>
 	  </question>
 
 	  <answer>
-	    <indexterm><primary>ÓÉÇÎÁÌ 11</primary></indexterm>
-
 	    <para>Как правило, это говорит о проблемах с оборудованием.
 	      (Пере)построение системы является эффективным стресс-тестом для
 	      вашего оборудования и частенько выявляет проблемы с памятью.

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>
 

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>
+	  <para>Традиционно, программа разрешения имен BSD BIND<indexterm><primary>BIND</primary></indexterm> позволяла это
-	    <primary>BIND</primary>
-	  </indexterm>
-
-	  <para>Традиционно, программа разрешения имен BSD BIND позволяла это
 	    делать.  Однако, текущая версия <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>

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
 -->

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<indexterm><primary>信号 11</primary></indexterm>
-
-	    <para>我的编译失败，并伴随有许多 11
 	      (或其它的数字信息) 号错误。是怎么回事呀？</para>
 	  </question>
 

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>
               的时候， 黄色的字体相对于浅灰色的背景变得难以阅读。
-              有没有什么能让这个应用程序提供高对比度的方法？</para>
+              有没有什么能让这个应用程序提供高对比度的方法？<indexterm><primary>color</primary><secondary>contrast</secondary></indexterm></para>
 	  </question>
 	  <answer>
             <para>如果你已经安装了 X11 并且 <application>sysinstall</application>

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<indexterm><primary>BIND</primary></indexterm> resolvers 中是可行的。
-	<para>传统上，这在 BSD BIND 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>
+	<para>最少有两种方法可以满足您的要求。一种方法就是使用 UUCP<indexterm><primary>UUCP</primary></indexterm>。</para>
-	<indexterm>
-	  <primary>MX record</primary>
-	</indexterm>
-
-	<para>最少有两种方法可以满足您的要求。一种方法就是使用 UUCP。</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 主机将周期性的尝试连接并发送邮件到您的主机
 	  (<hostid role="domainname">example.com</hostid>)。</para>

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<indexterm><primary>signal 11</primary></indexterm> (or other signal
-
-	    <para>My compile failed with lots of signal 11 (or other signal
 	      number) errors.  What has happened?</para>
 	  </question>
 

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<indexterm><primary>BIND</primary></indexterm> resolvers.
-	<para>Traditionally, this was allowed by BSD BIND 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<indexterm><primary>PPP</primary></indexterm> host?</para>
-
-	<para>How can I run a mail server on a dial-up PPP 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