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

2 files changed, 3 insertions, 3 deletions

diff --git a/tr_TR.ISO8859-9/share/xml/catalog.xml b/tr_TR.ISO8859-9/share/xml/catalog.xml
index a3feec86ca..0417d6c356 100644
--- a/tr_TR.ISO8859-9/share/xml/catalog.xml
+++ b/tr_TR.ISO8859-9/share/xml/catalog.xml
@@ -11,6 +11,9 @@
               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>
diff --git a/tr_TR.ISO8859-9/share/xml/entities.ent b/tr_TR.ISO8859-9/share/xml/entities.ent
index 04c582d0f3..e00d625047 100644
--- 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;