r4132 - branches/testing/BOOK/chapter06

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sun Sep 5 06:22:25 PDT 2004


Author: manuel
Date: 2004-09-05 07:22:23 -0600 (Sun, 05 Sep 2004)
New Revision: 4132

Modified:
   branches/testing/BOOK/chapter06/autoconf.xml
   branches/testing/BOOK/chapter06/automake.xml
   branches/testing/BOOK/chapter06/bash.xml
   branches/testing/BOOK/chapter06/binutils.xml
   branches/testing/BOOK/chapter06/bison.xml
   branches/testing/BOOK/chapter06/bzip2.xml
   branches/testing/BOOK/chapter06/changingowner.xml
   branches/testing/BOOK/chapter06/chroot.xml
   branches/testing/BOOK/chapter06/coreutils.xml
   branches/testing/BOOK/chapter06/devices.xml
   branches/testing/BOOK/chapter06/diffutils.xml
   branches/testing/BOOK/chapter06/e2fsprogs.xml
   branches/testing/BOOK/chapter06/file.xml
   branches/testing/BOOK/chapter06/findutils.xml
   branches/testing/BOOK/chapter06/flex.xml
   branches/testing/BOOK/chapter06/gawk.xml
   branches/testing/BOOK/chapter06/gcc.xml
   branches/testing/BOOK/chapter06/gettext.xml
   branches/testing/BOOK/chapter06/glibc.xml
   branches/testing/BOOK/chapter06/grep.xml
   branches/testing/BOOK/chapter06/groff.xml
   branches/testing/BOOK/chapter06/grub.xml
   branches/testing/BOOK/chapter06/gzip.xml
   branches/testing/BOOK/chapter06/iana-etc.xml
   branches/testing/BOOK/chapter06/inetutils.xml
   branches/testing/BOOK/chapter06/iproute2.xml
   branches/testing/BOOK/chapter06/kbd.xml
   branches/testing/BOOK/chapter06/kernfs.xml
   branches/testing/BOOK/chapter06/less.xml
   branches/testing/BOOK/chapter06/libtool.xml
   branches/testing/BOOK/chapter06/m4.xml
   branches/testing/BOOK/chapter06/make.xml
   branches/testing/BOOK/chapter06/man-pages.xml
   branches/testing/BOOK/chapter06/man.xml
   branches/testing/BOOK/chapter06/mktemp.xml
   branches/testing/BOOK/chapter06/module-init-tools.xml
   branches/testing/BOOK/chapter06/ncurses.xml
   branches/testing/BOOK/chapter06/patch.xml
   branches/testing/BOOK/chapter06/perl.xml
   branches/testing/BOOK/chapter06/procps.xml
   branches/testing/BOOK/chapter06/psmisc.xml
   branches/testing/BOOK/chapter06/readjusting.xml
   branches/testing/BOOK/chapter06/readline.xml
   branches/testing/BOOK/chapter06/revisedchroot.xml
   branches/testing/BOOK/chapter06/sed.xml
   branches/testing/BOOK/chapter06/shadow.xml
   branches/testing/BOOK/chapter06/sysklogd.xml
   branches/testing/BOOK/chapter06/sysvinit.xml
   branches/testing/BOOK/chapter06/tar.xml
   branches/testing/BOOK/chapter06/texinfo.xml
   branches/testing/BOOK/chapter06/util-linux.xml
   branches/testing/BOOK/chapter06/vim.xml
   branches/testing/BOOK/chapter06/zlib.xml
Log:
Tags corrections, Chapter 6.

Modified: branches/testing/BOOK/chapter06/autoconf.xml
===================================================================
--- branches/testing/BOOK/chapter06/autoconf.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/autoconf.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-autoconf" xreflabel="Autoconf" role="wrap">
+<sect1 id="ch-system-autoconf" role="wrap">
 <title>Autoconf-&autoconf-version;</title>
 <?dbhtml filename="autoconf.html"?>
 

Modified: branches/testing/BOOK/chapter06/automake.xml
===================================================================
--- branches/testing/BOOK/chapter06/automake.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/automake.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-automake" xreflabel="Automake" role="wrap">
+<sect1 id="ch-system-automake" role="wrap">
 <title>Automake-&automake-version;</title>
 <?dbhtml filename="automake.html"?>
 

Modified: branches/testing/BOOK/chapter06/bash.xml
===================================================================
--- branches/testing/BOOK/chapter06/bash.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/bash.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-bash" xreflabel="Bash" role="wrap">
+<sect1 id="ch-system-bash" role="wrap">
 <title>Bash-&bash-version;</title>
 <?dbhtml filename="bash.html"?>
 

Modified: branches/testing/BOOK/chapter06/binutils.xml
===================================================================
--- branches/testing/BOOK/chapter06/binutils.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/binutils.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-binutils" xreflabel="Binutils" role="wrap">
+<sect1 id="ch-system-binutils" role="wrap">
 <title>Binutils-&binutils-version;</title>
 <?dbhtml filename="binutils.html"?>
 
@@ -33,7 +33,7 @@
 optimization flags (including the <parameter>-march</parameter> and
 <parameter>-mcpu</parameter> options) are changed. If any environment
 variables that override default optimizations have been defined, such
-as <emphasis>CFLAGS</emphasis> and <emphasis>CXXFLAGS</emphasis>,
+as <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar>,
 unset them when building Binutils.</para>
 
 <para>Verify that the PTYs are working properly inside the chroot

Modified: branches/testing/BOOK/chapter06/bison.xml
===================================================================
--- branches/testing/BOOK/chapter06/bison.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/bison.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-bison" xreflabel="Bison" role="wrap">
+<sect1 id="ch-system-bison" role="wrap">
 <title>Bison-&bison-version;</title>
 <?dbhtml filename="bison.html"?>
 

Modified: branches/testing/BOOK/chapter06/bzip2.xml
===================================================================
--- branches/testing/BOOK/chapter06/bzip2.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/bzip2.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-bzip2" xreflabel="Bzip2" role="wrap">
+<sect1 id="ch-system-bzip2" role="wrap">
 <title>Bzip2-&bzip2-version;</title>
 <?dbhtml filename="bzip2.html"?>
 

Modified: branches/testing/BOOK/chapter06/changingowner.xml
===================================================================
--- branches/testing/BOOK/chapter06/changingowner.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/changingowner.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -31,7 +31,7 @@
 <screen><userinput>chown -R 0:0 /tools</userinput></screen>
 
 <para>The command uses <parameter>0:0</parameter> instead of
-<parameter>root:root</parameter>, because <userinput>chown</userinput>
+<parameter>root:root</parameter>, because <command>chown</command>
 is unable to resolve the name <quote>root</quote> until the password
 file has been created. This book assumes you ran this
 <command>chown</command> command.</para>

Modified: branches/testing/BOOK/chapter06/chroot.xml
===================================================================
--- branches/testing/BOOK/chapter06/chroot.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/chroot.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -20,28 +20,29 @@
 
 <para>The <parameter>-i</parameter> option given to the
 <command>env</command> command will clear all variables of the chroot
-environment. After that, only the <emphasis>HOME</emphasis>,
-<emphasis>TERM</emphasis>, <emphasis>PS1</emphasis>, and
-<emphasis>PATH</emphasis> variables are set again. The
+environment. After that, only the <envar>HOME</envar>,
+<envar>TERM</envar>, <envar>PS1</envar>, and
+<envar>PATH</envar> variables are set again. The
 <parameter>TERM=$TERM</parameter> construct will set the
-<emphasis>TERM</emphasis> variable inside chroot to the same value as
+<envar>TERM</envar> variable inside chroot to the same value as
 outside chroot. This variable is needed for programs like
 <command>vim</command> and <command>less</command> to operate
 properly.  If other variables are needed, such as
-<emphasis>CFLAGS</emphasis> or <emphasis>CXXFLAGS</emphasis>, this is
+<envar>CFLAGS</envar> or <envar>CXXFLAGS</envar>, this is
 a good place to set them again.</para>
 
 <para>From this point on, there is no need to use the
-<emphasis>LFS</emphasis> variable anymore, because all work will be
+<envar>LFS</envar> variable anymore, because all work will be
 restricted to the LFS file system.  This is because the Bash shell is
 told that <filename class="directory">$LFS</filename> is now the root
 (<filename class="directory">/</filename>) directory.</para>
 
-<para>Notice that <filename class="directory">/tools/bin</filename> comes last in the PATH. This means that a
+<para>Notice that <filename class="directory">/tools/bin</filename> 
+comes last in the <envar>PATH</envar>. This means that a
 temporary tool will not be used anymore as soon as its final version
 is installed. This occurs when the shell does not <quote>remember</quote> the
 locations of executed binaries—for this reason, hashing is switched
-off by passing the +h option to bash.</para>
+off by passing the <parameter>+h</parameter> option to bash.</para>
 
 <para>It is important that all the commands throughout the remainder
 of this chapter and the following chapters be run from within the

Modified: branches/testing/BOOK/chapter06/coreutils.xml
===================================================================
--- branches/testing/BOOK/chapter06/coreutils.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/coreutils.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-coreutils" xreflabel="Coreutils" role="wrap">
+<sect1 id="ch-system-coreutils" role="wrap">
 <title>Coreutils-&coreutils-version;</title>
 <?dbhtml filename="coreutils.html"?>
 

Modified: branches/testing/BOOK/chapter06/devices.xml
===================================================================
--- branches/testing/BOOK/chapter06/devices.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/devices.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-devices" xreflabel="devices">
+<sect1 id="ch-system-devices">
 <title>Populating /dev</title>
 <?dbhtml filename="devices.html"?>
 
@@ -25,7 +25,8 @@
 <title>Mounting ramfs and Populating /dev</title>
 
 <para>The ideal way to populate <filename
-class="directory">/dev</filename> is to mount a ramfs onto <filename
+class="directory">/dev</filename> is to mount a <systemitem
+class="filesystem">ramfs</systemitem> onto <filename
 class="directory">/dev</filename>, like <systemitem
 class="filesystem">tmpfs</systemitem>, and create the devices on there
 during each bootup. Since the system has not been booted, it is

Modified: branches/testing/BOOK/chapter06/diffutils.xml
===================================================================
--- branches/testing/BOOK/chapter06/diffutils.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/diffutils.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-diffutils" xreflabel="Diffutils" role="wrap">
+<sect1 id="ch-system-diffutils" role="wrap">
 <title>Diffutils-&diffutils-version;</title>
 <?dbhtml filename="diffutils.html"?>
 

Modified: branches/testing/BOOK/chapter06/e2fsprogs.xml
===================================================================
--- branches/testing/BOOK/chapter06/e2fsprogs.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/e2fsprogs.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,15 +3,16 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-e2fsprogs" xreflabel="E2fsprogs" role="wrap">
+<sect1 id="ch-system-e2fsprogs" role="wrap">
 <title>E2fsprogs-&e2fsprogs-version;</title>
 <?dbhtml filename="e2fsprogs.html"?>
 
 <indexterm zone="ch-system-e2fsprogs"><primary sortas="a-E2fsprogs">E2fsprogs</primary></indexterm>
 
 <sect2 role="package"><title/>
-<para>The E2fsprogs package contains the utilities for handling the ext2
-file system. It also supports the ext3 journaling file system.</para>
+<para>The E2fsprogs package contains the utilities for handling the 
+<systemitem class="filesystem">ext2</systemitem> file system. It also supports
+the <systemitem class="filesystem">ext3</systemitem> journaling file system.</para>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>

Modified: branches/testing/BOOK/chapter06/file.xml
===================================================================
--- branches/testing/BOOK/chapter06/file.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/file.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-file" xreflabel="File" role="wrap">
+<sect1 id="ch-system-file" role="wrap">
 <title>File-&file-version;</title>
 <?dbhtml filename="file.html"?>
 

Modified: branches/testing/BOOK/chapter06/findutils.xml
===================================================================
--- branches/testing/BOOK/chapter06/findutils.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/findutils.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-findutils" xreflabel="Findutils" role="wrap">
+<sect1 id="ch-system-findutils" role="wrap">
 <title>Findutils-&findutils-version;</title>
 <?dbhtml filename="findutils.html"?>
 

Modified: branches/testing/BOOK/chapter06/flex.xml
===================================================================
--- branches/testing/BOOK/chapter06/flex.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/flex.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-flex" xreflabel="Flex" role="wrap">
+<sect1 id="ch-system-flex" role="wrap">
 <title>Flex-&flex-version;</title>
 <?dbhtml filename="flex.html"?>
 
@@ -56,7 +56,7 @@
 <screen><userinput>make install</userinput></screen>
 
 <para>There are some packages that expect to find the
-<filename>lex</filename> library in <filename
+<filename class="libraryfile">lex</filename> library in <filename
 class="directory">/usr/lib</filename>. Create a symlink to account for
 this:</para>
 

Modified: branches/testing/BOOK/chapter06/gawk.xml
===================================================================
--- branches/testing/BOOK/chapter06/gawk.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/gawk.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-gawk" xreflabel="Gawk" role="wrap">
+<sect1 id="ch-system-gawk" role="wrap">
 <title>Gawk-&gawk-version;</title>
 <?dbhtml filename="gawk.html"?>
 

Modified: branches/testing/BOOK/chapter06/gcc.xml
===================================================================
--- branches/testing/BOOK/chapter06/gcc.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/gcc.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-gcc" xreflabel="GCC" role="wrap">
+<sect1 id="ch-system-gcc" role="wrap">
 <title>GCC-&gcc-version;</title>
 <?dbhtml filename="gcc.html"?>
 
@@ -33,7 +33,7 @@
 optimization flags (including the <parameter>-march</parameter> and
 <parameter>-mcpu</parameter> options) are changed. If any environment
 variables that override default optimizations have been defined, such
-as <emphasis>CFLAGS</emphasis> and <emphasis>CXXFLAGS</emphasis>,
+as <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar>,
 unset them when building GCC.</para>
 
 <para>Unpack both the gcc-core and the gcc-g++ tarballs—they will

Modified: branches/testing/BOOK/chapter06/gettext.xml
===================================================================
--- branches/testing/BOOK/chapter06/gettext.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/gettext.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-gettext" xreflabel="Gettext" role="wrap">
+<sect1 id="ch-system-gettext" role="wrap">
 <title>Gettext-&gettext-version;</title>
 <?dbhtml filename="gettext.html"?>
 

Modified: branches/testing/BOOK/chapter06/glibc.xml
===================================================================
--- branches/testing/BOOK/chapter06/glibc.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/glibc.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-glibc" xreflabel="Glibc" role="wrap">
+<sect1 id="ch-system-glibc" role="wrap">
 <title>Glibc-&glibc-version;</title>
 <?dbhtml filename="glibc.html"?>
 
@@ -35,7 +35,7 @@
 optimization flags (including the <parameter>-march</parameter> and
 <parameter>-mcpu</parameter> options) are changed. If any environment
 variables that override default optimizations have been defined, such
-as <emphasis>CFLAGS</emphasis> and <emphasis>CXXFLAGS</emphasis>,
+as <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar>,
 unset them when building GCC.</para>
 
 <para>The Glibc build system is self-contained and will install
@@ -106,7 +106,8 @@
 class="filesystem">devfs</systemitem> file system but does not have
 the <systemitem class="filesystem">tmpfs</systemitem> file system
 mounted at <filename class="directory">/dev/shm</filename>.  This
-occurs because of a lack of support for tmpfs in the
+occurs because of a lack of support for <systemitem 
+class="filesystem">tmpfs</systemitem> in the
 kernel.</para></listitem>
 
 <listitem><para>When running on older and slower hardware, some tests
@@ -138,7 +139,7 @@
 are a number of locales that are essential in order for the tests of
 future packages to pass, in particular, the
 <emphasis>libstdc++</emphasis> tests from GCC. The following
-instructions, instead of the <emphasis>install-locales</emphasis>
+instructions, instead of the <parameter>install-locales</parameter>
 target used above, will install the minimum set of locales necessary
 for the tests to run successfully:</para>
 

Modified: branches/testing/BOOK/chapter06/grep.xml
===================================================================
--- branches/testing/BOOK/chapter06/grep.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/grep.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-grep" xreflabel="Grep" role="wrap">
+<sect1 id="ch-system-grep" role="wrap">
 <title>Grep-&grep-version;</title>
 <?dbhtml filename="grep.html"?>
 

Modified: branches/testing/BOOK/chapter06/groff.xml
===================================================================
--- branches/testing/BOOK/chapter06/groff.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/groff.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-groff" xreflabel="Groff" role="wrap">
+<sect1 id="ch-system-groff" role="wrap">
 <title>Groff-&groff-version;</title>
 <?dbhtml filename="groff.html"?>
 
@@ -28,7 +28,7 @@
 <sect2 role="installation">
 <title>Installation of Groff</title>
 
-<para>Groff expects the environment variable <emphasis>PAGE</emphasis>
+<para>Groff expects the environment variable <envar>PAGE</envar>
 to contain the default paper size. For users in the United States, the
 command below is appropriate. Elsewhere, the
 <parameter>PAGE=letter</parameter> may need to be changed to
@@ -36,7 +36,7 @@
 
 <para>Prepare Groff for compilation:</para>
 
-<screen><userinput>PAGE=letter ./configure --prefix=/usr</userinput></screen>
+<screen><userinput>PAGE=<replaceable>[letter]</replaceable> ./configure --prefix=/usr</userinput></screen>
 
 <para>Compile the package:</para>
 

Modified: branches/testing/BOOK/chapter06/grub.xml
===================================================================
--- branches/testing/BOOK/chapter06/grub.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/grub.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-grub" xreflabel="Grub" role="wrap">
+<sect1 id="ch-system-grub" role="wrap">
 <title>Grub-&grub-version;</title>
 <?dbhtml filename="grub.html"?>
 
@@ -32,7 +32,7 @@
 optimization flags (including the <parameter>-march</parameter> and
 <parameter>-mcpu</parameter> options) are changed. If any environment
 variables that override default optimizations have been defined, such
-as <emphasis>CFLAGS</emphasis> and <emphasis>CXXFLAGS</emphasis>,
+as <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar>,
 unset them when building Grub.</para>
 
 <para>Prepare Grub for compilation:</para>

Modified: branches/testing/BOOK/chapter06/gzip.xml
===================================================================
--- branches/testing/BOOK/chapter06/gzip.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/gzip.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-gzip" xreflabel="Gzip" role="wrap">
+<sect1 id="ch-system-gzip" role="wrap">
 <title>Gzip-&gzip-version;</title>
 <?dbhtml filename="gzip.html"?>
 

Modified: branches/testing/BOOK/chapter06/iana-etc.xml
===================================================================
--- branches/testing/BOOK/chapter06/iana-etc.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/iana-etc.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-iana-etc" xreflabel="Iana-Etc" role="wrap">
+<sect1 id="ch-system-iana-etc" role="wrap">
 <title>Iana-Etc-&iana-etc-version;</title>
 <?dbhtml filename="iana-etc.html"?>
 

Modified: branches/testing/BOOK/chapter06/inetutils.xml
===================================================================
--- branches/testing/BOOK/chapter06/inetutils.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/inetutils.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-inetutils" xreflabel="Inetutils" role="wrap">
+<sect1 id="ch-system-inetutils" role="wrap">
 <title>Inetutils-&inetutils-version;</title>
 <?dbhtml filename="inetutils.html"?>
 

Modified: branches/testing/BOOK/chapter06/iproute2.xml
===================================================================
--- branches/testing/BOOK/chapter06/iproute2.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/iproute2.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-iproute2" xreflabel="IProute2" role="wrap">
+<sect1 id="ch-system-iproute2" role="wrap">
   <title>Iproute2-&iproute2-version;</title>
 <?dbhtml filename="iproute2.html"?>
   <indexterm zone="ch-system-iproute2">

Modified: branches/testing/BOOK/chapter06/kbd.xml
===================================================================
--- branches/testing/BOOK/chapter06/kbd.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/kbd.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-kbd" xreflabel="Kbd" role="wrap">
+<sect1 id="ch-system-kbd" role="wrap">
 <title>Kbd-&kbd-version;</title>
 <?dbhtml filename="kbd.html"?>
 

Modified: branches/testing/BOOK/chapter06/kernfs.xml
===================================================================
--- branches/testing/BOOK/chapter06/kernfs.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/kernfs.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -31,8 +31,9 @@
 mount -f -t devpts -o gid=4,mode=620 devpts $LFS/dev/pts</userinput></screen>
 
 <para>The <command>mount</command> commands executed above may result
-in the following warning message: <quote>can't open /etc/fstab: No
-such file or directory</quote>. This file—/etc/fstab—has
+in the following warning message: <computeroutput>can't open /etc/fstab: No
+such file or directory</computeroutput>. This
+file—<filename>/etc/fstab</filename>—has
 not been created yet but is also not required for the file systems to
 be properly mounted. As such, the warning can be safely ignored.</para>
 

Modified: branches/testing/BOOK/chapter06/less.xml
===================================================================
--- branches/testing/BOOK/chapter06/less.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/less.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-less" xreflabel="Less" role="wrap">
+<sect1 id="ch-system-less" role="wrap">
 <title>Less-&less-version;</title>
 <?dbhtml filename="less.html"?>
 

Modified: branches/testing/BOOK/chapter06/libtool.xml
===================================================================
--- branches/testing/BOOK/chapter06/libtool.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/libtool.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-libtool" xreflabel="Libtool" role="wrap">
+<sect1 id="ch-system-libtool" role="wrap">
 <title>Libtool-&libtool-version;</title>
 <?dbhtml filename="libtool.html"?>
 

Modified: branches/testing/BOOK/chapter06/m4.xml
===================================================================
--- branches/testing/BOOK/chapter06/m4.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/m4.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-m4" xreflabel="M4" role="wrap">
+<sect1 id="ch-system-m4" role="wrap">
 <title>M4-&m4-version;</title>
 <?dbhtml filename="m4.html"?>
 

Modified: branches/testing/BOOK/chapter06/make.xml
===================================================================
--- branches/testing/BOOK/chapter06/make.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/make.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-make" xreflabel="Make" role="wrap">
+<sect1 id="ch-system-make" role="wrap">
 <title>Make-&make-version;</title>
 <?dbhtml filename="make.html"?>
 

Modified: branches/testing/BOOK/chapter06/man-pages.xml
===================================================================
--- branches/testing/BOOK/chapter06/man-pages.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/man-pages.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-man-pages" xreflabel="Man-pages" role="wrap">
+<sect1 id="ch-system-man-pages" role="wrap">
 <title>Man-pages-&man-pages-version;</title>
 <?dbhtml filename="man-pages.html"?>
 

Modified: branches/testing/BOOK/chapter06/man.xml
===================================================================
--- branches/testing/BOOK/chapter06/man.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/man.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-man" xreflabel="Man" role="wrap">
+<sect1 id="ch-system-man" role="wrap">
 <title>Man-&man-version;</title>
 <?dbhtml filename="man.html"?>
 
@@ -37,7 +37,7 @@
 <screen><userinput>patch -Np1 -i ../man-&man-version;-80cols-1.patch</userinput></screen>
 
 <para>The second is a sed substitution to add the
-<parameter>-R</parameter> switch to the <emphasis>PAGER</emphasis>
+<parameter>-R</parameter> switch to the <envar>PAGER</envar>
 variable so that escape sequences are properly handled by Less:</para>
 
 <screen><userinput>sed -i 's at -is@&R at g' configure</userinput></screen>
@@ -75,7 +75,7 @@
 <note><para>To disable Select Graphic Rendition (SGR) escape
 sequences, edit the <filename>man.conf</filename> file and
 add the <parameter>-c</parameter> switch to
-the <quote>NROFF</quote> variable.</para></note>
+the <envar>NROFF</envar> variable.</para></note>
 
 <para>If the character set uses 8-bit characters, search for the line
 beginning with <quote>NROFF</quote> in

Modified: branches/testing/BOOK/chapter06/mktemp.xml
===================================================================
--- branches/testing/BOOK/chapter06/mktemp.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/mktemp.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-mktemp" xreflabel="Mktemp" role="wrap">
+<sect1 id="ch-system-mktemp" role="wrap">
 <title>Mktemp-&mktemp-version;</title>
 <?dbhtml filename="mktemp.html"?>
 

Modified: branches/testing/BOOK/chapter06/module-init-tools.xml
===================================================================
--- branches/testing/BOOK/chapter06/module-init-tools.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/module-init-tools.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-module-init-tools" xreflabel="Module-Init-Tools" role="wrap">
+<sect1 id="ch-system-module-init-tools" role="wrap">
 <title>Module-Init-Tools-&module-init-tools-version;</title>
 <?dbhtml filename="module-init-tools.html"?>
 

Modified: branches/testing/BOOK/chapter06/ncurses.xml
===================================================================
--- branches/testing/BOOK/chapter06/ncurses.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/ncurses.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-ncurses" xreflabel="Ncurses" role="wrap">
+<sect1 id="ch-system-ncurses" role="wrap">
 <title>Ncurses-&ncurses-version;</title>
 <?dbhtml filename="ncurses.html"?>
 

Modified: branches/testing/BOOK/chapter06/patch.xml
===================================================================
--- branches/testing/BOOK/chapter06/patch.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/patch.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-patch" xreflabel="Patch" role="wrap">
+<sect1 id="ch-system-patch" role="wrap">
 <title>Patch-&patch-version;</title>
 <?dbhtml filename="patch.html"?>
 

Modified: branches/testing/BOOK/chapter06/perl.xml
===================================================================
--- branches/testing/BOOK/chapter06/perl.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/perl.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-perl" xreflabel="Perl" role="wrap">
+<sect1 id="ch-system-perl" role="wrap">
 <title>Perl-&perl-version;</title>
 <?dbhtml filename="perl.html"?>
 

Modified: branches/testing/BOOK/chapter06/procps.xml
===================================================================
--- branches/testing/BOOK/chapter06/procps.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/procps.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-procps" xreflabel="Procps" role="wrap">
+<sect1 id="ch-system-procps" role="wrap">
 <title>Procps-&procps-version;</title>
 <?dbhtml filename="procps.html"?>
 

Modified: branches/testing/BOOK/chapter06/psmisc.xml
===================================================================
--- branches/testing/BOOK/chapter06/psmisc.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/psmisc.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-psmisc" xreflabel="Psmisc" role="wrap">
+<sect1 id="ch-system-psmisc" role="wrap">
 <title>Psmisc-&psmisc-version;</title>
 <?dbhtml filename="psmisc.html"?>
 

Modified: branches/testing/BOOK/chapter06/readjusting.xml
===================================================================
--- branches/testing/BOOK/chapter06/readjusting.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/readjusting.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -67,8 +67,8 @@
 
 <important><para>If working on a platform where the name of the
 dynamic linker is something other than
-<filename>ld-linux.so.2</filename>, substitute
-<filename>ld-linux.so.2</filename> with the name of the platform's
+<filename class="libraryfile">ld-linux.so.2</filename>, substitute
+<quote>ld-linux.so.2</quote> with the name of the platform's
 dynamic linker in the above commands. Refer back to <xref
 linkend="ch-tools-toolchaintechnotes" role=","/> if
 necessary.</para></important>

Modified: branches/testing/BOOK/chapter06/readline.xml
===================================================================
--- branches/testing/BOOK/chapter06/readline.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/readline.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-readline" xreflabel="Readline" role="wrap">
+<sect1 id="ch-system-readline" role="wrap">
 <title>Readline-&readline-version;</title>
 <?dbhtml filename="readline.html"?>
 
@@ -48,7 +48,7 @@
 <varlistentry>
 <term><parameter>SHLIB_XLDFLAGS=-lncurses</parameter></term>
 <listitem><para>This option forces readline to link against the
-<filename>libncurses</filename> library.</para></listitem>
+<filename class="libraryfile">libncurses</filename> library.</para></listitem>
 </varlistentry>
 </variablelist>
 

Modified: branches/testing/BOOK/chapter06/revisedchroot.xml
===================================================================
--- branches/testing/BOOK/chapter06/revisedchroot.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/revisedchroot.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -38,7 +38,7 @@
 class="directory">/sources</filename> can also be moved to a more
 usual location, such as <filename
 class="directory">/usr/src/packages</filename>. The entire directory
-can also be deleted if its contents have been burned to a CD).</para>
+can also be deleted if its contents have been burned to a CD.</para>
 
 </sect1>
 

Modified: branches/testing/BOOK/chapter06/sed.xml
===================================================================
--- branches/testing/BOOK/chapter06/sed.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/sed.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-sed" xreflabel="Sed" role="wrap">
+<sect1 id="ch-system-sed" role="wrap">
 <title>Sed-&sed-version;</title>
 <?dbhtml filename="sed.html"?>
 

Modified: branches/testing/BOOK/chapter06/shadow.xml
===================================================================
--- branches/testing/BOOK/chapter06/shadow.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/shadow.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-shadow" xreflabel="Shadow" role="wrap">
+<sect1 id="ch-system-shadow" role="wrap">
 <title>Shadow-&shadow-version;</title>
 <?dbhtml filename="shadow.html"?>
 

Modified: branches/testing/BOOK/chapter06/sysklogd.xml
===================================================================
--- branches/testing/BOOK/chapter06/sysklogd.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/sysklogd.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-sysklogd" xreflabel="Sysklogd" role="wrap">
+<sect1 id="ch-system-sysklogd" role="wrap">
 <title>Sysklogd-&sysklogd-version;</title>
 <?dbhtml filename="sysklogd.html"?>
 

Modified: branches/testing/BOOK/chapter06/sysvinit.xml
===================================================================
--- branches/testing/BOOK/chapter06/sysvinit.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/sysvinit.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-sysvinit" xreflabel="Sysvinit" role="wrap">
+<sect1 id="ch-system-sysvinit" role="wrap">
 <title>Sysvinit-&sysvinit-version;</title>
 <?dbhtml filename="sysvinit.html"?>
 

Modified: branches/testing/BOOK/chapter06/tar.xml
===================================================================
--- branches/testing/BOOK/chapter06/tar.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/tar.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-tar" xreflabel="Tar" role="wrap">
+<sect1 id="ch-system-tar" role="wrap">
 <title>Tar-&tar-version;</title>
 <?dbhtml filename="tar.html"?>
 

Modified: branches/testing/BOOK/chapter06/texinfo.xml
===================================================================
--- branches/testing/BOOK/chapter06/texinfo.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/texinfo.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-texinfo" xreflabel="Texinfo" role="wrap">
+<sect1 id="ch-system-texinfo" role="wrap">
 <title>Texinfo-&texinfo-version;</title>
 <?dbhtml filename="texinfo.html"?>
 
@@ -53,7 +53,7 @@
 <variablelist>
 <varlistentry>
 <term><parameter>TEXMF=/usr/share/texmf</parameter></term>
-<listitem><para>The TEXMF makefile variable holds the location of the
+<listitem><para>The <envar>TEXMF</envar> makefile variable holds the location of the
 root of the TeX tree if, for example, a TeX package will be installed
 later.</para></listitem>
 </varlistentry>

Modified: branches/testing/BOOK/chapter06/util-linux.xml
===================================================================
--- branches/testing/BOOK/chapter06/util-linux.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/util-linux.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-util-linux" xreflabel="Util-linux" role="wrap">
+<sect1 id="ch-system-util-linux" role="wrap">
 <title>Util-linux-&util-linux-version;</title>
 <?dbhtml filename="util-linux.html"?>
 

Modified: branches/testing/BOOK/chapter06/vim.xml
===================================================================
--- branches/testing/BOOK/chapter06/vim.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/vim.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-vim" xreflabel="Vim" role="wrap">
+<sect1 id="ch-system-vim" role="wrap">
 <title>Vim-&vim-version;</title>
 <?dbhtml filename="vim.html"?>
 
@@ -99,7 +99,7 @@
 fact that a new behavior is being used. It also reminds those who
 would change to <quote>compatible</quote> mode that it should appear
 first.  This is necessary because it changes other settings, and
-overrides must come after this setting.  Create a default vim
+overrides must come after this setting.  Create a default <command>vim</command>
 configuration file by running the following:</para>
 
 <screen><userinput>cat > /etc/vimrc << "EOF"
@@ -122,7 +122,7 @@
 backspace=2</parameter> allows backspacing over line breaks,
 autoindents, and the start of insert. The <parameter>syntax
 on</parameter> enables vim's syntax highlighting. Finally, the
-<parameter>if</parameter> statement with the <parameter>set
+<emphasis>if</emphasis> statement with the <parameter>set
 background=dark</parameter> corrects <command>vim</command>'s guess
 about the background color of some terminal emulators. This gives the
 highlighting a better color scheme for use on the black background of

Modified: branches/testing/BOOK/chapter06/zlib.xml
===================================================================
--- branches/testing/BOOK/chapter06/zlib.xml	2004-09-05 11:18:43 UTC (rev 4131)
+++ branches/testing/BOOK/chapter06/zlib.xml	2004-09-05 13:22:23 UTC (rev 4132)
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-zlib" xreflabel="Zlib" role="wrap">
+<sect1 id="ch-system-zlib" role="wrap">
 <title>Zlib-&zlib-version;</title>
 <?dbhtml filename="zlib.html"?>
 
@@ -29,9 +29,10 @@
 <title>Installation of Zlib</title>
 
 <note><para>Zlib is known to build its shared library incorrectly if
-CFLAGS is specified in the environment. If using a specified CFLAGS
+<envar>CFLAGS</envar> is specified in the environment. If using a 
+specified <envar>CFLAGS</envar>
 variable, be sure to add the <parameter>-fPIC</parameter> directive to
-the <emphasis>CFLAGS</emphasis> variable for the duration of the
+the <envar>CFLAGS</envar> variable for the duration of the
 configure command below, then remove it afterwards.</para></note>
 
 <para>Prepare Zlib for compilation:</para>




More information about the lfs-book mailing list