Index: chapter06/gettext.xml
===================================================================
--- chapter06/gettext.xml	(revision a001133b31b73376be437cc4483867149b03a1df)
+++ chapter06/gettext.xml	(revision c6cb3aa2f176d65a5ebe77e7da82e20946188a98)
@@ -50,136 +50,252 @@
 
 
-<sect2 id="contents-gettext"><title>Contents of Gettext</title>
-
-<para><emphasis>Installed programs</emphasis>: autopoint, config.charset,
-config.rpath, envsubst, gettext, gettextize, hostname, msgattrib, msgcat,
-msgcmp, msgcomm, msgconv, msgen, msgexec, msgfilter, msgfmt, msggrep, msginit,
-msgmerge, msgunfmt, msguniq, ngettext, project-id, team-address, trigger,
-urlget, user-email and xgettext</para>
-
-<para><emphasis>Installed libraries</emphasis>: libasprintf[a,so],
-libgettextlib[a,so], libgettextpo[a,so] and libgettextsrc[a,so]</para>
-
-</sect2>
-
-<sect2><title>Short descriptions</title>
-
+<sect2 id="contents-gettext" role="content"><title>Contents of Gettext</title>
+
+<segmentedlist>
+<segtitle>Installed programs</segtitle>
+<segtitle>Installed libraries</segtitle>
+<seglistitem><seg>autopoint, config.charset, config.rpath, envsubst, gettext, 
+gettextize, hostname, msgattrib, msgcat, msgcmp, msgcomm, msgconv, msgen, 
+msgexec, msgfilter, msgfmt, msggrep, msginit, msgmerge, msgunfmt, msguniq, 
+ngettext, project-id, team-address, trigger, urlget, user-email and xgettext</seg>
+<seg>libasprintf[a,so], libgettextlib[a,so], libgettextpo[a,so] and libgettextsrc[a,so]</seg></seglistitem>
+</segmentedlist>
+
+<variablelist><title>Short descriptions</title>
+
+<varlistentry>
+<term id="autopoint"><command>autopoint</command></term>
+<listitem>
 <indexterm zone="ch-system-gettext autopoint"><primary sortas="b-autopoint">autopoint</primary></indexterm>
-<para id="autopoint"><command>autopoint</command> copies standard gettext infrastructure
-files into a source package.</para>
-
+<para>copies standard gettext infrastructure files into a source package.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="config.charset"><command>config.charset</command></term>
+<listitem>
 <indexterm zone="ch-system-gettext config.charset"><primary sortas="b-config.charset">config.charset</primary></indexterm>
-<para id="config.charset"><command>config.charset</command> outputs a system-dependent table of
-character encoding aliases.</para>
-
+<para>outputs a system-dependent table of character encoding aliases.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="config.rpath"><command>config.rpath</command></term>
+<listitem>
 <indexterm zone="ch-system-gettext config.rpath"><primary sortas="b-config.rpath">config.rpath</primary></indexterm>
-<para id="config.rpath"><command>config.rpath</command> outputs a system-dependent set of
-variables, describing how to set the runtime search path of shared libraries in an
-executable.</para>
-
+<para>outputs a system-dependent set of variables, describing how to set the 
+runtime search path of shared libraries in an executable.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="envsubst"><command>envsubst</command></term>
+<listitem>
 <indexterm zone="ch-system-gettext envsubst"><primary sortas="b-envsubst">envsubst</primary></indexterm>
-<para id="envsubst"><command>envsubst</command> substitutes environment variables in shell
-format strings.</para>
-
+<para>substitutes environment variables in shell format strings.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="gettext"><command>gettext</command></term>
+<listitem>
 <indexterm zone="ch-system-gettext gettext"><primary sortas="b-gettext">gettext</primary></indexterm>
-<para id="gettext"><command>gettext</command> translates a natural language message into
+<para>translates a natural language message into
 the user's language, by looking up the translation in a message catalog.</para>
-
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="gettextize"><command>gettextize</command></term>
+<listitem>
 <indexterm zone="ch-system-gettext gettextize"><primary sortas="b-gettextize">gettextize</primary></indexterm>
-<para id="gettextize"><command>gettextize</command> copies all standard Gettext files into
+<para>copies all standard Gettext files into
 the given top-level directory of a package, to begin inter-nationalizing it.</para>
-
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="hostname-gettext"><command>hostname</command></term>
+<listitem>
 <indexterm zone="ch-system-gettext hostname-gettext"><primary sortas="b-hostname-gettext">hostname</primary></indexterm>
-<para id="hostname-gettext"><command>hostname</command> displays a network hostname in various
-forms.</para>
-
+<para>displays a network hostname in various forms.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="msgattrib"><command>msgattrib</command></term>
+<listitem>
 <indexterm zone="ch-system-gettext msgattrib"><primary sortas="b-msgattrib">msgattrib</primary></indexterm>
-<para id="msgattrib"><command>msgattrib</command> filters the messages of a translation
+<para>filters the messages of a translation
 catalog according to their attributes and manipulates the attributes.</para>
-
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="msgcat"><command>msgcat</command></term>
+<listitem>
 <indexterm zone="ch-system-gettext msgcat"><primary sortas="b-msgcat">msgcat</primary></indexterm>
-<para id="msgcat"><command>msgcat</command> concatenates and merges the given
-<filename>.po</filename> files.</para>
-
+<para>concatenates and merges the given <filename>.po</filename> files.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="msgcmp"><command>msgcmp</command></term>
+<listitem>
 <indexterm zone="ch-system-gettext msgcmp"><primary sortas="b-msgcmp">msgcmp</primary></indexterm>
-<para id="msgcmp"><command>msgcmp</command> compares two <filename>.po</filename>
+<para>compares two <filename>.po</filename>
 files to check that both contain the same set of msgid strings.</para>
-
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="msgcomm"><command>msgcomm</command></term>
+<listitem>
 <indexterm zone="ch-system-gettext msgcomm"><primary sortas="b-msgcomm">msgcomm</primary></indexterm>
-<para id="msgcomm"><command>msgcomm</command> finds the messages that are common to
+<para>finds the messages that are common to
 to the given <filename>.po</filename> files.</para>
-
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="msgconv"><command>msgconv</command></term>
+<listitem>
 <indexterm zone="ch-system-gettext msgconv"><primary sortas="b-msgconv">msgconv</primary></indexterm>
-<para id="msgconv"><command>msgconv</command> converts a translation catalog to a
-different character encoding.</para>
-
+<para>converts a translation catalog to a different character encoding.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="msgen"><command>msgen</command></term>
+<listitem>
 <indexterm zone="ch-system-gettext msgen"><primary sortas="b-msgen">msgen</primary></indexterm>
-<para id="msgen"><command>msgen</command> creates an English translation catalog.</para>
-
+<para>creates an English translation catalog.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="msgexec"><command>msgexec</command></term>
+<listitem>
 <indexterm zone="ch-system-gettext msgexec"><primary sortas="b-msgexec">msgexec</primary></indexterm>
-<para id="msgexec"><command>msgexec</command> applies a command to all translations of a
-translation catalog.</para>
-
+<para>applies a command to all translations of a translation catalog.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="msgfilter"><command>msgfilter</command></term>
+<listitem>
 <indexterm zone="ch-system-gettext msgfilter"><primary sortas="b-msgfilter">msgfilter</primary></indexterm>
-<para id="msgfilter"><command>msgfilter</command> applies a filter to all translations of a
-translation catalog.</para>
-
+<para>applies a filter to all translations of a translation catalog.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="msgfmt"><command>msgfmt</command></term>
+<listitem>
 <indexterm zone="ch-system-gettext msgfmt"><primary sortas="b-msgfmt">msgfmt</primary></indexterm>
-<para id="msgfmt"><command>msgfmt</command> generates a binary message catalog from
-from a translation catalog.</para>
-
+<para>generates a binary message catalog from from a translation catalog.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="msggrep"><command>msggrep</command></term>
+<listitem>
 <indexterm zone="ch-system-gettext msggrep"><primary sortas="b-msggrep">msggrep</primary></indexterm>
-<para id="msggrep"><command>msggrep</command> extracts all messages of a translation
+<para>extracts all messages of a translation
 catalog that match a given pattern or belong to some given source files.</para>
-
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="msginit"><command>msginit</command></term>
+<listitem>
 <indexterm zone="ch-system-gettext msginit"><primary sortas="b-msginit">msginit</primary></indexterm>
-<para id="msginit"><command>msginit</command> creates a new <filename>.po</filename>
-file, initializing the meta information with values from the user's
-environment.</para>
-
+<para>creates a new <filename>.po</filename> file, initializing the meta 
+information with values from the user's environment.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="msgmerge"><command>msgmerge</command></term>
+<listitem>
 <indexterm zone="ch-system-gettext msgmerge"><primary sortas="b-msgmerge">msgmerge</primary></indexterm>
-<para id="msgmerge"><command>msgmerge</command> combines two raw translations into a
-single file.</para>
-
+<para>combines two raw translations into a single file.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="msgunfmt"><command>msgunfmt</command></term>
+<listitem>
 <indexterm zone="ch-system-gettext msgunfmt"><primary sortas="b-msgunfmt">msgunfmt</primary></indexterm>
-<para id="msgunfmt"><command>msgunfmt</command> decompiles a binary message catalog
-into raw translation text.</para>
-
+<para>decompiles a binary message catalog into raw translation text.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="msguniq"><command>msguniq</command></term>
+<listitem>
 <indexterm zone="ch-system-gettext msguniq"><primary sortas="b-msguniq">msguniq</primary></indexterm>
-<para id="msguniq"><command>msguniq</command> unifies duplicate translations in a
-translation catalog.</para>
-
+<para>unifies duplicate translations in a translation catalog.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="ngettext"><command>ngettext</command></term>
+<listitem>
 <indexterm zone="ch-system-gettext ngettext"><primary sortas="b-ngettext">ngettext</primary></indexterm>
-<para id="ngettext"><command>ngettext</command> displays native language translations of a
+<para>displays native language translations of a
 textual message whose grammatical form depends on a number.</para>
-
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="xgettext"><command>xgettext</command></term>
+<listitem>
 <indexterm zone="ch-system-gettext xgettext"><primary sortas="b-xgettext">xgettext</primary></indexterm>
-<para id="xgettext"><command>xgettext</command> extracts the translatable message lines
+<para>extracts the translatable message lines
 from the given source files, to make the first translation template.</para>
-
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="libasprintf"><command>libasprintf</command></term>
+<listitem>
 <indexterm zone="ch-system-gettext libasprintf"><primary sortas="c-libasprintf">libasprintf</primary></indexterm>
-<para id="libasprintf"><command>libasprintf</command> defines the autosprintf class, which
+<para>defines the autosprintf class, which
 makes C formatted output routines usable in C++ programs, for use with the
 &lt;string&gt; strings and the &lt;iostream&gt; streams.</para>
-
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="libgettextlib"><command>libgettextlib</command></term>
+<listitem>
 <indexterm zone="ch-system-gettext libgettextlib"><primary sortas="c-libgettextlib">libgettextlib</primary></indexterm>
-<para id="libgettextlib"><command>libgettextlib</command> is a private library containing
-common routines used by the various gettext programs. They're not meant for
-general use.</para>
-
+<para>is a private library containing common routines used by the various gettext 
+programs. They're not meant for general use.</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="libgettextpo"><command>libgettextpo</command></term>
+<listitem>
 <indexterm zone="ch-system-gettext libgettextpo"><primary sortas="c-libgettextpo">libgettextpo</primary></indexterm>
-<para id="libgettextpo"><command>libgettextpo</command> is used to write specialized
-programs that process PO files. This library is used when the standard
-applications shipped with gettext won't suffice (such as msgcomm, msgcmp,
-msgattrib and msgen).</para>
-
+<para>is used to write specialized programs that process PO files. This library is 
+used when the standard applications shipped with gettext won't suffice (such as 
+msgcomm, msgcmp, msgattrib and msgen).</para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term id="libgettextsrc"><command>libgettextsrc</command></term>
+<listitem>
 <indexterm zone="ch-system-gettext libgettextsrc"><primary sortas="c-libgettextsrc">libgettextsrc</primary></indexterm>
-<para id="libgettextsrc"><command>libgettextsrc</command> is a private library containing
-common routines used by the various gettext programs. They're not meant for
-general use.</para>
+<para>is a private library containing common routines used by the various gettext 
+programs. They're not meant for general use.</para>
+</listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>
 
-
-
 </sect1>
