From owner-cvs-all@FreeBSD.ORG Thu Apr 29 23:13:03 2004 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 31C8516A4CE; Thu, 29 Apr 2004 23:13:03 -0700 (PDT) Received: from mail.vistcom.ru (relay-1.vistcom.ru [217.23.84.1]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0501A43D49; Thu, 29 Apr 2004 23:13:02 -0700 (PDT) (envelope-from den@FreeBSD.org) Received: by mail.vistcom.ru (Postfix, from userid 220) id 9991893486; Fri, 30 Apr 2004 10:12:58 +0400 (MSD) Received: from FreeBSD.org (llp-13.vistcom.ru [217.23.84.68]) by mail.vistcom.ru (Postfix) with ESMTP id 49FAA934E1; Fri, 30 Apr 2004 10:12:58 +0400 (MSD) Message-ID: <4091EE64.7080402@FreeBSD.org> Date: Fri, 30 Apr 2004 10:12:52 +0400 From: Denis Peplin User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.6) Gecko/20040205 X-Accept-Language: ru, en-us, en MIME-Version: 1.0 To: Denis Peplin References: <200404141711.i3EHBF3S006248@repoman.freebsd.org> <40909696.5080408@FreeBSD.org> <20040429101442.GK10877@submonkey.net> <4090DE6B.3010205@FreeBSD.org> <4090E7EB.9030906@FreeBSD.org> In-Reply-To: <4090E7EB.9030906@FreeBSD.org> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit cc: cvs-doc@FreeBSD.org cc: cvs-all@FreeBSD.org cc: Ceri Davies cc: Alexey Zelkin cc: =?ISO-8859-1?Q?Dag-Erling_Sm=F8rgrav?= cc: doc-committers@FreeBSD.org Subject: [PATCH] Re: cvs commit: doc/en_US.ISO8859-1/books/handbook book.sgml X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Apr 2004 06:13:03 -0000 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 @@ %trademarks; %txtfiles; + +%urls; @@ -144,7 +146,7 @@ FreeBSD Mall. You may also want to search the + url="&url.main;/search/index.html">search the handbook. 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 '' > ${DOC_PREFIX}/share/sgml/urls.ent +.else + echo '' > ${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 ..................................................... --