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

svn path=/projects/db5/; revision=42423
2013-07-24 19:38:10 +00:00 · 2013-07-24 19:38:10 +00:00 · 4a47cdca9b · 2020-12-08 03:00:23 +00:00
commit 4a47cdca9b
parent 988c5ce88c
92 changed files with 102 additions and 104 deletions
--- 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
--- 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>
--- 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>
--- 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>
--- 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
--- 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?=

--- 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/>">
--- 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>
--- 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?=

--- 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">
--- a/el_GR.ISO8859-7/articles/contributing/article.xml
+++ b/el_GR.ISO8859-7/articles/contributing/article.xml
@ -616,4 +616,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    </sect2>
  </sect1>

+  <index/>
+
 </article>
--- a/el_GR.ISO8859-7/articles/nanobsd/article.xml
+++ b/el_GR.ISO8859-7/articles/nanobsd/article.xml
@ -573,4 +573,6 @@ get _.disk.image "| sh updatep1"</userinput></screen>
      </sect3>
    </sect2>
  </sect1>
+
+  <index/>
 </article>
--- a/el_GR.ISO8859-7/articles/problem-reports/article.xml
+++ b/el_GR.ISO8859-7/articles/problem-reports/article.xml
@ -1052,4 +1052,6 @@
      </listitem>
    </itemizedlist>
  </section>
+
+  <index/>
 </article>
--- a/el_GR.ISO8859-7/books/handbook/Makefile
+++ b/el_GR.ISO8859-7/books/handbook/Makefile
@ -43,8 +43,6 @@ DOC?=		book

 FORMATS?=	html-split

-HAS_INDEX=	true
-
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=

--- a/el_GR.ISO8859-7/books/handbook/chapters.ent
+++ b/el_GR.ISO8859-7/books/handbook/chapters.ent
@ -73,6 +73,6 @@
  <!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.colophon	SYSTEM "colophon.xml">
--- a/en_US.ISO8859-1/articles/console-server/article.xml
+++ b/en_US.ISO8859-1/articles/console-server/article.xml
@ -1473,4 +1473,6 @@ exit 0</programlisting>
    </itemizedlist>
  </sect1>

+  <index/>
+
 </article>
--- a/en_US.ISO8859-1/articles/contributing-ports/article.xml
+++ b/en_US.ISO8859-1/articles/contributing-ports/article.xml
@ -827,4 +827,6 @@
      archives of the &a.ports-bugs; and the &a.cvs-ports; may also be
      of interest.</para>
  </sect1>
+
+  <index/>
 </article>
--- a/en_US.ISO8859-1/articles/contributing/article.xml
+++ b/en_US.ISO8859-1/articles/contributing/article.xml
@ -547,4 +547,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      </sect3>
    </sect2>
  </sect1>
+
+  <index/>
 </article>
--- a/en_US.ISO8859-1/articles/contributors/article.xml
+++ b/en_US.ISO8859-1/articles/contributors/article.xml
@ -421,4 +421,6 @@

    &contrib.386bsd;
  </sect1>
+
+  <index/>
 </article>
--- a/en_US.ISO8859-1/articles/cups/article.xml
+++ b/en_US.ISO8859-1/articles/cups/article.xml
@ -388,4 +388,6 @@ WITHOUT_LPR=YES</programlisting>
      <application>LPR</application> support from being added to ports
      where applicable.</para>
  </sect1>
+
+  <index/>
 </article>
--- a/en_US.ISO8859-1/articles/nanobsd/article.xml
+++ b/en_US.ISO8859-1/articles/nanobsd/article.xml
@ -504,4 +504,6 @@ get _.disk.image "| sh updatep1"</userinput></screen>
      </sect3>
    </sect2>
  </sect1>
+
+  <index/>
 </article>
--- a/en_US.ISO8859-1/articles/problem-reports/article.xml
+++ b/en_US.ISO8859-1/articles/problem-reports/article.xml
@ -1272,4 +1272,6 @@
      </listitem>
    </itemizedlist>
  </section>
+
+  <index/>
 </article>
--- a/en_US.ISO8859-1/books/arch-handbook/Makefile
+++ b/en_US.ISO8859-1/books/arch-handbook/Makefile
@ -10,8 +10,6 @@ DOC?= book

 FORMATS?= html-split

-HAS_INDEX= true
-
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=

--- a/en_US.ISO8859-1/books/arch-handbook/chapters.ent
+++ b/en_US.ISO8859-1/books/arch-handbook/chapters.ent
@ -10,8 +10,6 @@
     $FreeBSD$
 -->

-<!ENTITY % chap.index "IGNORE">
-
 <!-- Part one - Kernel -->
 <!ENTITY chap.boot			SYSTEM "boot/chapter.xml">
 <!ENTITY chap.kobj			SYSTEM "kobj/chapter.xml">
@ -33,7 +31,4 @@
 <!ENTITY chap.pccard			SYSTEM "pccard/chapter.xml">

 <!-- Part three - Appendices -->
-<![%chap.index;[
-  <!ENTITY chap.index			SYSTEM "index.xml">
-]]>
-<!ENTITY chap.index			"">
+<!ENTITY chap.index			"<index/>">
--- a/en_US.ISO8859-1/books/developers-handbook/Makefile
+++ b/en_US.ISO8859-1/books/developers-handbook/Makefile
@ -10,8 +10,6 @@ DOC?= book

 FORMATS?= html-split

-HAS_INDEX= true
-
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=

--- a/en_US.ISO8859-1/books/developers-handbook/chapters.ent
+++ b/en_US.ISO8859-1/books/developers-handbook/chapters.ent
@ -10,8 +10,6 @@
     $FreeBSD$
 -->

-<!ENTITY % chap.index "IGNORE">
-
 <!-- Part one -->
 <!ENTITY chap.introduction		SYSTEM "introduction/chapter.xml">
 <!ENTITY chap.tools			SYSTEM "tools/chapter.xml">
@ -32,7 +30,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/>">
--- a/en_US.ISO8859-1/books/fdp-primer/book.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/book.xml
@ -265,7 +265,5 @@ The time is 09:18</screen></entry>

  &app.examples;

-<!--
  &index;
-->
 </book>
--- a/en_US.ISO8859-1/books/handbook/Makefile
+++ b/en_US.ISO8859-1/books/handbook/Makefile
@ -39,8 +39,6 @@ DOC?= book

 FORMATS?= html-split

-HAS_INDEX= true
-
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=

--- a/en_US.ISO8859-1/books/handbook/chapters.ent
+++ b/en_US.ISO8859-1/books/handbook/chapters.ent
@ -65,6 +65,6 @@
  <!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		SYSTEM "index.xml">
+  <!ENTITY chap.index		"<index/>">

 <!ENTITY chap.colophon	SYSTEM "colophon.xml">
--- a/es_ES.ISO8859-1/articles/contributing/article.xml
+++ b/es_ES.ISO8859-1/articles/contributing/article.xml
@ -610,4 +610,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    </sect2>
  </sect1>

+  <index/>
+
 </article>
--- a/es_ES.ISO8859-1/articles/nanobsd/article.xml
+++ b/es_ES.ISO8859-1/articles/nanobsd/article.xml
@ -560,4 +560,6 @@ get _.disk.image "| sh updatep1"</userinput></screen>
      </sect3>
    </sect2>
  </sect1>
+
+  <index/>
 </article>
--- a/es_ES.ISO8859-1/articles/problem-reports/article.xml
+++ b/es_ES.ISO8859-1/articles/problem-reports/article.xml
@ -1012,4 +1012,6 @@ XXX
      </listitem>
    </itemizedlist>
  </section>
+
+  <index/>
 </article>
--- a/es_ES.ISO8859-1/books/handbook/Makefile
+++ b/es_ES.ISO8859-1/books/handbook/Makefile
@ -36,8 +36,6 @@ DOC?= book

 FORMATS?= html-split

-HAS_INDEX= true
-
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=

--- a/es_ES.ISO8859-1/books/handbook/chapters.ent
+++ b/es_ES.ISO8859-1/books/handbook/chapters.ent
@ -74,6 +74,6 @@
  <!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.colophon	SYSTEM "colophon.xml">
--- a/fr_FR.ISO8859-1/articles/contributing-ports/article.xml
+++ b/fr_FR.ISO8859-1/articles/contributing-ports/article.xml
@ -1044,4 +1044,6 @@
      les archives de la &a.ports-bugs; et de la &a.cvs-ports; peut
      aussi présenter de l'intérêt.</para>
  </sect1>
+
+  <index/>
 </article>
--- a/fr_FR.ISO8859-1/articles/contributing/article.xml
+++ b/fr_FR.ISO8859-1/articles/contributing/article.xml
@ -628,4 +628,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    </sect2>
  </sect1>

+  <index/>
+
 </article>
--- a/fr_FR.ISO8859-1/articles/contributors/article.xml
+++ b/fr_FR.ISO8859-1/articles/contributors/article.xml
@ -7838,4 +7838,6 @@
      </listitem>
    </itemizedlist>
  </sect1>
+
+  <index/>
 </article>
--- a/fr_FR.ISO8859-1/articles/nanobsd/article.xml
+++ b/fr_FR.ISO8859-1/articles/nanobsd/article.xml
@ -569,4 +569,6 @@ get _.disk.image "| sh updatep1"</userinput></screen>
      </sect3>
    </sect2>
  </sect1>
+
+  <index/>
 </article>
--- a/fr_FR.ISO8859-1/articles/problem-reports/article.xml
+++ b/fr_FR.ISO8859-1/articles/problem-reports/article.xml
@ -582,4 +582,6 @@
      </listitem>
    </itemizedlist>
  </sect1>
+
+  <index/>
 </article>
--- a/fr_FR.ISO8859-1/books/handbook/Makefile
+++ b/fr_FR.ISO8859-1/books/handbook/Makefile
@ -33,8 +33,6 @@ DOC?= book

 FORMATS?= html-split

-HAS_INDEX= true
-
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=

--- a/fr_FR.ISO8859-1/books/handbook/chapters.ent
+++ b/fr_FR.ISO8859-1/books/handbook/chapters.ent
@ -68,6 +68,6 @@
  <!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.colophon	SYSTEM "colophon.xml">
--- a/hu_HU.ISO8859-2/articles/cups/article.xml
+++ b/hu_HU.ISO8859-2/articles/cups/article.xml
@ -524,4 +524,6 @@ WITHOUT_LPR=YES</programlisting>
 	használatának mellőzésére
 	utasítja az érintett portokat.</para>
  </sect1>
+
+  <index/>
 </article>
--- a/hu_HU.ISO8859-2/books/fdp-primer/book.xml
+++ b/hu_HU.ISO8859-2/books/fdp-primer/book.xml
@ -304,7 +304,5 @@ Password:</screen></entry>

  &app.examples;

-<!--
  &index;
-->
 </book>
--- a/hu_HU.ISO8859-2/books/handbook/Makefile
+++ b/hu_HU.ISO8859-2/books/handbook/Makefile
@ -44,8 +44,6 @@ DOC?= book

 FORMATS?= html-split

-HAS_INDEX= true
-
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=

--- a/hu_HU.ISO8859-2/books/handbook/chapters.ent
+++ b/hu_HU.ISO8859-2/books/handbook/chapters.ent
@ -70,6 +70,6 @@
  <!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.colophon	SYSTEM "colophon.xml">
--- a/it_IT.ISO8859-15/books/handbook/Makefile
+++ b/it_IT.ISO8859-15/books/handbook/Makefile
@ -34,8 +34,6 @@ DOC?= book

 FORMATS?= html-split

-HAS_INDEX= true
-
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=

--- a/it_IT.ISO8859-15/books/handbook/chapters.ent
+++ b/it_IT.ISO8859-15/books/handbook/chapters.ent
@ -68,6 +68,6 @@
  <!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.colophon	SYSTEM "colophon.xml">
--- a/ja_JP.eucJP/articles/contributing/article.xml
+++ b/ja_JP.eucJP/articles/contributing/article.xml
@ -594,4 +594,6 @@ Copyright (C) [ǯ]
    </sect2>
  </sect1>

+  <index/>
+
 </article>
--- a/ja_JP.eucJP/articles/contributors/article.xml
+++ b/ja_JP.eucJP/articles/contributors/article.xml
@ -428,4 +428,6 @@

    &contrib.386bsd;
  </sect1>
+
+  <index/>
 </article>
--- a/ja_JP.eucJP/articles/problem-reports/article.xml
+++ b/ja_JP.eucJP/articles/problem-reports/article.xml
@ -1325,4 +1325,6 @@
      </listitem>
    </itemizedlist>
  </section>
+
+  <index/>
 </article>
--- a/ja_JP.eucJP/books/fdp-primer/book.xml
+++ b/ja_JP.eucJP/books/fdp-primer/book.xml
@ -275,7 +275,5 @@ Password:</screen></entry>

  &app.examples;

-<!--
  &index;
-->
 </book>
--- a/ja_JP.eucJP/books/handbook/Makefile
+++ b/ja_JP.eucJP/books/handbook/Makefile
@ -41,8 +41,6 @@ DOC?= book

 FORMATS?= html-split

-HAS_INDEX= true
-
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=

--- a/ja_JP.eucJP/books/handbook/chapters.ent
+++ b/ja_JP.eucJP/books/handbook/chapters.ent
@ -69,6 +69,6 @@
  <!ENTITY chap.eresources.www.inc      SYSTEM "eresources.xml.www.inc">
  <!ENTITY chap.pgpkeys		SYSTEM "pgpkeys/chapter.xml">
  <!ENTITY chap.freebsd-glossary	SYSTEM "../../../en_US.ISO8859-1/share/xml/glossary.ent">
-  <!ENTITY chap.index		"">
+  <!ENTITY chap.index		"<index/>">

 <!ENTITY chap.colophon	SYSTEM "colophon.xml">
--- a/mn_MN.UTF-8/books/handbook/Makefile
+++ b/mn_MN.UTF-8/books/handbook/Makefile
@ -42,8 +42,6 @@ DOC?= book

 FORMATS?= html-split

-HAS_INDEX= true
-
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=

--- a/mn_MN.UTF-8/books/handbook/chapters.ent
+++ b/mn_MN.UTF-8/books/handbook/chapters.ent
@ -72,6 +72,6 @@
  <!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.colophon	SYSTEM "colophon.xml">
--- a/nl_NL.ISO8859-1/articles/contributing-ports/article.xml
+++ b/nl_NL.ISO8859-1/articles/contributing-ports/article.xml
@ -870,4 +870,6 @@
      Het lezen van de archieven van de &a.ports-bugs; en de
      &a.cvs-ports; kan ook interessant zijn.</para>
  </sect1>
+
+  <index/>
 </article>
--- a/nl_NL.ISO8859-1/articles/contributing/article.xml
+++ b/nl_NL.ISO8859-1/articles/contributing/article.xml
@ -559,4 +559,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      </sect3>
    </sect2>
  </sect1>
+
+  <index/>
 </article>
--- a/nl_NL.ISO8859-1/articles/problem-reports/article.xml
+++ b/nl_NL.ISO8859-1/articles/problem-reports/article.xml
@ -1358,4 +1358,6 @@
      </listitem>
    </itemizedlist>
  </section>
+
+  <index/>
 </article>
--- a/nl_NL.ISO8859-1/books/handbook/Makefile
+++ b/nl_NL.ISO8859-1/books/handbook/Makefile
@ -42,8 +42,6 @@ DOC?= book

 FORMATS?= html-split

-HAS_INDEX= true
-
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=

--- a/nl_NL.ISO8859-1/books/handbook/chapters.ent
+++ b/nl_NL.ISO8859-1/books/handbook/chapters.ent
@ -69,6 +69,6 @@
  <!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.colophon	SYSTEM "colophon.xml">
--- a/pl_PL.ISO8859-2/books/handbook/Makefile
+++ b/pl_PL.ISO8859-2/books/handbook/Makefile
@ -34,8 +34,6 @@ DOC?= book

 FORMATS?= html-split

-HAS_INDEX= true
-
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=

--- a/pl_PL.ISO8859-2/books/handbook/chapters.ent
+++ b/pl_PL.ISO8859-2/books/handbook/chapters.ent
@ -65,6 +65,6 @@
  <!ENTITY chap.eresources.www.inc	SYSTEM "eresources.xml.www.inc">
  <!ENTITY chap.pgpkeys		SYSTEM "pgpkeys/chapter.xml">
  <!ENTITY chap.freebsd-glossary	SYSTEM "../../../en_US.ISO8859-1/share/xml/glossary.ent">
-  <!ENTITY chap.index		"">
+  <!ENTITY chap.index		"<index/>">

 <!ENTITY chap.colophon	SYSTEM "colophon.xml">
--- a/pt_BR.ISO8859-1/articles/contributing-ports/article.xml
+++ b/pt_BR.ISO8859-1/articles/contributing-ports/article.xml
@ -1073,4 +1073,6 @@
      lista</ulink>.  A leitura do histórico da &a.ports-bugs;
      e da &a.cvs-ports; também pode ser interessante.</para>
  </sect1>
+
+  <index/>
 </article>
--- a/pt_BR.ISO8859-1/articles/contributing/article.xml
+++ b/pt_BR.ISO8859-1/articles/contributing/article.xml
@ -685,4 +685,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	</sect3>
    </sect2>
  </sect1>
+
+  <index/>
 </article>
--- a/pt_BR.ISO8859-1/articles/problem-reports/article.xml
+++ b/pt_BR.ISO8859-1/articles/problem-reports/article.xml
@ -1646,4 +1646,6 @@
      </listitem>
    </itemizedlist>
  </section>
+
+  <index/>
 </article>
--- a/pt_BR.ISO8859-1/books/fdp-primer/book.xml
+++ b/pt_BR.ISO8859-1/books/fdp-primer/book.xml
@ -283,9 +283,7 @@ Password:</screen></entry>

  &app.examples;

-<!--
  &index;
-->
 </book>

 <!--
--- a/pt_BR.ISO8859-1/books/handbook/Makefile
+++ b/pt_BR.ISO8859-1/books/handbook/Makefile
@ -35,8 +35,6 @@ DOC?= book

 FORMATS?= html-split

-HAS_INDEX= true
-
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=

--- a/pt_BR.ISO8859-1/books/handbook/chapters.ent
+++ b/pt_BR.ISO8859-1/books/handbook/chapters.ent
@ -64,6 +64,6 @@
  <!ENTITY chap.eresources.www.inc	SYSTEM "eresources.xml.www.inc">
  <!ENTITY chap.pgpkeys		SYSTEM "pgpkeys/chapter.xml">
  <!ENTITY chap.freebsd-glossary	SYSTEM "../../../en_US.ISO8859-1/share/xml/glossary.ent">
-  <!ENTITY chap.index		"">
+  <!ENTITY chap.index		"<index/>">

 <!ENTITY chap.colophon	SYSTEM "colophon.xml">
--- a/ru_RU.KOI8-R/articles/console-server/article.xml
+++ b/ru_RU.KOI8-R/articles/console-server/article.xml
@ -1553,4 +1553,6 @@ exit 0</programlisting>
      </listitem>
    </itemizedlist>
  </sect1>
+
+  <index/>
 </article>
--- a/ru_RU.KOI8-R/articles/contributing/article.xml
+++ b/ru_RU.KOI8-R/articles/contributing/article.xml
@ -546,4 +546,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
      </sect3>
    </sect2>
  </sect1>
+
+  <index/>
 </article>
--- a/ru_RU.KOI8-R/articles/cups/article.xml
+++ b/ru_RU.KOI8-R/articles/cups/article.xml
@ -396,4 +396,6 @@ WITHOUT_LPR=YES</programlisting>
      <application>LPR</application> × ÐÏÒÔÁÈ, ÐÏÔÅÎÃÉÁÌØÎÏ ÅÅ
      ÉÓÐÏÌØÚÕÀÝÉÈ.</para>
  </sect1>
+
+  <index/>
 </article>
--- a/ru_RU.KOI8-R/articles/problem-reports/article.xml
+++ b/ru_RU.KOI8-R/articles/problem-reports/article.xml
@ -1265,4 +1265,6 @@
      </listitem>
    </itemizedlist>
  </section>
+
+  <index/>
 </article>
--- a/ru_RU.KOI8-R/books/developers-handbook/Makefile
+++ b/ru_RU.KOI8-R/books/developers-handbook/Makefile
@ -15,8 +15,6 @@ DOC?= book

 FORMATS?= html-split

-HAS_INDEX= true
-
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=

--- a/ru_RU.KOI8-R/books/developers-handbook/book.xml
+++ b/ru_RU.KOI8-R/books/developers-handbook/book.xml
@ -498,4 +498,6 @@
      </biblioentry>
    </bibliography>
  </part>
+
+  <index/>
 </book>
--- a/ru_RU.KOI8-R/books/developers-handbook/chapters.ent
+++ b/ru_RU.KOI8-R/books/developers-handbook/chapters.ent
@ -37,4 +37,4 @@
 <!ENTITY chap.x86			SYSTEM "x86/chapter.xml">

 <!-- Часть шестая - Приложения -->
-<!ENTITY chap.index			SYSTEM "index.xml">
+<!ENTITY chap.index			"<index/>">
--- a/ru_RU.KOI8-R/books/fdp-primer/book.xml
+++ b/ru_RU.KOI8-R/books/fdp-primer/book.xml
@ -259,7 +259,5 @@ Password:</screen></entry>

  &app.examples;

-<!--
  &index;
-->
 </book>
--- a/ru_RU.KOI8-R/books/handbook/Makefile
+++ b/ru_RU.KOI8-R/books/handbook/Makefile
@ -37,8 +37,6 @@ DOC?= book

 FORMATS?= html-split

-#HAS_INDEX= true
-
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=

--- a/ru_RU.KOI8-R/books/handbook/chapters.ent
+++ b/ru_RU.KOI8-R/books/handbook/chapters.ent
@ -70,6 +70,6 @@
  <!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.colophon	SYSTEM "colophon.xml">
--- a/zh_CN.GB2312/articles/contributing/article.xml
+++ b/zh_CN.GB2312/articles/contributing/article.xml
@ -502,4 +502,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    </sect2>
  </sect1>

+  <index/>
+
 </article>
--- a/zh_CN.GB2312/articles/nanobsd/article.xml
+++ b/zh_CN.GB2312/articles/nanobsd/article.xml
@ -469,4 +469,6 @@ get _.disk.image "| sh updatep1"</userinput></screen>
      </sect3>
    </sect2>
  </sect1>
+
+  <index/>
 </article>
--- a/zh_CN.GB2312/books/arch-handbook/Makefile
+++ b/zh_CN.GB2312/books/arch-handbook/Makefile
@ -11,8 +11,6 @@ DOC?= book

 FORMATS?= html-split

-HAS_INDEX= true
-
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=

--- a/zh_CN.GB2312/books/arch-handbook/chapters.ent
+++ b/zh_CN.GB2312/books/arch-handbook/chapters.ent
@ -11,8 +11,6 @@
     $FreeBSD$
 -->

-<!ENTITY % chap.index "IGNORE">
-
 <!-- Part one - Kernel -->
 <!ENTITY chap.boot			SYSTEM "boot/chapter.xml">
 <!ENTITY chap.kobj			SYSTEM "kobj/chapter.xml">
@ -34,7 +32,4 @@
 <!ENTITY chap.pccard			SYSTEM "pccard/chapter.xml">

 <!-- Part three - Appendices -->
-<![%chap.index;[
-  <!ENTITY chap.index			SYSTEM "index.xml">
-]]>
-<!ENTITY chap.index			"">
+<!ENTITY chap.index			"<index/>">
--- a/zh_CN.GB2312/books/handbook/Makefile
+++ b/zh_CN.GB2312/books/handbook/Makefile
@ -40,8 +40,6 @@ DOC?= book

 FORMATS?= html-split

-HAS_INDEX= true
-
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=

--- a/zh_CN.GB2312/books/handbook/chapters.ent
+++ b/zh_CN.GB2312/books/handbook/chapters.ent
@ -67,6 +67,6 @@
  <!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.colophon	SYSTEM "colophon.xml">
--- a/zh_TW.Big5/articles/contributing/article.xml
+++ b/zh_TW.Big5/articles/contributing/article.xml
@ -480,4 +480,5 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    </sect2>
  </sect1>

+  <index/>
 </article>
--- a/zh_TW.Big5/articles/nanobsd/article.xml
+++ b/zh_TW.Big5/articles/nanobsd/article.xml
@ -435,4 +435,6 @@ get _.disk.image "| sh updatep1"</userinput></screen>
      </sect3>
    </sect2>
  </sect1>
+
+  <index/>
 </article>
--- a/zh_TW.Big5/articles/problem-reports/article.xml
+++ b/zh_TW.Big5/articles/problem-reports/article.xml
@ -1111,4 +1111,6 @@
      </listitem>
    </itemizedlist>
  </section>
+
+  <index/>
 </article>
--- a/zh_TW.Big5/books/developers-handbook/Makefile
+++ b/zh_TW.Big5/books/developers-handbook/Makefile
@ -10,8 +10,6 @@ DOC?= book

 FORMATS?= html-split

-HAS_INDEX= true
-
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=

--- a/zh_TW.Big5/books/developers-handbook/chapters.ent
+++ b/zh_TW.Big5/books/developers-handbook/chapters.ent
@ -10,8 +10,6 @@
     $FreeBSD$
 -->

-<!ENTITY % chap.index "IGNORE">
-
 <!-- Part one -->
 <!ENTITY chap.introduction		SYSTEM "introduction/chapter.xml">
 <!ENTITY chap.tools			SYSTEM "tools/chapter.xml">
@ -32,7 +30,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/>">
--- a/zh_TW.Big5/books/fdp-primer/book.xml
+++ b/zh_TW.Big5/books/fdp-primer/book.xml
@ -232,7 +232,5 @@ Password:</screen></entry>

  &app.examples;

-<!--
  &index;
-->
 </book>
--- a/zh_TW.Big5/books/handbook/Makefile
+++ b/zh_TW.Big5/books/handbook/Makefile
@ -33,8 +33,6 @@ DOC?= book

 FORMATS?= html-split

-HAS_INDEX= true
-
 INSTALL_COMPRESSED?= gz
 INSTALL_ONLY_COMPRESSED?=

--- a/zh_TW.Big5/books/handbook/chapters.ent
+++ b/zh_TW.Big5/books/handbook/chapters.ent
@ -66,6 +66,6 @@
  <!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.colophon	SYSTEM "colophon.xml">