diff options
| -rw-r--r-- | chapter01/changelog.xml | 2 | ||||
| -rw-r--r-- | chapter03/patches.xml | 12 | ||||
| -rw-r--r-- | chapter05/adjusting.xml | 8 | ||||
| -rw-r--r-- | chapter06/aboutdebug.xml | 3 | ||||
| -rw-r--r-- | chapter06/binutils.xml | 7 | ||||
| -rw-r--r-- | chapter06/inetutils.xml | 5 | ||||
| -rw-r--r-- | chapter06/man.xml | 4 | ||||
| -rw-r--r-- | chapter07/udev.xml | 14 | ||||
| -rw-r--r-- | chapter08/kernel.xml | 5 | ||||
| -rw-r--r-- | prologue/prerequisites.xml | 6 | ||||
| -rw-r--r-- | prologue/typography.xml | 2 |
11 files changed, 25 insertions, 43 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 7ac8512e9..1e424b0d7 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -3,7 +3,7 @@ <!ENTITY % general-entities SYSTEM "../general.ent"> %general-entities; ]> -<sect1 id="ch-scatter-changelog" condition="html"> +<sect1 id="ch-scatter-changelog"> <title>Changelog</title> <?dbhtml filename="changelog.html"?> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index c7d3efb8f..516646f95 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -32,8 +32,7 @@ needed to build an LFS system:</para> <varlistentry> <term>Coreutils Suppress Uptime, Kill, Su Patch - 16 KB:</term> <listitem> -<para condition="html"><ulink url="&patches-root;coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch"/></para> -<para condition="pdf"><ulink url="&patches-root;coreutils-&coreutils-version;-suppress_uptime_ kill_su-1.patch"/></para> +<para><ulink url="&patches-root;coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch"/></para> </listitem> </varlistentry> @@ -82,24 +81,21 @@ needed to build an LFS system:</para> <varlistentry> <term>Inetutils Kernel Headers Patch - 1 KB:</term> <listitem> -<para condition="html"><ulink url="&patches-root;inetutils-&inetutils-version;-kernel_headers-1.patch"/></para> -<para condition="pdf"><ulink url="&patches-root;inetutils-&inetutils-version;-kernel_headers- 1.patch"/></para> +<para><ulink url="&patches-root;inetutils-&inetutils-version;-kernel_headers-1.patch"/></para> </listitem> </varlistentry> <varlistentry> <term>Inetutils No-Server-Man-Pages Patch - 4 KB:</term> <listitem> -<para condition="html"><ulink url="&patches-root;inetutils-&inetutils-version;-no_server_man_pages-1.patch"/></para> -<para condition="pdf"><ulink url="&patches-root;inetutils-&inetutils-version;-no_server_man_ pages-1.patch"/></para> +<para><ulink url="&patches-root;inetutils-&inetutils-version;-no_server_man_pages-1.patch"/></para> </listitem> </varlistentry> <varlistentry> <term>IPRoute2 Disable DB Patch - 1 KB:</term> <listitem> -<para condition="html"><ulink url="&patches-root;iproute2-&iproute2-patch-version;-remove_db-1.patch"/></para> -<para condition="pdf"><ulink url="&patches-root;iproute2-&iproute2-patch-version;-remove_ db-1.patch"/></para> +<para><ulink url="&patches-root;iproute2-&iproute2-patch-version;-remove_db-1.patch"/></para> </listitem> </varlistentry> diff --git a/chapter05/adjusting.xml b/chapter05/adjusting.xml index 834ef166f..3558b1098 100644 --- a/chapter05/adjusting.xml +++ b/chapter05/adjusting.xml @@ -42,8 +42,8 @@ sed 's@ /lib/ld-linux.so.2@ /tools/lib/ld-linux.so.2@g' \ mv -f tempspecfile $SPECFILE && unset SPECFILE</userinput></screen> -<para><phrase condition="html">It is recommended that the above -command be copy-and-pasted in order to ensure accuracy.</phrase> +<para>It is recommended that the above +command be copy-and-pasted in order to ensure accuracy. Alternatively, the specs file can be edited by hand. This is done by replacing every occurrence of <quote>/lib/ld-linux.so.2</quote> with <quote>/tools/lib/ld-linux.so.2</quote></para> @@ -100,8 +100,8 @@ the <envar>PATH</envar> is wrong it could mean that you are not logged in as use <emphasis>lfs</emphasis> or that something went wrong back in <xref linkend="ch-tools-settingenviron" role="."/> Another option is that something may have gone wrong with the specs file amendment above. In this case, -redo the specs file amendment<phrase condition="html">, being careful to copy-and-paste the -commands</phrase>.</para> +redo the specs file amendment, being careful to copy-and-paste the +commands.</para> <para>Once all is well, clean up the test files:</para> diff --git a/chapter06/aboutdebug.xml b/chapter06/aboutdebug.xml index 7ef47d71c..5ba986652 100644 --- a/chapter06/aboutdebug.xml +++ b/chapter06/aboutdebug.xml @@ -44,8 +44,7 @@ five.</para> software, a lot of disk space can be regained by removing these symbols. The next section shows how to strip all debugging symbols from the programs and libraries. Additional information on system -optimization can be found at <ulink url="&hints-root;optimization.txt"><phrase -condition="pdf">&hints-root; optimization.txt</phrase></ulink>.</para> +optimization can be found at <ulink url="&hints-root;optimization.txt"/>.</para> </sect1> diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml index c3032612a..99dca0a03 100644 --- a/chapter06/binutils.xml +++ b/chapter06/binutils.xml @@ -69,11 +69,8 @@ cd ../binutils-build</userinput></screen> <para>Normally, the tooldir (the directory where the executables will ultimately be located) is set to <filename class="directory">$(exec_prefix)/$(target_alias)</filename>, which -expands into <phrase condition="html"><filename -class="directory">/usr/i686-pc-linux-gnu</filename></phrase><phrase -condition="pdf"><filename class="directory">/usr/i686-pc- -linux-gnu</filename></phrase>. Because this is a custom system, this -target-specific directory in <filename +expands into <filename class="directory">/usr/i686-pc-linux-gnu</filename>. +Because this is a custom system, this target-specific directory in <filename class="directory">/usr</filename> is not required. This setup would be used if the system was used to cross-compile (for example, compiling a package on an Intel machine that generates code that can be executed diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml index e489dfc06..9c45ccda7 100644 --- a/chapter06/inetutils.xml +++ b/chapter06/inetutils.xml @@ -78,9 +78,8 @@ Instructions for a better <command>whois</command> client are in the BLFS book.< servers included as part of the Inetutils package. These servers are deemed not appropriate in a basic LFS system. Some are insecure by nature and are only considered safe on trusted networks. More -information can be found at <phrase condition="html"><ulink -url="&blfs-root;view/svn/basicnet/inetutils.html"/></phrase><phrase -condition="pdf"><ulink url="&blfs-root;view/svn/ basicnet/inetutils.html"/></phrase>. Note that +information can be found at <ulink +url="&blfs-root;view/svn/basicnet/inetutils.html"/>. Note that better replacements are available for many of these servers.</para></listitem> </varlistentry> diff --git a/chapter06/man.xml b/chapter06/man.xml index 1a0bce0ff..a5ed1bf50 100644 --- a/chapter06/man.xml +++ b/chapter06/man.xml @@ -99,9 +99,7 @@ not support multibyte character sets.</para> <para>Additional information with regards to the compression of man and info pages can be found in the BLFS book at -<ulink url="&blfs-root;view/cvs/postlfs/compressdoc.html"><phrase -condition="pdf">http://www.linuxfromscratch.org/blfs/view/cvs/postlfs/ -compressdoc.html</phrase></ulink>.</para> +<ulink url="&blfs-root;view/cvs/postlfs/compressdoc.html"/>.</para> </sect2> diff --git a/chapter07/udev.xml b/chapter07/udev.xml index 51e001134..f1af4561c 100644 --- a/chapter07/udev.xml +++ b/chapter07/udev.xml @@ -226,18 +226,14 @@ modules when any request is made to load the driver sites:</para> <itemizedlist> -<listitem><para remap="verbatim">A Userspace Implementation of devfs -<ulink url="http://www.kroah.com/linux/talks/ols_2003_udev_paper/Reprint-Kroah-Hartman-OLS2003.pdf"><phrase -condition="pdf">http://www.kroah.com/linux/talks/ols_2003_udev_paper/ -Reprint-Kroah-Hartman-OLS2003.pdf</phrase></ulink></para></listitem> +<listitem><para>A Userspace Implementation of devfs +<ulink url="http://www.kroah.com/linux/talks/ols_2003_udev_paper/Reprint-Kroah-Hartman-OLS2003.pdf"/></para></listitem> -<listitem><para remap="verbatim">udev FAQ +<listitem><para>udev FAQ <ulink url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-FAQ"/></para></listitem> -<listitem><para remap="verbatim">The Linux Kernel Driver Model -<ulink url="http://public.planetmirror.com/pub/lca/2003/proceedings/papers/Patrick_Mochel/Patrick_Mochel.pdf"><phrase -condition="pdf">http://public.planetmirror.com/pub/lca/2003/proceedings/papers/ -Patrick_Mochel/Patrick_Mochel.pdf</phrase></ulink></para></listitem> +<listitem><para>The Linux Kernel Driver Model +<ulink url="http://public.planetmirror.com/pub/lca/2003/proceedings/papers/Patrick_Mochel/Patrick_Mochel.pdf"/></para></listitem> </itemizedlist> </sect2> diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml index e081c0b46..a6b1e727a 100644 --- a/chapter08/kernel.xml +++ b/chapter08/kernel.xml @@ -56,10 +56,7 @@ compile the keymap into the kernel, issue the command below:</para> drivers/char/defkeymap.c</userinput></screen> <para>For example, if using a Dutch keyboard, use -<phrase -condition="html"><filename>/usr/share/kbd/keymaps/i386/qwerty/nl.map.gz</filename></phrase><phrase -condition="pdf"><filename>/usr/share/kbd/keymaps/i386/ -qwerty/nl.map.gz</filename></phrase>.</para> +<filename>/usr/share/kbd/keymaps/i386/qwerty/nl.map.gz</filename>.</para> <para>Configure the kernel via a menu-driven interface BLFS has some information regarding particular kernel configuration requirements of diff --git a/prologue/prerequisites.xml b/prologue/prerequisites.xml index 506fe4487..f72d4b853 100644 --- a/prologue/prerequisites.xml +++ b/prologue/prerequisites.xml @@ -12,18 +12,18 @@ and installing Linux software. Before building an LFS system, we recommend reading the following HOWTOs:</para> <itemizedlist> -<listitem><para remap="verbatim">Software-Building-HOWTO +<listitem><para>Software-Building-HOWTO <ulink url="http://www.tldp.org/HOWTO/Software-Building-HOWTO.html"/></para> <para>This is a comprehensive guide to building and installing <quote>generic</quote> Unix software distributions under Linux.</para></listitem> -<listitem><para remap="verbatim">The Linux Users' Guide +<listitem><para>The Linux Users' Guide <ulink url="http://espc22.murdoch.edu.au/~stewart/guide/guide.html"/></para> <para>This guide covers the usage of assorted Linux software.</para></listitem> -<listitem><para remap="verbatim">The Essential Pre-Reading Hint +<listitem><para>The Essential Pre-Reading Hint <ulink url="&hints-root;essential_prereading.txt"/></para> <para>This is an LFS Hint written specifically for users new to Linux. diff --git a/prologue/typography.xml b/prologue/typography.xml index 3a74378a4..62b8ef9c9 100644 --- a/prologue/typography.xml +++ b/prologue/typography.xml @@ -52,7 +52,7 @@ Therefore, this entire section is generally typed as seen.</para> <para><replaceable>[REPLACED TEXT]</replaceable></para> <para>This format is used to encapsulate text that is not to be typed -as seen<phrase condition="html"> or copy-and-pasted</phrase>.</para> +as seen or copy-and-pasted.</para> </sect1> |