1 files changed, 54 insertions, 54 deletions
diff --git a/chapter06/gettext.xml b/chapter06/gettext.xml
index feb85a5f0..ca3e5e8f7 100644
--- a/chapter06/gettext.xml
+++ b/chapter06/gettext.xml
@@ -63,24 +63,24 @@ ngettext, project-id, team-address, trigger, urlget, user-email and xgettext</se
 
 <variablelist><title>Short descriptions</title>
 
-<varlistentry>
-<term id="autopoint"><command>autopoint</command></term>
+<varlistentry id="autopoint">
+<term><command>autopoint</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext autopoint"><primary sortas="b-autopoint">autopoint</primary></indexterm>
 <para>copies standard gettext infrastructure files into a source package.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="config.charset"><command>config.charset</command></term>
+<varlistentry id="config.charset">
+<term><command>config.charset</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext config.charset"><primary sortas="b-config.charset">config.charset</primary></indexterm>
 <para>outputs a system-dependent table of character encoding aliases.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="config.rpath"><command>config.rpath</command></term>
+<varlistentry id="config.rpath">
+<term><command>config.rpath</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext config.rpath"><primary sortas="b-config.rpath">config.rpath</primary></indexterm>
 <para>outputs a system-dependent set of variables, describing how to set the 
@@ -88,16 +88,16 @@ runtime search path of shared libraries in an executable.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="envsubst"><command>envsubst</command></term>
+<varlistentry id="envsubst">
+<term><command>envsubst</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext envsubst"><primary sortas="b-envsubst">envsubst</primary></indexterm>
 <para>substitutes environment variables in shell format strings.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="gettext"><command>gettext</command></term>
+<varlistentry id="gettext">
+<term><command>gettext</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext gettext"><primary sortas="b-gettext">gettext</primary></indexterm>
 <para>translates a natural language message into
@@ -105,8 +105,8 @@ the user's language, by looking up the translation in a message catalog.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="gettextize"><command>gettextize</command></term>
+<varlistentry id="gettextize">
+<term><command>gettextize</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext gettextize"><primary sortas="b-gettextize">gettextize</primary></indexterm>
 <para>copies all standard Gettext files into
@@ -114,16 +114,16 @@ the given top-level directory of a package, to begin inter-nationalizing it.</pa
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="hostname-gettext"><command>hostname</command></term>
+<varlistentry id="hostname-gettext">
+<term><command>hostname</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext hostname-gettext"><primary sortas="b-hostname-gettext">hostname</primary></indexterm>
 <para>displays a network hostname in various forms.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="msgattrib"><command>msgattrib</command></term>
+<varlistentry id="msgattrib">
+<term><command>msgattrib</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext msgattrib"><primary sortas="b-msgattrib">msgattrib</primary></indexterm>
 <para>filters the messages of a translation
@@ -131,16 +131,16 @@ catalog according to their attributes and manipulates the attributes.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="msgcat"><command>msgcat</command></term>
+<varlistentry id="msgcat">
+<term><command>msgcat</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext msgcat"><primary sortas="b-msgcat">msgcat</primary></indexterm>
 <para>concatenates and merges the given <filename>.po</filename> files.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="msgcmp"><command>msgcmp</command></term>
+<varlistentry id="msgcmp">
+<term><command>msgcmp</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext msgcmp"><primary sortas="b-msgcmp">msgcmp</primary></indexterm>
 <para>compares two <filename>.po</filename>
@@ -148,8 +148,8 @@ files to check that both contain the same set of msgid strings.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="msgcomm"><command>msgcomm</command></term>
+<varlistentry id="msgcomm">
+<term><command>msgcomm</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext msgcomm"><primary sortas="b-msgcomm">msgcomm</primary></indexterm>
 <para>finds the messages that are common to
@@ -157,48 +157,48 @@ to the given <filename>.po</filename> files.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="msgconv"><command>msgconv</command></term>
+<varlistentry id="msgconv">
+<term><command>msgconv</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext msgconv"><primary sortas="b-msgconv">msgconv</primary></indexterm>
 <para>converts a translation catalog to a different character encoding.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="msgen"><command>msgen</command></term>
+<varlistentry id="msgen">
+<term><command>msgen</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext msgen"><primary sortas="b-msgen">msgen</primary></indexterm>
 <para>creates an English translation catalog.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="msgexec"><command>msgexec</command></term>
+<varlistentry id="msgexec">
+<term><command>msgexec</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext msgexec"><primary sortas="b-msgexec">msgexec</primary></indexterm>
 <para>applies a command to all translations of a translation catalog.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="msgfilter"><command>msgfilter</command></term>
+<varlistentry id="msgfilter">
+<term><command>msgfilter</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext msgfilter"><primary sortas="b-msgfilter">msgfilter</primary></indexterm>
 <para>applies a filter to all translations of a translation catalog.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="msgfmt"><command>msgfmt</command></term>
+<varlistentry id="msgfmt">
+<term><command>msgfmt</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext msgfmt"><primary sortas="b-msgfmt">msgfmt</primary></indexterm>
 <para>generates a binary message catalog from from a translation catalog.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="msggrep"><command>msggrep</command></term>
+<varlistentry id="msggrep">
+<term><command>msggrep</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext msggrep"><primary sortas="b-msggrep">msggrep</primary></indexterm>
 <para>extracts all messages of a translation
@@ -206,8 +206,8 @@ catalog that match a given pattern or belong to some given source files.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="msginit"><command>msginit</command></term>
+<varlistentry id="msginit">
+<term><command>msginit</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext msginit"><primary sortas="b-msginit">msginit</primary></indexterm>
 <para>creates a new <filename>.po</filename> file, initializing the meta 
@@ -215,32 +215,32 @@ information with values from the user's environment.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="msgmerge"><command>msgmerge</command></term>
+<varlistentry id="msgmerge">
+<term><command>msgmerge</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext msgmerge"><primary sortas="b-msgmerge">msgmerge</primary></indexterm>
 <para>combines two raw translations into a single file.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="msgunfmt"><command>msgunfmt</command></term>
+<varlistentry id="msgunfmt">
+<term><command>msgunfmt</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext msgunfmt"><primary sortas="b-msgunfmt">msgunfmt</primary></indexterm>
 <para>decompiles a binary message catalog into raw translation text.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="msguniq"><command>msguniq</command></term>
+<varlistentry id="msguniq">
+<term><command>msguniq</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext msguniq"><primary sortas="b-msguniq">msguniq</primary></indexterm>
 <para>unifies duplicate translations in a translation catalog.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="ngettext"><command>ngettext</command></term>
+<varlistentry id="ngettext">
+<term><command>ngettext</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext ngettext"><primary sortas="b-ngettext">ngettext</primary></indexterm>
 <para>displays native language translations of a
@@ -248,8 +248,8 @@ textual message whose grammatical form depends on a number.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="xgettext"><command>xgettext</command></term>
+<varlistentry id="xgettext">
+<term><command>xgettext</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext xgettext"><primary sortas="b-xgettext">xgettext</primary></indexterm>
 <para>extracts the translatable message lines
@@ -257,8 +257,8 @@ from the given source files, to make the first translation template.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="libasprintf"><command>libasprintf</command></term>
+<varlistentry id="libasprintf">
+<term><command>libasprintf</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext libasprintf"><primary sortas="c-libasprintf">libasprintf</primary></indexterm>
 <para>defines the autosprintf class, which
@@ -267,8 +267,8 @@ makes C formatted output routines usable in C++ programs, for use with the
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="libgettextlib"><command>libgettextlib</command></term>
+<varlistentry id="libgettextlib">
+<term><command>libgettextlib</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext libgettextlib"><primary sortas="c-libgettextlib">libgettextlib</primary></indexterm>
 <para>is a private library containing common routines used by the various gettext 
@@ -276,8 +276,8 @@ programs. They're not meant for general use.</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="libgettextpo"><command>libgettextpo</command></term>
+<varlistentry id="libgettextpo">
+<term><command>libgettextpo</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext libgettextpo"><primary sortas="c-libgettextpo">libgettextpo</primary></indexterm>
 <para>is used to write specialized programs that process PO files. This library is 
@@ -286,8 +286,8 @@ msgcomm, msgcmp, msgattrib and msgen).</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term id="libgettextsrc"><command>libgettextsrc</command></term>
+<varlistentry id="libgettextsrc">
+<term><command>libgettextsrc</command></term>
 <listitem>
 <indexterm zone="ch-system-gettext libgettextsrc"><primary sortas="c-libgettextsrc">libgettextsrc</primary></indexterm>
 <para>is a private library containing common routines used by the various gettext