Tagging corrections in chapters 1 to 4.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3725 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

5 files changed, 28 insertions, 19 deletions

diff --git a/chapter04/aboutlfs.xml b/chapter04/aboutlfs.xml
index fa39b8873..3d320c3a3 100644
--- a/chapter04/aboutlfs.xml
+++ b/chapter04/aboutlfs.xml
@@ -22,12 +22,12 @@ with:</para>
 <screen><userinput>export LFS=/mnt/lfs</userinput></screen>
 
 <para>Having this variable set means that if you are told to run a command like
-<userinput>mkdir $LFS/tools</userinput>, you can type it literally. Your shell
-will replace "$LFS" with "/mnt/lfs" (or whatever you set the variable to) when
-it processes the command line.</para>
+<command>mkdir $LFS/tools</command>, you can type it literally. Your shell
+will replace <quote>$LFS</quote> with <quote>/mnt/lfs</quote> (or whatever 
+you set the variable to) when it processes the command line.</para>
 
 <para>Don't forget to check that <quote>$LFS</quote> is set whenever you leave and
-reenter the environment (as when doing an <quote>su</quote> to root or another user).
+reenter the environment (as when doing a <quote>su</quote> to root or another user).
 </para>
 
 </sect1>
diff --git a/chapter04/aboutsbus.xml b/chapter04/aboutsbus.xml
index f39754433..e8983711f 100644
--- a/chapter04/aboutsbus.xml
+++ b/chapter04/aboutsbus.xml
@@ -8,7 +8,7 @@
 <?dbhtml filename="aboutsbus.html"?>
 
 <para>Most people would like to know beforehand approximately how long it
-takes to compile and install each package. But "Linux from Scratch" is built
+takes to compile and install each package. But <quote>Linux from Scratch</quote> is built
 on so many different systems, it is not possible to give actual times that are
 anywhere near accurate: the biggest package (Glibc) won't take more than
 twenty minutes on the fastest systems, but will take something like three days
diff --git a/chapter04/addinguser.xml b/chapter04/addinguser.xml
index 5763b04c5..0a2688efc 100644
--- a/chapter04/addinguser.xml
+++ b/chapter04/addinguser.xml
@@ -19,19 +19,28 @@ issue the following command to add the new user:</para>
 
 <para>The meaning of the switches:</para>
 
-<itemizedlist>
-<listitem><para><userinput>-s /bin/bash</userinput>: This makes
-<userinput>bash</userinput> the default shell for user
+<variablelist>
+<varlistentry>
+<term><parameter>-s /bin/bash</parameter></term>
+<listitem><para>This makes
+<command>bash</command> the default shell for user
 <emphasis>lfs</emphasis>.</para></listitem>
+</varlistentry>
 
-<listitem><para><userinput>-m</userinput>: This creates a home
+<varlistentry>
+<term><parameter>-m</parameter></term>
+<listitem><para>This creates a home
 directory for <emphasis>lfs</emphasis>.</para></listitem>
+</varlistentry>
 
-<listitem><para><userinput>-k /dev/null</userinput>: This parameter
+<varlistentry>
+<term><parameter>-k /dev/null</parameter></term>
+<listitem><para>This parameter
 prevents possible copying of files from a skeleton directory (default
-is <filename>/etc/skel</filename>) by changing the input location to
+is <filename class="directory">/etc/skel</filename>) by changing the input location to
 the special null device.</para></listitem>
-</itemizedlist>
+</varlistentry>
+</variablelist>
 
 <para>If you want to be able to log in as <emphasis>lfs</emphasis>, then give
 <emphasis>lfs</emphasis> a password:</para>
@@ -55,7 +64,7 @@ user command:</para>
 
 <screen><userinput>su - lfs</userinput></screen>
 
-<para>The <quote><command>-</command></quote> instructs <command>su</command> to
+<para>The <quote><parameter>-</parameter></quote> instructs <command>su</command> to
 start a <emphasis>login</emphasis> shell.</para>
 
 </sect1>
diff --git a/chapter04/creatingtoolsdir.xml b/chapter04/creatingtoolsdir.xml
index 4b8569210..4bb0ef3b2 100644
--- a/chapter04/creatingtoolsdir.xml
+++ b/chapter04/creatingtoolsdir.xml
@@ -38,7 +38,7 @@ has a few syntactic variations, so be sure to check the info page before
 reporting what you may think is an error.</para></note>
 
 <para>The created symlink enables us to compile our toolchain so that it always
-refers to <filename>/tools</filename>, meaning that the compiler, assembler
+refers to <filename class="directory">/tools</filename>, meaning that the compiler, assembler
 and linker will work both in this chapter (when we are still using some tools
 from the host) <emphasis>and</emphasis> in the next (when we are <quote>chrooted</quote> to
 the LFS partition).</para>
diff --git a/chapter04/settingenviron.xml b/chapter04/settingenviron.xml
index 79bc3225b..d43de93e5 100644
--- a/chapter04/settingenviron.xml
+++ b/chapter04/settingenviron.xml
@@ -12,9 +12,9 @@ startup files for the <command>bash</command> shell. While logged in as
 user <emphasis>lfs</emphasis>, issue the following command to create a new
 <filename>.bash_profile</filename>:</para>
 
-<screen><userinput>cat &gt; ~/.bash_profile &lt;&lt; "EOF"</userinput>
+<screen><userinput>cat &gt; ~/.bash_profile &lt;&lt; <quote>EOF<quote>
 exec env -i HOME=$HOME TERM=$TERM PS1='\u:\w\$ ' /bin/bash
-<userinput>EOF</userinput></screen>
+EOF</userinput></screen>
 
 <para>Normally, when you log on as user <emphasis>lfs</emphasis>,
 the initial shell is a <emphasis>login</emphasis> shell which reads the
@@ -32,14 +32,14 @@ which doesn't read the <filename>/etc/profile</filename> or
 <filename>.bash_profile</filename> files, but reads the
 <filename>.bashrc</filename> file instead. Create this latter file now:</para>
 
-<screen><userinput>cat &gt; ~/.bashrc &lt;&lt; "EOF"</userinput>
+<screen><userinput>cat &gt; ~/.bashrc &lt;&lt; <quote>EOF<quote>
 set +h
 umask 022
 LFS=/mnt/lfs
 LC_ALL=POSIX
 PATH=/tools/bin:/bin:/usr/bin
 export LFS LC_ALL PATH
-<userinput>EOF</userinput></screen>
+EOF</userinput></screen>
 
 <para>The <command>set +h</command> command turns off
 <command>bash</command>'s hash function. Normally hashing is a useful
@@ -68,7 +68,7 @@ environment and wish to return later.  By setting LC_ALL to <quote>POSIX</quote>
 (or <quote>C</quote>, the two are equivalent) we ensure that
 everything will work as expected in the chroot environment.</para>
 
-<para>We prepend <filename>/tools/bin</filename> to the standard PATH so
+<para>We prepend <filename class="directory">/tools/bin</filename> to the standard PATH so
 that, as we move along through this chapter, the tools we build will get used
 during the rest of the building process.</para>