17 files changed, 37 insertions, 25 deletions

diff --git a/el_GR.ISO8859-7/share/sgml/catalog b/el_GR.ISO8859-7/share/sgml/catalog
index fd6e7e7862..ae2a5e7e44 100644
--- a/el_GR.ISO8859-7/share/sgml/catalog
+++ b/el_GR.ISO8859-7/share/sgml/catalog
@@ -18,3 +18,6 @@ PUBLIC  "-//FreeBSD//ENTITIES DocBook Team Entities//EL"
 
 PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EL"
         "trademarks.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+        "l10n.ent"
diff --git a/el_GR.ISO8859-7/share/sgml/freebsd.dsl b/el_GR.ISO8859-7/share/sgml/freebsd.dsl
index 8111343bd1..c3d10d4f6c 100644
--- a/el_GR.ISO8859-7/share/sgml/freebsd.dsl
+++ b/el_GR.ISO8859-7/share/sgml/freebsd.dsl
@@ -11,20 +11,10 @@
 <style-sheet>
   <style-specification use="docbook">
     <style-specification-body>
-      <![ %lang.el.dsssl; [
-        (define %gentext-language% "el")
-      ]]>
-
       <!-- HTML only .................................................... -->
 
       <![ %output.html; [
 
-        <!-- Add a header with the correct character-set/encoding -->
-        (define %html-header-tags%
-	  '(("META" ("HTTP-EQUIV" "Content-Type")
-		    ("CONTENT" "text/html; charset=ISO-8859-7"))))
-
-
         <!-- Generate links to HTML man pages -->
         (define %refentry-xref-link% #t)
 
diff --git a/el_GR.ISO8859-7/share/sgml/l10n.ent b/el_GR.ISO8859-7/share/sgml/l10n.ent
new file mode 100644
index 0000000000..e215468401
--- /dev/null
+++ b/el_GR.ISO8859-7/share/sgml/l10n.ent
@@ -0,0 +1,4 @@
+<!-- $FreeBSD$ -->
+
+<!-- charset for HTML output -->
+<!ENTITY doc.html.charset "iso-8859-7">
diff --git a/ja_JP.eucJP/share/sgml/freebsd.dsl b/ja_JP.eucJP/share/sgml/freebsd.dsl
index 0f79964460..c6aa195d20 100644
--- a/ja_JP.eucJP/share/sgml/freebsd.dsl
+++ b/ja_JP.eucJP/share/sgml/freebsd.dsl
@@ -1,18 +1,13 @@
-<!-- $FreeBSD: doc/ja_JP.eucJP/share/sgml/freebsd.dsl,v 1.2 2000/03/27 04:38:47 kuriyama Exp $ -->
+<!-- $FreeBSD$ -->
 
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
-<!ENTITY % lang.ja.dsssl "IGNORE">
 ]>
 
 <style-sheet>
   <style-specification use="docbook">
     <style-specification-body>
-      <![ %lang.ja.dsssl; [
-	(define %gentext-language% "ja")
-      ]]>
 
-      (define %html-header-tags% '(("META" ("HTTP-EQUIV" "Content-Type") ("CONTENT" "text/html; charset=EUC-JP")))) 
     </style-specification-body>
   </style-specification>
 
diff --git a/ja_JP.eucJP/share/sgml/l10n.ent b/ja_JP.eucJP/share/sgml/l10n.ent
index 7ddd63f93a..0a6e50882e 100644
--- a/ja_JP.eucJP/share/sgml/l10n.ent
+++ b/ja_JP.eucJP/share/sgml/l10n.ent
@@ -10,3 +10,6 @@
 
 <!ENTITY doc.langcode.ja "ja_JP.eucJP">
 <!ENTITY doc.langcode    "&doc.langcode.ja;">
+
+<!-- charset for HTML output -->
+<!ENTITY doc.html.charset "euc-jp">
diff --git a/pl_PL.ISO8859-2/share/sgml/catalog b/pl_PL.ISO8859-2/share/sgml/catalog
index 1eff5d70df..c2ed201df1 100644
--- a/pl_PL.ISO8859-2/share/sgml/catalog
+++ b/pl_PL.ISO8859-2/share/sgml/catalog
@@ -9,3 +9,6 @@ PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
 
 PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PL"
 	"mailing-lists.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+        "l10n.ent"
diff --git a/pl_PL.ISO8859-2/share/sgml/freebsd.dsl b/pl_PL.ISO8859-2/share/sgml/freebsd.dsl
index 31b0fd0fa9..a6004cbe62 100644
--- a/pl_PL.ISO8859-2/share/sgml/freebsd.dsl
+++ b/pl_PL.ISO8859-2/share/sgml/freebsd.dsl
@@ -244,9 +244,6 @@
           (list (normalize "sect4")             "  ")
           (list (normalize "sect5")             "  ")
           ))
-
-	(define %html-header-tags% '(("META" ("HTTP-EQUIV" "Content-Type") ("CONTENT" "text/html; charset=iso-8859-2"))))
-
     </style-specification-body>
   </style-specification>
 
diff --git a/pl_PL.ISO8859-2/share/sgml/l10n.ent b/pl_PL.ISO8859-2/share/sgml/l10n.ent
new file mode 100644
index 0000000000..fb351da903
--- /dev/null
+++ b/pl_PL.ISO8859-2/share/sgml/l10n.ent
@@ -0,0 +1,4 @@
+<!-- $FreeBSD$ -->
+
+<!-- charset for HTML output -->
+<!ENTITY doc.html.charset "iso-8859-2">
diff --git a/ru_RU.KOI8-R/share/sgml/freebsd.dsl b/ru_RU.KOI8-R/share/sgml/freebsd.dsl
index 15a72e0bf2..fa4a28acb7 100644
--- a/ru_RU.KOI8-R/share/sgml/freebsd.dsl
+++ b/ru_RU.KOI8-R/share/sgml/freebsd.dsl
@@ -30,8 +30,6 @@
         (define %gentext-language% "ru")
       ]]>
 
-      (define %html-header-tags% '(("META" ("HTTP-EQUIV" "Content-Type") ("CONTENT" "text/html; charset=koi8-r")))) 
-
         <!-- Generate links to HTML man pages -->
         (define %refentry-xref-link% #t)
 
diff --git a/ru_RU.KOI8-R/share/sgml/l10n.ent b/ru_RU.KOI8-R/share/sgml/l10n.ent
index 44e4b1b65c..41274efd1f 100644
--- a/ru_RU.KOI8-R/share/sgml/l10n.ent
+++ b/ru_RU.KOI8-R/share/sgml/l10n.ent
@@ -17,3 +17,6 @@
 
 <!ENTITY doc.langcode.ru "ru_RU.KOI8-R">
 <!ENTITY doc.langcode    "&doc.langcode.ru;">
+
+<!-- charset for HTML output -->
+<!ENTITY doc.html.charset "koi8-r">
diff --git a/share/sgml/freebsd.dsl b/share/sgml/freebsd.dsl
index 09b02325c3..eb4a46d656 100644
--- a/share/sgml/freebsd.dsl
+++ b/share/sgml/freebsd.dsl
@@ -37,6 +37,9 @@
 
         (define %hyphenation% #f)        <!-- Silence a warning -->
 
+        (define %html-header-tags% '(("META" ("HTTP-EQUIV" "Content-Type")
+          ("CONTENT" "text/html; charset=\"&doc.html.charset;\""))))
+
         (define %gentext-nav-use-tables%
           ;; Use tables to build the navigation headers and footers?
           #t)
diff --git a/share/sgml/l10n.ent b/share/sgml/l10n.ent
index 7f01b191d3..576b1f0c96 100644
--- a/share/sgml/l10n.ent
+++ b/share/sgml/l10n.ent
@@ -13,3 +13,6 @@
 <!-- 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">
diff --git a/sr_YU.ISO8859-2/share/sgml/catalog b/sr_YU.ISO8859-2/share/sgml/catalog
index 4a2b9be8b6..c3e69e9318 100644
--- a/sr_YU.ISO8859-2/share/sgml/catalog
+++ b/sr_YU.ISO8859-2/share/sgml/catalog
@@ -1,9 +1,11 @@
   -- ...................................................................... --
   -- FreeBSD SGML Public Identifiers ...................................... --
   
-  -- $FreeBSD: doc/sr_YU.ISO_8859-2/share/sgml/catalog,v 1.1 2000/09/28 23:29:45 nbm Exp $
+  -- $FreeBSD$
   --
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
 	"freebsd.dsl"
 
+PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+        "l10n.ent"
diff --git a/sr_YU.ISO8859-2/share/sgml/freebsd.dsl b/sr_YU.ISO8859-2/share/sgml/freebsd.dsl
index adb037d736..71e2a76229 100644
--- a/sr_YU.ISO8859-2/share/sgml/freebsd.dsl
+++ b/sr_YU.ISO8859-2/share/sgml/freebsd.dsl
@@ -45,8 +45,6 @@
                   (literal "doc@FreeBSD.org"))
 	        (literal ">.")))))
       ]]>
-
-       (define %html-header-tags% '(("META" ("HTTP-EQUIV" "Content-Type") ("CONTENT" "text/html; charset=iso-8859-2")))) 
     </style-specification-body>
   </style-specification>
 
diff --git a/sr_YU.ISO8859-2/share/sgml/l10n.ent b/sr_YU.ISO8859-2/share/sgml/l10n.ent
new file mode 100644
index 0000000000..fb351da903
--- /dev/null
+++ b/sr_YU.ISO8859-2/share/sgml/l10n.ent
@@ -0,0 +1,4 @@
+<!-- $FreeBSD$ -->
+
+<!-- charset for HTML output -->
+<!ENTITY doc.html.charset "iso-8859-2">
diff --git a/zh_CN.GB2312/share/sgml/freebsd.dsl b/zh_CN.GB2312/share/sgml/freebsd.dsl
index 0a463e8a33..e394e610e7 100644
--- a/zh_CN.GB2312/share/sgml/freebsd.dsl
+++ b/zh_CN.GB2312/share/sgml/freebsd.dsl
@@ -18,7 +18,6 @@
 	    (literal "“")
 	    (process-children)
 	    (literal "”")))
-      (define %html-header-tags% '(("META" ("HTTP-EQUIV" "Content-Type") ("CONTENT" "text/html; charset=GB2312")))) 
     </style-specification-body>
   </style-specification>
 
diff --git a/zh_CN.GB2312/share/sgml/l10n.ent b/zh_CN.GB2312/share/sgml/l10n.ent
index ef004d1156..b178d97cfc 100644
--- a/zh_CN.GB2312/share/sgml/l10n.ent
+++ b/zh_CN.GB2312/share/sgml/l10n.ent
@@ -7,3 +7,6 @@
 <!-- docformat navi -->
 <!ENTITY docnavi.single-html "完整文件">
 <!ENTITY docnavi.split-html  "章节模式">
+
+<!-- charset for HTML output -->
+<!ENTITY doc.html.charset "gb2312">