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

3 files changed, 8 insertions, 24 deletions

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