diff options
Diffstat (limited to 'en_US.ISO8859-1/articles')
32 files changed, 106 insertions, 49 deletions
| diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 91af421771..a9fa47258e 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -715,11 +715,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.o  	</itemizedlist>  	<para>You will almost certainly get a conflict because -	  of the <literal>$Id: article.sgml,v 1.203 2004-08-02 04:15:08 murray Exp $</literal> (or in FreeBSD's case, +	  of the <literal>$Id: article.sgml,v 1.204 2004-08-05 10:04:26 den Exp $</literal> (or in FreeBSD's case,  	  <literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)  	  lines, so you will have to edit the file to resolve the conflict -	  (remove the marker lines and the second <literal>$Id: article.sgml,v 1.203 2004-08-02 04:15:08 murray Exp $</literal> line, -	  leaving the original <literal>$Id: article.sgml,v 1.203 2004-08-02 04:15:08 murray Exp $</literal> line intact).</para> +	  (remove the marker lines and the second <literal>$Id: article.sgml,v 1.204 2004-08-05 10:04:26 den Exp $</literal> line, +	  leaving the original <literal>$Id: article.sgml,v 1.204 2004-08-05 10:04:26 den Exp $</literal> line intact).</para>        </listitem>        <listitem> @@ -1029,7 +1029,7 @@ checkout -P</programlisting>        <listitem>  	<para>Add yourself to the <quote>Developers</quote> section of -	  the <ulink url="../contributors/index.html">Contributors List</ulink> +	  the <ulink url="&url.articles.contributors;/index.html">Contributors List</ulink>  	  and remove yourself from the <quote>Additional  	  Contributors</quote> section.</para>        </listitem> @@ -1424,7 +1424,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>  	    related discussion takes place on the &a.doc;. Committers  	    interested in contributing to the documentation should familiarize  	    themselves with the <ulink -	    url="../../books/fdp-primer/index.html">Documentation Project +	    url="&url.books.fdp-primer;/index.html">Documentation Project  	    Primer</ulink>.</para>  	</listitem>        </varlistentry> @@ -1873,7 +1873,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>  	    <filename>Makefile</filename> for any package or subtree  	    which is being actively maintained by one or more people;  	    see <ulink -	    url="../../books/developers-handbook/policies.html"></ulink> +	    url="&url.books.developers-handbook;/policies.html"></ulink>  	    for documentation on this.  Where sections of code have  	    several maintainers, commits to affected areas by one  	    maintainer need to be reviewed by at least one other @@ -1887,7 +1887,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>  	    someone who manages an overall category of FreeBSD  	    evolution, such as internationalization or networking.  	    See <ulink -	    url="../contributors/staff-who.html"> +	    url="&url.articles.contributors;/staff-who.html">  	    http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/contributors/staff-who.html</ulink>  	    for more information on this.</para>  	</listitem> @@ -2357,7 +2357,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>  	    </screen>  	    <para>The -	      <ulink url="../../books/porters-handbook/index.html">Porters +	      <ulink url="&url.books.porters-handbook;/index.html">Porters  	      Handbook</ulink> contains more detailed  	      instructions.</para> @@ -2368,7 +2368,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>  	    <para>If the port came from a submitter who has not  	      contributed to the project before, add that person's  	      name to the <ulink -	      url="../contributors/contrib-additional.html">Additional +	      url="&url.articles.contributors;/contrib-additional.html">Additional  	      Contributors</ulink> section of the FreeBSD Contributors  	      List.</para> @@ -2763,7 +2763,7 @@ docs:Documentation Bug:freebsd-doc:</programlisting>  		<step>  		  <para>Submit a docs PR to add the new category to both the -		    <ulink url="../../books/porters-handbook/makefile-categories.html#PORTING-CATEGORIES"> +		    <ulink url="&url.books.porters-handbook;/makefile-categories.html#PORTING-CATEGORIES">  		    Porter's Handbook</ulink> and to  		    <filename>www/en/ports/categories</filename>.</para>  		</step> diff --git a/en_US.ISO8859-1/articles/console-server/Makefile b/en_US.ISO8859-1/articles/console-server/Makefile index b3384825b1..fcb305cc9c 100644 --- a/en_US.ISO8859-1/articles/console-server/Makefile +++ b/en_US.ISO8859-1/articles/console-server/Makefile @@ -14,5 +14,7 @@ INSTALL_ONLY_COMPRESSED?=  SRCS=		article.sgml  IMAGES_EN=	tk0231-9-1.png +URL_RELPREFIX?=	../../../..  DOC_PREFIX?= ${.CURDIR}/../../.. +  .include "${DOC_PREFIX}/share/mk/doc.project.mk" diff --git a/en_US.ISO8859-1/articles/console-server/article.sgml b/en_US.ISO8859-1/articles/console-server/article.sgml index 890accf8f4..6787bc7af1 100644 --- a/en_US.ISO8859-1/articles/console-server/article.sgml +++ b/en_US.ISO8859-1/articles/console-server/article.sgml @@ -7,6 +7,8 @@  %authors;  <!ENTITY % trademark PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">  %trademark; +<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"> +%urls;  ]>  <article> @@ -329,7 +331,7 @@  	will need to upgrade to a more modern version of &os; (which  	you should do anyway, to make sure your system is not  	vulnerable to known security issues).  See the <ulink -	url="../../books/handbook/makeworld.html">&os; +	url="&url.books.handbook;/makeworld.html">&os;  	Handbook</ulink> for information about updating your  	system.</para> @@ -342,7 +344,7 @@  	<literal>GENERIC</literal> kernel, so you will need to create a kernel        config file with the appropriate entries.  See &man.stl.4; and the        appropriate section of the <ulink -	URL="../../books/handbook/kernelconfig.html">&os; +	URL="&url.books.handbook;/kernelconfig.html">&os;        Handbook</ulink>.</para>      </sect2> @@ -1276,7 +1278,7 @@ exit 0</programlisting>      <title>Using a Serial Console on &os;</title>      <para>The procedure for doing this is described in detail in the -      <ulink URL="../../books/handbook/serialconsole-setup.html">&os; +      <ulink URL="&url.books.handbook;/serialconsole-setup.html">&os;        Handbook</ulink>.  This is a quick summary.</para>      <sect2 id="freebsd-kernconf"> diff --git a/en_US.ISO8859-1/articles/contributing/article.sgml b/en_US.ISO8859-1/articles/contributing/article.sgml index 4b2878f2ef..000748a1b7 100644 --- a/en_US.ISO8859-1/articles/contributing/article.sgml +++ b/en_US.ISO8859-1/articles/contributing/article.sgml @@ -106,7 +106,7 @@ FreeBSD Entities//EN"> %freebsd;  	    language, you can help translate additional documents or  	    verify that the translations are up-to-date.  First take a  	    look at the <ulink -	    url="../../books/fdp-primer/translations.html">Translations +	    url="&url.books.fdp-primer;/translations.html">Translations  	    FAQ</ulink> in the FreeBSD Documentation Project Primer.  	    You are not committing yourself to translating every  	    single FreeBSD document by doing this — as a @@ -248,7 +248,7 @@ FreeBSD Entities//EN"> %freebsd;  	tolerance for a <emphasis>high</emphasis> volume of mail!) may  	subscribe to the &a.hackers;.  	See <ulink -	url="../../books/handbook/eresources.html#ERESOURCES-MAIL">The +	url="&url.books.handbook;/eresources.html#ERESOURCES-MAIL">The  	FreeBSD Handbook</ulink> for more information about this and  	other mailing lists.</para> @@ -280,7 +280,7 @@ FreeBSD Entities//EN"> %freebsd;  	the &a.bugs;.</para>        <para>See also <ulink -  	URL="../../articles/problem-reports/article.html">this +  	URL="&url.articles.problem-reports;/article.html">this    	article</ulink> on how to write good problem reports.</para>      </sect2> @@ -291,7 +291,7 @@ FreeBSD Entities//EN"> %freebsd;        <para>Changes to the documentation are overseen by the &a.doc;.  	Please look at the <ulink -	url="../../books/fdp-primer/index.html">FreeBSD Documentation +	url="&url.books.fdp-primer;/index.html">FreeBSD Documentation  	Project Primer</ulink> for complete instructions.  Send  	submissions and changes (even small ones are welcome!) using  	&man.send-pr.1; as described in <link @@ -311,7 +311,7 @@ FreeBSD Entities//EN"> %freebsd;  	known as <quote>FreeBSD-CURRENT</quote> which is made  	available in a variety of ways for the convenience of  	developers working actively on the system. See <ulink url=" -	../../books/handbook/current-stable.html">The FreeBSD +	&url.books.handbook;/current-stable.html">The FreeBSD  	Handbook</ulink> for more information about getting and using  	FreeBSD-CURRENT.</para> @@ -546,7 +546,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  	<para>We can always use new mirror sites for FTP, WWW or  	  <command>cvsup</command>.  If you would like to be such a  	  mirror, please see the <ulink -	  url="../../articles/hubs/index.html">Mirroring FreeBSD</ulink> +	  url="&url.articles.hubs;/index.html">Mirroring FreeBSD</ulink>  	  article for more information.</para>        </sect3>      </sect2> diff --git a/en_US.ISO8859-1/articles/contributors/article.sgml b/en_US.ISO8859-1/articles/contributors/article.sgml index 60fb711019..fef0c1f7d4 100644 --- a/en_US.ISO8859-1/articles/contributors/article.sgml +++ b/en_US.ISO8859-1/articles/contributors/article.sgml @@ -301,7 +301,7 @@  	  <listitem>  	    <para><ulink url="http://www.osd.bsdi.com/">BSDi</ulink> (formerly Walnut Creek CDROM)  	      has donated almost more than we can say (see the 'About the FreeBSD Project' -	      section of the <ulink url="../../books/handbook/index.html">FreeBSD Handbook</ulink> for more details). +	      section of the <ulink url="&url.books.handbook;/index.html">FreeBSD Handbook</ulink> for more details).  	      In particular, we would like to thank them for the original  	      hardware used for <hostid  		role="fqdn">freefall.FreeBSD.org</hostid>, our primary @@ -530,7 +530,7 @@        </varlistentry>        <varlistentry> -	<term><ulink url="../releng/index.html">Release +	<term><ulink url="&url.articles.releng;/index.html">Release  		Coordination</ulink></term>  	<listitem> diff --git a/en_US.ISO8859-1/articles/cvs-freebsd/Makefile b/en_US.ISO8859-1/articles/cvs-freebsd/Makefile index a450bb703e..1740a1a8e9 100644 --- a/en_US.ISO8859-1/articles/cvs-freebsd/Makefile +++ b/en_US.ISO8859-1/articles/cvs-freebsd/Makefile @@ -13,5 +13,7 @@ INSTALL_ONLY_COMPRESSED?=  SRCS=	article.sgml +URL_RELPREFIX?=	../../../..  DOC_PREFIX?= ${.CURDIR}/../../.. +  .include "${DOC_PREFIX}/share/mk/doc.project.mk" diff --git a/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml b/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml index 2f0ad424fc..014627f14f 100644 --- a/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml +++ b/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml @@ -5,6 +5,8 @@  %authors;  <!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">  %trademarks; +<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"> +%urls;  ]>  <article> @@ -112,7 +114,7 @@        <para>Now you need to obtain the <filename>CVSROOT</filename> directory          from the FreeBSD repository. This is most easily done by checking it          out from a FreeBSD anonymous CVS mirror. See <ulink -          url="../../books/handbook/anoncvs.html">the relevant chapter in +          url="&url.books.handbook;/anoncvs.html">the relevant chapter in          the handbook</ulink> for more information. Let us assume that the          sources are stored in <filename>CVSROOT-freebsd</filename> in the          current directory.</para> diff --git a/en_US.ISO8859-1/articles/dialup-firewall/Makefile b/en_US.ISO8859-1/articles/dialup-firewall/Makefile index 37854b51ad..c512d68c66 100644 --- a/en_US.ISO8859-1/articles/dialup-firewall/Makefile +++ b/en_US.ISO8859-1/articles/dialup-firewall/Makefile @@ -12,5 +12,7 @@ INSTALL_ONLY_COMPRESSED?=  SRCS=	article.sgml +URL_RELPREFIX?=	../../../..  DOC_PREFIX?= ${.CURDIR}/../../.. +  .include "${DOC_PREFIX}/share/mk/doc.project.mk" diff --git a/en_US.ISO8859-1/articles/dialup-firewall/article.sgml b/en_US.ISO8859-1/articles/dialup-firewall/article.sgml index 6ea1502af6..88fd86c288 100644 --- a/en_US.ISO8859-1/articles/dialup-firewall/article.sgml +++ b/en_US.ISO8859-1/articles/dialup-firewall/article.sgml @@ -11,6 +11,9 @@  <!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">  %trademarks; + +<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"> +%urls;  ]>  <article> @@ -64,7 +67,7 @@      <para>In order to use IPFW, support for it must be compiled into the        kernel.  For more information on how to recompile the kernel,        please see the <ulink -      URL="../../books/handbook/kernelconfig.html">kernel configuration +      URL="&url.books.handbook;/kernelconfig.html">kernel configuration        section in the Handbook</ulink>.  The following options must be        added into your kernel configuration file for IPFW support:</para> diff --git a/en_US.ISO8859-1/articles/euro/Makefile b/en_US.ISO8859-1/articles/euro/Makefile index 6efcc67d29..e1247939d0 100644 --- a/en_US.ISO8859-1/articles/euro/Makefile +++ b/en_US.ISO8859-1/articles/euro/Makefile @@ -12,5 +12,7 @@ INSTALL_ONLY_COMPRESSED?=  SRCS=	article.sgml +URL_RELPREFIX?=	../../../..  DOC_PREFIX?= ${.CURDIR}/../../.. +  .include "${DOC_PREFIX}/share/mk/doc.project.mk" diff --git a/en_US.ISO8859-1/articles/euro/article.sgml b/en_US.ISO8859-1/articles/euro/article.sgml index f0906e4801..3d7cb36628 100644 --- a/en_US.ISO8859-1/articles/euro/article.sgml +++ b/en_US.ISO8859-1/articles/euro/article.sgml @@ -4,6 +4,9 @@  <!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">  %trademarks; + +<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"> +%urls;  ]>  <article> @@ -59,7 +62,7 @@      <title>The Euro in a nutshell</title>      <para>If you already feel comfortable with  -      <ulink url="../../books/handbook/l10n.html">localization</ulink> as  +      <ulink url="&url.books.handbook;/l10n.html">localization</ulink> as         described in the <systemitem class="osname">FreeBSD</systemitem>         Handbook you might be only interested in the following facts which         will get you started quickly:</para>  diff --git a/en_US.ISO8859-1/articles/filtering-bridges/Makefile b/en_US.ISO8859-1/articles/filtering-bridges/Makefile index 6b6c1b3fae..d9e00e9285 100644 --- a/en_US.ISO8859-1/articles/filtering-bridges/Makefile +++ b/en_US.ISO8859-1/articles/filtering-bridges/Makefile @@ -12,5 +12,7 @@ INSTALL_ONLY_COMPRESSED?=  SRCS=	article.sgml +URL_RELPREFIX?=	../../../..  DOC_PREFIX?= ${.CURDIR}/../../.. +  .include "${DOC_PREFIX}/share/mk/doc.project.mk" diff --git a/en_US.ISO8859-1/articles/filtering-bridges/article.sgml b/en_US.ISO8859-1/articles/filtering-bridges/article.sgml index 306ac1bbe3..99c31812d2 100644 --- a/en_US.ISO8859-1/articles/filtering-bridges/article.sgml +++ b/en_US.ISO8859-1/articles/filtering-bridges/article.sgml @@ -5,6 +5,8 @@  %freebsd;  <!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">  %trademarks; +<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"> +%urls;  ]>  <article> @@ -109,7 +111,7 @@ options IPFIREWALL_VERBOSE</programlisting>        <para>Now it is necessary to build and install the new kernel.  You may  	find detailed instructions in the <ulink -	  url="../../books/handbook/kernelconfig-building.html">Building +	  url="&url.books.handbook;/kernelconfig-building.html">Building  	and Installing a Custom Kernel</ulink> section of the FreeBSD  	Handbook.</para>      </sect2> diff --git a/en_US.ISO8859-1/articles/fonts/Makefile b/en_US.ISO8859-1/articles/fonts/Makefile index d1da66dfde..0163a287fa 100644 --- a/en_US.ISO8859-1/articles/fonts/Makefile +++ b/en_US.ISO8859-1/articles/fonts/Makefile @@ -12,5 +12,7 @@ INSTALL_ONLY_COMPRESSED?=  SRCS=	article.sgml +URL_RELPREFIX?=	../../../..  DOC_PREFIX?= ${.CURDIR}/../../.. +  .include "${DOC_PREFIX}/share/mk/doc.project.mk" diff --git a/en_US.ISO8859-1/articles/fonts/article.sgml b/en_US.ISO8859-1/articles/fonts/article.sgml index ec361445f0..b988270d3a 100644 --- a/en_US.ISO8859-1/articles/fonts/article.sgml +++ b/en_US.ISO8859-1/articles/fonts/article.sgml @@ -7,6 +7,8 @@  %man;  <!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">  %trademarks; +<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"> +%urls;  ]>  <!-- Recently, I wanted to figure out how to use some additional fonts that @@ -864,7 +866,7 @@ Converting 3of9.ttf to A.pfa and B.afm.        <listitem>          <para>The freetype module is included with XFree86 4.x.  For          more information please see the <ulink -        url="../../books/handbook/x-fonts.html">FreeBSD +        url="&url.books.handbook;/x-fonts.html">FreeBSD          Handbook</ulink> or the <ulink          url="http://www.xfree86.org/4.0.2/fonts.html">XFree86 4.0.2          Fonts</ulink> page.</para> diff --git a/en_US.ISO8859-1/articles/freebsd-questions/Makefile b/en_US.ISO8859-1/articles/freebsd-questions/Makefile index 1ab662c7f5..216dfe9c92 100644 --- a/en_US.ISO8859-1/articles/freebsd-questions/Makefile +++ b/en_US.ISO8859-1/articles/freebsd-questions/Makefile @@ -15,5 +15,7 @@ INSTALL_ONLY_COMPRESSED?=  SRCS=	article.sgml +URL_RELPREFIX?=	../../../..  DOC_PREFIX?= ${.CURDIR}/../../.. +  .include "${DOC_PREFIX}/share/mk/doc.project.mk" diff --git a/en_US.ISO8859-1/articles/freebsd-questions/article.sgml b/en_US.ISO8859-1/articles/freebsd-questions/article.sgml index c07906e9b1..e6a1c64c57 100644 --- a/en_US.ISO8859-1/articles/freebsd-questions/article.sgml +++ b/en_US.ISO8859-1/articles/freebsd-questions/article.sgml @@ -7,6 +7,8 @@  %freebsd;  <!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">  %trademarks; +<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"> +%urls;  ]>  <article> @@ -237,8 +239,8 @@ your options page that will email your current password to you.</literallayout>          <para>Read the manual pages, and the FreeBSD documentation (either  	  installed in <filename>/usr/doc</filename> or accessible via WWW at  	  <ulink URL="http://www.FreeBSD.org"></ulink>), especially the -	  <ulink URL="../../books/handbook/index.html">handbook</ulink> -	  and the <ulink URL="../../books/faq/index.html">FAQ</ulink>. +	  <ulink URL="&url.books.handbook;/index.html">handbook</ulink> +	  and the <ulink URL="&url.books.faq;/index.html">FAQ</ulink>.  	</para>        </listitem> diff --git a/en_US.ISO8859-1/articles/ipsec-must/Makefile b/en_US.ISO8859-1/articles/ipsec-must/Makefile index 09c0c41f9f..bcc0fec86e 100644 --- a/en_US.ISO8859-1/articles/ipsec-must/Makefile +++ b/en_US.ISO8859-1/articles/ipsec-must/Makefile @@ -12,5 +12,7 @@ INSTALL_ONLY_COMPRESSED?=  SRCS=	article.sgml +URL_RELPREFIX?=	../../../..  DOC_PREFIX?= ${.CURDIR}/../../.. +  .include "${DOC_PREFIX}/share/mk/doc.project.mk" diff --git a/en_US.ISO8859-1/articles/ipsec-must/article.sgml b/en_US.ISO8859-1/articles/ipsec-must/article.sgml index c96dab3a5e..338a83c789 100644 --- a/en_US.ISO8859-1/articles/ipsec-must/article.sgml +++ b/en_US.ISO8859-1/articles/ipsec-must/article.sgml @@ -10,6 +10,9 @@  <!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">  %trademarks; + +<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"> +%urls;  ]>  <article> @@ -192,7 +195,7 @@ Expected value for L=8 is 7.1836656      <para>A comprehensive guide on running IPsec on FreeBSD is        provided in <ulink -      url="../../books/handbook/ipsec.html">FreeBSD +      url="&url.books.handbook;/ipsec.html">FreeBSD        Handbook</ulink>.</para>    </sect1> diff --git a/en_US.ISO8859-1/articles/java-tomcat/Makefile b/en_US.ISO8859-1/articles/java-tomcat/Makefile index 2a8b598453..41b2a16407 100644 --- a/en_US.ISO8859-1/articles/java-tomcat/Makefile +++ b/en_US.ISO8859-1/articles/java-tomcat/Makefile @@ -15,5 +15,7 @@ INSTALL_ONLY_COMPRESSED?=  SRCS=	article.sgml +URL_RELPREFIX?=	../../../..  DOC_PREFIX?= ${.CURDIR}/../../.. +  .include "${DOC_PREFIX}/share/mk/doc.project.mk" diff --git a/en_US.ISO8859-1/articles/java-tomcat/article.sgml b/en_US.ISO8859-1/articles/java-tomcat/article.sgml index de13705e13..5fce6ed1c3 100644 --- a/en_US.ISO8859-1/articles/java-tomcat/article.sgml +++ b/en_US.ISO8859-1/articles/java-tomcat/article.sgml @@ -38,6 +38,8 @@  <!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">  %trademarks; +<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"> +%urls;  <!--    URL Entities.  These are in place, to allow wrapping long URLs to the 80th    column. @@ -151,7 +153,7 @@        <command>make</command> it will fail if it attempts to build older        source.  You can upgrade your entire ports collection by using        <application>CVSup</application>.  See <ulink -      url="../../books/handbook/cvsup.html">Using CVSup</ulink> section +      url="&url.books.handbook;/cvsup.html">Using CVSup</ulink> section        of the Handbook for more information.  You can also download the        ports you need manually from <ulink        url="&ftpurl;/pub/FreeBSD/ports/"></ulink> to @@ -162,7 +164,7 @@  	  (Linux-ABI) enabled in your kernel configuration.  Simply add  	  the following option to your kernel configuration file and  	  recompile it.  Instructions for building a kernel can be found -	  in the <ulink url="../../books/handbook/index.html">FreeBSD +	  in the <ulink url="&url.books.handbook;/index.html">FreeBSD            Handbook</ulink>.</para>  	<programlisting>options		COMPAT_LINUX</programlisting> diff --git a/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml b/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml index f8ce24f2c3..7570f2cb37 100644 --- a/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml +++ b/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml @@ -208,19 +208,19 @@  	    <ulink url="&url.base;/docs.html#articles">articles</ulink>  	    that are available.  Items of particular interest  	    include the <ulink -	    url="../../books/faq/index.html"> +	    url="&url.books.faq;/index.html">  	    &os; Frequently Asked Questions (FAQ)</ulink> document,  	    the <ulink -	    url="../../books/handbook/index.html"> +	    url="&url.books.handbook;/index.html">  	    &os; Handbook</ulink>,  	    and the articles <ulink -	    url="../freebsd-questions/article.html"> +	    url="&url.articles.freebsd-questions;/article.html">  	    How to get best results from the FreeBSD-questions mailing list</ulink>,  	    <ulink -	    url="../explaining-bsd/article.html"> +	    url="&url.articles.explaining-bsd;/article.html">  	    Explaining BSD</ulink>,  	    and <ulink -	    url="../new-users/article.html"> +	    url="&url.articles.new-users;/article.html">  	    &os; First Steps</ulink>.</para>  	  <para>It is always considered bad form to ask a question that is @@ -517,7 +517,7 @@  	to refer to a topic which has never reached a consensus within  	the &os; community, and instead remains controversial.  (The  	genesis of this term is explained in more detail <ulink -	url="../../books/faq/misc.html#BIKESHED-PAINTING"> +	url="&url.books.faq;/misc.html#BIKESHED-PAINTING">  	in this document</ulink>).  You simply must have a working  	knowledge of this concept before posting to any &os; mailing  	list.</para> @@ -540,7 +540,7 @@  	  <listitem>  	    <para>Original author of most of the material on mailing  	      list etiquette, taken from the article on <ulink -	      url="../freebsd-questions/article.html"> +	      url="&url.articles.freebsd-questions;/article.html">  	      How to get best results from the FreeBSD-questions mailing list</ulink>.</para>  	  </listitem>  	</varlistentry> diff --git a/en_US.ISO8859-1/articles/new-users/Makefile b/en_US.ISO8859-1/articles/new-users/Makefile index be470ca93f..5eaabc4d5a 100644 --- a/en_US.ISO8859-1/articles/new-users/Makefile +++ b/en_US.ISO8859-1/articles/new-users/Makefile @@ -12,5 +12,7 @@ INSTALL_ONLY_COMPRESSED?=  SRCS=	article.sgml +URL_RELPREFIX?=	../../../..  DOC_PREFIX?= ${.CURDIR}/../../.. +  .include "${DOC_PREFIX}/share/mk/doc.project.mk" diff --git a/en_US.ISO8859-1/articles/new-users/article.sgml b/en_US.ISO8859-1/articles/new-users/article.sgml index f818b5da45..e790f21940 100644 --- a/en_US.ISO8859-1/articles/new-users/article.sgml +++ b/en_US.ISO8859-1/articles/new-users/article.sgml @@ -703,7 +703,7 @@        <command>lp</command> or <command>lpr</command> should send a        file to the printer.  Whether or not the file actually prints        depends on configuring it, which is covered in the <ulink -      URL="../../books/handbook/index.html">FreeBSD +      URL="&url.books.handbook;/index.html">FreeBSD        handbook.</ulink></para>    </sect1> diff --git a/en_US.ISO8859-1/articles/pr-guidelines/Makefile b/en_US.ISO8859-1/articles/pr-guidelines/Makefile index 68ea714baa..9aa329f736 100644 --- a/en_US.ISO8859-1/articles/pr-guidelines/Makefile +++ b/en_US.ISO8859-1/articles/pr-guidelines/Makefile @@ -13,5 +13,7 @@ INSTALL_ONLY_COMPRESSED?=  SRCS=	article.sgml +URL_RELPREFIX?=	../../../..  DOC_PREFIX?= ${.CURDIR}/../../.. +  .include "${DOC_PREFIX}/share/mk/doc.project.mk" diff --git a/en_US.ISO8859-1/articles/pr-guidelines/article.sgml b/en_US.ISO8859-1/articles/pr-guidelines/article.sgml index ae83629ccc..60f2565edb 100644 --- a/en_US.ISO8859-1/articles/pr-guidelines/article.sgml +++ b/en_US.ISO8859-1/articles/pr-guidelines/article.sgml @@ -12,6 +12,8 @@  %freebsd;  <!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">  %trademarks; +<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"> +%urls;  <!ENTITY man.edit-pr.1 "<citerefentry/<refentrytitle/edit-pr/<manvolnum/1//">  <!ENTITY man.query-pr.1 "<citerefentry/<refentrytitle/query-pr/<manvolnum/1//">  ]> @@ -527,7 +529,7 @@ This was misfiled because the subject didn't have the format:      <itemizedlist>        <listitem>          <para><ulink -    	  url="../../articles/problem-reports/article.html">How to +    	  url="&url.articles.problem-reports;/article.html">How to      	  Write FreeBSD Problem Reports</ulink>—guidelines      	  for PR originators.</para>        </listitem> diff --git a/en_US.ISO8859-1/articles/problem-reports/Makefile b/en_US.ISO8859-1/articles/problem-reports/Makefile index bb5882f4ed..081f20e0f8 100644 --- a/en_US.ISO8859-1/articles/problem-reports/Makefile +++ b/en_US.ISO8859-1/articles/problem-reports/Makefile @@ -13,5 +13,7 @@ INSTALL_ONLY_COMPRESSED?=  SRCS=	article.sgml +URL_RELPREFIX?=	../../../..  DOC_PREFIX?= ${.CURDIR}/../../.. +  .include "${DOC_PREFIX}/share/mk/doc.project.mk" diff --git a/en_US.ISO8859-1/articles/problem-reports/article.sgml b/en_US.ISO8859-1/articles/problem-reports/article.sgml index af12cc544b..d52827bc7d 100644 --- a/en_US.ISO8859-1/articles/problem-reports/article.sgml +++ b/en_US.ISO8859-1/articles/problem-reports/article.sgml @@ -7,6 +7,8 @@  %trademarks;  <!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">  %freebsd; +<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"> +%urls;  ]>  <article> @@ -149,22 +151,22 @@      <itemizedlist>        <listitem>  	<para>The &os; -	  <ulink URL="../../books/faq/index.html">Frequently Asked +	  <ulink URL="&url.books.faq;/index.html">Frequently Asked  	    Questions</ulink> (FAQ) list.  	  The FAQ attempts to provide answers for a wide range of questions,  	  such as those concerning -	  <ulink URL="../../books/faq/hardware.html">hardware +	  <ulink URL="&url.books.faq;/hardware.html">hardware  	    compatibility</ulink>, -	  <ulink URL="../../books/faq/applications.html">user +	  <ulink URL="&url.books.faq;/applications.html">user  	    applications</ulink>, -	  and <ulink URL="../../books/faq/kernelconfig.html">kernel +	  and <ulink URL="&url.books.faq;/kernelconfig.html">kernel  	    configuration</ulink>.</para>        </listitem>        <listitem>  	<para>The  	  <ulink -	    URL="../../books/handbook/eresources.html#ERESOURCES-MAIL">mailing +	    URL="&url.books.handbook;/eresources.html#ERESOURCES-MAIL">mailing  	    lists</ulink>—if you are not subscribed, use  	  <ulink  	    URL="http://www.FreeBSD.org/search/search.html#mailinglists">the @@ -875,7 +877,7 @@        </listitem>        <listitem>  	<para><ulink -	  url="../../articles/pr-guidelines/article.html">Problem +	  url="&url.articles.pr-guidelines;/article.html">Problem  	  Report Handling Guidelines</ulink>—valuable insight  	  into how problem reports are handled by the &os;  	  developers.</para> diff --git a/en_US.ISO8859-1/articles/releng/Makefile b/en_US.ISO8859-1/articles/releng/Makefile index 5a25b1d4f5..ae3d3c2f4f 100644 --- a/en_US.ISO8859-1/articles/releng/Makefile +++ b/en_US.ISO8859-1/articles/releng/Makefile @@ -18,5 +18,7 @@ IMAGES_EN+=	branches-releng4.pic  CSS_SHEET_ADDITIONS= extra.css +URL_RELPREFIX?=	../../../..  DOC_PREFIX?= ${.CURDIR}/../../.. +  .include "${DOC_PREFIX}/share/mk/doc.project.mk" diff --git a/en_US.ISO8859-1/articles/releng/article.sgml b/en_US.ISO8859-1/articles/releng/article.sgml index d3fcb36fb0..cad8f5f9c6 100644 --- a/en_US.ISO8859-1/articles/releng/article.sgml +++ b/en_US.ISO8859-1/articles/releng/article.sgml @@ -15,7 +15,9 @@  %freebsd;  <!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">  %trademarks; -<!ENTITY art.re.pkgs '<ulink url="../releng-packages/article.html">The Release Engineering of Third Party Packages</ulink>'> +<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"> +%urls; +<!ENTITY art.re.pkgs '<ulink url="&url.articles.releng-packages;/article.html">The Release Engineering of Third Party Packages</ulink>'>  ]>  <article> @@ -799,7 +801,7 @@    <para>For more information about the distribution mirror      architecture of the FreeBSD FTP sites, please see the <ulink -    url="../hubs/">Mirroring FreeBSD</ulink> article.</para> +    url="&url.articles.hubs;/">Mirroring FreeBSD</ulink> article.</para>    <para>It may take many hours to two days after updating      <hostid>ftp-master</hostid> before a majority of the Tier-1 FTP diff --git a/en_US.ISO8859-1/articles/serial-uart/Makefile b/en_US.ISO8859-1/articles/serial-uart/Makefile index 123d2f0218..b0465bf0c0 100644 --- a/en_US.ISO8859-1/articles/serial-uart/Makefile +++ b/en_US.ISO8859-1/articles/serial-uart/Makefile @@ -13,5 +13,7 @@ INSTALL_ONLY_COMPRESSED?=  SRCS=	article.sgml +URL_RELPREFIX?=	../../../..  DOC_PREFIX?= ${.CURDIR}/../../.. +  .include "${DOC_PREFIX}/share/mk/doc.project.mk" diff --git a/en_US.ISO8859-1/articles/serial-uart/article.sgml b/en_US.ISO8859-1/articles/serial-uart/article.sgml index cefcec46a0..c63bd54548 100644 --- a/en_US.ISO8859-1/articles/serial-uart/article.sgml +++ b/en_US.ISO8859-1/articles/serial-uart/article.sgml @@ -5,6 +5,8 @@  %authors;  <!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">  %trademarks; +<!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN"> +%urls;  ]>  <article> @@ -2043,7 +2045,7 @@ device          sio11   at isa? port 0x138 flags 0xb05 irq 9</programlisting>          <para>If you do not already have a custom kernel  	  configuration file set up, refer to <ulink -	  url="../../books/handbook/kernelconfig.html">Kernel +	  url="&url.books.handbook;/kernelconfig.html">Kernel  	  Configuration</ulink> chapter of the FreeBSD Handbook for  	  general procedures.  The following are the specifics for the  	  Boca 16 board and assume you are using the kernel name | 
