aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml12
-rw-r--r--en_US.ISO8859-1/articles/pam/article.xml11
-rw-r--r--es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml11
-rw-r--r--fr_FR.ISO8859-1/articles/pam/article.xml12
-rw-r--r--ja_JP.eucJP/articles/fbsd-from-scratch/article.xml22
-rw-r--r--ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml22
-rw-r--r--ru_RU.KOI8-R/articles/pam/article.xml15
-rw-r--r--share/mk/doc.docbook.mk2
8 files changed, 63 insertions, 44 deletions
diff --git a/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml b/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml
index a16712e632..8adbfcb619 100644
--- a/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml
+++ b/en_US.ISO8859-1/articles/fbsd-from-scratch/article.xml
@@ -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 /var/tmp/temproot.stage1? [no] <userinput>
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="--enable-uucp-rnews --enable-setgid-inews"
<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>
diff --git a/en_US.ISO8859-1/articles/pam/article.xml b/en_US.ISO8859-1/articles/pam/article.xml
index 408bc17b34..0bf1ea2848 100644
--- a/en_US.ISO8859-1/articles/pam/article.xml
+++ b/en_US.ISO8859-1/articles/pam/article.xml
@@ -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</programlisting>
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</programlisting>
&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</programlisting>
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">
diff --git a/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml b/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml
index 216da1b136..fd0fc8e1d6 100644
--- a/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml
+++ b/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.xml
@@ -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 /var/tmp/temproot.fase1? [no] <userinput>n
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-uucp-rnews --enable-setgid-inews" make
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-uucp-rnews --enable-setgid-inews" make
particin compartida bien copindolo en algn
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>
diff --git a/fr_FR.ISO8859-1/articles/pam/article.xml b/fr_FR.ISO8859-1/articles/pam/article.xml
index cc13df1323..f9459e0883 100644
--- a/fr_FR.ISO8859-1/articles/pam/article.xml
+++ b/fr_FR.ISO8859-1/articles/pam/article.xml
@@ -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</programlisting>
relles.</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</programlisting>
<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</programlisting>
oriente tty peut l'tre.</para>
<programlisting>
-
-<inlinegraphic fileref="pam_conv.c"
- format="linespecific"/>
+<xi:include href="converse.c" parse="text"/>
</programlisting>
</appendix>
diff --git a/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml b/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml
index 0739471fca..e2f4733638 100644
--- a/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml
+++ b/ja_JP.eucJP/articles/fbsd-from-scratch/article.xml
@@ -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 /var/tmp/temproot.stage1? [no] <userinput>
ǥХ̾ѹտԤʤäƤ</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-uucp-rnews --enable-setgid-inews" make
<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>
diff --git a/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml b/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml
index 05b7027309..6f801e5da8 100644
--- a/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml
+++ b/ru_RU.KOI8-R/articles/fbsd-from-scratch/article.xml
@@ -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 /var/tmp/temproot.stage1? [no] <userinput>
. ,
.</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="--enable-uucp-rnews --enable-setgid-inews"
<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>
diff --git a/ru_RU.KOI8-R/articles/pam/article.xml b/ru_RU.KOI8-R/articles/pam/article.xml
index e481023e04..d10d4b116b 100644
--- a/ru_RU.KOI8-R/articles/pam/article.xml
+++ b/ru_RU.KOI8-R/articles/pam/article.xml
@@ -1272,8 +1272,9 @@ sshd password required pam_permit.so</programlisting>
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 pam_permit.so</programlisting>
&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 pam_permit.so</programlisting>
; , ģ
.</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">
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 878566172d..1fc9c466c8 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -149,7 +149,7 @@ DSSSLCATALOG= ${PREFIX}/share/sgml/docbook/dsssl/modular/catalog
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