Date: Fri, 30 Apr 2004 10:12:52 +0400 From: Denis Peplin <den@FreeBSD.org> To: Denis Peplin <den@FreeBSD.org> Cc: doc-committers@FreeBSD.org Subject: [PATCH] Re: cvs commit: doc/en_US.ISO8859-1/books/handbook book.sgml Message-ID: <4091EE64.7080402@FreeBSD.org> In-Reply-To: <4090E7EB.9030906@FreeBSD.org> References: <200404141711.i3EHBF3S006248@repoman.freebsd.org> <40909696.5080408@FreeBSD.org> <20040429101442.GK10877@submonkey.net> <4090DE6B.3010205@FreeBSD.org> <xzpr7u7yrea.fsf@dwp.des.no> <4090E7EB.9030906@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Hello!
I'm not sure about naming conventions and so, but patch below
looks OK for mirrors (relative urls) and for local doc copy
(absolute urls).
It is possible to include URLS_ABSOLUTE=YES into src/release/Makefile
and leave urls relative by default (for mirrors).
Index: en_US.ISO8859-1/books/handbook/Makefile
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/Makefile,v
retrieving revision 1.79
diff -u -r1.79 Makefile
--- en_US.ISO8859-1/books/handbook/Makefile 16 Mar 2004 06:55:13 -0000 1.79
+++ en_US.ISO8859-1/books/handbook/Makefile 30 Apr 2004 05:45:31 -0000
@@ -225,6 +225,8 @@
CLEANFILES+= eresources.sgml.www.inc
CLEANFILES+= eresources.sgml.www.inc.tmp
+SRCS+= urls.ent
+
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
.for p in ftp cvsup
Index: en_US.ISO8859-1/books/handbook/book.sgml
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/book.sgml,v
retrieving revision 1.146
diff -u -r1.146 book.sgml
--- en_US.ISO8859-1/books/handbook/book.sgml 14 Apr 2004 17:11:13 -0000 1.146
+++ en_US.ISO8859-1/books/handbook/book.sgml 29 Apr 2004 12:49:46 -0000
@@ -24,6 +24,8 @@
<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
%trademarks;
<!ENTITY % txtfiles SYSTEM "txtfiles.ent"> %txtfiles;
+<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
+%urls;
<!ENTITY % not.published "INCLUDE">
@@ -144,7 +146,7 @@
<ulink
url="http://www.freebsdmall.com/">FreeBSD Mall</ulink>. You
may also want to <ulink
- url="../../../../search/index.html">search the
+ url="&url.main;/search/index.html">search the
handbook</ulink>.</para>
</abstract>
</bookinfo>
Index: share/mk/doc.common.mk
===================================================================
RCS file: /home/ncvs/doc/share/mk/doc.common.mk,v
retrieving revision 1.5
diff -u -r1.5 doc.common.mk
--- share/mk/doc.common.mk 12 Jan 2004 21:27:01 -0000 1.5
+++ share/mk/doc.common.mk 30 Apr 2004 05:42:51 -0000
@@ -158,3 +158,16 @@
CLEANFILES+= ${XML_MIRRORS}
CLEANFILES+= ${XML_MIRRORS}.sort
CLEANFILES+= ${XML_MIRRORS}.sort.tmp
+
+#
+# urls.ent dependency.
+#
+
+urls.ent:
+.if !defined(URLS_ABSOLUTE)
+ echo '<!ENTITY url.main "../../../..">' > ${DOC_PREFIX}/share/sgml/urls.ent
+.else
+ echo '<!ENTITY url.main "http://www.FreeBSD.org">' > ${DOC_PREFIX}/share/sgml/urls.ent
+.endif
+
+CLEANFILES+= ${DOC_PREFIX}/share/sgml/urls.ent
Index: share/sgml/catalog
===================================================================
RCS file: /home/ncvs/doc/share/sgml/catalog,v
retrieving revision 1.29
diff -u -r1.29 catalog
--- share/sgml/catalog 11 Aug 2003 16:26:04 -0000 1.29
+++ share/sgml/catalog 29 Apr 2004 12:49:29 -0000
@@ -38,6 +38,8 @@
PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN"
"trademarks.ent"
+PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"
+ "urls.ent"
-- ...................................................................... --
-- English specific ..................................................... --
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4091EE64.7080402>