From af7381742b95a92cd69ad77de0da6fc03219e207 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Fri, 1 Feb 2013 09:03:01 +0000
Subject: - Move language-independent entities directly to the DTD

---
 da_DK.ISO8859-1/share/xml/entities.ent  |  6 ------
 de_DE.ISO8859-1/share/xml/entities.ent  |  6 ------
 el_GR.ISO8859-7/share/xml/entities.ent  |  6 ------
 en_US.ISO8859-1/share/xml/entities.ent  |  6 ------
 es_ES.ISO8859-1/share/xml/entities.ent  |  6 ------
 fr_FR.ISO8859-1/share/xml/entities.ent  |  6 ------
 hu_HU.ISO8859-2/share/xml/entities.ent  |  6 ------
 it_IT.ISO8859-15/share/xml/entities.ent |  6 ------
 ja_JP.eucJP/share/xml/entities.ent      |  6 ------
 mn_MN.UTF-8/share/xml/entities.ent      |  6 ------
 nl_NL.ISO8859-1/share/xml/entities.ent  |  6 ------
 pl_PL.ISO8859-2/share/xml/entities.ent  |  6 ------
 pt_BR.ISO8859-1/share/xml/entities.ent  |  6 ------
 ru_RU.KOI8-R/share/xml/entities.ent     |  6 ------
 share/xml/freebsd45.dtd                 | 12 +++++++++++-
 sr_YU.ISO8859-2/share/xml/entities.ent  |  6 ------
 tr_TR.ISO8859-9/share/xml/entities.ent  |  6 ------
 zh_CN.GB2312/share/xml/entities.ent     |  6 ------
 zh_TW.Big5/share/xml/entities.ent       |  6 ------
 19 files changed, 11 insertions(+), 109 deletions(-)

diff --git a/da_DK.ISO8859-1/share/xml/entities.ent b/da_DK.ISO8859-1/share/xml/entities.ent
index c7853679a4..f59c2fe83c 100644
--- a/da_DK.ISO8859-1/share/xml/entities.ent
+++ b/da_DK.ISO8859-1/share/xml/entities.ent
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
 
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
-	"nonexistent">
-%authors;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
-	"nonexistent">
-%man;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;
diff --git a/de_DE.ISO8859-1/share/xml/entities.ent b/de_DE.ISO8859-1/share/xml/entities.ent
index 5061a702fe..d1c5b456a2 100644
--- a/de_DE.ISO8859-1/share/xml/entities.ent
+++ b/de_DE.ISO8859-1/share/xml/entities.ent
@@ -4,18 +4,12 @@
 	basiert auf: 1.1
 -->
 
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
-	"nonexistent">
-%man;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//DE"
 	"translators.ent">
 %translators;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
-	"nonexistent">
-%authors;
 <!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
 	"nonexistent">
 %teams;
diff --git a/el_GR.ISO8859-7/share/xml/entities.ent b/el_GR.ISO8859-7/share/xml/entities.ent
index 46e60f1b7d..7a156813e3 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 % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
-	"nonexistent">
-%man;
 <!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//EL"
 	"glossary.ent">
 %glossary;
@@ -45,9 +42,6 @@
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
-	"nonexistent">
-%authors;
 <!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EL"
 	"teams.ent">
 %teams;
diff --git a/en_US.ISO8859-1/share/xml/entities.ent b/en_US.ISO8859-1/share/xml/entities.ent
index b84c1cdbf8..e5a3813abe 100644
--- a/en_US.ISO8859-1/share/xml/entities.ent
+++ b/en_US.ISO8859-1/share/xml/entities.ent
@@ -3,18 +3,12 @@
 <!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
 	"l10n.ent">
 %l10n;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
-	"../../../share/xml/man-refs.ent">
-%man;
 <!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 % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
-	"../../../share/xml/authors.ent">
-%authors;
 <!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
 	"teams.ent">
 %teams;
diff --git a/es_ES.ISO8859-1/share/xml/entities.ent b/es_ES.ISO8859-1/share/xml/entities.ent
index 11499c8a0a..a651859d38 100644
--- a/es_ES.ISO8859-1/share/xml/entities.ent
+++ b/es_ES.ISO8859-1/share/xml/entities.ent
@@ -5,15 +5,9 @@
 <!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
 	"l10n.ent">
 %l10n;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
-	"nonexistent">
-%man;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
-	"nonexistent">
-%authors;
 <!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ES"
 	"teams.ent">
 %teams;
diff --git a/fr_FR.ISO8859-1/share/xml/entities.ent b/fr_FR.ISO8859-1/share/xml/entities.ent
index 30ac9f08ed..fd5cf3bbea 100644
--- a/fr_FR.ISO8859-1/share/xml/entities.ent
+++ b/fr_FR.ISO8859-1/share/xml/entities.ent
@@ -17,15 +17,9 @@
 <!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//FR"
 	"newsgroups.ent">
 %newsgroups;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
-	"nonexistent">
-%man;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
-	"nonexistent">
-%authors;
 <!ENTITY % glossary PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//FR"
 	"glossary.ent">
 %glossary;
diff --git a/hu_HU.ISO8859-2/share/xml/entities.ent b/hu_HU.ISO8859-2/share/xml/entities.ent
index 9cd4155b4f..97b921021f 100644
--- a/hu_HU.ISO8859-2/share/xml/entities.ent
+++ b/hu_HU.ISO8859-2/share/xml/entities.ent
@@ -8,15 +8,9 @@
 <!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
 	"l10n.ent">
 %l10n;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
-	"nonexistent">
-%man;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//HU"
 	"freebsd.ent">
 %freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
-	"nonexistent">
-%authors;
 <!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//HU"
 	"teams.ent">
 %teams;
diff --git a/it_IT.ISO8859-15/share/xml/entities.ent b/it_IT.ISO8859-15/share/xml/entities.ent
index c4b4a9e7e5..5b4e18e7e0 100644
--- a/it_IT.ISO8859-15/share/xml/entities.ent
+++ b/it_IT.ISO8859-15/share/xml/entities.ent
@@ -7,15 +7,9 @@
 <!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
 	"l10n.ent">
 %l10n;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
-	"nonexistent">
-%man;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
-	"nonexistent">
-%authors;
 <!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
 	"nonexistent">
 %teams;
diff --git a/ja_JP.eucJP/share/xml/entities.ent b/ja_JP.eucJP/share/xml/entities.ent
index ef5b26f204..1450780b91 100644
--- a/ja_JP.eucJP/share/xml/entities.ent
+++ b/ja_JP.eucJP/share/xml/entities.ent
@@ -3,18 +3,12 @@
 <!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
 	"l10n.ent">
 %l10n;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
-	"nonexistent">
-%man;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;
 <!ENTITY % authors-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//JA"
 	"authors.ent">
 %authors-ja;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
-	"nonexistent">
-%authors;
 <!ENTITY % teams-ja PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//JA"
 	"teams.ent">
 %teams-ja;
diff --git a/mn_MN.UTF-8/share/xml/entities.ent b/mn_MN.UTF-8/share/xml/entities.ent
index ca664ee908..a7528cc690 100644
--- a/mn_MN.UTF-8/share/xml/entities.ent
+++ b/mn_MN.UTF-8/share/xml/entities.ent
@@ -6,15 +6,9 @@
      $FreeBSD$
 -->
 
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
-	"nonexistent">
-%man;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
-	"nonexistent">
-%authors;
 <!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//MN"
 	"teams.ent">
 %teams;
diff --git a/nl_NL.ISO8859-1/share/xml/entities.ent b/nl_NL.ISO8859-1/share/xml/entities.ent
index bd9c5e799f..d411d34cb3 100644
--- a/nl_NL.ISO8859-1/share/xml/entities.ent
+++ b/nl_NL.ISO8859-1/share/xml/entities.ent
@@ -6,15 +6,9 @@
      %SRCID%	39534
 -->
 
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
-	"nonexistent">
-%man;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
-	"nonexistent">
-%authors;
 <!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//NL"
 	"teams.ent">
 %teams;
diff --git a/pl_PL.ISO8859-2/share/xml/entities.ent b/pl_PL.ISO8859-2/share/xml/entities.ent
index 7ec7b52fc2..8c3ea6368a 100644
--- a/pl_PL.ISO8859-2/share/xml/entities.ent
+++ b/pl_PL.ISO8859-2/share/xml/entities.ent
@@ -8,15 +8,9 @@
 <!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
 	"l10n.ent">
 %l10n;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
-	"nonexistent">
-%man;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
-	"nonexistent">
-%authors;
 <!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//PL"
 	"teams.ent">
 %teams;
diff --git a/pt_BR.ISO8859-1/share/xml/entities.ent b/pt_BR.ISO8859-1/share/xml/entities.ent
index 6460afbca2..6776d9dcae 100644
--- a/pt_BR.ISO8859-1/share/xml/entities.ent
+++ b/pt_BR.ISO8859-1/share/xml/entities.ent
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
 
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
-	"nonexistent">
-%authors;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
-	"nonexistent">
-%man;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;
diff --git a/ru_RU.KOI8-R/share/xml/entities.ent b/ru_RU.KOI8-R/share/xml/entities.ent
index 40caa1f4c0..ee50a6be6e 100644
--- a/ru_RU.KOI8-R/share/xml/entities.ent
+++ b/ru_RU.KOI8-R/share/xml/entities.ent
@@ -7,15 +7,9 @@
      Original revision: 1.1 (doc/share/xml)
 -->
 
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
-	"nonexistent">
-%man;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
-	"nonexistent">
-%authors;
 <!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//RU"
 	"teams.ent">
 %teams;
diff --git a/share/xml/freebsd45.dtd b/share/xml/freebsd45.dtd
index 92bd9468bc..a062247c67 100644
--- a/share/xml/freebsd45.dtd
+++ b/share/xml/freebsd45.dtd
@@ -3,6 +3,8 @@
 <!ENTITY % output.print "IGNORE">    <!-- Print output is being generated  -->
 <!ENTITY % output.print.pdf "IGNORE"> <!-- PDF output -->
 
+<!ENTITY % jade.compat "IGNORE">
+
 <!ENTITY % local.tech.char.class "|hostid|username|groupname|devicename|maketarget|makevar|svnref">
 
 <!ENTITY % filename.element "IGNORE">
@@ -13,8 +15,16 @@
 	"/usr/local/share/xml/docbook/4.5/docbookx.dtd">
 %orig-docbook;
 
+<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
+	"authors.ent">
+%authors;
+
+<!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"
-        "nonexistent">
+	"entities.ent">
 %orig-entities;
 
 <!ELEMENT hostid (%cptr.char.mix;)*>
diff --git a/sr_YU.ISO8859-2/share/xml/entities.ent b/sr_YU.ISO8859-2/share/xml/entities.ent
index a92856522b..04c582d0f3 100644
--- a/sr_YU.ISO8859-2/share/xml/entities.ent
+++ b/sr_YU.ISO8859-2/share/xml/entities.ent
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
 
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
-	"nonexistent">
-%authors;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
-	"nonexistent">
-%man;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;
diff --git a/tr_TR.ISO8859-9/share/xml/entities.ent b/tr_TR.ISO8859-9/share/xml/entities.ent
index a92856522b..04c582d0f3 100644
--- a/tr_TR.ISO8859-9/share/xml/entities.ent
+++ b/tr_TR.ISO8859-9/share/xml/entities.ent
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
 
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
-	"nonexistent">
-%authors;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
-	"nonexistent">
-%man;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;
diff --git a/zh_CN.GB2312/share/xml/entities.ent b/zh_CN.GB2312/share/xml/entities.ent
index cd2064caef..ac85e86b8c 100644
--- a/zh_CN.GB2312/share/xml/entities.ent
+++ b/zh_CN.GB2312/share/xml/entities.ent
@@ -3,9 +3,6 @@
 <!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
 	"l10n.ent">
 %l10n;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
-	"nonexistent">
-%man;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;
@@ -15,9 +12,6 @@
 <!ENTITY % authors.in.author.tag.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author In Author Tag Entities//ZH"
 	"authors-in-author-tag.ent">
 %authors.in.author.tag.cn;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
-	"nonexistent">
-%authors;
 <!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//ZH"
 	"teams.ent">
 %teams;
diff --git a/zh_TW.Big5/share/xml/entities.ent b/zh_TW.Big5/share/xml/entities.ent
index 24ec0e64ba..3bf1002aee 100644
--- a/zh_TW.Big5/share/xml/entities.ent
+++ b/zh_TW.Big5/share/xml/entities.ent
@@ -3,18 +3,12 @@
 <!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
 	"l10n.ent">
 %l10n;
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN"
-	"nonexistent">
-%man;
 <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN"
 	"nonexistent">
 %freebsd;
 <!ENTITY % authors.cn PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//ZH"
 	"authors.ent">
 %authors.cn;
-<!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN"
-	"nonexistent">
-%authors;
 <!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
 	"nonexistent">
 %teams;
-- 
cgit v1.2.3