- Enable indexes by default; now they are not so difficult to generate

10 files changed, 8 insertions, 15 deletions

diff --git a/de_DE.ISO8859-1/articles/Makefile.inc b/de_DE.ISO8859-1/articles/Makefile.inc
index cf192d078c..06e8d21cb6 100644
--- a/de_DE.ISO8859-1/articles/Makefile.inc
+++ b/de_DE.ISO8859-1/articles/Makefile.inc
@@ -8,4 +8,3 @@
 #
 
 DESTDIR?=	${DOCDIR}/de_DE.ISO8859-1/articles/${.CURDIR:T}
-COLLATEINDEX+=-s Symbole
diff --git a/de_DE.ISO8859-1/articles/contributing-ports/article.xml b/de_DE.ISO8859-1/articles/contributing-ports/article.xml
index 585df8c56a..4882931849 100644
--- a/de_DE.ISO8859-1/articles/contributing-ports/article.xml
+++ b/de_DE.ISO8859-1/articles/contributing-ports/article.xml
@@ -931,4 +931,6 @@
       Die Mailinglisten &a.ports-bugs; und &a.cvs-ports; könnten
       für Sie ebenfalls von Interesse sein.</para>
   </sect1>
+
+  <index/>
 </article>
diff --git a/de_DE.ISO8859-1/articles/contributing/article.xml b/de_DE.ISO8859-1/articles/contributing/article.xml
index 6993c696dd..3e21b6b8eb 100644
--- a/de_DE.ISO8859-1/articles/contributing/article.xml
+++ b/de_DE.ISO8859-1/articles/contributing/article.xml
@@ -619,4 +619,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       </sect3>
     </sect2>
   </sect1>
+
+  <index/>
 </article>
diff --git a/de_DE.ISO8859-1/articles/nanobsd/article.xml b/de_DE.ISO8859-1/articles/nanobsd/article.xml
index 875d6c7214..02c0d32a81 100644
--- a/de_DE.ISO8859-1/articles/nanobsd/article.xml
+++ b/de_DE.ISO8859-1/articles/nanobsd/article.xml
@@ -545,4 +545,6 @@ get _.disk.image "| sh updatep1"</userinput></screen>
       </sect3>
     </sect2>
   </sect1>
+
+  <index/>
 </article>
diff --git a/de_DE.ISO8859-1/books/Makefile.inc b/de_DE.ISO8859-1/books/Makefile.inc
index f6f6151093..1238ecb6b5 100644
--- a/de_DE.ISO8859-1/books/Makefile.inc
+++ b/de_DE.ISO8859-1/books/Makefile.inc
@@ -8,4 +8,3 @@
 #
 
 DESTDIR?=	${DOCDIR}/de_DE.ISO8859-1/books/${.CURDIR:T}
-COLLATEINDEX+=-s Symbole
diff --git a/de_DE.ISO8859-1/books/developers-handbook/Makefile b/de_DE.ISO8859-1/books/developers-handbook/Makefile
index 375e408711..dd85528e0f 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/Makefile
+++ b/de_DE.ISO8859-1/books/developers-handbook/Makefile
@@ -14,8 +14,6 @@ DOC?= book
 
 FORMATS?= html-split
 
-HAS_INDEX= true
-
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
diff --git a/de_DE.ISO8859-1/books/developers-handbook/chapters.ent b/de_DE.ISO8859-1/books/developers-handbook/chapters.ent
index 7b1ed4db4c..d38cfa1154 100644
--- a/de_DE.ISO8859-1/books/developers-handbook/chapters.ent
+++ b/de_DE.ISO8859-1/books/developers-handbook/chapters.ent
@@ -15,8 +15,6 @@
      basiert auf: 1.23
 -->
 
-<!ENTITY % chap.index "IGNORE">
-
 <!-- Part one -->
 <!ENTITY chap.introduction		SYSTEM "introduction/chapter.xml">
 <!ENTITY chap.tools			SYSTEM "tools/chapter.xml">
@@ -37,7 +35,4 @@
 <!ENTITY chap.x86			SYSTEM "x86/chapter.xml">
 
 <!-- Part six - Appendices -->
-<![%chap.index;[
-  <!ENTITY chap.index SYSTEM "index.xml">
-]]>
-<!ENTITY chap.index "">
+<!ENTITY chap.index "<index/>">
diff --git a/de_DE.ISO8859-1/books/fdp-primer/book.xml b/de_DE.ISO8859-1/books/fdp-primer/book.xml
index 4dd715903b..31eb5fee81 100644
--- a/de_DE.ISO8859-1/books/fdp-primer/book.xml
+++ b/de_DE.ISO8859-1/books/fdp-primer/book.xml
@@ -267,7 +267,5 @@
 
   &app.examples;
 
-<!--
   &index;
--->
 </book>
diff --git a/de_DE.ISO8859-1/books/handbook/Makefile b/de_DE.ISO8859-1/books/handbook/Makefile
index d3775164db..1f46588470 100644
--- a/de_DE.ISO8859-1/books/handbook/Makefile
+++ b/de_DE.ISO8859-1/books/handbook/Makefile
@@ -22,8 +22,6 @@ DOC?= book
 
 FORMATS?= html-split
 
-HAS_INDEX= true
-
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=
 
diff --git a/de_DE.ISO8859-1/books/handbook/chapters.ent b/de_DE.ISO8859-1/books/handbook/chapters.ent
index a933a8d86e..ba4f855d3f 100644
--- a/de_DE.ISO8859-1/books/handbook/chapters.ent
+++ b/de_DE.ISO8859-1/books/handbook/chapters.ent
@@ -67,7 +67,7 @@
   <!ENTITY chap.eresources.www.inc	SYSTEM "eresources.xml.www.inc">
   <!ENTITY chap.pgpkeys		SYSTEM "pgpkeys/chapter.xml">
   <!ENTITY chap.freebsd-glossary	SYSTEM "../../share/xml/glossary.ent">
-  <!ENTITY chap.index		"">
+  <!ENTITY chap.index		"<index/>">
 
 <!ENTITY chap.mirrors.lastmod.inc	SYSTEM "mirrors.lastmod.inc">
 <!ENTITY chap.mirrors.ftp.index.inc	SYSTEM "mirrors.xml.ftp.index.inc">