diff --git a/en_US.ISO8859-1/articles/5-roadmap/Makefile b/en_US.ISO8859-1/articles/5-roadmap/Makefile index 93dfd73071..6e007740bb 100644 --- a/en_US.ISO8859-1/articles/5-roadmap/Makefile +++ b/en_US.ISO8859-1/articles/5-roadmap/Makefile @@ -10,7 +10,8 @@ FORMATS?= html INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= -WITH_ARTICLE_TOC=YES +WITH_ARTICLE_TOC?=YES +WITH_DOCFORMAT_NAVI_LINK?=YES # SGML content SRCS= article.sgml diff --git a/en_US.ISO8859-1/articles/checkpoint/Makefile b/en_US.ISO8859-1/articles/checkpoint/Makefile index 8ed0801bd5..5f38e62723 100644 --- a/en_US.ISO8859-1/articles/checkpoint/Makefile +++ b/en_US.ISO8859-1/articles/checkpoint/Makefile @@ -7,6 +7,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= article.sgml IMAGES_EN= networks.pic diff --git a/en_US.ISO8859-1/articles/committers-guide/Makefile b/en_US.ISO8859-1/articles/committers-guide/Makefile index 3fd9f366c9..06ac91cdb6 100644 --- a/en_US.ISO8859-1/articles/committers-guide/Makefile +++ b/en_US.ISO8859-1/articles/committers-guide/Makefile @@ -13,7 +13,8 @@ FORMATS?= html INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= -WITH_ARTICLE_TOC=YES +WITH_ARTICLE_TOC?=YES +WITH_DOCFORMAT_NAVI_LINK?=YES # # SRCS lists the individual SGML files that make up the document. Changes diff --git a/en_US.ISO8859-1/articles/contributing/Makefile b/en_US.ISO8859-1/articles/contributing/Makefile index 87264e55ec..511e391975 100644 --- a/en_US.ISO8859-1/articles/contributing/Makefile +++ b/en_US.ISO8859-1/articles/contributing/Makefile @@ -7,7 +7,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= -WITH_ARTICLE_TOC=YES +WITH_ARTICLE_TOC?=YES +WITH_DOCFORMAT_NAVI_LINK?=YES SRCS= article.sgml diff --git a/en_US.ISO8859-1/articles/contributors/Makefile b/en_US.ISO8859-1/articles/contributors/Makefile index 87264e55ec..511e391975 100644 --- a/en_US.ISO8859-1/articles/contributors/Makefile +++ b/en_US.ISO8859-1/articles/contributors/Makefile @@ -7,7 +7,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= -WITH_ARTICLE_TOC=YES +WITH_ARTICLE_TOC?=YES +WITH_DOCFORMAT_NAVI_LINK?=YES SRCS= article.sgml diff --git a/en_US.ISO8859-1/articles/cvs-freebsd/Makefile b/en_US.ISO8859-1/articles/cvs-freebsd/Makefile index 058eadc0eb..bbca39c88c 100644 --- a/en_US.ISO8859-1/articles/cvs-freebsd/Makefile +++ b/en_US.ISO8859-1/articles/cvs-freebsd/Makefile @@ -11,6 +11,8 @@ FORMATS?= html INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + # SGML content SRCS= article.sgml diff --git a/en_US.ISO8859-1/articles/cvsup-advanced/Makefile b/en_US.ISO8859-1/articles/cvsup-advanced/Makefile index 87264e55ec..511e391975 100644 --- a/en_US.ISO8859-1/articles/cvsup-advanced/Makefile +++ b/en_US.ISO8859-1/articles/cvsup-advanced/Makefile @@ -7,7 +7,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= -WITH_ARTICLE_TOC=YES +WITH_ARTICLE_TOC?=YES +WITH_DOCFORMAT_NAVI_LINK?=YES SRCS= article.sgml diff --git a/en_US.ISO8859-1/articles/dialup-firewall/Makefile b/en_US.ISO8859-1/articles/dialup-firewall/Makefile index 886e21cc9d..a796e78fe4 100644 --- a/en_US.ISO8859-1/articles/dialup-firewall/Makefile +++ b/en_US.ISO8859-1/articles/dialup-firewall/Makefile @@ -7,6 +7,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= article.sgml DOC_PREFIX?= ${.CURDIR}/../../.. diff --git a/en_US.ISO8859-1/articles/diskless-x/Makefile b/en_US.ISO8859-1/articles/diskless-x/Makefile index 886e21cc9d..a796e78fe4 100644 --- a/en_US.ISO8859-1/articles/diskless-x/Makefile +++ b/en_US.ISO8859-1/articles/diskless-x/Makefile @@ -7,6 +7,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= article.sgml DOC_PREFIX?= ${.CURDIR}/../../.. diff --git a/en_US.ISO8859-1/articles/euro/Makefile b/en_US.ISO8859-1/articles/euro/Makefile index 886e21cc9d..a796e78fe4 100644 --- a/en_US.ISO8859-1/articles/euro/Makefile +++ b/en_US.ISO8859-1/articles/euro/Makefile @@ -7,6 +7,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= article.sgml DOC_PREFIX?= ${.CURDIR}/../../.. diff --git a/en_US.ISO8859-1/articles/explaining-bsd/Makefile b/en_US.ISO8859-1/articles/explaining-bsd/Makefile index 3893643f3e..f2d7ac4c78 100644 --- a/en_US.ISO8859-1/articles/explaining-bsd/Makefile +++ b/en_US.ISO8859-1/articles/explaining-bsd/Makefile @@ -1,5 +1,5 @@ # -# $FreeBSD: doc/en_US.ISO_8859-1/articles/freebsd-questions/Makefile,v 1.1 2001/02/16 00:22:33 nik Exp $ +# $FreeBSD$ # MAINTAINER=grog@FreeBSD.org @@ -11,6 +11,8 @@ FORMATS?= html INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + # # SRCS lists the individual SGML files that make up the document. Changes # to any of these files will force a rebuild diff --git a/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile b/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile index 6f1b1ccf43..693ec98fef 100644 --- a/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile +++ b/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile @@ -12,6 +12,8 @@ MAINTAINER= schweikh@FreeBSD.org INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + # SGML content SRCS= article.sgml stage_1.sh stage_2.sh stage_3.mk diff --git a/en_US.ISO8859-1/articles/filtering-bridges/Makefile b/en_US.ISO8859-1/articles/filtering-bridges/Makefile index 7a18da1228..a796e78fe4 100644 --- a/en_US.ISO8859-1/articles/filtering-bridges/Makefile +++ b/en_US.ISO8859-1/articles/filtering-bridges/Makefile @@ -1,3 +1,4 @@ +# $FreeBSD$ DOC?= article @@ -6,6 +7,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= article.sgml DOC_PREFIX?= ${.CURDIR}/../../.. diff --git a/en_US.ISO8859-1/articles/fonts/Makefile b/en_US.ISO8859-1/articles/fonts/Makefile index 886e21cc9d..a796e78fe4 100644 --- a/en_US.ISO8859-1/articles/fonts/Makefile +++ b/en_US.ISO8859-1/articles/fonts/Makefile @@ -7,6 +7,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= article.sgml DOC_PREFIX?= ${.CURDIR}/../../.. diff --git a/en_US.ISO8859-1/articles/formatting-media/Makefile b/en_US.ISO8859-1/articles/formatting-media/Makefile index 886e21cc9d..a796e78fe4 100644 --- a/en_US.ISO8859-1/articles/formatting-media/Makefile +++ b/en_US.ISO8859-1/articles/formatting-media/Makefile @@ -7,6 +7,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= article.sgml DOC_PREFIX?= ${.CURDIR}/../../.. diff --git a/en_US.ISO8859-1/articles/freebsd-questions/Makefile b/en_US.ISO8859-1/articles/freebsd-questions/Makefile index 16296d21ff..f2d7ac4c78 100644 --- a/en_US.ISO8859-1/articles/freebsd-questions/Makefile +++ b/en_US.ISO8859-1/articles/freebsd-questions/Makefile @@ -1,5 +1,5 @@ # -# $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/Makefile,v 1.3 1999/09/06 06:52:35 peter Exp $ +# $FreeBSD$ # MAINTAINER=grog@FreeBSD.org @@ -11,6 +11,8 @@ FORMATS?= html INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + # # SRCS lists the individual SGML files that make up the document. Changes # to any of these files will force a rebuild diff --git a/en_US.ISO8859-1/articles/hats/Makefile b/en_US.ISO8859-1/articles/hats/Makefile index 886e21cc9d..a796e78fe4 100644 --- a/en_US.ISO8859-1/articles/hats/Makefile +++ b/en_US.ISO8859-1/articles/hats/Makefile @@ -7,6 +7,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= article.sgml DOC_PREFIX?= ${.CURDIR}/../../.. diff --git a/en_US.ISO8859-1/articles/hubs/Makefile b/en_US.ISO8859-1/articles/hubs/Makefile index 87264e55ec..511e391975 100644 --- a/en_US.ISO8859-1/articles/hubs/Makefile +++ b/en_US.ISO8859-1/articles/hubs/Makefile @@ -7,7 +7,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= -WITH_ARTICLE_TOC=YES +WITH_ARTICLE_TOC?=YES +WITH_DOCFORMAT_NAVI_LINK?=YES SRCS= article.sgml diff --git a/en_US.ISO8859-1/articles/ipsec-must/Makefile b/en_US.ISO8859-1/articles/ipsec-must/Makefile index 5a348e95df..a796e78fe4 100644 --- a/en_US.ISO8859-1/articles/ipsec-must/Makefile +++ b/en_US.ISO8859-1/articles/ipsec-must/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: doc/en_US.ISO8859-1/articles/ipsec-must/Makefile,v 1.1 2000/06/26 09:10:24 nik Exp $ +# $FreeBSD$ DOC?= article @@ -7,6 +7,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= article.sgml DOC_PREFIX?= ${.CURDIR}/../../.. diff --git a/en_US.ISO8859-1/articles/java-tomcat/Makefile b/en_US.ISO8859-1/articles/java-tomcat/Makefile index 2b95b0060b..600709809d 100644 --- a/en_US.ISO8859-1/articles/java-tomcat/Makefile +++ b/en_US.ISO8859-1/articles/java-tomcat/Makefile @@ -14,6 +14,8 @@ FORMATS?= html INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + # SGML content SRCS= article.sgml diff --git a/en_US.ISO8859-1/articles/laptop/Makefile b/en_US.ISO8859-1/articles/laptop/Makefile index 483154c25e..ddbfe5d2e3 100644 --- a/en_US.ISO8859-1/articles/laptop/Makefile +++ b/en_US.ISO8859-1/articles/laptop/Makefile @@ -11,6 +11,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= article.sgml DOC_PREFIX?= ${.CURDIR}/../../.. diff --git a/en_US.ISO8859-1/articles/mh/Makefile b/en_US.ISO8859-1/articles/mh/Makefile index 886e21cc9d..a796e78fe4 100644 --- a/en_US.ISO8859-1/articles/mh/Makefile +++ b/en_US.ISO8859-1/articles/mh/Makefile @@ -7,6 +7,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= article.sgml DOC_PREFIX?= ${.CURDIR}/../../.. diff --git a/en_US.ISO8859-1/articles/multi-os/Makefile b/en_US.ISO8859-1/articles/multi-os/Makefile index 886e21cc9d..a796e78fe4 100644 --- a/en_US.ISO8859-1/articles/multi-os/Makefile +++ b/en_US.ISO8859-1/articles/multi-os/Makefile @@ -7,6 +7,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= article.sgml DOC_PREFIX?= ${.CURDIR}/../../.. diff --git a/en_US.ISO8859-1/articles/new-users/Makefile b/en_US.ISO8859-1/articles/new-users/Makefile index 886e21cc9d..a796e78fe4 100644 --- a/en_US.ISO8859-1/articles/new-users/Makefile +++ b/en_US.ISO8859-1/articles/new-users/Makefile @@ -7,6 +7,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= article.sgml DOC_PREFIX?= ${.CURDIR}/../../.. diff --git a/en_US.ISO8859-1/articles/pam/Makefile b/en_US.ISO8859-1/articles/pam/Makefile index fe6b103d31..30871f82ae 100644 --- a/en_US.ISO8859-1/articles/pam/Makefile +++ b/en_US.ISO8859-1/articles/pam/Makefile @@ -7,8 +7,9 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= -WITH_ARTICLE_TOC=YES -WITH_INLINE_LEGALNOTICE=YES +WITH_ARTICLE_TOC?=YES +WITH_INLINE_LEGALNOTICE?=YES +WITH_DOCFORMAT_NAVI_LINK?=YES SRCS= article.sgml pam_app.c pam_conv.c pam_module.c diff --git a/en_US.ISO8859-1/articles/pr-guidelines/Makefile b/en_US.ISO8859-1/articles/pr-guidelines/Makefile index ea2ae7b7dc..b4541023c6 100644 --- a/en_US.ISO8859-1/articles/pr-guidelines/Makefile +++ b/en_US.ISO8859-1/articles/pr-guidelines/Makefile @@ -7,7 +7,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= -WITH_ARTICLE_TOC=YES +WITH_ARTICLE_TOC?=YES +WITH_DOCFORMAT_NAVI_LINK?=YES SRCS= article.sgml diff --git a/en_US.ISO8859-1/articles/problem-reports/Makefile b/en_US.ISO8859-1/articles/problem-reports/Makefile index 87264e55ec..511e391975 100644 --- a/en_US.ISO8859-1/articles/problem-reports/Makefile +++ b/en_US.ISO8859-1/articles/problem-reports/Makefile @@ -7,7 +7,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= -WITH_ARTICLE_TOC=YES +WITH_ARTICLE_TOC?=YES +WITH_DOCFORMAT_NAVI_LINK?=YES SRCS= article.sgml diff --git a/en_US.ISO8859-1/articles/pxe/Makefile b/en_US.ISO8859-1/articles/pxe/Makefile index 7a18da1228..a796e78fe4 100644 --- a/en_US.ISO8859-1/articles/pxe/Makefile +++ b/en_US.ISO8859-1/articles/pxe/Makefile @@ -1,3 +1,4 @@ +# $FreeBSD$ DOC?= article @@ -6,6 +7,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= article.sgml DOC_PREFIX?= ${.CURDIR}/../../.. diff --git a/en_US.ISO8859-1/articles/releng-packages/Makefile b/en_US.ISO8859-1/articles/releng-packages/Makefile index 00cedcd8e7..d4558429db 100644 --- a/en_US.ISO8859-1/articles/releng-packages/Makefile +++ b/en_US.ISO8859-1/articles/releng-packages/Makefile @@ -10,6 +10,8 @@ FORMATS?= html INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + # SGML content SRCS= article.sgml diff --git a/en_US.ISO8859-1/articles/releng/Makefile b/en_US.ISO8859-1/articles/releng/Makefile index d0509146f4..5c72c3c467 100644 --- a/en_US.ISO8859-1/articles/releng/Makefile +++ b/en_US.ISO8859-1/articles/releng/Makefile @@ -10,7 +10,8 @@ FORMATS?= html INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= -WITH_ARTICLE_TOC=YES +WITH_ARTICLE_TOC?=YES +WITH_DOCFORMAT_NAVI_LINK?=YES # SGML content SRCS= article.sgml branches.ascii diff --git a/en_US.ISO8859-1/articles/serial-uart/Makefile b/en_US.ISO8859-1/articles/serial-uart/Makefile index 7a18da1228..a796e78fe4 100644 --- a/en_US.ISO8859-1/articles/serial-uart/Makefile +++ b/en_US.ISO8859-1/articles/serial-uart/Makefile @@ -1,3 +1,4 @@ +# $FreeBSD$ DOC?= article @@ -6,6 +7,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= article.sgml DOC_PREFIX?= ${.CURDIR}/../../.. diff --git a/en_US.ISO8859-1/articles/smp/Makefile b/en_US.ISO8859-1/articles/smp/Makefile index d6d4fcec9f..0e28ea46e2 100644 --- a/en_US.ISO8859-1/articles/smp/Makefile +++ b/en_US.ISO8859-1/articles/smp/Makefile @@ -9,7 +9,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= -WITH_ARTICLE_TOC=YES +WITH_ARTICLE_TOC?=YES +WITH_DOCFORMAT_NAVI_LINK?=YES SRCS= article.sgml diff --git a/en_US.ISO8859-1/articles/solid-state/Makefile b/en_US.ISO8859-1/articles/solid-state/Makefile index 94354ccd05..6a5fa999e6 100644 --- a/en_US.ISO8859-1/articles/solid-state/Makefile +++ b/en_US.ISO8859-1/articles/solid-state/Makefile @@ -10,7 +10,8 @@ FORMATS?= html INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= -WITH_ARTICLE_TOC=YES +WITH_ARTICLE_TOC?=YES +WITH_DOCFORMAT_NAVI_LINK?=YES # # SRCS lists the individual SGML files that make up the document. Changes diff --git a/en_US.ISO8859-1/articles/storage-devices/Makefile b/en_US.ISO8859-1/articles/storage-devices/Makefile index 7a18da1228..a796e78fe4 100644 --- a/en_US.ISO8859-1/articles/storage-devices/Makefile +++ b/en_US.ISO8859-1/articles/storage-devices/Makefile @@ -1,3 +1,4 @@ +# $FreeBSD$ DOC?= article @@ -6,6 +7,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= article.sgml DOC_PREFIX?= ${.CURDIR}/../../.. diff --git a/en_US.ISO8859-1/articles/vinum/Makefile b/en_US.ISO8859-1/articles/vinum/Makefile index 257fc4f030..1a93c61ce5 100644 --- a/en_US.ISO8859-1/articles/vinum/Makefile +++ b/en_US.ISO8859-1/articles/vinum/Makefile @@ -9,6 +9,8 @@ IMAGES_EN= ad0b4aft.eps ad2b4aft.eps arch.eps INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= article.sgml DOC_PREFIX?= ${.CURDIR}/../../.. diff --git a/en_US.ISO8859-1/articles/vm-design/Makefile b/en_US.ISO8859-1/articles/vm-design/Makefile index bfed9d70fd..b08a7000c7 100644 --- a/en_US.ISO8859-1/articles/vm-design/Makefile +++ b/en_US.ISO8859-1/articles/vm-design/Makefile @@ -9,6 +9,8 @@ IMAGES_EN= fig1.eps fig2.eps fig3.eps fig4.eps INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= article.sgml DOC_PREFIX?= ${.CURDIR}/../../.. diff --git a/en_US.ISO8859-1/articles/zip-drive/Makefile b/en_US.ISO8859-1/articles/zip-drive/Makefile index 60f4a450ea..a796e78fe4 100644 --- a/en_US.ISO8859-1/articles/zip-drive/Makefile +++ b/en_US.ISO8859-1/articles/zip-drive/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: doc/en_US.ISO_8859-1/articles/programming-tools/Makefile,v 1.8 1999/09/06 06:52:38 peter Exp $ +# $FreeBSD$ DOC?= article @@ -7,6 +7,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= article.sgml DOC_PREFIX?= ${.CURDIR}/../../.. diff --git a/en_US.ISO8859-1/books/arch-handbook/Makefile b/en_US.ISO8859-1/books/arch-handbook/Makefile index 360a8fe698..d37df792a5 100644 --- a/en_US.ISO8859-1/books/arch-handbook/Makefile +++ b/en_US.ISO8859-1/books/arch-handbook/Makefile @@ -12,6 +12,8 @@ FORMATS?= html-split HAS_INDEX= true +WITH_DOCFORMAT_NAVI_LINK?=YES + INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= diff --git a/en_US.ISO8859-1/books/bibliography/Makefile b/en_US.ISO8859-1/books/bibliography/Makefile index 6ca5ea735d..48db419bc9 100644 --- a/en_US.ISO8859-1/books/bibliography/Makefile +++ b/en_US.ISO8859-1/books/bibliography/Makefile @@ -1,5 +1,5 @@ # -# $FreeBSD: doc/en_US.ISO8859-1/books/handbook/Makefile,v 1.40 2001/07/17 01:37:39 murray Exp $ +# $FreeBSD$ # # @@ -12,6 +12,8 @@ FORMATS?= html INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + # # SRCS lists the individual SGML files that make up the document. Changes # to any of these files will force a rebuild diff --git a/en_US.ISO8859-1/books/corp-net-guide/Makefile b/en_US.ISO8859-1/books/corp-net-guide/Makefile index a15b0c5382..4ec05dda9a 100644 --- a/en_US.ISO8859-1/books/corp-net-guide/Makefile +++ b/en_US.ISO8859-1/books/corp-net-guide/Makefile @@ -7,6 +7,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= book.sgml IMAGES_EN= 08-01.eps diff --git a/en_US.ISO8859-1/books/design-44bsd/Makefile b/en_US.ISO8859-1/books/design-44bsd/Makefile index 3784c7b90d..d1420cb817 100644 --- a/en_US.ISO8859-1/books/design-44bsd/Makefile +++ b/en_US.ISO8859-1/books/design-44bsd/Makefile @@ -9,6 +9,8 @@ IMAGES_EN= fig1.eps fig2.eps INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= book.sgml # Use the local DSSSL file diff --git a/en_US.ISO8859-1/books/developers-handbook/Makefile b/en_US.ISO8859-1/books/developers-handbook/Makefile index 360a8fe698..d37df792a5 100644 --- a/en_US.ISO8859-1/books/developers-handbook/Makefile +++ b/en_US.ISO8859-1/books/developers-handbook/Makefile @@ -12,6 +12,8 @@ FORMATS?= html-split HAS_INDEX= true +WITH_DOCFORMAT_NAVI_LINK?=YES + INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= diff --git a/en_US.ISO8859-1/books/faq/Makefile b/en_US.ISO8859-1/books/faq/Makefile index e6205e1ca3..26ce83156a 100644 --- a/en_US.ISO8859-1/books/faq/Makefile +++ b/en_US.ISO8859-1/books/faq/Makefile @@ -13,7 +13,9 @@ FORMATS?= html-split html INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= -WITH_BIBLIOXREF_TITLE=YES +WITH_BIBLIOXREF_TITLE?=YES +WITH_DOCFORMAT_NAVI_LINK?=YES + # # SRCS lists the individual SGML files that make up the document. Changes # to any of these files will force a rebuild diff --git a/en_US.ISO8859-1/books/fdp-primer/Makefile b/en_US.ISO8859-1/books/fdp-primer/Makefile index 3e9ced1ea7..14f3cc1b64 100644 --- a/en_US.ISO8859-1/books/fdp-primer/Makefile +++ b/en_US.ISO8859-1/books/fdp-primer/Makefile @@ -1,5 +1,5 @@ # -# $FreeBSD: doc/en_US.ISO_8859-1/books/fdp-primer/Makefile,v 1.9 2000/07/16 16:40:36 nik Exp $ +# $FreeBSD$ # # Build the FreeBSD Documentation Project Primer. # @@ -10,6 +10,8 @@ DOC?= book FORMATS?= html-split html +WITH_DOCFORMAT_NAVI_LINK?=YES + INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= diff --git a/en_US.ISO8859-1/books/handbook/Makefile b/en_US.ISO8859-1/books/handbook/Makefile index 4166a127c7..6ce21e4649 100644 --- a/en_US.ISO8859-1/books/handbook/Makefile +++ b/en_US.ISO8859-1/books/handbook/Makefile @@ -32,6 +32,8 @@ FORMATS?= html-split HAS_INDEX= true +WITH_DOCFORMAT_NAVI_LINK?=YES + INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= diff --git a/en_US.ISO8859-1/books/porters-handbook/Makefile b/en_US.ISO8859-1/books/porters-handbook/Makefile index 4557e616bf..aa0990dbdc 100644 --- a/en_US.ISO8859-1/books/porters-handbook/Makefile +++ b/en_US.ISO8859-1/books/porters-handbook/Makefile @@ -1,5 +1,5 @@ # -# $FreeBSD: doc/en_US.ISO_8859-1/books/porter-handbook/Makefile,v 1.1 2000/04/22 23:47:57 nik Exp $ +# $FreeBSD$ # # Build the FreeBSD Porter's Handbook. # @@ -13,6 +13,8 @@ FORMATS?= html-split INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + # # SRCS lists the individual SGML files that make up the document. Changes # to any of these files will force a rebuild diff --git a/en_US.ISO8859-1/share/sgml/catalog b/en_US.ISO8859-1/share/sgml/catalog index f92e609315..41eb3847fd 100644 --- a/en_US.ISO8859-1/share/sgml/catalog +++ b/en_US.ISO8859-1/share/sgml/catalog @@ -1,7 +1,7 @@ -- ...................................................................... -- -- FreeBSD SGML Public Identifiers ...................................... -- - -- $FreeBSD: doc/en_US.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 +9,7 @@ PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN" "mailing-lists.ent" + +PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN" + "l10n.ent" + diff --git a/en_US.ISO8859-1/share/sgml/freebsd.dsl b/en_US.ISO8859-1/share/sgml/freebsd.dsl index af2d056146..83aaba035c 100644 --- a/en_US.ISO8859-1/share/sgml/freebsd.dsl +++ b/en_US.ISO8859-1/share/sgml/freebsd.dsl @@ -2,6 +2,10 @@ + + +%freebsd.l10n; + diff --git a/en_US.ISO8859-1/share/sgml/l10n.ent b/en_US.ISO8859-1/share/sgml/l10n.ent new file mode 100644 index 0000000000..40a8b127a9 --- /dev/null +++ b/en_US.ISO8859-1/share/sgml/l10n.ent @@ -0,0 +1,9 @@ + + + + + diff --git a/ja_JP.eucJP/articles/contributing/Makefile b/ja_JP.eucJP/articles/contributing/Makefile index de1cf2a3c9..ddfa1f212f 100644 --- a/ja_JP.eucJP/articles/contributing/Makefile +++ b/ja_JP.eucJP/articles/contributing/Makefile @@ -8,7 +8,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= -WITH_ARTICLE_TOC=YES +WITH_ARTICLE_TOC?=YES +WITH_DOCFORMAT_NAVI_LINK?=YES SRCS= article.sgml diff --git a/ja_JP.eucJP/articles/contributors/Makefile b/ja_JP.eucJP/articles/contributors/Makefile index de1cf2a3c9..ddfa1f212f 100644 --- a/ja_JP.eucJP/articles/contributors/Makefile +++ b/ja_JP.eucJP/articles/contributors/Makefile @@ -8,7 +8,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= -WITH_ARTICLE_TOC=YES +WITH_ARTICLE_TOC?=YES +WITH_DOCFORMAT_NAVI_LINK?=YES SRCS= article.sgml diff --git a/ja_JP.eucJP/articles/dialup-firewall/Makefile b/ja_JP.eucJP/articles/dialup-firewall/Makefile index 0d87c27db0..e6b4a66913 100644 --- a/ja_JP.eucJP/articles/dialup-firewall/Makefile +++ b/ja_JP.eucJP/articles/dialup-firewall/Makefile @@ -8,6 +8,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= article.sgml DOC_PREFIX?= ${.CURDIR}/../../.. diff --git a/ja_JP.eucJP/articles/diskless-x/Makefile b/ja_JP.eucJP/articles/diskless-x/Makefile index 55ffe5118c..2221a1d870 100644 --- a/ja_JP.eucJP/articles/diskless-x/Makefile +++ b/ja_JP.eucJP/articles/diskless-x/Makefile @@ -8,6 +8,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= article.sgml DOC_PREFIX?= ${.CURDIR}/../../.. diff --git a/ja_JP.eucJP/articles/fonts/Makefile b/ja_JP.eucJP/articles/fonts/Makefile index 624dcd9eb7..d4e3610d9a 100644 --- a/ja_JP.eucJP/articles/fonts/Makefile +++ b/ja_JP.eucJP/articles/fonts/Makefile @@ -8,6 +8,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= article.sgml DOC_PREFIX?= ${.CURDIR}/../../.. diff --git a/ja_JP.eucJP/articles/ipsec-must/Makefile b/ja_JP.eucJP/articles/ipsec-must/Makefile index d58839e308..164421984d 100644 --- a/ja_JP.eucJP/articles/ipsec-must/Makefile +++ b/ja_JP.eucJP/articles/ipsec-must/Makefile @@ -8,6 +8,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= article.sgml DOC_PREFIX?= ${.CURDIR}/../../.. diff --git a/ja_JP.eucJP/articles/multi-os/Makefile b/ja_JP.eucJP/articles/multi-os/Makefile index 624dcd9eb7..d4e3610d9a 100644 --- a/ja_JP.eucJP/articles/multi-os/Makefile +++ b/ja_JP.eucJP/articles/multi-os/Makefile @@ -8,6 +8,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= article.sgml DOC_PREFIX?= ${.CURDIR}/../../.. diff --git a/ja_JP.eucJP/articles/zip-drive/Makefile b/ja_JP.eucJP/articles/zip-drive/Makefile index 0d87c27db0..e6b4a66913 100644 --- a/ja_JP.eucJP/articles/zip-drive/Makefile +++ b/ja_JP.eucJP/articles/zip-drive/Makefile @@ -8,6 +8,8 @@ FORMATS?= html INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= article.sgml DOC_PREFIX?= ${.CURDIR}/../../.. diff --git a/ja_JP.eucJP/books/design-44bsd/Makefile b/ja_JP.eucJP/books/design-44bsd/Makefile index 2d8d9e676d..3d0bbb55de 100644 --- a/ja_JP.eucJP/books/design-44bsd/Makefile +++ b/ja_JP.eucJP/books/design-44bsd/Makefile @@ -10,6 +10,8 @@ IMAGES= fig1.eps fig2.eps INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + SRCS= book.sgml # Use the local DSSSL file diff --git a/ja_JP.eucJP/books/faq/Makefile b/ja_JP.eucJP/books/faq/Makefile index b97abaf74d..750e3f2880 100644 --- a/ja_JP.eucJP/books/faq/Makefile +++ b/ja_JP.eucJP/books/faq/Makefile @@ -15,6 +15,8 @@ FORMATS?= html-split html INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + # # SRCS lists the individual SGML files that make up the document. Changes # to any of these files will force a rebuild diff --git a/ja_JP.eucJP/books/fdp-primer/Makefile b/ja_JP.eucJP/books/fdp-primer/Makefile index f31792a11e..016153d3e7 100644 --- a/ja_JP.eucJP/books/fdp-primer/Makefile +++ b/ja_JP.eucJP/books/fdp-primer/Makefile @@ -15,6 +15,8 @@ FORMATS?= html-split html INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + # # SRCS lists the individual SGML files that make up the document. Changes # to any of these files will force a rebuild diff --git a/ja_JP.eucJP/books/handbook/Makefile b/ja_JP.eucJP/books/handbook/Makefile index cd243a28d8..7624fd708a 100644 --- a/ja_JP.eucJP/books/handbook/Makefile +++ b/ja_JP.eucJP/books/handbook/Makefile @@ -35,6 +35,8 @@ FORMATS?= html-split INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + #IMAGES = advanced-networking/isdn-bus.eps #IMAGES+= advanced-networking/isdn-twisted-pair.eps #IMAGES+= advanced-networking/natd.eps diff --git a/ja_JP.eucJP/books/porters-handbook/Makefile b/ja_JP.eucJP/books/porters-handbook/Makefile index 14c27aafd8..a02f38549e 100644 --- a/ja_JP.eucJP/books/porters-handbook/Makefile +++ b/ja_JP.eucJP/books/porters-handbook/Makefile @@ -14,6 +14,8 @@ FORMATS?= html-split INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + # # SRCS lists the individual SGML files that make up the document. Changes # to any of these files will force a rebuild diff --git a/ja_JP.eucJP/books/ppp-primer/Makefile b/ja_JP.eucJP/books/ppp-primer/Makefile index e21e455cc9..f5a37ab16f 100644 --- a/ja_JP.eucJP/books/ppp-primer/Makefile +++ b/ja_JP.eucJP/books/ppp-primer/Makefile @@ -16,6 +16,8 @@ FORMATS?= html-split html INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= +WITH_DOCFORMAT_NAVI_LINK?=YES + # # SRCS lists the individual SGML files that make up the document. Changes # to any of these files will force a rebuild diff --git a/ja_JP.eucJP/share/sgml/catalog b/ja_JP.eucJP/share/sgml/catalog index 5ea23aa21a..2d47041738 100644 --- a/ja_JP.eucJP/share/sgml/catalog +++ b/ja_JP.eucJP/share/sgml/catalog @@ -10,6 +10,9 @@ PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//JA" "mailing-lists.ent" +PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN" + "l10n.ent" + PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//JA" "authors.ent" diff --git a/ja_JP.eucJP/share/sgml/l10n.ent b/ja_JP.eucJP/share/sgml/l10n.ent new file mode 100644 index 0000000000..364a0a056b --- /dev/null +++ b/ja_JP.eucJP/share/sgml/l10n.ent @@ -0,0 +1,9 @@ + + + + + diff --git a/share/misc/docbook.css b/share/misc/docbook.css index 3e4bcd9683..df96aa29db 100644 --- a/share/misc/docbook.css +++ b/share/misc/docbook.css @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: doc/share/misc/docbook.css,v 1.3 2001/07/03 12:30:32 nik Exp $ + * $FreeBSD$ */ BODY ADDRESS { @@ -159,3 +159,7 @@ BODY H1, BODY H2, BODY H3, BODY H4, BODY H5, BODY H6 { background-color: #F0F0F0; text-decoration: underline; } + +.PROGRAMLISTING, .SCREEN { + margin-left: 3ex; +} diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk index a5177ecd53..0c1a4ae774 100644 --- a/share/mk/doc.docbook.mk +++ b/share/mk/doc.docbook.mk @@ -203,6 +203,9 @@ PRINTFLAGS+= -V %generate-article-toc% HTMLFLAGS+= -V biblio-xref-title PRINTFLAGS+= -V biblio-xref-title .endif +.if defined(WITH_DOCFORMAT_NAVI_LINK) && !empty(WITH_DOCFORMAT_NAVI_LINK) +HTMLFLAGS+= -V %generate-docformat-navi-link% +.endif PERL?= /usr/bin/perl PKG_CREATE?= /usr/sbin/pkg_create diff --git a/share/sgml/catalog b/share/sgml/catalog index 93c34b1d20..adc7283242 100644 --- a/share/sgml/catalog +++ b/share/sgml/catalog @@ -29,6 +29,12 @@ PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN" "freebsd.ent" +PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN" + "l10n.ent" + +PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN" + "l10n.ent" + -- ...................................................................... -- -- English specific ..................................................... -- diff --git a/share/sgml/freebsd.dsl b/share/sgml/freebsd.dsl index 3f561bfcb7..186cec0b29 100644 --- a/share/sgml/freebsd.dsl +++ b/share/sgml/freebsd.dsl @@ -8,6 +8,11 @@ + +%freebsd.l10n; + +%freebsd.l10n-common; + ]]> @@ -62,6 +67,10 @@ ;; HTML file. #f) + (define %generate-docformat-navi-link% + ;; Create docformat navi link for HTML output? + #f) + (define (book-titlepage-recto-elements) (list (normalize "title") (normalize "subtitle") @@ -76,6 +85,59 @@ (normalize "legalnotice") (normalize "isbn"))) + ;; Create a simple navigation link + ;; if %generate-docformat-navi-link% defined. + (define (make-docformat-navi tlist) + (let ((rootgi (gi (sgml-root-element)))) + (make element gi: "DIV" + attributes: '(("CLASS" "DOCFORAMTNAVI")) + (literal "[ ") + (make-docformat-navi-link rootgi tlist) + (literal " ]")))) + + (define (make-docformat-navi-link rootgi tlist) + (make sequence + (cond + ((null? tlist) (empty-sosofo)) + ((null? (car tlist)) (empty-sosofo)) + ((not (symbol? (car tlist))) (empty-sosofo)) + ((equal? (car tlist) 'html-split) + (make sequence + (create-link (list (list "href" "./index.html")) + (literal "&docnavi.split-html;")) + (if (not (null? (cdr tlist))) + (make sequence + (literal " / ") + (make-docformat-navi-link rootgi (cdr tlist))) + (empty-sosofo)))) + ((equal? (car tlist) 'html-single) + (make sequence + (create-link (list (list "href" + (string-append "./" (case-fold-down rootgi) ".html"))) + (literal "&docnavi.single-html;")) + (if (not (null? (cdr tlist))) + (make sequence + (literal " / ") + (make-docformat-navi-link rootgi (cdr tlist))) + (empty-sosofo)))) + (else (empty-sosofo))))) + + (define (article-titlepage-separator side) + (make sequence + (if %generate-docformat-navi-link% + (make-docformat-navi '(html-split html-single)) + (empty-sosofo)) + (make empty-element gi: "HR"))) + + (define (book-titlepage-separator side) + (if (equal? side 'recto) + (make sequence + (if %generate-docformat-navi-link% + (make-docformat-navi '(html-split html-single)) + (empty-sosofo)) + (make empty-element gi: "HR")) + (empty-sosofo))) + @@ -601,10 +663,10 @@ #f) (define %indent-programlisting-lines% - " ") + #f) (define %indent-screen-lines% - " ") + #f) (define (article-titlepage-recto-elements) (list (normalize "title") diff --git a/share/sgml/l10n.ent b/share/sgml/l10n.ent new file mode 100644 index 0000000000..7f01b191d3 --- /dev/null +++ b/share/sgml/l10n.ent @@ -0,0 +1,15 @@ + + + + +