14 files changed, 92 insertions, 50 deletions
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index ba4201881..b67fe6976 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -36,8 +36,10 @@ Diffutils, Gawk, GCC, Gettext, Glibc, Grep, Make, Sed, Texinfo</seg></seglistite
 
 <para>The meaning of the configure options:</para>
 
-<itemizedlist>
-<listitem><para><userinput>--with-root-prefix=""</userinput>: Certain
+<variablelist>
+<varlistentry>
+<term><userinput>--with-root-prefix=""</userinput></term>
+<listitem><para>Certain
 programs (such as the e2fsck program) are considered essential programs.
 When, for example, <filename class="directory">/usr</filename> isn't
 mounted, these essential programs have to be available. They belong in
@@ -46,10 +48,14 @@ directories like <filename class="directory">/lib</filename> and
 to E2fsprogs's configure, the programs are placed in the
 <filename class="directory">/usr</filename> directory, which is not what we
 want.</para></listitem>
+</varlistentry>
 
-<listitem><para><userinput>--enable-elf-shlibs</userinput>: This creates
+<varlistentry>
+<term><userinput>--enable-elf-shlibs</userinput></term>
+<listitem><para>This creates
 the shared libraries which some programs in this package use.</para></listitem>
-</itemizedlist>
+</varlistentry>
+</variablelist>
 
 <para>Compile the package:</para>
 
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index f3b7d108f..40bc3b3a9 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -55,14 +55,17 @@ cd ../glibc-build</userinput></screen>
 
 <para>The meaning of the new configure options:</para>
 
-<itemizedlist>
-<listitem><para><userinput>--libexecdir=/tmp/pt_chown</userinput>: This changes
+<variablelist>
+<varlistentry>
+<term><userinput>--libexecdir=/tmp/pt_chown</userinput></term>
+<listitem><para>This changes
 the location of the <filename>pt_chown</filename> program from its default of
 <filename class="directory">/usr/libexec</filename> to
 <filename class="directory">/tmp/pt_chown</filename>. This program isn't required
 on modern systems, so we install it in a place from which we will delete it
 later.</para></listitem>
-</itemizedlist>
+</varlistentry>
+</variablelist>
 
 <para>Compile the package:</para>
 
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index 12aeebdf5..96604857b 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -48,28 +48,40 @@ pages anyway. The following patch will correct this situation:</para>
 
 <para>The meaning of the configure options:</para>
 
-<itemizedlist>
-<listitem><para><userinput>--disable-logger</userinput>: This option
+<variablelist>
+<varlistentry>
+<term><userinput>--disable-logger</userinput></term>
+<listitem><para>This option
 prevents Inetutils from installing the logger program, which is used by
 scripts to pass messages to the System Log Daemon. We do not install it
 because Util-linux installs a better version later.</para></listitem>
+</varlistentry>
 
-<listitem><para><userinput>--disable-syslogd</userinput>: This option
+<varlistentry>
+<term><userinput>--disable-syslogd</userinput></term>
+<listitem><para>This option
 prevents Inetutils from installing the System Log Daemon, which is
 installed with the Sysklogd package.</para></listitem>
+</varlistentry>
 
-<listitem><para><userinput>--disable-whois</userinput>: This option disables
+<varlistentry>
+<term><userinput>--disable-whois</userinput></term>
+<listitem><para>This option disables
 the building of the Inetutils whois client, which is woefully out of date.
 Instructions for a better whois client are in the BLFS book.</para></listitem>
+</varlistentry>
 
-<listitem><para><userinput>--disable-servers</userinput>: This disables the
+<varlistentry>
+<term><userinput>--disable-servers</userinput></term>
+<listitem><para>This disables the
 installation of the various network 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
 <ulink url="&blfs-root;view/stable/basicnet/inetutils.html"/>. Note that better
 replacements are available for many of these servers.</para></listitem>
-</itemizedlist>
+</varlistentry>
+</variablelist>
 
 <para>Compile the package:</para>
 
diff --git a/chapter06/less.xml b/chapter06/less.xml
index 1aa67392d..d1f95e419 100644
--- a/chapter06/less.xml
+++ b/chapter06/less.xml
@@ -34,11 +34,13 @@ GCC, Glibc, Grep, Make, Ncurses, Sed</seg></seglistitem>
 
 <para>The meaning of the configure option:</para>
 
-<itemizedlist>
-<listitem><para><userinput>--sysconfdir=/etc</userinput>: This option tells the
-programs created by the package to look in <filename>/etc</filename> for their
-configuration files.</para></listitem>
-</itemizedlist>
+<variablelist>
+<varlistentry>
+<term><userinput>--sysconfdir=/etc</userinput></term>
+<listitem><para>This option tells the programs created by the package to look in 
+<filename>/etc</filename> for their configuration files.</para></listitem>
+</varlistentry>
+</variablelist>
 
 <para>Compile the package:</para>
 
diff --git a/chapter06/man.xml b/chapter06/man.xml
index 6a95b0702..babe2acdf 100644
--- a/chapter06/man.xml
+++ b/chapter06/man.xml
@@ -54,11 +54,14 @@ redundant results when using programs such as <command>whatis</command>:</para>
 
 <para>The meaning of the configure options:</para>
 
-<itemizedlist>
-<listitem><para><userinput>-confdir=/etc</userinput>: This tells the
+<variablelist>
+<varlistentry>
+<term><userinput>-confdir=/etc</userinput></term>
+<listitem><para>This tells the
 <command>man</command> program to look for the <filename>man.conf</filename>
 configuration file in the <filename>/etc</filename> directory.</para></listitem>
-</itemizedlist>
+</varlistentry>
+</variablelist>
 
 <para>Compile the package:</para>
 
diff --git a/chapter06/mktemp.xml b/chapter06/mktemp.xml
index 689ae992a..28f6153b5 100644
--- a/chapter06/mktemp.xml
+++ b/chapter06/mktemp.xml
@@ -38,12 +38,14 @@ Patch mktemp to include a <command>tempfile</command> wrapper:</para>
 
 <para>The meaning of the configure option:</para>
 
-<itemizedlist>
-<listitem><para><userinput>--with-libc</userinput>: This causes the
-<command>mktemp</command> program to use the <emphasis>mkstemp</emphasis>
-and <emphasis>mkdtemp</emphasis> functions from the system C
-library.</para></listitem>
-</itemizedlist>
+<variablelist>
+<varlistentry>
+<term><userinput>--with-libc</userinput></term>
+<listitem><para>This causes the <command>mktemp</command> program to 
+use the <emphasis>mkstemp</emphasis> and <emphasis>mkdtemp</emphasis>
+functions from the system C library.</para></listitem>
+</varlistentry>
+</variablelist>
 
 <para>Compile the package:</para>
 
diff --git a/chapter06/perl.xml b/chapter06/perl.xml
index 2008d4959..1a303f907 100644
--- a/chapter06/perl.xml
+++ b/chapter06/perl.xml
@@ -37,11 +37,13 @@ defaults it auto-detects, then prepare Perl for compilation with:</para>
 
 <para>The meaning of the configure option:</para>
 
-<itemizedlist>
-<listitem><para><userinput>-Dpager="/bin/less -isR"</userinput>: This corrects
-an error in the perldoc code with the invocation of the less
-program.</para></listitem>
-</itemizedlist>
+<variablelist>
+<varlistentry>
+<term><userinput>-Dpager="/bin/less -isR"</userinput></term>
+<listitem><para>This corrects an error in the perldoc code with the invocation 
+of the less program.</para></listitem>
+</varlistentry>
+</variablelist>
 
 <para>Compile the package:</para>
 
diff --git a/chapter06/psmisc.xml b/chapter06/psmisc.xml
index 99fce8c68..0e3383fa2 100644
--- a/chapter06/psmisc.xml
+++ b/chapter06/psmisc.xml
@@ -35,13 +35,16 @@ GCC, Gettext, Glibc, Grep, Make, Ncurses, Sed</seg></seglistitem>
 
 <para>The meaning of the configure option:</para>
 
-<itemizedlist>
-<listitem><para><userinput>--exec-prefix=""</userinput>: This causes the
+<variablelist>
+<varlistentry>
+<term><userinput>--exec-prefix=""</userinput></term>
+<listitem><para>This causes the
 binaries to be installed in <filename>/bin</filename> instead of
 <filename>/usr/bin</filename>. As the Psmisc programs are often used in
 bootscripts, they should be available also when the <filename>/usr</filename>
 file system isn't mounted.</para></listitem>
-</itemizedlist>
+</varlistentry>
+</variablelist>
 
 <para>Compile the package:</para>
 
diff --git a/chapter06/shadow.xml b/chapter06/shadow.xml
index 04f988a99..525affe6d 100644
--- a/chapter06/shadow.xml
+++ b/chapter06/shadow.xml
@@ -100,7 +100,7 @@ installed by Shadow:</para>
 </sect2>
 
 
-<sect2 id="conf-shadow"><title>Configuring Shadow</title>
+<sect2 id="conf-shadow" role="configuration"><title>Configuring Shadow</title>
 <indexterm zone="conf-shadow">
 <primary sortas="a-Shadow">Shadow</primary>
 <secondary>configuring</secondary></indexterm>
@@ -130,7 +130,7 @@ any group passwords with the <command>gpasswd</command> command.</para>
 </sect2>
 
 
-<sect2>
+<sect2 role="configuration">
 <title>Setting the root password</title>
 
 <para>Choose a password for user root and set it via:</para>
diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml
index c1a10c5bf..851a28808 100644
--- a/chapter06/sysklogd.xml
+++ b/chapter06/sysklogd.xml
@@ -50,7 +50,7 @@ Fix this bug by applying another patch:</para>
 </sect2>
 
 
-<sect2 id="conf-sysklogd"><title>Configuring Sysklogd</title>
+<sect2 id="conf-sysklogd" role="configuration"><title>Configuring Sysklogd</title>
 <indexterm zone="conf-sysklogd">
 <primary sortas="a-Sysklogd">Sysklogd</primary>
 <secondary>configuring</secondary></indexterm>
diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml
index 31095948d..842396db7 100644
--- a/chapter06/sysvinit.xml
+++ b/chapter06/sysvinit.xml
@@ -51,7 +51,7 @@ sed 's/Sending processes/&amp; started by init/g' \
 </sect2>
 
 
-<sect2 id="conf-sysvinit"><title>Configuring Sysvinit</title>
+<sect2 id="conf-sysvinit" role="configuration"><title>Configuring Sysvinit</title>
 <indexterm zone="conf-sysvinit">
 <primary sortas="a-Sysvinit">Sysvinit</primary>
 <secondary>configuring</secondary></indexterm>
diff --git a/chapter06/texinfo.xml b/chapter06/texinfo.xml
index 524423ad0..a19c0351b 100644
--- a/chapter06/texinfo.xml
+++ b/chapter06/texinfo.xml
@@ -50,11 +50,14 @@ Diffutils, GCC, Gettext, Glibc, Grep, Make, Ncurses, Sed</seg></seglistitem>
 
 <para>The meaning of the make parameter:</para>
 
-<itemizedlist>
-<listitem><para><userinput>TEXMF=/usr/share/texmf</userinput>: The TEXMF
+<variablelist>
+<varlistentry>
+<term><userinput>TEXMF=/usr/share/texmf</userinput></term>
+<listitem><para>The TEXMF
 makefile variable holds the location of the root of your TeX tree if, for
 example, you plan to install a TeX package later on.</para></listitem>
-</itemizedlist>
+</varlistentry>
+</variablelist>
 
 <para>The Info documentation system uses a plain text file to hold its list of
 menu entries. The file is located at <filename>/usr/share/info/dir</filename>.
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index a1b81dc92..7ab4b6374 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -42,7 +42,7 @@ mkdir -p /var/lib/hwclock</userinput></screen>
 
 </sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Util-linux</title>
 
 <para>Util-linux has issues with the Linux 2.6 kernel series - fix these isues
@@ -60,16 +60,22 @@ by applying the following patch:</para>
 
 <para>The meaning of the make parameters:</para>
 
-<itemizedlist>
-<listitem><para><userinput>HAVE_KILL=yes</userinput>: This prevents the
+<variablelist>
+<varlistentry>
+<term><userinput>HAVE_KILL=yes</userinput></term>
+<listitem><para>This prevents the
 <command>kill</command> program (already installed by Procps) from being
 built and installed again.</para></listitem>
+</varlistentry>
 
-<listitem><para><userinput>HAVE_SLN=yes</userinput>: This prevents the
+<varlistentry>
+<term><userinput>HAVE_SLN=yes</userinput></term>
+<listitem><para>This prevents the
 <command>sln</command> program (a statically linked
 <command>ln</command> already installed by Glibc) from being built and
 installed again.</para></listitem>
-</itemizedlist>
+</varlistentry>
+</variablelist>
 
 <para>Now install the package:</para>
 
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index a47d9d456..5787a793d 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -23,13 +23,13 @@
 <seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
 GCC, Glibc, Grep, Make, Ncurses, Sed</seg></seglistitem>
 </segmentedlist>
-</sect2>
 
-<sect2>
+<tip>
 <title>Alternatives to Vim</title>
 <para>If you prefer another editor -- like Emacs, Joe, or Nano -- to Vim,
 have a look at <ulink url="&blfs-root;view/stable/postlfs/editors.html"/> for
 suggested installation instructions.</para>
+</tip>
 </sect2>
 
 <sect2 role="installation">
@@ -79,7 +79,7 @@ installed. For more information read the Vim documentation.</para>
 </sect2>
 
 
-<sect2 id="conf-vim"><title>Configuring Vim</title>
+<sect2 id="conf-vim" role="configuration"><title>Configuring Vim</title>
 <indexterm zone="conf-vim"><primary sortas="e-/etc/vim">/etc/vim</primary></indexterm>
 
 <para>By default, <command>vim</command> runs in vi-incompatible mode. Some