From ecd26f86b1c4375fe912750e3e4f0c3d948db2d2 Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Thu, 22 May 2003 15:03:50 +0000
Subject: [PATCH] Move ($create-refentry-xref-link$) to share/sgml/freebsd.dsl
 and the localized sysids to <langcode>/share/sgml/catalog.

Since <langcode>/share/sgml/freebsd.dsl still include some
language-neutral parameters and procedures for printable formats,
I will work on assorting them similarly.  I am sorry that
this (and probably the next) commit may break the translation
team's usual update procedure, but you can merge the language-specific
freebsd.dsl from the English version as before.

Discussed on:	-doc
---
 da_DK.ISO8859-1/share/sgml/freebsd.dsl  | 29 ++------
 de_DE.ISO8859-1/share/sgml/catalog      | 19 +++++-
 de_DE.ISO8859-1/share/sgml/freebsd.dsl  | 29 ++------
 el_GR.ISO8859-7/share/sgml/freebsd.dsl  | 28 ++------
 en_US.ISO8859-1/share/sgml/freebsd.dsl  | 29 ++------
 es_ES.ISO8859-1/share/sgml/catalog      | 14 +++-
 es_ES.ISO8859-1/share/sgml/freebsd.dsl  | 20 ++----
 fr_FR.ISO8859-1/share/sgml/catalog      | 27 ++++++++
 fr_FR.ISO8859-1/share/sgml/freebsd.dsl  | 30 ++-------
 it_IT.ISO8859-15/share/sgml/catalog     | 12 ++++
 it_IT.ISO8859-15/share/sgml/freebsd.dsl | 29 ++------
 nl_NL.ISO8859-1/share/sgml/freebsd.dsl  | 28 ++------
 pl_PL.ISO8859-2/share/sgml/freebsd.dsl  | 28 ++------
 pt_BR.ISO8859-1/share/sgml/catalog      | 18 +++++
 pt_BR.ISO8859-1/share/sgml/freebsd.dsl  | 28 ++------
 ru_RU.KOI8-R/share/sgml/catalog         |  6 ++
 share/sgml/catalog                      | 90 -------------------------
 share/sgml/freebsd.dsl                  | 23 ++++++-
 sr_YU.ISO8859-2/share/sgml/freebsd.dsl  | 10 +--
 zh_TW.Big5/share/sgml/freebsd.dsl       | 29 ++------
 20 files changed, 159 insertions(+), 367 deletions(-)

diff --git a/da_DK.ISO8859-1/share/sgml/freebsd.dsl b/da_DK.ISO8859-1/share/sgml/freebsd.dsl
index 005cafdae5..43501ab3fd 100644
--- a/da_DK.ISO8859-1/share/sgml/freebsd.dsl
+++ b/da_DK.ISO8859-1/share/sgml/freebsd.dsl
@@ -13,6 +13,10 @@
       <!-- HTML only .................................................... -->
  
       <![ %output.html; [ 
+
+        <!-- Generate links to HTML man pages -->
+        (define %refentry-xref-link% #t)
+
 	(define ($email-footer$)
           (make sequence
 	    (make element gi: "p"
@@ -40,31 +44,6 @@
 		(create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
                   (literal "doc@FreeBSD.org"))
 	        (literal ">.")))))
-
-
-	<!-- Convert " ... " to `` ... '' in the HTML output. -->
-	(element quote
-	  (make sequence
-	    (literal "``")
-	    (process-children)
-	    (literal "''")))
-
-        <!-- Generate links to HTML man pages -->
-        (define %refentry-xref-link% #t)
-
-        <!-- Specify how to generate the man page link HREF -->
-        (define ($create-refentry-xref-link$ #!optional (n (current-node)))
-          (let* ((r (select-elements (children n) (normalize "refentrytitle")))
-                 (m (select-elements (children n) (normalize "manvolnum")))
-                 (v (attribute-string (normalize "vendor") n))
-                 (u (string-append "http://www.FreeBSD.org/cgi/man.cgi?query="
-                         (data r) "&" "sektion=" (data m))))
-            (case v
-              (("current") (string-append u "&" "manpath=FreeBSD+5.0-current"))
-              (("xfree86") (string-append u "&" "manpath=XFree86+4.2.0"))
-              (("netbsd")  (string-append u "&" "manpath=NetBSD+1.5"))
-              (("ports")   (string-append u "&" "manpath=FreeBSD+Ports"))
-              (else u))))
       ]]>
 
       <!-- More aesthetically pleasing chapter headers for print output --> 
diff --git a/de_DE.ISO8859-1/share/sgml/catalog b/de_DE.ISO8859-1/share/sgml/catalog
index 57c87d31cd..dcfcc7e140 100644
--- a/de_DE.ISO8859-1/share/sgml/catalog
+++ b/de_DE.ISO8859-1/share/sgml/catalog
@@ -1,5 +1,8 @@
   -- ...................................................................... --
   -- FreeBSD SGML Public Identifiers ...................................... --
+
+  -- ...................................................................... --
+  -- German specific ...................................................... --
   
   -- $FreeBSD$ --
   -- $FreeBSDde: de-docproj/share/sgml/catalog,v 1.5 2003/04/23 22:35:56 mheinen Exp $ --
@@ -8,11 +11,23 @@
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
 	"freebsd.dsl"
 
+PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
+	"l10n.ent"
+
 PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//DE"
 	"mailing-lists.ent"
 
 PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//DE"
 	"teams.ent"
 
-PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
-	"l10n.ent"
+PUBLIC  "-//FreeBSD//ENTITIES DocBook BookInfo Entities//DE"
+        "bookinfo.ent"
+
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//DE"
+	"freebsd.dsl"
+
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//DE"
+	"freebsd.dsl"
+
+PUBLIC  "-//FreeBSD//ENTITIES DocBook Translator Entities//DE"
+        "translators.ent"
diff --git a/de_DE.ISO8859-1/share/sgml/freebsd.dsl b/de_DE.ISO8859-1/share/sgml/freebsd.dsl
index cdc0c86dbe..fbdc79ac1c 100644
--- a/de_DE.ISO8859-1/share/sgml/freebsd.dsl
+++ b/de_DE.ISO8859-1/share/sgml/freebsd.dsl
@@ -19,6 +19,10 @@
     <style-specification-body>
  
       <![ %output.html; [ 
+
+        <!-- Generate links to HTML man pages -->
+        (define %refentry-xref-link% #t)
+
 	(define ($email-footer$)
           (make sequence
             (make element gi: "p"
@@ -35,31 +39,6 @@
                       attributes: (list (list "href" "mailto:de-bsd-translators@de.FreeBSD.org"))
                   (literal "de-bsd-translators@de.FreeBSD.org"))
 	        (literal ">.")))))
-
-
-	<!-- Convert " ... " to `` ... '' in the HTML output. -->
-	(element quote
-	  (make sequence
-	    (literal "``")
-	    (process-children)
-	    (literal "''")))
-
-        <!-- Generate links to HTML man pages -->
-        (define %refentry-xref-link% #t)
-
-        <!-- Specify how to generate the man page link HREF -->
-        (define ($create-refentry-xref-link$ #!optional (n (current-node)))
-          (let* ((r (select-elements (children n) (normalize "refentrytitle")))
-                 (m (select-elements (children n) (normalize "manvolnum")))
-                 (v (attribute-string (normalize "vendor") n))
-                 (u (string-append "http://www.FreeBSD.org/cgi/man.cgi?query="
-                         (data r) "&" "sektion=" (data m))))
-            (case v
-              (("current") (string-append u "&" "manpath=FreeBSD+5.0-current"))
-              (("xfree86") (string-append u "&" "manpath=XFree86+4.2.0"))
-              (("netbsd")  (string-append u "&" "manpath=NetBSD+1.5"))
-              (("ports")   (string-append u "&" "manpath=FreeBSD+Ports"))
-              (else u))))
       ]]>
     </style-specification-body>
   </style-specification>
diff --git a/el_GR.ISO8859-7/share/sgml/freebsd.dsl b/el_GR.ISO8859-7/share/sgml/freebsd.dsl
index b42d18f184..9dba5f71dd 100644
--- a/el_GR.ISO8859-7/share/sgml/freebsd.dsl
+++ b/el_GR.ISO8859-7/share/sgml/freebsd.dsl
@@ -13,6 +13,10 @@
       <!-- HTML only .................................................... -->
  
       <![ %output.html; [ 
+
+        <!-- Generate links to HTML man pages -->
+        (define %refentry-xref-link% #t)
+
 	(define ($email-footer$)
           (make sequence
 	    (make element gi: "p"
@@ -40,30 +44,6 @@
 		(create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
                   (literal "doc@FreeBSD.org"))
 	        (literal ">.")))))
-
-
-	<!-- Convert " ... " to `` ... '' in the HTML output. -->
-	(element quote
-	  (make sequence
-	    (literal "``")
-	    (process-children)
-	    (literal "''")))
-
-        <!-- Generate links to HTML man pages -->
-        (define %refentry-xref-link% #t)
-
-        <!-- Specify how to generate the man page link HREF -->
-        (define ($create-refentry-xref-link$ #!optional (n (current-node)))
-          (let* ((r (select-elements (children n) (normalize "refentrytitle")))
-                 (m (select-elements (children n) (normalize "manvolnum")))
-                 (v (attribute-string (normalize "vendor") n))
-                 (u (string-append "http://www.FreeBSD.org/cgi/man.cgi?query="
-                         (data r) "&" "sektion=" (data m))))
-            (case v
-              (("xfree86") (string-append u "&" "manpath=XFree86+4.2.0"))
-              (("netbsd")  (string-append u "&" "manpath=NetBSD+1.5"))
-              (("ports")   (string-append u "&" "manpath=FreeBSD+Ports"))
-              (else u))))
       ]]>
 
       <!-- More aesthetically pleasing chapter headers for print output --> 
diff --git a/en_US.ISO8859-1/share/sgml/freebsd.dsl b/en_US.ISO8859-1/share/sgml/freebsd.dsl
index 18109d723c..c6569f7342 100644
--- a/en_US.ISO8859-1/share/sgml/freebsd.dsl
+++ b/en_US.ISO8859-1/share/sgml/freebsd.dsl
@@ -17,6 +17,10 @@
       <!-- HTML only .................................................... -->
  
       <![ %output.html; [ 
+
+        <!-- Generate links to HTML man pages -->
+        (define %refentry-xref-link% #t)
+
 	(define ($email-footer$)
           (make sequence
 	    (make element gi: "p"
@@ -44,31 +48,6 @@
 		(create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
                   (literal "doc@FreeBSD.org"))
 	        (literal ">.")))))
-
-
-	<!-- Convert " ... " to `` ... '' in the HTML output. -->
-	(element quote
-	  (make sequence
-	    (literal "``")
-	    (process-children)
-	    (literal "''")))
-
-        <!-- Generate links to HTML man pages -->
-        (define %refentry-xref-link% #t)
-
-        <!-- Specify how to generate the man page link HREF -->
-        (define ($create-refentry-xref-link$ #!optional (n (current-node)))
-          (let* ((r (select-elements (children n) (normalize "refentrytitle")))
-                 (m (select-elements (children n) (normalize "manvolnum")))
-                 (v (attribute-string (normalize "vendor") n))
-                 (u (string-append "http://www.FreeBSD.org/cgi/man.cgi?query="
-                         (data r) "&" "sektion=" (data m))))
-            (case v
-              (("current") (string-append u "&" "manpath=FreeBSD+5.0-current"))
-              (("xfree86") (string-append u "&" "manpath=XFree86+4.3.0"))
-              (("netbsd")  (string-append u "&" "manpath=NetBSD+1.6.1"))
-              (("ports")   (string-append u "&" "manpath=FreeBSD+Ports"))
-              (else u))))
       ]]>
 
       <!-- More aesthetically pleasing chapter headers for print output --> 
diff --git a/es_ES.ISO8859-1/share/sgml/catalog b/es_ES.ISO8859-1/share/sgml/catalog
index a3628f677f..8468fc3385 100644
--- a/es_ES.ISO8859-1/share/sgml/catalog
+++ b/es_ES.ISO8859-1/share/sgml/catalog
@@ -1,7 +1,10 @@
   -- ...................................................................... --
   -- FreeBSD SGML Public Identifiers ...................................... --
+
+  -- ...................................................................... --
+  -- Spanish specific ..................................................... --
   
-  -- $FreeBSD: doc/es_ES.ISO8859-1/share/sgml/catalog,v 1.1 2000/09/28 23:29:45 nbm Exp $
+  -- $FreeBSD$
   --
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
@@ -9,3 +12,12 @@ PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
 
 PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ES"
 	"mailing-lists.ent"
+
+PUBLIC  "-//FreeBSD//ENTITIES DocBook BookInfo Entities//ES"
+        "bookinfo.ent"
+
+PUBLIC  "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ES"
+        "mailing-lists.ent"
+
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//ES"
+        "freebsd.dsl"
diff --git a/es_ES.ISO8859-1/share/sgml/freebsd.dsl b/es_ES.ISO8859-1/share/sgml/freebsd.dsl
index 92b19e2794..36cd43f8c0 100644
--- a/es_ES.ISO8859-1/share/sgml/freebsd.dsl
+++ b/es_ES.ISO8859-1/share/sgml/freebsd.dsl
@@ -13,6 +13,10 @@
       <!-- HTML only .................................................... -->
  
       <![ %output.html; [ 
+
+        <!-- Generate links to HTML man pages -->
+        (define %refentry-xref-link% #t)
+
 	(define ($email-footer$)
           (make sequence
 	    (make element gi: "p"
@@ -40,22 +44,6 @@
 		(create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
                   (literal "doc@FreeBSD.org"))
 	        (literal ">.")))))
-
-
-	<!-- Convert " ... " to `` ... '' in the HTML output. -->
-	(element quote
-	  (make sequence
-	    (literal "``")
-	    (process-children)
-	    (literal "''")))
-
-        <!-- Generate links to HTML man pages -->
-        (define %refentry-xref-link% #t)
-
-        <!-- Specify how to generate the man page link HREF -->
-        (define ($create-refentry-xref-link$ refentrytitle manvolnum)
-	  (string-append "http://www.FreeBSD.org/cgi/man.cgi?query="
-			 refentrytitle "&" "sektion=" manvolnum))
       ]]>
 
       <!-- More aesthetically pleasing chapter headers for print output --> 
diff --git a/fr_FR.ISO8859-1/share/sgml/catalog b/fr_FR.ISO8859-1/share/sgml/catalog
index 6b38e883c1..923a836c4a 100644
--- a/fr_FR.ISO8859-1/share/sgml/catalog
+++ b/fr_FR.ISO8859-1/share/sgml/catalog
@@ -1,5 +1,8 @@
   -- ...................................................................... --
   -- FreeBSD SGML Public Identifiers ...................................... --
+
+  -- ...................................................................... --
+  -- French specific ...................................................... --
  
   -- $FreeBSD$
   --
@@ -15,3 +18,27 @@ PUBLIC  "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//FR"
 
 PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//FR"
 	"teams.ent"
+
+PUBLIC  "-//FreeBSD//ENTITIES DocBook BookInfo Entities//FR"
+        "bookinfo.ent"
+
+PUBLIC  "-//FreeBSD//ENTITIES Common Document URL Entities//FR"
+        "urls.ent"
+
+PUBLIC  "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"
+        "translators.ent"
+
+PUBLIC  "-//FreeBSD//ENTITIES DocBook Abstract Entities//FR"
+        "abstract.ent"
+
+PUBLIC  "-//FreeBSD//ENTITIES DocBook ArtHeader Entities//FR"
+        "artheader.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"
+        "mailing-lists.ent"
+
+PUBLIC  "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//FR"
+        "newsgroups.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//FR"
+        "teams.ent"
diff --git a/fr_FR.ISO8859-1/share/sgml/freebsd.dsl b/fr_FR.ISO8859-1/share/sgml/freebsd.dsl
index 7247755d70..209b70ca19 100644
--- a/fr_FR.ISO8859-1/share/sgml/freebsd.dsl
+++ b/fr_FR.ISO8859-1/share/sgml/freebsd.dsl
@@ -2,7 +2,7 @@
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
 
-     $Id: freebsd.dsl,v 1.11 2002-12-11 20:06:19 blackend Exp $
+     $Id: freebsd.dsl,v 1.12 2003-05-22 15:03:49 hrs Exp $
      $FreeBSD$
      Original revision: 1.17
 
@@ -19,6 +19,10 @@
     <style-specification-body>
  
       <![ %output.html; [ 
+
+	<!-- Generate links to HTML man pages -->                        
+        (define %refentry-xref-link% #t)                                 
+                                                                         
         <!-- Fix a problem with the French localisation.  This should really
              be a patch to the dsssl-docbook-modular port, but this gets it
              more widely available sooner.  A patch will be applied to the
@@ -54,30 +58,6 @@
                       attributes: (list (list "href" "mailto:doc@FreeBSD.org"))
                   (literal "doc@FreeBSD.org"))
                 (literal ">.")))))
-
-	<!-- Convert " ... " to `` ... '' in the HTML output. -->
-	(element quote
-	  (make sequence
-	    (literal "``")
-	    (process-children)
-	    (literal "''")))
-
-	<!-- Generate links to HTML man pages -->                        
-        (define %refentry-xref-link% #t)                                 
-                                                                         
-        <!-- Specify how to generate the man page link HREF -->          
-        (define ($create-refentry-xref-link$ #!optional (n (current-node)))
-          (let* ((r (select-elements (children n) (normalize "refentrytitle")))
-                 (m (select-elements (children n) (normalize "manvolnum")))
-                 (v (attribute-string (normalize "vendor") n))
-                 (u (string-append "http://www.FreeBSD.org/cgi/man.cgi?query="
-                         (data r) "&" "sektion=" (data m))))
-            (case v
-              (("current") (string-append u "&" "manpath=FreeBSD+5.0-current"))
-              (("xfree86") (string-append u "&" "manpath=XFree86+4.2.0"))
-              (("netbsd")  (string-append u "&" "manpath=NetBSD+1.5"))
-              (("ports")   (string-append u "&" "manpath=FreeBSD+Ports"))
-              (else u))))
       ]]>
 	<!-- Fix a problem with the French localisation. The bug was
 	submitted to authors of docbook project -->
diff --git a/it_IT.ISO8859-15/share/sgml/catalog b/it_IT.ISO8859-15/share/sgml/catalog
index f615831b57..e60239be26 100644
--- a/it_IT.ISO8859-15/share/sgml/catalog
+++ b/it_IT.ISO8859-15/share/sgml/catalog
@@ -1,6 +1,9 @@
   -- ...................................................................... --
   -- FreeBSD SGML Public Identifiers ...................................... --
 
+  -- ...................................................................... --
+  -- Italian specific ..................................................... --
+
   -- $FreeBSD$
   --
 
@@ -9,3 +12,12 @@ PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
 
 PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//IT"
 	"mailing-lists.ent"
+
+PUBLIC  "-//FreeBSD//ENTITIES DocBook BookInfo Entities//IT"
+	"bookinfo.ent"
+
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//IT"
+	"freebsd.dsl"
+
+PUBLIC  "-//FreeBSD//ENTITIES DocBook Translator Entities//IT"
+	"translators.ent"
diff --git a/it_IT.ISO8859-15/share/sgml/freebsd.dsl b/it_IT.ISO8859-15/share/sgml/freebsd.dsl
index 0aede93f80..d5f400f766 100644
--- a/it_IT.ISO8859-15/share/sgml/freebsd.dsl
+++ b/it_IT.ISO8859-15/share/sgml/freebsd.dsl
@@ -18,6 +18,10 @@
       <!-- HTML only .................................................... -->
 
       <![ %output.html; [
+
+        <!-- Generate links to HTML man pages -->
+        (define %refentry-xref-link% #t)
+
         (define ($email-footer$)
           (make sequence
             (make element gi: "p"
@@ -45,31 +49,6 @@
                 (create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
                   (literal "doc@FreeBSD.org"))
                 (literal ">.")))))
-
-
-        <!-- Convert " ... " to `` ... '' in the HTML output. -->
-        (element quote
-          (make sequence
-            (literal "``")
-            (process-children)
-            (literal "''")))
-
-        <!-- Generate links to HTML man pages -->
-        (define %refentry-xref-link% #t)
-
-        <!-- Specify how to generate the man page link HREF -->
-        (define ($create-refentry-xref-link$ #!optional (n (current-node)))
-          (let* ((r (select-elements (children n) (normalize "refentrytitle")))
-                 (m (select-elements (children n) (normalize "manvolnum")))
-                 (v (attribute-string (normalize "vendor") n))
-                 (u (string-append "http://www.FreeBSD.org/cgi/man.cgi?query="
-                      (data r) "&" "sektion=" (data m))))
-            (case v
-              (("current") (string-append u "&" "manpath=FreeBSD+5.0-current"))
-              (("xfree86") (string-append u "&" "manpath=XFree86+4.2.0"))
-              (("netbsd")  (string-append u "&" "manpath=NetBSD+1.5"))
-              (("ports")   (string-append u "&" "manpath=FreeBSD+Ports"))
-              (else u))))
       ]]>
 
       <!-- Both sets of stylesheets ..................................... -->
diff --git a/nl_NL.ISO8859-1/share/sgml/freebsd.dsl b/nl_NL.ISO8859-1/share/sgml/freebsd.dsl
index cd516f0275..5226f5cffe 100644
--- a/nl_NL.ISO8859-1/share/sgml/freebsd.dsl
+++ b/nl_NL.ISO8859-1/share/sgml/freebsd.dsl
@@ -13,6 +13,10 @@
       <!-- HTML only .................................................... -->
  
       <![ %output.html; [ 
+
+        <!-- Generate links to HTML man pages -->
+        (define %refentry-xref-link% #t)
+
 	(define ($email-footer$)
           (make sequence
 	    (make element gi: "p"
@@ -40,30 +44,6 @@
 		(create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
                   (literal "doc@FreeBSD.org"))
 	        (literal ">.")))))
-
-
-	<!-- Convert " ... " to `` ... '' in the HTML output. -->
-	(element quote
-	  (make sequence
-	    (literal "``")
-	    (process-children)
-	    (literal "''")))
-
-        <!-- Generate links to HTML man pages -->
-        (define %refentry-xref-link% #t)
-
-        <!-- Specify how to generate the man page link HREF -->
-        (define ($create-refentry-xref-link$ #!optional (n (current-node)))
-          (let* ((r (select-elements (children n) (normalize "refentrytitle")))
-                 (m (select-elements (children n) (normalize "manvolnum")))
-                 (v (attribute-string (normalize "vendor") n))
-                 (u (string-append "http://www.FreeBSD.org/cgi/man.cgi?query="
-                         (data r) "&" "sektion=" (data m))))
-            (case v
-              (("xfree86") (string-append u "&" "manpath=XFree86+4.2.0"))
-              (("netbsd")  (string-append u "&" "manpath=NetBSD+1.5"))
-              (("ports")   (string-append u "&" "manpath=FreeBSD+Ports"))
-              (else u))))
       ]]>
 
       <!-- More aesthetically pleasing chapter headers for print output --> 
diff --git a/pl_PL.ISO8859-2/share/sgml/freebsd.dsl b/pl_PL.ISO8859-2/share/sgml/freebsd.dsl
index 1773e99933..31b0fd0fa9 100644
--- a/pl_PL.ISO8859-2/share/sgml/freebsd.dsl
+++ b/pl_PL.ISO8859-2/share/sgml/freebsd.dsl
@@ -18,6 +18,10 @@
       <!-- HTML only .................................................... -->
 
       <![ %output.html; [
+
+        <!-- Generate links to HTML man pages -->
+        (define %refentry-xref-link% #t)
+
         (define ($email-footer$)
           (make sequence
 	    (make element gi: "p"
@@ -45,30 +49,6 @@
 		(create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
                   (literal "doc@FreeBSD.org"))
 	        (literal ">.")))))
-
-
-	<!-- Convert " ... " to `` ... '' in the HTML output. -->
-	(element quote
-	  (make sequence
-	    (literal "``")
-	    (process-children)
-	    (literal "''")))
-
-        <!-- Generate links to HTML man pages -->
-        (define %refentry-xref-link% #t)
-
-        <!-- Specify how to generate the man page link HREF -->
-        (define ($create-refentry-xref-link$ #!optional (n (current-node)))
-          (let* ((r (select-elements (children n) (normalize "refentrytitle")))
-                 (m (select-elements (children n) (normalize "manvolnum")))
-                 (v (attribute-string (normalize "vendor") n))
-                 (u (string-append "http://www.FreeBSD.org/cgi/man.cgi?query="
-                         (data r) "&" "sektion=" (data m))))
-            (case v
-              (("xfree86") (string-append u "&" "manpath=XFree86+4.2.0"))
-              (("netbsd")  (string-append u "&" "manpath=NetBSD+1.5"))
-              (("ports")   (string-append u "&" "manpath=FreeBSD+Ports"))
-              (else u))))
       ]]>
 
       <!-- More aesthetically pleasing chapter headers for print output -->
diff --git a/pt_BR.ISO8859-1/share/sgml/catalog b/pt_BR.ISO8859-1/share/sgml/catalog
index 8062c35fd6..d97045738a 100644
--- a/pt_BR.ISO8859-1/share/sgml/catalog
+++ b/pt_BR.ISO8859-1/share/sgml/catalog
@@ -1,5 +1,8 @@
   -- ...................................................................... --
   -- FreeBSD SGML Public Identifiers ...................................... --
+
+  -- ...................................................................... --
+  -- Portuguese Brazilian specific ........................................ --
   
   -- The FreeBSD Documentation Project
   -- The FreeBSD Brazilian Portuguese Documentation Project
@@ -25,3 +28,18 @@ PUBLIC  "-//FreeBSD//ENTITIES DocBook Translators Entities//PTBR"
 PUBLIC  "-//FreeBSD//ENTITIES DocBook Specific Word Translations Entities//PTBR"
         "words.ent"
 
+PUBLIC  "-//FreeBSD//ENTITIES DocBook BookInfo Entities//PTBR"
+        "bookinfo.ent"
+
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//PTBR"
+        "freebsd.dsl"
+
+PUBLIC  "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PTBR"
+        "mailing-lists.ent"
+
+PUBLIC  "-//FreeBSD//ENTITIES DocBook Team Entities//PTBR"
+        "teams.ent"
+
+PUBLIC  "-//FreeBSD//ENTITIES DocBook Translator Entities//PTBR"
+        "translators.ent"
+
diff --git a/pt_BR.ISO8859-1/share/sgml/freebsd.dsl b/pt_BR.ISO8859-1/share/sgml/freebsd.dsl
index e58d0cd8da..42583fd922 100644
--- a/pt_BR.ISO8859-1/share/sgml/freebsd.dsl
+++ b/pt_BR.ISO8859-1/share/sgml/freebsd.dsl
@@ -29,6 +29,10 @@
       <!-- HTML only .................................................... -->
  
       <![ %output.html; [ 
+
+        <!-- Generate links to HTML man pages -->
+        (define %refentry-xref-link% #t)
+
 	(define ($email-footer$)
           (make sequence
 	    (make element gi: "p"
@@ -56,30 +60,6 @@
 		(create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
                   (literal "doc@FreeBSD.org"))
 	        (literal ">.")))))
-
-
-	<!-- Convert " ... " to `` ... '' in the HTML output. -->
-	(element quote
-	  (make sequence
-	    (literal "``")
-	    (process-children)
-	    (literal "''")))
-
-        <!-- Generate links to HTML man pages -->
-        (define %refentry-xref-link% #t)
-
-        <!-- Specify how to generate the man page link HREF -->
-        (define ($create-refentry-xref-link$ #!optional (n (current-node)))
-          (let* ((r (select-elements (children n) (normalize "refentrytitle")))
-                 (m (select-elements (children n) (normalize "manvolnum")))
-                 (v (attribute-string (normalize "vendor") n))
-                 (u (string-append "http://www.FreeBSD.org/cgi/man.cgi?query="
-                         (data r) "&" "sektion=" (data m))))
-            (case v
-              (("xfree86") (string-append u "&" "manpath=XFree86+4.2.0"))
-              (("netbsd")  (string-append u "&" "manpath=NetBSD+1.5"))
-              (("ports")   (string-append u "&" "manpath=FreeBSD+Ports"))
-              (else u))))
      ]]>
 
       <!-- More aesthetically pleasing chapter headers for print output --> 
diff --git a/ru_RU.KOI8-R/share/sgml/catalog b/ru_RU.KOI8-R/share/sgml/catalog
index 204e5c81fd..923675ed2b 100644
--- a/ru_RU.KOI8-R/share/sgml/catalog
+++ b/ru_RU.KOI8-R/share/sgml/catalog
@@ -1,5 +1,8 @@
   -- ...................................................................... --
   -- FreeBSD SGML Public Identifiers ...................................... --
+
+  -- ...................................................................... --
+  -- Russian specific ...................................................... --
   
   -- $FreeBSDru: frdp/doc/ru_RU.KOI8-R/share/sgml/catalog,v 1.2 2001/06/30 12:44:46 phantom Exp $
   -- $FreeBSD$
@@ -11,3 +14,6 @@ PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
 
 PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//RU"
 	"mailing-lists.ent"
+
+PUBLIC  "-//FreeBSD//ENTITIES DocBook BookInfo Entities//RU"
+        "bookinfo.ent"
diff --git a/share/sgml/catalog b/share/sgml/catalog
index adc7283242..06b020e593 100644
--- a/share/sgml/catalog
+++ b/share/sgml/catalog
@@ -57,93 +57,3 @@ PUBLIC  "-//FreeBSD//ENTITIES DocBook Team Entities//EN"
 
 PUBLIC  "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN"
         "../../en_US.ISO8859-1/share/sgml/newsgroups.ent"
-
-  -- ...................................................................... --
-  -- French specific ...................................................... --
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook BookInfo Entities//FR"
-        "../../fr_FR.ISO8859-1/share/sgml/bookinfo.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES Common Document URL Entities//FR"
-        "../../fr_FR.ISO8859-1/share/sgml/urls.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"
-        "../../fr_FR.ISO8859-1/share/sgml/translators.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Abstract Entities//FR"
-        "../../fr_FR.ISO8859-1/share/sgml/abstract.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook ArtHeader Entities//FR"
-        "../../fr_FR.ISO8859-1/share/sgml/artheader.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"
-        "../../fr_FR.ISO8859-1/share/sgml/mailing-lists.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//FR"
-        "../../fr_FR.ISO8859-1/share/sgml/newsgroups.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//FR"
-        "../../fr_FR.ISO8859-1/share/sgml/teams.ent"
-
-  -- ...................................................................... --
-  -- Russian specific ...................................................... --
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook BookInfo Entities//RU"
-        "../../ru_RU.KOI8-R/share/sgml/bookinfo.ent"
-
-  -- ...................................................................... --
-  -- German specific ...................................................... --
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook BookInfo Entities//DE"
-        "../../de_DE.ISO8859-1/share/sgml/bookinfo.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//DE"
-	"../../de_DE.ISO8859-1/share/sgml/freebsd.dsl"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//DE"
-	"../../de_DE.ISO8859-1/share/sgml/freebsd.dsl"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Translator Entities//DE"
-        "../../de_DE.ISO8859-1/share/sgml/translators.ent"
-
-   -- ...................................................................... --
-   -- Portuguese Brazilian specific ........................................ --
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook BookInfo Entities//PTBR"
-        "../../pt_BR.ISO8859-1/share/sgml/bookinfo.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//PTBR"
-        "../../pt_BR.ISO8859-1/share/sgml/freebsd.dsl"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Mailing List Entities//PTBR"
-        "../../pt_BR.ISO8859-1/share/sgml/mailing-lists.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Team Entities//PTBR"
-        "../../pt_BR.ISO8859-1/share/sgml/teams.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Translator Entities//PTBR"
-        "../../pt_BR.ISO8859-1/share/sgml/translators.ent"
-
-  -- ...................................................................... --
-  -- Spanish specific ..................................................... --
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook BookInfo Entities//ES"
-        "../../es_ES.ISO8859-1/share/sgml/bookinfo.ent"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Mailing List Entities//ES"
-        "../../es_ES.ISO8859-1/share/sgml/mailing-lists.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//ES"
-        "../../es_ES.ISO8859-1/share/sgml/freebsd.dsl"
-
-   -- ...................................................................... --
-   -- Italian specific ..................................................... --
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook BookInfo Entities//IT"
-	"../../it_IT.ISO8859-15/share/sgml/bookinfo.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//IT"
-	"../../it_IT.ISO8859-15/share/sgml/freebsd.dsl"
-
-PUBLIC  "-//FreeBSD//ENTITIES DocBook Translator Entities//IT"
-	"../../it_IT.ISO8859-15/share/sgml/translators.ent"
diff --git a/share/sgml/freebsd.dsl b/share/sgml/freebsd.dsl
index 186cec0b29..b7e6e69002 100644
--- a/share/sgml/freebsd.dsl
+++ b/share/sgml/freebsd.dsl
@@ -182,9 +182,19 @@
           ;; /REFENTRY
           #f)
 
-        ; Empty function to quiet warnings
-        (define ($create-refentry-xref-link$)
-          (literal ""))
+        <!-- Specify how to generate the man page link HREF -->
+        (define ($create-refentry-xref-link$ #!optional (n (current-node)))
+          (let* ((r (select-elements (children n) (normalize "refentrytitle")))
+                 (m (select-elements (children n) (normalize "manvolnum")))
+                 (v (attribute-string (normalize "vendor") n))
+                 (u (string-append "http://www.FreeBSD.org/cgi/man.cgi?query="
+                         (data r) "&" "sektion=" (data m))))
+            (case v
+              (("current") (string-append u "&" "manpath=FreeBSD+5.0-current"))
+              (("xfree86") (string-append u "&" "manpath=XFree86+4.3.0"))
+              (("netbsd")  (string-append u "&" "manpath=NetBSD+1.6.1"))
+              (("ports")   (string-append u "&" "manpath=FreeBSD+Ports"))
+              (else u))))
 
         (element citerefentry
           (let ((href          ($create-refentry-xref-link$)))
@@ -214,6 +224,13 @@
 	;; textobject
         (define preferred-mediaobject-notations
 	  '())
+
+	<!-- Convert " ... " to `` ... '' in the HTML output. -->
+	(element quote
+	  (make sequence
+	    (literal "``")
+	    (process-children)
+	    (literal "''")))
       ]]>
 
       <!-- HTML with images  ............................................ -->
diff --git a/sr_YU.ISO8859-2/share/sgml/freebsd.dsl b/sr_YU.ISO8859-2/share/sgml/freebsd.dsl
index 47bd37ee28..adb037d736 100644
--- a/sr_YU.ISO8859-2/share/sgml/freebsd.dsl
+++ b/sr_YU.ISO8859-2/share/sgml/freebsd.dsl
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO_8859-1/share/sgml/freebsd.dsl,v 1.5 2001/02/20 19:41:41 nik 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>
@@ -44,14 +44,6 @@
                       attributes: (list (list "href" "mailto:doc@FreeBSD.org"))
                   (literal "doc@FreeBSD.org"))
 	        (literal ">.")))))
-
-
-	<!-- Convert " ... " to `` ... '' in the HTML output. -->
-	(element quote
-	  (make sequence
-	    (literal "``")
-	    (process-children)
-	    (literal "''")))
       ]]>
 
        (define %html-header-tags% '(("META" ("HTTP-EQUIV" "Content-Type") ("CONTENT" "text/html; charset=iso-8859-2")))) 
diff --git a/zh_TW.Big5/share/sgml/freebsd.dsl b/zh_TW.Big5/share/sgml/freebsd.dsl
index af2d056146..242fb86423 100644
--- a/zh_TW.Big5/share/sgml/freebsd.dsl
+++ b/zh_TW.Big5/share/sgml/freebsd.dsl
@@ -13,6 +13,10 @@
       <!-- HTML only .................................................... -->
  
       <![ %output.html; [ 
+
+        <!-- Generate links to HTML man pages -->
+        (define %refentry-xref-link% #t)
+
 	(define ($email-footer$)
           (make sequence
 	    (make element gi: "p"
@@ -40,31 +44,6 @@
 		(create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
                   (literal "doc@FreeBSD.org"))
 	        (literal ">.")))))
-
-
-	<!-- Convert " ... " to `` ... '' in the HTML output. -->
-	(element quote
-	  (make sequence
-	    (literal "``")
-	    (process-children)
-	    (literal "''")))
-
-        <!-- Generate links to HTML man pages -->
-        (define %refentry-xref-link% #t)
-
-        <!-- Specify how to generate the man page link HREF -->
-        (define ($create-refentry-xref-link$ #!optional (n (current-node)))
-          (let* ((r (select-elements (children n) (normalize "refentrytitle")))
-                 (m (select-elements (children n) (normalize "manvolnum")))
-                 (v (attribute-string (normalize "vendor") n))
-                 (u (string-append "http://www.FreeBSD.org/cgi/man.cgi?query="
-                         (data r) "&" "sektion=" (data m))))
-            (case v
-              (("current") (string-append u "&" "manpath=FreeBSD+5.0-current"))
-              (("xfree86") (string-append u "&" "manpath=XFree86+4.2.0"))
-              (("netbsd")  (string-append u "&" "manpath=NetBSD+1.5"))
-              (("ports")   (string-append u "&" "manpath=FreeBSD+Ports"))
-              (else u))))
       ]]>
 
       <!-- More aesthetically pleasing chapter headers for print output -->