diff --git a/en_US.ISO8859-1/share/sgml/freebsd.dsl b/en_US.ISO8859-1/share/sgml/freebsd.dsl
new file mode 100644
index 0000000000..b9912bbffb
--- /dev/null
+++ b/en_US.ISO8859-1/share/sgml/freebsd.dsl
@@ -0,0 +1,30 @@
+<!-- $FreeBSD$ -->
+
+<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
+<!ENTITY freebsd.dsl SYSTEM "../../../share/sgml/freebsd.dsl" CDATA DSSSL>
+]>
+
+<style-sheet>
+ <style-specification use="docbook">
+ <style-specification-body>
+
+ <![ %output.html; [
+ (define ($email-footer$)
+ (make sequence
+ (literal "For questions about FreeBSD, e-mail <")
+ (make element gi: "a"
+ attributes: (list (list "href" "mailto:questions@FreeBSD.org"))
+ (literal "questions@FreeBSD.org"))
+ (literal ">.")
+ (make empty-element gi: "br")
+ (literal "For questions about this documentation, e-mail <")
+ (make element gi: "a"
+ attributes: (list (list "href" "mailto:doc@FreeBSD.org"))
+ (literal "doc@FreeBSD.org"))
+ (literal ">.")))
+ ]]>
+ </style-specification-body>
+ </style-specification>
+
+ <external-specification id="docbook" document="freebsd.dsl">
+</style-sheet>
diff --git a/en_US.ISO_8859-1/share/sgml/freebsd.dsl b/en_US.ISO_8859-1/share/sgml/freebsd.dsl
new file mode 100644
index 0000000000..b9912bbffb
--- /dev/null
+++ b/en_US.ISO_8859-1/share/sgml/freebsd.dsl
@@ -0,0 +1,30 @@
+<!-- $FreeBSD$ -->
+
+<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
+<!ENTITY freebsd.dsl SYSTEM "../../../share/sgml/freebsd.dsl" CDATA DSSSL>
+]>
+
+<style-sheet>
+ <style-specification use="docbook">
+ <style-specification-body>
+
+ <![ %output.html; [
+ (define ($email-footer$)
+ (make sequence
+ (literal "For questions about FreeBSD, e-mail <")
+ (make element gi: "a"
+ attributes: (list (list "href" "mailto:questions@FreeBSD.org"))
+ (literal "questions@FreeBSD.org"))
+ (literal ">.")
+ (make empty-element gi: "br")
+ (literal "For questions about this documentation, e-mail <")
+ (make element gi: "a"
+ attributes: (list (list "href" "mailto:doc@FreeBSD.org"))
+ (literal "doc@FreeBSD.org"))
+ (literal ">.")))
+ ]]>
+ </style-specification-body>
+ </style-specification>
+
+ <external-specification id="docbook" document="freebsd.dsl">
+</style-sheet>
diff --git a/es_ES.ISO8859-1/share/sgml/freebsd.dsl b/es_ES.ISO8859-1/share/sgml/freebsd.dsl
new file mode 100644
index 0000000000..b9912bbffb
--- /dev/null
+++ b/es_ES.ISO8859-1/share/sgml/freebsd.dsl
@@ -0,0 +1,30 @@
+<!-- $FreeBSD$ -->
+
+<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
+<!ENTITY freebsd.dsl SYSTEM "../../../share/sgml/freebsd.dsl" CDATA DSSSL>
+]>
+
+<style-sheet>
+ <style-specification use="docbook">
+ <style-specification-body>
+
+ <![ %output.html; [
+ (define ($email-footer$)
+ (make sequence
+ (literal "For questions about FreeBSD, e-mail <")
+ (make element gi: "a"
+ attributes: (list (list "href" "mailto:questions@FreeBSD.org"))
+ (literal "questions@FreeBSD.org"))
+ (literal ">.")
+ (make empty-element gi: "br")
+ (literal "For questions about this documentation, e-mail <")
+ (make element gi: "a"
+ attributes: (list (list "href" "mailto:doc@FreeBSD.org"))
+ (literal "doc@FreeBSD.org"))
+ (literal ">.")))
+ ]]>
+ </style-specification-body>
+ </style-specification>
+
+ <external-specification id="docbook" document="freebsd.dsl">
+</style-sheet>
diff --git a/es_ES.ISO_8859-1/share/sgml/freebsd.dsl b/es_ES.ISO_8859-1/share/sgml/freebsd.dsl
new file mode 100644
index 0000000000..b9912bbffb
--- /dev/null
+++ b/es_ES.ISO_8859-1/share/sgml/freebsd.dsl
@@ -0,0 +1,30 @@
+<!-- $FreeBSD$ -->
+
+<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
+<!ENTITY freebsd.dsl SYSTEM "../../../share/sgml/freebsd.dsl" CDATA DSSSL>
+]>
+
+<style-sheet>
+ <style-specification use="docbook">
+ <style-specification-body>
+
+ <![ %output.html; [
+ (define ($email-footer$)
+ (make sequence
+ (literal "For questions about FreeBSD, e-mail <")
+ (make element gi: "a"
+ attributes: (list (list "href" "mailto:questions@FreeBSD.org"))
+ (literal "questions@FreeBSD.org"))
+ (literal ">.")
+ (make empty-element gi: "br")
+ (literal "For questions about this documentation, e-mail <")
+ (make element gi: "a"
+ attributes: (list (list "href" "mailto:doc@FreeBSD.org"))
+ (literal "doc@FreeBSD.org"))
+ (literal ">.")))
+ ]]>
+ </style-specification-body>
+ </style-specification>
+
+ <external-specification id="docbook" document="freebsd.dsl">
+</style-sheet>
diff --git a/fr_FR.ISO8859-1/share/sgml/freebsd.dsl b/fr_FR.ISO8859-1/share/sgml/freebsd.dsl
new file mode 100644
index 0000000000..3f957ed651
--- /dev/null
+++ b/fr_FR.ISO8859-1/share/sgml/freebsd.dsl
@@ -0,0 +1,37 @@
+<!-- $FreeBSD$ -->
+
+<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
+<!ENTITY freebsd.dsl SYSTEM "../../../share/sgml/freebsd.dsl" CDATA DSSSL>
+]>
+
+<style-sheet>
+ <style-specification use="docbook">
+ <style-specification-body>
+
+ <![ %output.html; [
+ <!-- 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
+ port as well, and then this can be removed. -->
+ (define (gentext-fr-nav-prev prev)
+ (make sequence (literal "Pr\U-00E9;c\U-00E9;dent")))
+
+ (define ($email-footer$)
+ (make sequence
+ (literal "For questions about FreeBSD, e-mail <")
+ (make element gi: "a"
+ attributes: (list (list "href" "mailto:questions@FreeBSD.org"))
+ (literal "questions@FreeBSD.org"))
+ (literal ">.")
+ (make empty-element gi: "br")
+ (literal "For questions about this documentation, e-mail <")
+ (make element gi: "a"
+ attributes: (list (list "href" "mailto:doc@FreeBSD.org"))
+ (literal "doc@FreeBSD.org"))
+ (literal ">.")))
+ ]]>
+ </style-specification-body>
+ </style-specification>
+
+ <external-specification id="docbook" document="freebsd.dsl">
+</style-sheet>
diff --git a/fr_FR.ISO_8859-1/share/sgml/freebsd.dsl b/fr_FR.ISO_8859-1/share/sgml/freebsd.dsl
new file mode 100644
index 0000000000..3f957ed651
--- /dev/null
+++ b/fr_FR.ISO_8859-1/share/sgml/freebsd.dsl
@@ -0,0 +1,37 @@
+<!-- $FreeBSD$ -->
+
+<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
+<!ENTITY freebsd.dsl SYSTEM "../../../share/sgml/freebsd.dsl" CDATA DSSSL>
+]>
+
+<style-sheet>
+ <style-specification use="docbook">
+ <style-specification-body>
+
+ <![ %output.html; [
+ <!-- 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
+ port as well, and then this can be removed. -->
+ (define (gentext-fr-nav-prev prev)
+ (make sequence (literal "Pr\U-00E9;c\U-00E9;dent")))
+
+ (define ($email-footer$)
+ (make sequence
+ (literal "For questions about FreeBSD, e-mail <")
+ (make element gi: "a"
+ attributes: (list (list "href" "mailto:questions@FreeBSD.org"))
+ (literal "questions@FreeBSD.org"))
+ (literal ">.")
+ (make empty-element gi: "br")
+ (literal "For questions about this documentation, e-mail <")
+ (make element gi: "a"
+ attributes: (list (list "href" "mailto:doc@FreeBSD.org"))
+ (literal "doc@FreeBSD.org"))
+ (literal ">.")))
+ ]]>
+ </style-specification-body>
+ </style-specification>
+
+ <external-specification id="docbook" document="freebsd.dsl">
+</style-sheet>
diff --git a/ja_JP.eucJP/articles/Makefile.inc b/ja_JP.eucJP/articles/Makefile.inc
index eab9ed4aa2..a9df44cd97 100644
--- a/ja_JP.eucJP/articles/Makefile.inc
+++ b/ja_JP.eucJP/articles/Makefile.inc
@@ -1,9 +1,8 @@
#
-# $FreeBSD$
+# $FreeBSD: doc/ja_JP.eucJP/articles/Makefile.inc,v 1.1.1.1 2000/01/06 07:22:40 kuriyama Exp $
#
# Original revision: 1.3
-JADEFLAGS= -ilang.ja
TIDYFLAGS= -raw
DESTDIR?= ${DOCDIR}/ja/articles/${.CURDIR:T}
diff --git a/ja_JP.eucJP/books/Makefile.inc b/ja_JP.eucJP/books/Makefile.inc
index 907f6310f2..534a7db0fd 100644
--- a/ja_JP.eucJP/books/Makefile.inc
+++ b/ja_JP.eucJP/books/Makefile.inc
@@ -1,8 +1,7 @@
#
-# $FreeBSD$
+# $FreeBSD: doc/ja_JP.eucJP/books/Makefile.inc,v 1.4 1999/09/06 06:53:19 peter Exp $
#
-JADEFLAGS= -ilang.ja
TIDYFLAGS= -raw
DESTDIR?= ${DOCDIR}/ja/books/${.CURDIR:T}
diff --git a/ja_JP.eucJP/share/sgml/freebsd.dsl b/ja_JP.eucJP/share/sgml/freebsd.dsl
new file mode 100644
index 0000000000..0a91bba141
--- /dev/null
+++ b/ja_JP.eucJP/share/sgml/freebsd.dsl
@@ -0,0 +1,17 @@
+<!-- $FreeBSD$ -->
+
+<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
+<!ENTITY freebsd.dsl SYSTEM "../../../share/sgml/freebsd.dsl" CDATA DSSSL>
+]>
+
+<style-sheet>
+ <style-specification use="docbook">
+ <style-specification-body>
+ (define %gentext-language% "ja")
+
+ (define %html-header-tags% '(("META" ("HTTP-EQUIV" "Content-Type") ("CONTENT" "text/html; charset=EUC-JP"))))
+ </style-specification-body>
+ </style-specification>
+
+ <external-specification id="docbook" document="freebsd.dsl">
+</style-sheet>
diff --git a/ru_RU.KOI8-R/books/Makefile.inc b/ru_RU.KOI8-R/books/Makefile.inc
index 3cf0078886..48619cce24 100644
--- a/ru_RU.KOI8-R/books/Makefile.inc
+++ b/ru_RU.KOI8-R/books/Makefile.inc
@@ -1,8 +1,7 @@
#
-# $FreeBSD: doc/ru_RU.KOI8-R/books/Makefile.inc,v 1.3 1999/10/13 00:33:42 phantom Exp $
+# $FreeBSD: doc/ru_RU.KOI8-R/books/Makefile.inc,v 1.4 1999/10/31 22:13:32 phantom Exp $
#
-JADEFLAGS= -ilang.ru
TIDYFLAGS= -raw
DESTDIR?= ${DOCDIR}/ru_RU.KOI8-R/books/${.CURDIR:T}
diff --git a/ru_RU.KOI8-R/share/sgml/freebsd.dsl b/ru_RU.KOI8-R/share/sgml/freebsd.dsl
new file mode 100644
index 0000000000..61ae68d289
--- /dev/null
+++ b/ru_RU.KOI8-R/share/sgml/freebsd.dsl
@@ -0,0 +1,17 @@
+<!-- $FreeBSD$ -->
+
+<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
+<!ENTITY freebsd.dsl SYSTEM "../../../share/sgml/freebsd.dsl" CDATA DSSSL>
+]>
+
+<style-sheet>
+ <style-specification use="docbook">
+ <style-specification-body>
+ (define %gentext-language% "ja")
+
+ (define %html-header-tags% '(("META" ("HTTP-EQUIV" "Content-Type") ("CONTENT" "text/html; charset=koi8-r"))))
+ </style-specification-body>
+ </style-specification>
+
+ <external-specification id="docbook" document="freebsd.dsl">
+</style-sheet>
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index a2cca807ea..e6055859a8 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -1,5 +1,5 @@
#
-# $FreeBSD: doc/share/mk/doc.docbook.mk,v 1.7 2000/02/03 03:10:43 kuriyama Exp $
+# $FreeBSD: doc/share/mk/doc.docbook.mk,v 1.8 2000/03/08 11:21:37 nbm Exp $
#
# This include file <doc.docbook.mk> handles building and installing of
# DocBook documentation in the FreeBSD Documentation Project.
@@ -49,8 +49,8 @@ MASTERDOC?= ${.CURDIR}/${DOC}.sgml
JADE= ${PREFIX}/bin/jade
-DSLHTML?= ${DOC_PREFIX}/share/sgml/freebsd.dsl
-DSLPRINT?= ${DOC_PREFIX}/share/sgml/freebsd.dsl
+DSLHTML?= ../../share/sgml/freebsd.dsl
+DSLPRINT?= ../../share/sgml/freebsd.dsl
FREEBSDCATALOG= ${DOC_PREFIX}/share/sgml/catalog
DOCBOOKCATALOG= ${PREFIX}/share/sgml/docbook/catalog
@@ -137,8 +137,8 @@ CLEANFILES+= ${DOC}.tar
_docs+= ${DOC}.doc
CLEANFILES+= ${DOC}.doc
.elif ${_cf} == "pdb"
-_docs+= ${DOC}.pdb
-+CLEANFILES+= ${DOC}.pdb
+_docs+= ${DOC}.pdb ${.CURDIR:T}.pdb
++CLEANFILES+= ${DOC}.pdb ${.CURDIR:T}.pdb
.endif
.endfor
@@ -185,7 +185,10 @@ ${DOC}.txt: ${DOC}.html
w3m -S -dump ${.ALLSRC} > ${.TARGET}
${DOC}.pdb: ${DOC}.html
- iSilo386 -y -d0 -Idef ${DOC}.html ${DOC}.pdb
+ iSiloBSD -y -d0 -Idef ${DOC}.html ${DOC}.pdb
+
+${.CURDIR:T}.pdb: ${DOC}.pdb
+ ln -f ${DOC}.pdb ${.CURDIR}.pdb
${DOC}.rtf: ${SRCS}
${JADE} -Vrtf-backend -ioutput.print ${JADEOPTS} -d ${DSLPRINT} -t rtf -o ${.TARGET} ${MASTERDOC}
diff --git a/share/sgml/freebsd.dsl b/share/sgml/freebsd.dsl
index cd0e94f104..b5ad6e462b 100644
--- a/share/sgml/freebsd.dsl
+++ b/share/sgml/freebsd.dsl
@@ -1,34 +1,21 @@
-<!-- $FreeBSD: doc/share/sgml/freebsd.dsl,v 1.12 2000/02/14 01:29:17 nik Exp $ -->
+<!-- $FreeBSD: doc/share/sgml/freebsd.dsl,v 1.13 2000/02/15 01:57:17 nik Exp $ -->
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY % output.html "IGNORE">
<!ENTITY % output.print "IGNORE">
-<!ENTITY % lang.ja "IGNORE">
-<!ENTITY % lang.ja.dsssl "IGNORE">
-<!ENTITY % lang.ru "IGNORE">
+
<![ %output.html; [
<!ENTITY docbook.dsl PUBLIC "-//Norman Walsh//DOCUMENT DocBook HTML Stylesheet//EN" CDATA DSSSL>
]]>
<![ %output.print; [
<!ENTITY docbook.dsl PUBLIC "-//Norman Walsh//DOCUMENT DocBook Print Stylesheet//EN" CDATA DSSSL>
+
]]>
]>
<style-sheet>
<style-specification use="docbook">
<style-specification-body>
- <!-- Locatization -->
- <![ %lang.ja; [
- <![ %lang.ja.dsssl; [
- (define %gentext-language% "ja")
- ]]>
- (define %html-header-tags% '(("META" ("HTTP-EQUIV" "Content-Type") ("CONTENT" "text/html; charset=EUC-JP"))))
- ]]>
-
- <![ %lang.ru; [
- (define %html-header-tags% '(("META" ("HTTP-EQUIV" "Content-Type") ("CONTENT" "text/html; charset=koi8-r"))))
- ]]>
-
<!-- HTML only .................................................... -->
<![ %output.html; [
@@ -74,12 +61,35 @@
attributes: '(("VALIGN" "TOP"))
(process-children)))
- <!-- 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
- port as well, and then this can be removed. -->
- (define (gentext-fr-nav-prev prev)
- (make sequence (literal "Pr\U-00E9;c\U-00E9;dent")))
+ <!-- The next two definitions control the appearance of an
+ e-mail footer at the bottom of each page. -->
+
+ <!-- This is the text to display at the bottom of each page.
+ Defaults to nothing. The individual stylesheets should
+ redefine this as necessary. -->
+ (define ($email-footer$)
+ (empty-sosofo))
+
+ <!-- This code handles displaying $email-footer$ at the bottom
+ of each page.
+
+ If "nuchunks" is turned on then we make sure that an <hr>
+ is shown first.
+
+ Then create a centered paragraph ("<p>"), and reduce the font
+ size ("<small>"). Then run $email-footer$, which should
+ create the text and links as necessary. -->
+ (define ($html-body-end$)
+ (if (equal? $email-footer$ (normalize ""))
+ (empty-sosofo)
+ (make sequence
+ (if nochunks
+ (make empty-element gi: "hr")
+ (empty-sosofo))
+ (make element gi: "p"
+ attributes: (list (list "align" "center"))
+ (make element gi: "small"
+ ($email-footer$))))))
]]>
<!-- Print only ................................................... -->
diff --git a/zh_TW.Big5/share/sgml/freebsd.dsl b/zh_TW.Big5/share/sgml/freebsd.dsl
new file mode 100644
index 0000000000..033d4b9b56
--- /dev/null
+++ b/zh_TW.Big5/share/sgml/freebsd.dsl
@@ -0,0 +1,15 @@
+<!-- $FreeBSD$ -->
+
+<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
+<!ENTITY freebsd.dsl SYSTEM "../../../share/sgml/freebsd.dsl" CDATA DSSSL>
+]>
+
+<style-sheet>
+ <style-specification use="docbook">
+ <style-specification-body>
+
+ </style-specification-body>
+ </style-specification>
+
+ <external-specification id="docbook" document="freebsd.dsl">
+</style-sheet>