diff options
42 files changed, 15 insertions, 84 deletions
diff --git a/de_DE.ISO8859-1/books/handbook/chapters.ent b/de_DE.ISO8859-1/books/handbook/chapters.ent index f8bb7e300f..a933a8d86e 100644 --- a/de_DE.ISO8859-1/books/handbook/chapters.ent +++ b/de_DE.ISO8859-1/books/handbook/chapters.ent @@ -66,7 +66,7 @@ <!ENTITY chap.eresources SYSTEM "eresources/chapter.xml"> <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc"> <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml"> - <!ENTITY chap.freebsd-glossary "&freebsd-glossary;"> + <!ENTITY chap.freebsd-glossary SYSTEM "../../share/xml/glossary.ent"> <!ENTITY chap.index ""> <!ENTITY chap.mirrors.lastmod.inc SYSTEM "mirrors.lastmod.inc"> diff --git a/de_DE.ISO8859-1/share/xml/entities.ent b/de_DE.ISO8859-1/share/xml/entities.ent index d1c5b456a2..fcd24d2368 100644 --- a/de_DE.ISO8859-1/share/xml/entities.ent +++ b/de_DE.ISO8859-1/share/xml/entities.ent @@ -31,6 +31,3 @@ <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN" "nonexistent"> %urls; -<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//DE" - "glossary.ent"> -%glossary; diff --git a/de_DE.ISO8859-1/share/xml/glossary.ent b/de_DE.ISO8859-1/share/xml/glossary.ent index 0bb26713d4..cffd573532 100644 --- a/de_DE.ISO8859-1/share/xml/glossary.ent +++ b/de_DE.ISO8859-1/share/xml/glossary.ent @@ -34,7 +34,6 @@ basiert auf: 1.37 --> -<!ENTITY freebsd-glossary ' <glossary status="draft" id="freebsd-glossary"> <title>&os; Glossar</title> @@ -2115,4 +2114,3 @@ </glossentry> </glossdiv> </glossary> -'> diff --git a/el_GR.ISO8859-7/books/handbook/chapters.ent b/el_GR.ISO8859-7/books/handbook/chapters.ent index eefe8973a2..a7834f11a8 100644 --- a/el_GR.ISO8859-7/books/handbook/chapters.ent +++ b/el_GR.ISO8859-7/books/handbook/chapters.ent @@ -72,7 +72,7 @@ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc"> <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc"> <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml"> - <!ENTITY chap.freebsd-glossary "&freebsd-glossary;"> + <!ENTITY chap.freebsd-glossary SYSTEM "../../share/xml/glossary.ent"> <!ENTITY chap.index ""> <!ENTITY chap.colophon SYSTEM "colophon.xml"> diff --git a/el_GR.ISO8859-7/share/xml/entities.ent b/el_GR.ISO8859-7/share/xml/entities.ent index 7a156813e3..e737c57c22 100644 --- a/el_GR.ISO8859-7/share/xml/entities.ent +++ b/el_GR.ISO8859-7/share/xml/entities.ent @@ -28,9 +28,6 @@ <!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EL" "newsgroups.ent"> %newsgroups; -<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EL" - "glossary.ent"> -%glossary; <!-- %freebsd.el; %freebsd; . entities . diff --git a/el_GR.ISO8859-7/share/xml/glossary.ent b/el_GR.ISO8859-7/share/xml/glossary.ent index c268cc4b25..252ab09e1b 100644 --- a/el_GR.ISO8859-7/share/xml/glossary.ent +++ b/el_GR.ISO8859-7/share/xml/glossary.ent @@ -41,7 +41,6 @@ --> -<!ENTITY freebsd-glossary ' <glossary status="draft" id="freebsd-glossary"> <title> &os;</title> <para> @@ -2099,4 +2098,3 @@ </glossentry> </glossdiv> </glossary> -'> diff --git a/en_US.ISO8859-1/books/handbook/chapters.ent b/en_US.ISO8859-1/books/handbook/chapters.ent index d7efb577fe..421b86b06b 100644 --- a/en_US.ISO8859-1/books/handbook/chapters.ent +++ b/en_US.ISO8859-1/books/handbook/chapters.ent @@ -65,7 +65,7 @@ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc"> <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc"> <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml"> - <!ENTITY chap.freebsd-glossary "&freebsd-glossary;"> + <!ENTITY chap.freebsd-glossary SYSTEM "../../share/xml/glossary.ent"> <!ENTITY chap.index SYSTEM "index.xml"> <!ENTITY chap.colophon SYSTEM "colophon.xml"> diff --git a/en_US.ISO8859-1/share/xml/entities.ent b/en_US.ISO8859-1/share/xml/entities.ent index e5a3813abe..ffd135e39a 100644 --- a/en_US.ISO8859-1/share/xml/entities.ent +++ b/en_US.ISO8859-1/share/xml/entities.ent @@ -6,9 +6,6 @@ <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN" "../../../share/xml/freebsd.ent"> %freebsd; -<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN" - "glossary.ent"> -%glossary; <!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN" "teams.ent"> %teams; diff --git a/en_US.ISO8859-1/share/xml/glossary.ent b/en_US.ISO8859-1/share/xml/glossary.ent index 4e2b6290b1..6fe3bd1081 100644 --- a/en_US.ISO8859-1/share/xml/glossary.ent +++ b/en_US.ISO8859-1/share/xml/glossary.ent @@ -32,7 +32,6 @@ --> -<!ENTITY freebsd-glossary ' <glossary status="draft" id="freebsd-glossary"> <title>&os; Glossary</title> <para>This glossary contains terms and acronyms used within the &os; @@ -2032,4 +2031,3 @@ </glossentry> </glossdiv> </glossary> -'> diff --git a/es_ES.ISO8859-1/books/handbook/chapters.ent b/es_ES.ISO8859-1/books/handbook/chapters.ent index 2de5ecc113..8e4d01c7e3 100755 --- a/es_ES.ISO8859-1/books/handbook/chapters.ent +++ b/es_ES.ISO8859-1/books/handbook/chapters.ent @@ -73,7 +73,7 @@ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc"> <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc"> <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml"> - <!ENTITY chap.freebsd-glossary "&freebsd-glossary;"> + <!ENTITY chap.freebsd-glossary SYSTEM "../../share/xml/glossary.ent"> <!ENTITY chap.index ""> <!ENTITY chap.colophon SYSTEM "colophon.xml"> diff --git a/es_ES.ISO8859-1/share/xml/entities.ent b/es_ES.ISO8859-1/share/xml/entities.ent index a651859d38..196fe80ed6 100644 --- a/es_ES.ISO8859-1/share/xml/entities.ent +++ b/es_ES.ISO8859-1/share/xml/entities.ent @@ -29,6 +29,3 @@ <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN" "nonexistent"> %urls; -<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ES" - "glossary.ent"> -%glossary; diff --git a/es_ES.ISO8859-1/share/xml/glossary.ent b/es_ES.ISO8859-1/share/xml/glossary.ent index d9c7a4c83b..1832319625 100644 --- a/es_ES.ISO8859-1/share/xml/glossary.ent +++ b/es_ES.ISO8859-1/share/xml/glossary.ent @@ -37,7 +37,6 @@ --> -<!ENTITY freebsd-glossary ' <glossary status="draft" id="freebsd-glossary"> <title>Glosario de &os;</title> <para>Este glosario contiene trminos y acrnimos usados en la @@ -1930,4 +1929,3 @@ </glossentry> </glossdiv> </glossary> -'> diff --git a/fr_FR.ISO8859-1/books/handbook/chapters.ent b/fr_FR.ISO8859-1/books/handbook/chapters.ent index b6aac4feae..33d9d7c01f 100644 --- a/fr_FR.ISO8859-1/books/handbook/chapters.ent +++ b/fr_FR.ISO8859-1/books/handbook/chapters.ent @@ -67,7 +67,7 @@ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc"> <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc"> <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml"> - <!ENTITY chap.freebsd-glossary "&freebsd-glossary;"> + <!ENTITY chap.freebsd-glossary SYSTEM "../../share/xml/glossary.ent"> <!ENTITY chap.index ""> <!ENTITY chap.colophon SYSTEM "colophon.xml"> diff --git a/fr_FR.ISO8859-1/share/xml/entities.ent b/fr_FR.ISO8859-1/share/xml/entities.ent index fd5cf3bbea..0b84bfc31c 100644 --- a/fr_FR.ISO8859-1/share/xml/entities.ent +++ b/fr_FR.ISO8859-1/share/xml/entities.ent @@ -20,9 +20,6 @@ <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN" "nonexistent"> %freebsd; -<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//FR" - "glossary.ent"> -%glossary; <!-- <!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN" "nonexistent"> diff --git a/fr_FR.ISO8859-1/share/xml/glossary.ent b/fr_FR.ISO8859-1/share/xml/glossary.ent index 3fe427fb20..eb42f44160 100644 --- a/fr_FR.ISO8859-1/share/xml/glossary.ent +++ b/fr_FR.ISO8859-1/share/xml/glossary.ent @@ -8,7 +8,6 @@ Original Revision: 1.5 --> -<!ENTITY freebsd-glossary ' <glossary status="draft" id="freebsd-glossary"> <title>Glossaire &os;</title> <para>Ce glossaire dfinit des termes et des acronymes @@ -139,4 +138,3 @@ </glossentry> </glossdiv> </glossary> -'> diff --git a/hu_HU.ISO8859-2/books/handbook/chapters.ent b/hu_HU.ISO8859-2/books/handbook/chapters.ent index fb50794c97..3703f274c4 100644 --- a/hu_HU.ISO8859-2/books/handbook/chapters.ent +++ b/hu_HU.ISO8859-2/books/handbook/chapters.ent @@ -69,7 +69,7 @@ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc"> <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc"> <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml"> - <!ENTITY chap.freebsd-glossary "&freebsd-glossary;"> + <!ENTITY chap.freebsd-glossary SYSTEM "../../share/xml/glossary.ent"> <!ENTITY chap.index ""> <!ENTITY chap.colophon SYSTEM "colophon.xml"> diff --git a/hu_HU.ISO8859-2/share/xml/entities.ent b/hu_HU.ISO8859-2/share/xml/entities.ent index 97b921021f..42cc88578f 100644 --- a/hu_HU.ISO8859-2/share/xml/entities.ent +++ b/hu_HU.ISO8859-2/share/xml/entities.ent @@ -29,6 +29,3 @@ <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN" "nonexistent"> %urls; -<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//HU" - "glossary.ent"> -%glossary; diff --git a/hu_HU.ISO8859-2/share/xml/glossary.ent b/hu_HU.ISO8859-2/share/xml/glossary.ent index 4e46395faa..22385196dc 100644 --- a/hu_HU.ISO8859-2/share/xml/glossary.ent +++ b/hu_HU.ISO8859-2/share/xml/glossary.ent @@ -37,7 +37,6 @@ %SRCID% 1.36 --> -<!ENTITY freebsd-glossary ' <glossary status="draft" id="freebsd-glossary" lang="hu"> <title>A &os;-s szakkifejezsek gyjtemnye</title> @@ -2305,4 +2304,3 @@ </glossentry> </glossdiv> </glossary> -'> diff --git a/it_IT.ISO8859-15/books/handbook/chapters.ent b/it_IT.ISO8859-15/books/handbook/chapters.ent index 9ceb77664e..ddec590e01 100644 --- a/it_IT.ISO8859-15/books/handbook/chapters.ent +++ b/it_IT.ISO8859-15/books/handbook/chapters.ent @@ -67,7 +67,7 @@ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc"> <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc"> <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml"> - <!ENTITY chap.freebsd-glossary "&freebsd-glossary;"> + <!ENTITY chap.freebsd-glossary SYSTEM "../../share/xml/glossary.ent"> <!ENTITY chap.index ""> <!ENTITY chap.colophon SYSTEM "colophon.xml"> diff --git a/it_IT.ISO8859-15/share/xml/entities.ent b/it_IT.ISO8859-15/share/xml/entities.ent index 5b4e18e7e0..763dd1f74f 100644 --- a/it_IT.ISO8859-15/share/xml/entities.ent +++ b/it_IT.ISO8859-15/share/xml/entities.ent @@ -31,6 +31,3 @@ <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//IT" "translators.ent"> %translators; -<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//IT" - "glossary.ent"> -%glossary; diff --git a/it_IT.ISO8859-15/share/xml/glossary.ent b/it_IT.ISO8859-15/share/xml/glossary.ent index 0f29c7603b..5e2f40b685 100644 --- a/it_IT.ISO8859-15/share/xml/glossary.ent +++ b/it_IT.ISO8859-15/share/xml/glossary.ent @@ -6,7 +6,6 @@ Original revision: 1.20 --> -<!ENTITY freebsd-glossary ' <glossary status="draft" id="freebsd-glossary"> <title>Glossario di &os;</title> @@ -1766,4 +1765,3 @@ </glossentry> </glossdiv> </glossary> -'> diff --git a/ja_JP.eucJP/books/handbook/chapters.ent b/ja_JP.eucJP/books/handbook/chapters.ent index a8690771db..3354161101 100644 --- a/ja_JP.eucJP/books/handbook/chapters.ent +++ b/ja_JP.eucJP/books/handbook/chapters.ent @@ -64,7 +64,7 @@ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc"> <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc"> <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml"> - <!ENTITY chap.freebsd-glossary "&freebsd-glossary;"> + <!ENTITY chap.freebsd-glossary SYSTEM "../../../en_US.ISO8859-1/share/xml/glossary.ent"> <!ENTITY chap.index ""> <!ENTITY chap.colophon SYSTEM "colophon.xml"> diff --git a/ja_JP.eucJP/share/xml/entities.ent b/ja_JP.eucJP/share/xml/entities.ent index 1450780b91..267defdc4a 100644 --- a/ja_JP.eucJP/share/xml/entities.ent +++ b/ja_JP.eucJP/share/xml/entities.ent @@ -40,6 +40,3 @@ <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN" "nonexistent"> %urls; -<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN" - "nonexistent"> -%glossary; diff --git a/mn_MN.UTF-8/books/handbook/chapters.ent b/mn_MN.UTF-8/books/handbook/chapters.ent index af58bdce2a..b82b00701b 100644 --- a/mn_MN.UTF-8/books/handbook/chapters.ent +++ b/mn_MN.UTF-8/books/handbook/chapters.ent @@ -71,7 +71,7 @@ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc"> <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc"> <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml"> - <!ENTITY chap.freebsd-glossary "&freebsd-glossary;"> + <!ENTITY chap.freebsd-glossary SYSTEM "../../share/xml/glossary.ent"> <!ENTITY chap.index ""> <!ENTITY chap.colophon SYSTEM "colophon.xml"> diff --git a/mn_MN.UTF-8/share/xml/entities.ent b/mn_MN.UTF-8/share/xml/entities.ent index a7528cc690..d27a37e871 100644 --- a/mn_MN.UTF-8/share/xml/entities.ent +++ b/mn_MN.UTF-8/share/xml/entities.ent @@ -27,6 +27,3 @@ <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN" "nonexistent"> %urls; -<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//MN" - "glossary.ent"> -%glossary; diff --git a/mn_MN.UTF-8/share/xml/glossary.ent b/mn_MN.UTF-8/share/xml/glossary.ent index 4e17355b36..b07796428c 100644 --- a/mn_MN.UTF-8/share/xml/glossary.ent +++ b/mn_MN.UTF-8/share/xml/glossary.ent @@ -36,7 +36,6 @@ --> -<!ENTITY freebsd-glossary ' <glossary status="draft" id="freebsd-glossary"> <title>&os; Нэр томъёо</title> <para>Энэ нэр томъёо нь &os;-ийн хүрээнийхэн болон баримтжуулалтад ашигласан @@ -2023,4 +2022,3 @@ </glossentry> </glossdiv> </glossary> -'> diff --git a/nl_NL.ISO8859-1/books/handbook/chapters.ent b/nl_NL.ISO8859-1/books/handbook/chapters.ent index 32e3eb91c6..25bac581e1 100644 --- a/nl_NL.ISO8859-1/books/handbook/chapters.ent +++ b/nl_NL.ISO8859-1/books/handbook/chapters.ent @@ -69,7 +69,7 @@ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc"> <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc"> <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml"> - <!ENTITY chap.freebsd-glossary "&freebsd-glossary;"> + <!ENTITY chap.freebsd-glossary SYSTEM "../../share/xml/glossary.ent"> <!ENTITY chap.index ""> <!ENTITY chap.colophon SYSTEM "colophon.xml"> diff --git a/nl_NL.ISO8859-1/share/xml/entities.ent b/nl_NL.ISO8859-1/share/xml/entities.ent index d411d34cb3..31af606e43 100644 --- a/nl_NL.ISO8859-1/share/xml/entities.ent +++ b/nl_NL.ISO8859-1/share/xml/entities.ent @@ -30,6 +30,3 @@ <!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN" "l10n.ent"> %l10n; -<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//NL" - "glossary.ent"> -%glossary; diff --git a/nl_NL.ISO8859-1/share/xml/glossary.ent b/nl_NL.ISO8859-1/share/xml/glossary.ent index ba94e26b02..3d4fd9275a 100644 --- a/nl_NL.ISO8859-1/share/xml/glossary.ent +++ b/nl_NL.ISO8859-1/share/xml/glossary.ent @@ -39,7 +39,6 @@ --> -<!ENTITY freebsd-glossary ' <glossary status="draft" id="freebsd-glossary"> <title>&os; begrippenlijst</title> <para>Deze begrippenlijst bevat de termen en acroniemen die binnen @@ -2091,4 +2090,3 @@ </glossentry> </glossdiv> </glossary> -'> diff --git a/pl_PL.ISO8859-2/books/handbook/chapters.ent b/pl_PL.ISO8859-2/books/handbook/chapters.ent index ce6215bb29..7117d36d11 100644 --- a/pl_PL.ISO8859-2/books/handbook/chapters.ent +++ b/pl_PL.ISO8859-2/books/handbook/chapters.ent @@ -64,7 +64,7 @@ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc"> <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc"> <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml"> - <!ENTITY chap.freebsd-glossary "&freebsd-glossary;"> + <!ENTITY chap.freebsd-glossary SYSTEM "../../../en_US.ISO8859-1/share/xml/glossary.ent"> <!ENTITY chap.index ""> <!ENTITY chap.colophon SYSTEM "colophon.xml"> diff --git a/pl_PL.ISO8859-2/share/xml/entities.ent b/pl_PL.ISO8859-2/share/xml/entities.ent index 8c3ea6368a..dec7fc8518 100644 --- a/pl_PL.ISO8859-2/share/xml/entities.ent +++ b/pl_PL.ISO8859-2/share/xml/entities.ent @@ -29,6 +29,3 @@ <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN" "nonexistent"> %urls; -<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EN" - "nonexistent"> -%glossary; diff --git a/pt_BR.ISO8859-1/books/handbook/chapters.ent b/pt_BR.ISO8859-1/books/handbook/chapters.ent index e493b62744..fb661ad326 100644 --- a/pt_BR.ISO8859-1/books/handbook/chapters.ent +++ b/pt_BR.ISO8859-1/books/handbook/chapters.ent @@ -63,7 +63,7 @@ <!ENTITY chap.eresources SYSTEM "eresources/chapter.xml"> <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc"> <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml"> - <!ENTITY chap.freebsd-glossary "&freebsd-glossary;"> + <!ENTITY chap.freebsd-glossary SYSTEM "../../../en_US.ISO8859-1/share/xml/glossary.ent"> <!ENTITY chap.index ""> <!ENTITY chap.colophon SYSTEM "colophon.xml"> diff --git a/ru_RU.KOI8-R/books/handbook/chapters.ent b/ru_RU.KOI8-R/books/handbook/chapters.ent index 213cd1c9a9..b934687d63 100644 --- a/ru_RU.KOI8-R/books/handbook/chapters.ent +++ b/ru_RU.KOI8-R/books/handbook/chapters.ent @@ -70,7 +70,7 @@ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc"> <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc"> <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml"> - <!ENTITY chap.freebsd-glossary "&freebsd-glossary;"> + <!ENTITY chap.freebsd-glossary SYSTEM "../../share/xml/glossary.ent"> <!ENTITY chap.index ""> <!ENTITY chap.colophon SYSTEM "colophon.xml"> diff --git a/ru_RU.KOI8-R/share/xml/entities.ent b/ru_RU.KOI8-R/share/xml/entities.ent index ee50a6be6e..cb4e534341 100644 --- a/ru_RU.KOI8-R/share/xml/entities.ent +++ b/ru_RU.KOI8-R/share/xml/entities.ent @@ -31,6 +31,3 @@ <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN" "nonexistent"> %urls; -<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//RU" - "glossary.ent"> -%glossary; diff --git a/ru_RU.KOI8-R/share/xml/glossary.ent b/ru_RU.KOI8-R/share/xml/glossary.ent index 7e2054d054..a5829d33fd 100644 --- a/ru_RU.KOI8-R/share/xml/glossary.ent +++ b/ru_RU.KOI8-R/share/xml/glossary.ent @@ -14,7 +14,6 @@ Please keep this file sorted. --> -<!ENTITY freebsd-glossary ' <glossary status="draft" id="freebsd-glossary"> <title> &os;</title> <para> @@ -1736,4 +1735,3 @@ </glossdiv> </glossary> -'> diff --git a/share/xml/catalog.xml b/share/xml/catalog.xml index 7b14607ae2..fe6223ed44 100644 --- a/share/xml/catalog.xml +++ b/share/xml/catalog.xml @@ -103,9 +103,6 @@ uri="xhtml10-freebsd.dtd" /> publicId="-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN" uri="../../en_US.ISO8859-1/share/xml/newsgroups.ent"/> <public - publicId="-//FreeBSD//ENTITIES DocBook Glossary Entities//EN" - uri="../../en_US.ISO8859-1/share/xml/glossary.ent"/> - <public publicId="-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN" uri="../../en_US.ISO8859-1/share/xml/mailing-lists.ent"/> </catalog> diff --git a/zh_CN.GB2312/books/handbook/chapters.ent b/zh_CN.GB2312/books/handbook/chapters.ent index f2ec296043..937cf24264 100644 --- a/zh_CN.GB2312/books/handbook/chapters.ent +++ b/zh_CN.GB2312/books/handbook/chapters.ent @@ -66,7 +66,7 @@ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc"> <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc"> <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml"> - <!ENTITY chap.freebsd-glossary "&freebsd-glossary;"> + <!ENTITY chap.freebsd-glossary SYSTEM "../../share/xml/glossary.ent"> <!ENTITY chap.index ""> <!ENTITY chap.colophon SYSTEM "colophon.xml"> diff --git a/zh_CN.GB2312/share/xml/entities.ent b/zh_CN.GB2312/share/xml/entities.ent index ac85e86b8c..30ba3b65f2 100644 --- a/zh_CN.GB2312/share/xml/entities.ent +++ b/zh_CN.GB2312/share/xml/entities.ent @@ -27,6 +27,3 @@ <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN" "nonexistent"> %urls; -<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ZH" - "glossary.ent"> -%glossary; diff --git a/zh_CN.GB2312/share/xml/glossary.ent b/zh_CN.GB2312/share/xml/glossary.ent index b4ef15c21f..ffed36c768 100644 --- a/zh_CN.GB2312/share/xml/glossary.ent +++ b/zh_CN.GB2312/share/xml/glossary.ent @@ -33,7 +33,6 @@ --> -<!ENTITY freebsd-glossary ' <glossary status="draft" id="freebsd-glossary"> <title>&os; </title> <para> &os; ĵʹõ</para> @@ -1983,4 +1982,3 @@ </glossentry> </glossdiv> </glossary> -'> diff --git a/zh_TW.Big5/books/handbook/chapters.ent b/zh_TW.Big5/books/handbook/chapters.ent index 177bf80f5b..dfe7f04d24 100644 --- a/zh_TW.Big5/books/handbook/chapters.ent +++ b/zh_TW.Big5/books/handbook/chapters.ent @@ -65,7 +65,7 @@ <!ENTITY chap.eresources.www.index.inc SYSTEM "eresources.xml.www.index.inc"> <!ENTITY chap.eresources.www.inc SYSTEM "eresources.xml.www.inc"> <!ENTITY chap.pgpkeys SYSTEM "pgpkeys/chapter.xml"> - <!ENTITY chap.freebsd-glossary "&freebsd-glossary;"> + <!ENTITY chap.freebsd-glossary SYSTEM "../../share/xml/glossary.ent"> <!ENTITY chap.index ""> <!ENTITY chap.colophon SYSTEM "colophon.xml"> diff --git a/zh_TW.Big5/share/xml/entities.ent b/zh_TW.Big5/share/xml/entities.ent index 3bf1002aee..31be33abe7 100644 --- a/zh_TW.Big5/share/xml/entities.ent +++ b/zh_TW.Big5/share/xml/entities.ent @@ -27,6 +27,3 @@ <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//ZH" "urls.ent"> %urls; -<!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ZH" - "glossary.ent"> -%glossary; diff --git a/zh_TW.Big5/share/xml/glossary.ent b/zh_TW.Big5/share/xml/glossary.ent index 66ec337fbe..30f7ca81fe 100644 --- a/zh_TW.Big5/share/xml/glossary.ent +++ b/zh_TW.Big5/share/xml/glossary.ent @@ -32,7 +32,6 @@ --> -<!ENTITY freebsd-glossary ' <glossary status="draft" id="freebsd-glossary"> <title>&os; Glossary</title> <para>This glossary contains terms and acronyms used within the &os; @@ -1922,4 +1921,3 @@ </glossentry> </glossdiv> </glossary> -'> |