Date: Wed, 30 Jan 2013 20:11:31 +0000 (UTC) From: Gabor Kovesdan <gabor@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40834 - in projects/xml-tools: en_US.ISO8859-1/articles/fbsd-from-scratch en_US.ISO8859-1/articles/pam es_ES.ISO8859-1/articles/fbsd-from-scratch fr_FR.ISO8859-1/articles/pam ja_JP.euc... Message-ID: <201301302011.r0UKBVHZ073867@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gabor Date: Wed Jan 30 20:11:31 2013 New Revision: 40834 URL: http://svnweb.freebsd.org/changeset/doc/40834 Log: - Use XInclude to include text files instead of <inlinegraphic> since such inclusion is not supported in standard XSLT and xsltproc provides no extensions for that Modified: projects/xml-tools/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml projects/xml-tools/en_US.ISO8859-1/articles/pam/article.xml projects/xml-tools/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml projects/xml-tools/fr_FR.ISO8859-1/articles/pam/article.xml projects/xml-tools/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml projects/xml-tools/ru_RU.KOI8-R/articles/pam/article.xml projects/xml-tools/share/mk/doc.docbook.mk Modified: projects/xml-tools/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml Wed Jan 30 19:20:57 2013 (r40833) +++ projects/xml-tools/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml Wed Jan 30 20:11:31 2013 (r40834) @@ -4,7 +4,7 @@ <!ENTITY scratch.ap "<application>FreeBSD From Scratch</application>"> ]> -<article lang='en'> +<article xmlns:xi="http://www.w3.org/2001/XInclude" lang='en'> <articleinfo> <title>FreeBSD From Scratch</title> @@ -381,7 +381,7 @@ Do you wish to delete what is left of /v which you need to modify substantially. The comments give you enough information what to change.</para> -<programlisting><inlinegraphic fileref="stage_1.conf.default" format="linespecific"/></programlisting> +<programlisting><xi:include href="stage_1.conf.default" parse="text"/></programlisting> <para>Download <ulink url="stage_1.conf.default"><filename>stage_1.conf.default</filename> @@ -485,7 +485,7 @@ news inn-stable CONFIGURE_ARGS="-- <filename>LOGDIR/category+port</filename> is created for each port it actually installs.</para> -<programlisting><inlinegraphic fileref="stage_2.conf.default" format="linespecific"/></programlisting> +<programlisting><xi:include href="stage_2.conf.default" parse="text"/></programlisting> <para>Download <ulink url="stage_2.conf.default"><filename>stage_2.conf.default</filename></ulink>.</para> @@ -586,7 +586,7 @@ fi url="stage_1.sh"><filename>stage_1.sh</filename></ulink> script, which you should not need to modify.</para> -<programlisting><inlinegraphic fileref="stage_1.sh" format="linespecific"/></programlisting> +<programlisting><xi:include href="stage_1.sh" parse="text"/></programlisting> <para>Download <ulink url="stage_1.sh"><filename>stage_1.sh</filename></ulink>.</para> @@ -596,7 +596,7 @@ fi script. You may want to modify the variables at the beginning.</para> -<programlisting><inlinegraphic fileref="stage_2.sh" format="linespecific"/></programlisting> +<programlisting><xi:include href="stage_2.sh" parse="text"/></programlisting> <para>Download <ulink url="stage_2.sh"><filename>stage_2.sh</filename></ulink>.</para> @@ -605,7 +605,7 @@ fi url="stage_3.mk"><filename>stage_3.mk</filename></ulink> to give you an idea how to automate all reconfiguration.</para> -<programlisting><inlinegraphic fileref="stage_3.mk" format="linespecific"/></programlisting> +<programlisting><xi:include href="stage_3.mk" parse="text"/></programlisting> <para>Download <ulink url="stage_3.mk"><filename>stage_3.mk</filename></ulink>.</para> Modified: projects/xml-tools/en_US.ISO8859-1/articles/pam/article.xml ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/articles/pam/article.xml Wed Jan 30 19:20:57 2013 (r40833) +++ projects/xml-tools/en_US.ISO8859-1/articles/pam/article.xml Wed Jan 30 20:11:31 2013 (r40834) @@ -36,7 +36,7 @@ - SUCH DAMAGE. --> -<article lang='en'> +<article xmlns:xi="http://www.w3.org/2001/XInclude" lang='en'> <articleinfo> <title>Pluggable Authentication Modules</title> @@ -1234,8 +1234,7 @@ sshd password required pam_permit.so</pr starting point, but should not be used in real-world applications.</para> -<programlisting><inlinegraphic fileref="pam_app.c" - format="linespecific"/></programlisting> +<programlisting><xi:include href="su.c" parse="text"/></programlisting> </appendix> <appendix id="pam-sample-module"> @@ -1248,8 +1247,7 @@ sshd password required pam_permit.so</pr &man.pam.get.authtok.3;, which enormously simplifies prompting the user for a password.</para> -<programlisting><inlinegraphic fileref="pam_module.c" - format="linespecific"/></programlisting> +<programlisting><xi:include href="pam_unix.c" parse="text"/></programlisting> </appendix> <appendix id="pam-sample-conv"> @@ -1265,8 +1263,7 @@ sshd password required pam_permit.so</pr your uses; we believe it to be as robust as a tty-oriented conversation function can reasonably get.</para> -<programlisting><inlinegraphic fileref="pam_conv.c" - format="linespecific"/></programlisting> +<programlisting><xi:include href="converse.c" parse="text"/></programlisting> </appendix> <bibliography id="pam-further"> Modified: projects/xml-tools/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml Wed Jan 30 19:20:57 2013 (r40833) +++ projects/xml-tools/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml Wed Jan 30 20:11:31 2013 (r40834) @@ -4,7 +4,7 @@ <!ENTITY scratch.ap "<application>FreeBSD From Scratch</application>"> ]> -<article lang='es'> +<article xmlns:xi="http://www.w3.org/2001/XInclude" lang='es'> <articleinfo> <title>FreeBSD From Scratch</title> @@ -470,7 +470,8 @@ Do you wish to delete what is left of /v dispositivos como corresponda.</para> </warning> -<programlisting><inlinegraphic fileref="fase_1.sh" format="linespecific"/></programlisting> +<programlisting><xi:include href="fase_1.sh" parse="text" + encoding="iso-8859-1"/></programlisting> <para>Descargue <ulink url="fase_1.sh"><filename>fase_1.sh</filename></ulink>.</para> @@ -586,7 +587,8 @@ news inn-stable CONFIGURE_ARGS="--enable compartida no olvide copiarlo al sistema nuevo antes de arrancarlo.</para> -<programlisting><inlinegraphic fileref="fase_2.sh" format="linespecific"/></programlisting> +<programlisting><xi:include href="fase_2.sh" parse="text" + encoding="iso-8859-1"/></programlisting> <para>Descargue <ulink url="fase_2.sh"><filename>fase_2.sh</filename></ulink>.</para> @@ -624,7 +626,8 @@ news inn-stable CONFIGURE_ARGS="--enable partición compartida bien copiándolo en algún lugar dentro del nuevo sistema.</para> -<programlisting><inlinegraphic fileref="fase_3.mk" format="linespecific"/></programlisting> +<programlisting><xi:include href="fase_3.mk" parse="text" + encoding="iso-8859-1"/></programlisting> <para>Descargue <ulink url="fase_3.mk"><filename>fase_3.mk</filename></ulink>.</para> Modified: projects/xml-tools/fr_FR.ISO8859-1/articles/pam/article.xml ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/articles/pam/article.xml Wed Jan 30 19:20:57 2013 (r40833) +++ projects/xml-tools/fr_FR.ISO8859-1/articles/pam/article.xml Wed Jan 30 20:11:31 2013 (r40834) @@ -36,7 +36,7 @@ - SUCH DAMAGE. --> -<article lang='fr'> +<article xmlns:xi="http://www.w3.org/2001/XInclude" lang='fr'> <articleinfo> <title>Pluggable Authentication Modules</title> @@ -1218,8 +1218,7 @@ sshd password required pam_permit.so</pr réelles.</para> <programlisting> -<inlinegraphic fileref="pam_app.c" - format="linespecific"/> +<xi:include href="su.c" parse="text"/> </programlisting> </appendix> @@ -1236,8 +1235,7 @@ sshd password required pam_permit.so</pr <programlisting> -<inlinegraphic fileref="pam_module.c" - format="linespecific"/> +<xi:include href="pam_unix.c" parse="text"/> </programlisting> </appendix> @@ -1256,9 +1254,7 @@ sshd password required pam_permit.so</pr orientée tty peut l'être.</para> <programlisting> - -<inlinegraphic fileref="pam_conv.c" - format="linespecific"/> +<xi:include href="converse.c" parse="text"/> </programlisting> </appendix> Modified: projects/xml-tools/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml ============================================================================== --- projects/xml-tools/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml Wed Jan 30 19:20:57 2013 (r40833) +++ projects/xml-tools/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml Wed Jan 30 20:11:31 2013 (r40834) @@ -9,7 +9,7 @@ Original revision: 1.11 --> -<article lang='ja'> +<article xmlns:xi="http://www.w3.org/2001/XInclude" lang='ja'> <articleinfo> <title>FreeBSD ¤ò¥¼¥í¤«¤éÀßÄꤹ¤ë¤Ë¤Ï</title> @@ -430,7 +430,9 @@ Do you wish to delete what is left of /v ¥Ç¥Ð¥¤¥¹Ì¾¤ÎÊѹ¹¤ÏÃí°Õ¿¼¤¯¹Ô¤Ê¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para> </warning> -<programlisting><inlinegraphic fileref="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default" format="linespecific"/></programlisting> +<programlisting> +<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default" parse="text"/> +</programlisting> <para>¥À¥¦¥ó¥í¡¼¥É: <ulink url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default"><filename>stage_1.conf.default</filename> @@ -536,7 +538,9 @@ news inn-stable CONFIGURE_ARGS="--enable <filename>LOGDIR/category+port</filename> ¤È¤¤¤¦Ì¾Á°¤Î¥í¥°¥Õ¥¡¥¤¥ë¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£</para> -<programlisting><inlinegraphic fileref="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default" format="linespecific"/></programlisting> +<programlisting> +<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default" parse="text"/> +</programlisting> <para>¥À¥¦¥ó¥í¡¼¥É: <ulink url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default"><filename>stage_2.conf.default</filename></ulink>.</para> @@ -672,7 +676,9 @@ fi url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh"><filename>stage_1.sh</filename></ulink> ¥¹¥¯¥ê¥×¥È¤Ç¤¹¡£ÆâÍƤòÊѹ¹¤¹¤ëɬÍפϤʤ¤¤Ç¤·¤ç¤¦¡£</para> -<programlisting><inlinegraphic fileref="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh" format="linespecific"/></programlisting> +<programlisting> +<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh" parse="text"/> +</programlisting> <para>¥À¥¦¥ó¥í¡¼¥É: <ulink url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh"><filename>stage_1.sh</filename></ulink>.</para> @@ -681,7 +687,9 @@ fi url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh"><filename>stage_2.sh</filename></ulink> ¥¹¥¯¥ê¥×¥È¤Ç¤¹¡£ºÇ½é¤ÎÉôʬ¤Ë¤¢¤ëÊÑ¿ô¤òÊѹ¹¤·¤Þ¤·¤ç¤¦¡£</para> -<programlisting><inlinegraphic fileref="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh" format="linespecific"/></programlisting> +<programlisting> +<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh" parse="text"/> +</programlisting> <para>¥À¥¦¥ó¥í¡¼¥É: <ulink url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh"><filename>stage_2.sh</filename></ulink>.</para> @@ -690,7 +698,9 @@ fi url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk"><filename>stage_3.mk</filename></ulink> ¤Ç¤¹¡£ ÀßÄê¤ò¼«Æ°Åª¤Ë¤ª¤³¤Ê¤¦¤¿¤á¤Î¼ê½ç¤ò¡¢¤³¤³¤ËÆþ¤ì¤Þ¤¹¡£</para> -<programlisting><inlinegraphic fileref="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk" format="linespecific"/></programlisting> +<programlisting> +<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk" parse="text"/> +</programlisting> <para>¥À¥¦¥ó¥í¡¼¥É: <ulink url="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk"><filename>stage_3.mk</filename></ulink>.</para> Modified: projects/xml-tools/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml ============================================================================== --- projects/xml-tools/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml Wed Jan 30 19:20:57 2013 (r40833) +++ projects/xml-tools/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml Wed Jan 30 20:11:31 2013 (r40834) @@ -12,7 +12,7 @@ Original revision: r33355 --> -<article lang="ru"> +<article xmlns:xi="http://www.w3.org/2001/XInclude" lang="ru"> <articleinfo> <title>FreeBSD "Ó ÎÕÌÑ"</title> @@ -407,7 +407,9 @@ Do you wish to delete what is left of /v ÐÏÔÏÍ ÓÕÝÅÓÔ×ÅÎÎÏ ÍÏÄÉÆÉÃÉÒÏ×ÁÔØ. ÷ ËÏÍÍÅÎÔÁÒÉÑÈ ÄÁ£ÔÓÑ ÄÏÓÔÁÔÏÞÎÏ ÉÎÆÏÒÍÁÃÉÉ Ï ÔÏÍ, ÞÔÏ ÎÅÏÂÈÏÄÉÍÏ ÉÚÍÅÎÉÔØ.</para> - <programlisting><inlinegraphic fileref="stage_1.conf.default" format="linespecific"/></programlisting> + <programlisting> +<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default" parse="text"/> + </programlisting> <para>óËÁÞÁÊÔÅ <ulink url="stage_1.conf.default"> <filename>stage_1.conf.default</filename></ulink>.</para> @@ -515,7 +517,9 @@ news inn-stable CONFIGURE_ARGS="-- ËÁÖÄÏÇÏ ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ ÉÍ ÐÏÒÔÁ ÓÏÚÄÁ£ÔÓÑ ÆÁÊÌ ÐÒÏÔÏËÏÌÁ <filename>LOGDIR/category+port</filename>.</para> - <programlisting><inlinegraphic fileref="stage_2.conf.default" format="linespecific"/></programlisting> + <programlisting> +<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default" parse="text"/> + </programlisting> <para>óËÁÞÁÊÔÅ <ulink url="stage_2.conf.default"> <filename>stage_2.conf.default</filename></ulink>.</para> @@ -617,7 +621,9 @@ fi <filename>stage_1.sh</filename></ulink>, ËÏÔÏÒÙÊ ×Ù ÎÅ ÄÏÌÖÎÙ ÍÏÄÉÆÉÃÉÒÏ×ÁÔØ.</para> - <programlisting><inlinegraphic fileref="stage_1.sh" format="linespecific"/></programlisting> + <programlisting> +<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default" parse="text"/> + </programlisting> <para>óËÁÞÁÊÔÅ <ulink url="stage_1.sh"><filename>stage_1.sh</filename></ulink>.</para> @@ -626,7 +632,9 @@ fi url="stage_2.sh"><filename>stage_2.sh</filename></ulink>. ÷ÁÍ ÍÏÖÅÔ ÐÏÎÁÄÏÂÉÔØÓÑ ÉÚÍÅÎÉÔØ ÐÅÒÅÍÅÎÎÙÅ × ÓÁÍÏÍ ÎÁÞÁÌÅ ÆÁÊÌÁ.</para> - <programlisting><inlinegraphic fileref="stage_2.sh" format="linespecific"/></programlisting> + <programlisting> +<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh" parse="text"/> + </programlisting> <para>óËÁÞÁÊÔÅ <ulink url="stage_2.sh"><filename>stage_2.sh</filename></ulink>.</para> @@ -635,7 +643,9 @@ fi url="stage_3.mk"><filename>stage_3.mk</filename></ulink>, ËÏÔÏÒÙÊ ÄÁÓÔ ×ÁÍ ÉÄÅÀ Ï ÔÏÍ, ËÁË Á×ÔÏÍÁÔÉÚÉÒÏ×ÁÔØ ×ÓÀ ÐÏ×ÔÏÒÎÕÀ ËÏÎÆÉÇÕÒÁÃÉÀ.</para> - <programlisting><inlinegraphic fileref="stage_3.mk" format="linespecific"/></programlisting> + <programlisting> +<xi:include href="../../../en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default" parse="text"/> + </programlisting> <para>óËÁÞÁÊÔÅ <ulink url="stage_3.mk"><filename>stage_3.mk</filename></ulink>.</para> Modified: projects/xml-tools/ru_RU.KOI8-R/articles/pam/article.xml ============================================================================== --- projects/xml-tools/ru_RU.KOI8-R/articles/pam/article.xml Wed Jan 30 19:20:57 2013 (r40833) +++ projects/xml-tools/ru_RU.KOI8-R/articles/pam/article.xml Wed Jan 30 20:11:31 2013 (r40834) @@ -1272,8 +1272,9 @@ sshd password required p endterm="pam-sample-conv.title"></link>, ÈÏÒÏÛÁ × ËÁÞÅÓÔ×Å ÏÔÐÒÁ×ÎÏÊ ÔÏÞËÉ, ÎÏ × ÒÅÁÌØÎÙÈ ÐÒÉÌÏÖÅÎÉÑÈ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÎÅ ÍÏÖÅÔ.</para> - <programlisting><inlinegraphic fileref="pam_app.c" - format="linespecific"/></programlisting> + <programlisting> +<xi:include href="../../../en_US.ISO8859-1/articles/pam/su.c" parse="text"/> + </programlisting> </appendix> <appendix id="pam-sample-module"> @@ -1286,8 +1287,9 @@ sshd password required p ÆÕÎËÃÉÉ &man.pam.get.authtok.3;, ËÏÔÏÒÁÑ ËÁÒÄÉÎÁÌØÎÏ ÕÐÒÏÝÁÅÔ ÏÒÇÁÎÉÚÁÃÉÀ ××ÏÄÁ ÐÁÒÏÌÑ ÐÏÌØÚÏ×ÁÔÅÌÅÍ.</para> - <programlisting><inlinegraphic fileref="pam_module.c" - format="linespecific"/></programlisting> + <programlisting> +<xi:include href="../../../en_US.ISO8859-1/articles/pam/pam_unix.c" parse="text"/> + </programlisting> </appendix> <appendix id="pam-sample-conv"> @@ -1303,8 +1305,9 @@ sshd password required p ÃÅÌÑÈ; ÍÙ ÎÁÄÅÅÍÓÑ, ÞÔÏ ÏÎÁ ÄÏÓÔÁÔÏÞÎÏ ÎÁÄ£ÖÎÁ × ËÁÞÅÓÔ×Å ÆÕÎËÃÉÉ ÄÌÑ ×ÚÁÉÍÏÄÅÊÓÔ×ÉÑ Ó ÔÅÒÍÉÎÁÌØÎÙÍÉ ÕÓÔÒÏÊÓÔ×ÁÍÉ.</para> - <programlisting><inlinegraphic fileref="pam_conv.c" - format="linespecific"/></programlisting> + <programlisting> +<xi:include href="../../../en_US.ISO8859-1/articles/pam/converse.c" parse="text"/> + </programlisting> </appendix> <bibliography id="pam-further"> Modified: projects/xml-tools/share/mk/doc.docbook.mk ============================================================================== --- projects/xml-tools/share/mk/doc.docbook.mk Wed Jan 30 19:20:57 2013 (r40833) +++ projects/xml-tools/share/mk/doc.docbook.mk Wed Jan 30 20:11:31 2013 (r40834) @@ -149,7 +149,7 @@ DSSSLCATALOG= ${PREFIX}/share/sgml/docbo COLLATEINDEX= ${PREFIX}/share/sgml/docbook/dsssl/modular/bin/collateindex.pl -XSLTPROCFLAGS?= --nonet +XSLTPROCFLAGS?= --nonet --xinclude XSLXHTML?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml.xsl XSLXHTMLCHUNK?= ${DOC_PREFIX}/share/xsl/freebsd-xhtml-chunk.xsl XSLEPUB?= ${DOC_PREFIX}/share/xsl/freebsd-epub.xsl
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301302011.r0UKBVHZ073867>