Index: share/mk/doc.common.mk
===================================================================
RCS file: /home/ncvs/doc/share/mk/doc.common.mk,v
retrieving revision 1.12
diff -u -r1.12 doc.common.mk
--- share/mk/doc.common.mk	7 Jul 2004 11:23:16 -0000	1.12
+++ share/mk/doc.common.mk	25 Jul 2004 06:33:57 -0000
@@ -108,7 +108,8 @@
 
 .if !defined(URL_RELPREFIX)
 URLS_ABSOLUTE=	YES
-.elif !defined(URLS_ABSOLUTE)
+URLS_DOC_ABSOLUTE=	YES
+.elif !defined(URLS_ABSOLUTE) || !defined(URLS_DOC_ABSOLUTE)
 _URL_RELPREFIX_LEVEL!=	set -- ${URL_RELPREFIX:S,/$,,:S,/, ,g}; echo "$$\#"
 URL_RELPREFIX_ENT=	freebsd.urls.relprefix.${_URL_RELPREFIX_LEVEL}
 .endif
@@ -174,21 +175,34 @@
 #
 # when URLS_ABSOLUTE is specified, make
 # %freebsd.urls.absolute; "INCLUDE".
+# when URLS_DOC_ABSOLUTE is specified, make
+# %freebsd.urls.doc.absolute; "INCLUDE".
 #
 .if defined(URLS_ABSOLUTE)
 HTMLFLAGS+=	-ifreebsd.urls.absolute
 SGMLNORMFLAGS+=	-ifreebsd.urls.absolute
 NSGMLSFLAGS+=	-ifreebsd.urls.absolute
-.elif defined(URL_RELPREFIX_ENT) && !empty(URL_RELPREFIX_ENT)
+.endif
+.if defined(URLS_DOC_ABSOLUTE)
+HTMLFLAGS+=	-ifreebsd.urls.doc.absolute
+SGMLNORMFLAGS+=	-ifreebsd.urls.doc.absolute
+NSGMLSFLAGS+=	-ifreebsd.urls.doc.absolute
+.endif
+.if !defined(URLS_ABSOLUTE) || !defined(URLS_DOC_ABSOLUTE) && defined(URL_RELPREFIX_ENT) && !empty(URL_RELPREFIX_ENT)
 HTMLFLAGS+=	-i${URL_RELPREFIX_ENT}
 SGMLNORMFLAGS+=	-i${URL_RELPREFIX_ENT}
 NSGMLSFLAGS+=	-i${URL_RELPREFIX_ENT}
 .endif
 
-# for ascii and printable format, always use URLS_ABSOLUTE.
+# for ascii and printable format, always use URLS_ABSOLUTE
+# and URLS_DOC_ABSOLUTE.
 PRINTFLAGS+=	-ifreebsd.urls.absolute
 HTMLTXTFLAGS+=	-ifreebsd.urls.absolute
 OTHERFLAGS+=	-ifreebsd.urls.absolute
+PRINTFLAGS+=	-ifreebsd.urls.doc.absolute
+HTMLTXTFLAGS+=	-ifreebsd.urls.doc.absolute
+OTHERFLAGS+=	-ifreebsd.urls.doc.absolute
 
-# for packages, always use URLS_ABSOLUTE.
+# for packages, always use URLS_ABSOLUTE and URLS_DOC_ABSOLUTE.
 PKGMAKEFLAGS+=	URLS_ABSOLUTE=yes
+PKGMAKEFLAGS+=	URLS_DOC_ABSOLUTE=yes
Index: share/sgml/urls.ent
===================================================================
RCS file: /home/ncvs/doc/share/sgml/urls.ent,v
retrieving revision 1.4
diff -u -r1.4 urls.ent
--- share/sgml/urls.ent	7 Jul 2004 11:23:16 -0000	1.4
+++ share/sgml/urls.ent	25 Jul 2004 07:07:21 -0000
@@ -1,6 +1,7 @@
 <!-- $FreeBSD: doc/share/sgml/urls.ent,v 1.4 2004/07/07 11:23:16 hrs Exp $ -->
 
 <!ENTITY % freebsd.urls.absolute "IGNORE">
+<!ENTITY % freebsd.urls.doc.absolute "IGNORE">
 <!ENTITY % freebsd.urls.relprefix.1 "IGNORE">
 <!ENTITY % freebsd.urls.relprefix.2 "IGNORE">
 <!ENTITY % freebsd.urls.relprefix.3 "IGNORE">
@@ -46,7 +47,51 @@
 <!ENTITY url.base "http://www.FreeBSD.org">
 ]]>
 
+<![ %freebsd.urls.doc.absolute; [
+
+<!ENTITY url.doc.base "http://www.FreeBSD.org">
+]]>
+
 <!-- put relative urls here -->
 
 <!ENTITY url.main "&url.relprefix;">
 <!ENTITY url.base "&url.relprefix;">
+
+<!ENTITY url.doc.base "&url.relprefix;">
+
+<!-- put links to articles and books here -->
+
+<!ENTITY url.bn.articles "&url.doc.base;/doc/bn_BD.ISO10646-1/articles">
+<!ENTITY url.bn.books "&url.doc.base;/doc/bn_BD.ISO10646-1/books">
+<!ENTITY url.da.articles "&url.doc.base;/doc/da_DK.ISO8859-1/articles">
+<!ENTITY url.da.books "&url.doc.base;/doc/da_DK.ISO8859-1/books">
+<!ENTITY url.de.articles "&url.doc.base;/doc/de_DE.ISO8859-1/articles">
+<!ENTITY url.de.books "&url.doc.base;/doc/de_DE.ISO8859-1/books">
+<!ENTITY url.el.articles "&url.doc.base;/doc/el_GR.ISO8859-7/articles">
+<!ENTITY url.el.books "&url.doc.base;/doc/el_GR.ISO8859-7/books">
+<!ENTITY url.en.articles "&url.doc.base;/doc/en_US.ISO8859-1/articles">
+<!ENTITY url.en.books "&url.doc.base;/doc/en_US.ISO8859-1/books">
+<!ENTITY url.es.articles "&url.doc.base;/doc/es_ES.ISO8859-1/articles">
+<!ENTITY url.es.books "&url.doc.base;/doc/es_ES.ISO8859-1/books">
+<!ENTITY url.fr.articles "&url.doc.base;/doc/fr_FR.ISO8859-1/articles">
+<!ENTITY url.fr.books "&url.doc.base;/doc/fr_FR.ISO8859-1/books">
+<!ENTITY url.it.articles "&url.doc.base;/doc/it_IT.ISO8859-15/articles">
+<!ENTITY url.it.books "&url.doc.base;/doc/it_IT.ISO8859-15/books">
+<!ENTITY url.ja.articles "&url.doc.base;/doc/ja_JP.eucJP/articles">
+<!ENTITY url.ja.books "&url.doc.base;/doc/ja_JP.eucJP/books">
+<!ENTITY url.nl.articles "&url.doc.base;/doc/nl_NL.ISO8859-1/articles">
+<!ENTITY url.nl.books "&url.doc.base;/doc/nl_NL.ISO8859-1/books">
+<!ENTITY url.no.articles "&url.doc.base;/doc/no_NO.ISO8859-1/articles">
+<!ENTITY url.no.books "&url.doc.base;/doc/no_NO.ISO8859-1/books">
+<!ENTITY url.pl.articles "&url.doc.base;/doc/pl_PL.ISO8859-2/articles">
+<!ENTITY url.pl.books "&url.doc.base;/doc/pl_PL.ISO8859-2/books">
+<!ENTITY url.pt.articles "&url.doc.base;/doc/pt_BR.ISO8859-1/articles">
+<!ENTITY url.pt.books "&url.doc.base;/doc/pt_BR.ISO8859-1/books">
+<!ENTITY url.ru.articles "&url.doc.base;/doc/ru_RU.KOI8-R/articles">
+<!ENTITY url.ru.books "&url.doc.base;/doc/ru_RU.KOI8-R/books">
+<!ENTITY url.sr.articles "&url.doc.base;/doc/sr_YU.ISO8859-2/articles">
+<!ENTITY url.sr.books "&url.doc.base;/doc/sr_YU.ISO8859-2/books">
+<!ENTITY url.tr.articles "&url.doc.base;/doc/tr_TR.ISO8859-9/articles">
+<!ENTITY url.tr.books "&url.doc.base;/doc/tr_TR.ISO8859-9/books">
+<!ENTITY url.zh.articles "&url.doc.base;/doc/zh_TW.Big5/articles">
+<!ENTITY url.zh.books "&url.doc.base;/doc/zh_TW.Big5/books">