From owner-svn-doc-head@FreeBSD.ORG  Mon Nov 11 06:53:09 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id F3F5D2E7;
 Mon, 11 Nov 2013 06:53:08 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id DDDC52E24;
 Mon, 11 Nov 2013 06:53:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAB6r8fk024690;
 Mon, 11 Nov 2013 06:53:08 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAB6qxEM024622;
 Mon, 11 Nov 2013 06:52:59 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201311110652.rAB6qxEM024622@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Mon, 11 Nov 2013 06:52:59 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r43161 - in head: da_DK.ISO8859-1/share/xml
 de_DE.ISO8859-1/share/xml el_GR.ISO8859-7/share/xml en_US.ISO8859-1/share/xml
 es_ES.ISO8859-1/share/xml fr_FR.ISO8859-1/share/xml hu_HU.ISO88...
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Nov 2013 06:53:09 -0000

Author: hrs
Date: Mon Nov 11 06:52:59 2013
New Revision: 43161
URL: http://svnweb.freebsd.org/changeset/doc/43161

Log:
  - 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 &nbsp; as &#x20; 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 &#xa0; still in the final XML output.
  
  - Make XML catalog resolution consistent for l10n.ent.  This should be
    revisited for the others later.

Added:
  head/share/xml/l10n-common.ent
     - copied, changed from r43131, head/share/xml/l10n.ent
  head/sr_YU.ISO8859-2/share/xml/catalog.xml   (contents, props changed)
Modified:
  head/da_DK.ISO8859-1/share/xml/catalog.xml
  head/da_DK.ISO8859-1/share/xml/entities.ent
  head/de_DE.ISO8859-1/share/xml/catalog.xml
  head/de_DE.ISO8859-1/share/xml/entities.ent
  head/el_GR.ISO8859-7/share/xml/catalog.xml
  head/el_GR.ISO8859-7/share/xml/entities.ent
  head/en_US.ISO8859-1/share/xml/catalog.xml
  head/en_US.ISO8859-1/share/xml/entities.ent
  head/es_ES.ISO8859-1/share/xml/catalog.xml
  head/es_ES.ISO8859-1/share/xml/entities.ent
  head/fr_FR.ISO8859-1/share/xml/catalog.xml
  head/fr_FR.ISO8859-1/share/xml/entities.ent
  head/hu_HU.ISO8859-2/share/xml/catalog.xml
  head/hu_HU.ISO8859-2/share/xml/entities.ent
  head/it_IT.ISO8859-15/share/xml/catalog.xml
  head/it_IT.ISO8859-15/share/xml/entities.ent
  head/ja_JP.eucJP/share/xml/catalog.xml
  head/ja_JP.eucJP/share/xml/entities.ent
  head/ja_JP.eucJP/share/xml/l10n.ent
  head/mn_MN.UTF-8/share/xml/catalog.xml
  head/mn_MN.UTF-8/share/xml/entities.ent
  head/nl_NL.ISO8859-1/share/xml/catalog.xml
  head/nl_NL.ISO8859-1/share/xml/entities.ent
  head/pl_PL.ISO8859-2/share/xml/catalog.xml
  head/pl_PL.ISO8859-2/share/xml/entities.ent
  head/pt_BR.ISO8859-1/share/xml/catalog.xml
  head/pt_BR.ISO8859-1/share/xml/entities.ent
  head/ru_RU.KOI8-R/share/xml/catalog.xml
  head/ru_RU.KOI8-R/share/xml/entities.ent
  head/share/mk/doc.xml.mk
  head/share/xml/catalog.xml
  head/share/xml/freebsd50.dtd   (contents, props changed)
  head/share/xml/l10n.ent
  head/share/xml/xhtml10-freebsd.dtd
  head/share/xml/xslt10-freebsd.dtd
  head/sr_YU.ISO8859-2/share/xml/entities.ent
  head/tr_TR.ISO8859-9/share/xml/catalog.xml
  head/tr_TR.ISO8859-9/share/xml/entities.ent
  head/zh_CN.GB2312/share/xml/catalog.xml
  head/zh_CN.GB2312/share/xml/entities.ent
  head/zh_TW.Big5/share/xml/catalog.xml
  head/zh_TW.Big5/share/xml/entities.ent

Modified: head/da_DK.ISO8859-1/share/xml/catalog.xml
==============================================================================
--- head/da_DK.ISO8859-1/share/xml/catalog.xml	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/da_DK.ISO8859-1/share/xml/catalog.xml	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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"

Modified: head/da_DK.ISO8859-1/share/xml/entities.ent
==============================================================================
--- head/da_DK.ISO8859-1/share/xml/entities.ent	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/da_DK.ISO8859-1/share/xml/entities.ent	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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;

Modified: head/de_DE.ISO8859-1/share/xml/catalog.xml
==============================================================================
--- head/de_DE.ISO8859-1/share/xml/catalog.xml	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/de_DE.ISO8859-1/share/xml/catalog.xml	Mon Nov 11 06:52:59 2013	(r43161)
@@ -14,15 +14,15 @@
               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" />
   <public

Modified: head/de_DE.ISO8859-1/share/xml/entities.ent
==============================================================================
--- head/de_DE.ISO8859-1/share/xml/entities.ent	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/de_DE.ISO8859-1/share/xml/entities.ent	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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;

Modified: head/el_GR.ISO8859-7/share/xml/catalog.xml
==============================================================================
--- head/el_GR.ISO8859-7/share/xml/catalog.xml	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/el_GR.ISO8859-7/share/xml/catalog.xml	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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>

Modified: head/el_GR.ISO8859-7/share/xml/entities.ent
==============================================================================
--- head/el_GR.ISO8859-7/share/xml/entities.ent	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/el_GR.ISO8859-7/share/xml/entities.ent	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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;

Modified: head/en_US.ISO8859-1/share/xml/catalog.xml
==============================================================================
--- head/en_US.ISO8859-1/share/xml/catalog.xml	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/en_US.ISO8859-1/share/xml/catalog.xml	Mon Nov 11 06:52:59 2013	(r43161)
@@ -15,6 +15,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>

Modified: head/en_US.ISO8859-1/share/xml/entities.ent
==============================================================================
--- head/en_US.ISO8859-1/share/xml/entities.ent	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/en_US.ISO8859-1/share/xml/entities.ent	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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;

Modified: head/es_ES.ISO8859-1/share/xml/catalog.xml
==============================================================================
--- head/es_ES.ISO8859-1/share/xml/catalog.xml	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/es_ES.ISO8859-1/share/xml/catalog.xml	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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" />

Modified: head/es_ES.ISO8859-1/share/xml/entities.ent
==============================================================================
--- head/es_ES.ISO8859-1/share/xml/entities.ent	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/es_ES.ISO8859-1/share/xml/entities.ent	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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;

Modified: head/fr_FR.ISO8859-1/share/xml/catalog.xml
==============================================================================
--- head/fr_FR.ISO8859-1/share/xml/catalog.xml	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/fr_FR.ISO8859-1/share/xml/catalog.xml	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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" />

Modified: head/fr_FR.ISO8859-1/share/xml/entities.ent
==============================================================================
--- head/fr_FR.ISO8859-1/share/xml/entities.ent	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/fr_FR.ISO8859-1/share/xml/entities.ent	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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;

Modified: head/hu_HU.ISO8859-2/share/xml/catalog.xml
==============================================================================
--- head/hu_HU.ISO8859-2/share/xml/catalog.xml	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/hu_HU.ISO8859-2/share/xml/catalog.xml	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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" />

Modified: head/hu_HU.ISO8859-2/share/xml/entities.ent
==============================================================================
--- head/hu_HU.ISO8859-2/share/xml/entities.ent	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/hu_HU.ISO8859-2/share/xml/entities.ent	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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;

Modified: head/it_IT.ISO8859-15/share/xml/catalog.xml
==============================================================================
--- head/it_IT.ISO8859-15/share/xml/catalog.xml	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/it_IT.ISO8859-15/share/xml/catalog.xml	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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" />

Modified: head/it_IT.ISO8859-15/share/xml/entities.ent
==============================================================================
--- head/it_IT.ISO8859-15/share/xml/entities.ent	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/it_IT.ISO8859-15/share/xml/entities.ent	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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;

Modified: head/ja_JP.eucJP/share/xml/catalog.xml
==============================================================================
--- head/ja_JP.eucJP/share/xml/catalog.xml	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/ja_JP.eucJP/share/xml/catalog.xml	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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" />

Modified: head/ja_JP.eucJP/share/xml/entities.ent
==============================================================================
--- head/ja_JP.eucJP/share/xml/entities.ent	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/ja_JP.eucJP/share/xml/entities.ent	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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;

Modified: head/ja_JP.eucJP/share/xml/l10n.ent
==============================================================================
--- head/ja_JP.eucJP/share/xml/l10n.ent	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/ja_JP.eucJP/share/xml/l10n.ent	Mon Nov 11 06:52:59 2013	(r43161)
@@ -5,6 +5,8 @@
      $FreeBSD$
 -->
 
+<!ENTITY nbsp "&#x20;">
+
 <!-- docformat navi -->
 <!ENTITY docnavi.single-html "単一版">
 <!ENTITY docnavi.split-html  "分割版">

Modified: head/mn_MN.UTF-8/share/xml/catalog.xml
==============================================================================
--- head/mn_MN.UTF-8/share/xml/catalog.xml	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/mn_MN.UTF-8/share/xml/catalog.xml	Mon Nov 11 06:52:59 2013	(r43161)
@@ -11,12 +11,12 @@
               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>

Modified: head/mn_MN.UTF-8/share/xml/entities.ent
==============================================================================
--- head/mn_MN.UTF-8/share/xml/entities.ent	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/mn_MN.UTF-8/share/xml/entities.ent	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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;

Modified: head/nl_NL.ISO8859-1/share/xml/catalog.xml
==============================================================================
--- head/nl_NL.ISO8859-1/share/xml/catalog.xml	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/nl_NL.ISO8859-1/share/xml/catalog.xml	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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" />

Modified: head/nl_NL.ISO8859-1/share/xml/entities.ent
==============================================================================
--- head/nl_NL.ISO8859-1/share/xml/entities.ent	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/nl_NL.ISO8859-1/share/xml/entities.ent	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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;

Modified: head/pl_PL.ISO8859-2/share/xml/catalog.xml
==============================================================================
--- head/pl_PL.ISO8859-2/share/xml/catalog.xml	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/pl_PL.ISO8859-2/share/xml/catalog.xml	Mon Nov 11 06:52:59 2013	(r43161)
@@ -11,9 +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" />
-  <public
-        publicId="-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
-        uri="l10n.ent" />
 </catalog>

Modified: head/pl_PL.ISO8859-2/share/xml/entities.ent
==============================================================================
--- head/pl_PL.ISO8859-2/share/xml/entities.ent	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/pl_PL.ISO8859-2/share/xml/entities.ent	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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;

Modified: head/pt_BR.ISO8859-1/share/xml/catalog.xml
==============================================================================
--- head/pt_BR.ISO8859-1/share/xml/catalog.xml	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/pt_BR.ISO8859-1/share/xml/catalog.xml	Mon Nov 11 06:52:59 2013	(r43161)
@@ -11,12 +11,12 @@
               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>

Modified: head/pt_BR.ISO8859-1/share/xml/entities.ent
==============================================================================
--- head/pt_BR.ISO8859-1/share/xml/entities.ent	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/pt_BR.ISO8859-1/share/xml/entities.ent	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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;

Modified: head/ru_RU.KOI8-R/share/xml/catalog.xml
==============================================================================
--- head/ru_RU.KOI8-R/share/xml/catalog.xml	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/ru_RU.KOI8-R/share/xml/catalog.xml	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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" />

Modified: head/ru_RU.KOI8-R/share/xml/entities.ent
==============================================================================
--- head/ru_RU.KOI8-R/share/xml/entities.ent	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/ru_RU.KOI8-R/share/xml/entities.ent	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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;

Modified: head/share/mk/doc.xml.mk
==============================================================================
--- head/share/mk/doc.xml.mk	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/share/mk/doc.xml.mk	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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

Modified: head/share/xml/catalog.xml
==============================================================================
--- head/share/xml/catalog.xml	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/share/xml/catalog.xml	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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"

Modified: head/share/xml/freebsd50.dtd
==============================================================================
--- head/share/xml/freebsd50.dtd	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/share/xml/freebsd50.dtd	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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;

Copied and modified: head/share/xml/l10n-common.ent (from r43131, head/share/xml/l10n.ent)
==============================================================================
--- head/share/xml/l10n.ent	Thu Nov  7 18:35:51 2013	(r43131, copy source)
+++ head/share/xml/l10n-common.ent	Mon Nov 11 06:52:59 2013	(r43161)
@@ -3,7 +3,7 @@
 
      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.
 

Modified: head/share/xml/l10n.ent
==============================================================================
--- head/share/xml/l10n.ent	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/share/xml/l10n.ent	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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">

Modified: head/share/xml/xhtml10-freebsd.dtd
==============================================================================
--- head/share/xml/xhtml10-freebsd.dtd	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/share/xml/xhtml10-freebsd.dtd	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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;

Modified: head/share/xml/xslt10-freebsd.dtd
==============================================================================
--- head/share/xml/xslt10-freebsd.dtd	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/share/xml/xslt10-freebsd.dtd	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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

Added: head/sr_YU.ISO8859-2/share/xml/catalog.xml
==============================================================================
Binary file. No diff available.

Modified: head/sr_YU.ISO8859-2/share/xml/entities.ent
==============================================================================
--- head/sr_YU.ISO8859-2/share/xml/entities.ent	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/sr_YU.ISO8859-2/share/xml/entities.ent	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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;

Modified: head/tr_TR.ISO8859-9/share/xml/catalog.xml
==============================================================================
--- head/tr_TR.ISO8859-9/share/xml/catalog.xml	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/tr_TR.ISO8859-9/share/xml/catalog.xml	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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>

Modified: head/tr_TR.ISO8859-9/share/xml/entities.ent
==============================================================================
--- head/tr_TR.ISO8859-9/share/xml/entities.ent	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/tr_TR.ISO8859-9/share/xml/entities.ent	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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;

Modified: head/zh_CN.GB2312/share/xml/catalog.xml
==============================================================================
--- head/zh_CN.GB2312/share/xml/catalog.xml	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/zh_CN.GB2312/share/xml/catalog.xml	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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" />

Modified: head/zh_CN.GB2312/share/xml/entities.ent
==============================================================================
--- head/zh_CN.GB2312/share/xml/entities.ent	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/zh_CN.GB2312/share/xml/entities.ent	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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;

Modified: head/zh_TW.Big5/share/xml/catalog.xml
==============================================================================
--- head/zh_TW.Big5/share/xml/catalog.xml	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/zh_TW.Big5/share/xml/catalog.xml	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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" />

Modified: head/zh_TW.Big5/share/xml/entities.ent
==============================================================================
--- head/zh_TW.Big5/share/xml/entities.ent	Mon Nov 11 04:12:16 2013	(r43160)
+++ head/zh_TW.Big5/share/xml/entities.ent	Mon Nov 11 06:52:59 2013	(r43161)
@@ -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;