1 files changed, 133 insertions, 42 deletions
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 4a74b90b8..a47d9d456 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -118,94 +118,185 @@ the following command:</para>
 </sect2>
 
 
-<sect2 id="contents-vim"><title>Contents of Vim</title>
+<sect2 id="contents-vim" role="content"><title>Contents of Vim</title>
 
-<para><emphasis>Installed programs</emphasis>: efm_filter.pl, efm_perl.pl, ex
-(link to vim), less.sh, mve.awk, pltags.pl, ref, rview (link to vim), rvim
-(link to vim), shtags.pl, tcltags, vi (link to vim), view (link to vim), vim,
-vim132, vim2html.pl, vimdiff (link to vim), vimm, vimspell.sh, vimtutor
-and xxd</para>
-
-</sect2>
+<segmentedlist>
+<segtitle>Installed programs</segtitle>
+<seglistitem><seg>efm_filter.pl, efm_perl.pl, ex (link to vim), less.sh, mve.awk, 
+pltags.pl, ref, rview (link to vim), rvim (link to vim), shtags.pl, tcltags, vi (link to vim), 
+view (link to vim), vim, vim132, vim2html.pl, vimdiff (link to vim), vimm, vimspell.sh, 
+vimtutor and xxd</seg></seglistitem>
+</segmentedlist>
 
-<sect2><title>Short descriptions</title>
+<variablelist><title>Short descriptions</title>
 
+<varlistentry>
+<term id="efm_filter.pl"><command>efm_filter.pl</command></term>
+<listitem>
 <indexterm zone="ch-system-vim efm_filter.pl"><primary sortas="b-efm_filter.pl">efm_filter.pl</primary></indexterm>
-<para id="efm_filter.pl"><command>efm_filter.pl</command> is a filter for creating an error
-file that can be read by vim.</para>
+<para>is a filter for creating an error file that can be read by vim.</para>
+</listitem>
+</varlistentry>
 
+<varlistentry>
+<term id="efm_perl.pl"><command>efm_perl.pl</command></term>
+<listitem>
 <indexterm zone="ch-system-vim efm_perl.pl"><primary sortas="b-efm_perl.pl">efm_perl.pl</primary></indexterm>
-<para id="efm_perl.pl"><command>efm_perl.pl</command> reformats the error messages of the
+<para>reformats the error messages of the
 Perl interpreter for use with the <quote>quickfix</quote> mode of vim.</para>
+</listitem>
+</varlistentry>
 
+<varlistentry>
+<term id="ex"><command>ex</command></term>
+<listitem>
 <indexterm zone="ch-system-vim ex"><primary sortas="b-ex">ex</primary></indexterm>
-<para id="ex"><command>ex</command> starts vim in ex mode.</para>
+<para>starts vim in ex mode.</para>
+</listitem>
+</varlistentry>
 
+<varlistentry>
+<term id="less.sh"><command>less.sh</command></term>
+<listitem>
 <indexterm zone="ch-system-vim less.sh"><primary sortas="b-less.sh">less.sh</primary></indexterm>
-<para id="less.sh"><command>less.sh</command> is a script that starts vim with less.vim.</para>
+<para>is a script that starts vim with less.vim.</para>
+</listitem>
+</varlistentry>
 
+<varlistentry>
+<term id="mve.awk"><command>mve.awk</command></term>
+<listitem>
 <indexterm zone="ch-system-vim mve.awk"><primary sortas="b-mve.awk">mve.awk</primary></indexterm>
-<para id="mve.awk"><command>mve.awk</command> processes vim errors.</para>
+<para>processes vim errors.</para>
+</listitem>
+</varlistentry>
 
+<varlistentry>
+<term id="pltags.pl"><command>pltags.pl</command></term>
+<listitem>
 <indexterm zone="ch-system-vim pltags.pl"><primary sortas="b-pltags.pl">pltags.pl</primary></indexterm>
-<para id="pltags.pl"><command>pltags.pl</command> creates a tags file for perl code,
-for use by vim.</para>
+<para>creates a tags file for perl code, for use by vim.</para>
+</listitem>
+</varlistentry>
 
+<varlistentry>
+<term id="ref"><command>ref</command></term>
+<listitem>
 <indexterm zone="ch-system-vim ref"><primary sortas="b-ref">ref</primary></indexterm>
-<para id="ref"><command>ref</command> checks the spelling of arguments.</para>
+<para>checks the spelling of arguments.</para>
+</listitem>
+</varlistentry>
 
+<varlistentry>
+<term id="rview"><command>rview</command></term>
+<listitem>
 <indexterm zone="ch-system-vim rview"><primary sortas="b-rview">rview</primary></indexterm>
-<para id="rview"><command>rview</command> is a restricted version of view: no shell
+<para>is a restricted version of view: no shell
 commands can be started and view can't be suspended.</para>
+</listitem>
+</varlistentry>
 
+<varlistentry>
+<term id="rvim"><command>rvim</command></term>
+<listitem>
 <indexterm zone="ch-system-vim rvim"><primary sortas="b-rvim">rvim</primary></indexterm>
-<para id="rvim"><command>rvim</command> is a restricted version of vim: no shell
+<para>is a restricted version of vim: no shell
 commands can be started and vim can't be suspended.</para>
+</listitem>
+</varlistentry>
 
+<varlistentry>
+<term id="shtags.pl"><command>shtags.pl</command></term>
+<listitem>
 <indexterm zone="ch-system-vim shtags.pl"><primary sortas="b-shtags.pl">shtags.pl</primary></indexterm>
-<para id="shtags.pl"><command>shtags.pl</command> generates a tag file for perl scripts.</para>
+<para>generates a tag file for perl scripts.</para>
+</listitem>
+</varlistentry>
 
+<varlistentry>
+<term id="tcltags"><command>tcltags</command></term>
+<listitem>
 <indexterm zone="ch-system-vim tcltags"><primary sortas="b-tcltags">tcltags</primary></indexterm>
-<para id="tcltags"><command>tcltags</command> generates a tag file for TCL code.</para>
+<para>generates a tag file for TCL code.</para>
+</listitem>
+</varlistentry>
 
+<varlistentry>
+<term id="view"><command>view</command></term>
+<listitem>
 <indexterm zone="ch-system-vim view"><primary sortas="b-view">view</primary></indexterm>
-<para id="view"><command>view</command> starts vim in read-only mode.</para>
+<para>starts vim in read-only mode.</para>
+</listitem>
+</varlistentry>
 
+<varlistentry>
+<term id="vim"><command>vim</command></term>
+<listitem>
 <indexterm zone="ch-system-vim vim"><primary sortas="b-vim">vim</primary></indexterm>
-<para id="vim"><command>vim</command> is the editor.</para>
+<para>is the editor.</para>
+</listitem>
+</varlistentry>
 
+<varlistentry>
+<term id="vim132"><command>vim132</command></term>
+<listitem>
 <indexterm zone="ch-system-vim vim132"><primary sortas="b-vim132">vim132</primary></indexterm>
-<para id="vim132"><command>vim132</command> starts vim with the terminal in
-132-column mode.</para>
+<para>starts vim with the terminal in 132-column mode.</para>
+</listitem>
+</varlistentry>
 
+<varlistentry>
+<term id="vim2html.pl"><command>vim2html.pl</command></term>
+<listitem>
 <indexterm zone="ch-system-vim vim2html.pl"><primary sortas="b-vim2html.pl">vim2html.pl</primary></indexterm>
-<para id="vim2html.pl"><command>vim2html.pl</command> converts vim documentation to
-HTML.</para>
+<para>converts vim documentation to HTML.</para>
+</listitem>
+</varlistentry>
 
+<varlistentry>
+<term id="vimdiff"><command>vimdiff</command></term>
+<listitem>
 <indexterm zone="ch-system-vim vimdiff"><primary sortas="b-vimdiff">vimdiff</primary></indexterm>
-<para id="vimdiff"><command>vimdiff</command> edits two or three versions of a file with
-vim and show differences.</para>
+<para>edits two or three versions of a file with vim and show differences.</para>
+</listitem>
+</varlistentry>
 
+<varlistentry>
+<term id="vimm"><command>vimm</command></term>
+<listitem>
 <indexterm zone="ch-system-vim vimm"><primary sortas="b-vimm">vimm</primary></indexterm>
-<para id="vimm"><command>vimm</command> enables the DEC locator input model on a
-remote terminal.</para>
+<para>enables the DEC locator input model on a remote terminal.</para>
+</listitem>
+</varlistentry>
 
+<varlistentry>
+<term id="vimspell.sh"><command>vimspell.sh</command></term>
+<listitem>
 <indexterm zone="ch-system-vim vimspell.sh"><primary sortas="b-vimspell.sh">vimspell.sh</primary></indexterm>
-<para id="vimspell.sh"><command>vimspell.sh</command> is a script which spells a file and generates the syntax
-statements necessary to highlight in vim.
-This script requires the old Unix <command>spell</command> command,
-which is provided neither in LFS nor in BLFS.</para>
-
+<para>is a script which spells a file and generates the syntax statements necessary 
+to highlight in vim. This script requires the old Unix <command>spell</command> 
+command, which is provided neither in LFS nor in BLFS.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="vimtutor"><command>vimtutor</command></term>
+<listitem>
 <indexterm zone="ch-system-vim vimtutor"><primary sortas="b-vimtutor">vimtutor</primary></indexterm>
-<para id="vimtutor"><command>vimtutor</command> teaches you the basic keys and commands
-of vim.</para>
+<para>teaches you the basic keys and commands of vim.</para>
+</listitem>
+</varlistentry>
 
+<varlistentry>
+<term id="xxd"><command>xxd</command></term>
+<listitem>
 <indexterm zone="ch-system-vim xxd"><primary sortas="b-xxd">xxd</primary></indexterm>
-<para id="xxd"><command>xxd</command> makes a hex dump of the given file. It can
+<para>makes a hex dump of the given file. It can
 also do the reverse, so it can be used for binary patching.</para>
+</listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>
 
-
-
 </sect1>