- Define l10n.ent as an entity in localized directories and make them be

picked up via XML catalog in freebsd50.ent or xhtml10-freebsd.dtd, not entities.ent. The L10N entities always come first to be able to override everything. - Define   as   in EUC-JP encoding. This is a workaround to prevent an invalid character in EUC-JP caused by converting 0xa0 in UTF-8 (EUC-JP does not allow 0xa0) in XSLT processing. Theoretically it should be   still in the final XML output. - Make XML catalog resolution consistent for l10n.ent. This should be revisited for the others later.
svn path=/head/; revision=43161
2013-11-11 06:52:59 +00:00 · 2013-11-11 06:52:59 +00:00 · db0b08db8f · 2020-12-08 03:00:23 +00:00
commit db0b08db8f
parent 13ebce2b52
44 changed files with 114 additions and 112 deletions
--- a/da_DK.ISO8859-1/share/xml/catalog.xml
+++ b/da_DK.ISO8859-1/share/xml/catalog.xml
@ -10,6 +10,8 @@
  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
              rewritePrefix="../../"/>

+  <public publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        uri="l10n.ent" />
  <public publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
        uri="entities.ent"/>
  <public publicId="-//FreeBSD//ENTITIES DocBook Translator Entities//DK"
--- a/da_DK.ISO8859-1/share/xml/entities.ent
+++ b/da_DK.ISO8859-1/share/xml/entities.ent
@ -7,9 +7,6 @@
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DK"
 	"translators.ent">
 %translators;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DK"
 	"mailing-lists.ent">
 %mailing-lists;
--- a/de_DE.ISO8859-1/share/xml/catalog.xml
+++ b/de_DE.ISO8859-1/share/xml/catalog.xml
@ -13,15 +13,15 @@
  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
              rewritePrefix="../../"/>

+  <public
+        publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        uri="l10n.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
        uri="entities.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES DocBook Translator Entities//DE"
        uri="translators.ent" />
-  <public
-        publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        uri="l10n.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
        uri="release.l10n.ent" />
--- a/de_DE.ISO8859-1/share/xml/entities.ent
+++ b/de_DE.ISO8859-1/share/xml/entities.ent
@ -25,9 +25,6 @@
 <!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
 	"nonexistent">
 %trademarks;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
 	"nonexistent">
 %urls;
--- a/el_GR.ISO8859-7/share/xml/catalog.xml
+++ b/el_GR.ISO8859-7/share/xml/catalog.xml
@ -10,6 +10,9 @@
  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
              rewritePrefix="../../"/>

+  <public
+        publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        uri="l10n.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
        uri="entities.ent" />
--- a/el_GR.ISO8859-7/share/xml/entities.ent
+++ b/el_GR.ISO8859-7/share/xml/entities.ent
@ -13,9 +13,6 @@

 -->

-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//EL"
 	"translators.ent">
 %translators;
--- a/en_US.ISO8859-1/share/xml/catalog.xml
+++ b/en_US.ISO8859-1/share/xml/catalog.xml
@ -14,6 +14,9 @@
  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
              rewritePrefix="../../"/>

+  <public
+        publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        uri="l10n.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
        uri="entities.ent" />
--- a/en_US.ISO8859-1/share/xml/entities.ent
+++ b/en_US.ISO8859-1/share/xml/entities.ent
@ -1,10 +1,7 @@
 <!-- $FreeBSD$ -->

-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
-	"../../../share/xml/freebsd.ent">
+	"nonexistent">
 %freebsd;
 <!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
 	"teams.ent">
@ -16,8 +13,8 @@
 	"newsgroups.ent">
 %newsgroups;
 <!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
-	"../../../share/xml/trademarks.ent">
+	"nonexistent">
 %trademarks;
 <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
-	"../../../share/xml/urls.ent">
+	"nonexistent">
 %urls;
--- a/es_ES.ISO8859-1/share/xml/catalog.xml
+++ b/es_ES.ISO8859-1/share/xml/catalog.xml
@ -10,12 +10,11 @@
  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
              rewritePrefix="../../"/>

+  <public publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        uri="l10n.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
        uri="entities.ent" />
-
-  <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        uri="l10n.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
        uri="release.l10n.ent" />
--- a/es_ES.ISO8859-1/share/xml/entities.ent
+++ b/es_ES.ISO8859-1/share/xml/entities.ent
@ -2,9 +2,6 @@
 	$FreeBSD$
 -->

-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;
--- a/fr_FR.ISO8859-1/share/xml/catalog.xml
+++ b/fr_FR.ISO8859-1/share/xml/catalog.xml
@ -10,11 +10,11 @@
  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
              rewritePrefix="../../"/>

+  <public publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        uri="l10n.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
        uri="entities.ent" />
-  <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        uri="l10n.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
        uri="release.l10n.ent" />
--- a/fr_FR.ISO8859-1/share/xml/entities.ent
+++ b/fr_FR.ISO8859-1/share/xml/entities.ent
@ -2,9 +2,6 @@
  Original revision: 1.2
 -->

-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"
 	"translators.ent">
 %translators;
--- a/hu_HU.ISO8859-2/share/xml/catalog.xml
+++ b/hu_HU.ISO8859-2/share/xml/catalog.xml
@ -10,11 +10,11 @@
  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
              rewritePrefix="../../"/>

+  <public publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        uri="l10n.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
        uri="entities.ent" />
-  <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        uri="l10n.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
        uri="release.l10n.ent" />
--- a/hu_HU.ISO8859-2/share/xml/entities.ent
+++ b/hu_HU.ISO8859-2/share/xml/entities.ent
@ -5,9 +5,6 @@
     %SRCID%	1.2
 -->

-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//HU"
 	"freebsd.ent">
 %freebsd;
--- a/it_IT.ISO8859-15/share/xml/catalog.xml
+++ b/it_IT.ISO8859-15/share/xml/catalog.xml
@ -10,11 +10,11 @@
  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
              rewritePrefix="../../"/>

+  <public publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        uri="l10n.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
        uri="entities.ent" />
-  <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        uri="l10n.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
        uri="release.l10n.ent" />
--- a/it_IT.ISO8859-15/share/xml/entities.ent
+++ b/it_IT.ISO8859-15/share/xml/entities.ent
@ -4,9 +4,6 @@
      $FreeBSD$
 -->

-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;
--- a/ja_JP.eucJP/share/xml/catalog.xml
+++ b/ja_JP.eucJP/share/xml/catalog.xml
@ -10,11 +10,11 @@
  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
              rewritePrefix="../../"/>

+  <public publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        uri="l10n.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
        uri="entities.ent" />
-  <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        uri="l10n.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
        uri="release.l10n.ent" />
--- a/ja_JP.eucJP/share/xml/entities.ent
+++ b/ja_JP.eucJP/share/xml/entities.ent
@ -1,8 +1,5 @@
 <!-- $FreeBSD$ -->

-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;
--- a/ja_JP.eucJP/share/xml/l10n.ent
+++ b/ja_JP.eucJP/share/xml/l10n.ent
@ -5,6 +5,8 @@
     $FreeBSD$
 -->

+<!ENTITY nbsp "&#x20;">
+
 <!-- docformat navi -->
 <!ENTITY docnavi.single-html "Ã±°ìÈÇ">
 <!ENTITY docnavi.split-html  "Ê¬³äÈÇ">
--- a/mn_MN.UTF-8/share/xml/catalog.xml
+++ b/mn_MN.UTF-8/share/xml/catalog.xml
@ -10,13 +10,13 @@
  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
              rewritePrefix="../../"/>

+  <public
+        publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        uri="l10n.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
        uri="entities.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES DocBook Translator Entities//MN"
        uri="translators.ent" />
-  <public
-        publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        uri="l10n.ent" />
 </catalog>
--- a/mn_MN.UTF-8/share/xml/entities.ent
+++ b/mn_MN.UTF-8/share/xml/entities.ent
@ -21,9 +21,6 @@
 <!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//MN"
 	"trademarks.ent">
 %trademarks;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
 	"nonexistent">
 %urls;
--- a/nl_NL.ISO8859-1/share/xml/catalog.xml
+++ b/nl_NL.ISO8859-1/share/xml/catalog.xml
@ -11,11 +11,11 @@
  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
              rewritePrefix="../../"/>

+  <public publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        uri="l10n.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
        uri="entities.ent" />
-  <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        uri="l10n.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
        uri="release.l10n.ent" />
--- a/nl_NL.ISO8859-1/share/xml/entities.ent
+++ b/nl_NL.ISO8859-1/share/xml/entities.ent
@ -27,6 +27,3 @@
 <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
 	"nonexistent">
 %urls;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
--- a/pl_PL.ISO8859-2/share/xml/catalog.xml
+++ b/pl_PL.ISO8859-2/share/xml/catalog.xml
@ -10,10 +10,10 @@
  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
              rewritePrefix="../../"/>

+  <public
+        publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        uri="l10n.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
        uri="entities.ent" />
-  <public
-        publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        uri="l10n.ent" />
 </catalog>
--- a/pl_PL.ISO8859-2/share/xml/entities.ent
+++ b/pl_PL.ISO8859-2/share/xml/entities.ent
@ -5,9 +5,6 @@
     Original revision: 1.2
 -->

-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;
--- a/pt_BR.ISO8859-1/share/xml/catalog.xml
+++ b/pt_BR.ISO8859-1/share/xml/catalog.xml
@ -10,13 +10,13 @@
  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
              rewritePrefix="../../"/>

+  <public
+        publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        uri="l10n.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
        uri="entities.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES DocBook Translator Entities//PT"
        uri="translators.ent" />
-  <public
-        publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        uri="l10n.ent" />
 </catalog>
--- a/pt_BR.ISO8859-1/share/xml/entities.ent
+++ b/pt_BR.ISO8859-1/share/xml/entities.ent
@ -10,9 +10,6 @@
 <!ENTITY % words PUBLIC "-//FreeBSD//ENTITIES DocBook Specific Word Translations Entities//PT"
 	"words.ent">
 %words;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//PT"
-	"l10n.ent">
-%l10n;
 <!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PT"
 	"mailing-lists.ent">
 %mailing-lists;
--- a/ru_RU.KOI8-R/share/xml/catalog.xml
+++ b/ru_RU.KOI8-R/share/xml/catalog.xml
@ -10,11 +10,11 @@
  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
              rewritePrefix="../../"/>

+  <public publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        uri="l10n.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
        uri="entities.ent" />
-  <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        uri="l10n.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
        uri="release.l10n.ent" />
--- a/ru_RU.KOI8-R/share/xml/entities.ent
+++ b/ru_RU.KOI8-R/share/xml/entities.ent
@ -22,9 +22,6 @@
 <!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//RU"
 	"trademarks.ent">
 %trademarks;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % urls-ru PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//RU"
 	"urls.ent">
 %urls-ru;
--- a/share/mk/doc.xml.mk
+++ b/share/mk/doc.xml.mk
@ -111,7 +111,7 @@ ${XML_MIRRORS}: ${XML_MIRRORS_MASTER} \
 		--param 'transtable-word-group' "'country'" \
 		--param 'transtable-sortkey.xml' "'$@.sort'" \
 		${XSL_TRANSTABLE} ${XML_MIRRORS_MASTER}
-	${RM} -f $@.sort $@.sort.tmp
+#	${RM} -f $@.sort $@.sort.tmp
 .if ${LANGCODE} != .
 CLEANFILES+=	${XML_MIRRORS}
 CLEANFILES+=	${XML_MIRRORS}.sort
--- a/share/xml/catalog.xml
+++ b/share/xml/catalog.xml
@ -35,10 +35,10 @@
        publicId="-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
        uri="common.ent" />
  <public
-	publicId="-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
+	publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Common Entities//EN"
 	uri="l10n-common.ent" />
  <public
-	publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+	publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
 	uri="l10n.ent" />
  <public
 	publicId="-//FreeBSD//DOCUMENT FreeBSD Language Neutral XSLT Library//EN"
--- a/share/xml/freebsd50.dtd
+++ b/share/xml/freebsd50.dtd
@ -1,11 +1,24 @@
-<!ENTITY % orig-docbook PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
-	"docbook50.dtd">
-%orig-docbook;
+<!-- $FreeBSD$ -->
+<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        "http://www.FreeBSD.org/XML/www/lang/share/xml/l10n.ent">
+%l10n;
+
+<!ENTITY % l10n.common PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Common Entities//EN"
+        "http://www.FreeBSD.org/XML/www/lang/share/xml/l10n-common.ent">
+%l10n.common;

 <!ENTITY % iso8879.ent PUBLIC "-//FreeBSD//ENTITIES ISO 8879:1986 Entity Set//EN//XML"
 	"http://www.FreeBSD.org/XML/www/share/xml/iso8879.ent">
 %iso8879.ent;

+<!ENTITY % orig-docbook PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
+	"docbook50.dtd">
+%orig-docbook;
+
+<!ENTITY % orig-entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+	"entities.ent">
+%orig-entities;
+
 <!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
 	"authors.ent">
 %authors;
@ -13,7 +26,3 @@
 <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
 	"man-refs.ent">
 %man;
-
-<!ENTITY % orig-entities PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
-	"entities.ent">
-%orig-entities;
--- a/share/xml/l10n-common.ent
+++ b/share/xml/l10n-common.ent
@ -0,0 +1,18 @@
+<!-- -*- sgml -*-
+     DocBook Language Neutral Entities for Localization.
+
+     An entity here can be overridden with the localized version
+     when the entity is defined in
+     PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+     in language-specific directory.  Otherwise the following entity
+     set is used by default.
+
+     $FreeBSD$
+-->
+
+<!-- docformat navi -->
+<!ENTITY docnavi.single-html "Single HTML">
+<!ENTITY docnavi.split-html  "Split HTML">
+
+<!-- charset for HTML output -->
+<!ENTITY doc.html.charset "iso-8859-1">
--- a/share/xml/l10n.ent
+++ b/share/xml/l10n.ent
@ -1,18 +1,13 @@
 <!-- -*- sgml -*-
-     DocBook Language Neutral Entities for Localization.
+     Language Specific Entities for Localization.

     An entity here can be overridden with the localized version
     when the entity is defined in
-     PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+     PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
     in language-specific directory.  Otherwise the following entity
     set is used by default.

+     This file should be empty.
+
     $FreeBSD$
 -->
-
-<!-- docformat navi -->
-<!ENTITY docnavi.single-html "Single HTML">
-<!ENTITY docnavi.split-html  "Split HTML">
-
-<!-- charset for HTML output -->
-<!ENTITY doc.html.charset "iso-8859-1">
--- a/share/xml/xhtml10-freebsd.dtd
+++ b/share/xml/xhtml10-freebsd.dtd
@ -7,10 +7,14 @@
 "http://www.FreeBSD.org/XML/cwd/autogen.ent">
 %autogen.ent;

-<!ENTITY % l10n.ent PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
+<!ENTITY % l10n.ent PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
 "http://www.FreeBSD.org/XML/doc/share/xml/l10n.ent">
 %l10n.ent;

+<!ENTITY % l10n.common.ent PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Common Entities//EN"
+"http://www.FreeBSD.org/XML/doc/share/xml/l10n-common.ent">
+%l10n.common.ent;
+
 <!ENTITY % common.ent PUBLIC "-//FreeBSD//ENTITIES FreeBSD Common Entities//EN"
 "http://www.FreeBSD.org/XML/doc/share/xml/common.ent">
 %common.ent;
--- a/share/xml/xslt10-freebsd.dtd
+++ b/share/xml/xslt10-freebsd.dtd
@ -22,13 +22,13 @@
 %autogen.ent;

 <!ENTITY % l10n.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        "http://www.FreeBSD.org/XML/www/lang/share/xml/l10n.ent">
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        "http://www.FreeBSD.org/XML/www/share/xml/l10n.ent">
 %l10n.ent;

 <!ENTITY % l10n-common.ent
- PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Common Entities//EN"
-        "http://www.FreeBSD.org/XML/www/share/xml/l10n.ent">
+ PUBLIC "-//FreeBSD//ENTITIES FreeBSD FreeBSD Language Specific Common Entities//EN"
+        "http://www.FreeBSD.org/XML/www/share/xml/l10n-common.ent">
 %l10n-common.ent;

 <!ENTITY % common.ent
--- a/sr_YU.ISO8859-2/share/xml/catalog.xml
+++ b/sr_YU.ISO8859-2/share/xml/catalog.xml
@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+        "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+<!-- $FreeBSD$ -->
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+  <rewriteSystem systemIdStartString="http://www.FreeBSD.org/XML/www/lang/"
+                 rewritePrefix="../../"/>
+  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
+              rewritePrefix="../../"/>
+
+  <public publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        uri="l10n.ent" />
+  <public
+        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
+        uri="entities.ent" />
+</catalog>
--- a/sr_YU.ISO8859-2/share/xml/entities.ent
+++ b/sr_YU.ISO8859-2/share/xml/entities.ent
@ -4,9 +4,6 @@
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
 	"nonexistent">
 %mailing-lists;
--- a/tr_TR.ISO8859-9/share/xml/catalog.xml
+++ b/tr_TR.ISO8859-9/share/xml/catalog.xml
@ -10,6 +10,9 @@
  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
              rewritePrefix="../../"/>

+  <public
+        publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        uri="l10n.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
        uri="entities.ent" />
--- a/tr_TR.ISO8859-9/share/xml/entities.ent
+++ b/tr_TR.ISO8859-9/share/xml/entities.ent
@ -4,9 +4,6 @@
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;
-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN"
 	"nonexistent">
 %mailing-lists;
--- a/zh_CN.GB2312/share/xml/catalog.xml
+++ b/zh_CN.GB2312/share/xml/catalog.xml
@ -10,11 +10,11 @@
  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
              rewritePrefix="../../"/>

+  <public publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        uri="l10n.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
        uri="entities.ent" />
-  <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        uri="l10n.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
        uri="release.l10n.ent" />
--- a/zh_CN.GB2312/share/xml/entities.ent
+++ b/zh_CN.GB2312/share/xml/entities.ent
@ -1,8 +1,5 @@
 <!-- $FreeBSD$ -->

-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;
--- a/zh_TW.Big5/share/xml/catalog.xml
+++ b/zh_TW.Big5/share/xml/catalog.xml
@ -10,11 +10,11 @@
  <rewriteURI uriStartString="http://www.FreeBSD.org/XML/www/lang/"
              rewritePrefix="../../"/>

+  <public publicId="-//FreeBSD//ENTITIES FreeBSD Language Specific Entities//EN"
+        uri="l10n.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES DocBook FreeBSD Entity Set//EN"
        uri="entities.ent" />
-  <public publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        uri="l10n.ent" />
  <public
        publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
        uri="release.l10n.ent" />
--- a/zh_TW.Big5/share/xml/entities.ent
+++ b/zh_TW.Big5/share/xml/entities.ent
@ -1,8 +1,5 @@
 <!-- $FreeBSD$ -->

-<!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent">
-%l10n;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;