Tagging corrections in chapters 1 to 4.

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

13 files changed, 70 insertions, 82 deletions

diff --git a/chapter01/administrativa.xml b/chapter01/administrativa.xml
index c21d010d0..2b63714cd 100644
--- a/chapter01/administrativa.xml
+++ b/chapter01/administrativa.xml
@@ -26,8 +26,8 @@ consult the FAQ (Frequently Asked Questions) at
 IRC (Internet Relay Chat) network. Before you utilize this mode of support, we
 ask that you've at least checked the LFS FAQ (see above) and the mailing list
 archives (see below) for the answer to your question. You can find the IRC
-network at <emphasis>irc.linuxfromscratch.org</emphasis> or 
-<emphasis>irc.linux-phreak.net</emphasis> port 6667. The support channel is
+network at <uri>irc.linuxfromscratch.org</uri> or
+<uri>irc.linux-phreak.net</uri> port 6667. The support channel is
 named #LFS-support.</para>
 
 </sect2>
@@ -36,7 +36,7 @@ named #LFS-support.</para>
 <sect2 id="ch-scatter-maillists" xreflabel="Chapter 1 - Mailing lists">
 <title>Mailing lists</title>
 
-<para>The <emphasis>linuxfromscratch.org</emphasis> server is hosting a number
+<para>The <uri>linuxfromscratch.org</uri> server is hosting a number
 of mailing lists used for the development of the LFS project. These lists
 include, among others, the main development and support lists.</para>
 
@@ -49,12 +49,12 @@ their archive locations, and so on, visit <ulink url="&lfs-root;mail.html"/>.</p
 <sect2 id="ch-scatter-newsserver">
 <title>News server</title>
 
-<para>All the mailing lists hosted at <emphasis>linuxfromscratch.org</emphasis>
+<para>All the mailing lists hosted at <uri>linuxfromscratch.org</uri>
 are also accessible via the NNTP server. All messages posted to a mailing list
 are copied to the corresponding newsgroup, and vice versa.</para>
 
 <para>The news server can be reached at
-<emphasis>news.linuxfromscratch.org</emphasis>.</para>
+<uri>news.linuxfromscratch.org</uri>.</para>
 
 </sect2>
 
diff --git a/chapter01/askforhelp.xml b/chapter01/askforhelp.xml
index 747a74b92..16517e54f 100644
--- a/chapter01/askforhelp.xml
+++ b/chapter01/askforhelp.xml
@@ -33,9 +33,9 @@ LFS,</para></listitem>
 <listitem><para>whether you have deviated from the book at all.</para></listitem>
 </itemizedlist>
 
-<para>(Note that saying that you've deviated from the book doesn't mean
+<note><para>Saying that you've deviated from the book doesn't mean
 that we won't help you. After all, LFS is about choice. It'll just
-help us to see other possible causes of your problem.)</para>
+help us to see other possible causes of your problem.</para></note>
 
 </sect2>
 
@@ -59,7 +59,7 @@ the ./configure script and the make run can be useful. Don't blindly
 include the whole thing but, on the other hand, don't include too little.
 As an example, here is some screen output from make:</para>
 
-<screen>gcc -DALIASPATH=\"/mnt/lfs/usr/share/locale:.\"
+<screen><computeroutput>gcc -DALIASPATH=\"/mnt/lfs/usr/share/locale:.\"
 -DLOCALEDIR=\"/mnt/lfs/usr/share/locale\" -DLIBDIR=\"/mnt/lfs/usr/lib\"
 -DINCLUDEDIR=\"/mnt/lfs/usr/include\" -DHAVE_CONFIG_H -I. -I.
 -g -O2 -c getopt1.c
@@ -73,12 +73,12 @@ make[2]: *** [make] Error 1
 make[2]: Leaving directory `/lfs/tmp/make-3.79.1'
 make[1]: *** [all-recursive] Error 1
 make[1]: Leaving directory `/lfs/tmp/make-3.79.1'
-make: *** [all-recursive-am] Error 2</screen>
+make: *** [all-recursive-am] Error 2</computeroutput></screen>
 
 <para>In this case, many people just include the bottom section where it
 says:</para>
 
-<screen>make [2]: *** [make] Error 1</screen>
+<screen><computeroutput>make [2]: *** [make] Error 1</computeroutput></screen>
 
 <para>and onwards. This isn't enough for us to diagnose the problem because it
 only tells us that <emphasis>something</emphasis> went wrong, not
diff --git a/chapter02/creatingfilesystem.xml b/chapter02/creatingfilesystem.xml
index 3745679b8..ae1f5b8c6 100644
--- a/chapter02/creatingfilesystem.xml
+++ b/chapter02/creatingfilesystem.xml
@@ -16,18 +16,18 @@ system, but build instructions for other file systems can be found at
 
 <para>To create an ext2 file system on the LFS partition run the following:</para>
 
-<screen><userinput>mke2fs /dev/xxx</userinput></screen>
+<screen><userinput>mke2fs /dev/<replaceable>[xxx]</replaceable></userinput></screen>
 
-<para>Replace <filename>xxx</filename> with the name of the LFS partition
+<para>Replace <replaceable>[xxx]</replaceable> with the name of the LFS partition
 (something like <filename>hda5</filename>).</para>
 
 <para>If you created a (new) swap partition you need to initialize it as a
 swap partition too (also known as formatting, like you did above with
-<userinput>mke2fs</userinput>) by running:</para>
+<command>mke2fs</command>) by running:</para>
 
-<screen><userinput>mkswap /dev/yyy</userinput></screen>
+<screen><userinput>mkswap /dev/<replaceable>[yyy]</replaceable></userinput></screen>
 
-<para>Replace <filename>yyy</filename> with the name of the swap
+<para>Replace <replaceable>[yyy]</replaceable> with the name of the swap
 partition.</para>
 
 </sect1>
diff --git a/chapter02/creatingpartition.xml b/chapter02/creatingpartition.xml
index fd317876e..82b4184e4 100644
--- a/chapter02/creatingpartition.xml
+++ b/chapter02/creatingpartition.xml
@@ -28,12 +28,12 @@ The swap partition for your LFS system can be the same one as for your host
 system, so you won't have to create another if your host system already uses
 a swap partition.</para>
 
-<para>Start a disk partitioning program such as <userinput>cfdisk</userinput>
-or <userinput>fdisk</userinput> with an argument naming the hard disk upon
+<para>Start a disk partitioning program such as <command>cfdisk</command>
+or <command>fdisk</command> with an argument naming the hard disk upon
 which the new partition must be created -- for example
 <filename>/dev/hda</filename> for the primary IDE disk. Create a Linux native
 partition and a swap partition, if needed. Please refer to the man pages of
-<userinput>cfdisk</userinput> or <userinput>fdisk</userinput> if you don't yet
+<command>cfdisk</command> or <command>fdisk</command> if you don't yet
 know how to use the programs.</para>
 
 <para>Remember the designation of your new partition -- something like
diff --git a/chapter02/mounting.xml b/chapter02/mounting.xml
index 610ccf652..87331dcfb 100644
--- a/chapter02/mounting.xml
+++ b/chapter02/mounting.xml
@@ -10,7 +10,7 @@
 <para>Now that we've created a file system, we want to be able to access
 the partition. For that, we need to mount it, and have to choose a mount
 point. In this book we assume that the file system is mounted under
-<filename>/mnt/lfs</filename>, but it doesn't matter what directory
+<filename class="directory">/mnt/lfs</filename>, but it doesn't matter what directory
 you choose.</para>
 
 <para>Choose a mount point and assign it to the LFS environment variable
@@ -21,22 +21,22 @@ by running:</para>
 <para>Now create the mount point and mount the LFS file system by running:</para>
 
 <screen><userinput>mkdir -p $LFS
-mount /dev/xxx $LFS</userinput></screen>
+mount /dev/<replaceable>[xxx]</replaceable> $LFS</userinput></screen>
 
-<para>Replace <filename>xxx</filename> with the designation of the LFS
+<para>Replace <replaceable>[xxx]</replaceable> with the designation of the LFS
 partition.</para>
 
 <para>If you have decided to use multiple partitions for LFS (say one for
-<filename>/</filename> and another for <filename>/usr</filename>), mount
-them like this:</para>
+<filename class="directory">/</filename> and another for 
+<filename class="directory">/usr</filename>), mount them like this:</para>
 
 <screen><userinput>mkdir -p $LFS
-mount /dev/xxx $LFS
+mount /dev/<replaceable>[xxx]</replaceable> $LFS
 mkdir $LFS/usr
-mount /dev/yyy $LFS/usr</userinput></screen>
+mount /dev/<replaceable>[yyy]</replaceable> $LFS/usr</userinput></screen>
 
-<para>Of course, replace <filename>xxx</filename> and <filename>yyy</filename>
-with the appropriate partition names.</para>
+<para>Of course, replace <replaceable>[xxx]</replaceable> and
+<replaceable>[yyy]</replaceable> with the appropriate partition names.</para>
 
 <para>You should also ensure that this new partition is not mounted with
 permissions that are too restrictive (such as the nosuid, nodev or noatime
diff --git a/chapter03/introduction.xml b/chapter03/introduction.xml
index 031d05c6e..b2ac8da14 100644
--- a/chapter03/introduction.xml
+++ b/chapter03/introduction.xml
@@ -31,7 +31,7 @@ or, better yet, try one of the alternative means of downloading listed on
 <para>You'll need to store all the downloaded packages and patches somewhere
 that is conveniently available throughout the entire build. You'll also need a
 working directory in which to unpack the sources and build them. A scheme that
-works well is to use <filename>$LFS/sources</filename> as the place to store
+works well is to use <filename class="directory">$LFS/sources</filename> as the place to store
 the tarballs and patches, <emphasis>and</emphasis> as a working directory.
 This way everything you need will be located on the LFS partition and available
 during all stages of the building process.</para>
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>
 
diff --git a/stylesheets/lfs.css b/stylesheets/lfs.css
index 3de1aba17..0ba33057a 100644
--- a/stylesheets/lfs.css
+++ b/stylesheets/lfs.css
@@ -129,26 +129,13 @@ div.toc ul li h3, div.toc ul li h4 {
 }
 
 /* Admonitions */
-div.note, div.tip {
+div.admonition {
   background-color: #fffff6;
-  border: 2px solid #dbddec;
+  border: medium solid #600;
   width: 90%;
   margin: .5em auto;
 }
 
-div.important, div.warning, div.caution {
-  background-color: #fffff6;
-  border: medium solid #400;
-  width: 90%;
-  margin: 1.5em auto;
-  color: #600;
-  font-size: larger;
-}
-
-div.important h3, div.warning h3, div.caution h3 {
-  color: #900;
-}
-
 div.admonhead img {
   padding: .3em;
 }
@@ -162,15 +149,6 @@ div.admonbody {
   margin: .5em;
 }
 
-div.important em, div.warning em, div.caution em {
-  color: #000;
-  font-weight: bold;
-}
-
-div.important tt, div.warning tt, div.caution tt {
-  font-weight: bold;
-}
-
 /* variablelist & segmentedlist */
 dl {
   margin: 0;
@@ -187,7 +165,6 @@ dd  {
   margin: 0 0 1em 3em;
   padding: 0;
 }
-
 div.variablelist dd {
   margin-bottom: 1em;
 }
@@ -196,10 +173,6 @@ div.variablelist dd p {
   margin-top: 0px;
 }
 
-dl.materials dt, div.installation dt, div.configuration dt, div.sect2 dt {
-  display: list-item;
-}
-
 dl.materials dd {
   margin-left: 0px;
 }
@@ -222,7 +195,7 @@ tt, code, kbd, pre, .command {
   font-family: monospace;
 }
 
-pre.screen {
+pre.userinput {
   color: #101310;
   background-color: #e5e5e5;
   border: 1px solid #050505;
@@ -231,17 +204,24 @@ pre.screen {
   font-weight: bold;
 }
 
+pre.screen {
+  background-color: #e9e9e9;
+  border: 1px solid #050505;
+  padding: .5em 1em;
+  margin: 0 2em;
+}
+
 /* Sections */
 div.wrap h1 {
   background: #f5f6f7;
-  padding: 1em 0 0.5em 0;
+  padding: 0.5em 0 0.5em 0;
   margin: 0px auto;
 }
 
 div.package {
   background: #f5f6f7;
   border-bottom: 0.2em solid #dbddec;
-  padding: 0.5em 0.5em 0.3em 0.5em;
+  padding: 0 0.5em 0.3em 0.5em;
   margin: 0px auto;
 }
 
@@ -260,7 +240,7 @@ div.configuration {
 div.content {
   background: #f5f6f7;
   border-top: 0.2em solid #dbddec;
-  padding: 0.5em 0.5em 1em 0.5em;
+  padding: 0.5em 0.5em 0.5em 0.5em;
   margin: 0.5em 0 .5em 0;
 }
 
diff --git a/stylesheets/xhtml/lfs-mixed.xsl b/stylesheets/xhtml/lfs-mixed.xsl
index 2d9a3cbfa..c4dbd04dd 100644
--- a/stylesheets/xhtml/lfs-mixed.xsl
+++ b/stylesheets/xhtml/lfs-mixed.xsl
@@ -7,9 +7,8 @@
     <!-- screen -->
   <xsl:template match="screen">
     <xsl:choose>
-        <!-- Temporally hack -->
       <xsl:when test="child::* = userinput">
-        <pre class="{name(.)}">
+        <pre class="userinput">
           <kbd class="command">
             <xsl:value-of select="."/>
           </kbd>