Index: chapter06/e2fsprogs.xml
===================================================================
--- chapter06/e2fsprogs.xml	(revision c6cb3aa2f176d65a5ebe77e7da82e20946188a98)
+++ chapter06/e2fsprogs.xml	(revision df8334f9247ba4aca231fab539c83a0a986236ee)
@@ -37,6 +37,8 @@
 <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
@@ -47,8 +49,12 @@
 <filename class="directory">/usr</filename> directory, which is not what we
 want.</para></listitem>
-
-<listitem><para><userinput>--enable-elf-shlibs</userinput>: This creates
+</varlistentry>
+
+<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>
Index: chapter06/glibc.xml
===================================================================
--- chapter06/glibc.xml	(revision c6cb3aa2f176d65a5ebe77e7da82e20946188a98)
+++ chapter06/glibc.xml	(revision df8334f9247ba4aca231fab539c83a0a986236ee)
@@ -56,6 +56,8 @@
 <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
@@ -63,5 +65,6 @@
 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>
Index: chapter06/inetutils.xml
===================================================================
--- chapter06/inetutils.xml	(revision c6cb3aa2f176d65a5ebe77e7da82e20946188a98)
+++ chapter06/inetutils.xml	(revision df8334f9247ba4aca231fab539c83a0a986236ee)
@@ -49,19 +49,30 @@
 <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
@@ -70,5 +81,6 @@
 <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>
Index: chapter06/less.xml
===================================================================
--- chapter06/less.xml	(revision c6cb3aa2f176d65a5ebe77e7da82e20946188a98)
+++ chapter06/less.xml	(revision df8334f9247ba4aca231fab539c83a0a986236ee)
@@ -35,9 +35,11 @@
 <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>
Index: chapter06/man.xml
===================================================================
--- chapter06/man.xml	(revision c6cb3aa2f176d65a5ebe77e7da82e20946188a98)
+++ chapter06/man.xml	(revision df8334f9247ba4aca231fab539c83a0a986236ee)
@@ -55,9 +55,12 @@
 <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>
Index: chapter06/mktemp.xml
===================================================================
--- chapter06/mktemp.xml	(revision c6cb3aa2f176d65a5ebe77e7da82e20946188a98)
+++ chapter06/mktemp.xml	(revision df8334f9247ba4aca231fab539c83a0a986236ee)
@@ -39,10 +39,12 @@
 <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>
Index: chapter06/perl.xml
===================================================================
--- chapter06/perl.xml	(revision c6cb3aa2f176d65a5ebe77e7da82e20946188a98)
+++ chapter06/perl.xml	(revision df8334f9247ba4aca231fab539c83a0a986236ee)
@@ -38,9 +38,11 @@
 <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>
Index: chapter06/psmisc.xml
===================================================================
--- chapter06/psmisc.xml	(revision c6cb3aa2f176d65a5ebe77e7da82e20946188a98)
+++ chapter06/psmisc.xml	(revision df8334f9247ba4aca231fab539c83a0a986236ee)
@@ -36,11 +36,14 @@
 <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>
Index: chapter06/shadow.xml
===================================================================
--- chapter06/shadow.xml	(revision c6cb3aa2f176d65a5ebe77e7da82e20946188a98)
+++ chapter06/shadow.xml	(revision df8334f9247ba4aca231fab539c83a0a986236ee)
@@ -101,5 +101,5 @@
 
 
-<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>
@@ -131,5 +131,5 @@
 
 
-<sect2>
+<sect2 role="configuration">
 <title>Setting the root password</title>
 
Index: chapter06/sysklogd.xml
===================================================================
--- chapter06/sysklogd.xml	(revision c6cb3aa2f176d65a5ebe77e7da82e20946188a98)
+++ chapter06/sysklogd.xml	(revision df8334f9247ba4aca231fab539c83a0a986236ee)
@@ -51,5 +51,5 @@
 
 
-<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>
Index: chapter06/sysvinit.xml
===================================================================
--- chapter06/sysvinit.xml	(revision c6cb3aa2f176d65a5ebe77e7da82e20946188a98)
+++ chapter06/sysvinit.xml	(revision df8334f9247ba4aca231fab539c83a0a986236ee)
@@ -52,5 +52,5 @@
 
 
-<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>
Index: chapter06/texinfo.xml
===================================================================
--- chapter06/texinfo.xml	(revision c6cb3aa2f176d65a5ebe77e7da82e20946188a98)
+++ chapter06/texinfo.xml	(revision df8334f9247ba4aca231fab539c83a0a986236ee)
@@ -51,9 +51,12 @@
 <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
Index: chapter06/util-linux.xml
===================================================================
--- chapter06/util-linux.xml	(revision c6cb3aa2f176d65a5ebe77e7da82e20946188a98)
+++ chapter06/util-linux.xml	(revision df8334f9247ba4aca231fab539c83a0a986236ee)
@@ -43,5 +43,5 @@
 </sect2>
 
-<sect2>
+<sect2 role="installation">
 <title>Installation of Util-linux</title>
 
@@ -61,14 +61,20 @@
 <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>
-
-<listitem><para><userinput>HAVE_SLN=yes</userinput>: This prevents the
+</varlistentry>
+
+<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>
Index: chapter06/vim.xml
===================================================================
--- chapter06/vim.xml	(revision c6cb3aa2f176d65a5ebe77e7da82e20946188a98)
+++ chapter06/vim.xml	(revision df8334f9247ba4aca231fab539c83a0a986236ee)
@@ -24,11 +24,11 @@
 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>
 
@@ -80,5 +80,5 @@
 
 
-<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>
 
