[SCM] live-manual branch, debian, updated. debian/2.0_a1-1-4-gadf7b40

Daniel Baumann daniel at debian.org
Sun Jun 6 16:00:46 UTC 2010


The following commit has been merged in the debian branch:
commit adf7b4050a6625a3ec6f9f21b87f388e24de58d3
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Jun 6 17:46:47 2010 +0200

    Tidy all files and regenerating po files.

diff --git a/Makefile b/Makefile
index e6482d3..b4d113e 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 SHELL := sh -e
 
-LANGUAGES = en de fr
+LANGUAGES = en de
 
 all: test build
 
diff --git a/html/index.html b/html/index.html
index 5b7e61e..7f2fa68 100644
--- a/html/index.html
+++ b/html/index.html
@@ -24,7 +24,6 @@
 	<ul>
 		<li>&rsaquo; <a href="en"><b>English</b></a></li>
 		<li>&rsaquo; <a href="de">German</a></li>
-		<li>&rsaquo; <a href="fr">French</a></li>
 	</ul>
 </dd>
 
diff --git a/manual/de/about.xml b/manual/de/about.xml
index 60a851b..ef8ec09 100644
--- a/manual/de/about.xml
+++ b/manual/de/about.xml
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-	<!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
-
 <chapter>
-<title>About</title>
-
-<xi:include href="about_manual.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="about_project.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-
+  <title>About</title>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="about_manual.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="about_project.xml"/>
 </chapter>
diff --git a/manual/de/about_manual.xml b/manual/de/about_manual.xml
index 28979f4..674d4d0 100644
--- a/manual/de/about_manual.xml
+++ b/manual/de/about_manual.xml
@@ -1,397 +1,231 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-	<!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
-
 <sect1 id="meta">
-<title>About this manual</title>
-
-<para>
-	The main goal of this manual is to serve as a single access point to all
+  <title>About this manual</title>
+  <para> The main goal of this manual is to serve as a single access point to all
 documentation related to the Debian Live project. It does not include
-end-user documentation for using a Debian Live system.
-</para>
-
-<para>
-	Some of the commands mentioned in the text must be executed with superuser
+end-user documentation for using a Debian Live system. </para>
+  <para> Some of the commands mentioned in the text must be executed with superuser
 privileges which can be obtained by becoming the root user via
 <filename>su</filename> or by using <filename>sudo</filename>. To
 distinguish between commands which may be executed by an unprivileged user
 and those requiring superuser privileges, commands are prepended by
 <command>$</command> or <command>#</command> respectively. This symbol is
-not a part of the command.
-</para>
-
-<sect2 id="terms">
-<title>Terms</title>
-
-<variablelist>
-
-<varlistentry>
-<term>Live system</term>
-
-<listitem>
-<para>
-	An operating system that can boot without installation to a hard drive.
-Live systems do not alter local operating system(s) or file(s) already
-installed on the computer hard drive unless instructed to do so. Live
-systems are typically booted from media such as CDs or DVDs, some may also
-boot with USB sticks or over the network (via netboot images).
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Debian Live</term>
-
-<listitem>
-<para>
-	The Debian sub-project which maintains the &live-helper; and
-&live-initramfs; utilities.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Debian Live system</term>
-
-<listitem>
-<para>
-	A live system that uses software from the Debian operating system that may
+not a part of the command. </para>
+  <sect2 id="terms">
+    <title>Terms</title>
+    <variablelist>
+      <varlistentry>
+        <term>Live system</term>
+        <listitem>
+          <para> An operating system that can boot without installation to a hard drive. Live
+systems do not alter local operating system(s) or file(s) already installed
+on the computer hard drive unless instructed to do so. Live systems are
+typically booted from media such as CDs or DVDs, some may also boot with USB
+sticks or over the network (via netboot images). </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Debian Live</term>
+        <listitem>
+          <para> The Debian sub-project which maintains the &live-helper; and
+&live-initramfs; utilities. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Debian Live system</term>
+        <listitem>
+          <para> A live system that uses software from the Debian operating system that may
 be booted from CDs, DVDs, USB sticks, over the network (via netboot images),
-and over the internet (via boot parameter fetch=URL)
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Build system / host system</term>
-
-<listitem>
-<para>
-	The environment used to create the live system.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>&live-helper;</term>
-
-<listitem>
-<para>
-	A collection of scripts used to build customised Debian Live systems.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>&live-initramfs;</term>
-
-<listitem>
-<para>
-	A collection of scripts used to boot live systems. &live-initramfs; is a
-fork of <filename>casper</filename> by Canonical, Ltd.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><filename>live-package</filename></term>
-
-<listitem>
-<para>
-	The former name of &live-helper;.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Debian Installer / (d-i)</term>
-
-<listitem>
-<para>
-	The official installation system for the Debian distribution.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Cheat codes</term>
-
-<listitem>
-<para>
-	FIXME
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>chroot</term>
-
-<listitem>
-<para>
-	The chroot program, chroot(8), enables us to run different instances of the
-GNU/Linux environment on a single system simultaneously without rebooting.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>binary image</term>
-
-<listitem>
-<para>
-	On a live system, binary image refers to the binary filesystem and the
-respective extension, such as binary.iso or binary.img.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Target distribution</term>
-
-<listitem>
-<para>
-	The distribution upon which your live system will be based. This can differ
-from the distribution of your Build System.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>&lenny;/&squeeze;/&sid; stable/testing/unstable</term>
-
-<listitem>
-<para>
-	The "stable" distribution contains the latest officially released
+and over the internet (via boot parameter fetch=URL) </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Build system / host system</term>
+        <listitem>
+          <para> The environment used to create the live system. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>&live-helper;</term>
+        <listitem>
+          <para> A collection of scripts used to build customised Debian Live systems. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>&live-initramfs;</term>
+        <listitem>
+          <para> A collection of scripts used to boot live systems. &live-initramfs; is a
+fork of <filename>casper</filename> by Canonical, Ltd. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <filename>live-package</filename>
+        </term>
+        <listitem>
+          <para> The former name of &live-helper;. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Debian Installer / (d-i)</term>
+        <listitem>
+          <para> The official installation system for the Debian distribution. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Cheat codes</term>
+        <listitem>
+          <para> FIXME </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>chroot</term>
+        <listitem>
+          <para> The chroot program, chroot(8), enables us to run different instances of the
+GNU/Linux environment on a single system simultaneously without rebooting. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>binary image</term>
+        <listitem>
+          <para> On a live system, binary image refers to the binary filesystem and the
+respective extension, such as binary.iso or binary.img. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Target distribution</term>
+        <listitem>
+          <para> The distribution upon which your live system will be based. This can differ
+from the distribution of your Build System. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>&lenny;/&squeeze;/&sid; stable/testing/unstable</term>
+        <listitem>
+          <para> The "stable" distribution contains the latest officially released
 distribution of Debian. The "testing" distribution is the staging area for
 the next stable release. A major advantage of using this distribution is
 that it has more recent versions of software relative to the "stable"
 release. The "unstable" distribution is where active development of Debian
 occurs. Generally, this distribution is run by developers and those who like
-to live on the edge.
-</para>
-
-<para>
-	At the time of writing, &lenny; is the current "stable" release and
+to live on the edge. </para>
+          <para> At the time of writing, &lenny; is the current "stable" release and
 &squeeze; is the current "testing" release. &sid; will always be a synonym
-for the "unstable" release.
-</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-
-</sect2>
-
-<sect2 id="authors">
-<title>Authors</title>
-
-<para>
-	A list of authors (in alphabetical order):
-</para>
-
-<itemizedlist>
-
-<listitem>
-<para>
-	Ben Armstrong
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Brendan Sleight
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Chris Lamb
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Daniel Baumann
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Franklin Piat
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Jonas Stein
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Kai Hendry
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Marco Amadori
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Mathieu Geli
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Matthias Kirschner
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Richard Nelson
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Trent W. Buck
-</para>
-</listitem>
-
-</itemizedlist>
-
-</sect2>
-
-<sect2 id="contributing">
-<title>Contributing to this document</title>
-
-<para>
-	This manual is intended as a community project and all proposals for
+for the "unstable" release. </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+  <sect2 id="authors">
+    <title>Authors</title>
+    <para> A list of authors (in alphabetical order): </para>
+    <itemizedlist>
+      <listitem>
+        <para> Ben Armstrong </para>
+      </listitem>
+      <listitem>
+        <para> Brendan Sleight </para>
+      </listitem>
+      <listitem>
+        <para> Chris Lamb </para>
+      </listitem>
+      <listitem>
+        <para> Daniel Baumann </para>
+      </listitem>
+      <listitem>
+        <para> Franklin Piat </para>
+      </listitem>
+      <listitem>
+        <para> Jonas Stein </para>
+      </listitem>
+      <listitem>
+        <para> Kai Hendry </para>
+      </listitem>
+      <listitem>
+        <para> Marco Amadori </para>
+      </listitem>
+      <listitem>
+        <para> Mathieu Geli </para>
+      </listitem>
+      <listitem>
+        <para> Matthias Kirschner </para>
+      </listitem>
+      <listitem>
+        <para> Richard Nelson </para>
+      </listitem>
+      <listitem>
+        <para> Trent W. Buck </para>
+      </listitem>
+    </itemizedlist>
+  </sect2>
+  <sect2 id="contributing">
+    <title>Contributing to this document</title>
+    <para> This manual is intended as a community project and all proposals for
 improvements and contributions are extremely welcome. The preferred way to
 submit a contribution is to send it to the mailing list. Please see <xref
-linkend="contact" /> for more information.
-</para>
-
-<para>
-	When submitting a contribution please clearly identify its copyright holder
+linkend="contact"/> for more information. </para>
+    <para> When submitting a contribution please clearly identify its copyright holder
 and include the licensing statement. Note that to be accepted the
 contribution must be licensed under the same license as the rest of the
-document, namely GPL version 3 or later.
-</para>
-
-<para>
-	The sources for this manual are maintained using the Git version control
-system. You can checkout the latest copy by executing:
-</para>
-
-<para>
-	<screen>$ git clone git://live.debian.net/git/live-manual.git</screen>
-</para>
-
-<para>
-	Prior to submission of your contribution, please preview your work. To
+document, namely GPL version 3 or later. </para>
+    <para> The sources for this manual are maintained using the Git version control
+system. You can checkout the latest copy by executing: </para>
+    <para>
+      <screen>$ git clone git://live.debian.net/git/live-manual.git</screen>
+    </para>
+    <para> Prior to submission of your contribution, please preview your work. To
 preview the live-manual, ensure the packages needed for building are
-installed by executing:
-</para>
-
-<para>
-	<screen># apt-get install dblatex docbook-xml docbook-xsl make po4a
-	w3m</screen>
-</para>
-
-<para>
-	You may build the live-manual from the top level directory of your git
-checkout by executing:
-</para>
-
-<para>
-	<screen>$ make build</screen>
-</para>
-
-<sect3 id="commiting">
-<title>Applying patches</title>
-
-<para>
-	Directly commiting to the repository is possible by anyone. However, we ask
-you to send bigger changes to the mailinglist to discuss them first.  In
-order to push to the repository, the following steps are required.
-</para>
-
-<itemizedlist>
-
-<listitem>
-<para>
-	Fetch the public commit key:
-</para>
-
-<para>
-	<screen>$ mkdir -p ~/.ssh/identity.d
-$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live -O ~/.ssh/identity.d/live-manual at debian-live
-$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub -O ~/.ssh/identity.d/live-manual at debian-live.pub
-$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*</screen>
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Add the following section to your openssh-client config:
-</para>
-
-<para>
-	<screen> $ cat &gt;&gt; ~/.ssh/config &lt;&lt; EOF
-Host live.debian.net
-	Hostname live.debian.net
-	User gitosis
-	IdentityFile ~/.ssh/identity.d/live-manual at debian-live
-EOF</screen>
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Checkout a clone of the manual through ssh:
-</para>
-
-<para>
-	<screen>$ git clone gitosis at live.debian.net:/live-manual.git</screen>
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Commit the file after editing. Write commit messages, that consist of full
+installed by executing: </para>
+    <para>
+      <screen># apt-get install dblatex docbook-xml docbook-xsl make po4a w3m</screen>
+    </para>
+    <para> You may build the live-manual from the top level directory of your git
+checkout by executing: </para>
+    <para>
+      <screen>$ make build</screen>
+    </para>
+    <sect3 id="commiting">
+      <title>Applying patches</title>
+      <para> Directly commiting to the repository is possible by anyone. However, we ask
+you to send bigger changes to the mailinglist to discuss them first. In
+order to push to the repository, the following steps are required. </para>
+      <itemizedlist>
+        <listitem>
+          <para> Fetch the public commit key: </para>
+          <para>
+            <screen>$ mkdir -p ~/.ssh/identity.d $ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live -O ~/.ssh/identity.d/live-manual at debian-live $ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub -O ~/.ssh/identity.d/live-manual at debian-live.pub $ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*</screen>
+          </para>
+        </listitem>
+        <listitem>
+          <para> Add the following section to your openssh-client config: </para>
+          <para>
+            <screen> $ cat &gt;&gt; ~/.ssh/config &lt;&lt; EOF Host live.debian.net Hostname live.debian.net User gitosis IdentityFile ~/.ssh/identity.d/live-manual at debian-live EOF</screen>
+          </para>
+        </listitem>
+        <listitem>
+          <para> Checkout a clone of the manual through ssh: </para>
+          <para>
+            <screen>$ git clone gitosis at live.debian.net:/live-manual.git</screen>
+          </para>
+        </listitem>
+        <listitem>
+          <para> Commit the file after editing. Write commit messages, that consist of full
 useful sentences, starting with a capital letter and ending with a full
-stop. Usually starting with the form 'Fixing/Adding/Removing/Correcting/':
-</para>
-
-<para>
-	<screen>$ git commit -a</screen>
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Push the commit to the server:
-</para>
-
-<para>
-	<screen>$ git push</screen>
-</para>
-</listitem>
-
-</itemizedlist>
-
-</sect3>
-
-</sect2>
-
+stop. Usually starting with the form 'Fixing/Adding/Removing/Correcting/': </para>
+          <para>
+            <screen>$ git commit -a</screen>
+          </para>
+        </listitem>
+        <listitem>
+          <para> Push the commit to the server: </para>
+          <para>
+            <screen>$ git push</screen>
+          </para>
+        </listitem>
+      </itemizedlist>
+    </sect3>
+  </sect2>
 </sect1>
diff --git a/manual/de/about_project.xml b/manual/de/about_project.xml
index 50480ad..6747b4a 100644
--- a/manual/de/about_project.xml
+++ b/manual/de/about_project.xml
@@ -1,148 +1,159 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <sect1 id="about">
-<title>About the Debian Live Project</title>
-
-<sect2 id="motivation">
-<title>Motivation</title>
-
-<sect3>
-<title>What is wrong with current live systems</title>
-
-<para>There are already several Debian-based live systems and they are doing a
+  <title>About the Debian Live Project</title>
+  <sect2 id="motivation">
+    <title>Motivation</title>
+    <sect3>
+      <title>What is wrong with current live systems</title>
+      <para> There are already several Debian-based live systems and they are doing a
 great job. But, from the Debian perspective most of them have one or more of
-the following disadvantages:</para>
-
-<orderedlist>
-<listitem><para>They are unofficial projects, developed outside of Debian.</para></listitem>
-<listitem><para>They mix different distributions, e.g. testing and unstable.</para></listitem>
-<listitem><para>They support i386 only.</para></listitem>
-<listitem><para>They modify the behaviour and/or appearance of packages by stripping them
-down to save space.</para></listitem>
-<listitem><para>They include unofficial packages.</para></listitem>
-<listitem><para>They ship custom kernels with additional patches that are not part of
-Debian.</para></listitem>
-<listitem><para>They are large and slow due to their sheer size and thus not suitable for
-rescue issues.</para></listitem>
-<listitem><para>They are not available in different flavours, e.g. CDs, DVDs, USB-stick and
-netboot images </para></listitem>
-</orderedlist>
-</sect3>
-
-<sect3>
-<title>Why create our own live system?</title>
-
-<para>Debian is the Universal Operating System: Debian should have an official
+the following disadvantages: </para>
+      <orderedlist>
+        <listitem>
+          <para> They are unofficial projects, developed outside of Debian. </para>
+        </listitem>
+        <listitem>
+          <para> They mix different distributions, e.g. testing and unstable. </para>
+        </listitem>
+        <listitem>
+          <para> They support i386 only. </para>
+        </listitem>
+        <listitem>
+          <para> They modify the behaviour and/or appearance of packages by stripping them
+down to save space. </para>
+        </listitem>
+        <listitem>
+          <para> They include unofficial packages. </para>
+        </listitem>
+        <listitem>
+          <para> They ship custom kernels with additional patches that are not part of
+Debian. </para>
+        </listitem>
+        <listitem>
+          <para> They are large and slow due to their sheer size and thus not suitable for
+rescue issues. </para>
+        </listitem>
+        <listitem>
+          <para> They are not available in different flavours, e.g. CDs, DVDs, USB-stick and
+netboot images. </para>
+        </listitem>
+      </orderedlist>
+    </sect3>
+    <sect3>
+      <title>Why create our own live system?</title>
+      <para> Debian is the Universal Operating System: Debian should have an official
 live system for showing around and to officially represent the true, one and
-only Debian system with the following main advantages:</para>
-
-<orderedlist>
-<listitem><para>It would be an official Debian subproject.</para></listitem>
-<listitem><para>It reflects the (current) state of one distribution.</para></listitem>
-<listitem><para>It runs on as many architectures as possible.</para></listitem>
-<listitem><para>It consists of unchanged Debian packages only.</para></listitem>
-<listitem><para>It does not contain any unofficial packages.</para></listitem>
-<listitem><para>It uses an unaltered Debian kernel-image with no additional patches.</para></listitem>
-</orderedlist>
-
-</sect3>
-
-</sect2>
-
-<sect2 id="philosophy">
-<title>Philosophy</title>
-
-<sect3>
-<title>Only unchanged, official packages</title>
-<para>We will only use official packages from the Debian repository in the "main"
+only Debian system with the following main advantages: </para>
+      <orderedlist>
+        <listitem>
+          <para> It would be an official Debian subproject. </para>
+        </listitem>
+        <listitem>
+          <para> It reflects the (current) state of one distribution. </para>
+        </listitem>
+        <listitem>
+          <para> It runs on as many architectures as possible. </para>
+        </listitem>
+        <listitem>
+          <para> It consists of unchanged Debian packages only. </para>
+        </listitem>
+        <listitem>
+          <para> It does not contain any unofficial packages. </para>
+        </listitem>
+        <listitem>
+          <para> It uses an unaltered Debian kernel-image with no additional patches. </para>
+        </listitem>
+      </orderedlist>
+    </sect3>
+  </sect2>
+  <sect2 id="philosophy">
+    <title>Philosophy</title>
+    <sect3>
+      <title>Only unchanged, official packages</title>
+      <para> We will only use official packages from the Debian repository in the "main"
 section (possibly contrib, although not decided yet). The non-free section
-is not part of Debian and therefore cannot be used at all for live systems.</para>
-
-<para>We will not change any packages. Whenever we need to change something, we
-will do that in coordination with its package maintainer in Debian.</para>
-
-<para>As an exception, our own packages such as &live-helper; or &live-initramfs;
+is not part of Debian and therefore cannot be used at all for live systems. </para>
+      <para> We will not change any packages. Whenever we need to change something, we
+will do that in coordination with its package maintainer in Debian. </para>
+      <para> As an exception, our own packages such as &live-helper; or &live-initramfs;
 may temporarily be used from our own repository for development reasons
 (e.g. to create development snapshots). They will be uploaded to Debian on a
-regular basis.</para>
-</sect3>
-
-<sect3>
-<title>No package configuration of the live system</title>
-<para>In this phase we will not ship or install sample or alternative
+regular basis. </para>
+    </sect3>
+    <sect3>
+      <title>No package configuration of the live system</title>
+      <para> In this phase we will not ship or install sample or alternative
 configurations. All packages are used in their default configuration as they
-are after a regular installation of Debian.</para>
-
-<para>Whenever we need a different default configuration, we will do that in
-coordination with its package maintainer in Debian.</para>
-
-<para>A system for configuring packages is provided using debconf in <command>lh
+are after a regular installation of Debian. </para>
+      <para> Whenever we need a different default configuration, we will do that in
+coordination with its package maintainer in Debian. </para>
+      <para> A system for configuring packages is provided using debconf in <command>lh
 config</command> (use --preseed FILE) allowing custom configured packages to
 be installed in your custom produced Debian Live images, but for official
 live images only default configuration will be used. For more information,
-please see <xref linkend="customization"/>.</para>
-
-<para>Exception: There are a few essential changes needed to bring a live system
+please see <xref linkend="customization"/>. </para>
+      <para> Exception: There are a few essential changes needed to bring a live system
 to life (e.g. configuring pam to allow empty passwords). These essential
 changes have to be kept as minimal as possible and should be merged within
-the Debian repository if possible.</para>
-</sect3>
-
-<sect3>
-<title>Live system to hard disk installer</title>
-<para>For the moment we will not ship an installer to copy the live system to a
+the Debian repository if possible. </para>
+    </sect3>
+    <sect3>
+      <title>Live system to hard disk installer</title>
+      <para> For the moment we will not ship an installer to copy the live system to a
 partition on the hard disk. Although we keep the changes in the live system
 as drastically minimal as possible compared to a regular Debian
 installation, the live system does differ in a few essential points (see
-exceptions, guideline 2).</para>
-
-<para> Therefore, we will ship a copy of the regular DebianInstaller (resp. Debian
+exceptions, guideline 2). </para>
+      <para> Therefore, we will ship a copy of the regular DebianInstaller (resp. Debian
 Installer, Graphical Installer) instead, to allow users to perform a regular
 Debian installation (and, of course, cdebootstrap and debootstrap are on the
-system too).</para>
-</sect3>
-
-</sect2>
-
-<sect2 id="contact">
-<title>Contact</title>
-
-<variablelist>
- <varlistentry><term>Mailing list</term>
- <listitem><para>The primary contact for the project is the <ulink
+system too). </para>
+    </sect3>
+  </sect2>
+  <sect2 id="contact">
+    <title>Contact</title>
+    <variablelist>
+      <varlistentry>
+        <term>Mailing list</term>
+        <listitem>
+          <para> The primary contact for the project is the <ulink
 url="http://lists.debian.org/debian-live/">mailing list</ulink>. You can
 email the list directly by addressing your mail to
 <email>debian-live at lists.debian.org</email>. The <ulink
 url="http://lists.debian.org/debian-live/">list archives</ulink> are also
-available.</para></listitem>
-</varlistentry>
-
-<varlistentry><term>IRC</term>
-<listitem><para>A number of users and developers are present in the <ulink
+available. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>IRC</term>
+        <listitem>
+          <para> A number of users and developers are present in the <ulink
 url="irc://irc.debian.org/#debian-live">#debian-live</ulink> channel on
 <ulink url="http://oftc.net">OFTC</ulink>. When asking a question on IRC,
 please be patient for an answer. If no answer is forthcoming, please email
-the mailing list.</para></listitem>
-</varlistentry>
-
-<varlistentry><term>BTS</term>
-<listitem><para>The Debian Bug Tracking System (BTS) contains details of bugs reported by
+the mailing list. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>BTS</term>
+        <listitem>
+          <para> The Debian Bug Tracking System (BTS) contains details of bugs reported by
 users and developers. Each bug is given a number, and is kept on file until
 it is marked as having been dealt with. For more information, please see
-<xref linkend="bugs"/>.</para></listitem>
-</varlistentry>
-
-<varlistentry><term>Wiki</term>
-<listitem><para>The <ulink url="http://wiki.debian.org/DebianLive">Debian Live wiki</ulink>
+<xref linkend="bugs"/>. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Wiki</term>
+        <listitem>
+          <para> The <ulink url="http://wiki.debian.org/DebianLive">Debian Live wiki</ulink>
 is a place to gather information, discuss applied technologies, and document
-frameworks of Debian Live systems that go beyond the scope of this document.</para></listitem>
-</varlistentry>
-
-</variablelist>
-
-</sect2>
-
+frameworks of Debian Live systems that go beyond the scope of this document. </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
 </sect1>
diff --git a/manual/de/appendices_configuration-files.xml b/manual/de/appendices_configuration-files.xml
index d7b5481..6316541 100644
--- a/manual/de/appendices_configuration-files.xml
+++ b/manual/de/appendices_configuration-files.xml
@@ -1,531 +1,615 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
-
 <appendix id="configuration-files">
-<title>Configuration files</title>
-
-<section id="config-binary">
-<title>The <filename>config/binary</filename> file</title>
-
-<variablelist>
-<varlistentry>
- <term>LH_BINARY_FILESYSTEM</term>
- <listitem><para>Set image filesystem. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BINARY_IMAGES</term>
- <listitem><para>Set image type. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BINARY_INDICES</term>
- <listitem><para>Set apt/aptitude generic indices. (See <xref
-linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BOOTAPPEND_LIVE</term>
- <listitem><para>Set boot parameters. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BOOTAPPEND_INSTALL</term>
- <listitem><para>Set boot parameters. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BOOTLOADER</term>
- <listitem><para>Set bootloader. (See <xref linkend="bootloaders"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_CHECKSUMS</term>
- <listitem><para>Set checksums. (See <xref linkend="cheat-codes"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_CHROOT_BUILD</term>
- <listitem><para>Control if we build binary images chrooted. (See <xref
-linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_DEBIAN_INSTALLER</term>
- <listitem><para>Set debian-installer. (See <xref linkend="debian-installer"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_DEBIAN_INSTALLER_DAILY</term>
- <listitem><para>Set daily images. (See <xref linkend="debian-installer"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_ENCRYPTION</term>
- <listitem><para>Set encrytion. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_GRUB_SPLASH</term>
- <listitem><para>Set custom grub splash. (See <xref linkend="splash"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_HOSTNAME</term>
- <listitem><para>Set hostname. (See <xref linkend="hostname"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_ISO_APPLICATION</term>
- <listitem><para>Set iso author. (See <xref linkend="iso-metadata"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_ISO_PREPARER</term>
- <listitem><para>Set iso preparer. (See <xref linkend="iso-metadata"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_ISO_PUBLISHER</term>
- <listitem><para>Set iso publisher. (See <xref linkend="iso-metadata"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_ISO_VOLUME</term>
- <listitem><para>Set iso volume (max 32 chars). (See <xref linkend="iso-metadata"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_JFFS2_ERASEBLOCK</term>
- <listitem><para>Set jffs2 eraseblock size. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_MEMTEST</term>
- <listitem><para>Set memtest. (See <xref linkend="memtest"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_NET_ROOT_FILESYSTEM</term>
- <listitem><para>Set netboot filesystem. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_NET_ROOT_MOUNTOPTIONS</term>
- <listitem><para>Set nfsopts. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_NET_ROOT_PATH</term>
- <listitem><para>Set netboot server directory. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_NET_ROOT_SERVER</term>
- <listitem><para>Set netboot server address. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_NET_COW_FILESYSTEM</term>
- <listitem><para>Set net client cow filesystem. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_NET_COW_MOUNTOPTIONS</term>
- <listitem><para>Set cow mount options. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_NET_COW_PATH</term>
- <listitem><para>Set cow directory. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_NET_COW_SERVER</term>
- <listitem><para>Set cow server. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_NET_TARBALL</term>
- <listitem><para>Set net tarball. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SYSLINUX_SPLASH</term>
- <listitem><para>Set custom syslinux splash. (See <xref linkend="splash"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SYSLINUX_TIMEOUT</term>
- <listitem><para>Set custom syslinux timeout in seconds. (See <xref linkend="syslinux"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SYSLINUX_CFG</term>
- <listitem><para>Set custom syslinux configuration file. (See <xref linkend="syslinux"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SYSLINUX_MENU</term>
- <listitem><para>Set syslinux menu. (See <xref linkend="syslinux"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SYSLINUX_MENU_LIVE_ENTRY</term>
- <listitem><para>Set text to be used on the menu for live entries. (See <xref
-linkend="syslinux"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY</term>
- <listitem><para>Set text to be used on the menu for live entries (failsafe ones). (See <xref
-linkend="syslinux"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SYSLINUX_MENU_MEMTEST_ENTRY</term>
- <listitem><para>Set text to be used on the menu for memtest entry. (See <xref
-linkend="syslinux"/> and <xref linkend="memtest"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_USERNAME</term>
- <listitem><para>Set username. (See <xref linkend="live-user"/>)</para></listitem>
-</varlistentry>
-
-</variablelist>
-</section>
-
-<section id="config-bootstrap">
-<title>The <filename>config/bootstrap</filename> file</title>
-
-<variablelist>
-<varlistentry>
- <term>LH_ARCHITECTURE</term>
- <listitem><para>Select chroot architecture. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BOOTSTRAP_CONFIG</term>
- <listitem><para>Set distribution config directory. (See <xref
-linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BOOTSTRAP_INCLUDE</term>
- <listitem><para>Include packages on base. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BOOTSTRAP_EXCLUDE</term>
- <listitem><para>Exclude packages on base. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BOOTSTRAP_FLAVOUR</term>
- <listitem><para>Select flavour to use. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BOOTSTRAP_KEYRING</term>
- <listitem><para>Set distribution keyring. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_DISTRIBUTION</term>
- <listitem><para>Select distribution to use. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_MIRROR_BOOTSTRAP</term>
- <listitem><para>Set mirror to bootstrap from. (See <xref linkend="package-sources"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_MIRROR_CHROOT</term>
- <listitem><para>Set mirror to fetch packages from. (See <xref linkend="package-sources"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_MIRROR_CHROOT_SECURITY</term>
- <listitem><para>Set security mirror to fetch packages from. (See <xref
-linkend="package-sources"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_MIRROR_BINARY</term>
- <listitem><para>Set mirror which ends up in the image. (See <xref
-linkend="package-sources"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_MIRROR_BINARY_SECURITY</term>
- <listitem><para>Set security mirror which ends up in the image. (See <xref
-linkend="package-sources"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SECTIONS</term>
- <listitem><para>select section(s) to use. (See <xref linkend="package-sources"/>)</para></listitem>
-</varlistentry>
-</variablelist>
-</section>
-
-<section id="config-chroot">
-<title>The <filename>config/chroot</filename> file</title>
-
-<variablelist>
-<varlistentry>
- <term>LH_CHROOT_FILESYSTEM</term>
- <listitem><para>Set chroot filesystem. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_UNION_FILESYSTEM</term>
- <listitem><para>Set union filesystem. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_EXPOSED_ROOT</term>
- <listitem><para>expose root as read only. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_HOOKS</term>
- <listitem><para>Set hook commands. (See <xref linkend="hooks"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_INTERACTIVE</term>
- <listitem><para>Set interactive build. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_KEYRING_PACKAGES</term>
- <listitem><para>Set keyring packages. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_LANGUAGE</term>
- <listitem><para>Set language to use. (See <xref linkend="language"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_LINUX_FLAVOURS</term>
- <listitem><para>Set kernel flavour to use. (See <xref linkend="kernel"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_LINUX_PACKAGES</term>
- <listitem><para>Set kernel packages to use. (See <xref linkend="kernel"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_PACKAGES</term>
- <listitem><para>Set packages to install. (See <xref linkend="lh-packages"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_PACKAGES_LISTS</term>
- <listitem><para>Set package list to install. (See <xref linkend="package-lists"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_TASKS</term>
- <listitem><para>Set tasks to install. (See <xref linkend="tasks"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SECURITY</term>
- <listitem><para>enable security updates. (See <xref linkend="package-sources"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SYMLINKS</term>
- <listitem><para>enable symlink convertion. (See <xref linkend="symlinks"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SYSVINIT</term>
- <listitem><para>enable sysvinit. (See <xref linkend="startup-scripts"/>)</para></listitem>
-</varlistentry>
-
-</variablelist>
-</section>
-
-<section id="config-common">
-<title>The <filename>config/common</filename> file</title>
-
-<variablelist>
-<varlistentry>
- <term>LH_APT</term>
- <listitem><para>Set package manager. (See <xref linkend="package-installation"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_APT_FTP_PROXY</term>
- <listitem><para>Set apt/aptitude ftp proxy. (See <xref linkend="package-installation"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_APT_HTTP_PROXY</term>
- <listitem><para>Set apt/aptitude http proxy. (See <xref linkend="package-installation"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_APT_PDIFFS</term>
- <listitem><para>Set apt/aptitude pdiff indices. (See <xref linkend="package-installation"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_APT_PIPELINE</term>
- <listitem><para>Set apt/aptitude pipeline depth. (See <xref
-linkend="package-installation"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_APT_RECOMMENDS</term>
- <listitem><para>Set apt/aptitude recommends. (See <xref linkend="package-installation"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_APT_SECURE</term>
- <listitem><para>Set apt/aptitude security. (See <xref linkend="package-installation"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BOOTSTRAP</term>
- <listitem><para>Set bootstrap program. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_CACHE</term>
- <listitem><para>control cache. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_CACHE_INDICES</term>
- <listitem><para>control if downloaded package indices should be cached. (See <xref
-linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_CACHE_PACKAGES</term>
- <listitem><para>control if downloaded packages files should be cached. (See <xref
-linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_CACHE_STAGES</term>
- <listitem><para>control if completed stages should be cached. (See <xref
-linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_DEBCONF_FRONTEND</term>
- <listitem><para>Set debconf(1) frontend to use. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_DEBCONF_NOWARNINGS</term>
- <listitem><para>Set debconf(1) warnings. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_DEBCONF_PRIORITY</term>
- <listitem><para>Set debconf(1) priority to use. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_INITRAMFS</term>
- <listitem><para>Set initramfs hook. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_FDISK</term>
- <listitem><para>Set fdisk program. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_LOSETUP</term>
- <listitem><para>Set losetup program. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_MODE</term>
- <listitem><para>Set distribution mode. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_ROOT_COMMAND</term>
- <listitem><para>use sudo or equivalent. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_USE_FAKEROOT</term>
- <listitem><para>use fakeroot/fakechroot. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_TASKSEL</term>
- <listitem><para>Set tasksel program. (See <xref linkend="tasks"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_INCLUDES</term>
- <listitem><para>Set includes. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_TEMPLATES</term>
- <listitem><para>Set templates. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BREAKPOINTS</term>
- <listitem><para>enable breakpoints. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_DEBUG</term>
- <listitem><para>enable debug. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_FORCE</term>
- <listitem><para>enable force. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_QUIET</term>
- <listitem><para>enable quiet. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_VERBOSE</term>
- <listitem><para>enable verbose. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-</variablelist>
-</section>
-
-<section id="config-source">
-<title>The <filename>config/source</filename> file</title>
-
-<variablelist>
-<varlistentry>
- <term>LH_SOURCE</term>
- <listitem><para>Set source option. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SOURCE_IMAGES</term>
- <listitem><para>Set image type. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-</variablelist>
-</section>
-
+  <title>Configuration files</title>
+  <section id="config-binary">
+    <title>The <filename>config/binary</filename> file</title>
+    <variablelist>
+      <varlistentry>
+        <term>LH_BINARY_FILESYSTEM</term>
+        <listitem>
+          <para>Set image filesystem. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_BINARY_IMAGES</term>
+        <listitem>
+          <para>Set image type. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_BINARY_INDICES</term>
+        <listitem>
+          <para>Set apt/aptitude generic indices. (See <xref
+linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_BOOTAPPEND_LIVE</term>
+        <listitem>
+          <para>Set boot parameters. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_BOOTAPPEND_INSTALL</term>
+        <listitem>
+          <para>Set boot parameters. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_BOOTLOADER</term>
+        <listitem>
+          <para>Set bootloader. (See <xref linkend="bootloaders"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_CHECKSUMS</term>
+        <listitem>
+          <para>Set checksums. (See <xref linkend="cheat-codes"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_CHROOT_BUILD</term>
+        <listitem>
+          <para>Control if we build binary images chrooted. (See <xref
+linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_DEBIAN_INSTALLER</term>
+        <listitem>
+          <para>Set debian-installer. (See <xref linkend="debian-installer"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_DEBIAN_INSTALLER_DAILY</term>
+        <listitem>
+          <para>Set daily images. (See <xref linkend="debian-installer"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_ENCRYPTION</term>
+        <listitem>
+          <para>Set encrytion. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_GRUB_SPLASH</term>
+        <listitem>
+          <para>Set custom grub splash. (See <xref linkend="splash"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_HOSTNAME</term>
+        <listitem>
+          <para>Set hostname. (See <xref linkend="hostname"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_ISO_APPLICATION</term>
+        <listitem>
+          <para>Set iso author. (See <xref linkend="iso-metadata"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_ISO_PREPARER</term>
+        <listitem>
+          <para>Set iso preparer. (See <xref linkend="iso-metadata"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_ISO_PUBLISHER</term>
+        <listitem>
+          <para>Set iso publisher. (See <xref linkend="iso-metadata"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_ISO_VOLUME</term>
+        <listitem>
+          <para>Set iso volume (max 32 chars). (See <xref linkend="iso-metadata"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_JFFS2_ERASEBLOCK</term>
+        <listitem>
+          <para>Set jffs2 eraseblock size. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_MEMTEST</term>
+        <listitem>
+          <para>Set memtest. (See <xref linkend="memtest"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_NET_ROOT_FILESYSTEM</term>
+        <listitem>
+          <para>Set netboot filesystem. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_NET_ROOT_MOUNTOPTIONS</term>
+        <listitem>
+          <para>Set nfsopts. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_NET_ROOT_PATH</term>
+        <listitem>
+          <para>Set netboot server directory. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_NET_ROOT_SERVER</term>
+        <listitem>
+          <para>Set netboot server address. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_NET_COW_FILESYSTEM</term>
+        <listitem>
+          <para>Set net client cow filesystem. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_NET_COW_MOUNTOPTIONS</term>
+        <listitem>
+          <para>Set cow mount options. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_NET_COW_PATH</term>
+        <listitem>
+          <para>Set cow directory. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_NET_COW_SERVER</term>
+        <listitem>
+          <para>Set cow server. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_NET_TARBALL</term>
+        <listitem>
+          <para>Set net tarball. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_SYSLINUX_SPLASH</term>
+        <listitem>
+          <para>Set custom syslinux splash. (See <xref linkend="splash"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_SYSLINUX_TIMEOUT</term>
+        <listitem>
+          <para>Set custom syslinux timeout in seconds. (See <xref linkend="syslinux"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_SYSLINUX_CFG</term>
+        <listitem>
+          <para>Set custom syslinux configuration file. (See <xref linkend="syslinux"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_SYSLINUX_MENU</term>
+        <listitem>
+          <para>Set syslinux menu. (See <xref linkend="syslinux"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_SYSLINUX_MENU_LIVE_ENTRY</term>
+        <listitem>
+          <para>Set text to be used on the menu for live entries. (See <xref
+linkend="syslinux"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY</term>
+        <listitem>
+          <para>Set text to be used on the menu for live entries (failsafe ones). (See <xref
+linkend="syslinux"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_SYSLINUX_MENU_MEMTEST_ENTRY</term>
+        <listitem>
+          <para>Set text to be used on the menu for memtest entry. (See <xref
+linkend="syslinux"/> and <xref linkend="memtest"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_USERNAME</term>
+        <listitem>
+          <para>Set username. (See <xref linkend="live-user"/>)</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </section>
+  <section id="config-bootstrap">
+    <title>The <filename>config/bootstrap</filename> file</title>
+    <variablelist>
+      <varlistentry>
+        <term>LH_ARCHITECTURE</term>
+        <listitem>
+          <para>Select chroot architecture. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_BOOTSTRAP_CONFIG</term>
+        <listitem>
+          <para>Set distribution config directory. (See <xref
+linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_BOOTSTRAP_INCLUDE</term>
+        <listitem>
+          <para>Include packages on base. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_BOOTSTRAP_EXCLUDE</term>
+        <listitem>
+          <para>Exclude packages on base. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_BOOTSTRAP_FLAVOUR</term>
+        <listitem>
+          <para>Select flavour to use. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_BOOTSTRAP_KEYRING</term>
+        <listitem>
+          <para>Set distribution keyring. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_DISTRIBUTION</term>
+        <listitem>
+          <para>Select distribution to use. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_MIRROR_BOOTSTRAP</term>
+        <listitem>
+          <para>Set mirror to bootstrap from. (See <xref linkend="package-sources"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_MIRROR_CHROOT</term>
+        <listitem>
+          <para>Set mirror to fetch packages from. (See <xref linkend="package-sources"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_MIRROR_CHROOT_SECURITY</term>
+        <listitem>
+          <para>Set security mirror to fetch packages from. (See <xref
+linkend="package-sources"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_MIRROR_BINARY</term>
+        <listitem>
+          <para>Set mirror which ends up in the image. (See <xref
+linkend="package-sources"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_MIRROR_BINARY_SECURITY</term>
+        <listitem>
+          <para>Set security mirror which ends up in the image. (See <xref
+linkend="package-sources"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_SECTIONS</term>
+        <listitem>
+          <para>select section(s) to use. (See <xref linkend="package-sources"/>)</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </section>
+  <section id="config-chroot">
+    <title>The <filename>config/chroot</filename> file</title>
+    <variablelist>
+      <varlistentry>
+        <term>LH_CHROOT_FILESYSTEM</term>
+        <listitem>
+          <para>Set chroot filesystem. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_UNION_FILESYSTEM</term>
+        <listitem>
+          <para>Set union filesystem. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_EXPOSED_ROOT</term>
+        <listitem>
+          <para>expose root as read only. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_HOOKS</term>
+        <listitem>
+          <para>Set hook commands. (See <xref linkend="hooks"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_INTERACTIVE</term>
+        <listitem>
+          <para>Set interactive build. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_KEYRING_PACKAGES</term>
+        <listitem>
+          <para>Set keyring packages. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_LANGUAGE</term>
+        <listitem>
+          <para>Set language to use. (See <xref linkend="language"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_LINUX_FLAVOURS</term>
+        <listitem>
+          <para>Set kernel flavour to use. (See <xref linkend="kernel"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_LINUX_PACKAGES</term>
+        <listitem>
+          <para>Set kernel packages to use. (See <xref linkend="kernel"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_PACKAGES</term>
+        <listitem>
+          <para>Set packages to install. (See <xref linkend="lh-packages"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_PACKAGES_LISTS</term>
+        <listitem>
+          <para>Set package list to install. (See <xref linkend="package-lists"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_TASKS</term>
+        <listitem>
+          <para>Set tasks to install. (See <xref linkend="tasks"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_SECURITY</term>
+        <listitem>
+          <para>enable security updates. (See <xref linkend="package-sources"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_SYMLINKS</term>
+        <listitem>
+          <para>enable symlink convertion. (See <xref linkend="symlinks"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_SYSVINIT</term>
+        <listitem>
+          <para>enable sysvinit. (See <xref linkend="startup-scripts"/>)</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </section>
+  <section id="config-common">
+    <title>The <filename>config/common</filename> file</title>
+    <variablelist>
+      <varlistentry>
+        <term>LH_APT</term>
+        <listitem>
+          <para>Set package manager. (See <xref linkend="package-installation"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_APT_FTP_PROXY</term>
+        <listitem>
+          <para>Set apt/aptitude ftp proxy. (See <xref linkend="package-installation"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_APT_HTTP_PROXY</term>
+        <listitem>
+          <para>Set apt/aptitude http proxy. (See <xref linkend="package-installation"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_APT_PDIFFS</term>
+        <listitem>
+          <para>Set apt/aptitude pdiff indices. (See <xref linkend="package-installation"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_APT_PIPELINE</term>
+        <listitem>
+          <para>Set apt/aptitude pipeline depth. (See <xref
+linkend="package-installation"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_APT_RECOMMENDS</term>
+        <listitem>
+          <para>Set apt/aptitude recommends. (See <xref linkend="package-installation"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_APT_SECURE</term>
+        <listitem>
+          <para>Set apt/aptitude security. (See <xref linkend="package-installation"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_BOOTSTRAP</term>
+        <listitem>
+          <para>Set bootstrap program. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_CACHE</term>
+        <listitem>
+          <para>control cache. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_CACHE_INDICES</term>
+        <listitem>
+          <para>control if downloaded package indices should be cached. (See <xref
+linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_CACHE_PACKAGES</term>
+        <listitem>
+          <para>control if downloaded packages files should be cached. (See <xref
+linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_CACHE_STAGES</term>
+        <listitem>
+          <para>control if completed stages should be cached. (See <xref
+linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_DEBCONF_FRONTEND</term>
+        <listitem>
+          <para>Set debconf(1) frontend to use. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_DEBCONF_NOWARNINGS</term>
+        <listitem>
+          <para>Set debconf(1) warnings. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_DEBCONF_PRIORITY</term>
+        <listitem>
+          <para>Set debconf(1) priority to use. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_INITRAMFS</term>
+        <listitem>
+          <para>Set initramfs hook. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_FDISK</term>
+        <listitem>
+          <para>Set fdisk program. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_LOSETUP</term>
+        <listitem>
+          <para>Set losetup program. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_MODE</term>
+        <listitem>
+          <para>Set distribution mode. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_ROOT_COMMAND</term>
+        <listitem>
+          <para>use sudo or equivalent. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_USE_FAKEROOT</term>
+        <listitem>
+          <para>use fakeroot/fakechroot. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_TASKSEL</term>
+        <listitem>
+          <para>Set tasksel program. (See <xref linkend="tasks"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_INCLUDES</term>
+        <listitem>
+          <para>Set includes. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_TEMPLATES</term>
+        <listitem>
+          <para>Set templates. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_BREAKPOINTS</term>
+        <listitem>
+          <para>enable breakpoints. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_DEBUG</term>
+        <listitem>
+          <para>enable debug. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_FORCE</term>
+        <listitem>
+          <para>enable force. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_QUIET</term>
+        <listitem>
+          <para>enable quiet. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_VERBOSE</term>
+        <listitem>
+          <para>enable verbose. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </section>
+  <section id="config-source">
+    <title>The <filename>config/source</filename> file</title>
+    <variablelist>
+      <varlistentry>
+        <term>LH_SOURCE</term>
+        <listitem>
+          <para>Set source option. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_SOURCE_IMAGES</term>
+        <listitem>
+          <para>Set image type. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </section>
 </appendix>
diff --git a/manual/de/appendices_configuration-layout.xml b/manual/de/appendices_configuration-layout.xml
index 7ca45ab..3e8d475 100644
--- a/manual/de/appendices_configuration-layout.xml
+++ b/manual/de/appendices_configuration-layout.xml
@@ -1,109 +1,194 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
-
 <appendix id="configuration-layout">
-<title>Configuration layout</title>
-
-<variablelist>
-<title>Layout of the <filename class="directory">config/</filename> directory</title>
-
-<varlistentry>
- <term><filename class="directory">binary_debian-installer/</filename></term>
- <listitem><para>(see <xref linkend="debian-installer"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">binary_grub/</filename></term>
- <listitem><para>(see <xref linkend="bootloaders"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">binary_local-debs/</filename></term>
- <listitem><para>(see <xref linkend="debian-installer"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">binary_local-hooks/</filename></term>
- <listitem><para>(see <xref linkend="binary-local-hooks"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">binary_local-includes/</filename></term>
- <listitem><para>(see <xref linkend="binary-includes"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">binary_local-packageslists/</filename></term>
- <listitem><para>(see <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">binary_local-udebs/</filename></term>
- <listitem><para>(see <xref linkend="debian-installer"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">binary_rootfs/</filename></term>
- <listitem><para>(see <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">binary_syslinux/</filename></term>
- <listitem><para>(see <xref linkend="bootloaders"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">chroot_apt/</filename></term>
- <listitem><para>(see <xref linkend="custom-packages-apt"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">chroot_local-hooks/</filename></term>
- <listitem><para>(see <xref linkend="chroot-local-hooks"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">chroot_local-includes/</filename></term>
- <listitem><para>(see <xref linkend="chroot-local-includes"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">chroot_local-packages/</filename></term>
- <listitem><para>(see <xref linkend="local-packages"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">chroot_local-packageslists/</filename></term>
- <listitem><para>(see <xref linkend="package-lists"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">chroot_local-presed/</filename></term>
- <listitem><para>(see <xref linkend="debconf-preseed"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">chroot_sources/</filename></term>
- <listitem><para>(see <xref linkend="custom-apt-repo"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">includes/</filename></term>
- <listitem><para>(see <xref linkend="bootloaders"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">templates/</filename></term>
- <listitem><para>(see <xref linkend="bootloaders"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term><filename>bootstrap</filename></term>
- <listitem><para>(see <xref linkend="config-bootstrap"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename>binary</filename></term>
- <listitem><para>(see <xref linkend="config-binary"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename>chroot</filename></term>
- <listitem><para>(see <xref linkend="config-chroot"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename>common</filename></term>
- <listitem><para>(see <xref linkend="config-common"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename>source</filename></term>
- <listitem><para>(see <xref linkend="config-source"/>)</para></listitem>
-</varlistentry>
-
-</variablelist>
-
+  <title>Configuration layout</title>
+  <variablelist>
+    <title>Layout of the <filename class="directory">config/</filename> directory</title>
+    <varlistentry>
+      <term>
+        <filename class="directory">binary_debian-installer/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="debian-installer"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">binary_grub/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="bootloaders"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">binary_local-debs/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="debian-installer"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">binary_local-hooks/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="binary-local-hooks"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">binary_local-includes/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="binary-includes"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">binary_local-packageslists/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="configuration-layout"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">binary_local-udebs/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="debian-installer"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">binary_rootfs/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="configuration-layout"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">binary_syslinux/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="bootloaders"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">chroot_apt/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="custom-packages-apt"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">chroot_local-hooks/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="chroot-local-hooks"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">chroot_local-includes/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="chroot-local-includes"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">chroot_local-packages/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="local-packages"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">chroot_local-packageslists/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="package-lists"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">chroot_local-presed/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="debconf-preseed"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">chroot_sources/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="custom-apt-repo"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">includes/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="bootloaders"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">templates/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="bootloaders"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename>bootstrap</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="config-bootstrap"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename>binary</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="config-binary"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename>chroot</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="config-chroot"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename>common</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="config-common"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename>source</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="config-source"/>)</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
 </appendix>
diff --git a/manual/de/basics.xml b/manual/de/basics.xml
index 7e7d110..a347305 100644
--- a/manual/de/basics.xml
+++ b/manual/de/basics.xml
@@ -1,665 +1,324 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-	<!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
-
 <chapter id="basics">
-<title>The basics</title>
-
-<para>
-	This chapter contains a brief overview of the build process as well as
-containing instructions on how to boot the various binary image types.
-</para>
-
-<section>
-<title>What is a live system?</title>
-
-<para>
-	A live system usually means an OS booted on a computer from a removable
+  <title>The basics</title>
+  <para> This chapter contains a brief overview of the build process as well as
+containing instructions on how to boot the various binary image types. </para>
+  <section>
+    <title>What is a live system?</title>
+    <para> A live system usually means an OS booted on a computer from a removable
 medium (such as CD-ROM, USB stick, or network), ready to use without any
 installation on the usual drive(s), with an auto-configuration done at
-runtime (see <xref linkend="terms" />).
-</para>
-
-<para>
-	With Debian Live, it's a Debian GNU/Linux OS, built for one of the supported
+runtime (see <xref linkend="terms"/>). </para>
+    <para> With Debian Live, it's a Debian GNU/Linux OS, built for one of the supported
 architectures (currently amd64, i386, powerpc and sparc). It is made from
-following parts:
-</para>
-
-<variablelist>
-
-<varlistentry>
-<term>Linux kernel</term>
-
-<listitem>
-<para>
-	The Linux image, usually named <filename>vmlinuz*</filename>.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Initial RAM disk image (initrd)</term>
-
-<listitem>
-<para>
-	RAM disk setup for the Linux boot, containing modules possibly needed to
-mount the filesystem's image and some scripts to do it.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>System image</term>
-
-<listitem>
-<para>
-	The OS filesystem image. Debian Live uses SquashFS, a compressed filesystem,
+following parts: </para>
+    <variablelist>
+      <varlistentry>
+        <term>Linux kernel</term>
+        <listitem>
+          <para> The Linux image, usually named <filename>vmlinuz*</filename>. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Initial RAM disk image (initrd)</term>
+        <listitem>
+          <para> RAM disk setup for the Linux boot, containing modules possibly needed to
+mount the filesystem's image and some scripts to do it. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>System image</term>
+        <listitem>
+          <para> The OS filesystem image. Debian Live uses SquashFS, a compressed filesystem,
 to minimize its image size. Note that it's read-only. So, during boot the
 Debian Live system will use a RAM disk and 'union' mechanism to enable
 writing files within the running system. However, all modifications will be
 lost upon shutdown unless optional persistence partition(s) are used. (See
-<xref linkend="persistence" />.)
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Bootloader</term>
-
-<listitem>
-<para>
-	A small piece of code, crafted to boot up from the chosen media, possibly
+<xref linkend="persistence"/>.) </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Bootloader</term>
+        <listitem>
+          <para> A small piece of code, crafted to boot up from the chosen media, possibly
 presenting a prompt or menu to allow selection of options/configuration. It
 then loads the Linux kernel and its initrd to run with an associated
 filesystem image. Different solutions can be used depending on the target
 media and format of the filesystem containing the previous components:
 Isolinux to boot from a CD or DVD in ISO9660 format, syslinux for HDD or USB
 drive booting from a VFAT partition, GRUB for ext2/3 partition, pxelinux for
-PXE netboot, etc.
-</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-
-<para>
-	The Debian Live tools will build the system image from your specifications,
+PXE netboot, etc. </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <para> The Debian Live tools will build the system image from your specifications,
 setup a Linux kernel and its initrd, a bootloader to run them, all in one
-media-dependant format(ISO9660 image, disk image, etc.)
-</para>
-
-</section>
-
-<section>
-<title>First steps: building an ISO image</title>
-
-<para>
-	The following sequence of helper commands, provided by &live-helper;, will
+media-dependant format(ISO9660 image, disk image, etc.) </para>
+  </section>
+  <section>
+    <title>First steps: building an ISO image</title>
+    <para> The following sequence of helper commands, provided by &live-helper;, will
 create a basic ISO image containing just the Debian standard system without
-X.org. It is suitable for burning to CD or DVD media.
-</para>
-
-<para>
-	First, we run the <filename>lh config</filename> helper command which will
+X.org. It is suitable for burning to CD or DVD media. </para>
+    <para> First, we run the <filename>lh config</filename> helper command which will
 create a <filename>"config/"</filename> hierarchy in the current directory
-for use by other helper commands:
-</para>
-
-<para>
-	<screen>$ lh config</screen>
-</para>
-
-<para>
-	By passing no parameters to <filename>lh config</filename> we indicated that
+for use by other helper commands: </para>
+    <para>
+      <screen>$ lh config</screen>
+    </para>
+    <para> By passing no parameters to <filename>lh config</filename> we indicated that
 we wish to use the defaults. This will create an image of type binary (see
-<xref linkend="lh-config" />).
-</para>
-
-<para>
-	Now that we have a <filename>"config/"</filename> hierarchy, we may build
-the image with the <filename>lh build</filename> helper command:
-</para>
-
-<para>
-	<screen># lh build</screen>
-</para>
-
-<para>
-	This process can take a while, depending on the speed of your network
-connection (see <xref linkend="lh-build" />).
-</para>
-
-<section>
-<title>Testing an ISO image with Qemu</title>
-
-<para>
-	Testing an ISO is simple:
-</para>
-
-<para>
-	<screen># apt-get install qemu
-$ qemu -cdrom binary.iso</screen>
-</para>
-
-</section>
-
-<section>
-<title>Testing an ISO image with virtualbox-ose</title>
-
-<para>
-	In order to test the ISO with virtualbox-ose:
-</para>
-
-<para>
-	<screen># apt-get install virtualbox-ose</screen>
-</para>
-and either install 
-<itemizedlist>
-<listitem><para>the modules package for a stock kernel eg
-virtualbox-ose-modules-2.6.26-1-486 or</para></listitem>
-<listitem><para>the modules package compiled for your kernel using module-assistant from the
-package virtualbox-ose-source </para></listitem>
-</itemizedlist>
-<para> Run Virtualbox:</para>
-For example, in Gnome
-<para>  {{{Applications -> System Tools -> VirtualBox OSE }}}</para>
-
-<para>Create a virtual machine from your Live ISO</para>
-
-<para>To create a virtual machine "mylive" from A CDROM ISO "binary.iso" in
-VirtualBox:</para>
-<para>  {{{Machine -> New }}}</para>
-<para>In the Wizard: FIXME </para>
-</section>
-
-<section>
-<title>Testing an ISO image with VMware Workstation</title>
-
-<para>In order to test the ISO with VMware Workstation:</para>
-
-<para> Run VMware Workstation:</para>
-<para>Click on Edit virtual machine settings in the VM summary page. </para>
-<para>Then, click on the CD-ROM device and select Use ISO image. Remeber to
+<xref linkend="lh-config"/>). </para>
+    <para> Now that we have a <filename>"config/"</filename> hierarchy, we may build
+the image with the <filename>lh build</filename> helper command: </para>
+    <para>
+      <screen># lh build</screen>
+    </para>
+    <para> This process can take a while, depending on the speed of your network
+connection (see <xref linkend="lh-build"/>). </para>
+    <section>
+      <title>Testing an ISO image with Qemu</title>
+      <para> Testing an ISO is simple: </para>
+      <para>
+        <screen># apt-get install qemu $ qemu -cdrom binary.iso</screen>
+      </para>
+    </section>
+    <section><title>Testing an ISO image with virtualbox-ose</title><para> In order to test the ISO with virtualbox-ose: </para><para><screen># apt-get install virtualbox-ose</screen></para> and either install <itemizedlist><listitem><para>the modules package for a stock kernel eg
+virtualbox-ose-modules-2.6.26-1-486 or</para></listitem><listitem><para>the modules package compiled for your kernel using module-assistant from the
+package virtualbox-ose-source </para></listitem></itemizedlist> <para> Run Virtualbox:</para> For example, in Gnome <para> {{{Applications -&gt; System Tools -&gt; VirtualBox OSE }}}</para> <para>Create a virtual machine from your Live ISO</para> <para>To create a virtual machine "mylive" from A CDROM ISO "binary.iso" in
+VirtualBox:</para> <para> {{{Machine -&gt; New }}}</para> <para>In the Wizard: FIXME </para> </section>
+    <section>
+      <title>Testing an ISO image with VMware Workstation</title>
+      <para>In order to test the ISO with VMware Workstation:</para>
+      <para> Run VMware Workstation:</para>
+      <para>Click on Edit virtual machine settings in the VM summary page. </para>
+      <para>Then, click on the CD-ROM device and select Use ISO image. Remeber to
 connect the CD-ROM device at power on and remeber to adjust the boot order
 in the bios.</para>
-</section>
-
-<section>
-<title>Burning an ISO image to a physical medium</title>
-
-<para>
-	Burning an ISO image is easy:
-</para>
-
-<para>
-	<screen># apt-get install wodim
-$ wodim binary.iso</screen>
-</para>
-
-</section>
-
-</section>
-
-<section>
-<title>Building an USB/HDD image</title>
-
-<para>
-	The following sequence of helper commands will create a basic USB/HDD image
+    </section>
+    <section>
+      <title>Burning an ISO image to a physical medium</title>
+      <para> Burning an ISO image is easy: </para>
+      <para>
+        <screen># apt-get install wodim $ wodim binary.iso</screen>
+      </para>
+    </section>
+  </section>
+  <section>
+    <title>Building an USB/HDD image</title>
+    <para> The following sequence of helper commands will create a basic USB/HDD image
 containing just the Debian standard system without X.org. It is suitable for
 booting from USB sticks, USB hard drives, and various other portable storage
-devices.
-</para>
-
-<para>
-	Note if you created an iso image with the previous example, you will need to
+devices. </para>
+    <para> Note if you created an iso image with the previous example, you will need to
 clean up your working directory with the <filename>lh clean</filename>
-helper command (see <xref linkend="lh-clean" />):
-</para>
-
-<para>
-	<screen>$ lh clean --binary</screen>
-</para>
-
-<para>
-	Run the <filename>lh config</filename> helper command with the parameters to
+helper command (see <xref linkend="lh-clean"/>): </para>
+    <para>
+      <screen>$ lh clean --binary</screen>
+    </para>
+    <para> Run the <filename>lh config</filename> helper command with the parameters to
 configure the <filename>"config/"</filename> hierarchy to create a USB/HDD
-image type:
-</para>
-
-<para>
-	<screen>$ lh config -b usb-hdd</screen>
-</para>
-
-<para>
-	Now build the image with the <filename>lh build</filename> helper command:
-</para>
-
-<para>
-	<screen># lh build</screen>
-</para>
-
-<section  id="image_copying">
-<title>Copying USB/HDD image to a USB stick</title>
-
-<para>
-	The generated binary image contains a <acronym>VFAT</acronym> partition and
+image type: </para>
+    <para>
+      <screen>$ lh config -b usb-hdd</screen>
+    </para>
+    <para> Now build the image with the <filename>lh build</filename> helper command: </para>
+    <para>
+      <screen># lh build</screen>
+    </para>
+    <section id="image_copying">
+      <title>Copying USB/HDD image to a USB stick</title>
+      <para> The generated binary image contains a <acronym>VFAT</acronym> partition and
 the <command>syslinux</command> bootloader, ready to be directly written on
 an USB stick. Plug in an USB stick with a size larger than that of
-<filename>binary.img</filename> and type:
-</para>
-
-<para>
-	<screen>$ dd if=binary.img of=${USBSTICK}</screen>
-</para>
-
-<para>
-	where <replaceable>${USBSTICK}</replaceable> is the device file of your key,
+<filename>binary.img</filename> and type: </para>
+      <para>
+        <screen>$ dd if=binary.img of=${USBSTICK}</screen>
+      </para>
+      <para> where <replaceable>${USBSTICK}</replaceable> is the device file of your key,
 like <filename>/dev/sdb</filename> (not a partition like
 <filename>/dev/sdb1</filename>!); you can find the right device name by
 looking in <command>dmesg</command>'s output after plugging in the stick,
-for example.
-</para>
-
-<para>
-	<important>This will definitely overwrite any previous contents on your
-	stick!</important>
-</para>
-
-</section>
-
-<section>
-<title>Testing a USB/HDD image with Qemu</title>
-
-<para>
-	<screen># apt-get install qemu
-$ qemu -hda binary.img</screen>
-</para>
-
-</section>
-<section>
-<title>Testing an USB/HDD image with VMware Workstation</title>
-
-<para>
-	In order to test the USB/HDD image with VMware Workstation:
-</para>
-
-<para> Run VMware Workstation:</para>
-<para>Write the image to an usb stick. In VMware, click on Edit virtual machine
+for example. </para>
+      <para>
+        <important>This will definitely overwrite any previous contents on your stick!</important>
+      </para>
+    </section>
+    <section>
+      <title>Testing a USB/HDD image with Qemu</title>
+      <para>
+        <screen># apt-get install qemu $ qemu -hda binary.img</screen>
+      </para>
+    </section>
+    <section>
+      <title>Testing an USB/HDD image with VMware Workstation</title>
+      <para> In order to test the USB/HDD image with VMware Workstation: </para>
+      <para> Run VMware Workstation:</para>
+      <para>Write the image to an usb stick. In VMware, click on Edit virtual machine
 settings in VM summary page. Then, add a new physical harddisk device and
 enter the device node of your usb stick.</para>
-</section>
-
-<section>
-<title>Using the space left on a USB stick</title>
-
-<para>
-	If you want to use the remaining free space after you have installed the
+    </section>
+    <section>
+      <title>Using the space left on a USB stick</title>
+      <para> If you want to use the remaining free space after you have installed the
 <filename>binary.img</filename>, you can use a partitioning tool such as
 gparted or parted to create a new partition on the stick. The first
-partition will be used by the Debian Live system.
-</para>
-
-<para>
-	<screen># gparted ${USBSTICK}</screen>
-</para>
-
-<para>
-	After the creation of the partition you have to create a filsystem on
+partition will be used by the Debian Live system. </para>
+      <para>
+        <screen># gparted ${USBSTICK}</screen>
+      </para>
+      <para> After the creation of the partition you have to create a filsystem on
 it. One possible choice would be ext2 (ext3 isn't recommended because the
-journaling causes too many writes to the stick).
-</para>
-
-<para>
-	<screen># mkfs.ext2 ${USBSTICK}</screen>
-</para>
-
-<para>
-	If you want to use this data partition with Windows, use FAT32.
-</para>
-
-<para>
-	<screen># mkfs.vfat -F 32</screen>
-</para>
-
-<para>
-	<important>Remember: Every time you install a new binary.img on the
-	stick, all your data will be lost because the image includes a complete
-	partition table.</important>
-</para>
-
-<para>
-	FIXME: Describe installing Debian Live to a partition (e.g. /dev/sdc1)  AND
-using a bootloader to boot this.
-</para>
-
-</section>
-
-</section>
-
-<section>
-<title>Building a netboot image</title>
-
-<para>
-	The following sequence of helper commands will create a basic netboot image
+journaling causes too many writes to the stick). </para>
+      <para>
+        <screen># mkfs.ext2 ${USBSTICK}</screen>
+      </para>
+      <para> If you want to use this data partition with Windows, use FAT32. </para>
+      <para>
+        <screen># mkfs.vfat -F 32</screen>
+      </para>
+      <para>
+        <important>Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.</important>
+      </para>
+      <para> FIXME: Describe installing Debian Live to a partition (e.g. /dev/sdc1) AND
+using a bootloader to boot this. </para>
+    </section>
+  </section>
+  <section>
+    <title>Building a netboot image</title>
+    <para> The following sequence of helper commands will create a basic netboot image
 containing the Debian standard system without X.org. It is suitable for
-booting over the network.
-</para>
-
-<para>
-	Note if you performed any previous examples, you will need to clean up your
-working directory with the <filename>lh clean</filename> helper command:
-</para>
-
-<para>
-	<screen>$ lh clean --binary</screen>
-</para>
-
-<para>
-	Run the <filename>lh config</filename> helper command with the parameters to
+booting over the network. </para>
+    <para> Note if you performed any previous examples, you will need to clean up your
+working directory with the <filename>lh clean</filename> helper command: </para>
+    <para>
+      <screen>$ lh clean --binary</screen>
+    </para>
+    <para> Run the <filename>lh config</filename> helper command with the parameters to
 configure the <filename>"config/"</filename> hierarchy to create our netboot
-image:
-</para>
-
-<para>
-	<screen>$ lh config -b net --net-root-path "/srv/debian-live" --net-root-server "192.168.0.1"</screen>
-</para>
-
-<para>
-	In contrast with the ISO and USB hdd images, netbooting does not support
+image: </para>
+    <para>
+      <screen>$ lh config -b net --net-root-path "/srv/debian-live" --net-root-server "192.168.0.1"</screen>
+    </para>
+    <para> In contrast with the ISO and USB hdd images, netbooting does not support
 serving a filesystem image with the client so the files must be served via
 NFS. The <replaceable>net-root-path</replaceable> and
 <replaceable>net-root-server</replaceable> options specify the location and
 server, respectively, of the NFS server where the filesytem image will be
-located at boot-time.
-</para>
-
-<para>
-	Now build the image with the <filename>lh build</filename> helper command:
-</para>
-
-<para>
-	<screen># lh build</screen>
-</para>
-
-<para>
-	In a network boot the client runs a small piece of software, which usually
-resides on the <acronym>EEPROM</acronym> of the Ethernet card.  This program
+located at boot-time. </para>
+    <para> Now build the image with the <filename>lh build</filename> helper command: </para>
+    <para>
+      <screen># lh build</screen>
+    </para>
+    <para> In a network boot the client runs a small piece of software, which usually
+resides on the <acronym>EEPROM</acronym> of the Ethernet card. This program
 sends a <abbrev>DHCP</abbrev> request to get an <abbrev>IP</abbrev> address
-and information about what to do next.  Typically the next step is getting a
+and information about what to do next. Typically the next step is getting a
 higher level boot loader via the <abbrev>TFTP</abbrev> protocol. That could
 be <application>Grub</application>, <application>PXELINUX</application>, or
 even boot directly to an operating system like
-<application>Linux</application>.
-</para>
-
-<para>
-	For example, if you unpack the generated
+<application>Linux</application>. </para>
+    <para> For example, if you unpack the generated
 <filename>binary-net.tar.gz</filename> archive in the
 <filename>/srv/debian-live</filename> directory, you'll find the filesystem
 image in <filename>live/filesystem.squashfs</filename> and the kernel,
 initrd and PXE Linux bootloader in
-<filename>tftpboot/debian-live/i386</filename>.
-</para>
-
-<para>
-	We must now configure three services on the server to enable netboot:
-</para>
-
-<variablelist>
-
-<varlistentry>
-<term>DHCP server</term>
-
-<listitem>
-<para>
-	We must configure our network's DHCP server to be sure to give an
+<filename>tftpboot/debian-live/i386</filename>. </para>
+    <para> We must now configure three services on the server to enable netboot: </para>
+    <variablelist>
+      <varlistentry>
+        <term>DHCP server</term>
+        <listitem>
+          <para> We must configure our network's DHCP server to be sure to give an
 <abbrev>IP</abbrev> address to the computer netbooting, and to advertise the
-location of the PXE bootloader.
-</para>
-
-<para>
-	Here is an example for inspiration, written for the ISC DHCP server (package
+location of the PXE bootloader. </para>
+          <para> Here is an example for inspiration, written for the ISC DHCP server (package
 <literal>dhcp3-server</literal>) in the
-<filename>/etc/dhcp3/dhcpd.conf</filename> configuration file:
-</para>
-
-<para>
-	<screen># Options DHCP spécifiques à Pxelinux:
-option space pxelinux;
-option pxelinux.magic      code 208 = string;
-option pxelinux.configfile code 209 = text;
-option pxelinux.pathprefix code 210 = text;
-option pxelinux.reboottime code 211 = unsigned integer 32;
-
-
-subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
-
-  # IP addresses available for guests
-  range 192.168.1.100 192.168.1.149;
-
-  # allow booting from the net
-  allow bootp;
-
-  # for net booting, server where the first file to be loaded (by TFTP
-  # protocol) ("filename" following definition) lies : so the TFTP
-  # server's name.
-  next-server myserver;
-
-  # net boot configuration for guests with a PXE client :
-  if substring (option vendor-class-identifier, 0, 9) = "PXEClient" {
-    # Note : all files for PXE are relatives to the TFTP server's root
-    # path, as usually defined in /etc/inetd.conf.
-
-    # PXE boot loader (first program to be loaded, by TFTP)
-    filename "pxelinux.0";
-
-    # describe some specific pxelinux's options through DHCP options :
-    site-option-space "pxelinux";
-    option pxelinux.magic f1:00:74:7e;
-    if exists dhcp-parameter-request-list {
-      # Always send the PXELINUX options (specified in hexadecimal)
-      option dhcp-parameter-request-list = concat(option dhcp-parameter-request-list,d0,d1,d2,d3);
-    }
-
-    # For a PXE boot menu, different versions are available : simple
-    # text, text with curses, graphic (VESA)
-    #option pxelinux.configfile "pxelinux/config_simple";
-    #option pxelinux.configfile "pxelinux/config_curses";
-    option pxelinux.configfile "pxelinux/config_vesa";
-
-    # automatically reboot after 10 minutes of no activity
-    option pxelinux.reboottime 600;
-  }
-}</screen>
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>TFTPd server</term>
-
-<listitem>
-<para>
-	This serves the kernel and initial ramdisk to the system at run-time.
-</para>
-
-<para>
-	You should install the <command>tftpd-hpa</command> package. It can serve
+<filename>/etc/dhcp3/dhcpd.conf</filename> configuration file: </para>
+          <para>
+            <screen># Options DHCP spécifiques à Pxelinux: option space pxelinux; option pxelinux.magic code 208 = string; option pxelinux.configfile code 209 = text; option pxelinux.pathprefix code 210 = text; option pxelinux.reboottime code 211 = unsigned integer 32; subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24 # IP addresses available for guests range 192.168.1.100 192.168.1.149; # allow booting from the net allow bootp; # for net booting, server where the first file to be loaded (by TFTP # protocol) ("filename" following definition) lies : so the TFTP # server's name. next-server myserver; # net boot configuration for guests with a PXE client : if substring (option vendor-class-identifier, 0, 9) = "PXEClient" { # Note : all files for PXE are relatives to the TFTP server's root # path, as usually defined in /etc/inetd.conf. # PXE boot loader (first program to be loaded, by TFTP) filename "pxelinux.0"; # describe some specific pxelinux's options through
  DHCP options : site-option-space "pxelinux"; option pxelinux.magic f1:00:74:7e; if exists dhcp-parameter-request-list { # Always send the PXELINUX options (specified in hexadecimal) option dhcp-parameter-request-list = concat(option dhcp-parameter-request-list,d0,d1,d2,d3); } # For a PXE boot menu, different versions are available : simple # text, text with curses, graphic (VESA) #option pxelinux.configfile "pxelinux/config_simple"; #option pxelinux.configfile "pxelinux/config_curses"; option pxelinux.configfile "pxelinux/config_vesa"; # automatically reboot after 10 minutes of no activity option pxelinux.reboottime 600; } }</screen>
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>TFTPd server</term>
+        <listitem>
+          <para> This serves the kernel and initial ramdisk to the system at run-time. </para>
+          <para> You should install the <command>tftpd-hpa</command> package. It can serve
 all files contained inside a root directory, usually
 <filename>/var/lib/tftpboot/</filename>, as defined with its
 <option>-s</option> option. To let it serve files inside
 <filename>/srv/debian-live/tftpboot</filename>, modify its start definition
-in <filename>/etc/inetd.conf</filename> with:
-</para>
-
-<para>
-	<screen>tftp           dgram   udp     wait    root  /usr/sbin/in.tftpd /usr/sbin/in.tftpd -s /srv/debian-live/tftpboot -r blksize -v -v</screen>
-</para>
-
-<para>
-	and reload the super server with <command>/etc/init.d/openbsd-inetd
-reload</command>.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>NFS server</term>
-
-<listitem>
-<para>
-	Once the guest computer has downloaded and booted a Linux kernel and loaded
+in <filename>/etc/inetd.conf</filename> with: </para>
+          <para>
+            <screen>tftp dgram udp wait root /usr/sbin/in.tftpd /usr/sbin/in.tftpd -s /srv/debian-live/tftpboot -r blksize -v -v</screen>
+          </para>
+          <para> and reload the super server with <command>/etc/init.d/openbsd-inetd
+reload</command>. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>NFS server</term>
+        <listitem>
+          <para> Once the guest computer has downloaded and booted a Linux kernel and loaded
 its initrd, it will try to mount the Live filesystem image through a NFS
-server.
-</para>
-
-<para>
-	You should install the <command>nfs-kernel-server</command> package --
-<command>nfs-user-server</command> does not function correctly with netboot.
-</para>
-
-<para>
-	Then, make the filesystem image available through NFS by adding a line like
-the following to <filename>/etc/exports</filename>:
-</para>
-
-<para>
-	<screen>/srv/debian-live *(ro,async,subtree_check,no_root_squash)</screen>
-</para>
-
-<para>
-	and tell the NFS server about this new export with the following command:
-</para>
-
-<para>
-	<screen># exportfs -rv</screen>
-</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-
-<para>
-	Setting up these three services can be a little tricky. You might need some
+server. </para>
+          <para> You should install the <command>nfs-kernel-server</command> package --
+<command>nfs-user-server</command> does not function correctly with netboot. </para>
+          <para> Then, make the filesystem image available through NFS by adding a line like
+the following to <filename>/etc/exports</filename>: </para>
+          <para>
+            <screen>/srv/debian-live *(ro,async,subtree_check,no_root_squash)</screen>
+          </para>
+          <para> and tell the NFS server about this new export with the following command: </para>
+          <para>
+            <screen># exportfs -rv</screen>
+          </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <para> Setting up these three services can be a little tricky. You might need some
 patience to get all of them working together. The Debian Installer Manual's
-<ulink url="http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html" >TFTP
-Net Booting</ulink> section might help as that process is very similar.
-</para>
-
-</section>
-
-<section>
-<title> Netboot testing HowTo </title>
-
-<para>
-	Netboot image creation is made easy with live-helper magic, but testing the
-images on physical machines can be really time consuming.
-</para>
-
-<para>
-	To make our life easier, we can use virtualization. There are two solutions:
-</para>
-
-<variablelist>
-
-<varlistentry>
-<term>VMWare Player</term>
-
-<listitem>
-<para>
-	Install VMWare Player ("free as in beer" edition)
-</para>
-
-<para>
-	Create a PXETester directory, and create a text file called pxe.vwx inside
-</para>
-
-<para>
-	Paste this text inside:
-</para>
-
-<para>
-	<screen>#!/usr/bin/vmware
-config.version = "8"
-virtualHW.version = "4"
-memsize = "512"
-MemAllowAutoScaleDown = "FALSE"
-
-ide0:0.present = "FALSE"
-ide1:0.present = "FALSE"
-floppy0.present = "FALSE"
-sound.present = "FALSE"
-tools.remindInstall = "FALSE"
-
-ethernet0.present = "TRUE"
-ethernet0.addressType = "generated"
-
-displayName = "Test Boot PXE"
-guestOS = "other"
-
-ethernet0.generatedAddress = "00:0c:29:8d:71:3b"
-uuid.location = "56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b"
-uuid.bios = "56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b"
-ethernet0.generatedAddressOffset = "0"</screen>
-</para>
-
-<para>
-	You can play with this configuration file (i.e. change memory limit to 256)
-</para>
-
-<para>
-	Double click on this file (or run VMWare player and selecet this file).
-</para>
-
-<para>
-	When running just press space if that strange question comes up...
-</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-
-<variablelist>
-
-<varlistentry>
-<term>Qemu</term>
-
-<listitem>
-<para>
-	Install qemu, bridge-utils, sudo.
-</para>
-
-<para>
-	Edit <filename>/etc/qemu-ifup</filename>:
-</para>
-
-<para>
-	<screen>#!/bin/sh
-sudo -p "Password for $0:" /sbin/ifconfig $1 172.20.0.1
-echo "Executing /etc/qemu-ifup"
-echo "Bringing up $1 for bridged mode..."
-sudo /sbin/ifconfig $1 0.0.0.0 promisc up
-echo "Adding $1 to br0..."
-sudo /usr/sbin/brctl addif br0 $1
-sleep 2</screen>
-</para>
-
-<para>
-	Get, or build a grub-floppy-netboot (in the svn).
-</para>
-
-<para>
-	Launch qemu with "-net nic,vlan=0 -net tap,vlan=0,ifname=tun0"
-</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-
-</section>
-
+<ulink url="http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html">TFTP
+Net Booting</ulink> section might help as that process is very similar. </para>
+  </section>
+  <section>
+    <title> Netboot testing HowTo </title>
+    <para> Netboot image creation is made easy with live-helper magic, but testing the
+images on physical machines can be really time consuming. </para>
+    <para> To make our life easier, we can use virtualization. There are two solutions: </para>
+    <variablelist>
+      <varlistentry>
+        <term>VMWare Player</term>
+        <listitem>
+          <para> Install VMWare Player ("free as in beer" edition) </para>
+          <para> Create a PXETester directory, and create a text file called pxe.vwx inside </para>
+          <para> Paste this text inside: </para>
+          <para>
+            <screen>#!/usr/bin/vmware config.version = "8" virtualHW.version = "4" memsize = "512" MemAllowAutoScaleDown = "FALSE" ide0:0.present = "FALSE" ide1:0.present = "FALSE" floppy0.present = "FALSE" sound.present = "FALSE" tools.remindInstall = "FALSE" ethernet0.present = "TRUE" ethernet0.addressType = "generated" displayName = "Test Boot PXE" guestOS = "other" ethernet0.generatedAddress = "00:0c:29:8d:71:3b" uuid.location = "56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b" uuid.bios = "56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b" ethernet0.generatedAddressOffset = "0"</screen>
+          </para>
+          <para> You can play with this configuration file (i.e. change memory limit to 256) </para>
+          <para> Double click on this file (or run VMWare player and selecet this file). </para>
+          <para> When running just press space if that strange question comes up... </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <variablelist>
+      <varlistentry>
+        <term>Qemu</term>
+        <listitem>
+          <para> Install qemu, bridge-utils, sudo. </para>
+          <para> Edit <filename>/etc/qemu-ifup</filename>: </para>
+          <para>
+            <screen>#!/bin/sh sudo -p "Password for $0:" /sbin/ifconfig $1 172.20.0.1 echo "Executing /etc/qemu-ifup" echo "Bringing up $1 for bridged mode..." sudo /sbin/ifconfig $1 0.0.0.0 promisc up echo "Adding $1 to br0..." sudo /usr/sbin/brctl addif br0 $1 sleep 2</screen>
+          </para>
+          <para> Get, or build a grub-floppy-netboot (in the svn). </para>
+          <para> Launch qemu with "-net nic,vlan=0 -net tap,vlan=0,ifname=tun0" </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </section>
 </chapter>
diff --git a/manual/de/coding-style.xml b/manual/de/coding-style.xml
index d3e4e96..eea7357 100644
--- a/manual/de/coding-style.xml
+++ b/manual/de/coding-style.xml
@@ -1,126 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <chapter id="coding-style">
-<title>Coding Style</title>
-
-<para>This chapter documents the coding style used in &live-helper; and (ideally)
+  <title>Coding Style</title>
+  <para>This chapter documents the coding style used in &live-helper; and (ideally)
 in &live-initramfs;.</para>
-
-<sect1 id="compatibilty">
-<title>Compatibility</title>
-
-<itemizedlist>
-	<listitem>Don't use syntax or semantics that are unique to the Bash shell. For example, the use of array constructs.</listitem>
-	<listitem>Only use the POSIX subset - for example, use $(foo) over `foo`.</listitem>
-	<listitem>You can check your scripts with 'sh -n' and 'checkbashisms'</listitem>
-</itemizedlist>
-</sect1>
-
-<sect1 id="indenting">
-<title>Indenting</title>
-
-<itemizedlist>
-	<listitem>Always use tabs over spaces.</listitem>
-</itemizedlist>
-
-</sect1>
-
-<sect1 id="wrapping">
-<title>Wrapping</title>
-
-<itemizedlist>
-	<listitem>Generally, lines are 80 chars at maximum.</listitem>
-
-	<listitem>Use the "Linux style" of line breaks:
-
-	<para>Bad: <screen>
-if foo; then
-	bar
-fi
-</screen>
-
-	</para>
-	<para>Good: <screen>
-if foo
-then
-	bar
-fi
-</screen>
-	</para></listitem>
-
-	<listitem>The same holds for functions:
-
-	<para>Bad: <screen>
-foo () {
-	bar
-}
-</screen>
-	</para>
-	<para>Good: <screen>
-foo ()
-{
-	bar
-}
-</screen>
-	</para></listitem>
-</itemizedlist>
-
-</sect1>
-
-<sect1 id="variables">
-<title>Variables</title>
-
-<itemizedlist>
-	<listitem>Variables are always in capital letters.</listitem>
-	<listitem>Variables that used in config always start with LH_ prefix.</listitem>
-	<listitem>Internal temporary variables should start with the _LH_ prefix.</listitem>
-	<listitem>Local variables start with __LH_ prefix.</listitem>
-	<listitem>Use braces around variables; eg. write ${FOO} instead of $FOO.</listitem>
-	<listitem>Always protect variables with respect to potential whitespaces, write "${FOO}" not ${FOO}.</listitem>
-	<listitem>For consistency reasons, always use quotes when assigning values to variables:
-
-	<para>Bad: <screen>
-FOO=bar
-</screen>
-	</para>
-	<para>Good: <screen>
-FOO="bar"
-</screen>
-
-	</para></listitem>
-
-	<listitem>If multiple variables are used, quote the full expression:
-
-	<para>Bad: <screen>
-if [ -f "${FOO}"/foo/"${BAR}"/bar ]
-then
-	foobar
-fi
-</screen>
-	</para>
-	<para>Good: <screen>
-if [ -f "${FOO}/foo/${BAR}/bar" ]
-then
-	foobar
-fi
-</screen>
-	</para></listitem>
-</itemizedlist>
-
-</sect1>
-
-<sect1 id="misc">
-<title>Miscellaneous</title>
-
-<itemizedlist>
-	<listitem>Use "|" (without the surround quotes) as a seperator in calls to sed, e.g. "sed -e 's|foo|bar|'" (without "").</listitem>
-	<listitem>Don't use the test command for comparisons or tests, use "[" "]" (without ""), e.g. "if [ -x /bin/foo ]; ..." and not "if test -x /bin/foo; ...".</listitem>
-
-</itemizedlist>
-
-</sect1>
-
+  <sect1 id="compatibilty">
+    <title>Compatibility</title>
+    <itemizedlist>
+      <listitem>Don't use syntax or semantics that are unique to the Bash shell. For example, the use of array constructs.</listitem>
+      <listitem>Only use the POSIX subset - for example, use $(foo) over `foo`.</listitem>
+      <listitem>You can check your scripts with 'sh -n' and 'checkbashisms'</listitem>
+    </itemizedlist>
+  </sect1>
+  <sect1 id="indenting">
+    <title>Indenting</title>
+    <itemizedlist>
+      <listitem>Always use tabs over spaces.</listitem>
+    </itemizedlist>
+  </sect1>
+  <sect1 id="wrapping">
+    <title>Wrapping</title>
+    <itemizedlist>
+      <listitem>Generally, lines are 80 chars at maximum.</listitem>
+      <listitem>Use the "Linux style" of line breaks: <para>Bad: <screen> if foo; then bar fi </screen> </para> <para>Good: <screen> if foo then bar fi </screen> </para></listitem>
+      <listitem>The same holds for functions: <para>Bad: <screen> foo () { bar } </screen> </para> <para>Good: <screen> foo () { bar } </screen> </para></listitem>
+    </itemizedlist>
+  </sect1>
+  <sect1 id="variables">
+    <title>Variables</title>
+    <itemizedlist>
+      <listitem>Variables are always in capital letters.</listitem>
+      <listitem>Variables that used in config always start with LH_ prefix.</listitem>
+      <listitem>Internal temporary variables should start with the _LH_ prefix.</listitem>
+      <listitem>Local variables start with __LH_ prefix.</listitem>
+      <listitem>Use braces around variables; eg. write ${FOO} instead of $FOO.</listitem>
+      <listitem>Always protect variables with respect to potential whitespaces, write "${FOO}" not ${FOO}.</listitem>
+      <listitem>For consistency reasons, always use quotes when assigning values to variables: <para>Bad: <screen> FOO=bar </screen> </para> <para>Good: <screen> FOO="bar" </screen> </para></listitem>
+      <listitem>If multiple variables are used, quote the full expression: <para>Bad: <screen> if [ -f "${FOO}"/foo/"${BAR}"/bar ] then foobar fi </screen> </para> <para>Good: <screen> if [ -f "${FOO}/foo/${BAR}/bar" ] then foobar fi </screen> </para></listitem>
+    </itemizedlist>
+  </sect1>
+  <sect1 id="misc">
+    <title>Miscellaneous</title>
+    <itemizedlist>
+      <listitem>Use "|" (without the surround quotes) as a seperator in calls to sed, e.g. "sed -e 's|foo|bar|'" (without "").</listitem>
+      <listitem>Don't use the test command for comparisons or tests, use "[" "]" (without ""), e.g. "if [ -x /bin/foo ]; ..." and not "if test -x /bin/foo; ...".</listitem>
+    </itemizedlist>
+  </sect1>
 </chapter>
diff --git a/manual/de/common-tasks.xml b/manual/de/common-tasks.xml
index 782c47a..198b755 100644
--- a/manual/de/common-tasks.xml
+++ b/manual/de/common-tasks.xml
@@ -1,129 +1,77 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <chapter id="common-tasks">
-<title>Common tasks</title>
-
-<section id="debian-installer">
-<title>The Debian Installer</title>
- <para>
-  Although Debian Live is mostly concerned with avoiding permanent
+  <title>Common tasks</title>
+  <section id="debian-installer">
+    <title>The Debian Installer</title>
+    <para> Although Debian Live is mostly concerned with avoiding permanent
 installation, integrating some form of installer to your image is
 possible. There are number of different "types" of installation, varying in
-what and how to install the image.
- </para>
-
- <note>
-  <title>
-   The "Debian Installer"
-  </title>
-  <para>
-   Please note the careful use of capital letters when referring to the "Debian
+what and how to install the image. </para>
+    <note>
+      <title> The "Debian Installer" </title>
+      <para> Please note the careful use of capital letters when referring to the "Debian
 Installer" in this section - when used like this we refer explicitly to the
 official installer for the Debian system, not anything else. It is often
-seen abbreviated to "d-i".
-  </para>
- </note>
- <para>
-  The three main types of installer are:
- </para>
- <variablelist>
-  <varlistentry>
-   <term>
-    "Normal" Debian Installer
-   </term>
-   <listitem>
-    <para>
-     This is a normal Debian Live image with a seperate kernel and initrd which
+seen abbreviated to "d-i". </para>
+    </note>
+    <para> The three main types of installer are: </para>
+    <variablelist>
+      <varlistentry>
+        <term> "Normal" Debian Installer </term>
+        <listitem>
+          <para> This is a normal Debian Live image with a seperate kernel and initrd which
 (when selected from the appropriate bootloader) launches into a standard
 Debian Installer instance, just as if you had downloaded a CD image of
-Debian and booted it.
-    </para>
-    <para>
-     This means that Debian is installed by fetching and installing
+Debian and booted it. </para>
+          <para> This means that Debian is installed by fetching and installing
 <command>.deb</command> packages using <filename>debootstrap</filename> or
 <filename>cdebootstrap</filename>, from the local media or some network-base
 network, resulting in a standard Debian system being installed to the hard
-disk.
-    </para>
-    <para>
-     This whole process can be preseeded and customised in a number of ways; see
+disk. </para>
+          <para> This whole process can be preseeded and customised in a number of ways; see
 the relevant "DebianInstaller" wiki page and installation guide for
-more. This is operational now withing &live-helper;.
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term>
-    "Live" Debian Installer
-   </term>
-   <listitem>
-    <para>
-     This is a Debian Live image with a seperate kernel and initrd which (when
+more. This is operational now withing &live-helper;. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term> "Live" Debian Installer </term>
+        <listitem>
+          <para> This is a Debian Live image with a seperate kernel and initrd which (when
 selected from the appropriate bootloader) launches into an instance of the
-Debian Installer.
-    </para>
-    <para>
-     Installation will proceed in an identical fashion to the "Normal"
+Debian Installer. </para>
+          <para> Installation will proceed in an identical fashion to the "Normal"
 installation described above, but at the actual package installation stage,
 instead of using <filename>debootstrap</filename> to fetch and install
 packages, the "live" filesystem image is copied to the target. After this
 stage, the Debian Installer continues as normal, installing and configuring
-items such as bootloaders and local users, etc.
-    </para>
-    <para>
-     This is working now.
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term>
-    "Ubuntu"-style installer
-   </term>
-   <listitem>
-    <para>
-     This is where you boot into a graphical Debian Live system and run a
+items such as bootloaders and local users, etc. </para>
+          <para> This is working now. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term> "Ubuntu"-style installer </term>
+        <listitem>
+          <para> This is where you boot into a graphical Debian Live system and run a
 wizard-based program which installs and configures the live system, all the
-time remaining inside the live graphical environment.
-    </para>
-    <para>
-     This is currently NOT possible with Debian Live.
-    </para>
-   </listitem>
-  </varlistentry>
- </variablelist>
-
-
-  <para>
- By default, no installer will be included in the Debian Live image. You can
-enable it by using <filename>lh_config</filename> : <screen>
-$ lh_config --help
-  ...
-  [--debian-installer enabled|cdrom|netinst|netboot|businesscard|live|disabled]
-  [--debian-installer-distribution CODENAME|daily]
-  [--debian-installer-preseedfile FILE|URL]
-  ...
- </screen>
- </para>
-
-
- <para>
-  The values "Normal", "Live" and "Ubuntu" are not valid values for <term>LH_BINARY_DEBIAN_INSTALLER</term>. Refer to the output of <filename>lh_config</filename> cited above to
-choose the appropriate values.
- </para>
-</section>
-
-<section id="wifi-connection">
-<title>WiFi Connection</title>
- <para>
-  Depending on the Debian Live image you are using and the given tools
+time remaining inside the live graphical environment. </para>
+          <para> This is currently NOT possible with Debian Live. </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <para> By default, no installer will be included in the Debian Live image. You can
+enable it by using <filename>lh_config</filename> : <screen> $ lh_config --help ... [--debian-installer enabled|cdrom|netinst|netboot|businesscard|live|disabled] [--debian-installer-distribution CODENAME|daily] [--debian-installer-preseedfile FILE|URL] ... </screen> </para>
+    <para> The values "Normal", "Live" and "Ubuntu" are not valid values for <term>LH_BINARY_DEBIAN_INSTALLER</term>. Refer to the output of <filename>lh_config</filename> cited above to
+choose the appropriate values. </para>
+  </section>
+  <section id="wifi-connection">
+    <title>WiFi Connection</title>
+    <para> Depending on the Debian Live image you are using and the given tools
 configured with your Debian Live image you may need to only attach to an
 available access point. If you encounter difficulty a good place to start is
 at the Debian Wiki entry for <ulink
-url="http://wiki.debian.org/WiFi">WiFi</ulink>.
- </para>
-</section>
-
+url="http://wiki.debian.org/WiFi">WiFi</ulink>. </para>
+  </section>
 </chapter>
diff --git a/manual/de/customization.xml b/manual/de/customization.xml
index f31c972..19e3940 100644
--- a/manual/de/customization.xml
+++ b/manual/de/customization.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <chapter id="customization">
-<title>Customization</title>
-
-<xi:include href="customization_packages.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="customization_contents.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="customization_internationalization.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="customization_bootup.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="customization_binary.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="customization_backports.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-
+  <title>Customization</title>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="customization_packages.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="customization_contents.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="customization_internationalization.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="customization_bootup.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="customization_binary.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="customization_backports.xml"/>
 </chapter>
diff --git a/manual/de/customization_backports.xml b/manual/de/customization_backports.xml
index 7281b7d..d1f8ef6 100644
--- a/manual/de/customization_backports.xml
+++ b/manual/de/customization_backports.xml
@@ -1,27 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <sect1 id="backports">
-
-<title>Using a newer kernel with Lenny</title>
-
-<para>The backports repository, backports.org, lacks the necessary module packages
+  <title>Using a newer kernel with Lenny</title>
+  <para>The backports repository, backports.org, lacks the necessary module packages
 (linux-modules-extra-2.6, aufs, etc.) so an alternative repository has been
 set up, in order to build Lenny live images with a later kernel. Shown here
 is one way of doing it.</para>
-
-<screen>
-$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6'
-
-$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.chroot
-$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.binary
-
-$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.chroot.gpg
-$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.binary.gpg
-
-# lh_build
-</screen>
-
+  <screen> $ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6' $ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' &gt; config/chroot_sources/backports-kernel.chroot $ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' &gt; config/chroot_sources/backports-kernel.binary $ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.chroot.gpg $ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.binary.gpg # lh_build </screen>
 </sect1>
diff --git a/manual/de/customization_binary.xml b/manual/de/customization_binary.xml
index d2991a4..e1a5dc4 100644
--- a/manual/de/customization_binary.xml
+++ b/manual/de/customization_binary.xml
@@ -1,67 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <sect1 id="binary">
-<title>Customising the binary image</title>
-
-<para>This chapter discusses FIXME</para>
-
-<sect2 id="iso-metadata">
- <title>ISO metadata</title>
- <para>
-  When creating an ISO9660 binary image, you can use the following options to
+  <title>Customising the binary image</title>
+  <para>This chapter discusses FIXME</para>
+  <sect2 id="iso-metadata">
+    <title>ISO metadata</title>
+    <para> When creating an ISO9660 binary image, you can use the following options to
 add various textual metadata for your image. This can help you easily
-identify the version or configuration of an image without booting it.
- </para>
-
-<variablelist>
- <varlistentry>
-  <term><command>LH_ISO_APPLICATION</command> / <command>--iso-application
+identify the version or configuration of an image without booting it. </para>
+    <variablelist>
+      <varlistentry>
+        <term><command>LH_ISO_APPLICATION</command> / <command>--iso-application
 <replaceable>NAME</replaceable></command></term>
-  <listitem>
-   <para>
-    This should describe the application that will be on the image. The maximum
-length for this field is 128 characters.
-   </para>
-  </listitem>
- </varlistentry>
- <varlistentry>
-  <term><command>LH_ISO_PREPARER</command> / <command>--iso-preparer
+        <listitem>
+          <para> This should describe the application that will be on the image. The maximum
+length for this field is 128 characters. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>LH_ISO_PREPARER</command> / <command>--iso-preparer
 <replaceable>NAME</replaceable></command></term>
-  <listitem>
-   <para>
-    This should describe the preparer of the image, usually with some contact
+        <listitem>
+          <para> This should describe the preparer of the image, usually with some contact
 details. The default for this option is the &live-helper; version you are
 using, which may help with debugging later. The maximum length for this
-field is 128 characters.
-   </para>
-  </listitem>
- </varlistentry>
- <varlistentry>
-  <term><command>LH_ISO_PUBLISHER</command> / <command>--iso-publisher
+field is 128 characters. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>LH_ISO_PUBLISHER</command> / <command>--iso-publisher
 <replaceable>NAME</replaceable></command></term>
-  <listitem>
-   <para>
-    This should describe the publisher of the image, usually with some contact
-details. The maximum length for this field is 128 characters.
-   </para>
-  </listitem>
- </varlistentry>
- <varlistentry>
-  <term><command>LH_ISO_VOLUME</command> / <command>--iso-volume
+        <listitem>
+          <para> This should describe the publisher of the image, usually with some contact
+details. The maximum length for this field is 128 characters. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>LH_ISO_VOLUME</command> / <command>--iso-volume
 <replaceable>NAME</replaceable></command></term>
-  <listitem>
-   <para>
-    This should specify the volume ID of the image. This is used as a
+        <listitem>
+          <para> This should specify the volume ID of the image. This is used as a
 user-visible label on some platforms such as Windows and Apple Mac OS. The
-maximum length for this field is 32 characters.
-   </para>
-  </listitem>
- </varlistentry>
-</variablelist>
-
-</sect2>
-
+maximum length for this field is 32 characters. </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
 </sect1>
diff --git a/manual/de/customization_bootup.xml b/manual/de/customization_bootup.xml
index 7f213e0..ac840db 100644
--- a/manual/de/customization_bootup.xml
+++ b/manual/de/customization_bootup.xml
@@ -1,117 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <sect1 id="bootup">
-<title>Customising the bootup process</title>
-
-<para>This chapter discusses customisation of bootup process of a live system,
+  <title>Customising the bootup process</title>
+  <para>This chapter discusses customisation of bootup process of a live system,
 including kernel options, modifications to the bootloader, "splash" screens
 and startup scripts.</para>
-
-<para>FIXME</para>
-
-<sect2 id="kernel">
-<title>Kernel</title>
-</sect2>
-
-<sect2 id="bootloaders">
-<title>Bootloaders</title>
-<para>
- FIXME
-</para>
-
-<sect3>
-<title>Choosing a bootloader</title>
-<para>
- FIXME
-</para>
-</sect3>
-
-<sect3 id="syslinux">
-<title>Syslinux</title>
- <para>In the default configuration, Syslinux will pause indefinitely at its splash
+  <para>FIXME</para>
+  <sect2 id="kernel">
+    <title>Kernel</title>
+  </sect2>
+  <sect2 id="bootloaders">
+    <title>Bootloaders</title>
+    <para> FIXME </para>
+    <sect3>
+      <title>Choosing a bootloader</title>
+      <para> FIXME </para>
+    </sect3>
+    <sect3 id="syslinux">
+      <title>Syslinux</title>
+      <para>In the default configuration, Syslinux will pause indefinitely at its splash
 screen. To adjust this, modify the <command>LH_SYSLINUX_TIMEOUT</command>
 value or pass <command>--syslinux-timeout
 <replaceable>TIMEOUT</replaceable></command> to
 <filename>lh_config</filename>. The value is specified in units of 1/10s and
 the maximum possible timeout is 35996. A timeout of 0 (zero) disables the
 timeout completely. For more information please see syslinux(1).</para>
-</sect3>
-
-<sect3>
-<title>Bootloader templates</title>
-<para>
- FIXME
-</para>
-</sect3>
-
-<sect3>
-<title>Booting a Debian Live USB/HDD system from a USB stick with Grub</title>
-<para>
-Suppose you've built your Debian Live USB/HDD image, but want to install it
-on an already used USB stick with ext2/3 partition and Grub bootloader:
-</para>
-
-<para>First, copy live components in a directory on your key: the Linux kernel
+    </sect3>
+    <sect3>
+      <title>Bootloader templates</title>
+      <para> FIXME </para>
+    </sect3>
+    <sect3>
+      <title>Booting a Debian Live USB/HDD system from a USB stick with Grub</title>
+      <para> Suppose you've built your Debian Live USB/HDD image, but want to install it
+on an already used USB stick with ext2/3 partition and Grub bootloader: </para>
+      <para>First, copy live components in a directory on your key: the Linux kernel
 (<filename>vmlinuz*</filename>), its Initial RAM disk
 (<filename>initrd*</filename>) and the system
-(<filename>filesystem.squashfs</filename>): <screen>
-# mkdir /media/myUsb/boot/live/
-# cp binary/vmlinuz1 binary/initrd1.img binary/live/filesystem.squashfs /media/myUsb/boot/live/
-</screen>
-</para>
-
-<para>Then, add a stanza in Grub's menu definition to boot up this system:
-<screen>
-echo &gt;&gt;/media/myUsb/boot/grub/menu.lst  &lt;&lt;EOF
-
-title           my Debian Live
-root            (hd0,1)    # my Ext2 partition is the second on this stick
-kernel          /boot/live/vmlinuz1 boot=live vga=791 persistent union=aufs live-media-path=boot/live
-initrd          /boot/live/initrd1.img
-
-EOF
-</screen> The important kernel command line option
+(<filename>filesystem.squashfs</filename>): <screen> # mkdir /media/myUsb/boot/live/ # cp binary/vmlinuz1 binary/initrd1.img binary/live/filesystem.squashfs /media/myUsb/boot/live/ </screen> </para>
+      <para>Then, add a stanza in Grub's menu definition to boot up this system:
+<screen> echo &gt;&gt;/media/myUsb/boot/grub/menu.lst &lt;&lt;EOF title my Debian Live root (hd0,1) # my Ext2 partition is the second on this stick kernel /boot/live/vmlinuz1 boot=live vga=791 persistent union=aufs live-media-path=boot/live initrd /boot/live/initrd1.img EOF </screen> The important kernel command line option
 to add here is <variablename>live-media-path</variablename>, which tells to Live initrd's script in which subdirectory to look for the
-SquashFS image.
-</para>
-
-<para>Next, umount your USB stick and reboot on it. That's all!</para>
-
-</sect3>
-</sect2>
-
-<sect2 id="splash">
-<title>Splash screens</title>
-<para>
- FIXME
-</para>
-</sect2>
-
-<sect2 id="memtest">
-<title>Memtest</title>
-<para>
- FIXME
-</para>
-</sect2>
-
-<sect2 id="startup-scripts">
-<title>Startup scripts</title>
-<para>
- FIXME
-</para>
-</sect2>
-
-<sect2 id="cheat-codes">
-<title>Cheat codes</title>
-<para>
- FIXME
-</para>
-<para>
- Checksums.
-</para>
-</sect2>
-
+SquashFS image. </para>
+      <para>Next, umount your USB stick and reboot on it. That's all!</para>
+    </sect3>
+  </sect2>
+  <sect2 id="splash">
+    <title>Splash screens</title>
+    <para> FIXME </para>
+  </sect2>
+  <sect2 id="memtest">
+    <title>Memtest</title>
+    <para> FIXME </para>
+  </sect2>
+  <sect2 id="startup-scripts">
+    <title>Startup scripts</title>
+    <para> FIXME </para>
+  </sect2>
+  <sect2 id="cheat-codes">
+    <title>Cheat codes</title>
+    <para> FIXME </para>
+    <para> Checksums. </para>
+  </sect2>
 </sect1>
diff --git a/manual/de/customization_contents.xml b/manual/de/customization_contents.xml
index 2634571..8d31729 100644
--- a/manual/de/customization_contents.xml
+++ b/manual/de/customization_contents.xml
@@ -1,156 +1,93 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <sect1 id="contents">
-<title>Customising contents</title>
-
-<para>This chapter discusses further customisation of the live system.</para>
-
-<sect2>
- <title>Includes</title>
-
- <para>Using includes, it is possible to add (or replace) arbitrary files in your
+  <title>Customising contents</title>
+  <para>This chapter discusses further customisation of the live system.</para>
+  <sect2>
+    <title>Includes</title>
+    <para>Using includes, it is possible to add (or replace) arbitrary files in your
 Debian Live image. &live-helper; provides three mechanisms for using them:</para>
-
- <variablelist>
-  <varlistentry>
-   <term>
-    Chroot local includes
-   </term>
-   <listitem>
-    <para>
-     These allow you to add or replace files to the chroot/Live
+    <variablelist>
+      <varlistentry>
+        <term> Chroot local includes </term>
+        <listitem>
+          <para> These allow you to add or replace files to the chroot/Live
 filesystem. Please see <xref linkend="chroot-local-includes"/> for more
-information.
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term>
-    Binary local includes
-   </term>
-   <listitem>
-    <para>
-     These allow you to add or replace files in the binary image. Please see
-<xref linkend="binary-local-includes"/> for more information.
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term>
-    Binary includes
-   </term>
-   <listitem>
-    <para>
-     These allow you to add or replace Debian specific files in the binary image,
+information. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term> Binary local includes </term>
+        <listitem>
+          <para> These allow you to add or replace files in the binary image. Please see
+<xref linkend="binary-local-includes"/> for more information. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term> Binary includes </term>
+        <listitem>
+          <para> These allow you to add or replace Debian specific files in the binary image,
 such as the templates and tools directories. Please see <xref
-linkend="binary-includes"/> for more information.
-    </para>
-   </listitem>
-  </varlistentry>
- </variablelist>
-
- <para>
-  Please see <xref linkend="terms"/> for more information about the
-distinction between the "Live" and "binary" images.
- </para>
-
-<sect3 id="chroot-local-includes">
- <title>Live/chroot local includes</title>
- <para>
-  Chroot local includes can be used to add or replace files in the chroot/Live
+linkend="binary-includes"/> for more information. </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <para> Please see <xref linkend="terms"/> for more information about the
+distinction between the "Live" and "binary" images. </para>
+    <sect3 id="chroot-local-includes">
+      <title>Live/chroot local includes</title>
+      <para> Chroot local includes can be used to add or replace files in the chroot/Live
 filesystem so that they are visible when the Live system is booted. Typical
 uses for them are to populate the skeleton user directory (<filename
 class="directory">/etc/skel</filename>) used by the live system to create
 the live user's home directory, or adding configuration files where
-additional processing is not required.
- </para>
-
- <para>
-  To include files, simply add them to your <filename
+additional processing is not required. </para>
+      <para> To include files, simply add them to your <filename
 class="directory">config/chroot_local-includes</filename> directory. This
 directory corresponds to the root directory (<filename
 class="directory">/</filename>) of the live system. For example, to add a
-file <filename>/var/www/index.html</filename> in the live system, use:
- </para>
-
- <screen>
-  $ mkdir -p config/chroot_local-includes/var/www
-  $ cp /path/to/my/index.html config/chroot_local-includes/var/www
- </screen>
-
- <para>
-  Your configuration will then have the following layout:
- </para>
-
- <screen>
--- config
-   [...]
-    |-- chroot_local-includes
-    |   `-- var
-    |       `-- www
-    |           `-- index.html
-   [...]
-    `-- templates
- </screen>
-
- <para>
-  Chroot local includes are installed after package installation so that files
-installed by packages are overwritten.
- </para>
-</sect3>
-
-<sect3 id="binary-local-includes">
-<title>Binary local includes</title>
- <para>
-  FIXME.
- </para>
-</sect3>
-
-<sect3 id="binary-includes">
-<title>Binary includes</title>
- <para>
-  FIXME.
- </para>
-</sect3>
-
-</sect2>
-
-<sect2 id="hooks">
-<title>Hooks</title>
-
-<para>FIXME.</para>
-<para>Enabling hooks</para>
-
-<sect3 id="chroot-local-hooks">
-<title>Live/chroot local hooks</title>
-<para>FIXME.</para>
-</sect3>
-
-<sect3 id="binary-local-hooks">
-<title>Binary local hooks</title>
-<para>FIXME.</para>
-</sect3>
-
-</sect2>
-
-<sect2 id="debconf-preseed">
- <title>Preseeding Debconf questions</title>
-
- <para>Files in the <filename
+file <filename>/var/www/index.html</filename> in the live system, use: </para>
+      <screen> $ mkdir -p config/chroot_local-includes/var/www $ cp /path/to/my/index.html config/chroot_local-includes/var/www </screen>
+      <para> Your configuration will then have the following layout: </para>
+      <screen> -- config [...] |-- chroot_local-includes | `-- var | `-- www | `-- index.html [...] `-- templates </screen>
+      <para> Chroot local includes are installed after package installation so that files
+installed by packages are overwritten. </para>
+    </sect3>
+    <sect3 id="binary-local-includes">
+      <title>Binary local includes</title>
+      <para> FIXME. </para>
+    </sect3>
+    <sect3 id="binary-includes">
+      <title>Binary includes</title>
+      <para> FIXME. </para>
+    </sect3>
+  </sect2>
+  <sect2 id="hooks">
+    <title>Hooks</title>
+    <para>FIXME.</para>
+    <para>Enabling hooks</para>
+    <sect3 id="chroot-local-hooks">
+      <title>Live/chroot local hooks</title>
+      <para>FIXME.</para>
+    </sect3>
+    <sect3 id="binary-local-hooks">
+      <title>Binary local hooks</title>
+      <para>FIXME.</para>
+    </sect3>
+  </sect2>
+  <sect2 id="debconf-preseed">
+    <title>Preseeding Debconf questions</title>
+    <para>Files in the <filename
 class="directory">config/chroot_local-preseed</filename> directory are
 considered to be debconf preseed files and are installed by &live-helper;
 using <filename>debconf-set-selections</filename>.</para>
-
- <para>For more information about debconf, please see debconf(7) in the
+    <para>For more information about debconf, please see debconf(7) in the
 <command>debconf</command> package.</para>
-</sect2>
-
-<sect2 id="symlinks">
-<title>Symlink conversion</title>
-<para>FIXME. (This is probably in the wrong section)</para>
-</sect2>
-
+  </sect2>
+  <sect2 id="symlinks">
+    <title>Symlink conversion</title>
+    <para>FIXME. (This is probably in the wrong section)</para>
+  </sect2>
 </sect1>
diff --git a/manual/de/customization_internationalization.xml b/manual/de/customization_internationalization.xml
index b13ad26..d1c7f1f 100644
--- a/manual/de/customization_internationalization.xml
+++ b/manual/de/customization_internationalization.xml
@@ -1,47 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <sect1 id="internalization">
-<title>Customising Locale And Language</title>
-<para>This chapter discusses customisation for language specific parameters.</para>
-
-<sect2 id="locale">
-<title>Default locale and keyboard</title>
-
-<para>
-The default locale when building a live cd is "locale=en_US.UTF-8".  To set
-the locale for the UK (locale=en_GB.UTF-8)  <screen>
-$ lh_config --bootappend-live "locale=en_GB.UTF-8"
-</screen> The entry for a British keyboard would be <screen>
-$ lh_config --bootappend-live "keyb=uk"
-</screen> To configure both the locale and the keyboard for the
-UK the entry would be <screen>
-$ lh_config --bootappend-live "locale=en_GB.UTF-8 keyb=uk"
-</screen> or <screen>
-$ lh_config --bootappend-live "locale=uk"
-</screen>
-</para>
-<note>
- You can find a list of options in the manpage for live-initramfs. Only UTF8 locales are supported by live-initramfs.
-</note>
-</sect2>
-<sect2 id="default_language">
-<title>l10n Packages</title>
-
-<para>
-lh build can automatically check for each package, for which it's know that
+  <title>Customising Locale And Language</title>
+  <para>This chapter discusses customisation for language specific parameters.</para>
+  <sect2 id="locale">
+    <title>Default locale and keyboard</title>
+    <para> The default locale when building a live cd is "locale=en_US.UTF-8". To set
+the locale for the UK (locale=en_GB.UTF-8) <screen> $ lh_config --bootappend-live "locale=en_GB.UTF-8" </screen> The entry for a British keyboard would be <screen> $ lh_config --bootappend-live "keyb=uk" </screen> To configure both the locale and the keyboard for the
+UK the entry would be <screen> $ lh_config --bootappend-live "locale=en_GB.UTF-8 keyb=uk" </screen> or <screen> $ lh_config --bootappend-live "locale=uk" </screen> </para>
+    <note> You can find a list of options in the manpage for live-initramfs. Only UTF8 locales are supported by live-initramfs. </note>
+  </sect2>
+  <sect2 id="default_language">
+    <title>l10n Packages</title>
+    <para> lh build can automatically check for each package, for which it's know that
 there are -l10n packages available and install them. To add Swedish packages
-the entry would be <screen>
-$ lh_config --language "se"
-</screen> This will also change
-the default syslinux language if <screen>
-  config/templates/syslinux/se
-</screen> is
-available. Check syslinux configuration FIXME
-</para>
-
-</sect2>
-
+the entry would be <screen> $ lh_config --language "se" </screen> This will also change
+the default syslinux language if <screen> config/templates/syslinux/se </screen> is
+available. Check syslinux configuration FIXME </para>
+  </sect2>
 </sect1>
diff --git a/manual/de/customization_packages.xml b/manual/de/customization_packages.xml
index 4833647..47edc42 100644
--- a/manual/de/customization_packages.xml
+++ b/manual/de/customization_packages.xml
@@ -1,544 +1,289 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-	<!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
-
 <sect1 id="packages">
-<title>Customising package installation</title>
-
-<para>
-	This chapter discusses the customisation of package installation. This
-involves:
-</para>
-
-<orderedlist>
-
-<listitem>
-<para>
-	Selecting additional packages to be installed
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Installing modified packages
-</para>
-</listitem>
-
-</orderedlist>
-
-<sect2 id="package-sources">
-<title>Package sources</title>
-
-<para>
-	FIXME
-</para>
-
-<variablelist>
-
-<varlistentry>
-<term>Debian repositories</term>
-
-<listitem>
-<para>
-	To set a local mirror (used to ''build'' the live-cd)
-</para>
-
-<para>
-	<screen>$ lh config --mirror-bootstrap "http://local.intra.net/debian/" --mirror-chroot "http://local.intra.net/debian/"</screen>
-</para>
-
-<para>
-	The generic mirror is added to the live-system's /etc/apt/sources.list.
-</para>
-
-<para>
-	<screen>$ lh config --mirror-binary "http://ftp.debian.org/debian/"</screen>
-</para>
-
-<para>
-	Note: It is ''not'' used for building the live-cd but to install new
-software while using the live-cd.
-</para>
-
-<para>
-	It can be disabled by setting binary indices parameter to disabled
-</para>
-
-<para>
-	<screen>$ lh config --binary-indices disabled</screen>
-</para>
-
-<para>
-	Note: the same applies for mirror chroot security and mirror binary security
-</para>
-
-<para>
-	<screen>$ lh config --mirror-chroot-security {URL}
-$ lh config --mirror-binary-security {URL}</screen>
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Own repository</term>
-
-<listitem>
-<para>
-	To add more repositories (e.g. backports, experimental packages, etc.),
+  <title>Customising package installation</title>
+  <para> This chapter discusses the customisation of package installation. This
+involves: </para>
+  <orderedlist>
+    <listitem>
+      <para> Selecting additional packages to be installed </para>
+    </listitem>
+    <listitem>
+      <para> Installing modified packages </para>
+    </listitem>
+  </orderedlist>
+  <sect2 id="package-sources">
+    <title>Package sources</title>
+    <para> FIXME </para>
+    <variablelist>
+      <varlistentry>
+        <term>Debian repositories</term>
+        <listitem>
+          <para> To set a local mirror (used to ''build'' the live-cd) </para>
+          <para>
+            <screen>$ lh config --mirror-bootstrap "http://local.intra.net/debian/" --mirror-chroot "http://local.intra.net/debian/"</screen>
+          </para>
+          <para> The generic mirror is added to the live-system's /etc/apt/sources.list. </para>
+          <para>
+            <screen>$ lh config --mirror-binary "http://ftp.debian.org/debian/"</screen>
+          </para>
+          <para> Note: It is ''not'' used for building the live-cd but to install new
+software while using the live-cd. </para>
+          <para> It can be disabled by setting binary indices parameter to disabled </para>
+          <para>
+            <screen>$ lh config --binary-indices disabled</screen>
+          </para>
+          <para> Note: the same applies for mirror chroot security and mirror binary security </para>
+          <para>
+            <screen>$ lh config --mirror-chroot-security {URL} $ lh config --mirror-binary-security {URL}</screen>
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Own repository</term>
+        <listitem>
+          <para> To add more repositories (e.g. backports, experimental packages, etc.),
 create
 <filename>config/chroot_sources/your-cdd-repo.{chroot,binary}</filename>
-file.
-</para>
-
-<para>
-	e.g. <filename>config/chroot_sources/live.chroot</filename> allows you to
+file. </para>
+          <para> e.g. <filename>config/chroot_sources/live.chroot</filename> allows you to
 install packages from the debian live snapshot repository at live-cd build
-time (you have to add the packages in your package list):
-</para>
-
-<para>
-	<screen>deb http://live.debian.net/ sid-snapshots main contrib non-free</screen>
-</para>
-
-<para>
-	If you add the line to
+time (you have to add the packages in your package list): </para>
+          <para>
+            <screen>deb http://live.debian.net/ sid-snapshots main contrib non-free</screen>
+          </para>
+          <para> If you add the line to
 <filename>config/chroot_sources/live.binary</filename> the repository will
-be added to your live-system's <filename>/etc/apt/sources.list</filename>.
-</para>
-
-<para>
-	If such files exist, they will be picked up automatically.
-</para>
-
-<para>
-	You can also put the gpg-key used to sign the repository into
-config/chroot_sources/foo.{binary,chroot}.gpg
-</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-
-</sect2>
-
-<sect2 id="package-installation">
-<title>Package installation</title>
-
-<para>
-	You can elect to use either <command>apt</command> or
+be added to your live-system's <filename>/etc/apt/sources.list</filename>. </para>
+          <para> If such files exist, they will be picked up automatically. </para>
+          <para> You can also put the gpg-key used to sign the repository into
+config/chroot_sources/foo.{binary,chroot}.gpg </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+  <sect2 id="package-installation">
+    <title>Package installation</title>
+    <para> You can elect to use either <command>apt</command> or
 <command>aptitude</command> when installing packages. Which utility is used
 is governed by the <command>LH_APT</command> variable in
 <filename>config/chroot</filename> or by the <command>--apt</command>
-argument to <filename>lh config</filename>:
-</para>
-
-<variablelist>
-
-<varlistentry>
-<term><command>apt</command></term>
-
-<listitem>
-<para>
-	Specifying a missing package causes package installation to fail, which may
-not be the desired behaviour.
-</para>
-
-<para>
-	This is the default setting for building images for Lenny or later.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><command>aptitude</command></term>
-
-<listitem>
-<para>
-	Specifying a missing package causes package installation to succeed, which
-may not be the desired behaviour.
-</para>
-
-<para>
-	This is the default setting for building images for Etch.
-</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-
-</sect2>
-
-<sect2>
-<title>Installing additional packages</title>
-
-<para>
-	&live-helper; has a number of mechanisms for indicating that additional
-packages should be installed, including:
-</para>
-
-<orderedlist>
-
-<listitem>
-<para>
-	The <command>LH_PACKAGES</command> variable
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Package lists
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Local packages (<filename>chroot_local-packages/</filename>)
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Tasks
-</para>
-</listitem>
-
-</orderedlist>
-
-<sect3 id="lh-packages">
-<title>The <command>LH_PACKAGES</command> variable</title>
-
-<para>
-	To install additional packages, simply add them to the
+argument to <filename>lh config</filename>: </para>
+    <variablelist>
+      <varlistentry>
+        <term>
+          <command>apt</command>
+        </term>
+        <listitem>
+          <para> Specifying a missing package causes package installation to fail, which may
+not be the desired behaviour. </para>
+          <para> This is the default setting for building images for Lenny or later. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <command>aptitude</command>
+        </term>
+        <listitem>
+          <para> Specifying a missing package causes package installation to succeed, which
+may not be the desired behaviour. </para>
+          <para> This is the default setting for building images for Etch. </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+  <sect2>
+    <title>Installing additional packages</title>
+    <para> &live-helper; has a number of mechanisms for indicating that additional
+packages should be installed, including: </para>
+    <orderedlist>
+      <listitem>
+        <para> The <command>LH_PACKAGES</command> variable </para>
+      </listitem>
+      <listitem>
+        <para> Package lists </para>
+      </listitem>
+      <listitem>
+        <para> Local packages (<filename>chroot_local-packages/</filename>) </para>
+      </listitem>
+      <listitem>
+        <para> Tasks </para>
+      </listitem>
+    </orderedlist>
+    <sect3 id="lh-packages">
+      <title>The <command>LH_PACKAGES</command> variable</title>
+      <para> To install additional packages, simply add them to the
 <command>LH_PACKAGES</command> variable in
-<filename>config/chroot</filename>. For example:
-</para>
-
-<para>
-	<screen>LH_PACKAGES="package1 package2 package3 ... "</screen>
-</para>
-
-<para>
-	You can also specify initial values on the command line:
-</para>
-
-<para>
-	<screen>$ lh config --packages "package1 package2 package3"</screen>
-</para>
-
-<para>
-	The behaviour of &live-helper; when specifying a package that does not exist
+<filename>config/chroot</filename>. For example: </para>
+      <para>
+        <screen>LH_PACKAGES="package1 package2 package3 ... "</screen>
+      </para>
+      <para> You can also specify initial values on the command line: </para>
+      <para>
+        <screen>$ lh config --packages "package1 package2 package3"</screen>
+      </para>
+      <para> The behaviour of &live-helper; when specifying a package that does not exist
 is determined by your choice of APT utility. See <xref
-linkend="package-installation"/> for more details.
-</para>
-
-<para>
-	If you need to specify a large number of packages to be installed or you
+linkend="package-installation"/> for more details. </para>
+      <para> If you need to specify a large number of packages to be installed or you
 need flexibility regarding which packages to install, you should probably be
 using package lists. See <xref linkend="package-lists"/> for more
-information.
-</para>
-
-</sect3>
-
-<sect3 id="package-lists">
-<title>Package lists</title>
-
-<para>
-	Package lists are a powerful way of expressing which packages should be
+information. </para>
+    </sect3>
+    <sect3 id="package-lists">
+      <title>Package lists</title>
+      <para> Package lists are a powerful way of expressing which packages should be
 installed. &live-helper; ships with a number of predefined package lists
 which provide sensible default package selections for the GNOME and KDE
-desktop environments, as well as standard systems.
-</para>
-
-<para>
-	To specify a package list, add the name of the list to the
+desktop environments, as well as standard systems. </para>
+      <para> To specify a package list, add the name of the list to the
 <command>LH_PACKAGES_LISTS</command> variable in
-<filename>config/chroot</filename>. For example:
-</para>
-
-<para>
-	<screen>LH_PACKAGES_LISTS="gnome"</screen>
-</para>
-
-<para>
-	Package lists that are distributed with &live-helper; reside in the
-<command>/usr/share/live-helper/lists</command> directory.
-</para>
-
-<sect4>
-<title>Local packages lists</title>
-
-<para>
-	You may supplement the supplied lists using local package lists stored in
-<command>config/chroot_local-packageslists</command>.
-</para>
-
-<para>
-	Package lists that exist in this directory always override package lists
-distributed with &live-helper;. This can cause undesired effects when.
-</para>
-
-<note>
-<title>&live-helper; 2.x change</title>
-
-<para>
-	Any file with <command>.list</command> suffix in
+<filename>config/chroot</filename>. For example: </para>
+      <para>
+        <screen>LH_PACKAGES_LISTS="gnome"</screen>
+      </para>
+      <para> Package lists that are distributed with &live-helper; reside in the
+<command>/usr/share/live-helper/lists</command> directory. </para>
+      <sect4>
+        <title>Local packages lists</title>
+        <para> You may supplement the supplied lists using local package lists stored in
+<command>config/chroot_local-packageslists</command>. </para>
+        <para> Package lists that exist in this directory always override package lists
+distributed with &live-helper;. This can cause undesired effects when. </para>
+        <note>
+          <title>&live-helper; 2.x change</title>
+          <para> Any file with <command>.list</command> suffix in
 <command>config/chroot_local-packageslists</command> is automatically
 enabled, the variable LH_PACKAGES_LISTS should only be used referencing
 packages lists included in live-helper (at
-<command>/usr/share/live-helper/lists/</command>.
-</para>
-
-</note>
-
-</sect4>
-
-<sect4>
-<title>Extending a provided package list using includes</title>
-
-<para>
-	FIXME
-</para>
-
-<para>
-	<screen>#include &lt;gnome&gt;
-iceweasel</screen>
-</para>
-
-<para>
-	The package lists that are included with &live-helper; make extensive use of
+<command>/usr/share/live-helper/lists/</command>. </para>
+        </note>
+      </sect4>
+      <sect4>
+        <title>Extending a provided package list using includes</title>
+        <para> FIXME </para>
+        <para>
+          <screen>#include &lt;gnome&gt; iceweasel</screen>
+        </para>
+        <para> The package lists that are included with &live-helper; make extensive use of
 includes. They are available to view in the
-<command>/usr/share/live-helper/lists</command> directory.
-</para>
-
-</sect4>
-
-<sect4>
-<title>Using conditionals inside packages lists</title>
-
-<para>
-	FIXME
-</para>
-
-<para>
-	<screen>#if ARCHITECTURE amd64
-ia32-libs
-#endif</screen>
-</para>
-
-<para>
-	or if <command>LH_ARCHITECTURE</command> is set to <command>i386</command>
-or <command>amd64</command>:
-</para>
-
-<para>
-	<screen>#if ARCHITECTURE i386 amd64
-memtest86+
-#endif</screen>
-</para>
-
-<para>
-	or if <command>LH_SECTIONS</command> contains either
-<command>contrib</command> or <command>non-free</command>:
-</para>
-
-<para>
-	<screen>#if SECTIONS contrib non-free
-vrms
-#endif</screen>
-</para>
-
-<para>
-	A conditional may surround an <command>#include</command> directive:
-</para>
-
-<para>
-	<screen>#if ARCHITECTURE amd64
-#include &lt;gnome-full&gt;
-#endif</screen>
-</para>
-
-<para>
-	Any &live-helper; configuration variable that begins with
-<command>LH_</command> can be tested in this way.
-</para>
-
-<para>
-	The nesting of conditionals is not supported.
-</para>
-
-</sect4>
-
-</sect3>
-
-<sect3 id="tasks">
-<title>Tasks</title>
-
-<para>
-	FIXME
-</para>
-
-</sect3>
-
-</sect2>
-
-<sect2 id="custom-packages">
-<title>Installing modified or third-party packages</title>
-
-<para>
-	Whilst it is against the philosophy of Debian Live, it may sometimes be
+<command>/usr/share/live-helper/lists</command> directory. </para>
+      </sect4>
+      <sect4>
+        <title>Using conditionals inside packages lists</title>
+        <para> FIXME </para>
+        <para>
+          <screen>#if ARCHITECTURE amd64 ia32-libs #endif</screen>
+        </para>
+        <para> or if <command>LH_ARCHITECTURE</command> is set to <command>i386</command>
+or <command>amd64</command>: </para>
+        <para>
+          <screen>#if ARCHITECTURE i386 amd64 memtest86+ #endif</screen>
+        </para>
+        <para> or if <command>LH_SECTIONS</command> contains either
+<command>contrib</command> or <command>non-free</command>: </para>
+        <para>
+          <screen>#if SECTIONS contrib non-free vrms #endif</screen>
+        </para>
+        <para> A conditional may surround an <command>#include</command> directive: </para>
+        <para>
+          <screen>#if ARCHITECTURE amd64 #include &lt;gnome-full&gt; #endif</screen>
+        </para>
+        <para> Any &live-helper; configuration variable that begins with
+<command>LH_</command> can be tested in this way. </para>
+        <para> The nesting of conditionals is not supported. </para>
+      </sect4>
+    </sect3>
+    <sect3 id="tasks">
+      <title>Tasks</title>
+      <para> FIXME </para>
+    </sect3>
+  </sect2>
+  <sect2 id="custom-packages">
+    <title>Installing modified or third-party packages</title>
+    <para> Whilst it is against the philosophy of Debian Live, it may sometimes be
 necessary to build a Live system with modified versions of packages that are
 in the Debian repository. This may be to modify or support additional
 features, languages and branding, or even to remove elements of existing
 packages that are undesirable. Similarly, "third-party" packages may be used
-to add bespoke and/or proprietary functionality.
-</para>
-
-<para>
-	This section does not cover advice regarding building or maintaining
+to add bespoke and/or proprietary functionality. </para>
+    <para> This section does not cover advice regarding building or maintaining
 modified packages. Joachim Breitner's <ulink
-url="http://www.joachim-breitner.de/blog/archives/282-How-to-fork-privately.html"
->'How to fork privately'</ulink> may be of interest, however. The creation
-of bespoke packages is covered in the <ulink
+url="http://www.joachim-breitner.de/blog/archives/282-How-to-fork-privately.html">'How
+to fork privately'</ulink> may be of interest, however. The creation of
+bespoke packages is covered in the <ulink
 url="http://www.debian.org/doc/maint-guide/">Debian New Maintainers'
-Guide</ulink> and elsewhere.
-</para>
-
-<para>
-	There are two ways of installing modified custom packages:
-</para>
-
-<orderedlist>
-
-<listitem>
-<para>
-	<filename>chroot_local-packages</filename>
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Using a custom APT repository
-</para>
-</listitem>
-
-</orderedlist>
-
-<para>
-	The <filename>chroot_local-packages</filename> is simpler to achieve and
+Guide</ulink> and elsewhere. </para>
+    <para> There are two ways of installing modified custom packages: </para>
+    <orderedlist>
+      <listitem>
+        <para>
+          <filename>chroot_local-packages</filename>
+        </para>
+      </listitem>
+      <listitem>
+        <para> Using a custom APT repository </para>
+      </listitem>
+    </orderedlist>
+    <para> The <filename>chroot_local-packages</filename> is simpler to achieve and
 useful for "one-off" customisations but has a number of drawbacks, whilst
-using a custom APT repository is more time-consuming to set up.
-</para>
-
-<sect3 id="local-packages">
-<title>
-	Using <filename>chroot_local-packages</filename> to install custom packages
-</title>
-
-<para>
-	To install a custom package, simply copy it to the
+using a custom APT repository is more time-consuming to set up. </para>
+    <sect3 id="local-packages">
+      <title> Using <filename>chroot_local-packages</filename> to install custom packages </title>
+      <para> To install a custom package, simply copy it to the
 <command>config/chroot_local-packages</command> directory. Packages that are
 inside this directory will be automatically installed into the live system
-during build - you do not need to specify them elsewhere.
-</para>
-
-<para>
-	Packages <emphasis>must</emphasis> be named in the prescribed way. One
-simple way to do this is to use <command>dpkg-name</command>. FIXME
-</para>
-
-<para>
-	Using <filename>chroot_local-packages</filename> for installation of custom
-packages has disadvantages:
-</para>
-
-<orderedlist>
-
-<listitem>
-<para>
-	It is not possible to use secure APT
-</para>
-</listitem>
-
-<listitem>
-<para>
-	You must install all appropriate packages in the
-<command>config/chroot_local-packages</command> directory
-</para>
-</listitem>
-
-<listitem>
-<para>
-	It does not lend itself to storing Debian Live configurations in revision
-control
-</para>
-</listitem>
-
-</orderedlist>
-
-</sect3>
-
-<sect3 id="custom-apt-repo">
-<title>Using an APT repository to install custom packages</title>
-
-<para>
-	FIXME
-</para>
-
-<para>
-	Unlike using <filename>chroot_local-packages</filename>, when using a custom
+during build - you do not need to specify them elsewhere. </para>
+      <para> Packages <emphasis>must</emphasis> be named in the prescribed way. One
+simple way to do this is to use <command>dpkg-name</command>. FIXME </para>
+      <para> Using <filename>chroot_local-packages</filename> for installation of custom
+packages has disadvantages: </para>
+      <orderedlist>
+        <listitem>
+          <para> It is not possible to use secure APT </para>
+        </listitem>
+        <listitem>
+          <para> You must install all appropriate packages in the
+<command>config/chroot_local-packages</command> directory </para>
+        </listitem>
+        <listitem>
+          <para> It does not lend itself to storing Debian Live configurations in revision
+control </para>
+        </listitem>
+      </orderedlist>
+    </sect3>
+    <sect3 id="custom-apt-repo">
+      <title>Using an APT repository to install custom packages</title>
+      <para> FIXME </para>
+      <para> Unlike using <filename>chroot_local-packages</filename>, when using a custom
 APT repository you must ensure that you specify the packages elsewhere. See
-<xref linkend="lh-packages"/> for details.
-</para>
-
-<para>
-	Whilst it may seem unnecessary effort to create an APT repository to install
+<xref linkend="lh-packages"/> for details. </para>
+      <para> Whilst it may seem unnecessary effort to create an APT repository to install
 custom packages, the infrastructure can be easily re-used at a later date to
-offer updates of the modified packages.
-</para>
-
-</sect3>
-
-<sect3 id="custom-packages-apt">
-<title>Custom packages and APT</title>
-
-<para>
-	&live-helper; uses APT to install all packages into the live system so will
+offer updates of the modified packages. </para>
+    </sect3>
+    <sect3 id="custom-packages-apt">
+      <title>Custom packages and APT</title>
+      <para> &live-helper; uses APT to install all packages into the live system so will
 therefore inherit behaviours from this program. One relevant example is that
 (assuming a default configuration) given a package available in two
 different repositories with different version numbers, APT will elect to
-install the package with the higher version number.
-</para>
-
-<para>
-	Because of this, you may wish to increment the version number in your custom
+install the package with the higher version number. </para>
+      <para> Because of this, you may wish to increment the version number in your custom
 packages' <command>debian/changelog</command> files to ensure that your
 modified version is installed over one in the official Debian
 repositories. This may also be achieved by altering the live system's APT
 pinning preferences - see <xref linkend="apt-preferences"/> for more
-information.
-</para>
-
-</sect3>
-
-<sect3 id="apt-preferences">
-<title>Altering APT preferences during Live system</title>
-
-<para>
-	FIXME
-</para>
-
-<para>
-	Whilst it may seem unnecessary effort to create an APT repository to install
+information. </para>
+    </sect3>
+    <sect3 id="apt-preferences">
+      <title>Altering APT preferences during Live system</title>
+      <para> FIXME </para>
+      <para> Whilst it may seem unnecessary effort to create an APT repository to install
 custom packages, the infrastructure can be easily re-used at a later date to
-offer updates of the modified package.
-</para>
-
-</sect3>
-
-</sect2>
-
+offer updates of the modified package. </para>
+    </sect3>
+  </sect2>
 </sect1>
diff --git a/manual/de/faq.xml b/manual/de/faq.xml
index a8964fb..6506e4c 100644
--- a/manual/de/faq.xml
+++ b/manual/de/faq.xml
@@ -1,657 +1,401 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <chapter id="faq">
-<title>Frequently asked questions (FAQ)</title>
-
-<itemizedlist>
-
-<listitem>
-	<para>Q: I downloaded a prebuilt live image. How do I put it on a USB stick?</para>
-	<para>A: See <xref linkend="image_copying" /> "Copying USB/HDD image to a USB
+  <title>Frequently asked questions (FAQ)</title>
+  <itemizedlist>
+    <listitem>
+      <para>Q: I downloaded a prebuilt live image. How do I put it on a USB stick?</para>
+      <para>A: See <xref linkend="image_copying"/> "Copying USB/HDD image to a USB
 stick"</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I log my build?</para>
-	<para>A: You could use script, screen or tee: <screen>$ lh_build 2>&amp;1 | tee build.log</screen>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Q: How can I convert an already installed standard Debian partition into a
+    </listitem>
+    <listitem>
+      <para>Q: How do I log my build?</para>
+      <para>A: You could use script, screen or tee: <screen>$ lh_build 2&gt;&amp;1 | tee build.log</screen> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How can I convert an already installed standard Debian partition into a
 Debian Live system?</para>
-	<para>A: Save the list of installed packages and load it into your new Debian Live
+      <para>A: Save the list of installed packages and load it into your new Debian Live
 System. Copy your /etc to config/chroot_local-includes</para>
-</listitem>
-
-<listitem>
-	<para>Q: What does 'losetup: could not find any free loop device' mean and how do
+    </listitem>
+    <listitem>
+      <para>Q: What does 'losetup: could not find any free loop device' mean and how do
 I fix it?</para>
-	<para>A: Loop devices are used during the build; there probably aren't any free if
-you've aborted several builds. Something like: for l in /dev/loop* ; do
-losetup -d $l ; done should rectify the situation (assuming all loop devices
-in use were created by lh_build; if in doubt, check the contents of each
-loop device before deleting them with losetup -d).</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I launch an interactive shell during the chroot stage?</para>
-	<para>A: To enable interactive shell: <screen>$ lh_config --interactive shell</screen> To
+      <para>A: Loop devices are used during the build; there probably aren't any free if
+you've aborted several builds. Something like: for l in /dev/loop0
+/dev/loop1 /dev/loop2 /dev/loop3 /dev/loop4 /dev/loop5 /dev/loop6 /dev/loop7
+; do losetup -d $l ; done should rectify the situation (assuming all loop
+devices in use were created by lh_build; if in doubt, check the contents of
+each loop device before deleting them with losetup -d).</para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I launch an interactive shell during the chroot stage?</para>
+      <para>A: To enable interactive shell: <screen>$ lh_config --interactive shell</screen> To
 continue the build process: <screen># logout</screen> or
 <screen># exit</screen> To disable interactive shell, set
-LH_INTERACTIVE to "disabled" in config/chroot.
-	</para>
-</listitem>
-
-<listitem>
-	<para>Q: What is the root /user password?</para>
-	<para>A: The user password for the live user is 'live'. By default, there is not
+LH_INTERACTIVE to "disabled" in config/chroot. </para>
+    </listitem>
+    <listitem>
+      <para>Q: What is the root /user password?</para>
+      <para>A: The user password for the live user is 'live'. By default, there is not
 any root password. You can switch to root with <screen> sudo -i </screen> or set a password for root with <screen>sudo passwd</screen></para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I change root or any user password?</para>
-	<para>A: Add a chroot local hook script to change root or any user password each
+    </listitem>
+    <listitem>
+      <para>Q: How do I change root or any user password?</para>
+      <para>A: Add a chroot local hook script to change root or any user password each
 time you build an image.</para>
-	<para>e.g. config/chroot_local-hooks/01-update_password.sh to set root password to
+      <para>e.g. config/chroot_local-hooks/01-update_password.sh to set root password to
 "nopasswd"</para>
-	<para>
-		<screen>#!/bin/sh
-echo "I: update password"
-echo "root:nopasswd" | chpasswd</screen> <screen>$ chmod +x config/chroot_local-hooks/01-update_password.sh</screen>
-<note>For live user; you need to copy the
+      <para><screen>#!/bin/sh echo "I: update password" echo "root:nopasswd" | chpasswd</screen><screen>$ chmod +x config/chroot_local-hooks/01-update_password.sh</screen><note>For live user; you need to copy the
 /usr/share/initramfs-tools/scripts/live-bottom/10adduser your build folder:
-<screen>mkdir -p config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/
-cp /usr/share/initramfs-tools/scripts/live-bottom/10adduser config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/</screen></note> Then edit the
+<screen>mkdir -p config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/ cp /usr/share/initramfs-tools/scripts/live-bottom/10adduser config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/</screen></note> Then edit the
 config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/10adduser
-and paste in the new user_crypted password that you make with: <screen> echo "newlivepass" | mkpasswd -s.</screen>
-		<para> Or add an hook file in config/chroot_local-hooks/ with something like the
-below: </para>
-		<screen> #!/bin/sh
-# Change the autogenerated user password to "debianlive"
-plain_password="debianlive"
-password=$(echo "${plain_password}" | mkpasswd -s)
-sed -i -e 's/\(user_crypted=\)\(.*\)\( #.*\)/\1\"'${password}'\"\3/' /usr/share/initramfs-tools/scripts/live-bottom/10adduser
-update-initramfs -tu -kall</screen>
-<para> The latter (hook model) could be more future proof than the former solution
+and paste in the new user_crypted password that you make with: <screen> echo "newlivepass" | mkpasswd -s.</screen> <para> Or add an hook file in config/chroot_local-hooks/ with something like the
+below: </para> <screen> #!/bin/sh # Change the autogenerated user password to "debianlive" plain_password="debianlive" password=$(echo "${plain_password}" | mkpasswd -s) sed -i -e 's/\(user_crypted=\)\(.*\)\( #.*\)/\1\"'${password}'\"\3/' /usr/share/initramfs-tools/scripts/live-bottom/10adduser update-initramfs -tu -kall</screen> <para> The latter (hook model) could be more future proof than the former solution
 since it modifies just one string selectively but it requires the package
 "whois" to be installed on the target system (for mkpasswd) or that you
 generate the $password string not at build time and include it crypted in
-the above script. </para>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Q: How to disable autologin?</para>
-	<para>A1: use the commandline parameter <screen>lh config --bootappend-live "noautologin"</screen>
-	<para>A2: You need to set boot=noautologin noxautologin as described in man
+the above script. </para> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How to disable autologin?</para>
+      <para>A1: use the commandline parameter <screen>lh config --bootappend-live "noautologin"</screen> <para>A2: You need to set boot=noautologin noxautologin as described in man
 <filename>live-initramfs</filename> If you boot via TFTP you want to insert
-the option to pxelinux.cfg/default</para>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I change default hostname or username?</para>
-	<para>A: To change default hostname or username: <screen>$ lh_config --hostname myhostname
-$ lh_config --username myusername</screen>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I make the final image smaller?</para>
-	<para>A: Clean orphaned apps/libs: Install package "deborphan" and then run 'sudo
+the option to pxelinux.cfg/default</para> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I change default hostname or username?</para>
+      <para>A: To change default hostname or username: <screen>$ lh_config --hostname myhostname $ lh_config --username myusername</screen> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I make the final image smaller?</para>
+      <para>A: Clean orphaned apps/libs: Install package "deborphan" and then run 'sudo
 deborphan -n' . Delete unwanted packages. Remove the apt cache. Purge
-unwanted locales (see "localepurge" package).
-	</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I customize bash-config permanently (aliases, bash-completion
+unwanted locales (see "localepurge" package). </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I customize bash-config permanently (aliases, bash-completion
 etc.)?</para>
-	<para>A: Add your own .bashrc config/chroot_local-includes/etc/skel/.bashrc</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I disable services permanently? (Be careful!)</para>
-	<para> A: Add a chroot local hook script to disable a service each time you build
-an image:	</para>
-	<para>e.g. config/chroot_local-hooks/01-disable_service.sh <screen>#!/bin/sh
-echo "I: disable service"
-update-rc.d -f   &#9001;service name &#9002; remove </screen> <screen> $ chmod +x config/chroot_local-hooks/01-disable_service.sh </screen>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I enable | disable the md5checksum at the ISO building?
-<screen>lh_config --checksums enabled|disabled </screen> Or change the LH_CHECKSUMS value. 
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How to disable the generation of the .tar.gz file? <screen>lh_config --net-tarball none|gzip </screen> Or change the LH_NET_TARBALL value. (only available
-in snapsshot version at the moment 2008/Feb/28) 
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I "build a new image" ?</para>
-	<para> A: Run commands: <screen>$ sudo lh_clean --binary
-$ sudo lh_build </screen>
+      <para>A: Add your own .bashrc config/chroot_local-includes/etc/skel/.bashrc</para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I disable services permanently? (Be careful!)</para>
+      <para> A: Add a chroot local hook script to disable a service each time you build
+an image: </para>
+      <para>e.g. config/chroot_local-hooks/01-disable_service.sh <screen>#!/bin/sh echo "I: disable service" update-rc.d -f 〈service name 〉 remove </screen> <screen> $ chmod +x config/chroot_local-hooks/01-disable_service.sh </screen> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I enable | disable the md5checksum at the ISO building?
+<screen>lh_config --checksums enabled|disabled </screen> Or change the LH_CHECKSUMS value. </para>
+    </listitem>
+    <listitem>
+      <para>Q: How to disable the generation of the .tar.gz file? <screen>lh_config --net-tarball none|gzip </screen> Or change the LH_NET_TARBALL value. (only available
+in snapsshot version at the moment 2008/Feb/28) </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I "build a new image" ?</para>
+      <para> A: Run commands: <screen>$ sudo lh_clean --binary $ sudo lh_build </screen>
 <emphasis>Hint:</emphasis> If the configuration had changed you should leave
-"--binary" out. This will clean your chroot directory too. 
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I use Fluxbox ?
-	<para>A: Add a new lists file with the fluxbox packages you want. </para>
-	<para>Create /home/$USERNAME/.dmrc file (default username is "user").</para>
-	<screen>$ cat .dmrc
-[Desktop]
-Session=fluxbox</screen> <note>.dmrc is owned by
-$USERNAME:$USERNAME. </note>
-	<para>See also <ulink
-url="http://wiki.debian.org/Fluxbox/">http://wiki.debian.org/Fluxbox</ulink></para>
-	<para> A short HOWTO can be found here: <ulink url="
+"--binary" out. This will clean your chroot directory too. </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I use Fluxbox ? <para>A: Add a new lists file with the fluxbox packages you want. </para> <para>Create /home/$USERNAME/.dmrc file (default username is "user").</para> <screen>$ cat .dmrc [Desktop] Session=fluxbox</screen> <note>.dmrc is owned by
+$USERNAME:$USERNAME. </note> <para>See also <ulink
+url="http://wiki.debian.org/Fluxbox/">http://wiki.debian.org/Fluxbox</ulink></para> <para> A short HOWTO can be found here: <ulink url="
 http://wiki.debian.org/MichaelAblassmeier/CustomLiveCD">
-http://wiki.debian.org/MichaelAblassmeier/CustomLiveCD</ulink></para>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I use custom repositories?</para>
-	<para>A: <ulink url="http://wiki.debian.org/DebianLive/Configuration">See
+http://wiki.debian.org/MichaelAblassmeier/CustomLiveCD</ulink></para> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I use custom repositories?</para>
+      <para>A: <ulink url="http://wiki.debian.org/DebianLive/Configuration">See
 DebianLive/Configuration.</ulink></para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I customize the artwork for the live CD (grub or syslinux boot
+    </listitem>
+    <listitem>
+      <para>Q: How do I customize the artwork for the live CD (grub or syslinux boot
 splash, usplash, etc.)?</para>
-	<para>A: <ulink url="http://wiki.debian.org/DebianLive/Howto/Custom_Artwork"> See
+      <para>A: <ulink url="http://wiki.debian.org/DebianLive/Howto/Custom_Artwork"> See
 DebianLive/Howto/Custom_Artwork. </ulink> FIXME: NEED TO UPDATE</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I customize desktop environment (KDE, GNOME, XFCE, etc...) look?
-	<para>A: Start the live system in qemu:  </para>
-	<screen>$ qemu -m 256 -cdrom binary.iso -boot d -redir tcp:4222:10.0.2.15:22</screen> <note>the -redir argument must be
-changed to meet your needs </note>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I execute a custom shell script inside the chroot system after the
+    </listitem>
+    <listitem>
+      <para>Q: How do I customize desktop environment (KDE, GNOME, XFCE, etc...) look? <para>A: Start the live system in qemu: </para> <screen>$ qemu -m 256 -cdrom binary.iso -boot d -redir tcp:4222:10.0.2.15:22</screen> <note>the -redir argument must be
+changed to meet your needs </note> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I execute a custom shell script inside the chroot system after the
 chroot stage?</para>
-	<para>A: Add your script in config/chroot_local-hooks. </para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I add a script running immediately after all other scripts when
-the live system boots?
-	<para>A: Add your script in
-config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/99script </para>
-	<screen>$ chmod +x config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/99script</screen> <note>The hook script must be
+      <para>A: Add your script in config/chroot_local-hooks. </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I add a script running immediately after all other scripts when
+the live system boots? <para>A: Add your script in
+config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/99script </para> <screen>$ chmod +x config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/99script</screen> <note>The hook script must be
 executable. Do not forget to lh_clean --chroot after making this change
-before you build again. </note>
-	<para>You must also use the example script
+before you build again. </note> <para>You must also use the example script
 /usr/share/live-helper/examples/hooks/update-initramfs.sh to ensure your
 script gets built into the initramfs (read the comment header for
-instructions). </para>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I add software not in Debian ?</para>
-	<para>A: See <xref linkend="packages" /> Customising package installation</para>
-</listitem>
-
-<listitem>
-	<para>Q: What is the manifest with Ubuntu used for?</para>
-	<para>A: Manifest is just the package list, which ubuntu does $something
+instructions). </para> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I add software not in Debian ?</para>
+      <para>A: See <xref linkend="packages"/> Customising package installation</para>
+    </listitem>
+    <listitem>
+      <para>Q: What is the manifest with Ubuntu used for?</para>
+      <para>A: Manifest is just the package list, which ubuntu does $something
 with. Don't worry about it. </para>
-</listitem>
-
-<listitem>
-	<para>Q: What is this {p} syntax with mtools{p} and parted{p} ?</para>
-	<para>A: That's aptitude. </para>
-</listitem>
-
-<listitem>
-	<para>Q: Do I need to write the image on USB stick to test it? <note>you must use
-qemu >= 0.8. </note>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: What is /cow ?</para>
-	<para>A: Copy-on-write, the 'diff' from unionfs. </para>
-</listitem>
-
-<listitem>
-	<para>Q: Is /usr/share/live-helper/lists/standard-x11 like preseed or is preseed
+    </listitem>
+    <listitem>
+      <para>Q: What is this {p} syntax with mtools{p} and parted{p} ?</para>
+      <para>A: That's aptitude. </para>
+    </listitem>
+    <listitem>
+      <para>Q: Do I need to write the image on USB stick to test it? <note>you must use
+qemu &gt;= 0.8. </note> </para>
+    </listitem>
+    <listitem>
+      <para>Q: What is /cow ?</para>
+      <para>A: Copy-on-write, the 'diff' from unionfs. </para>
+    </listitem>
+    <listitem>
+      <para>Q: Is /usr/share/live-helper/lists/standard-x11 like preseed or is preseed
 something else entirely?</para>
-	<para>A: It is not. It is a package list, not a debconf preseeding. </para>
-</listitem>
-
-<listitem>
-	<para>Q: What is the difference between standard and minimal?
-	<para>standard: packages of priority standard and higher;</para>
-	<para>minimal: packages of priority essential and higher; </para>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Q: What can the sections be used for? Aren't they BIG?</para>
-	<para>A: Someone maybe wants to include packages from contrib or non-free. </para>
-</listitem>
-
-<listitem>
-	<para>Q: memtest86+ ... is that used?</para>
-	<para>A: Yes </para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I build using predefined packages lists?
-	<para>A: e.g. to build using standard-x11 packages list:  </para>
-	<screen>$ sudo lh_config -p standard-x11
-$ sudo lh_build</screen> <note>The packages lists can be found in
-/usr/share/live-helper/lists/ directory. </note>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I rebuild without downloading all the packages again?
-	<para>A: All packages are cached in cache subdirectory. They remain until a clean
-purge: </para>
-	<screen>$ sudo lh_clean --purge</screen>
-	<para>You do not have to do anything to prevent packages from being
+      <para>A: It is not. It is a package list, not a debconf preseeding. </para>
+    </listitem>
+    <listitem>
+      <para>Q: What is the difference between standard and minimal? <para>standard: packages of priority standard and higher;</para> <para>minimal: packages of priority essential and higher; </para> </para>
+    </listitem>
+    <listitem>
+      <para>Q: What can the sections be used for? Aren't they BIG?</para>
+      <para>A: Someone maybe wants to include packages from contrib or non-free. </para>
+    </listitem>
+    <listitem>
+      <para>Q: memtest86+ ... is that used?</para>
+      <para>A: Yes </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I build using predefined packages lists? <para>A: e.g. to build using standard-x11 packages list: </para> <screen>$ sudo lh_config -p standard-x11 $ sudo lh_build</screen> <note>The packages lists can be found in
+/usr/share/live-helper/lists/ directory. </note> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I rebuild without downloading all the packages again? <para>A: All packages are cached in cache subdirectory. They remain until a clean
+purge: </para> <screen>$ sudo lh_clean --purge</screen> <para>You do not have to do anything to prevent packages from being
 re-downloaded. You need to remember to clean whichever stages you want to
-rebuild first. </para>
-	<para>e.g. to rebuild from the cached bootstrap, chroot packages and build a new
-image. </para>
-	<screen>$ sudo lh_clean
-$ sudo lh_build</screen>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I boot USB debian-live on systems not supporting USB boot?
-	<para>A: Make a boot CD with grub, configured to boot from a debian-live kernel
-copied on the cd structure.</para>
-	<screen>$ mkdir -p iso/boot/grub
-$ cp /usr/lib/grub/i386-pc/stage2_eltorito iso/boot/grub
-$ cp chroot/boot/* iso/boot/</screen>
-	<para>Create iso/boot/grub/menu.lst  </para>
-	<screen>default 0
-timeout 5
-color cyan/blue white/blue
-title Debian Live
-root (cd)
-kernel /boot/vmlinuz boot=live
-initrd /boot/initrd.img</screen>
-<para>Create the iso image </para>
-	<screen>$ mkisofs -R -b boot/grub/stage2_eltorito -no-emul-boot \
--boot-load-size 4 -boot-info-table -o grub.iso iso</screen>
-<para>Burn the image. </para>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I boot debian-live on systems not supporting CDROM or USB boot?</para>
-	<para>A: If you have a floppy drive, you may be able to use it, otherwise you will
+rebuild first. </para> <para>e.g. to rebuild from the cached bootstrap, chroot packages and build a new
+image. </para> <screen>$ sudo lh_clean $ sudo lh_build</screen> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I boot USB debian-live on systems not supporting USB boot? <para>A: Make a boot CD with grub, configured to boot from a debian-live kernel
+copied on the cd structure.</para> <screen>$ mkdir -p iso/boot/grub $ cp /usr/lib/grub/i386-pc/stage2_eltorito iso/boot/grub $ cp chroot/boot/* iso/boot/</screen> <para>Create iso/boot/grub/menu.lst </para> <screen>default 0 timeout 5 color cyan/blue white/blue title Debian Live root (cd) kernel /boot/vmlinuz boot=live initrd /boot/initrd.img</screen> <para>Create the iso image </para> <screen>$ mkisofs -R -b boot/grub/stage2_eltorito -no-emul-boot \ -boot-load-size 4 -boot-info-table -o grub.iso iso</screen> <para>Burn the image. </para> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I boot debian-live on systems not supporting CDROM or USB boot?</para>
+      <para>A: If you have a floppy drive, you may be able to use it, otherwise you will
 need to use loadlin/grub4dos/win32-loader. If you have a second system to
 serve up the image over the network, <ulink
 url="DebianLive/Howto/Creating_a_Netboot_Image"> See
-DebianLive/Howto/Creating_a_Netboot_Image. </ulink> FIXME LINK
-	</para>
-</listitem>
-
-<listitem>
-	<para>Q: The X configuration does not seems to work, the resolution is too
-low. What can I do?
-	<para>A: Use xdebconfigurator </para>
-	<screen>$ lh_config --bootappend xdebconf
-$ lh_config --packages xdebconfigurator</screen>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: Apache has problems with static files
-	<para>A: Sendfile does not work well on the unionfs used by Debian Live. Add the
-following to apache's configuration: </para>
-	<screen>EnableSendfile off</screen>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I make hard disk partitions auto-mountable?
-	<para><command>A: Short answer:</command> Right now the best is to use a script
+DebianLive/Howto/Creating_a_Netboot_Image. </ulink> FIXME LINK </para>
+    </listitem>
+    <listitem>
+      <para>Q: The X configuration does not seems to work, the resolution is too
+low. What can I do? <para>A: Use xdebconfigurator </para> <screen>$ lh_config --bootappend xdebconf $ lh_config --packages xdebconfigurator</screen> </para>
+    </listitem>
+    <listitem>
+      <para>Q: Apache has problems with static files <para>A: Sendfile does not work well on the unionfs used by Debian Live. Add the
+following to apache's configuration: </para> <screen>EnableSendfile off</screen> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I make hard disk partitions auto-mountable? <para><command>A: Short answer:</command> Right now the best is to use a script
 that will populate the fstab when the CD is booting. Such a script can be
 found <ulink
 url="https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-includes/sbin/diskmounter.sh">
 FIXME BROKEN LINK </ulink>. A proper solution based on HAL will be described
-here in a hopefully near future. </para>
-	<para><command>A: Long Answer: </command> Since 55_nonpolkit-mount-policy.patch in
+here in a hopefully near future. </para> <para><command>A: Long Answer: </command> Since 55_nonpolkit-mount-policy.patch in
 HAL, debian-storage-policy-fixed-drives.fdi is not available anymore and the
 previous trick that consisted to remove this file to enable automounting of
-fixed drives as a consequence is obsolete.</para>
-	<para>Eventually, it will be possible to combine HAL and PolicyKit to enable
+fixed drives as a consequence is obsolete.</para> <para>Eventually, it will be possible to combine HAL and PolicyKit to enable
 different permissions and actions to achieve advanced (auto)mounting for
 non-root users. Until then, because the live scripts are only touching to
 the fstab to add a swap partition if discovered at boot time, the only way
 to have fixed drives mounted automatically is to use a script that will
-populate the fstab file at the end of the multiuser runlevel. </para>
-	<para>To achieve this, you can do, for example, the following: 
-	<para>download the <ulink
+populate the fstab file at the end of the multiuser runlevel. </para> <para>To achieve this, you can do, for example, the following: <para>download the <ulink
 url="https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-includes/sbin/diskmounter.sh">
-diskmounter.sh script FIXME BROKEN LINK </ulink> </para>
-	<para>Create the chroot_local-includes/sbin directory, and move the script inside</para>
-	<para>Make sure the script is executable (chmod +x diskmounter.sh)</para>
-	<para>create the chroot_local-includes/etc/rc.local file and call the diskmounter
+diskmounter.sh script FIXME BROKEN LINK </ulink> </para> <para>Create the chroot_local-includes/sbin directory, and move the script inside</para> <para>Make sure the script is executable (chmod +x diskmounter.sh)</para> <para>create the chroot_local-includes/etc/rc.local file and call the diskmounter
 from there (see this <ulink
 url="https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-includes/etc/rc.local">
-rc.local FIXME BROKEN LINK </ulink> </para>	
-	</para>
-When called correctly, the script detects ext2, ext3, reiserfs, xfs, FAT32,
+rc.local FIXME BROKEN LINK </ulink> </para> </para> When called correctly, the script detects ext2, ext3, reiserfs, xfs, FAT32,
 HFS+ and NTFS partitions and mount them read-write, except for NTFS. This
 will change soon and an option will be available to use ntfs-3g to mount
-NTFS as read-write.
-<para>comments, patches and other things about this script and issue:
-http://code.goto10.org/projects/puredyne/ticket/463</para>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: Boot fails with panic: can't open /scripts/live </para>
-	<para>A: Add latest live-initramfs deb package into config/chroot_local-packages
+NTFS as read-write. <para>comments, patches and other things about this script and issue:
+http://code.goto10.org/projects/puredyne/ticket/463</para> </para>
+    </listitem>
+    <listitem>
+      <para>Q: Boot fails with panic: can't open /scripts/live </para>
+      <para>A: Add latest live-initramfs deb package into config/chroot_local-packages
 directory and rebuild. </para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I configure the locale and the keyboard? </para>
-	<para>A: See <xref linkend="internalization" /> 10n</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I get past boot prompt without a working keyboard? </para>
-	<para>A: See <xref linkend="bootup" /> Customising the bootup process</para>
-	<note>Boot from an USB-HDD on an iMac with GRUB did not work. </note>
-</listitem>
-
-<listitem>
-	<para>Q: Can I serve the root image from a web or ftp server?
-	<para>A: Since live-initramfs 1.99, it should be possible to use the fetch=
+    </listitem>
+    <listitem>
+      <para>Q: How do I configure the locale and the keyboard? </para>
+      <para>A: See <xref linkend="internalization"/> 10n</para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I get past boot prompt without a working keyboard? </para>
+      <para>A: See <xref linkend="bootup"/> Customising the bootup process</para>
+      <note>Boot from an USB-HDD on an iMac with GRUB did not work. </note>
+    </listitem>
+    <listitem>
+      <para>Q: Can I serve the root image from a web or ftp server? <para>A: Since live-initramfs 1.99, it should be possible to use the fetch=
 argument on the kernel command line. You can build a netboot image as usual,
 and when you are done edit the tftpboot/pxelinux.cfg/default file. Remove
 the references to network boot (netboot, nfsroot, nfsopts), and replace with
-fetch= &#9001;url where you placed the root image>. </para>
-	<note>You have to include wget in the chroot. It could work for other boot
+fetch= 〈url where you placed the root image&gt;. </para> <note>You have to include wget in the chroot. It could work for other boot
 methods as well. However, I am not sure the live scripts configure the
-network when booting from a CD or USB disk.</note> <screen>$ lh_config --packages wget</screen>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: Why doesn't quickreboot (or some other boot parameter) work?
-	<para>A: If you are building an etch image (which was the default up to
+network when booting from a CD or USB disk.</note> <screen>$ lh_config --packages wget</screen> </para>
+    </listitem>
+    <listitem>
+      <para>Q: Why doesn't quickreboot (or some other boot parameter) work? <para>A: If you are building an etch image (which was the default up to
 2007/09/14) you have a very old version of casper which does not support
 quickreboot and possibly other boot parameters as well. You could configure
 your sources to use live-backports (see
 /usr/share/live-helper/examples/sources/live-backports) and switch to
 live-initramfs, or better yet, build a lenny image instead, which is the new
-default. </para>
-	<screen>$ lh_config --distribution lenny
-$ lh_config --initramfs live-initramfs</screen>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I fix "Could not find kernel image" issue with syslinux
-bootloader?
-	<para>A: Add a binary local hook script to fix kernel and initrd path each time
-you build an image. </para>
-	e.g. config/binary_local-hooks/01-fix_syslinux.sh <screen>#!/bin/sh
-SYSLINUXCFG=`find binary -type f -name syslinux.cfg`
-sed -i "s|kernel /vmlinuz|kernel vmlinuz|g" ${SYSLINUXCFG}
-sed -i "s|initrd=/initrd|initrd=initrd|g" ${SYSLINUXCFG}</screen> <screen>$ chmod +x config/binary_local-hooks/01-fix_syslinux.sh</screen>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I use a newer kernel with lenny?
-	<para>A: A build with backports.org kernels will fail as that repository lacks the
+default. </para> <screen>$ lh_config --distribution lenny $ lh_config --initramfs live-initramfs</screen> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I fix "Could not find kernel image" issue with syslinux
+bootloader? <para>A: Add a binary local hook script to fix kernel and initrd path each time
+you build an image. </para> e.g. config/binary_local-hooks/01-fix_syslinux.sh <screen>#!/bin/sh SYSLINUXCFG=`find binary -type f -name syslinux.cfg` sed -i "s|kernel /vmlinuz|kernel vmlinuz|g" ${SYSLINUXCFG} sed -i "s|initrd=/initrd|initrd=initrd|g" ${SYSLINUXCFG}</screen> <screen>$ chmod +x config/binary_local-hooks/01-fix_syslinux.sh</screen> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I use a newer kernel with lenny? <para>A: A build with backports.org kernels will fail as that repository lacks the
 necessary module packages (linux-modules-extra-2.6, aufs, etc.). Use the
 kernel backports <ulink
 url="http://unsupported.debian-maintainers.org/backports-kernel/">
-http://unsupported.debian-maintainers.org/backports-kernel/. </ulink> </para>
-	The quick way to success: <screen>$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6 squashfs-modules-2.6'
-
-$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.chroot
-$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.binary
-
-$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.chroot.gpg
-$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.binary.gpg
-
-$ lh_build</screen>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I use a custom kernel?
-	<para>&#9002; Is there a nice way of booting debian-live with a custom kernel (not
-in an apt repo)?  </para>
-	<para>A: Copy it into config/chroot_local-packages and set
-LH_LINUX_PACKAGES="none" or use lh config --linux-packages " " </para>
-	<para>Don't forget to compile your kernel with an union filesystem (unionfs or
-aufs), squashfs modules, and initrd support. </para>
-	<para>&#9002; I can cause the kernel to be installed but it seems this happens
-later than grub/syslinux is configured so it's not listed and casper/ and
-the menu require munging. </para>
-	 <para>You need to follow the debian scheme, e.g. placing the files in /boot as
-vmlinuz-$version and initrd.img-$version etc. </para>
-	 <para>I personally wouldn't go that way which is too much of a hassle, and just
+http://unsupported.debian-maintainers.org/backports-kernel/. </ulink> </para> The quick way to success: <screen>$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6 squashfs-modules-2.6' $ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' &gt; config/chroot_sources/backports-kernel.chroot $ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' &gt; config/chroot_sources/backports-kernel.binary $ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.chroot.gpg $ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.binary.gpg $ lh_build</screen> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I use a custom kernel? <para>〉 Is there a nice way of booting debian-live with a custom kernel (not in an
+apt repo)? </para> <para>A: Copy it into config/chroot_local-packages and set
+LH_LINUX_PACKAGES="none" or use lh config --linux-packages " " </para> <para>Don't forget to compile your kernel with an union filesystem (unionfs or
+aufs), squashfs modules, and initrd support. </para> <para>〉 I can cause the kernel to be installed but it seems this happens later
+than grub/syslinux is configured so it's not listed and casper/ and the menu
+require munging. </para> <para>You need to follow the debian scheme, e.g. placing the files in /boot as
+vmlinuz-$version and initrd.img-$version etc. </para> <para>I personally wouldn't go that way which is too much of a hassle, and just
 use make-kpkg to produce custom kernel deb packages. They should integrate
 nicely if you just put them into config/chroot_local-packages and set
-LH_LINUX_PACKAGES="". </para>
-	   <para><emphasis>Hint:</emphasis> to work around an error, which lh_binary_syslinux
+LH_LINUX_PACKAGES="". </para> <para><emphasis>Hint:</emphasis> to work around an error, which lh_binary_syslinux
 will throw on custom kernels if there is not an 468/686 in the kernel-name,
 you need to set CONFIG_LOCALVERSION="-486" or "-686" within the kernel
-configuration (-> General setup -> Local version set to -486 or -686)
+configuration (-&gt; General setup -&gt; Local version set to -486 or -686)
 corresponding to LH_LINUX_FLAVOURS="" or "686". this at least up till
-live-helper version 1.0~a40-1</para>
-	  see 
-	   <para><ulink
+live-helper version 1.0~a40-1</para> see <para><ulink
 url="http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-July/001947.html">
-http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-July/001947.html</ulink>  </para> and
-	    <para><ulink
-url="http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-November/002581.html">http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-November/002581.html</ulink></para>
-
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I create a cross arch live CD image?
-	<para><command>A: In short:</command> You can't. Read on:  </para>
-	<para>The procedure to create a live CD is based on creating a chroot that
+http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-July/001947.html</ulink></para> and <para><ulink
+url="http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-November/002581.html">http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-November/002581.html</ulink></para> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I create a cross arch live CD image? <para><command>A: In short:</command> You can't. Read on: </para> <para>The procedure to create a live CD is based on creating a chroot that
 contains the files that will be finally available on the live CD. The live
 CD building procedure includes chrooting into the chroot dir and so some
 operations. chrooting means that the terminal you chroot on will behave as a
 different system so your real system and the chroot environment is decoupled
-somehow.</para>
-	<para>Once the live CD scripts chroots into the chroot dir they have some
+somehow.</para> <para>Once the live CD scripts chroots into the chroot dir they have some
 operations to do inside that environment and your real system won't be able
-to run them unless you are using the same architecture.</para>
-	<para>So you only are able to make live CD for the arch you run on. But this
+to run them unless you are using the same architecture.</para> <para>So you only are able to make live CD for the arch you run on. But this
 doesn't prevent you run qemu or some other machine emulator that make this
-possible.</para>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: When is a lh_clean necessary?
-	<para>lh_clean is a script in /usr/bin/ </para>
-	<para>A: That depends what you've changed between builds
-	<para>If, for example, you've built an iso image and you want a usb image, you
+possible.</para> </para>
+    </listitem>
+    <listitem>
+      <para>Q: When is a lh_clean necessary? <para>lh_clean is a script in /usr/bin/ </para> <para>A: That depends what you've changed between builds <para>If, for example, you've built an iso image and you want a usb image, you
 only need to run <command> lh_clean --binary </command> before you run
-lh_build again. </para>
-	<para>If you've <command> changed anything in the chroot </command> , you'll need
+lh_build again. </para> <para>If you've <command> changed anything in the chroot </command> , you'll need
 to cleanup both chroot and binary with <command> lh_clean </command>before
-continuing </para>
-	</para>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Q: How can i set boot= parameters?</para>
-	<para>A: Set LH_BOOTAPPEND_LIVE in config/binary </para>
-
-</listitem>
-
-<listitem>
-	<para>Q: How do I include different modules to load when the live system boots?
-	<para>A: Configure config/chroot_local-includes/etc/initramfs-tools/ </para>
-	<para>The lh_chroot_hacks helper rebuilds the live/initrd1.img using the default
+continuing </para> </para> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How can i set boot= parameters?</para>
+      <para>A: Set LH_BOOTAPPEND_LIVE in config/binary </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I include different modules to load when the live system boots? <para>A: Configure config/chroot_local-includes/etc/initramfs-tools/ </para> <para>The lh_chroot_hacks helper rebuilds the live/initrd1.img using the default
 initramfs.conf "MODULES = most". You may override that by supplying your own
-initramfs.conf, or else just add your own modules, e.g. </para>
-	<screen>mkdir -p config/chroot_local-includes/etc/initramfs-tools/
-echo "atl2" >> config/chroot_local-includes/etc/initramfs-tools/modules</screen> <note>Even though initramfs.conf(5) says
+initramfs.conf, or else just add your own modules, e.g. </para> <screen>mkdir -p config/chroot_local-includes/etc/initramfs-tools/ echo "atl2" &gt;&gt; config/chroot_local-includes/etc/initramfs-tools/modules</screen> <note>Even though initramfs.conf(5) says
 "most adds all the framebuffer, acpi, file system, ide, sata, scsi and usb
 drivers", it actually includes network drivers as well. See
 auto_add_modules() in /usr/share/initramfs-tools/hook-functions for the
-complete list. </note>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: Can I have a splash screen?
-	<para>A: Yes you can </para>
-	You will not know what is going on when the splash screen is active, it may
+complete list. </note> </para>
+    </listitem>
+    <listitem>
+      <para>Q: Can I have a splash screen? <para>A: Yes you can </para> You will not know what is going on when the splash screen is active, it may
 fail to activate on some hardware or break X on other (both usplash and
 splashy use libdirectfb which does some evil voodoo and may break you
 graphics or input until you reboot). However, you can install and activate
-it just as you would on any other Debian system.
-	<para>To use splashy: </para>
-	<para> 1) install splashy and read the README, the manpages are useless for setting
+it just as you would on any other Debian system. <para>To use splashy: </para> <para> 1) install splashy and read the README, the manpages are useless for setting
 it up. Add some parameters to your kernel command line, such as in your
 pxelinux configuration or in LH_BOOTAPPEND_LIVE in config/binary in
-debian-live configuration: </para>
-	<screen>vga=792 splash quiet</screen>
-	<para><filename>vga </filename>to select video mode, <filename>splash
+debian-live configuration: </para> <screen>vga=792 splash quiet</screen> <para><filename>vga </filename>to select video mode, <filename>splash
 </filename>to activate splashy, <filename>quiet</filename> to suppress most
 kernel messages that you cannot see anyway but would scroll past before
-splashy manages to paint the graphics on your screen.</para>
-	You might want to add splashy to the list of packages installed in your
-image: <screen>echo splashy > config/chroot_local-packageslists/splashy
-echo splashy-themes >> config/chroot_local-packageslists/splashy</screen>
-<para>and select a theme:</para>
-	<screen>echo '#!/bin/sh' > config/chroot_local-hooks/splashy
-echo splashy_config -s debian-moreblue '||' true >> config/chroot_local-hooks/splashy
-# update the ramdisk to include the splash screen
-echo update-initramfs -u -k all >> config/chroot_local-hooks/splashy
-chmod 755 config/chroot_local-hooks/splashy 	</screen>
-<para> After you rebuild your live system you should observe a bluish splash screen
+splashy manages to paint the graphics on your screen.</para> You might want to add splashy to the list of packages installed in your
+image: <screen>echo splashy &gt; config/chroot_local-packageslists/splashy echo splashy-themes &gt;&gt; config/chroot_local-packageslists/splashy</screen> <para>and select a theme:</para> <screen>echo '#!/bin/sh' &gt; config/chroot_local-hooks/splashy echo splashy_config -s debian-moreblue '||' true &gt;&gt; config/chroot_local-hooks/splashy # update the ramdisk to include the splash screen echo update-initramfs -u -k all &gt;&gt; config/chroot_local-hooks/splashy chmod 755 config/chroot_local-hooks/splashy </screen> <para> After you rebuild your live system you should observe a bluish splash screen
 while booting. Nothing happens while initramfs is running because there is
 no splashy support in initramfs-tools. Once the init starts the progress bar
-should start to fill.</para>
-<para>If <filename> vga=something</filename> sets a mode that your screen cannot
+should start to fill.</para> <para>If <filename> vga=something</filename> sets a mode that your screen cannot
 show or your card cannot do vesa 2.0 (and thus you get plain text mode and
-no splashy) read the splashy faq.</para>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: Howto use my Broadcom eXtrem 2 network card (module bnx2) ?
-	<para>A: Add the firmwares to the initrd image. </para>
-	<para>You need to install the non-free package "firmware-bnx2". Uncompress your
-initrd image, then copy files : </para>
-	<screen>cp /lib/firmware/bnx2* ${INITRD}/lib/firmware/
-cp /lib/udev/firmware.agent ${INITRD}/lib/udev/</screen> Recompress your initrd image and boot:
-it works ! 
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: X is broken (the system boots, messages scroll by, and then the screen
-goes blank). What do I do?
-	<para>On my system starting X completely disables graphics so that I do not see
+no splashy) read the splashy faq.</para> </para>
+    </listitem>
+    <listitem>
+      <para>Q: Howto use my Broadcom eXtrem 2 network card (module bnx2) ? <para>A: Add the firmwares to the initrd image. </para> <para>You need to install the non-free package "firmware-bnx2". Uncompress your
+initrd image, then copy files : </para> <screen>cp /lib/firmware/bnx2* ${INITRD}/lib/firmware/ cp /lib/udev/firmware.agent ${INITRD}/lib/udev/</screen> Recompress your initrd image and boot:
+it works ! </para>
+    </listitem>
+    <listitem>
+      <para>Q: X is broken (the system boots, messages scroll by, and then the screen
+goes blank). What do I do? <para>On my system starting X completely disables graphics so that I do not see
 anything even after X bails out and I am back to the console. To prevent
-this you can change the driver Xorg uses.</para>
-	<para>If you have a working splash screen or at least graphical console you can
-use </para>
-	<filename>live xdriver=fbdev</filename>
-	<para>when booting the live system (instead of just enter). </para>
-	Another driver you might want to try is <filename> vesa. </filename>
-	<para>If all fails you might try to set xdriver to some wrong value so that Xorg
+this you can change the driver Xorg uses.</para> <para>If you have a working splash screen or at least graphical console you can
+use </para> <filename>live xdriver=fbdev</filename> <para>when booting the live system (instead of just enter). </para> Another driver you might want to try is <filename> vesa. </filename> <para>If all fails you might try to set xdriver to some wrong value so that Xorg
 fails to start and you can examine the system while you still see something
-on the console. </para>
-	<filename>live xdriver=none</filename>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How can I get Debian first stable versions?</para>
-	<para>I'm developing software and testing it on Live-CD. Thanks for the LiveCD
+on the console. </para> <filename>live xdriver=none</filename> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How can I get Debian first stable versions?</para>
+      <para>I'm developing software and testing it on Live-CD. Thanks for the LiveCD
 project. To be sure my development is fully compatible with the "etch"
 version, I need the same scenario when Debian GNU/Linux 4.0 was published as
 stable (I believe 2007.04.08). If there was some bug on 2007.04.08 that was
 corrected one week later, I need to test software foreseeing that scenario
 without the bug solved.</para>
-</listitem>
-
-<listitem>
-	<para>Q: I get "fopen: Permission denied"-warnings from apt on building/at the
+    </listitem>
+    <listitem>
+      <para>Q: I get "fopen: Permission denied"-warnings from apt on building/at the
 live-system</para>
-	<para>That's a harmless bug in apt. However, if you want to get off this warnings
+      <para>That's a harmless bug in apt. However, if you want to get off this warnings
 in the live-system, add a file in chroot_local-hooks with follow row: </para>
-	<screen> chown -R man.man /var/cache/man </screen>
-</listitem>
-
-<listitem>
-	<para>Q: Why I always fail during "Retrieving Packages" stage when running
+      <screen> chown -R man.man /var/cache/man </screen>
+    </listitem>
+    <listitem>
+      <para>Q: Why I always fail during "Retrieving Packages" stage when running
 lh_build? I have already set apt-http-proxy and so on.</para>
-	<para>A: lh_build retrieves packages via wget, as a result you need to enable the
+      <para>A: lh_build retrieves packages via wget, as a result you need to enable the
 proxy settings in /etc/wgetrc before running lh_build.</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I edit Xorg.conf?
-	<para>A: Xorg.conf is generated every time system boots, so it's useless to put
+    </listitem>
+    <listitem>
+      <para>Q: How do I edit Xorg.conf? <para>A: Xorg.conf is generated every time system boots, so it's useless to put
 modifed Xorg.conf in config/choort_local-includes/etc/X11, because it will
 be overwritten during boot. However, you can edit /usr/bin/dexconf, which
 generate xorg.conf during boot, so the result will be modified
 Xorg.conf. The modified dexconf has to be put in
 config/choort_local-includes/usr/bin. e.g.: you can configure Xorg.conf for
 two or more keyboards layouts with alt+shift toggle by editing dexconf and
-replacing the line:</para>
-	<screen>Option          "XkbLayout"     "$XKB_LAYOUT"</screen>
-	<para>with the lines: </para>
-	<screen>Option             "XkbLayout"     "us,il"
-Option             "XkbOptions"   "grp:alt_shift_toggle,grp_led:scroll"</screen>
-	<para>when "us,il" are the wanted keyboard layouts.</para>
-	<para>You can force default screen resulotion (e.g. 1024*768) by adding the lines:
-.</para>
-	<screen>  SubSection     "Display"
-               Modes  "1024x768"
-               EndSubSection</screen>
-       	<para>between the lines:</para>
-	<screen>  Section "Screen"
-        Identifier      "Default Screen"
-        Monitor         "Configured Monitor"
-            . . . . . . .
-SECTION
-printf "EndSection\n" &#9002; &amp;4</screen>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: Where are the build parameters for the prebuilt images</para>
-	<para>A: See <ulink
+replacing the line:</para> <screen>Option "XkbLayout" "$XKB_LAYOUT"</screen> <para>with the lines: </para> <screen>Option "XkbLayout" "us,il" Option "XkbOptions" "grp:alt_shift_toggle,grp_led:scroll"</screen> <para>when "us,il" are the wanted keyboard layouts.</para> <para>You can force default screen resulotion (e.g. 1024*768) by adding the lines:
+.</para> <screen> SubSection "Display" Modes "1024x768" EndSubSection</screen> <para>between the lines:</para> <screen> Section "Screen" Identifier "Default Screen" Monitor "Configured Monitor" . . . . . . . SECTION printf "EndSection\n" 〉 &amp;4</screen> </para>
+    </listitem>
+    <listitem>
+      <para>Q: Where are the build parameters for the prebuilt images</para>
+      <para>A: See <ulink
 url="http://live.debian.net/README.images">http://live.debian.net/README.images.</ulink></para>
-</listitem>
-
-</itemizedlist>
-
+    </listitem>
+  </itemizedlist>
 </chapter>
diff --git a/manual/de/index.xml b/manual/de/index.xml
index 2166412..f704cf2 100644
--- a/manual/de/index.xml
+++ b/manual/de/index.xml
@@ -1,70 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-  <!ENTITY pubdate "2010-06-06">
-  <!ENTITY version "2.0~a1">
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
+<!ENTITY pubdate "2010-06-06">
+<!ENTITY version "2.0~a1">
 ]>
 <book lang="en">
-
-<title>Debian Live Manual</title>
-<!-- Chapters -->
+  <title>Debian Live Manual</title>
+  <!-- Chapters -->
 <bookinfo>
-<author> <othername>The Debian Live Project</othername>
+    <author> <othername>The Debian Live Project</othername>
 <email>debian-live at lists.debian.org</email> </author>
-
-<releaseinfo>&version;</releaseinfo>
-<pubdate>&pubdate;</pubdate> <copyright> <year>2008-2010</year> <holder>The
+    <releaseinfo>&version;</releaseinfo>
+    <pubdate>&pubdate;</pubdate> <copyright> <year>2008-2010</year> <holder>The
 Debian Live Project</holder> </copyright>
-
-<legalnotice>
-<para>
-This program is free software: you can redistribute it and/or modify it
+    <legalnotice>
+      <para> This program is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the Free
 Software Foundation, either version 3 of the License, or (at your option)
-any later version.
-</para>
-<para>
-This program is distributed in the hope that it will be useful, but WITHOUT
+any later version. </para>
+      <para> This program is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-more details.
-</para>
-<para>
-A copy of the GNU General Public License is available as
+more details. </para>
+      <para> A copy of the GNU General Public License is available as
 <filename>/usr/share/common-licenses/GPL</filename> in the Debian GNU/Linux
 distribution or on the World Wide Web at <ulink
-url="http://www.gnu.org/copyleft/gpl.html">the GNU web site</ulink>.  You
-can also obtain it by writing to the Free Software Foundation, Inc., 59
-Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-</para>
-<para>
-If you want to print this reference, this document is also available in
-Portable Document Format (PDF).
-</para>
-</legalnotice>
-</bookinfo>
-
-
-<xi:include href="about.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="installation.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="basics.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="overview.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="customization.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="common-tasks.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="live-environment.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="faq.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="reporting-bugs.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="coding-style.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="procedures.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="resources.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="use-cases.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="success-stories.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="troubleshooting.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-
-
-<!-- Appendecis -->
-<xi:include href="appendices_configuration-layout.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="appendices_configuration-files.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-
+url="http://www.gnu.org/copyleft/gpl.html">the GNU web site</ulink>. You can
+also obtain it by writing to the Free Software Foundation, Inc., 59 Temple
+Place - Suite 330, Boston, MA 02111-1307, USA. </para>
+      <para> If you want to print this reference, this document is also available in
+Portable Document Format (PDF). </para>
+    </legalnotice>
+  </bookinfo>
+  
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="about.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="installation.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="basics.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="overview.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="customization.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common-tasks.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="live-environment.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="faq.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="reporting-bugs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="coding-style.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="procedures.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="resources.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="use-cases.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="success-stories.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="troubleshooting.xml"/>
+  
+  <!-- Appendecis -->
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices_configuration-layout.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices_configuration-files.xml"/>
 </book>
diff --git a/manual/de/installation.xml b/manual/de/installation.xml
index 0b50b7f..73043c8 100644
--- a/manual/de/installation.xml
+++ b/manual/de/installation.xml
@@ -1,163 +1,147 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <chapter id="installation">
-<title>Installation</title>
-
-<section>
-<title>Requirements</title>
-
-<para>Building Debian Live images has very few system requirements:</para>
-
-<orderedlist>
-<listitem><para>Super user (root) access</para></listitem>
-<listitem><para>An up-to-date version of &live-helper;</para></listitem>
-<listitem><para>A POSIX-compliant shell, such as <command>bash</command> or
-<command>dash</command>.</para></listitem>
-<listitem><para><command>debootstrap</command> or <command>cdebootstrap</command></para></listitem>
-<listitem><para>Linux 2.6.x</para></listitem>
-</orderedlist>
-
-<para>Note that using Debian or a Debian-derived distribution is not required -
+  <title>Installation</title>
+  <section>
+    <title>Requirements</title>
+    <para>Building Debian Live images has very few system requirements:</para>
+    <orderedlist>
+      <listitem>
+        <para>Super user (root) access</para>
+      </listitem>
+      <listitem>
+        <para>An up-to-date version of &live-helper;</para>
+      </listitem>
+      <listitem>
+        <para>A POSIX-compliant shell, such as <command>bash</command> or
+<command>dash</command>.</para>
+      </listitem>
+      <listitem>
+        <para><command>debootstrap</command> or <command>cdebootstrap</command></para>
+      </listitem>
+      <listitem>
+        <para>Linux 2.6.x</para>
+      </listitem>
+    </orderedlist>
+    <para>Note that using Debian or a Debian-derived distribution is not required -
 &live-helper; will run on almost any operating system with the above
 requirements.</para>
-
-</section>
-
-<section>
-<title>Installing &live-helper;</title>
-
-<para>You can install &live-helper; in a number of different ways:</para>
-
-<orderedlist>
-<listitem><para>From the Debian repository</para></listitem>
-<listitem><para>From source</para></listitem>
-<listitem><para>From snapshots</para></listitem>
-<listitem><para>From backports.org</para></listitem>
-</orderedlist>
-
-<para>If you are using &lenny; or &sid; the recommended way is to install
+  </section>
+  <section>
+    <title>Installing &live-helper;</title>
+    <para>You can install &live-helper; in a number of different ways:</para>
+    <orderedlist>
+      <listitem>
+        <para>From the Debian repository</para>
+      </listitem>
+      <listitem>
+        <para>From source</para>
+      </listitem>
+      <listitem>
+        <para>From snapshots</para>
+      </listitem>
+      <listitem>
+        <para>From backports.org</para>
+      </listitem>
+    </orderedlist>
+    <para>If you are using &lenny; or &sid; the recommended way is to install
 &live-helper; via the Debian repository.</para>
-
-<section>
-<title>From the Debian repository</title>
-
-<para>Simply install &live-helper; like any other package:</para>
-<screen># apt-get install live-helper</screen>
-<para>or</para>
-<screen># aptitude install live-helper</screen>
-
-</section>
-
-<section>
-<title>From source</title>
-
-<para>&live-helper; is developed using the Git version control system. On Debian
+    <section>
+      <title>From the Debian repository</title>
+      <para>Simply install &live-helper; like any other package:</para>
+      <screen># apt-get install live-helper</screen>
+      <para>or</para>
+      <screen># aptitude install live-helper</screen>
+    </section>
+    <section>
+      <title>From source</title>
+      <para>&live-helper; is developed using the Git version control system. On Debian
 systems, this is provided by the <command>git-core</command> package. To
 check out the latest code, execute:</para>
-<screen>$ git clone git://live.debian.net/git/live-helper.git</screen>
-<para>You can build and install your own Debian package by executing:</para>
-<screen>
- $ cd live-helper
- $ dpkg-buildpackage -rfakeroot -b -uc -us
- $ cd ..
- # dpkg -i live-helper*.deb
-</screen>
-<para>You can also use a local version of &live-helper; without installation:</para>
-<screen># live-helper/helpers/lh_local</screen>
-<para>Subsequent calls to <filename>lh_</filename>-prefixed helpers in that shell
+      <screen>$ git clone git://live.debian.net/git/live-helper.git</screen>
+      <para>You can build and install your own Debian package by executing:</para>
+      <screen> $ cd live-helper $ dpkg-buildpackage -rfakeroot -b -uc -us $ cd .. # dpkg -i live-helper*.deb </screen>
+      <para>You can also use a local version of &live-helper; without installation:</para>
+      <screen># live-helper/helpers/lh_local</screen>
+      <para>Subsequent calls to <filename>lh_</filename>-prefixed helpers in that shell
 environment will then use the version located in the directory you executed
 <filename>lh_local</filename> from.</para>
-<para>You can also install &live-helper; directly to your system by executing:</para>
-<screen># make install</screen>
-
-</section>
-
-<section>
-<title>From 'snapshots'</title>
-<para>If you do not wish to build or install &live-helper; from source, you can
+      <para>You can also install &live-helper; directly to your system by executing:</para>
+      <screen># make install</screen>
+    </section>
+    <section>
+      <title>From 'snapshots'</title>
+      <para>If you do not wish to build or install &live-helper; from source, you can
 use snapshots. These are built automatically from the latest version in Git
 and are available on <ulink
 url="http://live.debian.net/debian/">http://live.debian.net/debian</ulink>.</para>
-</section>
-
-<section>
-<title>&live-initramfs;</title>
-
-<para><emphasis>N.B. You do not need to install &live-initramfs; on your system to
+    </section>
+    <section>
+      <title>&live-initramfs;</title>
+      <para>
+        <emphasis>N.B. You do not need to install &live-initramfs; on your system to
 create customised Debian Live systems. However, doing so will do no
-harm.</emphasis></para>
-
-<section>
-<title>Using a customised &live-initramfs;</title>
-
-<para>To modify the code you can follow the process below. Please ensure you are
+harm.</emphasis>
+      </para>
+      <section>
+        <title>Using a customised &live-initramfs;</title>
+        <para>To modify the code you can follow the process below. Please ensure you are
 familiar with the terms mentioned in <xref linkend="terms"/>.</para>
-
-<orderedlist>
-<listitem>
-<para>Checkout the &live-initramfs; source</para>
-<screen>$ git clone git://live.debian.net/git/live-initramfs.git</screen>
-</listitem>
-<listitem>
-<para>Make changes to your local copy</para>
-<para>And beware that if you want to add your pre-init script in live-bottom, you
+        <orderedlist>
+          <listitem>
+            <para>Checkout the &live-initramfs; source</para>
+            <screen>$ git clone git://live.debian.net/git/live-initramfs.git</screen>
+          </listitem>
+          <listitem>
+            <para>Make changes to your local copy</para>
+            <para>And beware that if you want to add your pre-init script in live-bottom, you
 should name it without dashes '-', e.g: call it "81new_feature" and not
 "81new-feature".</para>
-</listitem>
-<listitem>
-<para>Build a &live-initramfs; <command>.deb</command></para>
-<para>You must build either on your target distribution or in a chroot containing
+          </listitem>
+          <listitem>
+            <para>Build a &live-initramfs; <command>.deb</command></para>
+            <para>You must build either on your target distribution or in a chroot containing
 your target platform: this means if your target is lenny then you should
 build against lenny. You can use a personal builder such as
 <command>pbuilder</command> to automate building packages in chroot. To
 build directly on the target platform, use
 <command>dpkg-buildpackage</command> (provided by the
 <command>dpkg-dev</command> package):</para>
-<screen>
-$ cd live-initramfs
-$ dpkg-buildpackage -rfakeroot -b -uc -us
-</screen>
-</listitem>
-<listitem>
-<para>Use the generated &live-initramfs; <command>.deb</command></para>
-<para>As &live-initramfs; is installed by the build system, installing the package
+            <screen> $ cd live-initramfs $ dpkg-buildpackage -rfakeroot -b -uc -us </screen>
+          </listitem>
+          <listitem>
+            <para>Use the generated &live-initramfs; <command>.deb</command></para>
+            <para>As &live-initramfs; is installed by the build system, installing the package
 in the host system is not sufficient: you should treat the generated
 <command>.deb</command> like another custom package. Please see <xref
 linkend="custom-packages"/> for more information. You should pay particular
 attention to <xref linkend="custom-packages-apt"/>.</para>
-</listitem>
-</orderedlist>
-</section>
-
-<section>
-<title>Using &live-initramfs; snapshots</title>
-
-<para>You can let &live-helper; automatically use the latest snapshot of
+          </listitem>
+        </orderedlist>
+      </section>
+      <section>
+        <title>Using &live-initramfs; snapshots</title>
+        <para>You can let &live-helper; automatically use the latest snapshot of
 &live-initramfs; by configuring a third-party repository in your live-system
 configuration. Assuming you have already created a configuration tree with
 <command>lh config</command>:</para>
-
-<orderedlist>
-<listitem>
-<para>Create a sources.list entry for the chroot stage:</para>
-<screen>echo "deb http://live.debian.net/ sid-snapshots main contrib non-free" > config/chroot_sources/debian-live_sid-snapshots.chroot</screen>
-</listitem>
-<listitem>
-<para>Create a sources.list entry for the binary stage:</para>
-<screen>cp config/chroot_sources/debian-live_sid-snapshots.chroot config/chroot_sources/debian-live_sid-snapshots.binary</screen>
-</listitem>
-<listitem>
-<para>Fetch the archive signing key:</para>
-<screen>
-wget http://live.debian.net/debian/project/openpgp/archive-key.asc -O config/chroot_sources/debian-live_sid-snapshots.chroot.gpg
-cp config/chroot_sources/debian-live_sid-snapshots.chroot.gpg config/chroot_sources/debian-live_sid-snapshots.binary.gpg
-</screen>
-</listitem>
-</orderedlist>
-</section>
-</section>
-</section>
+        <orderedlist>
+          <listitem>
+            <para>Create a sources.list entry for the chroot stage:</para>
+            <screen>echo "deb http://live.debian.net/ sid-snapshots main contrib non-free" &gt; config/chroot_sources/debian-live_sid-snapshots.chroot</screen>
+          </listitem>
+          <listitem>
+            <para>Create a sources.list entry for the binary stage:</para>
+            <screen>cp config/chroot_sources/debian-live_sid-snapshots.chroot config/chroot_sources/debian-live_sid-snapshots.binary</screen>
+          </listitem>
+          <listitem>
+            <para>Fetch the archive signing key:</para>
+            <screen> wget http://live.debian.net/debian/project/openpgp/archive-key.asc -O config/chroot_sources/debian-live_sid-snapshots.chroot.gpg cp config/chroot_sources/debian-live_sid-snapshots.chroot.gpg config/chroot_sources/debian-live_sid-snapshots.binary.gpg </screen>
+          </listitem>
+        </orderedlist>
+      </section>
+    </section>
+  </section>
 </chapter>
diff --git a/manual/de/live-environment.xml b/manual/de/live-environment.xml
index 93dcfd1..e82ecd8 100644
--- a/manual/de/live-environment.xml
+++ b/manual/de/live-environment.xml
@@ -1,57 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <chapter id="live-environment">
-<title>The Live environment</title>
-
-<section>
-<title>Swap space</title>
-<para>FIXME</para>
-</section>
-
-<section id="hostname">
-<title>Hostname</title>
-<para>The name of host running live system can be set with the
+  <title>The Live environment</title>
+  <section>
+    <title>Swap space</title>
+    <para>FIXME</para>
+  </section>
+  <section id="hostname">
+    <title>Hostname</title>
+    <para>The name of host running live system can be set with the
 <command>hostname</command> parameter into the
 <command>--bootappend-live</command> option of
 <filename>lh_config</filename>, e.g.: <screen>lh_config --bootappend-live "hostname=myhost"</screen>
 This parameter can also be used in kernel command line.</para>
-</section>
-
-<section id="live-user">
-<title>The Live user</title>
-<para>Username FIXME.</para>
-<para>One important consideration is that the live user is created by
+  </section>
+  <section id="live-user">
+    <title>The Live user</title>
+    <para>Username FIXME.</para>
+    <para>One important consideration is that the live user is created by
 &live-initramfs; during bootup, it is not created by &live-helper; when
 building the image.</para>
-
- <para>You can specify additional groups that the live user will belong to by
+    <para>You can specify additional groups that the live user will belong to by
 preseeding the <command>passwd/user-default-groups</command> debconf
 value. For example, to add the live user to the <command>fuse</command>
 group, add the following to a file in the <filename
 class="directory">config/chroot_local-preseed</filename> directory:</para>
-
-<screen>
- debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse
-</screen>
-
- <para>For more information about debconf preseeding, please see <xref
+    <screen> debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse </screen>
+    <para>For more information about debconf preseeding, please see <xref
 linkend="debconf-preseed"/>.</para>
-
-</section>
-
-<section id="language">
-<title>Language</title>
-<para>When the live system boots, language is involved in three steps:
-<itemizedlist>
-  <listitem><simpara>the locale generation</simpara></listitem>
-  <listitem><simpara>setting the keyboard layout for the console</simpara></listitem>
-  <listitem><simpara>setting the keyboard layout for X</simpara></listitem>
-</itemizedlist></para>
-
-<para>To define the locale that should be generated, use the
+  </section>
+  <section id="language">
+    <title>Language</title>
+    <para>When the live system boots, language is involved in three steps: <itemizedlist><listitem><simpara>the locale generation</simpara></listitem><listitem><simpara>setting the keyboard layout for the console</simpara></listitem><listitem><simpara>setting the keyboard layout for X</simpara></listitem></itemizedlist></para>
+    <para>To define the locale that should be generated, use the
 <command>locale</command> parameter into the
 <command>--bootappend-live</command> option of
 <filename>lh_config</filename>, e.g.: <screen>lh_config --bootappend-live "locale=sv_SE.utf8"</screen>
@@ -59,27 +42,18 @@ This parameter can also be used in kernel command line. You can specify a
 locale by a two-letters code, or for better control, by a full
 <userinput><parameter>language</parameter>_<parameter>country</parameter>.<parameter>encoding</parameter></userinput>
 word.</para>
-
-<para>Both the console and X keyboard configuration depends on the
+    <para>Both the console and X keyboard configuration depends on the
 <command>keyb</command> parameter of the
 <command>--bootappend-live</command> option. Valid options for X keyboard
 layouts can be found in <filename>/etc/X11/xkb/base.xml</filename> (rather
 limited to two-letters country codes). To find the value (the two
 characters) corresponding to a language try searching for the english name
-of the nation where the language is spoken, e.g: <screen>$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name
-	&lt;name&gt;se&lt;/name&gt;
-</screen> To get the locale files for swedish generated and a swedish
-keyboard layout in X use: <screen>lh_config --bootappend-live "locale=sv_SE.utf8 keyb=se"</screen>
-
-</para>
-<para>
-A list of the valid values of the keyboards for the console can be figured
+of the nation where the language is spoken, e.g: <screen>$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name &lt;name&gt;se&lt;/name&gt; </screen> To get the locale files for swedish generated and a swedish
+keyboard layout in X use: <screen>lh_config --bootappend-live "locale=sv_SE.utf8 keyb=se"</screen> </para>
+    <para> A list of the valid values of the keyboards for the console can be figured
 with the following command: <screen>for i in `find /usr/share/keymaps/ -iname "*kmap.gz"`; do basename $i | head -c -9; echo; done | sort | less </screen> To make the
-console keyboard use a swedish layout use <screen>lh_config --bootappend-live "locale=sv_SE.utf8 keyb=se-latin1"</screen>
-
-</para>
-
-<para>Alternatively, you can use the <literal>console-setup</literal> package, a
+console keyboard use a swedish layout use <screen>lh_config --bootappend-live "locale=sv_SE.utf8 keyb=se-latin1"</screen> </para>
+    <para>Alternatively, you can use the <literal>console-setup</literal> package, a
 tool to let you configure console layout using X (XKB) definitions; you can
 then setup your keyboard layout more precisely with
 <literal>klayout</literal>, <literal>kvariant</literal>,
@@ -87,82 +61,64 @@ then setup your keyboard layout more precisely with
 <command>live-initramfs</command> will use also these parameters for X
 configuration. For example, to set up a french system with a french-dvorak
 layout (called Bépo) on a TypeMatrix keyboard, both in console and X11, use:
-<screen>lh_config --bootappend-live \
-  "locale=fr_FR.UTF-8 klayout=fr kvariant=bepo kmodel=tm2030usb"</screen> Note that on old versions of
+<screen>lh_config --bootappend-live \ "locale=fr_FR.UTF-8 klayout=fr kvariant=bepo kmodel=tm2030usb"</screen> Note that on old versions of
 <literal>console-setup</literal> (i.e. Lenny's one), you'll need to setup
 also the <literal>keyb</literal> variable to the
-<literal>klayout</literal>'s value.
-</para>
-</section>
-
-<section id="persistence">
-<title>Persistence</title>
-<para>A live cd paradigm is a preinstalled system which runs from read-only media,
+<literal>klayout</literal>'s value. </para>
+  </section>
+  <section id="persistence">
+    <title>Persistence</title>
+    <para>A live cd paradigm is a preinstalled system which runs from read-only media,
 like a cdrom, where writes and modifications do not survive reboots of the
 host hardware which runs it.</para>
-<para>A Debian Live system is a generalization of this paradigm and thus supports
+    <para>A Debian Live system is a generalization of this paradigm and thus supports
 other media in addition to CDs; but still, in its default behaviour, it
 should be considered read-only and all the runtime evolutions of the system
 are lost at shutdown.</para>
-
-<para>Persistence is a common name for different kinds of solutions for saving
+    <para>Persistence is a common name for different kinds of solutions for saving
 across reboots some, or all, of this runtime evolution of the system. To
 understand how it could work it could be handy to know that even if the
 system is booted and run from read-only media, modification to the files and
 directories are written on writable media, typically a ram disk (tmpfs) and
 ram disks' data do not survive reboots.</para>
-<para>The data stored on this ramdisk should be saved on a writable persistent
+    <para>The data stored on this ramdisk should be saved on a writable persistent
 medium like a Hard Disk, a USB key, a network share or even a session of a
 multisession (re)writable CD/DVD. All these media are supported in Debian
 Live in different ways, and all but the last one require a special boot
 parameter to be specified at boot time: <command>persistent</command>.</para>
-
-<section><title>Full persistence</title>
-<para>By 'full persistence' it is meant that instead of using a tmpfs for storing
+    <section>
+      <title>Full persistence</title>
+      <para>By 'full persistence' it is meant that instead of using a tmpfs for storing
 modifications to the read-only media (with the copy-on-write, COW, system) a
 writable partition is used. In order to use this feature a partition with a
 clean writable supported filesystem on it labeled "live-rw" must be attached
 on the system at bootime and the system must be started with the boot
 parameter 'persistent'. This partition could be an ext2 partition on the
 hard disk or on a usb key created with, e.g.:</para>
-
-<screen>
-# mkfs.ext2 -L live-rw /dev/sdb1
-</screen>
-
-<para>If you already have a partition on your device, you could just change the
+      <screen> # mkfs.ext2 -L live-rw /dev/sdb1 </screen>
+      <para>If you already have a partition on your device, you could just change the
 label with one of the following:</para>
-
-<screen>
-# tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems
-# dosfslabel /dev/sdb1 live-rw # for a fat filesystem
-</screen>
-
-<para>But since live system users cannot always use a hard drive partition, and
+      <screen> # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems # dosfslabel /dev/sdb1 live-rw # for a fat filesystem </screen>
+      <para>But since live system users cannot always use a hard drive partition, and
 considering that most USB keys have poor write speeds, 'full' persistence
 could be also used with just image files, so you could create a file
 representing a partition and put this image file even on a NTFS partition of
 a foreign OS, with something like:</para>
-
-<screen>
-$ dd if=/dev/null of=live-rw bs=1G seek=1	# for a 1GB sized image file
-$ /sbin/mkfs.ext2 -F live-rw
-</screen>
-
-<para>Then copy the <command>live-rw</command> file to a writable partition and
+      <screen> $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file $ /sbin/mkfs.ext2 -F live-rw </screen>
+      <para>Then copy the <command>live-rw</command> file to a writable partition and
 reboot with the boot parameter 'persistent'.</para>
-</section>
-
-<section><title>Home automounting</title>
-<para>If during the boot a partition (filesystem) image file or a partition
+    </section>
+    <section>
+      <title>Home automounting</title>
+      <para>If during the boot a partition (filesystem) image file or a partition
 labeled <command>home-rw</command> is discovered, this filesystem will be
 directly mounted as <command>/home</command>, thus permitting persistence of
 files that belong to e.g. the default user. It can be combined with full
 persistence.</para>
-</section>
-
-<section><title>Snapshots</title>
-<para>Snapshots are collections of files and directories which are not mounted
+    </section>
+    <section>
+      <title>Snapshots</title>
+      <para>Snapshots are collections of files and directories which are not mounted
 while running but which are copied from a persistent device to the system
 (tmpfs) at boot and which are resynced at reboot/shutdown of the system. The
 content of a snapshot could reside on a partition or an image file (like the
@@ -175,15 +131,15 @@ interruption during runtime could lead to data loss, hence a tool invoked
 changes. This type of persistence, since it does not write continuously to
 the persistent media, is the most flash-based device friendly and the
 fastest of all the persistence systems.</para>
-<para> A /home version of snapshot exists too and its label is
+      <para> A /home version of snapshot exists too and its label is
 <command>home-sn.*</command>; it works the same as the main snapshot but it
 is only applied to /home.</para>
-<para>Snapshots cannot currently handle file deletion but full persistence and
+      <para>Snapshots cannot currently handle file deletion but full persistence and
 home automounting can.</para>
-</section>
-
-<section><title>Persistent SubText</title>
-<para>If a user would need multiple persistent storage of the same type for
+    </section>
+    <section>
+      <title>Persistent SubText</title>
+      <para>If a user would need multiple persistent storage of the same type for
 different locations or testing, such as <command>live-rw-nonwork</command>
 and <command>live-rw-work</command>, the boot parameter
 <command>persistent-subtext</command> used in conjuntion with the boot
@@ -192,15 +148,13 @@ persistent media. An example would be if a user wanted to use a persistent
 partition labeled <command>live-sn-subText</command> they would use the boot
 parameters of: <command>persistent</command>
 <command>persistent-subtext=subText</command>.</para>
-</section>
-
-<section><title>Partial remastering</title>
-<para>The runtime modification of the tmpfs could be collected using live-snapshot
+    </section>
+    <section>
+      <title>Partial remastering</title>
+      <para>The runtime modification of the tmpfs could be collected using live-snapshot
 in a squashfs and added to the cd by remastering the iso in the case of cd-r
 or adding a session to multisession cd/dvd(rw); live-initramfs mounts all
 /live filesystem in order or with the module bootparameter.</para>
-</section>
-
-</section>
-
+    </section>
+  </section>
 </chapter>
diff --git a/manual/de/overview.xml b/manual/de/overview.xml
index 9e35a1c..9a9a8c4 100644
--- a/manual/de/overview.xml
+++ b/manual/de/overview.xml
@@ -1,108 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-	<!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
-
 <chapter id="overview">
-<title>Overview of tools</title>
-
-<para>
-	This chapter contains an overview of the two main tools used in building
-Debian Live systems.
-</para>
-
-<section id="live-helper">
-<title>&live-helper;</title>
-
-<para>
-	&live-helper; is a collection of scripts to build Debian Live systems.
-These scripts are also referred to as "helpers".
-</para>
-
-<para>
-	The idea behind &live-helper; is to be a framework that uses a configuration
+  <title>Overview of tools</title>
+  <para> This chapter contains an overview of the two main tools used in building
+Debian Live systems. </para>
+  <section id="live-helper">
+    <title>&live-helper;</title>
+    <para> &live-helper; is a collection of scripts to build Debian Live systems. These
+scripts are also referred to as "helpers". </para>
+    <para> The idea behind &live-helper; is to be a framework that uses a configuration
 directory to completely automate and customize all aspects of building a
-Live image.
-</para>
-
-<para>
-	Many concepts are similar to those in the <command>debhelper</command>
-Debian package tools written by Joey Hess:
-</para>
-
-<orderedlist>
-
-<listitem>
-<para>
-	The scripts have a central location for configuring their operation.
-</para>
-
-<para>
-	In <command>debhelper</command>, this is the <filename class="directory"
->debian</filename> subdirectory of a package tree. For example,
-<command>dh_install</command> will look for a file called
+Live image. </para>
+    <para> Many concepts are similar to those in the <command>debhelper</command>
+Debian package tools written by Joey Hess: </para>
+    <orderedlist>
+      <listitem>
+        <para> The scripts have a central location for configuring their operation. </para>
+        <para> In <command>debhelper</command>, this is the <filename
+class="directory">debian</filename> subdirectory of a package tree. For
+example, <command>dh_install</command> will look for a file called
 <filename>debian/&lt;packagename&gt;.install</filename> to determine which
 files should exist in a particular binary package. In much the same way,
 &live-helper; stores its configuration entirely under a <filename
-class="directory">config/</filename> subdirectory.
-</para>
-</listitem>
-
-<listitem>
-<para>
-	The scripts are independent - that is to say, it is always safe to run each
-command.
-</para>
-</listitem>
-
-</orderedlist>
-
-<para>
-	Unlike <command>debhelper</command>, &live-helper; contains a tool to
+class="directory">config/</filename> subdirectory. </para>
+      </listitem>
+      <listitem>
+        <para> The scripts are independent - that is to say, it is always safe to run each
+command. </para>
+      </listitem>
+    </orderedlist>
+    <para> Unlike <command>debhelper</command>, &live-helper; contains a tool to
 generate a skeleton configuration directory, <filename>lh
 config</filename>. This could be considered to be similar to tools such as
 <command>dh-make</command>. For more information about <filename>lh
-config</filename>, please see <xref linkend="lh-config" />.
-</para>
-
-<para>
-	Besides the common <filename>config/common</filename>, which is used by all
+config</filename>, please see <xref linkend="lh-config"/>. </para>
+    <para> Besides the common <filename>config/common</filename>, which is used by all
 &live-helper; helper commands, some additional files can be used to
 configure the behavior of specific helper commands. These files are
 typically named <command>config/helper</command> or
 <command>config/stage</command> (where "stage", of course, is replaced with
 the name of the stage that they belong to, and "helper" with the name of the
-helper).
-</para>
-
-<para>
-	For example, the <command>lh bootstrap debootstrap</command> helper command
+helper). </para>
+    <para> For example, the <command>lh bootstrap debootstrap</command> helper command
 uses files named <filename>config/bootstrap</filename> and
 <filename>config/bootstrap_debootstrap</filename> to read the options it
 will use. Generally, these files contain variables with values assigned, one
 variable per line. Some programs in &live-helper; use pairs of values or
-slightly more complicated variable assignments.
-</para>
-
-<para>
-	&live-helper; respects environment variables which are present in the
+slightly more complicated variable assignments. </para>
+    <para> &live-helper; respects environment variables which are present in the
 context of the shell it is running. If variables can be read from config
 files, then they override environment variables, and if command line options
 are used, they override values from config files. If no value for a given
 variable can be found (and is thus unset), &live-helper; will automatically
-set it to a default value.
-</para>
-
-<para>
-	All config files are shell scripts which are sourced by a &live-helper;
+set it to a default value. </para>
+    <para> All config files are shell scripts which are sourced by a &live-helper;
 program. That means they have to follow the normal shell syntax. You can
-also put comments in these files; lines beginning with "#" are ignored.
-</para>
-
-<para>
-	In some rare cases you may want to have different versions of these files
+also put comments in these files; lines beginning with "#" are ignored. </para>
+    <para> In some rare cases you may want to have different versions of these files
 for different architectures or distributions. If files named
 <command>config/stage.arch</command> or
 <command>config/stage_helper.arch</command>, and
@@ -110,197 +66,102 @@ for different architectures or distributions. If files named
 <command>config/stage_helper.dist</command> exist (where "arch" is the same
 as the output of <command>dpkg --print-architecture</command> and "dist" is
 the same as the codename of the target distribution), then they will be used
-in preference to the other, more general files.
-</para>
-
-<para>
-	Please see <xref linkend="installation" /> for information on how to install
-&live-helper;.
-</para>
-
-<para>
-	The remainder of this section discusses the three most important helpers:
-</para>
-
-<variablelist>
-
-<varlistentry>
-<term><filename>lh config</filename></term>
-
-<listitem>
-<para>
-	Responsible for initialising a Live system configuration directory. See
-<xref linkend="lh-config" /> for more information.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><filename>lh build</filename></term>
-
-<listitem>
-<para>
-	Responsible for starting a Live system build. See <xref linkend="lh-build"
-/> for more information.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><filename>lh clean</filename></term>
-
-<listitem>
-<para>
-	Responsible for removing parts of a Live system build. See <xref
-linkend="lh-clean" /> for more information.
-</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-
-<section id="lh-config">
-<title>The <filename>lh config</filename> helper</title>
-
-<para>
-	As discussed in <xref linkend="live-helper" />, the scripts that make up
+in preference to the other, more general files. </para>
+    <para> Please see <xref linkend="installation"/> for information on how to install
+&live-helper;. </para>
+    <para> The remainder of this section discusses the three most important helpers: </para>
+    <variablelist>
+      <varlistentry>
+        <term>
+          <filename>lh config</filename>
+        </term>
+        <listitem>
+          <para> Responsible for initialising a Live system configuration directory. See
+<xref linkend="lh-config"/> for more information. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <filename>lh build</filename>
+        </term>
+        <listitem>
+          <para> Responsible for starting a Live system build. See <xref linkend="lh-build"/>
+for more information. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <filename>lh clean</filename>
+        </term>
+        <listitem>
+          <para> Responsible for removing parts of a Live system build. See <xref
+linkend="lh-clean"/> for more information. </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <section id="lh-config">
+      <title>The <filename>lh config</filename> helper</title>
+      <para> As discussed in <xref linkend="live-helper"/>, the scripts that make up
 &live-helper; source their configuration from a single directory named
 <command>config/</command>. As constructing this directory by hand would be
 time-consuming and error-prone, the <filename>lh config</filename> helper
-can be used to create skeleton configuration folders.
-</para>
-
-<para>
-	Issuing <filename>lh config</filename> without any arguments creates a
+can be used to create skeleton configuration folders. </para>
+      <para> Issuing <filename>lh config</filename> without any arguments creates a
 <command>config</command> subdirectory which it populates with some default
-settings:
-</para>
-
-<para>
-	<screen>$ lh config
-$ ls -l
-total 4.1k
-drwxr-xr-x 19 user group 4.1k 2008-05-09 21:37 config
-$ ls -l config/
-total 104
--rw-r--r-- 1 user group 4175 2010-04-11 12:16 binary
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_debian-installer
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_debian-installer-includes
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_grub
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-debs
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-hooks
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-includes
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-packageslists
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-udebs
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_rootfs
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_syslinux
--rw-r--r-- 1 user group 2205 2010-04-11 12:16 bootstrap
--rw-r--r-- 1 user group 1599 2010-04-11 12:16 chroot
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_apt
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-hooks
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-includes
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-packages
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-packageslists
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-patches
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-preseed
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_sources
--rw-r--r-- 1 user group 2938 2010-04-11 12:16 common
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 includes
--rw-r--r-- 1 user group  206 2010-04-11 12:16 source
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 templates
-</screen>
-</para>
-
-<para>
-	Using <filename>lh config</filename> without any arguments would be suitable
+settings: </para>
+      <para>
+        <screen>$ lh config $ ls -l total 4.1k drwxr-xr-x 19 user group 4.1k 2008-05-09 21:37 config $ ls -l config/ total 104 -rw-r--r-- 1 user group 4175 2010-04-11 12:16 binary drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_debian-installer drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_debian-installer-includes drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_grub drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-debs drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-hooks drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-includes drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-packageslists drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-udebs drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_rootfs drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_syslinux -rw-r--r-- 1 user group 2205 2010-04-11 12:16 bootstrap -rw-r--r-- 1 user group 1599 2010-04-11 12:16 chroot drwxr-xr-x 2 user group 4096 2010-04
 -11 12:16 chroot_apt drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-hooks drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-includes drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-packages drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-packageslists drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-patches drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-preseed drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_sources -rw-r--r-- 1 user group 2938 2010-04-11 12:16 common drwxr-xr-x 2 user group 4096 2010-04-11 12:16 includes -rw-r--r-- 1 user group 206 2010-04-11 12:16 source drwxr-xr-x 2 user group 4096 2010-04-11 12:16 templates </screen>
+      </para>
+      <para> Using <filename>lh config</filename> without any arguments would be suitable
 for users who are either happy editing the generated files, or are simply
-happy with the defaults it creates.
-</para>
-
-<para>
-	You can ask <filename>lh config</filename> to generate a <filename
+happy with the defaults it creates. </para>
+      <para> You can ask <filename>lh config</filename> to generate a <filename
 class="directory">config/</filename> directory "preseeded" with various
 options. This might be suitable if you do not require the default settings
-but do not need to change a large number of options. For example:
-</para>
-
-<para>
-	<screen>$ lh config -p gnome</screen>
-</para>
-
-<para>
-	will build a <filename class="directory">config/</filename> directory
+but do not need to change a large number of options. For example: </para>
+      <para>
+        <screen>$ lh config -p gnome</screen>
+      </para>
+      <para> will build a <filename class="directory">config/</filename> directory
 configured to include the '<command>gnome</command>' package list. It is
-possible to specify many options:
-</para>
-
-<para>
-	<screen>$ lh config --apt aptitude --binary-images net --hostname live-machine --username live-user ...</screen>
-</para>
-
-<para>
-	A full list of options is available in the <command>lh_config</command> man
+possible to specify many options: </para>
+      <para>
+        <screen>$ lh config --apt aptitude --binary-images net --hostname live-machine --username live-user ...</screen>
+      </para>
+      <para> A full list of options is available in the <command>lh_config</command> man
 page. Most options have a parallel with an "<command>LH_</command>" prefixed
-variable.
-</para>
-
-</section>
-
-<section id="lh-build">
-<title>The <filename>lh build</filename> helper</title>
-
-<para>
-	The <filename>lh build</filename> helper reads in your configuration from
+variable. </para>
+    </section>
+    <section id="lh-build">
+      <title>The <filename>lh build</filename> helper</title>
+      <para> The <filename>lh build</filename> helper reads in your configuration from
 the <filename class="directory">config/</filename> directory. It then runs
-the lower lower level commands needed to build your Live system.
-</para>
-
-</section>
-
-<section id="lh-clean">
-<title>The <filename>lh clean</filename> helper</title>
-
-<para>
-	It is the job of the <filename>lh clean</filename> helper to remove various
+the lower lower level commands needed to build your Live system. </para>
+    </section>
+    <section id="lh-clean">
+      <title>The <filename>lh clean</filename> helper</title>
+      <para> It is the job of the <filename>lh clean</filename> helper to remove various
 parts of a Live helper build so subsequent builds can start from a clean
-state.
-</para>
-
-</section>
-
-</section>
-
-<section id="live-initramfs">
-<title>The &live-initramfs; package</title>
-
-<para>
-	&live-initramfs; is a collection of scripts providing hooks for the
+state. </para>
+    </section>
+  </section>
+  <section id="live-initramfs">
+    <title>The &live-initramfs; package</title>
+    <para> &live-initramfs; is a collection of scripts providing hooks for the
 <command>initramfs-tools</command>, used to generate an initramfs capable of
 booting live systems, such as those created by
 <command>live-helper</command>. This includes the Debian Live isos, netboot
-tarballs, and usb stick images.
-</para>
-
-<para>
-	At boot time it will look for read-only media containing a "/live" directory
+tarballs, and usb stick images. </para>
+    <para> At boot time it will look for read-only media containing a "/live" directory
 where a root filesystem (often a compressed filesystem image like squashfs)
 is stored. If found, it will create a writable environment, using aufs or
-unionfs, for Debian like systems to boot from.
-</para>
-
-<para>
-	&live-initramfs; is a fork of <ulink
-url="http://packages.ubuntu.com/casper">casper</ulink>.
-</para>
-
-<para>
-	More information on initial ramfs in Debian can be found in the <ulink
+unionfs, for Debian like systems to boot from. </para>
+    <para> &live-initramfs; is a fork of <ulink
+url="http://packages.ubuntu.com/casper">casper</ulink>. </para>
+    <para> More information on initial ramfs in Debian can be found in the <ulink
 url="http://kernel-handbook.alioth.debian.org/"> Debian Linux Kernel
 Handbook</ulink>'s chapter on <ulink
 url="http://kernel-handbook.alioth.debian.org/ch-initramfs.html">
-initramfs</ulink>.
-</para>
-
-</section>
-
+initramfs</ulink>. </para>
+  </section>
 </chapter>
diff --git a/manual/de/procedures.xml b/manual/de/procedures.xml
index 5a9ea13..1ab1aeb 100644
--- a/manual/de/procedures.xml
+++ b/manual/de/procedures.xml
@@ -1,141 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <chapter id="procedures">
-<title>Procedures</title>
-
-<para>This chapter documents the procedures within the Debian Live project for
+  <title>Procedures</title>
+  <para>This chapter documents the procedures within the Debian Live project for
 various tasks that need cooperation with other teams in Debian.</para>
-
-<sect1 id="udeb-uploads">
-<title>Udeb Uploads</title>
-
-<para>Before commiting releases of a udeb in d-i svn, one has to call:</para>
-<screen><command>../../scripts/l10n/output-l10n-changes . -d</command></screen>
-</sect1>
-
-<sect1 id="major-releases">
-<title>Major Releases</title>
-
-<para>Releasing a new stable major version of Debian includes a lot of different
+  <sect1 id="udeb-uploads">
+    <title>Udeb Uploads</title>
+    <para>Before commiting releases of a udeb in d-i svn, one has to call:</para>
+    <screen>
+      <command>../../scripts/l10n/output-l10n-changes . -d</command>
+    </screen>
+  </sect1>
+  <sect1 id="major-releases">
+    <title>Major Releases</title>
+    <para>Releasing a new stable major version of Debian includes a lot of different
 teams working together to make it happen. At some point, the Live team comes
 in and builds live system images. The requirements to do this are:</para>
-
-<itemizedlist>
-	<listitem>The local debian mirror (debian, debian-security, debian-volatile) of the debian-live buildd needs to be synced against a mirror that contains the released version.</listitem>
-	<listitem>The names of the image need to be known (e.g. debian-live-VERSION-ARCH-FLAVOUR.iso).</listitem>
-	<listitem>The data from debian-cd needs to be synced (udeb exclude lists).</listitem>
-	<listitem>The includes from debian-cd needs to be synced (README.*, doc/*, etc.).</listitem>
-	<listitem>Images are built and mirrored on cdimage.debian.org.</listitem>
-</itemizedlist>
-
-</sect1>
-
-<sect1 id="point-releases">
-<title>Point Releases</title>
-
-<itemizedlist>
-	<listitem>Again, we need updated mirror of both debian and debian-security.</listitem>
-	<listitem>Before actual images can be built, the sizes of the gnome-desktop and kde-desktop CD images need to be checked that they are not too big.</listitem>
-	<listitem>Images are built and mirrored on cdimage.debian.org.</listitem>
-	<listitem>Send announcement mail.</listitem>
-</itemizedlist>
-
-<sect2 id="point-release-announce-template">
-<title>Point release announcement template</title>
-
-<para>An annoucement mail for point releases can be generated using the template
+    <itemizedlist>
+      <listitem>The local debian mirror (debian, debian-security, debian-volatile) of the debian-live buildd needs to be synced against a mirror that contains the released version.</listitem>
+      <listitem>The names of the image need to be known (e.g. debian-live-VERSION-ARCH-FLAVOUR.iso).</listitem>
+      <listitem>The data from debian-cd needs to be synced (udeb exclude lists).</listitem>
+      <listitem>The includes from debian-cd needs to be synced (README.*, doc/*, etc.).</listitem>
+      <listitem>Images are built and mirrored on cdimage.debian.org.</listitem>
+    </itemizedlist>
+  </sect1>
+  <sect1 id="point-releases">
+    <title>Point Releases</title>
+    <itemizedlist>
+      <listitem>Again, we need updated mirror of both debian and debian-security.</listitem>
+      <listitem>Before actual images can be built, the sizes of the gnome-desktop and kde-desktop CD images need to be checked that they are not too big.</listitem>
+      <listitem>Images are built and mirrored on cdimage.debian.org.</listitem>
+      <listitem>Send announcement mail.</listitem>
+    </itemizedlist>
+    <sect2 id="point-release-announce-template">
+      <title>Point release announcement template</title>
+      <para>An annoucement mail for point releases can be generated using the template
 below and the following command:</para>
-
-<screen>
-$ sed \
-  -e 's|%major%|5.0|g' \
-  -e 's|%minor%|5.0.2|g' \
-  -e 's|%codename%|lenny|g' \
-  -e 's|%release_mail%|2009/msg00007.html|g'
-</screen>
-
-<para>Please check the mail carefully before sending and pass it to others for
+      <screen> $ sed \ -e 's|%major%|5.0|g' \ -e 's|%minor%|5.0.2|g' \ -e 's|%codename%|lenny|g' \ -e 's|%release_mail%|2009/msg00007.html|g' </screen>
+      <para>Please check the mail carefully before sending and pass it to others for
 proof-reading.</para>
-
-<screen>
-Debian Live images for Debian GNU/Linux %major% updated
-
-The Debian Live project is pleased to announce the availability of
-updated Live images for its stable distribution Debian GNU/Linux %major%
-(codename "%codename%").
-
-The images are available for download at:
-
-    &lt;http://cdimage.debian.org/cdimage/release/current-live/&gt;
-
-This update incorporates the changes made in the %minor% point release,
-which adds corrections for security problems to the stable release
-along with a few adjustments for serious problems. A full list of the
-changes may be viewed at:
-
-    &lt;http://lists.debian.org/debian-announce/%release_mail%&gt;
-
-It also includes the following Live-specific changes:
-
- * [INSERT LIVE-SPECIFIC CHANGE HERE]
- * [INSERT LIVE-SPECIFIC CHANGE HERE]
- * [LARGER ISSUES MAY DESERVE THEIR OWN SECTION]
-
-
-URLs
-----
-
-Download location of updated images:
-
-  &lt;http://cdimage.debian.org/cdimage/release/current-live/&gt;
-
-Debian Live project homepage:
-
-  &lt;http://live.debian.net/&gt;
-
-The current stable distribution:
-
-  &lt;http://ftp.debian.org/debian/dists/stable&gt;
-
-stable distribution information (release notes, errata etc.):
-
-  &lt;http://www.debian.org/releases/stable/&gt;
-
-Security announcements and information:
-
-  &lt;http://www.debian.org/security/&gt;
-
-
-About Debian
--------------
-
-The Debian Project is an association of Free Software developers who
-volunteer their time and effort in order to produce the completely free
-operating system Debian GNU/Linux.
-
-
-About Debian Live
------------------
-
-Debian Live is an official sub-project of Debian which produces Debian
-systems that do not require a classical installer. Images are available
-for CD/DVD discs, USB sticks and PXE netbooting as well as a bare
-filesystem images for booting directly from the internet.
-
-
-Contact Information
--------------------
-
-For further information, please visit the Debian Live web pages at
-&lt;http://live.debian.net/&gt; or alternatively send mail to
-&lt;debian-live at lists.debian.org&gt;.
-</screen>
-
-</sect2>
-
-</sect1>
-
+      <screen> Debian Live images for Debian GNU/Linux %major% updated The Debian Live project is pleased to announce the availability of updated Live images for its stable distribution Debian GNU/Linux %major% (codename "%codename%"). The images are available for download at: &lt;http://cdimage.debian.org/cdimage/release/current-live/&gt; This update incorporates the changes made in the %minor% point release, which adds corrections for security problems to the stable release along with a few adjustments for serious problems. A full list of the changes may be viewed at: &lt;http://lists.debian.org/debian-announce/%release_mail%&gt; It also includes the following Live-specific changes: COPYING debian html Makefile manual VERSION xml xsl [INSERT LIVE-SPECIFIC CHANGE HERE] COPYING debian html Makefile manual VERSION xml xsl [INSERT LIVE-SPECIFIC CHANGE HERE] COPYING debian html Makefile manual VERSION xml xsl [LARGER ISSUES MAY DESERVE THEIR OWN SECTION] URLs ---- Download loca
 tion of updated images: &lt;http://cdimage.debian.org/cdimage/release/current-live/&gt; Debian Live project homepage: &lt;http://live.debian.net/&gt; The current stable distribution: &lt;http://ftp.debian.org/debian/dists/stable&gt; stable distribution information (release notes, errata etc.): &lt;http://www.debian.org/releases/stable/&gt; Security announcements and information: &lt;http://www.debian.org/security/&gt; About Debian ------------- The Debian Project is an association of Free Software developers who volunteer their time and effort in order to produce the completely free operating system Debian GNU/Linux. About Debian Live ----------------- Debian Live is an official sub-project of Debian which produces Debian systems that do not require a classical installer. Images are available for CD/DVD discs, USB sticks and PXE netbooting as well as a bare filesystem images for booting directly from the internet. Contact Information ------------------- For further informati
 on, please visit the Debian Live web pages at &lt;http://live.debian.net/&gt; or alternatively send mail to &lt;debian-live at lists.debian.org&gt;. </screen>
+    </sect2>
+  </sect1>
 </chapter>
diff --git a/manual/de/reporting-bugs.xml b/manual/de/reporting-bugs.xml
index 44fd575..f1e8acd 100644
--- a/manual/de/reporting-bugs.xml
+++ b/manual/de/reporting-bugs.xml
@@ -1,235 +1,200 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <chapter id="bugs">
-<title>Reporting bugs</title>
-
-<para>Debian Live is far from being perfect, but we want to make it as close as
+  <title>Reporting bugs</title>
+  <para>Debian Live is far from being perfect, but we want to make it as close as
 possible to perfect - with your help. Do not hesitate to report a bug: it is
 better to fill a report twice than never. However, this chapter includes
 recommendations how to file good bug reports.</para>
-
-<para>For the impatient:</para>
-
-<itemizedlist>
-<listitem>
-  <para>
-  Always check first the image status updates on <ulink
-url="http://live.debian.net/">our homepage</ulink> for known issues.
-  </para>
-</listitem>
-<listitem>
- <para>
-  Always try to reproduce the bug with the <emphasis>most recent version of
+  <para>For the impatient:</para>
+  <itemizedlist>
+    <listitem>
+      <para> Always check first the image status updates on <ulink
+url="http://live.debian.net/">our homepage</ulink> for known issues. </para>
+    </listitem>
+    <listitem>
+      <para> Always try to reproduce the bug with the <emphasis>most recent version of
 &live-helper; and &live-initramfs;</emphasis> before submitting a bug
-report.
- </para>
-</listitem>
-<listitem>
- <para>
-  Try to give <emphasis>as specific information as possible</emphasis> about
+report. </para>
+    </listitem>
+    <listitem>
+      <para> Try to give <emphasis>as specific information as possible</emphasis> about
 the bug. This includes (at least) the version of &live-helper; and
 &live-initramfs; used and the distribution of the live system you are
-building.
- </para>
-</listitem>
-</itemizedlist>
-
-<section id="known-issues">
-<title>Known issues</title>
-<para>Due to the nature of Debian testing and Debian unstable branches being a
+building. </para>
+    </listitem>
+  </itemizedlist>
+  <section id="known-issues">
+    <title>Known issues</title>
+    <para>Due to the nature of Debian testing and Debian unstable branches being a
 moving target, building a live system may not always be possible.</para>
-<para>If this is a problem, do not build a system based on testing or unstable,
+    <para>If this is a problem, do not build a system based on testing or unstable,
 but go with stable. live-helper does always default to the current stable
 release.</para>
-<para>Currently known issues are listed under the section 'status' on <ulink
+    <para>Currently known issues are listed under the section 'status' on <ulink
 url="http://live.debian.net/">our homepage</ulink>.</para>
-<para>It is out of the scope of this manual to train you in correctly identifying
+    <para>It is out of the scope of this manual to train you in correctly identifying
 and fixing problems in packages of the development branches, however, there
 are two things you can always try: When not succeeding to build testing, try
 if unstable works. If unstable does not work either, revert to testing and
 pinning the newer version of the failing package from unstable.</para>
-</section>
-
-<section id="rebuild-from-scratch">
-<title>Rebuild from scratch</title>
-<para>To ensure that a particular bug is not caused by an unclean built system,
+  </section>
+  <section id="rebuild-from-scratch">
+    <title>Rebuild from scratch</title>
+    <para>To ensure that a particular bug is not caused by an unclean built system,
 please always rebuild the whole live system from scratch to see if the bug
 is reproducible.</para>
-</section>
-
-<section id="up-to-date">
-<title>Use up-to-date packages</title>
-<para>This means</para>
-
-<para>Using outdated packages can cause significant problems when trying to
+  </section>
+  <section id="up-to-date">
+    <title>Use up-to-date packages</title>
+    <para>This means</para>
+    <para>Using outdated packages can cause significant problems when trying to
 reproduce (and ultimately fix) your problem. If a relevant package is not
 available in Debian anymore, please recognize that the resources of the
 Debian kernel team are limited and will be unlikely to be able to fix the
 problem.</para>
-</section>
-
-
-<section id="collect-information">
-<title>Collect information</title>
-
-<para>Please provide enough information with your report. At a minimum, it should
+  </section>
+  <section id="collect-information">
+    <title>Collect information</title>
+    <para>Please provide enough information with your report. At a minimum, it should
 contain the exact version of &live-helper; version where the bug is
 encountered, and steps to reproduce it. Please use common sense and include
 other relevant information if you think that it might help in solving the
 problem.</para>
-
-<para>To make the most out of your bug report, we require at least the following
+    <para>To make the most out of your bug report, we require at least the following
 information:</para>
-
-<itemizedlist>
- <listitem><para>Architecture of the host system</para></listitem>
- <listitem><para>Version of &live-helper; on the host system</para></listitem>
- <listitem><para>Version of &live-initramfs; on the live system</para></listitem>
- <listitem><para>Version of <filename>debootstrap</filename> and/or
-<filename>cdebootstrap</filename> on the host system</para></listitem>
- <listitem><para>Architecture of the live system</para></listitem>
- <listitem><para>Distribution of the live system</para></listitem>
- <listitem><para>Version of the kernel on the live system</para></listitem>
-</itemizedlist>
-
-<para>
- You can generate a log of the build process by using the
-<filename>tee</filename> command:
-</para>
-
-<screen>
- # lh_build 2>&amp;1 | tee buildlog.txt
-</screen>
-
-<para>Additionally, to rule out other errors, it is always a good idea to tar up
+    <itemizedlist>
+      <listitem>
+        <para>Architecture of the host system</para>
+      </listitem>
+      <listitem>
+        <para>Version of &live-helper; on the host system</para>
+      </listitem>
+      <listitem>
+        <para>Version of &live-initramfs; on the live system</para>
+      </listitem>
+      <listitem>
+        <para>Version of <filename>debootstrap</filename> and/or
+<filename>cdebootstrap</filename> on the host system</para>
+      </listitem>
+      <listitem>
+        <para>Architecture of the live system</para>
+      </listitem>
+      <listitem>
+        <para>Distribution of the live system</para>
+      </listitem>
+      <listitem>
+        <para>Version of the kernel on the live system</para>
+      </listitem>
+    </itemizedlist>
+    <para> You can generate a log of the build process by using the
+<filename>tee</filename> command: </para>
+    <screen> # lh_build 2&gt;&amp;1 | tee buildlog.txt </screen>
+    <para>Additionally, to rule out other errors, it is always a good idea to tar up
 your config directory and upload it somewhere (do *not* send it as an
 attachment to the mailinglist), so that we can try to reproduce the errors
 you encountered.</para>
-
-<para>Remember to send in any logs that were produced with English locale
+    <para>Remember to send in any logs that were produced with English locale
 settings, e.g. run your live-helper commands with a leading
 <code>LC_ALL=C</code> or <code>LC_ALL=en_US</code>.</para>
-
-
-</section>
-
-<section id="correct-package">
-<title>Use the correct package to report the bug against</title>
-
-<para>Where does the bug appear?</para>
-
-<para>
-<variablelist>
-
-<varlistentry><term>At build time whilst bootstrapping</term>
-
-<listitem><para>
-<para>&live-helper; first bootstraps a basic Debian system with
+  </section>
+  <section id="correct-package">
+    <title>Use the correct package to report the bug against</title>
+    <para>Where does the bug appear?</para>
+    <para>
+      <variablelist>
+        <varlistentry>
+          <term>At build time whilst bootstrapping</term>
+          <listitem>
+            <para>
+              <para>&live-helper; first bootstraps a basic Debian system with
 <command>debootstrap</command> or <command>cdebootstrap</command>. Depending
 on the bootstrapping tool used and the Debian distribution it is
 bootstrapping, it may fail. If a bug appears here, check if the error is
 related to a specific Debian package (most likely), or if it is related to
 cdebootstrap itself.</para>
-
-<para>In both cases, this is not a bug in Debian Live, but rather in Debian itself
+              <para>In both cases, this is not a bug in Debian Live, but rather in Debian itself
 which we can not fix this directly. Please report such a bug against
 <command>debootstrap</command>, <command>cdebootstrap</command> or the
 failing package.</para>
-</para></listitem>
-</varlistentry>
-
-<varlistentry><term>At build time whilst installing packages</term>
-
-<listitem><para>&live-helper; installs additional packages from the Debian archive and
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>At build time whilst installing packages</term>
+          <listitem>
+            <para>&live-helper; installs additional packages from the Debian archive and
 depending on the Debian distribution used and the daily archive state, it
 can fail. If a bug appears here, check if the error is also reproducible on
 a normal system.</para>
-
-<para>If this is the case, this is not a bug in Debian Live, but rather in Debian
+            <para>If this is the case, this is not a bug in Debian Live, but rather in Debian
 - please report it against the failing package. Running
 <filename>debootstrap</filename> seperately from the Live system build or
 running <filename>lh_bootstrap</filename> with <command>--debug</command>
 will give you more information.</para>
-
-<para>Also, if you are using a local mirror and/or any of sort of proxy and you
+            <para>Also, if you are using a local mirror and/or any of sort of proxy and you
 are experiencing a problem, please always reproduce it first by
 bootstrapping from an official mirror.</para>
-
-</listitem>
-
-</varlistentry>
-
-<varlistentry>
- <term>At boot-time</term>
- <listitem>
-  <para>
-   If your image does not boot, please report it to the mailing list together
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>At boot-time</term>
+          <listitem>
+            <para> If your image does not boot, please report it to the mailing list together
 with the information requested in <xref linkend="collect-information"/>. Do
 not forget to mention, how/when the image failed, in Qemu, VMWare or real
 hardware. If you are using a virtualization technology of any kind, please
 always run it on real hardware before reporting a bug. Providing a
-screenshot of the failure is also very helpful.
-  </para>
- </listitem>
-</varlistentry> 
-
-<varlistentry><term>At run-time</term>
-
-<listitem><para>If a package was successfully installed, but fails while actually running
-the Live system, this is probably a bug in Debian Live. However, </para></listitem>
-</varlistentry>
-
-</variablelist>
-</para>
-
-</section>
-
-<section id="research">
-<title>Do the research</title>
-<para>Before filing the bug, please search the web for the particular error
+screenshot of the failure is also very helpful. </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>At run-time</term>
+          <listitem>
+            <para>If a package was successfully installed, but fails while actually running
+the Live system, this is probably a bug in Debian Live. However, </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </para>
+  </section>
+  <section id="research">
+    <title>Do the research</title>
+    <para>Before filing the bug, please search the web for the particular error
 message or symptom you are getting. As it is highly unlikely that you are
 the only person experiencing a particular problem, there is always a chance
 that it has been discussed elsewhere, and a possible solution, patch, or
 workaround has been proposed.</para>
-
-<para>You should pay particular attention to the Debian Live mailing list, as well
+    <para>You should pay particular attention to the Debian Live mailing list, as well
 as the homepage, as these are likely to contain the most up-to-date
 information. If such information exists, always include the references to it
 in your bug report.</para>
-
-<para>In addition, you should check the <ulink
+    <para>In addition, you should check the <ulink
 url="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-helper">current
 bug list for &live-helper;</ulink> and the <ulink
 url="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-initramfs">current
 bug list for live-initramfs</ulink> to see whether something similar has
 been reported already.</para>
-</section>
-
-<section id="where">
-<title>Where to report bugs</title>
-
-<para>The Debian Live project keeps track of all bugs in the Debian Bug Tracking
+  </section>
+  <section id="where">
+    <title>Where to report bugs</title>
+    <para>The Debian Live project keeps track of all bugs in the Debian Bug Tracking
 System (BTS). For information on how to use the system, please see <ulink
 url="http://bugs.debian.org">http://bugs.debian.org</ulink>. You can also
 submit the bugs by using the <command>reportbug</command> command from the
 package with the same name.</para>
-
-<para>In general, you should report build time errors against the <ulink
+    <para>In general, you should report build time errors against the <ulink
 url="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-helper">live-helper</ulink>
 package and run time errors against <ulink
 url="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-initramfs">live-initramfs</ulink>.
 If you are unsure of which package is appropriate or need more help before
 submitting a bug report, please send a message to the mailing list and we
 will help you to figure it out.</para>
-
-<para>Please note that bugs found in distributions derived from Debian (such as
+    <para>Please note that bugs found in distributions derived from Debian (such as
 Ubuntu, Knoppix, Xandros, etc.) should <emphasis>not</emphasis> be reported
 to the Debian BTS unless they can be also reproduced on a Debian system
 using official Debian packages.</para>
-
-</section>
-
+  </section>
 </chapter>
diff --git a/manual/de/resources.xml b/manual/de/resources.xml
index 72b7ab7..697c87c 100644
--- a/manual/de/resources.xml
+++ b/manual/de/resources.xml
@@ -1,50 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <chapter id="resources">
-<title>Resources and links</title>
-
-<section>
-<title>Links</title>
-<para>FIXME</para>
-
-<orderedlist>
-<listitem><para><ulink url="http://www.debian.org/">Debian homepage</ulink></para></listitem>
-</orderedlist>
-
-</section>
-
-<section>
-<title>English sources related to debian live</title>
-<itemizedlist>
-<listitem><para><ulink url="http://en.wikipedia.org/wiki/Debian_Live">Debian_Live definition
-on Wikipedia </ulink></para></listitem>
-<listitem><para><ulink url="http://layer-acht.org/slides/20070115_debian-live_LCA2007.odp">
-Presentation on Debian-Live </ulink></para></listitem>
-</itemizedlist>
-</section>
-
-<section>
-<title>German sources related to debian live</title>
-<itemizedlist>
-<listitem><para><ulink url="http://wiki.skolelinux.de/DebianLive"> German translation (work
-in progress) </ulink></para></listitem>
-<listitem><para><ulink
+  <title>Resources and links</title>
+  <section>
+    <title>Links</title>
+    <para>FIXME</para>
+    <orderedlist>
+      <listitem>
+        <para>
+          <ulink url="http://www.debian.org/">Debian homepage</ulink>
+        </para>
+      </listitem>
+    </orderedlist>
+  </section>
+  <section>
+    <title>English sources related to debian live</title>
+    <itemizedlist>
+      <listitem>
+        <para>
+          <ulink url="http://en.wikipedia.org/wiki/Debian_Live">Debian_Live definition
+on Wikipedia </ulink>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <ulink url="http://layer-acht.org/slides/20070115_debian-live_LCA2007.odp">
+Presentation on Debian-Live </ulink>
+        </para>
+      </listitem>
+    </itemizedlist>
+  </section>
+  <section>
+    <title>German sources related to debian live</title>
+    <itemizedlist>
+      <listitem>
+        <para>
+          <ulink url="http://wiki.skolelinux.de/DebianLive"> German translation (work
+in progress) </ulink>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <ulink
 url="http://www.linux-magazin.de/online_artikel/workshop_debian_live_system_mit_etch">
-Article in linux-magazin.de </ulink></para></listitem>
-<listitem><para><ulink url="http://wiki.freenetproject.org/deDebianLiveCD"> Another german
-documentation </ulink></para></listitem>
-</itemizedlist>
-</section>
-
-<section>
-<title>Spanish sources related to debian live</title>
-<itemizedlist>
-<listitem><para><ulink url="http://el-directorio.org/DebianLive"> Spanish documentation
-project </ulink></para></listitem>
-</itemizedlist>
-</section>
-
+Article in linux-magazin.de </ulink>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <ulink url="http://wiki.freenetproject.org/deDebianLiveCD"> Another german
+documentation </ulink>
+        </para>
+      </listitem>
+    </itemizedlist>
+  </section>
+  <section>
+    <title>Spanish sources related to debian live</title>
+    <itemizedlist>
+      <listitem>
+        <para>
+          <ulink url="http://el-directorio.org/DebianLive"> Spanish documentation
+project </ulink>
+        </para>
+      </listitem>
+    </itemizedlist>
+  </section>
 </chapter>
diff --git a/manual/de/success-stories.xml b/manual/de/success-stories.xml
index a6a3867..26685bb 100644
--- a/manual/de/success-stories.xml
+++ b/manual/de/success-stories.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <chapter id="success-stories">
-<title>Success Stories</title>
-
-<para>This chapter documents success stories with Debian Live applied.</para>
-
-<para>FIXME</para>
-
+  <title>Success Stories</title>
+  <para>This chapter documents success stories with Debian Live applied.</para>
+  <para>FIXME</para>
 </chapter>
diff --git a/manual/de/troubleshooting.xml b/manual/de/troubleshooting.xml
index 15778a4..1b6455e 100644
--- a/manual/de/troubleshooting.xml
+++ b/manual/de/troubleshooting.xml
@@ -1,28 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <chapter id="troubleshooting">
-<title>Hints for troubleshooting</title>
-
-<para>To check on the client </para>
-
-<itemizedlist>
-<listitem>
-	<para> look at /live.log and /netboot.conf</para>
-</listitem>
-<listitem>
-	<para> could the image be mounted </para>
-</listitem>
-</itemizedlist>
-
-<para>To check on the pc that creates the image </para>
-
-<itemizedlist>
-<listitem>
-	<para>was chroot unmounted after build? (it should) </para>
-</listitem>
-</itemizedlist>
-
+  <title>Hints for troubleshooting</title>
+  <para>To check on the client </para>
+  <itemizedlist>
+    <listitem>
+      <para> look at /live.log and /netboot.conf</para>
+    </listitem>
+    <listitem>
+      <para> could the image be mounted </para>
+    </listitem>
+  </itemizedlist>
+  <para>To check on the pc that creates the image </para>
+  <itemizedlist>
+    <listitem>
+      <para>was chroot unmounted after build? (it should) </para>
+    </listitem>
+  </itemizedlist>
 </chapter>
diff --git a/manual/de/use-cases.xml b/manual/de/use-cases.xml
index b132b3a..973da6e 100644
--- a/manual/de/use-cases.xml
+++ b/manual/de/use-cases.xml
@@ -1,63 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <chapter id="use-cases">
-<title>Use Cases</title>
-
-<para>This chapter is for users to document their use cases with Debian Live.</para>
-
-<sect1 id="vnc-kiosk-client">
-<title>VNC Kiosk Client</title>
-<para>Create an image with &live-helper; to boot directly to a VNC server.</para>
-<itemizedlist>
-
-<listitem>
-	<para>Make a build directory: <screen>$ mkdir vncBuild</screen>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Move to the build directory: <screen>$ cd vncBuild</screen>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Example to config the build directory to include gdm metacity
-xtightvncviewer: <screen>$ lh config --packages "gdm metacity xtightvncviewer"</screen>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Create a folder /etc/skel folder for a custom .xsession for the default
-user: <screen>$ mkdir -p config/chroot_local-includes/etc/skel</screen>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Create the .xsession for the default user: <screen>$ touch config/chroot_local-includes/etc/skel/.xsession</screen>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Edit the .xsession file to launch metacity and start xvncviewer with
-something similar to the below: <screen>
-	#!/bin/sh
-	/usr/bin/metacity &amp;
-	/usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT
-	exit
-	</screen>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Build the image: <screen># lh build</screen>
-	</para>
-</listitem>
-
-</itemizedlist>
-
-</sect1>
-
+  <title>Use Cases</title>
+  <para>This chapter is for users to document their use cases with Debian Live.</para>
+  <sect1 id="vnc-kiosk-client">
+    <title>VNC Kiosk Client</title>
+    <para>Create an image with &live-helper; to boot directly to a VNC server.</para>
+    <itemizedlist>
+      <listitem>
+        <para>Make a build directory: <screen>$ mkdir vncBuild</screen> </para>
+      </listitem>
+      <listitem>
+        <para>Move to the build directory: <screen>$ cd vncBuild</screen> </para>
+      </listitem>
+      <listitem>
+        <para>Example to config the build directory to include gdm metacity
+xtightvncviewer: <screen>$ lh config --packages "gdm metacity xtightvncviewer"</screen> </para>
+      </listitem>
+      <listitem>
+        <para>Create a folder /etc/skel folder for a custom .xsession for the default
+user: <screen>$ mkdir -p config/chroot_local-includes/etc/skel</screen> </para>
+      </listitem>
+      <listitem>
+        <para>Create the .xsession for the default user: <screen>$ touch config/chroot_local-includes/etc/skel/.xsession</screen> </para>
+      </listitem>
+      <listitem>
+        <para>Edit the .xsession file to launch metacity and start xvncviewer with
+something similar to the below: <screen> #!/bin/sh /usr/bin/metacity &amp; /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT exit </screen> </para>
+      </listitem>
+      <listitem>
+        <para>Build the image: <screen># lh build</screen> </para>
+      </listitem>
+    </itemizedlist>
+  </sect1>
 </chapter>
diff --git a/manual/en/about.xml b/manual/en/about.xml
index 0e36f0e..af2b97b 100644
--- a/manual/en/about.xml
+++ b/manual/en/about.xml
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-	<!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
-
 <chapter>
-<title>About</title>
-
-<xi:include href="about_manual.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="about_project.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-
+  <title>About</title>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="about_manual.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="about_project.xml"/>
 </chapter>
diff --git a/manual/en/about_manual.xml b/manual/en/about_manual.xml
index fdbb291..442912b 100644
--- a/manual/en/about_manual.xml
+++ b/manual/en/about_manual.xml
@@ -1,399 +1,190 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-	<!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
-
 <sect1 id="meta">
-<title>About this manual</title>
-
-<para>
-	The main goal of this manual is to serve as a single access point to all
-	documentation related to the Debian Live project. It does not include
-	end-user documentation for using a Debian Live system.
-</para>
-
-<para>
-	Some of the commands mentioned in the text must be executed with
-	superuser privileges which can be obtained by becoming the root user via
-	<filename>su</filename> or by using <filename>sudo</filename>. To
-	distinguish between commands which may be executed by an unprivileged
-	user and those requiring superuser privileges, commands are prepended by
-	<command>$</command> or <command>#</command> respectively. This symbol
-	is not a part of the command.
-</para>
-
-<sect2 id="terms">
-<title>Terms</title>
-
-<variablelist>
-
-<varlistentry>
-<term>Live system</term>
-
-<listitem>
-<para>
-	An operating system that can boot without installation to a hard drive.
-	Live systems do not alter local operating system(s) or file(s) already
-	installed on the computer hard drive unless instructed to do so. Live
-	systems are typically booted from media such as CDs or DVDs, some may
-	also boot with USB sticks or over the network (via netboot images).
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Debian Live</term>
-
-<listitem>
-<para>
-	The Debian sub-project which maintains the &live-helper; and
-	&live-initramfs; utilities.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Debian Live system</term>
-
-<listitem>
-<para>
-	A live system that uses software from the Debian operating system that
-	may be booted from CDs, DVDs, USB sticks, over the network (via netboot
-	images), and over the internet (via boot parameter fetch=URL)
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Build system / host system</term>
-
-<listitem>
-<para>
-	The environment used to create the live system.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>&live-helper;</term>
-
-<listitem>
-<para>
-	A collection of scripts used to build customised Debian Live systems.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>&live-initramfs;</term>
-
-<listitem>
-<para>
-	A collection of scripts used to boot live systems. &live-initramfs; is a
-	fork of <filename>casper</filename> by Canonical, Ltd.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><filename>live-package</filename></term>
-
-<listitem>
-<para>
-	The former name of &live-helper;.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Debian Installer / (d-i)</term>
-
-<listitem>
-<para>
-	The official installation system for the Debian distribution.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Cheat codes</term>
-
-<listitem>
-<para>
-	FIXME
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>chroot</term>
-
-<listitem>
-<para>
-	The chroot program, chroot(8), enables us to run different instances of
-	the GNU/Linux environment on a single system simultaneously without
-	rebooting.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>binary image</term>
-
-<listitem>
-<para>
-	On a live system, binary image refers to the binary filesystem and the
-	respective extension, such as binary.iso or binary.img.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Target distribution</term>
-
-<listitem>
-<para>
-	The distribution upon which your live system will be based. This can
-	differ from the distribution of your Build System.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>&lenny;/&squeeze;/&sid; stable/testing/unstable</term>
-
-<listitem>
-<para>
-	The "stable" distribution contains the latest officially released
-	distribution of Debian. The "testing" distribution is the staging area
-	for the next stable release. A major advantage of using this
-	distribution is that it has more recent versions of software relative to
-	the "stable" release. The "unstable" distribution is where active
-	development of Debian occurs. Generally, this distribution is run by
-	developers and those who like to live on the edge.
-</para>
-
-<para>
-	At the time of writing, &lenny; is the current "stable" release
-	and &squeeze; is the current "testing" release. &sid; will always be a
-	synonym for the "unstable" release.
-</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-
-</sect2>
-
-<sect2 id="authors">
-<title>Authors</title>
-
-<para>
-	A list of authors (in alphabetical order):
-</para>
-
-<itemizedlist>
-
-<listitem>
-<para>
-	Ben Armstrong
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Brendan Sleight
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Chris Lamb
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Daniel Baumann
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Franklin Piat
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Jonas Stein
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Kai Hendry
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Marco Amadori
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Mathieu Geli
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Matthias Kirschner
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Richard Nelson
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Trent W. Buck
-</para>
-</listitem>
-
-</itemizedlist>
-
-</sect2>
-
-<sect2 id="contributing">
-<title>Contributing to this document</title>
-
-<para>
-	This manual is intended as a community project and all proposals for
-	improvements and contributions are extremely welcome. The preferred way
-	to submit a contribution is to send it to the mailing list. Please see
-	<xref linkend="contact" /> for more information.
-</para>
-
-<para>
-	When submitting a contribution please clearly identify its copyright
-	holder and include the licensing statement. Note that to be accepted the
-	contribution must be licensed under the same license as the rest of the
-	document, namely GPL version 3 or later.
-</para>
-
-<para>
-	The sources for this manual are maintained using the Git version control
-	system. You can checkout the latest copy by executing:
-</para>
-
-<para>
-	<screen>$ git clone git://live.debian.net/git/live-manual.git</screen>
-</para>
-
-<para>
-	Prior to submission of your contribution, please preview your work. To
-	preview the live-manual, ensure the packages needed for building are
-	installed by executing:
-</para>
-
-<para>
-	<screen># apt-get install dblatex docbook-xml docbook-xsl make po4a
-	w3m</screen>
-</para>
-
-<para>
-	You may build the live-manual from the top level directory of your git
-	checkout by executing:
-</para>
-
-<para>
-	<screen>$ make build</screen>
-</para>
-
-<sect3 id="commiting">
-<title>Applying patches</title>
-
-<para>
-	Directly commiting to the repository is possible by anyone. However, we
-	ask you to send bigger changes to the mailinglist to discuss them first.
-	In order to push to the repository, the following steps are required.
-</para>
-
-<itemizedlist>
-
-<listitem>
-<para>
-	Fetch the public commit key:
-</para>
-
-<para>
-	<screen>$ mkdir -p ~/.ssh/identity.d
-$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live -O ~/.ssh/identity.d/live-manual at debian-live
-$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub -O ~/.ssh/identity.d/live-manual at debian-live.pub
-$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*</screen>
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Add the following section to your openssh-client config:
-</para>
-
-<para>
-	<screen> $ cat &gt;&gt; ~/.ssh/config &lt;&lt; EOF
-Host live.debian.net
-	Hostname live.debian.net
-	User gitosis
-	IdentityFile ~/.ssh/identity.d/live-manual at debian-live
-EOF</screen>
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Checkout a clone of the manual through ssh:
-</para>
-
-<para>
-	<screen>$ git clone gitosis at live.debian.net:/live-manual.git</screen>
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Commit the file after editing. Write commit messages, that consist of
-	full useful sentences, starting with a capital letter and ending with a
-	full stop. Usually starting with the form
-	'Fixing/Adding/Removing/Correcting/':
-</para>
-
-<para>
-	<screen>$ git commit -a</screen>
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Push the commit to the server:
-</para>
-
-<para>
-	<screen>$ git push</screen>
-</para>
-</listitem>
-
-</itemizedlist>
-
-</sect3>
-
-</sect2>
-
+  <title>About this manual</title>
+  <para> The main goal of this manual is to serve as a single access point to all documentation related to the Debian Live project. It does not include end-user documentation for using a Debian Live system. </para>
+  <para> Some of the commands mentioned in the text must be executed with superuser privileges which can be obtained by becoming the root user via <filename>su</filename> or by using <filename>sudo</filename>. To distinguish between commands which may be executed by an unprivileged user and those requiring superuser privileges, commands are prepended by <command>$</command> or <command>#</command> respectively. This symbol is not a part of the command. </para>
+  <sect2 id="terms">
+    <title>Terms</title>
+    <variablelist>
+      <varlistentry>
+        <term>Live system</term>
+        <listitem>
+          <para> An operating system that can boot without installation to a hard drive. Live systems do not alter local operating system(s) or file(s) already installed on the computer hard drive unless instructed to do so. Live systems are typically booted from media such as CDs or DVDs, some may also boot with USB sticks or over the network (via netboot images). </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Debian Live</term>
+        <listitem>
+          <para> The Debian sub-project which maintains the &live-helper; and &live-initramfs; utilities. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Debian Live system</term>
+        <listitem>
+          <para> A live system that uses software from the Debian operating system that may be booted from CDs, DVDs, USB sticks, over the network (via netboot images), and over the internet (via boot parameter fetch=URL) </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Build system / host system</term>
+        <listitem>
+          <para> The environment used to create the live system. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>&live-helper;</term>
+        <listitem>
+          <para> A collection of scripts used to build customised Debian Live systems. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>&live-initramfs;</term>
+        <listitem>
+          <para> A collection of scripts used to boot live systems. &live-initramfs; is a fork of <filename>casper</filename> by Canonical, Ltd. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <filename>live-package</filename>
+        </term>
+        <listitem>
+          <para> The former name of &live-helper;. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Debian Installer / (d-i)</term>
+        <listitem>
+          <para> The official installation system for the Debian distribution. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Cheat codes</term>
+        <listitem>
+          <para> FIXME </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>chroot</term>
+        <listitem>
+          <para> The chroot program, chroot(8), enables us to run different instances of the GNU/Linux environment on a single system simultaneously without rebooting. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>binary image</term>
+        <listitem>
+          <para> On a live system, binary image refers to the binary filesystem and the respective extension, such as binary.iso or binary.img. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Target distribution</term>
+        <listitem>
+          <para> The distribution upon which your live system will be based. This can differ from the distribution of your Build System. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>&lenny;/&squeeze;/&sid; stable/testing/unstable</term>
+        <listitem>
+          <para> The "stable" distribution contains the latest officially released distribution of Debian. The "testing" distribution is the staging area for the next stable release. A major advantage of using this distribution is that it has more recent versions of software relative to the "stable" release. The "unstable" distribution is where active development of Debian occurs. Generally, this distribution is run by developers and those who like to live on the edge. </para>
+          <para> At the time of writing, &lenny; is the current "stable" release and &squeeze; is the current "testing" release. &sid; will always be a synonym for the "unstable" release. </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+  <sect2 id="authors">
+    <title>Authors</title>
+    <para> A list of authors (in alphabetical order): </para>
+    <itemizedlist>
+      <listitem>
+        <para> Ben Armstrong </para>
+      </listitem>
+      <listitem>
+        <para> Brendan Sleight </para>
+      </listitem>
+      <listitem>
+        <para> Chris Lamb </para>
+      </listitem>
+      <listitem>
+        <para> Daniel Baumann </para>
+      </listitem>
+      <listitem>
+        <para> Franklin Piat </para>
+      </listitem>
+      <listitem>
+        <para> Jonas Stein </para>
+      </listitem>
+      <listitem>
+        <para> Kai Hendry </para>
+      </listitem>
+      <listitem>
+        <para> Marco Amadori </para>
+      </listitem>
+      <listitem>
+        <para> Mathieu Geli </para>
+      </listitem>
+      <listitem>
+        <para> Matthias Kirschner </para>
+      </listitem>
+      <listitem>
+        <para> Richard Nelson </para>
+      </listitem>
+      <listitem>
+        <para> Trent W. Buck </para>
+      </listitem>
+    </itemizedlist>
+  </sect2>
+  <sect2 id="contributing">
+    <title>Contributing to this document</title>
+    <para> This manual is intended as a community project and all proposals for improvements and contributions are extremely welcome. The preferred way to submit a contribution is to send it to the mailing list. Please see <xref linkend="contact"/> for more information. </para>
+    <para> When submitting a contribution please clearly identify its copyright holder and include the licensing statement. Note that to be accepted the contribution must be licensed under the same license as the rest of the document, namely GPL version 3 or later. </para>
+    <para> The sources for this manual are maintained using the Git version control system. You can checkout the latest copy by executing: </para>
+    <para>
+      <screen>$ git clone git://live.debian.net/git/live-manual.git</screen>
+    </para>
+    <para> Prior to submission of your contribution, please preview your work. To preview the live-manual, ensure the packages needed for building are installed by executing: </para>
+    <para>
+      <screen># apt-get install dblatex docbook-xml docbook-xsl make po4a w3m</screen>
+    </para>
+    <para> You may build the live-manual from the top level directory of your git checkout by executing: </para>
+    <para>
+      <screen>$ make build</screen>
+    </para>
+    <sect3 id="commiting">
+      <title>Applying patches</title>
+      <para> Directly commiting to the repository is possible by anyone. However, we ask you to send bigger changes to the mailinglist to discuss them first. In order to push to the repository, the following steps are required. </para>
+      <itemizedlist>
+        <listitem>
+          <para> Fetch the public commit key: </para>
+          <para>
+            <screen>$ mkdir -p ~/.ssh/identity.d $ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live -O ~/.ssh/identity.d/live-manual at debian-live $ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub -O ~/.ssh/identity.d/live-manual at debian-live.pub $ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*</screen>
+          </para>
+        </listitem>
+        <listitem>
+          <para> Add the following section to your openssh-client config: </para>
+          <para>
+            <screen> $ cat &gt;&gt; ~/.ssh/config &lt;&lt; EOF Host live.debian.net Hostname live.debian.net User gitosis IdentityFile ~/.ssh/identity.d/live-manual at debian-live EOF</screen>
+          </para>
+        </listitem>
+        <listitem>
+          <para> Checkout a clone of the manual through ssh: </para>
+          <para>
+            <screen>$ git clone gitosis at live.debian.net:/live-manual.git</screen>
+          </para>
+        </listitem>
+        <listitem>
+          <para> Commit the file after editing. Write commit messages, that consist of full useful sentences, starting with a capital letter and ending with a full stop. Usually starting with the form 'Fixing/Adding/Removing/Correcting/': </para>
+          <para>
+            <screen>$ git commit -a</screen>
+          </para>
+        </listitem>
+        <listitem>
+          <para> Push the commit to the server: </para>
+          <para>
+            <screen>$ git push</screen>
+          </para>
+        </listitem>
+      </itemizedlist>
+    </sect3>
+  </sect2>
 </sect1>
diff --git a/manual/en/about_project.xml b/manual/en/about_project.xml
index 0105678..003cb58 100644
--- a/manual/en/about_project.xml
+++ b/manual/en/about_project.xml
@@ -1,277 +1,114 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-	<!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
-
 <sect1 id="about">
-<title>About the Debian Live Project</title>
-
-<sect2 id="motivation">
-<title>Motivation</title>
-
-<sect3>
-<title>What is wrong with current live systems</title>
-
-<para>
-	There are already several Debian-based live systems and they are doing a
-	great job. But, from the Debian perspective most of them have one or
-	more of the following disadvantages:
-</para>
-
-<orderedlist>
-
-<listitem>
-<para>
-	They are unofficial projects, developed outside of Debian.
-</para>
-</listitem>
-
-<listitem>
-<para>
-	They mix different distributions, e.g. testing and unstable.
-</para>
-</listitem>
-
-<listitem>
-<para>
-	They support i386 only.
-</para>
-</listitem>
-
-<listitem>
-<para>
-	They modify the behaviour and/or appearance of packages by stripping
-	them down to save space.
-</para>
-</listitem>
-
-<listitem>
-<para>
-	They include unofficial packages.
-</para>
-</listitem>
-
-<listitem>
-<para>
-	They ship custom kernels with additional patches that are not part of
-	Debian.
-</para>
-</listitem>
-
-<listitem>
-<para>
-	They are large and slow due to their sheer size and thus not suitable
-	for rescue issues.
-</para>
-</listitem>
-
-<listitem>
-<para>
-	They are not available in different flavours, e.g. CDs, DVDs, USB-stick
-	and netboot images.
-</para>
-</listitem>
-
-</orderedlist>
-</sect3>
-
-<sect3>
-<title>Why create our own live system?</title>
-
-<para>
-	Debian is the Universal Operating System: Debian should have an official
-	live system for showing around and to officially represent the true, one
-	and only Debian system with the following main advantages:
-</para>
-
-<orderedlist>
-
-<listitem>
-<para>
-	It would be an official Debian subproject.
-</para>
-</listitem>
-
-<listitem>
-<para>
-	It reflects the (current) state of one distribution.
-</para>
-</listitem>
-
-<listitem>
-<para>
-	It runs on as many architectures as possible.
-</para>
-</listitem>
-
-<listitem>
-<para>
-	It consists of unchanged Debian packages only.
-</para>
-</listitem>
-
-<listitem>
-<para>
-	It does not contain any unofficial packages.
-</para>
-</listitem>
-
-<listitem>
-<para>
-	It uses an unaltered Debian kernel-image with no additional patches.
-</para>
-</listitem>
-
-</orderedlist>
-
-</sect3>
-
-</sect2>
-
-<sect2 id="philosophy">
-<title>Philosophy</title>
-
-<sect3>
-<title>Only unchanged, official packages</title>
-
-<para>
-	We will only use official packages from the Debian repository in the
-	"main" section (possibly contrib, although not decided yet). The
-	non-free section is not part of Debian and therefore cannot be used at
-	all for live systems.
-</para>
-
-<para>
-	We will not change any packages. Whenever we need to change something,
-	we will do that in coordination with its package maintainer in Debian.
-</para>
-
-<para>
-	As an exception, our own packages such as &live-helper; or
-	&live-initramfs; may temporarily be used from our own repository for
-	development reasons (e.g. to create development snapshots). They will be
-	uploaded to Debian on a regular basis.
-</para>
-
-</sect3>
-
-<sect3>
-<title>No package configuration of the live system</title>
-
-<para>
-	In this phase we will not ship or install sample or alternative
-	configurations. All packages are used in their default configuration as
-	they are after a regular installation of Debian.
-</para>
-
-<para>
-	Whenever we need a different default configuration, we will do that in
-	coordination with its package maintainer in Debian.
-</para>
-
-<para>
-	A system for configuring packages is provided using debconf in
-	<command>lh config</command> (use --preseed FILE) allowing custom
-	configured packages to be installed in your custom produced Debian Live
-	images, but for official live images only default configuration will be
-	used. For more information, please see <xref linkend="customization"/>.
-</para>
-
-<para>
-	Exception: There are a few essential changes needed to bring a live
-	system to life (e.g. configuring pam to allow empty passwords). These
-	essential changes have to be kept as minimal as possible and should be
-	merged within the Debian repository if possible.
-</para>
-
-</sect3>
-
-<sect3>
-<title>Live system to hard disk installer</title>
-
-<para>
-	For the moment we will not ship an installer to copy the live system to
-	a partition on the hard disk. Although we keep the changes in the live
-	system as drastically minimal as possible compared to a regular Debian
-	installation, the live system does differ in a few essential points (see
-	exceptions, guideline 2).
-</para>
-
-<para>
-	Therefore, we will ship a copy of the regular DebianInstaller (resp.
-	Debian Installer, Graphical Installer) instead, to allow users to
-	perform a regular Debian installation (and, of course, cdebootstrap and
-	debootstrap are on the system too).
-</para>
-
-</sect3>
-
-</sect2>
-
-<sect2 id="contact">
-<title>Contact</title>
-
-<variablelist>
-
-<varlistentry>
-<term>Mailing list</term>
-
-<listitem>
-<para>
-	The primary contact for the project is the <ulink
-	url="http://lists.debian.org/debian-live/">mailing list</ulink>. You can
-	email the list directly by addressing your mail to
-	<email>debian-live at lists.debian.org</email>. The <ulink
-	url="http://lists.debian.org/debian-live/">list archives</ulink> are
-	also available.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>IRC</term>
-
-<listitem>
-<para>
-	A number of users and developers are present in the <ulink
-	url="irc://irc.debian.org/#debian-live">#debian-live</ulink> channel on
-	<ulink url="http://oftc.net">OFTC</ulink>. When asking a question on
-	IRC, please be patient for an answer. If no answer is forthcoming,
-	please email the mailing list.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>BTS</term>
-
-<listitem>
-<para>
-	The Debian Bug Tracking System (BTS) contains details of bugs reported
-	by users and developers. Each bug is given a number, and is kept on file
-	until it is marked as having been dealt with. For more information,
-	please see <xref linkend="bugs"/>.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Wiki</term>
-
-<listitem>
-<para>
-	The <ulink url="http://wiki.debian.org/DebianLive"
-	>Debian Live wiki</ulink> is a place to gather information, discuss
-	applied technologies, and document frameworks of Debian Live systems
-	that go beyond the scope of this document.
-</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-
-</sect2>
-
+  <title>About the Debian Live Project</title>
+  <sect2 id="motivation">
+    <title>Motivation</title>
+    <sect3>
+      <title>What is wrong with current live systems</title>
+      <para> There are already several Debian-based live systems and they are doing a great job. But, from the Debian perspective most of them have one or more of the following disadvantages: </para>
+      <orderedlist>
+        <listitem>
+          <para> They are unofficial projects, developed outside of Debian. </para>
+        </listitem>
+        <listitem>
+          <para> They mix different distributions, e.g. testing and unstable. </para>
+        </listitem>
+        <listitem>
+          <para> They support i386 only. </para>
+        </listitem>
+        <listitem>
+          <para> They modify the behaviour and/or appearance of packages by stripping them down to save space. </para>
+        </listitem>
+        <listitem>
+          <para> They include unofficial packages. </para>
+        </listitem>
+        <listitem>
+          <para> They ship custom kernels with additional patches that are not part of Debian. </para>
+        </listitem>
+        <listitem>
+          <para> They are large and slow due to their sheer size and thus not suitable for rescue issues. </para>
+        </listitem>
+        <listitem>
+          <para> They are not available in different flavours, e.g. CDs, DVDs, USB-stick and netboot images. </para>
+        </listitem>
+      </orderedlist>
+    </sect3>
+    <sect3>
+      <title>Why create our own live system?</title>
+      <para> Debian is the Universal Operating System: Debian should have an official live system for showing around and to officially represent the true, one and only Debian system with the following main advantages: </para>
+      <orderedlist>
+        <listitem>
+          <para> It would be an official Debian subproject. </para>
+        </listitem>
+        <listitem>
+          <para> It reflects the (current) state of one distribution. </para>
+        </listitem>
+        <listitem>
+          <para> It runs on as many architectures as possible. </para>
+        </listitem>
+        <listitem>
+          <para> It consists of unchanged Debian packages only. </para>
+        </listitem>
+        <listitem>
+          <para> It does not contain any unofficial packages. </para>
+        </listitem>
+        <listitem>
+          <para> It uses an unaltered Debian kernel-image with no additional patches. </para>
+        </listitem>
+      </orderedlist>
+    </sect3>
+  </sect2>
+  <sect2 id="philosophy">
+    <title>Philosophy</title>
+    <sect3>
+      <title>Only unchanged, official packages</title>
+      <para> We will only use official packages from the Debian repository in the "main" section (possibly contrib, although not decided yet). The non-free section is not part of Debian and therefore cannot be used at all for live systems. </para>
+      <para> We will not change any packages. Whenever we need to change something, we will do that in coordination with its package maintainer in Debian. </para>
+      <para> As an exception, our own packages such as &live-helper; or &live-initramfs; may temporarily be used from our own repository for development reasons (e.g. to create development snapshots). They will be uploaded to Debian on a regular basis. </para>
+    </sect3>
+    <sect3>
+      <title>No package configuration of the live system</title>
+      <para> In this phase we will not ship or install sample or alternative configurations. All packages are used in their default configuration as they are after a regular installation of Debian. </para>
+      <para> Whenever we need a different default configuration, we will do that in coordination with its package maintainer in Debian. </para>
+      <para> A system for configuring packages is provided using debconf in <command>lh config</command> (use --preseed FILE) allowing custom configured packages to be installed in your custom produced Debian Live images, but for official live images only default configuration will be used. For more information, please see <xref linkend="customization"/>. </para>
+      <para> Exception: There are a few essential changes needed to bring a live system to life (e.g. configuring pam to allow empty passwords). These essential changes have to be kept as minimal as possible and should be merged within the Debian repository if possible. </para>
+    </sect3>
+    <sect3>
+      <title>Live system to hard disk installer</title>
+      <para> For the moment we will not ship an installer to copy the live system to a partition on the hard disk. Although we keep the changes in the live system as drastically minimal as possible compared to a regular Debian installation, the live system does differ in a few essential points (see exceptions, guideline 2). </para>
+      <para> Therefore, we will ship a copy of the regular DebianInstaller (resp. Debian Installer, Graphical Installer) instead, to allow users to perform a regular Debian installation (and, of course, cdebootstrap and debootstrap are on the system too). </para>
+    </sect3>
+  </sect2>
+  <sect2 id="contact">
+    <title>Contact</title>
+    <variablelist>
+      <varlistentry>
+        <term>Mailing list</term>
+        <listitem>
+          <para> The primary contact for the project is the <ulink url="http://lists.debian.org/debian-live/">mailing list</ulink>. You can email the list directly by addressing your mail to <email>debian-live at lists.debian.org</email>. The <ulink url="http://lists.debian.org/debian-live/">list archives</ulink> are also available. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>IRC</term>
+        <listitem>
+          <para> A number of users and developers are present in the <ulink url="irc://irc.debian.org/#debian-live">#debian-live</ulink> channel on <ulink url="http://oftc.net">OFTC</ulink>. When asking a question on IRC, please be patient for an answer. If no answer is forthcoming, please email the mailing list. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>BTS</term>
+        <listitem>
+          <para> The Debian Bug Tracking System (BTS) contains details of bugs reported by users and developers. Each bug is given a number, and is kept on file until it is marked as having been dealt with. For more information, please see <xref linkend="bugs"/>. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Wiki</term>
+        <listitem>
+          <para> The <ulink url="http://wiki.debian.org/DebianLive">Debian Live wiki</ulink> is a place to gather information, discuss applied technologies, and document frameworks of Debian Live systems that go beyond the scope of this document. </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
 </sect1>
diff --git a/manual/en/appendices_configuration-files.xml b/manual/en/appendices_configuration-files.xml
index 3f14b56..ee07a94 100644
--- a/manual/en/appendices_configuration-files.xml
+++ b/manual/en/appendices_configuration-files.xml
@@ -1,518 +1,602 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
-
 <appendix id="configuration-files">
-<title>Configuration files</title>
-
-<section id="config-binary">
-<title>The <filename>config/binary</filename> file</title>
-
-<variablelist>
-<varlistentry>
- <term>LH_BINARY_FILESYSTEM</term>
- <listitem><para>Set image filesystem. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BINARY_IMAGES</term>
- <listitem><para>Set image type. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BINARY_INDICES</term>
- <listitem><para>Set apt/aptitude generic indices. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BOOTAPPEND_LIVE</term>
- <listitem><para>Set boot parameters. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BOOTAPPEND_INSTALL</term>
- <listitem><para>Set boot parameters. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BOOTLOADER</term>
- <listitem><para>Set bootloader. (See <xref linkend="bootloaders"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_CHECKSUMS</term>
- <listitem><para>Set checksums. (See <xref linkend="cheat-codes"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_CHROOT_BUILD</term>
- <listitem><para>Control if we build binary images chrooted. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_DEBIAN_INSTALLER</term>
- <listitem><para>Set debian-installer. (See <xref linkend="debian-installer"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_DEBIAN_INSTALLER_DAILY</term>
- <listitem><para>Set daily images. (See <xref linkend="debian-installer"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_ENCRYPTION</term>
- <listitem><para>Set encrytion. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_GRUB_SPLASH</term>
- <listitem><para>Set custom grub splash. (See <xref linkend="splash"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_HOSTNAME</term>
- <listitem><para>Set hostname. (See <xref linkend="hostname"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_ISO_APPLICATION</term>
- <listitem><para>Set iso author. (See <xref linkend="iso-metadata"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_ISO_PREPARER</term>
- <listitem><para>Set iso preparer. (See <xref linkend="iso-metadata"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_ISO_PUBLISHER</term>
- <listitem><para>Set iso publisher. (See <xref linkend="iso-metadata"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_ISO_VOLUME</term>
- <listitem><para>Set iso volume (max 32 chars). (See <xref linkend="iso-metadata"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_JFFS2_ERASEBLOCK</term>
- <listitem><para>Set jffs2 eraseblock size. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_MEMTEST</term>
- <listitem><para>Set memtest. (See <xref linkend="memtest"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_NET_ROOT_FILESYSTEM</term>
- <listitem><para>Set netboot filesystem. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_NET_ROOT_MOUNTOPTIONS</term>
- <listitem><para>Set nfsopts. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_NET_ROOT_PATH</term>
- <listitem><para>Set netboot server directory. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_NET_ROOT_SERVER</term>
- <listitem><para>Set netboot server address. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_NET_COW_FILESYSTEM</term>
- <listitem><para>Set net client cow filesystem. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_NET_COW_MOUNTOPTIONS</term>
- <listitem><para>Set cow mount options. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_NET_COW_PATH</term>
- <listitem><para>Set cow directory. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_NET_COW_SERVER</term>
- <listitem><para>Set cow server. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_NET_TARBALL</term>
- <listitem><para>Set net tarball. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SYSLINUX_SPLASH</term>
- <listitem><para>Set custom syslinux splash. (See <xref linkend="splash"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SYSLINUX_TIMEOUT</term>
- <listitem><para>Set custom syslinux timeout in seconds. (See <xref linkend="syslinux"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SYSLINUX_CFG</term>
- <listitem><para>Set custom syslinux configuration file. (See <xref linkend="syslinux"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SYSLINUX_MENU</term>
- <listitem><para>Set syslinux menu. (See <xref linkend="syslinux"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SYSLINUX_MENU_LIVE_ENTRY</term>
- <listitem><para>Set text to be used on the menu for live entries. (See <xref linkend="syslinux"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY</term>
- <listitem><para>Set text to be used on the menu for live entries (failsafe ones). (See <xref linkend="syslinux"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SYSLINUX_MENU_MEMTEST_ENTRY</term>
- <listitem><para>Set text to be used on the menu for memtest entry. (See <xref linkend="syslinux"/> and <xref linkend="memtest"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_USERNAME</term>
- <listitem><para>Set username. (See <xref linkend="live-user"/>)</para></listitem>
-</varlistentry>
-
-</variablelist>
-</section>
-
-<section id="config-bootstrap">
-<title>The <filename>config/bootstrap</filename> file</title>
-
-<variablelist>
-<varlistentry>
- <term>LH_ARCHITECTURE</term>
- <listitem><para>Select chroot architecture. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BOOTSTRAP_CONFIG</term>
- <listitem><para>Set distribution config directory. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BOOTSTRAP_INCLUDE</term>
- <listitem><para>Include packages on base. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BOOTSTRAP_EXCLUDE</term>
- <listitem><para>Exclude packages on base. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BOOTSTRAP_FLAVOUR</term>
- <listitem><para>Select flavour to use. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BOOTSTRAP_KEYRING</term>
- <listitem><para>Set distribution keyring. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_DISTRIBUTION</term>
- <listitem><para>Select distribution to use. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_MIRROR_BOOTSTRAP</term>
- <listitem><para>Set mirror to bootstrap from. (See <xref linkend="package-sources"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_MIRROR_CHROOT</term>
- <listitem><para>Set mirror to fetch packages from. (See <xref linkend="package-sources"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_MIRROR_CHROOT_SECURITY</term>
- <listitem><para>Set security mirror to fetch packages from. (See <xref linkend="package-sources"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_MIRROR_BINARY</term>
- <listitem><para>Set mirror which ends up in the image. (See <xref linkend="package-sources"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_MIRROR_BINARY_SECURITY</term>
- <listitem><para>Set security mirror which ends up in the image. (See <xref linkend="package-sources"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SECTIONS</term>
- <listitem><para>select section(s) to use. (See <xref linkend="package-sources"/>)</para></listitem>
-</varlistentry>
-</variablelist>
-</section>
-
-<section id="config-chroot">
-<title>The <filename>config/chroot</filename> file</title>
-
-<variablelist>
-<varlistentry>
- <term>LH_CHROOT_FILESYSTEM</term>
- <listitem><para>Set chroot filesystem. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_UNION_FILESYSTEM</term>
- <listitem><para>Set union filesystem. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_EXPOSED_ROOT</term>
- <listitem><para>expose root as read only. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_HOOKS</term>
- <listitem><para>Set hook commands. (See <xref linkend="hooks"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_INTERACTIVE</term>
- <listitem><para>Set interactive build. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_KEYRING_PACKAGES</term>
- <listitem><para>Set keyring packages. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_LANGUAGE</term>
- <listitem><para>Set language to use. (See <xref linkend="language"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_LINUX_FLAVOURS</term>
- <listitem><para>Set kernel flavour to use. (See <xref linkend="kernel"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_LINUX_PACKAGES</term>
- <listitem><para>Set kernel packages to use. (See <xref linkend="kernel"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_PACKAGES</term>
- <listitem><para>Set packages to install. (See <xref linkend="lh-packages"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_PACKAGES_LISTS</term>
- <listitem><para>Set package list to install. (See <xref linkend="package-lists"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_TASKS</term>
- <listitem><para>Set tasks to install. (See <xref linkend="tasks"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SECURITY</term>
- <listitem><para>enable security updates. (See <xref linkend="package-sources"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SYMLINKS</term>
- <listitem><para>enable symlink convertion. (See <xref linkend="symlinks"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SYSVINIT</term>
- <listitem><para>enable sysvinit. (See <xref linkend="startup-scripts"/>)</para></listitem>
-</varlistentry>
-
-</variablelist>
-</section>
-
-<section id="config-common">
-<title>The <filename>config/common</filename> file</title>
-
-<variablelist>
-<varlistentry>
- <term>LH_APT</term>
- <listitem><para>Set package manager. (See <xref linkend="package-installation"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_APT_FTP_PROXY</term>
- <listitem><para>Set apt/aptitude ftp proxy. (See <xref linkend="package-installation"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_APT_HTTP_PROXY</term>
- <listitem><para>Set apt/aptitude http proxy. (See <xref linkend="package-installation"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_APT_PDIFFS</term>
- <listitem><para>Set apt/aptitude pdiff indices. (See <xref linkend="package-installation"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_APT_PIPELINE</term>
- <listitem><para>Set apt/aptitude pipeline depth. (See <xref linkend="package-installation"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_APT_RECOMMENDS</term>
- <listitem><para>Set apt/aptitude recommends. (See <xref linkend="package-installation"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_APT_SECURE</term>
- <listitem><para>Set apt/aptitude security. (See <xref linkend="package-installation"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BOOTSTRAP</term>
- <listitem><para>Set bootstrap program. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_CACHE</term>
- <listitem><para>control cache. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_CACHE_INDICES</term>
- <listitem><para>control if downloaded package indices should be cached. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_CACHE_PACKAGES</term>
- <listitem><para>control if downloaded packages files should be cached. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_CACHE_STAGES</term>
- <listitem><para>control if completed stages should be cached. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_DEBCONF_FRONTEND</term>
- <listitem><para>Set debconf(1) frontend to use. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_DEBCONF_NOWARNINGS</term>
- <listitem><para>Set debconf(1) warnings. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_DEBCONF_PRIORITY</term>
- <listitem><para>Set debconf(1) priority to use. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_INITRAMFS</term>
- <listitem><para>Set initramfs hook. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_FDISK</term>
- <listitem><para>Set fdisk program. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_LOSETUP</term>
- <listitem><para>Set losetup program. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_MODE</term>
- <listitem><para>Set distribution mode. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_ROOT_COMMAND</term>
- <listitem><para>use sudo or equivalent. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_USE_FAKEROOT</term>
- <listitem><para>use fakeroot/fakechroot. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_TASKSEL</term>
- <listitem><para>Set tasksel program. (See <xref linkend="tasks"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_INCLUDES</term>
- <listitem><para>Set includes. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_TEMPLATES</term>
- <listitem><para>Set templates. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BREAKPOINTS</term>
- <listitem><para>enable breakpoints. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_DEBUG</term>
- <listitem><para>enable debug. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_FORCE</term>
- <listitem><para>enable force. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_QUIET</term>
- <listitem><para>enable quiet. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_VERBOSE</term>
- <listitem><para>enable verbose. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-</variablelist>
-</section>
-
-<section id="config-source">
-<title>The <filename>config/source</filename> file</title>
-
-<variablelist>
-<varlistentry>
- <term>LH_SOURCE</term>
- <listitem><para>Set source option. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SOURCE_IMAGES</term>
- <listitem><para>Set image type. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-</variablelist>
-</section>
-
+  <title>Configuration files</title>
+  <section id="config-binary">
+    <title>The <filename>config/binary</filename> file</title>
+    <variablelist>
+      <varlistentry>
+        <term>LH_BINARY_FILESYSTEM</term>
+        <listitem>
+          <para>Set image filesystem. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_BINARY_IMAGES</term>
+        <listitem>
+          <para>Set image type. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_BINARY_INDICES</term>
+        <listitem>
+          <para>Set apt/aptitude generic indices. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_BOOTAPPEND_LIVE</term>
+        <listitem>
+          <para>Set boot parameters. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_BOOTAPPEND_INSTALL</term>
+        <listitem>
+          <para>Set boot parameters. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_BOOTLOADER</term>
+        <listitem>
+          <para>Set bootloader. (See <xref linkend="bootloaders"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_CHECKSUMS</term>
+        <listitem>
+          <para>Set checksums. (See <xref linkend="cheat-codes"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_CHROOT_BUILD</term>
+        <listitem>
+          <para>Control if we build binary images chrooted. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_DEBIAN_INSTALLER</term>
+        <listitem>
+          <para>Set debian-installer. (See <xref linkend="debian-installer"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_DEBIAN_INSTALLER_DAILY</term>
+        <listitem>
+          <para>Set daily images. (See <xref linkend="debian-installer"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_ENCRYPTION</term>
+        <listitem>
+          <para>Set encrytion. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_GRUB_SPLASH</term>
+        <listitem>
+          <para>Set custom grub splash. (See <xref linkend="splash"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_HOSTNAME</term>
+        <listitem>
+          <para>Set hostname. (See <xref linkend="hostname"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_ISO_APPLICATION</term>
+        <listitem>
+          <para>Set iso author. (See <xref linkend="iso-metadata"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_ISO_PREPARER</term>
+        <listitem>
+          <para>Set iso preparer. (See <xref linkend="iso-metadata"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_ISO_PUBLISHER</term>
+        <listitem>
+          <para>Set iso publisher. (See <xref linkend="iso-metadata"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_ISO_VOLUME</term>
+        <listitem>
+          <para>Set iso volume (max 32 chars). (See <xref linkend="iso-metadata"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_JFFS2_ERASEBLOCK</term>
+        <listitem>
+          <para>Set jffs2 eraseblock size. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_MEMTEST</term>
+        <listitem>
+          <para>Set memtest. (See <xref linkend="memtest"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_NET_ROOT_FILESYSTEM</term>
+        <listitem>
+          <para>Set netboot filesystem. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_NET_ROOT_MOUNTOPTIONS</term>
+        <listitem>
+          <para>Set nfsopts. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_NET_ROOT_PATH</term>
+        <listitem>
+          <para>Set netboot server directory. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_NET_ROOT_SERVER</term>
+        <listitem>
+          <para>Set netboot server address. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_NET_COW_FILESYSTEM</term>
+        <listitem>
+          <para>Set net client cow filesystem. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_NET_COW_MOUNTOPTIONS</term>
+        <listitem>
+          <para>Set cow mount options. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_NET_COW_PATH</term>
+        <listitem>
+          <para>Set cow directory. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_NET_COW_SERVER</term>
+        <listitem>
+          <para>Set cow server. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_NET_TARBALL</term>
+        <listitem>
+          <para>Set net tarball. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_SYSLINUX_SPLASH</term>
+        <listitem>
+          <para>Set custom syslinux splash. (See <xref linkend="splash"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_SYSLINUX_TIMEOUT</term>
+        <listitem>
+          <para>Set custom syslinux timeout in seconds. (See <xref linkend="syslinux"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_SYSLINUX_CFG</term>
+        <listitem>
+          <para>Set custom syslinux configuration file. (See <xref linkend="syslinux"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_SYSLINUX_MENU</term>
+        <listitem>
+          <para>Set syslinux menu. (See <xref linkend="syslinux"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_SYSLINUX_MENU_LIVE_ENTRY</term>
+        <listitem>
+          <para>Set text to be used on the menu for live entries. (See <xref linkend="syslinux"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY</term>
+        <listitem>
+          <para>Set text to be used on the menu for live entries (failsafe ones). (See <xref linkend="syslinux"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_SYSLINUX_MENU_MEMTEST_ENTRY</term>
+        <listitem>
+          <para>Set text to be used on the menu for memtest entry. (See <xref linkend="syslinux"/> and <xref linkend="memtest"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_USERNAME</term>
+        <listitem>
+          <para>Set username. (See <xref linkend="live-user"/>)</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </section>
+  <section id="config-bootstrap">
+    <title>The <filename>config/bootstrap</filename> file</title>
+    <variablelist>
+      <varlistentry>
+        <term>LH_ARCHITECTURE</term>
+        <listitem>
+          <para>Select chroot architecture. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_BOOTSTRAP_CONFIG</term>
+        <listitem>
+          <para>Set distribution config directory. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_BOOTSTRAP_INCLUDE</term>
+        <listitem>
+          <para>Include packages on base. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_BOOTSTRAP_EXCLUDE</term>
+        <listitem>
+          <para>Exclude packages on base. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_BOOTSTRAP_FLAVOUR</term>
+        <listitem>
+          <para>Select flavour to use. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_BOOTSTRAP_KEYRING</term>
+        <listitem>
+          <para>Set distribution keyring. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_DISTRIBUTION</term>
+        <listitem>
+          <para>Select distribution to use. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_MIRROR_BOOTSTRAP</term>
+        <listitem>
+          <para>Set mirror to bootstrap from. (See <xref linkend="package-sources"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_MIRROR_CHROOT</term>
+        <listitem>
+          <para>Set mirror to fetch packages from. (See <xref linkend="package-sources"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_MIRROR_CHROOT_SECURITY</term>
+        <listitem>
+          <para>Set security mirror to fetch packages from. (See <xref linkend="package-sources"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_MIRROR_BINARY</term>
+        <listitem>
+          <para>Set mirror which ends up in the image. (See <xref linkend="package-sources"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_MIRROR_BINARY_SECURITY</term>
+        <listitem>
+          <para>Set security mirror which ends up in the image. (See <xref linkend="package-sources"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_SECTIONS</term>
+        <listitem>
+          <para>select section(s) to use. (See <xref linkend="package-sources"/>)</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </section>
+  <section id="config-chroot">
+    <title>The <filename>config/chroot</filename> file</title>
+    <variablelist>
+      <varlistentry>
+        <term>LH_CHROOT_FILESYSTEM</term>
+        <listitem>
+          <para>Set chroot filesystem. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_UNION_FILESYSTEM</term>
+        <listitem>
+          <para>Set union filesystem. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_EXPOSED_ROOT</term>
+        <listitem>
+          <para>expose root as read only. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_HOOKS</term>
+        <listitem>
+          <para>Set hook commands. (See <xref linkend="hooks"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_INTERACTIVE</term>
+        <listitem>
+          <para>Set interactive build. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_KEYRING_PACKAGES</term>
+        <listitem>
+          <para>Set keyring packages. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_LANGUAGE</term>
+        <listitem>
+          <para>Set language to use. (See <xref linkend="language"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_LINUX_FLAVOURS</term>
+        <listitem>
+          <para>Set kernel flavour to use. (See <xref linkend="kernel"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_LINUX_PACKAGES</term>
+        <listitem>
+          <para>Set kernel packages to use. (See <xref linkend="kernel"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_PACKAGES</term>
+        <listitem>
+          <para>Set packages to install. (See <xref linkend="lh-packages"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_PACKAGES_LISTS</term>
+        <listitem>
+          <para>Set package list to install. (See <xref linkend="package-lists"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_TASKS</term>
+        <listitem>
+          <para>Set tasks to install. (See <xref linkend="tasks"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_SECURITY</term>
+        <listitem>
+          <para>enable security updates. (See <xref linkend="package-sources"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_SYMLINKS</term>
+        <listitem>
+          <para>enable symlink convertion. (See <xref linkend="symlinks"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_SYSVINIT</term>
+        <listitem>
+          <para>enable sysvinit. (See <xref linkend="startup-scripts"/>)</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </section>
+  <section id="config-common">
+    <title>The <filename>config/common</filename> file</title>
+    <variablelist>
+      <varlistentry>
+        <term>LH_APT</term>
+        <listitem>
+          <para>Set package manager. (See <xref linkend="package-installation"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_APT_FTP_PROXY</term>
+        <listitem>
+          <para>Set apt/aptitude ftp proxy. (See <xref linkend="package-installation"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_APT_HTTP_PROXY</term>
+        <listitem>
+          <para>Set apt/aptitude http proxy. (See <xref linkend="package-installation"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_APT_PDIFFS</term>
+        <listitem>
+          <para>Set apt/aptitude pdiff indices. (See <xref linkend="package-installation"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_APT_PIPELINE</term>
+        <listitem>
+          <para>Set apt/aptitude pipeline depth. (See <xref linkend="package-installation"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_APT_RECOMMENDS</term>
+        <listitem>
+          <para>Set apt/aptitude recommends. (See <xref linkend="package-installation"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_APT_SECURE</term>
+        <listitem>
+          <para>Set apt/aptitude security. (See <xref linkend="package-installation"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_BOOTSTRAP</term>
+        <listitem>
+          <para>Set bootstrap program. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_CACHE</term>
+        <listitem>
+          <para>control cache. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_CACHE_INDICES</term>
+        <listitem>
+          <para>control if downloaded package indices should be cached. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_CACHE_PACKAGES</term>
+        <listitem>
+          <para>control if downloaded packages files should be cached. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_CACHE_STAGES</term>
+        <listitem>
+          <para>control if completed stages should be cached. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_DEBCONF_FRONTEND</term>
+        <listitem>
+          <para>Set debconf(1) frontend to use. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_DEBCONF_NOWARNINGS</term>
+        <listitem>
+          <para>Set debconf(1) warnings. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_DEBCONF_PRIORITY</term>
+        <listitem>
+          <para>Set debconf(1) priority to use. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_INITRAMFS</term>
+        <listitem>
+          <para>Set initramfs hook. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_FDISK</term>
+        <listitem>
+          <para>Set fdisk program. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_LOSETUP</term>
+        <listitem>
+          <para>Set losetup program. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_MODE</term>
+        <listitem>
+          <para>Set distribution mode. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_ROOT_COMMAND</term>
+        <listitem>
+          <para>use sudo or equivalent. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_USE_FAKEROOT</term>
+        <listitem>
+          <para>use fakeroot/fakechroot. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_TASKSEL</term>
+        <listitem>
+          <para>Set tasksel program. (See <xref linkend="tasks"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_INCLUDES</term>
+        <listitem>
+          <para>Set includes. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_TEMPLATES</term>
+        <listitem>
+          <para>Set templates. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_BREAKPOINTS</term>
+        <listitem>
+          <para>enable breakpoints. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_DEBUG</term>
+        <listitem>
+          <para>enable debug. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_FORCE</term>
+        <listitem>
+          <para>enable force. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_QUIET</term>
+        <listitem>
+          <para>enable quiet. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_VERBOSE</term>
+        <listitem>
+          <para>enable verbose. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </section>
+  <section id="config-source">
+    <title>The <filename>config/source</filename> file</title>
+    <variablelist>
+      <varlistentry>
+        <term>LH_SOURCE</term>
+        <listitem>
+          <para>Set source option. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>LH_SOURCE_IMAGES</term>
+        <listitem>
+          <para>Set image type. (See <xref linkend="configuration-layout"/>)</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </section>
 </appendix>
diff --git a/manual/en/appendices_configuration-layout.xml b/manual/en/appendices_configuration-layout.xml
index 7e23d9e..847029b 100644
--- a/manual/en/appendices_configuration-layout.xml
+++ b/manual/en/appendices_configuration-layout.xml
@@ -1,109 +1,194 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
-
 <appendix id="configuration-layout">
-<title>Configuration layout</title>
-
-<variablelist>
-<title>Layout of the <filename class="directory">config/</filename> directory</title>
-
-<varlistentry>
- <term><filename class="directory">binary_debian-installer/</filename></term>
- <listitem><para>(see <xref linkend="debian-installer"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">binary_grub/</filename></term>
- <listitem><para>(see <xref linkend="bootloaders"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">binary_local-debs/</filename></term>
- <listitem><para>(see <xref linkend="debian-installer"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">binary_local-hooks/</filename></term>
- <listitem><para>(see <xref linkend="binary-local-hooks"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">binary_local-includes/</filename></term>
- <listitem><para>(see <xref linkend="binary-includes"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">binary_local-packageslists/</filename></term>
- <listitem><para>(see <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">binary_local-udebs/</filename></term>
- <listitem><para>(see <xref linkend="debian-installer"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">binary_rootfs/</filename></term>
- <listitem><para>(see <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">binary_syslinux/</filename></term>
- <listitem><para>(see <xref linkend="bootloaders"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">chroot_apt/</filename></term>
- <listitem><para>(see <xref linkend="custom-packages-apt"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">chroot_local-hooks/</filename></term>
- <listitem><para>(see <xref linkend="chroot-local-hooks"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">chroot_local-includes/</filename></term>
- <listitem><para>(see <xref linkend="chroot-local-includes"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">chroot_local-packages/</filename></term>
- <listitem><para>(see <xref linkend="local-packages"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">chroot_local-packageslists/</filename></term>
- <listitem><para>(see <xref linkend="package-lists"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">chroot_local-presed/</filename></term>
- <listitem><para>(see <xref linkend="debconf-preseed"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">chroot_sources/</filename></term>
- <listitem><para>(see <xref linkend="custom-apt-repo"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">includes/</filename></term>
- <listitem><para>(see <xref linkend="bootloaders"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">templates/</filename></term>
- <listitem><para>(see <xref linkend="bootloaders"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term><filename>bootstrap</filename></term>
- <listitem><para>(see <xref linkend="config-bootstrap"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename>binary</filename></term>
- <listitem><para>(see <xref linkend="config-binary"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename>chroot</filename></term>
- <listitem><para>(see <xref linkend="config-chroot"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename>common</filename></term>
- <listitem><para>(see <xref linkend="config-common"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename>source</filename></term>
- <listitem><para>(see <xref linkend="config-source"/>)</para></listitem>
-</varlistentry>
-
-</variablelist>
-
+  <title>Configuration layout</title>
+  <variablelist>
+    <title>Layout of the <filename class="directory">config/</filename> directory</title>
+    <varlistentry>
+      <term>
+        <filename class="directory">binary_debian-installer/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="debian-installer"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">binary_grub/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="bootloaders"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">binary_local-debs/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="debian-installer"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">binary_local-hooks/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="binary-local-hooks"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">binary_local-includes/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="binary-includes"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">binary_local-packageslists/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="configuration-layout"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">binary_local-udebs/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="debian-installer"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">binary_rootfs/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="configuration-layout"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">binary_syslinux/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="bootloaders"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">chroot_apt/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="custom-packages-apt"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">chroot_local-hooks/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="chroot-local-hooks"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">chroot_local-includes/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="chroot-local-includes"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">chroot_local-packages/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="local-packages"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">chroot_local-packageslists/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="package-lists"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">chroot_local-presed/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="debconf-preseed"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">chroot_sources/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="custom-apt-repo"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">includes/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="bootloaders"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename class="directory">templates/</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="bootloaders"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename>bootstrap</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="config-bootstrap"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename>binary</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="config-binary"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename>chroot</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="config-chroot"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename>common</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="config-common"/>)</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry>
+      <term>
+        <filename>source</filename>
+      </term>
+      <listitem>
+        <para>(see <xref linkend="config-source"/>)</para>
+      </listitem>
+    </varlistentry>
+  </variablelist>
 </appendix>
diff --git a/manual/en/basics.xml b/manual/en/basics.xml
index e2e8479..9b186e0 100644
--- a/manual/en/basics.xml
+++ b/manual/en/basics.xml
@@ -1,670 +1,228 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-	<!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
-
 <chapter id="basics">
-<title>The basics</title>
-
-<para>
-	This chapter contains a brief overview of the build process as well as
-	containing instructions on how to boot the various binary image types.
-</para>
-
-<section>
-<title>What is a live system?</title>
-
-<para>
-	A live system usually means an OS booted on a computer from a removable
-	medium (such as CD-ROM, USB stick, or network), ready to use without any
-	installation on the usual drive(s), with an auto-configuration done at
-	runtime (see <xref linkend="terms" />).
-</para>
-
-<para>
-	With Debian Live, it's a Debian GNU/Linux OS, built for one of the
-	supported architectures (currently amd64, i386, powerpc and sparc). It
-	is made from following parts:
-</para>
-
-<variablelist>
-
-<varlistentry>
-<term>Linux kernel</term>
-
-<listitem>
-<para>
-	The Linux image, usually named <filename>vmlinuz*</filename>.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Initial RAM disk image (initrd)</term>
-
-<listitem>
-<para>
-	RAM disk setup for the Linux boot, containing modules possibly needed to
-	mount the filesystem's image and some scripts to do it.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>System image</term>
-
-<listitem>
-<para>
-	The OS filesystem image. Debian Live uses SquashFS, a compressed
-	filesystem, to minimize its image size. Note that it's read-only. So,
-	during boot the Debian Live system will use a RAM disk and 'union'
-	mechanism to enable writing files within the running system. However,
-	all modifications will be lost upon shutdown unless optional persistence
-	partition(s) are used. (See <xref linkend="persistence" />.)
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Bootloader</term>
-
-<listitem>
-<para>
-	A small piece of code, crafted to boot up from the chosen media,
-	possibly presenting a prompt or menu to allow selection of
-	options/configuration. It then loads the Linux kernel and its initrd to
-	run with an associated filesystem image. Different solutions can be used
-	depending on the target media and format of the filesystem containing
-	the previous components: Isolinux to boot from a CD or DVD in ISO9660
-	format, syslinux for HDD or USB drive booting from a VFAT partition,
-	GRUB for ext2/3 partition, pxelinux for PXE netboot, etc.
-</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-
-<para>
-	The Debian Live tools will build the system image from your
-	specifications, setup a Linux kernel and its initrd, a bootloader to run
-	them, all in one media-dependant format(ISO9660 image, disk image, etc.)
-</para>
-
-</section>
-
-<section>
-<title>First steps: building an ISO image</title>
-
-<para>
-	The following sequence of helper commands, provided by &live-helper;,
-	will create a basic ISO image containing just the Debian standard system
-	without X.org. It is suitable for burning to CD or DVD media.
-</para>
-
-<para>
-	First, we run the <filename>lh config</filename> helper command which
-	will create a <filename>"config/"</filename> hierarchy in the current
-	directory for use by other helper commands:
-</para>
-
-<para>
-	<screen>$ lh config</screen>
-</para>
-
-<para>
-	By passing no parameters to <filename>lh config</filename> we indicated
-	that we wish to use the defaults. This will create an image of type
-	binary (see <xref linkend="lh-config" />).
-</para>
-
-<para>
-	Now that we have a <filename>"config/"</filename> hierarchy, we may
-	build the image with the <filename>lh build</filename> helper command:
-</para>
-
-<para>
-	<screen># lh build</screen>
-</para>
-
-<para>
-	This process can take a while, depending on the speed of your network
-	connection (see <xref linkend="lh-build" />).
-</para>
-
-<section>
-<title>Testing an ISO image with Qemu</title>
-
-<para>
-	Testing an ISO is simple:
-</para>
-
-<para>
-	<screen># apt-get install qemu
-$ qemu -cdrom binary.iso</screen>
-</para>
-
-</section>
-
-<section>
-<title>Testing an ISO image with virtualbox-ose</title>
-
-<para>
-	In order to test the ISO with virtualbox-ose:
-</para>
-
-<para>
-	<screen># apt-get install virtualbox-ose</screen>
-</para>
-and either install 
-<itemizedlist>
-<listitem><para>the modules package for a stock kernel eg virtualbox-ose-modules-2.6.26-1-486 or</para></listitem>
-<listitem><para>the modules package compiled for your kernel using module-assistant from the package virtualbox-ose-source </para></listitem>
-</itemizedlist>
-<para> Run Virtualbox:</para>
-For example, in Gnome
-<para>  {{{Applications -> System Tools -> VirtualBox OSE }}}</para>
-
-<para>Create a virtual machine from your Live ISO</para>
-
-<para>To create a virtual machine "mylive" from A CDROM ISO "binary.iso" in VirtualBox:</para>
-<para>  {{{Machine -> New }}}</para>
-<para>In the Wizard:  FIXME </para>
-</section>
-
-<section>
-<title>Testing an ISO image with VMware Workstation</title>
-
-<para>In order to test the ISO with VMware Workstation:</para>
-
-<para> Run VMware Workstation:</para>
-<para>Click on Edit virtual machine settings in the VM summary page. </para>
-<para>Then, click on the CD-ROM device and select Use ISO image. Remeber to connect the CD-ROM device at power on and remeber to adjust the boot order in the bios.</para>
-</section>
-
-<section>
-<title>Burning an ISO image to a physical medium</title>
-
-<para>
-	Burning an ISO image is easy:
-</para>
-
-<para>
-	<screen># apt-get install wodim
-$ wodim binary.iso</screen>
-</para>
-
-</section>
-
-</section>
-
-<section>
-<title>Building an USB/HDD image</title>
-
-<para>
-	The following sequence of helper commands will create a basic USB/HDD
-	image containing just the Debian standard system without X.org. It is
-	suitable for booting from USB sticks, USB hard drives, and various other
-	portable storage devices.
-</para>
-
-<para>
-	Note if you created an iso image with the previous example, you will
-	need to clean up your working directory with the
-	<filename>lh clean</filename> helper command (see
-	<xref linkend="lh-clean" />):
-</para>
-
-<para>
-	<screen>$ lh clean --binary</screen>
-</para>
-
-<para>
-	Run the <filename>lh config</filename> helper command with the
-	parameters to configure the <filename>"config/"</filename> hierarchy to
-	create a USB/HDD image type:
-</para>
-
-<para>
-	<screen>$ lh config -b usb-hdd</screen>
-</para>
-
-<para>
-	Now build the image with the <filename>lh build</filename> helper
-	command:
-</para>
-
-<para>
-	<screen># lh build</screen>
-</para>
-
-<section  id="image_copying">
-<title>Copying USB/HDD image to a USB stick</title>
-
-<para>
-	The generated binary image contains a <acronym>VFAT</acronym> partition
-	and the <command>syslinux</command> bootloader, ready to be directly
-	written on an USB stick. Plug in an USB stick with a size larger than
-	that of <filename>binary.img</filename> and type:
-</para>
-
-<para>
-	<screen>$ dd if=binary.img of=${USBSTICK}</screen>
-</para>
-
-<para>
-	where <replaceable>${USBSTICK}</replaceable> is the device file of your
-	key, like <filename>/dev/sdb</filename> (not a partition like
-	<filename>/dev/sdb1</filename>!); you can find the right device name by
-	looking in <command>dmesg</command>'s output after plugging in the
-	stick, for example.
-</para>
-
-<para>
-	<important>This will definitely overwrite any previous contents on your
-	stick!</important>
-</para>
-
-</section>
-
-<section>
-<title>Testing a USB/HDD image with Qemu</title>
-
-<para>
-	<screen># apt-get install qemu
-$ qemu -hda binary.img</screen>
-</para>
-
-</section>
-<section>
-<title>Testing an USB/HDD  image with VMware Workstation</title>
-
-<para>
-	In order to test the USB/HDD image with VMware Workstation:
-</para>
-
-<para> Run VMware Workstation:</para>
-<para>Write the image to an usb stick. In VMware, click on Edit virtual machine settings in VM summary page. Then, add a new physical harddisk device and enter the device node of your usb stick.</para>
-</section>
-
-<section>
-<title>Using the space left on a USB stick</title>
-
-<para>
-	If you want to use the remaining free space after you have installed the
-	<filename>binary.img</filename>, you can use a partitioning tool such as
-	gparted or parted to create a new partition on the stick. The first
-	partition will be used by the Debian Live system.
-</para>
-
-<para>
-	<screen># gparted ${USBSTICK}</screen>
-</para>
-
-<para>
-	After the creation of the partition you have to create a filsystem on
-	it. One possible choice would be ext2 (ext3 isn't recommended because
-	the journaling causes too many writes to the stick).
-</para>
-
-<para>
-	<screen># mkfs.ext2 ${USBSTICK}</screen>
-</para>
-
-<para>
-	If you want to use this data partition with Windows, use FAT32.
-</para>
-
-<para>
-	<screen># mkfs.vfat -F 32</screen>
-</para>
-
-<para>
-	<important>Remember: Every time you install a new binary.img on the
-	stick, all your data will be lost because the image includes a complete
-	partition table.</important>
-</para>
-
-<para>
-	FIXME: Describe installing Debian Live to a partition (e.g. /dev/sdc1)
-	AND using a bootloader to boot this.
-</para>
-
-</section>
-
-</section>
-
-<section>
-<title>Building a netboot image</title>
-
-<para>
-	The following sequence of helper commands will create a basic netboot
-	image containing the Debian standard system without X.org. It is
-	suitable for booting over the network.
-</para>
-
-<para>
-	Note if you performed any previous examples, you will need to clean up
-	your working directory with the <filename>lh clean</filename> helper
-	command:
-</para>
-
-<para>
-	<screen>$ lh clean --binary</screen>
-</para>
-
-<para>
-	Run the <filename>lh config</filename> helper command with the
-	parameters to configure the <filename>"config/"</filename> hierarchy to
-	create our netboot image:
-</para>
-
-<para>
-	<screen>$ lh config -b net --net-root-path "/srv/debian-live" --net-root-server "192.168.0.1"</screen>
-</para>
-
-<para>
-	In contrast with the ISO and USB hdd images, netbooting does not support
-	serving a filesystem image with the client so the files must be served
-	via NFS. The <replaceable>net-root-path</replaceable> and
-	<replaceable>net-root-server</replaceable> options specify the location
-	and server, respectively, of the NFS server where the filesytem image
-	will be located at boot-time.
-</para>
-
-<para>
-	Now build the image with the <filename>lh build</filename> helper
-	command:
-</para>
-
-<para>
-	<screen># lh build</screen>
-</para>
-
-<para>
-	In a network boot the client runs a small piece of software, which
-	usually resides on the <acronym>EEPROM</acronym> of the Ethernet card.
-	This program sends a <abbrev>DHCP</abbrev> request to get an
-	<abbrev>IP</abbrev> address and information about what to do next.
-	Typically the next step is getting a higher level boot loader via the
-	<abbrev>TFTP</abbrev> protocol. That could be
-	<application>Grub</application>, <application>PXELINUX</application>, or
-	even boot directly to an operating system like
-	<application>Linux</application>.
-</para>
-
-<para>
-	For example, if you unpack the generated
-	<filename>binary-net.tar.gz</filename> archive in the
-	<filename>/srv/debian-live</filename> directory, you'll find the
-	filesystem image in <filename>live/filesystem.squashfs</filename> and
-	the kernel, initrd and PXE Linux bootloader in
-	<filename>tftpboot/debian-live/i386</filename>.
-</para>
-
-<para>
-	We must now configure three services on the server to enable netboot:
-</para>
-
-<variablelist>
-
-<varlistentry>
-<term>DHCP server</term>
-
-<listitem>
-<para>
-	We must configure our network's DHCP server to be sure to give an
-	<abbrev>IP</abbrev> address to the computer netbooting, and to
-	advertise the location of the PXE bootloader.
-</para>
-
-<para>
-	Here is an example for inspiration, written for the ISC DHCP server
-	(package <literal>dhcp3-server</literal>) in the
-	<filename>/etc/dhcp3/dhcpd.conf</filename> configuration file:
-</para>
-
-<para>
-	<screen># Options DHCP spécifiques à Pxelinux:
-option space pxelinux;
-option pxelinux.magic      code 208 = string;
-option pxelinux.configfile code 209 = text;
-option pxelinux.pathprefix code 210 = text;
-option pxelinux.reboottime code 211 = unsigned integer 32;
-
-
-subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
-
-  # IP addresses available for guests
-  range 192.168.1.100 192.168.1.149;
-
-  # allow booting from the net
-  allow bootp;
-
-  # for net booting, server where the first file to be loaded (by TFTP
-  # protocol) ("filename" following definition) lies : so the TFTP
-  # server's name.
-  next-server myserver;
-
-  # net boot configuration for guests with a PXE client :
-  if substring (option vendor-class-identifier, 0, 9) = "PXEClient" {
-    # Note : all files for PXE are relatives to the TFTP server's root
-    # path, as usually defined in /etc/inetd.conf.
-
-    # PXE boot loader (first program to be loaded, by TFTP)
-    filename "pxelinux.0";
-
-    # describe some specific pxelinux's options through DHCP options :
-    site-option-space "pxelinux";
-    option pxelinux.magic f1:00:74:7e;
-    if exists dhcp-parameter-request-list {
-      # Always send the PXELINUX options (specified in hexadecimal)
-      option dhcp-parameter-request-list = concat(option dhcp-parameter-request-list,d0,d1,d2,d3);
-    }
-
-    # For a PXE boot menu, different versions are available : simple
-    # text, text with curses, graphic (VESA)
-    #option pxelinux.configfile "pxelinux/config_simple";
-    #option pxelinux.configfile "pxelinux/config_curses";
-    option pxelinux.configfile "pxelinux/config_vesa";
-
-    # automatically reboot after 10 minutes of no activity
-    option pxelinux.reboottime 600;
-  }
-}</screen>
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>TFTPd server</term>
-
-<listitem>
-<para>
-	This serves the kernel and initial ramdisk to the system at run-time.
-</para>
-
-<para>
-	You should install the <command>tftpd-hpa</command> package. It can
-	serve all files contained inside a root directory, usually
-	<filename>/var/lib/tftpboot/</filename>, as defined with its
-	<option>-s</option> option. To let it serve files inside
-	<filename>/srv/debian-live/tftpboot</filename>, modify its start
-	definition in <filename>/etc/inetd.conf</filename> with:
-</para>
-
-<para>
-	<screen>tftp           dgram   udp     wait    root  /usr/sbin/in.tftpd /usr/sbin/in.tftpd -s /srv/debian-live/tftpboot -r blksize -v -v</screen>
-</para>
-
-<para>
-	and reload the super server with
-	<command>/etc/init.d/openbsd-inetd reload</command>.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>NFS server</term>
-
-<listitem>
-<para>
-	Once the guest computer has downloaded and booted a Linux kernel and
-	loaded its initrd, it will try to mount the Live filesystem image
-	through a NFS server.
-</para>
-
-<para>
-	You should install the <command>nfs-kernel-server</command> package --
-	<command>nfs-user-server</command> does not function correctly with
-	netboot.
-</para>
-
-<para>
-	Then, make the filesystem image available through NFS by adding a line
-	like the following to <filename>/etc/exports</filename>:
-</para>
-
-<para>
-	<screen>/srv/debian-live *(ro,async,subtree_check,no_root_squash)</screen>
-</para>
-
-<para>
-	and tell the NFS server about this new export with the following
-	command:
-</para>
-
-<para>
-	<screen># exportfs -rv</screen>
-</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-
-<para>
-	Setting up these three services can be a little tricky. You might need
-	some patience to get all of them working together. The Debian Installer
-	Manual's
-	<ulink url="http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html"
-	>TFTP Net Booting</ulink> section might help as that process is very
-	similar.
-</para>
-
-</section>
-
-<section>
-<title> Netboot testing HowTo </title>
-
-<para>
-	Netboot image creation is made easy with live-helper magic, but testing
-	the images on physical machines can be really time consuming.
-</para>
-
-<para>
-	To make our life easier, we can use virtualization. There are two
-	solutions:
-</para>
-
-<variablelist>
-
-<varlistentry>
-<term>VMWare Player</term>
-
-<listitem>
-<para>
-	Install VMWare Player ("free as in beer" edition)
-</para>
-
-<para>
-	Create a PXETester directory, and create a text file called pxe.vwx
-	inside
-</para>
-
-<para>
-	Paste this text inside:
-</para>
-
-<para>
-	<screen>#!/usr/bin/vmware
-config.version = "8"
-virtualHW.version = "4"
-memsize = "512"
-MemAllowAutoScaleDown = "FALSE"
-
-ide0:0.present = "FALSE"
-ide1:0.present = "FALSE"
-floppy0.present = "FALSE"
-sound.present = "FALSE"
-tools.remindInstall = "FALSE"
-
-ethernet0.present = "TRUE"
-ethernet0.addressType = "generated"
-
-displayName = "Test Boot PXE"
-guestOS = "other"
-
-ethernet0.generatedAddress = "00:0c:29:8d:71:3b"
-uuid.location = "56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b"
-uuid.bios = "56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b"
-ethernet0.generatedAddressOffset = "0"</screen>
-</para>
-
-<para>
-	You can play with this configuration file (i.e. change memory limit to
-	256)
-</para>
-
-<para>
-	Double click on this file (or run VMWare player and selecet this file).
-</para>
-
-<para>
-	When running just press space if that strange question comes up...
-</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-
-<variablelist>
-
-<varlistentry>
-<term>Qemu</term>
-
-<listitem>
-<para>
-	Install qemu, bridge-utils, sudo.
-</para>
-
-<para>
-	Edit <filename>/etc/qemu-ifup</filename>:
-</para>
-
-<para>
-	<screen>#!/bin/sh
-sudo -p "Password for $0:" /sbin/ifconfig $1 172.20.0.1
-echo "Executing /etc/qemu-ifup"
-echo "Bringing up $1 for bridged mode..."
-sudo /sbin/ifconfig $1 0.0.0.0 promisc up
-echo "Adding $1 to br0..."
-sudo /usr/sbin/brctl addif br0 $1
-sleep 2</screen>
-</para>
-
-<para>
-	Get, or build a grub-floppy-netboot (in the svn).
-</para>
-
-<para>
-	Launch qemu with "-net nic,vlan=0 -net tap,vlan=0,ifname=tun0"
-</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-
-</section>
-
+  <title>The basics</title>
+  <para> This chapter contains a brief overview of the build process as well as containing instructions on how to boot the various binary image types. </para>
+  <section>
+    <title>What is a live system?</title>
+    <para> A live system usually means an OS booted on a computer from a removable medium (such as CD-ROM, USB stick, or network), ready to use without any installation on the usual drive(s), with an auto-configuration done at runtime (see <xref linkend="terms"/>). </para>
+    <para> With Debian Live, it's a Debian GNU/Linux OS, built for one of the supported architectures (currently amd64, i386, powerpc and sparc). It is made from following parts: </para>
+    <variablelist>
+      <varlistentry>
+        <term>Linux kernel</term>
+        <listitem>
+          <para> The Linux image, usually named <filename>vmlinuz*</filename>. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Initial RAM disk image (initrd)</term>
+        <listitem>
+          <para> RAM disk setup for the Linux boot, containing modules possibly needed to mount the filesystem's image and some scripts to do it. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>System image</term>
+        <listitem>
+          <para> The OS filesystem image. Debian Live uses SquashFS, a compressed filesystem, to minimize its image size. Note that it's read-only. So, during boot the Debian Live system will use a RAM disk and 'union' mechanism to enable writing files within the running system. However, all modifications will be lost upon shutdown unless optional persistence partition(s) are used. (See <xref linkend="persistence"/>.) </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Bootloader</term>
+        <listitem>
+          <para> A small piece of code, crafted to boot up from the chosen media, possibly presenting a prompt or menu to allow selection of options/configuration. It then loads the Linux kernel and its initrd to run with an associated filesystem image. Different solutions can be used depending on the target media and format of the filesystem containing the previous components: Isolinux to boot from a CD or DVD in ISO9660 format, syslinux for HDD or USB drive booting from a VFAT partition, GRUB for ext2/3 partition, pxelinux for PXE netboot, etc. </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <para> The Debian Live tools will build the system image from your specifications, setup a Linux kernel and its initrd, a bootloader to run them, all in one media-dependant format(ISO9660 image, disk image, etc.) </para>
+  </section>
+  <section>
+    <title>First steps: building an ISO image</title>
+    <para> The following sequence of helper commands, provided by &live-helper;, will create a basic ISO image containing just the Debian standard system without X.org. It is suitable for burning to CD or DVD media. </para>
+    <para> First, we run the <filename>lh config</filename> helper command which will create a <filename>"config/"</filename> hierarchy in the current directory for use by other helper commands: </para>
+    <para>
+      <screen>$ lh config</screen>
+    </para>
+    <para> By passing no parameters to <filename>lh config</filename> we indicated that we wish to use the defaults. This will create an image of type binary (see <xref linkend="lh-config"/>). </para>
+    <para> Now that we have a <filename>"config/"</filename> hierarchy, we may build the image with the <filename>lh build</filename> helper command: </para>
+    <para>
+      <screen># lh build</screen>
+    </para>
+    <para> This process can take a while, depending on the speed of your network connection (see <xref linkend="lh-build"/>). </para>
+    <section>
+      <title>Testing an ISO image with Qemu</title>
+      <para> Testing an ISO is simple: </para>
+      <para>
+        <screen># apt-get install qemu $ qemu -cdrom binary.iso</screen>
+      </para>
+    </section>
+    <section><title>Testing an ISO image with virtualbox-ose</title><para> In order to test the ISO with virtualbox-ose: </para><para><screen># apt-get install virtualbox-ose</screen></para> and either install <itemizedlist><listitem><para>the modules package for a stock kernel eg virtualbox-ose-modules-2.6.26-1-486 or</para></listitem><listitem><para>the modules package compiled for your kernel using module-assistant from the package virtualbox-ose-source </para></listitem></itemizedlist> <para> Run Virtualbox:</para> For example, in Gnome <para> {{{Applications -&gt; System Tools -&gt; VirtualBox OSE }}}</para> <para>Create a virtual machine from your Live ISO</para> <para>To create a virtual machine "mylive" from A CDROM ISO "binary.iso" in VirtualBox:</para> <para> {{{Machine -&gt; New }}}</para> <para>In the Wizard: FIXME </para> </section>
+    <section>
+      <title>Testing an ISO image with VMware Workstation</title>
+      <para>In order to test the ISO with VMware Workstation:</para>
+      <para> Run VMware Workstation:</para>
+      <para>Click on Edit virtual machine settings in the VM summary page. </para>
+      <para>Then, click on the CD-ROM device and select Use ISO image. Remeber to connect the CD-ROM device at power on and remeber to adjust the boot order in the bios.</para>
+    </section>
+    <section>
+      <title>Burning an ISO image to a physical medium</title>
+      <para> Burning an ISO image is easy: </para>
+      <para>
+        <screen># apt-get install wodim $ wodim binary.iso</screen>
+      </para>
+    </section>
+  </section>
+  <section>
+    <title>Building an USB/HDD image</title>
+    <para> The following sequence of helper commands will create a basic USB/HDD image containing just the Debian standard system without X.org. It is suitable for booting from USB sticks, USB hard drives, and various other portable storage devices. </para>
+    <para> Note if you created an iso image with the previous example, you will need to clean up your working directory with the <filename>lh clean</filename> helper command (see <xref linkend="lh-clean"/>): </para>
+    <para>
+      <screen>$ lh clean --binary</screen>
+    </para>
+    <para> Run the <filename>lh config</filename> helper command with the parameters to configure the <filename>"config/"</filename> hierarchy to create a USB/HDD image type: </para>
+    <para>
+      <screen>$ lh config -b usb-hdd</screen>
+    </para>
+    <para> Now build the image with the <filename>lh build</filename> helper command: </para>
+    <para>
+      <screen># lh build</screen>
+    </para>
+    <section id="image_copying">
+      <title>Copying USB/HDD image to a USB stick</title>
+      <para> The generated binary image contains a <acronym>VFAT</acronym> partition and the <command>syslinux</command> bootloader, ready to be directly written on an USB stick. Plug in an USB stick with a size larger than that of <filename>binary.img</filename> and type: </para>
+      <para>
+        <screen>$ dd if=binary.img of=${USBSTICK}</screen>
+      </para>
+      <para> where <replaceable>${USBSTICK}</replaceable> is the device file of your key, like <filename>/dev/sdb</filename> (not a partition like <filename>/dev/sdb1</filename>!); you can find the right device name by looking in <command>dmesg</command>'s output after plugging in the stick, for example. </para>
+      <para>
+        <important>This will definitely overwrite any previous contents on your stick!</important>
+      </para>
+    </section>
+    <section>
+      <title>Testing a USB/HDD image with Qemu</title>
+      <para>
+        <screen># apt-get install qemu $ qemu -hda binary.img</screen>
+      </para>
+    </section>
+    <section>
+      <title>Testing an USB/HDD image with VMware Workstation</title>
+      <para> In order to test the USB/HDD image with VMware Workstation: </para>
+      <para> Run VMware Workstation:</para>
+      <para>Write the image to an usb stick. In VMware, click on Edit virtual machine settings in VM summary page. Then, add a new physical harddisk device and enter the device node of your usb stick.</para>
+    </section>
+    <section>
+      <title>Using the space left on a USB stick</title>
+      <para> If you want to use the remaining free space after you have installed the <filename>binary.img</filename>, you can use a partitioning tool such as gparted or parted to create a new partition on the stick. The first partition will be used by the Debian Live system. </para>
+      <para>
+        <screen># gparted ${USBSTICK}</screen>
+      </para>
+      <para> After the creation of the partition you have to create a filsystem on it. One possible choice would be ext2 (ext3 isn't recommended because the journaling causes too many writes to the stick). </para>
+      <para>
+        <screen># mkfs.ext2 ${USBSTICK}</screen>
+      </para>
+      <para> If you want to use this data partition with Windows, use FAT32. </para>
+      <para>
+        <screen># mkfs.vfat -F 32</screen>
+      </para>
+      <para>
+        <important>Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.</important>
+      </para>
+      <para> FIXME: Describe installing Debian Live to a partition (e.g. /dev/sdc1) AND using a bootloader to boot this. </para>
+    </section>
+  </section>
+  <section>
+    <title>Building a netboot image</title>
+    <para> The following sequence of helper commands will create a basic netboot image containing the Debian standard system without X.org. It is suitable for booting over the network. </para>
+    <para> Note if you performed any previous examples, you will need to clean up your working directory with the <filename>lh clean</filename> helper command: </para>
+    <para>
+      <screen>$ lh clean --binary</screen>
+    </para>
+    <para> Run the <filename>lh config</filename> helper command with the parameters to configure the <filename>"config/"</filename> hierarchy to create our netboot image: </para>
+    <para>
+      <screen>$ lh config -b net --net-root-path "/srv/debian-live" --net-root-server "192.168.0.1"</screen>
+    </para>
+    <para> In contrast with the ISO and USB hdd images, netbooting does not support serving a filesystem image with the client so the files must be served via NFS. The <replaceable>net-root-path</replaceable> and <replaceable>net-root-server</replaceable> options specify the location and server, respectively, of the NFS server where the filesytem image will be located at boot-time. </para>
+    <para> Now build the image with the <filename>lh build</filename> helper command: </para>
+    <para>
+      <screen># lh build</screen>
+    </para>
+    <para> In a network boot the client runs a small piece of software, which usually resides on the <acronym>EEPROM</acronym> of the Ethernet card. This program sends a <abbrev>DHCP</abbrev> request to get an <abbrev>IP</abbrev> address and information about what to do next. Typically the next step is getting a higher level boot loader via the <abbrev>TFTP</abbrev> protocol. That could be <application>Grub</application>, <application>PXELINUX</application>, or even boot directly to an operating system like <application>Linux</application>. </para>
+    <para> For example, if you unpack the generated <filename>binary-net.tar.gz</filename> archive in the <filename>/srv/debian-live</filename> directory, you'll find the filesystem image in <filename>live/filesystem.squashfs</filename> and the kernel, initrd and PXE Linux bootloader in <filename>tftpboot/debian-live/i386</filename>. </para>
+    <para> We must now configure three services on the server to enable netboot: </para>
+    <variablelist>
+      <varlistentry>
+        <term>DHCP server</term>
+        <listitem>
+          <para> We must configure our network's DHCP server to be sure to give an <abbrev>IP</abbrev> address to the computer netbooting, and to advertise the location of the PXE bootloader. </para>
+          <para> Here is an example for inspiration, written for the ISC DHCP server (package <literal>dhcp3-server</literal>) in the <filename>/etc/dhcp3/dhcpd.conf</filename> configuration file: </para>
+          <para>
+            <screen># Options DHCP spécifiques à Pxelinux: option space pxelinux; option pxelinux.magic code 208 = string; option pxelinux.configfile code 209 = text; option pxelinux.pathprefix code 210 = text; option pxelinux.reboottime code 211 = unsigned integer 32; subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24 # IP addresses available for guests range 192.168.1.100 192.168.1.149; # allow booting from the net allow bootp; # for net booting, server where the first file to be loaded (by TFTP # protocol) ("filename" following definition) lies : so the TFTP # server's name. next-server myserver; # net boot configuration for guests with a PXE client : if substring (option vendor-class-identifier, 0, 9) = "PXEClient" { # Note : all files for PXE are relatives to the TFTP server's root # path, as usually defined in /etc/inetd.conf. # PXE boot loader (first program to be loaded, by TFTP) filename "pxelinux.0"; # describe some specific pxelinux's options through
  DHCP options : site-option-space "pxelinux"; option pxelinux.magic f1:00:74:7e; if exists dhcp-parameter-request-list { # Always send the PXELINUX options (specified in hexadecimal) option dhcp-parameter-request-list = concat(option dhcp-parameter-request-list,d0,d1,d2,d3); } # For a PXE boot menu, different versions are available : simple # text, text with curses, graphic (VESA) #option pxelinux.configfile "pxelinux/config_simple"; #option pxelinux.configfile "pxelinux/config_curses"; option pxelinux.configfile "pxelinux/config_vesa"; # automatically reboot after 10 minutes of no activity option pxelinux.reboottime 600; } }</screen>
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>TFTPd server</term>
+        <listitem>
+          <para> This serves the kernel and initial ramdisk to the system at run-time. </para>
+          <para> You should install the <command>tftpd-hpa</command> package. It can serve all files contained inside a root directory, usually <filename>/var/lib/tftpboot/</filename>, as defined with its <option>-s</option> option. To let it serve files inside <filename>/srv/debian-live/tftpboot</filename>, modify its start definition in <filename>/etc/inetd.conf</filename> with: </para>
+          <para>
+            <screen>tftp dgram udp wait root /usr/sbin/in.tftpd /usr/sbin/in.tftpd -s /srv/debian-live/tftpboot -r blksize -v -v</screen>
+          </para>
+          <para> and reload the super server with <command>/etc/init.d/openbsd-inetd reload</command>. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>NFS server</term>
+        <listitem>
+          <para> Once the guest computer has downloaded and booted a Linux kernel and loaded its initrd, it will try to mount the Live filesystem image through a NFS server. </para>
+          <para> You should install the <command>nfs-kernel-server</command> package -- <command>nfs-user-server</command> does not function correctly with netboot. </para>
+          <para> Then, make the filesystem image available through NFS by adding a line like the following to <filename>/etc/exports</filename>: </para>
+          <para>
+            <screen>/srv/debian-live *(ro,async,subtree_check,no_root_squash)</screen>
+          </para>
+          <para> and tell the NFS server about this new export with the following command: </para>
+          <para>
+            <screen># exportfs -rv</screen>
+          </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <para> Setting up these three services can be a little tricky. You might need some patience to get all of them working together. The Debian Installer Manual's <ulink url="http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html">TFTP Net Booting</ulink> section might help as that process is very similar. </para>
+  </section>
+  <section>
+    <title> Netboot testing HowTo </title>
+    <para> Netboot image creation is made easy with live-helper magic, but testing the images on physical machines can be really time consuming. </para>
+    <para> To make our life easier, we can use virtualization. There are two solutions: </para>
+    <variablelist>
+      <varlistentry>
+        <term>VMWare Player</term>
+        <listitem>
+          <para> Install VMWare Player ("free as in beer" edition) </para>
+          <para> Create a PXETester directory, and create a text file called pxe.vwx inside </para>
+          <para> Paste this text inside: </para>
+          <para>
+            <screen>#!/usr/bin/vmware config.version = "8" virtualHW.version = "4" memsize = "512" MemAllowAutoScaleDown = "FALSE" ide0:0.present = "FALSE" ide1:0.present = "FALSE" floppy0.present = "FALSE" sound.present = "FALSE" tools.remindInstall = "FALSE" ethernet0.present = "TRUE" ethernet0.addressType = "generated" displayName = "Test Boot PXE" guestOS = "other" ethernet0.generatedAddress = "00:0c:29:8d:71:3b" uuid.location = "56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b" uuid.bios = "56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b" ethernet0.generatedAddressOffset = "0"</screen>
+          </para>
+          <para> You can play with this configuration file (i.e. change memory limit to 256) </para>
+          <para> Double click on this file (or run VMWare player and selecet this file). </para>
+          <para> When running just press space if that strange question comes up... </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <variablelist>
+      <varlistentry>
+        <term>Qemu</term>
+        <listitem>
+          <para> Install qemu, bridge-utils, sudo. </para>
+          <para> Edit <filename>/etc/qemu-ifup</filename>: </para>
+          <para>
+            <screen>#!/bin/sh sudo -p "Password for $0:" /sbin/ifconfig $1 172.20.0.1 echo "Executing /etc/qemu-ifup" echo "Bringing up $1 for bridged mode..." sudo /sbin/ifconfig $1 0.0.0.0 promisc up echo "Adding $1 to br0..." sudo /usr/sbin/brctl addif br0 $1 sleep 2</screen>
+          </para>
+          <para> Get, or build a grub-floppy-netboot (in the svn). </para>
+          <para> Launch qemu with "-net nic,vlan=0 -net tap,vlan=0,ifname=tun0" </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </section>
 </chapter>
diff --git a/manual/en/coding-style.xml b/manual/en/coding-style.xml
index fd1ea3b..4c31b84 100644
--- a/manual/en/coding-style.xml
+++ b/manual/en/coding-style.xml
@@ -1,141 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <chapter id="coding-style">
-<title>Coding Style</title>
-
-<para>This chapter documents the coding style used in &live-helper; and (ideally) in &live-initramfs;.</para>
-
-<sect1 id="compatibilty">
-<title>Compatibility</title>
-
-<itemizedlist>
-	<listitem>Don't use syntax or semantics that are unique to the Bash shell. For example, the use of array constructs.</listitem>
-	<listitem>Only use the POSIX subset - for example, use $(foo) over `foo`.</listitem>
-	<listitem>You can check your scripts with 'sh -n' and 'checkbashisms'</listitem>
-</itemizedlist>
-</sect1>
-
-<sect1 id="indenting">
-<title>Indenting</title>
-
-<itemizedlist>
-	<listitem>Always use tabs over spaces.</listitem>
-</itemizedlist>
-
-</sect1>
-
-<sect1 id="wrapping">
-<title>Wrapping</title>
-
-<itemizedlist>
-	<listitem>Generally, lines are 80 chars at maximum.</listitem>
-
-	<listitem>Use the "Linux style" of line breaks:
-
-	<para>Bad:
-
-<screen>
-if foo; then
-	bar
-fi
-</screen>
-
-	</para>
-	<para>Good:
-
-<screen>
-if foo
-then
-	bar
-fi
-</screen>
-	</para></listitem>
-
-	<listitem>The same holds for functions:
-
-	<para>Bad:
-
-<screen>
-foo () {
-	bar
-}
-</screen>
-	</para>
-	<para>Good:
-
-<screen>
-foo ()
-{
-	bar
-}
-</screen>
-	</para></listitem>
-</itemizedlist>
-
-</sect1>
-
-<sect1 id="variables">
-<title>Variables</title>
-
-<itemizedlist>
-	<listitem>Variables are always in capital letters.</listitem>
-	<listitem>Variables that used in config always start with LH_ prefix.</listitem>
-	<listitem>Internal temporary variables should start with the _LH_ prefix.</listitem>
-	<listitem>Local variables start with __LH_ prefix.</listitem>
-	<listitem>Use braces around variables; eg. write ${FOO} instead of $FOO.</listitem>
-	<listitem>Always protect variables with respect to potential whitespaces, write "${FOO}" not ${FOO}.</listitem>
-	<listitem>For consistency reasons, always use quotes when assigning values to variables:
-
-	<para>Bad:
-
-<screen>
-FOO=bar
-</screen>
-	</para>
-	<para>Good:
-
-<screen>
-FOO="bar"
-</screen>
-
-	</para></listitem>
-
-	<listitem>If multiple variables are used, quote the full expression:
-
-	<para>Bad:
-
-<screen>
-if [ -f "${FOO}"/foo/"${BAR}"/bar ]
-then
-	foobar
-fi
-</screen>
-	</para>
-	<para>Good:
-
-<screen>
-if [ -f "${FOO}/foo/${BAR}/bar" ]
-then
-	foobar
-fi
-</screen>
-	</para></listitem>
-</itemizedlist>
-
-</sect1>
-
-<sect1 id="misc">
-<title>Miscellaneous</title>
-
-<itemizedlist>
-	<listitem>Use "|" (without the surround quotes) as a seperator in calls to sed, e.g. "sed -e 's|foo|bar|'" (without "").</listitem>
-	<listitem>Don't use the test command for comparisons or tests, use "[" "]" (without ""), e.g. "if [ -x /bin/foo ]; ..." and not "if test -x /bin/foo; ...".</listitem>
-
-</itemizedlist>
-
-</sect1>
-
+  <title>Coding Style</title>
+  <para>This chapter documents the coding style used in &live-helper; and (ideally) in &live-initramfs;.</para>
+  <sect1 id="compatibilty">
+    <title>Compatibility</title>
+    <itemizedlist>
+      <listitem>Don't use syntax or semantics that are unique to the Bash shell. For example, the use of array constructs.</listitem>
+      <listitem>Only use the POSIX subset - for example, use $(foo) over `foo`.</listitem>
+      <listitem>You can check your scripts with 'sh -n' and 'checkbashisms'</listitem>
+    </itemizedlist>
+  </sect1>
+  <sect1 id="indenting">
+    <title>Indenting</title>
+    <itemizedlist>
+      <listitem>Always use tabs over spaces.</listitem>
+    </itemizedlist>
+  </sect1>
+  <sect1 id="wrapping">
+    <title>Wrapping</title>
+    <itemizedlist>
+      <listitem>Generally, lines are 80 chars at maximum.</listitem>
+      <listitem>Use the "Linux style" of line breaks: <para>Bad: <screen> if foo; then bar fi </screen> </para> <para>Good: <screen> if foo then bar fi </screen> </para></listitem>
+      <listitem>The same holds for functions: <para>Bad: <screen> foo () { bar } </screen> </para> <para>Good: <screen> foo () { bar } </screen> </para></listitem>
+    </itemizedlist>
+  </sect1>
+  <sect1 id="variables">
+    <title>Variables</title>
+    <itemizedlist>
+      <listitem>Variables are always in capital letters.</listitem>
+      <listitem>Variables that used in config always start with LH_ prefix.</listitem>
+      <listitem>Internal temporary variables should start with the _LH_ prefix.</listitem>
+      <listitem>Local variables start with __LH_ prefix.</listitem>
+      <listitem>Use braces around variables; eg. write ${FOO} instead of $FOO.</listitem>
+      <listitem>Always protect variables with respect to potential whitespaces, write "${FOO}" not ${FOO}.</listitem>
+      <listitem>For consistency reasons, always use quotes when assigning values to variables: <para>Bad: <screen> FOO=bar </screen> </para> <para>Good: <screen> FOO="bar" </screen> </para></listitem>
+      <listitem>If multiple variables are used, quote the full expression: <para>Bad: <screen> if [ -f "${FOO}"/foo/"${BAR}"/bar ] then foobar fi </screen> </para> <para>Good: <screen> if [ -f "${FOO}/foo/${BAR}/bar" ] then foobar fi </screen> </para></listitem>
+    </itemizedlist>
+  </sect1>
+  <sect1 id="misc">
+    <title>Miscellaneous</title>
+    <itemizedlist>
+      <listitem>Use "|" (without the surround quotes) as a seperator in calls to sed, e.g. "sed -e 's|foo|bar|'" (without "").</listitem>
+      <listitem>Don't use the test command for comparisons or tests, use "[" "]" (without ""), e.g. "if [ -x /bin/foo ]; ..." and not "if test -x /bin/foo; ...".</listitem>
+    </itemizedlist>
+  </sect1>
 </chapter>
diff --git a/manual/en/common-tasks.xml b/manual/en/common-tasks.xml
index fea9181..0672a3f 100644
--- a/manual/en/common-tasks.xml
+++ b/manual/en/common-tasks.xml
@@ -1,100 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <chapter id="common-tasks">
-<title>Common tasks</title>
-
-<section id="debian-installer">
-<title>The Debian Installer</title>
- <para>
-  Although Debian Live is mostly concerned with avoiding permanent installation, integrating some form of installer to your image is possible. There are number of different "types" of installation, varying in what and how to install the image.
- </para>
-
- <note>
-  <title>
-   The "Debian Installer"
-  </title>
-  <para>
-   Please note the careful use of capital letters when referring to the "Debian Installer" in this section - when used like this we refer explicitly to the official installer for the Debian system, not anything else. It is often seen abbreviated to "d-i".
-  </para>
- </note>
- <para>
-  The three main types of installer are:
- </para>
- <variablelist>
-  <varlistentry>
-   <term>
-    "Normal" Debian Installer
-   </term>
-   <listitem>
-    <para>
-     This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer  instance, just as if you had downloaded a CD image of Debian and booted it.
-    </para>
-    <para>
-     This means that Debian is installed by fetching and installing <command>.deb</command> packages using <filename>debootstrap</filename> or <filename>cdebootstrap</filename>, from the local media or some network-base network, resulting in a standard Debian system being installed to the hard disk.
-    </para>
-    <para>
-     This whole process can be preseeded and customised in a number of ways; see the relevant "DebianInstaller" wiki page and installation guide for more. This is operational now withing &live-helper;.
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term>
-    "Live" Debian Installer
-   </term>
-   <listitem>
-    <para>
-     This is a Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into an instance of the Debian Installer.
-    </para>
-    <para>
-     Installation will proceed in an identical fashion to the "Normal" installation described above, but at the actual package installation stage, instead of using <filename>debootstrap</filename> to fetch and install packages, the "live" filesystem image is copied to the target. After this stage, the Debian Installer continues as normal, installing and configuring items such as bootloaders and local users, etc.
-    </para>
-    <para>
-     This is working now.
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term>
-    "Ubuntu"-style installer
-   </term>
-   <listitem>
-    <para>
-     This is where you boot into a graphical Debian Live system and run a wizard-based program which installs and configures the live system, all the time remaining inside the live graphical environment.
-    </para>
-    <para>
-     This is currently NOT possible with Debian Live.
-    </para>
-   </listitem>
-  </varlistentry>
- </variablelist>
-
-
-  <para>
- By default, no installer will be included in the Debian Live image. You can enable it by using <filename>lh_config</filename> :
- <screen>
-$ lh_config --help
-  ...
-  [--debian-installer enabled|cdrom|netinst|netboot|businesscard|live|disabled]
-  [--debian-installer-distribution CODENAME|daily]
-  [--debian-installer-preseedfile FILE|URL]
-  ...
- </screen>
- </para>
-
-
- <para>
-  The values "Normal", "Live" and "Ubuntu" are not valid values for <term>LH_BINARY_DEBIAN_INSTALLER</term>. Refer to the output of <filename>lh_config</filename> cited above to choose the appropriate values.
- </para>
-</section>
-
-<section id="wifi-connection">
-<title>WiFi Connection</title>
- <para>
-  Depending on the Debian Live image you are using and the given tools configured with your Debian Live image you may need to only attach to an available access point. If you encounter difficulty a good place to start is at the Debian Wiki entry for <ulink url="http://wiki.debian.org/WiFi">WiFi</ulink>.
- </para>
-</section>
-
+  <title>Common tasks</title>
+  <section id="debian-installer">
+    <title>The Debian Installer</title>
+    <para> Although Debian Live is mostly concerned with avoiding permanent installation, integrating some form of installer to your image is possible. There are number of different "types" of installation, varying in what and how to install the image. </para>
+    <note>
+      <title> The "Debian Installer" </title>
+      <para> Please note the careful use of capital letters when referring to the "Debian Installer" in this section - when used like this we refer explicitly to the official installer for the Debian system, not anything else. It is often seen abbreviated to "d-i". </para>
+    </note>
+    <para> The three main types of installer are: </para>
+    <variablelist>
+      <varlistentry>
+        <term> "Normal" Debian Installer </term>
+        <listitem>
+          <para> This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. </para>
+          <para> This means that Debian is installed by fetching and installing <command>.deb</command> packages using <filename>debootstrap</filename> or <filename>cdebootstrap</filename>, from the local media or some network-base network, resulting in a standard Debian system being installed to the hard disk. </para>
+          <para> This whole process can be preseeded and customised in a number of ways; see the relevant "DebianInstaller" wiki page and installation guide for more. This is operational now withing &live-helper;. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term> "Live" Debian Installer </term>
+        <listitem>
+          <para> This is a Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into an instance of the Debian Installer. </para>
+          <para> Installation will proceed in an identical fashion to the "Normal" installation described above, but at the actual package installation stage, instead of using <filename>debootstrap</filename> to fetch and install packages, the "live" filesystem image is copied to the target. After this stage, the Debian Installer continues as normal, installing and configuring items such as bootloaders and local users, etc. </para>
+          <para> This is working now. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term> "Ubuntu"-style installer </term>
+        <listitem>
+          <para> This is where you boot into a graphical Debian Live system and run a wizard-based program which installs and configures the live system, all the time remaining inside the live graphical environment. </para>
+          <para> This is currently NOT possible with Debian Live. </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <para> By default, no installer will be included in the Debian Live image. You can enable it by using <filename>lh_config</filename> : <screen> $ lh_config --help ... [--debian-installer enabled|cdrom|netinst|netboot|businesscard|live|disabled] [--debian-installer-distribution CODENAME|daily] [--debian-installer-preseedfile FILE|URL] ... </screen> </para>
+    <para> The values "Normal", "Live" and "Ubuntu" are not valid values for <term>LH_BINARY_DEBIAN_INSTALLER</term>. Refer to the output of <filename>lh_config</filename> cited above to choose the appropriate values. </para>
+  </section>
+  <section id="wifi-connection">
+    <title>WiFi Connection</title>
+    <para> Depending on the Debian Live image you are using and the given tools configured with your Debian Live image you may need to only attach to an available access point. If you encounter difficulty a good place to start is at the Debian Wiki entry for <ulink url="http://wiki.debian.org/WiFi">WiFi</ulink>. </para>
+  </section>
 </chapter>
diff --git a/manual/en/customization.xml b/manual/en/customization.xml
index 0a24457..1396cc0 100644
--- a/manual/en/customization.xml
+++ b/manual/en/customization.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <chapter id="customization">
-<title>Customization</title>
-
-<xi:include href="customization_packages.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="customization_contents.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="customization_internationalization.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="customization_bootup.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="customization_binary.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="customization_backports.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-
+  <title>Customization</title>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="customization_packages.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="customization_contents.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="customization_internationalization.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="customization_bootup.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="customization_binary.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="customization_backports.xml"/>
 </chapter>
diff --git a/manual/en/customization_backports.xml b/manual/en/customization_backports.xml
index 545dd7f..943bb16 100644
--- a/manual/en/customization_backports.xml
+++ b/manual/en/customization_backports.xml
@@ -1,24 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <sect1 id="backports">
-
-<title>Using a newer kernel with Lenny</title>
-
-<para>The backports repository, backports.org, lacks the necessary module packages (linux-modules-extra-2.6, aufs, etc.) so an alternative repository has been set up, in order to build Lenny live images with a later kernel. Shown here is one way of doing it.</para>
-
-<screen>
-$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6'
-
-$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.chroot
-$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.binary
-
-$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.chroot.gpg
-$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.binary.gpg
-
-# lh_build
-</screen>
-
+  <title>Using a newer kernel with Lenny</title>
+  <para>The backports repository, backports.org, lacks the necessary module packages (linux-modules-extra-2.6, aufs, etc.) so an alternative repository has been set up, in order to build Lenny live images with a later kernel. Shown here is one way of doing it.</para>
+  <screen> $ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6' $ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' &gt; config/chroot_sources/backports-kernel.chroot $ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' &gt; config/chroot_sources/backports-kernel.binary $ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.chroot.gpg $ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.binary.gpg # lh_build </screen>
 </sect1>
diff --git a/manual/en/customization_binary.xml b/manual/en/customization_binary.xml
index e5fee3e..d291269 100644
--- a/manual/en/customization_binary.xml
+++ b/manual/en/customization_binary.xml
@@ -1,54 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <sect1 id="binary">
-<title>Customising the binary image</title>
-
-<para>This chapter discusses FIXME</para>
-
-<sect2 id="iso-metadata">
- <title>ISO metadata</title>
- <para>
-  When creating an ISO9660 binary image, you can use the following options to add various textual metadata for your image. This can help you easily identify the version or configuration of an image without booting it.
- </para>
-
-<variablelist>
- <varlistentry>
-  <term><command>LH_ISO_APPLICATION</command> / <command>--iso-application <replaceable>NAME</replaceable></command></term>
-  <listitem>
-   <para>
-    This should describe the application that will be on the image. The maximum length for this field is 128 characters.
-   </para>
-  </listitem>
- </varlistentry>
- <varlistentry>
-  <term><command>LH_ISO_PREPARER</command> / <command>--iso-preparer <replaceable>NAME</replaceable></command></term>
-  <listitem>
-   <para>
-    This should describe the preparer of the image, usually with some contact details. The default for this option is the &live-helper; version you are using, which may help with debugging later. The maximum length for this field is 128 characters.
-   </para>
-  </listitem>
- </varlistentry>
- <varlistentry>
-  <term><command>LH_ISO_PUBLISHER</command> / <command>--iso-publisher <replaceable>NAME</replaceable></command></term>
-  <listitem>
-   <para>
-    This should describe the publisher of the image, usually with some contact details. The maximum length for this field is 128 characters.
-   </para>
-  </listitem>
- </varlistentry>
- <varlistentry>
-  <term><command>LH_ISO_VOLUME</command> / <command>--iso-volume <replaceable>NAME</replaceable></command></term>
-  <listitem>
-   <para>
-    This should specify the volume ID of the image. This is used as a user-visible label on some platforms such as Windows and Apple Mac OS. The maximum length for this field is 32 characters.
-   </para>
-  </listitem>
- </varlistentry>
-</variablelist>
-
-</sect2>
-
+  <title>Customising the binary image</title>
+  <para>This chapter discusses FIXME</para>
+  <sect2 id="iso-metadata">
+    <title>ISO metadata</title>
+    <para> When creating an ISO9660 binary image, you can use the following options to add various textual metadata for your image. This can help you easily identify the version or configuration of an image without booting it. </para>
+    <variablelist>
+      <varlistentry>
+        <term><command>LH_ISO_APPLICATION</command> / <command>--iso-application <replaceable>NAME</replaceable></command></term>
+        <listitem>
+          <para> This should describe the application that will be on the image. The maximum length for this field is 128 characters. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>LH_ISO_PREPARER</command> / <command>--iso-preparer <replaceable>NAME</replaceable></command></term>
+        <listitem>
+          <para> This should describe the preparer of the image, usually with some contact details. The default for this option is the &live-helper; version you are using, which may help with debugging later. The maximum length for this field is 128 characters. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>LH_ISO_PUBLISHER</command> / <command>--iso-publisher <replaceable>NAME</replaceable></command></term>
+        <listitem>
+          <para> This should describe the publisher of the image, usually with some contact details. The maximum length for this field is 128 characters. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><command>LH_ISO_VOLUME</command> / <command>--iso-volume <replaceable>NAME</replaceable></command></term>
+        <listitem>
+          <para> This should specify the volume ID of the image. This is used as a user-visible label on some platforms such as Windows and Apple Mac OS. The maximum length for this field is 32 characters. </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
 </sect1>
diff --git a/manual/en/customization_bootup.xml b/manual/en/customization_bootup.xml
index 15b786a..a45f9b2 100644
--- a/manual/en/customization_bootup.xml
+++ b/manual/en/customization_bootup.xml
@@ -1,113 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <sect1 id="bootup">
-<title>Customising the bootup process</title>
-
-<para>This chapter discusses customisation of bootup process of a live system, including kernel options, modifications to the bootloader, "splash" screens and startup scripts.</para>
-
-<para>FIXME</para>
-
-<sect2 id="kernel">
-<title>Kernel</title>
-</sect2>
-
-<sect2 id="bootloaders">
-<title>Bootloaders</title>
-<para>
- FIXME
-</para>
-
-<sect3>
-<title>Choosing a bootloader</title>
-<para>
- FIXME
-</para>
-</sect3>
-
-<sect3 id="syslinux">
-<title>Syslinux</title>
- <para>In the default configuration, Syslinux will pause indefinitely at its splash screen. To adjust this, modify the <command>LH_SYSLINUX_TIMEOUT</command> value or pass <command>--syslinux-timeout <replaceable>TIMEOUT</replaceable></command> to <filename>lh_config</filename>. The value is specified in units of 1/10s and the maximum possible timeout is 35996. A timeout of 0 (zero) disables the timeout completely. For more information please see syslinux(1).</para>
-</sect3>
-
-<sect3>
-<title>Bootloader templates</title>
-<para>
- FIXME
-</para>
-</sect3>
-
-<sect3>
-<title>Booting a Debian Live USB/HDD system from a USB stick with Grub</title>
-<para>
-Suppose you've built your Debian Live USB/HDD image, but want to
-install it on an already used USB stick with ext2/3 partition and Grub
-bootloader:
-</para>
-
-<para>First, copy live components in a directory on your key: the
-  Linux kernel (<filename>vmlinuz*</filename>), its Initial RAM disk
-  (<filename>initrd*</filename>) and the system
-  (<filename>filesystem.squashfs</filename>):
-<screen>
-# mkdir /media/myUsb/boot/live/
-# cp binary/vmlinuz1 binary/initrd1.img binary/live/filesystem.squashfs /media/myUsb/boot/live/
-</screen>
-</para>
-
-<para>Then, add a stanza in Grub's menu definition to boot up this
-  system:
-<screen>
-echo &gt;&gt;/media/myUsb/boot/grub/menu.lst  &lt;&lt;EOF
-
-title           my Debian Live
-root            (hd0,1)    # my Ext2 partition is the second on this stick
-kernel          /boot/live/vmlinuz1 boot=live vga=791 persistent union=aufs live-media-path=boot/live
-initrd          /boot/live/initrd1.img
-
-EOF
-</screen>
-The important kernel command line option to add here
-is <variablename>live-media-path</variablename>, which tells to Live
-initrd's script in which subdirectory to look for the SquashFS image.
-</para>
-
-<para>Next, umount your USB stick and reboot on it. That's all!</para>
-
-</sect3>
-</sect2>
-
-<sect2 id="splash">
-<title>Splash screens</title>
-<para>
- FIXME
-</para>
-</sect2>
-
-<sect2 id="memtest">
-<title>Memtest</title>
-<para>
- FIXME
-</para>
-</sect2>
-
-<sect2 id="startup-scripts">
-<title>Startup scripts</title>
-<para>
- FIXME
-</para>
-</sect2>
-
-<sect2 id="cheat-codes">
-<title>Cheat codes</title>
-<para>
- FIXME
-</para>
-<para>
- Checksums.
-</para>
-</sect2>
-
+  <title>Customising the bootup process</title>
+  <para>This chapter discusses customisation of bootup process of a live system, including kernel options, modifications to the bootloader, "splash" screens and startup scripts.</para>
+  <para>FIXME</para>
+  <sect2 id="kernel">
+    <title>Kernel</title>
+  </sect2>
+  <sect2 id="bootloaders">
+    <title>Bootloaders</title>
+    <para> FIXME </para>
+    <sect3>
+      <title>Choosing a bootloader</title>
+      <para> FIXME </para>
+    </sect3>
+    <sect3 id="syslinux">
+      <title>Syslinux</title>
+      <para>In the default configuration, Syslinux will pause indefinitely at its splash screen. To adjust this, modify the <command>LH_SYSLINUX_TIMEOUT</command> value or pass <command>--syslinux-timeout <replaceable>TIMEOUT</replaceable></command> to <filename>lh_config</filename>. The value is specified in units of 1/10s and the maximum possible timeout is 35996. A timeout of 0 (zero) disables the timeout completely. For more information please see syslinux(1).</para>
+    </sect3>
+    <sect3>
+      <title>Bootloader templates</title>
+      <para> FIXME </para>
+    </sect3>
+    <sect3>
+      <title>Booting a Debian Live USB/HDD system from a USB stick with Grub</title>
+      <para> Suppose you've built your Debian Live USB/HDD image, but want to install it on an already used USB stick with ext2/3 partition and Grub bootloader: </para>
+      <para>First, copy live components in a directory on your key: the Linux kernel (<filename>vmlinuz*</filename>), its Initial RAM disk (<filename>initrd*</filename>) and the system (<filename>filesystem.squashfs</filename>): <screen> # mkdir /media/myUsb/boot/live/ # cp binary/vmlinuz1 binary/initrd1.img binary/live/filesystem.squashfs /media/myUsb/boot/live/ </screen> </para>
+      <para>Then, add a stanza in Grub's menu definition to boot up this system: <screen> echo &gt;&gt;/media/myUsb/boot/grub/menu.lst &lt;&lt;EOF title my Debian Live root (hd0,1) # my Ext2 partition is the second on this stick kernel /boot/live/vmlinuz1 boot=live vga=791 persistent union=aufs live-media-path=boot/live initrd /boot/live/initrd1.img EOF </screen> The important kernel command line option to add here is <variablename>live-media-path</variablename>, which tells to Live initrd's script in which subdirectory to look for the SquashFS image. </para>
+      <para>Next, umount your USB stick and reboot on it. That's all!</para>
+    </sect3>
+  </sect2>
+  <sect2 id="splash">
+    <title>Splash screens</title>
+    <para> FIXME </para>
+  </sect2>
+  <sect2 id="memtest">
+    <title>Memtest</title>
+    <para> FIXME </para>
+  </sect2>
+  <sect2 id="startup-scripts">
+    <title>Startup scripts</title>
+    <para> FIXME </para>
+  </sect2>
+  <sect2 id="cheat-codes">
+    <title>Cheat codes</title>
+    <para> FIXME </para>
+    <para> Checksums. </para>
+  </sect2>
 </sect1>
diff --git a/manual/en/customization_contents.xml b/manual/en/customization_contents.xml
index 2abd154..4a5dade 100644
--- a/manual/en/customization_contents.xml
+++ b/manual/en/customization_contents.xml
@@ -1,135 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <sect1 id="contents">
-<title>Customising contents</title>
-
-<para>This chapter discusses further customisation of the live system.</para>
-
-<sect2>
- <title>Includes</title>
-
- <para>Using includes, it is possible to add (or replace) arbitrary files in your Debian Live image. &live-helper; provides three mechanisms for using them:</para>
-
- <variablelist>
-  <varlistentry>
-   <term>
-    Chroot local includes
-   </term>
-   <listitem>
-    <para>
-     These allow you to add or replace files to the chroot/Live filesystem. Please see <xref linkend="chroot-local-includes"/> for more information.
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term>
-    Binary local includes
-   </term>
-   <listitem>
-    <para>
-     These allow you to add or replace files in the binary image. Please see <xref linkend="binary-local-includes"/> for more information.
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term>
-    Binary includes
-   </term>
-   <listitem>
-    <para>
-     These allow you to add or replace Debian specific files in the binary image, such as the templates and tools directories. Please see <xref linkend="binary-includes"/> for more information.
-    </para>
-   </listitem>
-  </varlistentry>
- </variablelist>
-
- <para>
-  Please see <xref linkend="terms"/> for more information about the distinction between the "Live" and "binary" images.
- </para>
-
-<sect3 id="chroot-local-includes">
- <title>Live/chroot local includes</title>
- <para>
-  Chroot local includes can be used to add or replace files in the chroot/Live filesystem so that they are visible when the Live system is booted. Typical uses for them are to populate the skeleton user directory (<filename class="directory">/etc/skel</filename>) used by the live system to create the live user's home directory, or adding configuration files where additional processing is not required.
- </para>
-
- <para>
-  To include files, simply add them to your <filename class="directory">config/chroot_local-includes</filename> directory. This directory corresponds to the root directory (<filename class="directory">/</filename>) of the live system. For example, to add a file <filename>/var/www/index.html</filename> in the live system, use:
- </para>
-
- <screen>
-  $ mkdir -p config/chroot_local-includes/var/www
-  $ cp /path/to/my/index.html config/chroot_local-includes/var/www
- </screen>
-
- <para>
-  Your configuration will then have the following layout:
- </para>
-
- <screen>
--- config
-   [...]
-    |-- chroot_local-includes
-    |   `-- var
-    |       `-- www
-    |           `-- index.html
-   [...]
-    `-- templates
- </screen>
-
- <para>
-  Chroot local includes are installed after package installation so that files installed by packages are overwritten.
- </para>
-</sect3>
-
-<sect3 id="binary-local-includes">
-<title>Binary local includes</title>
- <para>
-  FIXME.
- </para>
-</sect3>
-
-<sect3 id="binary-includes">
-<title>Binary includes</title>
- <para>
-  FIXME.
- </para>
-</sect3>
-
-</sect2>
-
-<sect2 id="hooks">
-<title>Hooks</title>
-
-<para>FIXME.</para>
-<para>Enabling hooks</para>
-
-<sect3 id="chroot-local-hooks">
-<title>Live/chroot local hooks</title>
-<para>FIXME.</para>
-</sect3>
-
-<sect3 id="binary-local-hooks">
-<title>Binary local hooks</title>
-<para>FIXME.</para>
-</sect3>
-
-</sect2>
-
-<sect2 id="debconf-preseed">
- <title>Preseeding Debconf questions</title>
-
- <para>Files in the <filename class="directory">config/chroot_local-preseed</filename> directory are considered to be debconf preseed files and are installed by &live-helper; using <filename>debconf-set-selections</filename>.</para>
-
- <para>For more information about debconf, please see debconf(7) in the <command>debconf</command> package.</para>
-</sect2>
-
-<sect2 id="symlinks">
-<title>Symlink conversion</title>
-<para>FIXME. (This is probably in the wrong section)</para>
-</sect2>
-
+  <title>Customising contents</title>
+  <para>This chapter discusses further customisation of the live system.</para>
+  <sect2>
+    <title>Includes</title>
+    <para>Using includes, it is possible to add (or replace) arbitrary files in your Debian Live image. &live-helper; provides three mechanisms for using them:</para>
+    <variablelist>
+      <varlistentry>
+        <term> Chroot local includes </term>
+        <listitem>
+          <para> These allow you to add or replace files to the chroot/Live filesystem. Please see <xref linkend="chroot-local-includes"/> for more information. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term> Binary local includes </term>
+        <listitem>
+          <para> These allow you to add or replace files in the binary image. Please see <xref linkend="binary-local-includes"/> for more information. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term> Binary includes </term>
+        <listitem>
+          <para> These allow you to add or replace Debian specific files in the binary image, such as the templates and tools directories. Please see <xref linkend="binary-includes"/> for more information. </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <para> Please see <xref linkend="terms"/> for more information about the distinction between the "Live" and "binary" images. </para>
+    <sect3 id="chroot-local-includes">
+      <title>Live/chroot local includes</title>
+      <para> Chroot local includes can be used to add or replace files in the chroot/Live filesystem so that they are visible when the Live system is booted. Typical uses for them are to populate the skeleton user directory (<filename class="directory">/etc/skel</filename>) used by the live system to create the live user's home directory, or adding configuration files where additional processing is not required. </para>
+      <para> To include files, simply add them to your <filename class="directory">config/chroot_local-includes</filename> directory. This directory corresponds to the root directory (<filename class="directory">/</filename>) of the live system. For example, to add a file <filename>/var/www/index.html</filename> in the live system, use: </para>
+      <screen> $ mkdir -p config/chroot_local-includes/var/www $ cp /path/to/my/index.html config/chroot_local-includes/var/www </screen>
+      <para> Your configuration will then have the following layout: </para>
+      <screen> -- config [...] |-- chroot_local-includes | `-- var | `-- www | `-- index.html [...] `-- templates </screen>
+      <para> Chroot local includes are installed after package installation so that files installed by packages are overwritten. </para>
+    </sect3>
+    <sect3 id="binary-local-includes">
+      <title>Binary local includes</title>
+      <para> FIXME. </para>
+    </sect3>
+    <sect3 id="binary-includes">
+      <title>Binary includes</title>
+      <para> FIXME. </para>
+    </sect3>
+  </sect2>
+  <sect2 id="hooks">
+    <title>Hooks</title>
+    <para>FIXME.</para>
+    <para>Enabling hooks</para>
+    <sect3 id="chroot-local-hooks">
+      <title>Live/chroot local hooks</title>
+      <para>FIXME.</para>
+    </sect3>
+    <sect3 id="binary-local-hooks">
+      <title>Binary local hooks</title>
+      <para>FIXME.</para>
+    </sect3>
+  </sect2>
+  <sect2 id="debconf-preseed">
+    <title>Preseeding Debconf questions</title>
+    <para>Files in the <filename class="directory">config/chroot_local-preseed</filename> directory are considered to be debconf preseed files and are installed by &live-helper; using <filename>debconf-set-selections</filename>.</para>
+    <para>For more information about debconf, please see debconf(7) in the <command>debconf</command> package.</para>
+  </sect2>
+  <sect2 id="symlinks">
+    <title>Symlink conversion</title>
+    <para>FIXME. (This is probably in the wrong section)</para>
+  </sect2>
 </sect1>
diff --git a/manual/en/customization_internationalization.xml b/manual/en/customization_internationalization.xml
index 9f55a15..cc06833 100644
--- a/manual/en/customization_internationalization.xml
+++ b/manual/en/customization_internationalization.xml
@@ -1,53 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <sect1 id="internalization">
-<title>Customising Locale And Language</title>
-<para>This chapter discusses customisation for language specific parameters.</para>
-
-<sect2 id="locale">
-<title>Default locale and keyboard</title>
-
-<para>
-The default locale when building a live cd is "locale=en_US.UTF-8". 
-To set the locale for the UK (locale=en_GB.UTF-8)
-<screen>
-$ lh_config --bootappend-live "locale=en_GB.UTF-8"
-</screen>
-The entry for a British keyboard would be 
-<screen>
-$ lh_config --bootappend-live "keyb=uk"
-</screen>
-To configure both the locale and the keyboard for the UK the entry would be 
-<screen>
-$ lh_config --bootappend-live "locale=en_GB.UTF-8 keyb=uk"
-</screen>
-or
-<screen>
-$ lh_config --bootappend-live "locale=uk"
-</screen>
-</para>
-<note>
- You can find a list of options in the manpage for live-initramfs. Only UTF8 locales are supported by live-initramfs.
-</note>
-</sect2>
-<sect2 id="default_language">
-<title>l10n Packages</title>
-
-<para>
-lh build can automatically check for each package, for which it's know that there are -l10n packages available and install them. To add Swedish packages the entry would be 
-<screen>
-$ lh_config --language "se"
-</screen>
-This will also change the default syslinux language if
-<screen>
-  config/templates/syslinux/se
-</screen>
-is available. Check syslinux configuration FIXME
-</para>
-
-</sect2>
-
+  <title>Customising Locale And Language</title>
+  <para>This chapter discusses customisation for language specific parameters.</para>
+  <sect2 id="locale">
+    <title>Default locale and keyboard</title>
+    <para> The default locale when building a live cd is "locale=en_US.UTF-8". To set the locale for the UK (locale=en_GB.UTF-8) <screen> $ lh_config --bootappend-live "locale=en_GB.UTF-8" </screen> The entry for a British keyboard would be <screen> $ lh_config --bootappend-live "keyb=uk" </screen> To configure both the locale and the keyboard for the UK the entry would be <screen> $ lh_config --bootappend-live "locale=en_GB.UTF-8 keyb=uk" </screen> or <screen> $ lh_config --bootappend-live "locale=uk" </screen> </para>
+    <note> You can find a list of options in the manpage for live-initramfs. Only UTF8 locales are supported by live-initramfs. </note>
+  </sect2>
+  <sect2 id="default_language">
+    <title>l10n Packages</title>
+    <para> lh build can automatically check for each package, for which it's know that there are -l10n packages available and install them. To add Swedish packages the entry would be <screen> $ lh_config --language "se" </screen> This will also change the default syslinux language if <screen> config/templates/syslinux/se </screen> is available. Check syslinux configuration FIXME </para>
+  </sect2>
 </sect1>
diff --git a/manual/en/customization_packages.xml b/manual/en/customization_packages.xml
index c1cd904..c4d6063 100644
--- a/manual/en/customization_packages.xml
+++ b/manual/en/customization_packages.xml
@@ -1,548 +1,213 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-	<!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
-
 <sect1 id="packages">
-<title>Customising package installation</title>
-
-<para>
-	This chapter discusses the customisation of package installation. This
-	involves:
-</para>
-
-<orderedlist>
-
-<listitem>
-<para>
-	Selecting additional packages to be installed
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Installing modified packages
-</para>
-</listitem>
-
-</orderedlist>
-
-<sect2 id="package-sources">
-<title>Package sources</title>
-
-<para>
-	FIXME
-</para>
-
-<variablelist>
-
-<varlistentry>
-<term>Debian repositories</term>
-
-<listitem>
-<para>
-	To set a local mirror (used to ''build'' the live-cd)
-</para>
-
-<para>
-	<screen>$ lh config --mirror-bootstrap "http://local.intra.net/debian/" --mirror-chroot "http://local.intra.net/debian/"</screen>
-</para>
-
-<para>
-	The generic mirror is added to the live-system's /etc/apt/sources.list.
-</para>
-
-<para>
-	<screen>$ lh config --mirror-binary "http://ftp.debian.org/debian/"</screen>
-</para>
-
-<para>
-	Note: It is ''not'' used for building the live-cd but to install new
-	software while using the live-cd.
-</para>
-
-<para>
-	It can be disabled by setting binary indices parameter to disabled
-</para>
-
-<para>
-	<screen>$ lh config --binary-indices disabled</screen>
-</para>
-
-<para>
-	Note: the same applies for mirror chroot security and mirror binary
-	security
-</para>
-
-<para>
-	<screen>$ lh config --mirror-chroot-security {URL}
-$ lh config --mirror-binary-security {URL}</screen>
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Own repository</term>
-
-<listitem>
-<para>
-	To add more repositories (e.g. backports, experimental packages, etc.),
-	create
-	<filename>config/chroot_sources/your-cdd-repo.{chroot,binary}</filename>
-	file.
-</para>
-
-<para>
-	e.g. <filename>config/chroot_sources/live.chroot</filename> allows you
-	to install packages from the debian live snapshot repository at live-cd
-	build time (you have to add the packages in your package list):
-</para>
-
-<para>
-	<screen>deb http://live.debian.net/ sid-snapshots main contrib non-free</screen>
-</para>
-
-<para>
-	If you add the line to
-	<filename>config/chroot_sources/live.binary</filename> the repository
-	will be added to your live-system's
-	<filename>/etc/apt/sources.list</filename>.
-</para>
-
-<para>
-	If such files exist, they will be picked up automatically.
-</para>
-
-<para>
-	You can also put the gpg-key used to sign the repository into
-	config/chroot_sources/foo.{binary,chroot}.gpg
-</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-
-</sect2>
-
-<sect2 id="package-installation">
-<title>Package installation</title>
-
-<para>
-	You can elect to use either <command>apt</command> or
-	<command>aptitude</command> when installing packages. Which utility is
-	used is governed by the <command>LH_APT</command> variable in
-	<filename>config/chroot</filename> or by the <command>--apt</command>
-	argument to <filename>lh config</filename>:
-</para>
-
-<variablelist>
-
-<varlistentry>
-<term><command>apt</command></term>
-
-<listitem>
-<para>
-	Specifying a missing package causes package installation to fail, which
-	may not be the desired behaviour.
-</para>
-
-<para>
-	This is the default setting for building images for Lenny or later.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><command>aptitude</command></term>
-
-<listitem>
-<para>
-	Specifying a missing package causes package installation to succeed,
-	which may not be the desired behaviour.
-</para>
-
-<para>
-	This is the default setting for building images for Etch.
-</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-
-</sect2>
-
-<sect2>
-<title>Installing additional packages</title>
-
-<para>
-	&live-helper; has a number of mechanisms for indicating that additional
-	packages should be installed, including:
-</para>
-
-<orderedlist>
-
-<listitem>
-<para>
-	The <command>LH_PACKAGES</command> variable
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Package lists
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Local packages (<filename>chroot_local-packages/</filename>)
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Tasks
-</para>
-</listitem>
-
-</orderedlist>
-
-<sect3 id="lh-packages">
-<title>The <command>LH_PACKAGES</command> variable</title>
-
-<para>
-	To install additional packages, simply add them to the
-	<command>LH_PACKAGES</command> variable in
-	<filename>config/chroot</filename>. For example:
-</para>
-
-<para>
-	<screen>LH_PACKAGES="package1 package2 package3 ... "</screen>
-</para>
-
-<para>
-	You can also specify initial values on the command line:
-</para>
-
-<para>
-	<screen>$ lh config --packages "package1 package2 package3"</screen>
-</para>
-
-<para>
-	The behaviour of &live-helper; when specifying a package that does not
-	exist is determined by your choice of APT utility. See <xref
-	linkend="package-installation"/> for more details.
-</para>
-
-<para>
-	If you need to specify a large number of packages to be installed or
-	you need flexibility regarding which packages to install, you should
-	probably be using package lists. See <xref linkend="package-lists"/>
-	for more information.
-</para>
-
-</sect3>
-
-<sect3 id="package-lists">
-<title>Package lists</title>
-
-<para>
-	Package lists are a powerful way of expressing which packages should be
-	installed. &live-helper; ships with a number of predefined package
-	lists which provide sensible default package selections for the GNOME
-	and KDE desktop environments, as well as standard systems.
-</para>
-
-<para>
-	To specify a package list, add the name of the list to the
-	<command>LH_PACKAGES_LISTS</command> variable in
-	<filename>config/chroot</filename>. For example:
-</para>
-
-<para>
-	<screen>LH_PACKAGES_LISTS="gnome"</screen>
-</para>
-
-<para>
-	Package lists that are distributed with &live-helper; reside in the
-	<command>/usr/share/live-helper/lists</command> directory.
-</para>
-
-<sect4>
-<title>Local packages lists</title>
-
-<para>
-	You may supplement the supplied lists using local package lists stored
-	in <command>config/chroot_local-packageslists</command>.
-</para>
-
-<para>
-	Package lists that exist in this directory always override package
-	lists distributed with &live-helper;. This can cause undesired effects
-	when.
-</para>
-
-<note>
-<title>&live-helper; 2.x change</title>
-
-<para>
-	Any file with <command>.list</command> suffix in
-	<command>config/chroot_local-packageslists</command> is automatically
-	enabled, the variable LH_PACKAGES_LISTS should only be used referencing
-	packages lists included in live-helper (at
-	<command>/usr/share/live-helper/lists/</command>.
-</para>
-
-</note>
-
-</sect4>
-
-<sect4>
-<title>Extending a provided package list using includes</title>
-
-<para>
-	FIXME
-</para>
-
-<para>
-	<screen>#include &lt;gnome&gt;
-iceweasel</screen>
-</para>
-
-<para>
-	The package lists that are included with &live-helper; make extensive
-	use of includes. They are available to view in the
-	<command>/usr/share/live-helper/lists</command> directory.
-</para>
-
-</sect4>
-
-<sect4>
-<title>Using conditionals inside packages lists</title>
-
-<para>
-	FIXME
-</para>
-
-<para>
-	<screen>#if ARCHITECTURE amd64
-ia32-libs
-#endif</screen>
-</para>
-
-<para>
-	or if <command>LH_ARCHITECTURE</command> is set to
-	<command>i386</command> or <command>amd64</command>:
-</para>
-
-<para>
-	<screen>#if ARCHITECTURE i386 amd64
-memtest86+
-#endif</screen>
-</para>
-
-<para>
-	or if <command>LH_SECTIONS</command> contains either
-	<command>contrib</command> or <command>non-free</command>:
-</para>
-
-<para>
-	<screen>#if SECTIONS contrib non-free
-vrms
-#endif</screen>
-</para>
-
-<para>
-	A conditional may surround an <command>#include</command> directive:
-</para>
-
-<para>
-	<screen>#if ARCHITECTURE amd64
-#include &lt;gnome-full&gt;
-#endif</screen>
-</para>
-
-<para>
-	Any &live-helper; configuration variable that begins with
-	<command>LH_</command> can be tested in this way.
-</para>
-
-<para>
-	The nesting of conditionals is not supported.
-</para>
-
-</sect4>
-
-</sect3>
-
-<sect3 id="tasks">
-<title>Tasks</title>
-
-<para>
-	FIXME
-</para>
-
-</sect3>
-
-</sect2>
-
-<sect2 id="custom-packages">
-<title>Installing modified or third-party packages</title>
-
-<para>
-	Whilst it is against the philosophy of Debian Live, it may sometimes be
-	necessary to build a Live system with modified versions of packages
-	that are in the Debian repository. This may be to modify or support
-	additional features, languages and branding, or even to remove elements
-	of existing packages that are undesirable. Similarly, "third-party"
-	packages may be used to add bespoke and/or proprietary functionality.
-</para>
-
-<para>
-	This section does not cover advice regarding building or maintaining
-	modified packages. Joachim Breitner's <ulink
-	url="http://www.joachim-breitner.de/blog/archives/282-How-to-fork-privately.html"
-	>'How to fork privately'</ulink> may be of interest, however. The
-	creation of bespoke packages is covered in the <ulink
-	url="http://www.debian.org/doc/maint-guide/">Debian New Maintainers'
-	Guide</ulink> and elsewhere.
-</para>
-
-<para>
-	There are two ways of installing modified custom packages:
-</para>
-
-<orderedlist>
-
-<listitem>
-<para>
-	<filename>chroot_local-packages</filename>
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Using a custom APT repository
-</para>
-</listitem>
-
-</orderedlist>
-
-<para>
-	The <filename>chroot_local-packages</filename> is simpler to achieve
-	and useful for "one-off" customisations but has a number of drawbacks,
-	whilst using a custom APT repository is more time-consuming to set up.
-</para>
-
-<sect3 id="local-packages">
-<title>
-	Using <filename>chroot_local-packages</filename> to install custom
-	packages
-</title>
-
-<para>
-	To install a custom package, simply copy it to the
-	<command>config/chroot_local-packages</command> directory. Packages
-	that are inside this directory will be automatically installed into the
-	live system during build - you do not need to specify them elsewhere.
-</para>
-
-<para>
-	Packages <emphasis>must</emphasis> be named in the prescribed way. One
-	simple way to do this is to use <command>dpkg-name</command>. FIXME
-</para>
-
-<para>
-	Using <filename>chroot_local-packages</filename> for installation of
-	custom packages has disadvantages:
-</para>
-
-<orderedlist>
-
-<listitem>
-<para>
-	It is not possible to use secure APT
-</para>
-</listitem>
-
-<listitem>
-<para>
-	You must install all appropriate packages in the
-	<command>config/chroot_local-packages</command> directory
-</para>
-</listitem>
-
-<listitem>
-<para>
-	It does not lend itself to storing Debian Live configurations in
-	revision control
-</para>
-</listitem>
-
-</orderedlist>
-
-</sect3>
-
-<sect3 id="custom-apt-repo">
-<title>Using an APT repository to install custom packages</title>
-
-<para>
-	FIXME
-</para>
-
-<para>
-	Unlike using <filename>chroot_local-packages</filename>, when using a
-	custom APT repository you must ensure that you specify the packages
-	elsewhere. See <xref linkend="lh-packages"/> for details.
-</para>
-
-<para>
-	Whilst it may seem unnecessary effort to create an APT repository to
-	install custom packages, the infrastructure can be easily re-used at a
-	later date to offer updates of the modified packages.
-</para>
-
-</sect3>
-
-<sect3 id="custom-packages-apt">
-<title>Custom packages and APT</title>
-
-<para>
-	&live-helper; uses APT to install all packages into the live system so
-	will therefore inherit behaviours from this program. One relevant
-	example is that (assuming a default configuration) given a package
-	available in two different repositories with different version numbers,
-	APT will elect to install the package with the higher version number.
-</para>
-
-<para>
-	Because of this, you may wish to increment the version number in your
-	custom packages' <command>debian/changelog</command> files to ensure
-	that your modified version is installed over one in the official Debian
-	repositories. This may also be achieved by altering the live system's
-	APT pinning preferences - see <xref linkend="apt-preferences"/> for
-	more information.
-</para>
-
-</sect3>
-
-<sect3 id="apt-preferences">
-<title>Altering APT preferences during Live system</title>
-
-<para>
-	FIXME
-</para>
-
-<para>
-	Whilst it may seem unnecessary effort to create an APT repository to
-	install custom packages, the infrastructure can be easily re-used at a
-	later date to offer updates of the modified package.
-</para>
-
-</sect3>
-
-</sect2>
-
+  <title>Customising package installation</title>
+  <para> This chapter discusses the customisation of package installation. This involves: </para>
+  <orderedlist>
+    <listitem>
+      <para> Selecting additional packages to be installed </para>
+    </listitem>
+    <listitem>
+      <para> Installing modified packages </para>
+    </listitem>
+  </orderedlist>
+  <sect2 id="package-sources">
+    <title>Package sources</title>
+    <para> FIXME </para>
+    <variablelist>
+      <varlistentry>
+        <term>Debian repositories</term>
+        <listitem>
+          <para> To set a local mirror (used to ''build'' the live-cd) </para>
+          <para>
+            <screen>$ lh config --mirror-bootstrap "http://local.intra.net/debian/" --mirror-chroot "http://local.intra.net/debian/"</screen>
+          </para>
+          <para> The generic mirror is added to the live-system's /etc/apt/sources.list. </para>
+          <para>
+            <screen>$ lh config --mirror-binary "http://ftp.debian.org/debian/"</screen>
+          </para>
+          <para> Note: It is ''not'' used for building the live-cd but to install new software while using the live-cd. </para>
+          <para> It can be disabled by setting binary indices parameter to disabled </para>
+          <para>
+            <screen>$ lh config --binary-indices disabled</screen>
+          </para>
+          <para> Note: the same applies for mirror chroot security and mirror binary security </para>
+          <para>
+            <screen>$ lh config --mirror-chroot-security {URL} $ lh config --mirror-binary-security {URL}</screen>
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>Own repository</term>
+        <listitem>
+          <para> To add more repositories (e.g. backports, experimental packages, etc.), create <filename>config/chroot_sources/your-cdd-repo.{chroot,binary}</filename> file. </para>
+          <para> e.g. <filename>config/chroot_sources/live.chroot</filename> allows you to install packages from the debian live snapshot repository at live-cd build time (you have to add the packages in your package list): </para>
+          <para>
+            <screen>deb http://live.debian.net/ sid-snapshots main contrib non-free</screen>
+          </para>
+          <para> If you add the line to <filename>config/chroot_sources/live.binary</filename> the repository will be added to your live-system's <filename>/etc/apt/sources.list</filename>. </para>
+          <para> If such files exist, they will be picked up automatically. </para>
+          <para> You can also put the gpg-key used to sign the repository into config/chroot_sources/foo.{binary,chroot}.gpg </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+  <sect2 id="package-installation">
+    <title>Package installation</title>
+    <para> You can elect to use either <command>apt</command> or <command>aptitude</command> when installing packages. Which utility is used is governed by the <command>LH_APT</command> variable in <filename>config/chroot</filename> or by the <command>--apt</command> argument to <filename>lh config</filename>: </para>
+    <variablelist>
+      <varlistentry>
+        <term>
+          <command>apt</command>
+        </term>
+        <listitem>
+          <para> Specifying a missing package causes package installation to fail, which may not be the desired behaviour. </para>
+          <para> This is the default setting for building images for Lenny or later. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <command>aptitude</command>
+        </term>
+        <listitem>
+          <para> Specifying a missing package causes package installation to succeed, which may not be the desired behaviour. </para>
+          <para> This is the default setting for building images for Etch. </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+  <sect2>
+    <title>Installing additional packages</title>
+    <para> &live-helper; has a number of mechanisms for indicating that additional packages should be installed, including: </para>
+    <orderedlist>
+      <listitem>
+        <para> The <command>LH_PACKAGES</command> variable </para>
+      </listitem>
+      <listitem>
+        <para> Package lists </para>
+      </listitem>
+      <listitem>
+        <para> Local packages (<filename>chroot_local-packages/</filename>) </para>
+      </listitem>
+      <listitem>
+        <para> Tasks </para>
+      </listitem>
+    </orderedlist>
+    <sect3 id="lh-packages">
+      <title>The <command>LH_PACKAGES</command> variable</title>
+      <para> To install additional packages, simply add them to the <command>LH_PACKAGES</command> variable in <filename>config/chroot</filename>. For example: </para>
+      <para>
+        <screen>LH_PACKAGES="package1 package2 package3 ... "</screen>
+      </para>
+      <para> You can also specify initial values on the command line: </para>
+      <para>
+        <screen>$ lh config --packages "package1 package2 package3"</screen>
+      </para>
+      <para> The behaviour of &live-helper; when specifying a package that does not exist is determined by your choice of APT utility. See <xref linkend="package-installation"/> for more details. </para>
+      <para> If you need to specify a large number of packages to be installed or you need flexibility regarding which packages to install, you should probably be using package lists. See <xref linkend="package-lists"/> for more information. </para>
+    </sect3>
+    <sect3 id="package-lists">
+      <title>Package lists</title>
+      <para> Package lists are a powerful way of expressing which packages should be installed. &live-helper; ships with a number of predefined package lists which provide sensible default package selections for the GNOME and KDE desktop environments, as well as standard systems. </para>
+      <para> To specify a package list, add the name of the list to the <command>LH_PACKAGES_LISTS</command> variable in <filename>config/chroot</filename>. For example: </para>
+      <para>
+        <screen>LH_PACKAGES_LISTS="gnome"</screen>
+      </para>
+      <para> Package lists that are distributed with &live-helper; reside in the <command>/usr/share/live-helper/lists</command> directory. </para>
+      <sect4>
+        <title>Local packages lists</title>
+        <para> You may supplement the supplied lists using local package lists stored in <command>config/chroot_local-packageslists</command>. </para>
+        <para> Package lists that exist in this directory always override package lists distributed with &live-helper;. This can cause undesired effects when. </para>
+        <note>
+          <title>&live-helper; 2.x change</title>
+          <para> Any file with <command>.list</command> suffix in <command>config/chroot_local-packageslists</command> is automatically enabled, the variable LH_PACKAGES_LISTS should only be used referencing packages lists included in live-helper (at <command>/usr/share/live-helper/lists/</command>. </para>
+        </note>
+      </sect4>
+      <sect4>
+        <title>Extending a provided package list using includes</title>
+        <para> FIXME </para>
+        <para>
+          <screen>#include &lt;gnome&gt; iceweasel</screen>
+        </para>
+        <para> The package lists that are included with &live-helper; make extensive use of includes. They are available to view in the <command>/usr/share/live-helper/lists</command> directory. </para>
+      </sect4>
+      <sect4>
+        <title>Using conditionals inside packages lists</title>
+        <para> FIXME </para>
+        <para>
+          <screen>#if ARCHITECTURE amd64 ia32-libs #endif</screen>
+        </para>
+        <para> or if <command>LH_ARCHITECTURE</command> is set to <command>i386</command> or <command>amd64</command>: </para>
+        <para>
+          <screen>#if ARCHITECTURE i386 amd64 memtest86+ #endif</screen>
+        </para>
+        <para> or if <command>LH_SECTIONS</command> contains either <command>contrib</command> or <command>non-free</command>: </para>
+        <para>
+          <screen>#if SECTIONS contrib non-free vrms #endif</screen>
+        </para>
+        <para> A conditional may surround an <command>#include</command> directive: </para>
+        <para>
+          <screen>#if ARCHITECTURE amd64 #include &lt;gnome-full&gt; #endif</screen>
+        </para>
+        <para> Any &live-helper; configuration variable that begins with <command>LH_</command> can be tested in this way. </para>
+        <para> The nesting of conditionals is not supported. </para>
+      </sect4>
+    </sect3>
+    <sect3 id="tasks">
+      <title>Tasks</title>
+      <para> FIXME </para>
+    </sect3>
+  </sect2>
+  <sect2 id="custom-packages">
+    <title>Installing modified or third-party packages</title>
+    <para> Whilst it is against the philosophy of Debian Live, it may sometimes be necessary to build a Live system with modified versions of packages that are in the Debian repository. This may be to modify or support additional features, languages and branding, or even to remove elements of existing packages that are undesirable. Similarly, "third-party" packages may be used to add bespoke and/or proprietary functionality. </para>
+    <para> This section does not cover advice regarding building or maintaining modified packages. Joachim Breitner's <ulink url="http://www.joachim-breitner.de/blog/archives/282-How-to-fork-privately.html">'How to fork privately'</ulink> may be of interest, however. The creation of bespoke packages is covered in the <ulink url="http://www.debian.org/doc/maint-guide/">Debian New Maintainers' Guide</ulink> and elsewhere. </para>
+    <para> There are two ways of installing modified custom packages: </para>
+    <orderedlist>
+      <listitem>
+        <para>
+          <filename>chroot_local-packages</filename>
+        </para>
+      </listitem>
+      <listitem>
+        <para> Using a custom APT repository </para>
+      </listitem>
+    </orderedlist>
+    <para> The <filename>chroot_local-packages</filename> is simpler to achieve and useful for "one-off" customisations but has a number of drawbacks, whilst using a custom APT repository is more time-consuming to set up. </para>
+    <sect3 id="local-packages">
+      <title> Using <filename>chroot_local-packages</filename> to install custom packages </title>
+      <para> To install a custom package, simply copy it to the <command>config/chroot_local-packages</command> directory. Packages that are inside this directory will be automatically installed into the live system during build - you do not need to specify them elsewhere. </para>
+      <para> Packages <emphasis>must</emphasis> be named in the prescribed way. One simple way to do this is to use <command>dpkg-name</command>. FIXME </para>
+      <para> Using <filename>chroot_local-packages</filename> for installation of custom packages has disadvantages: </para>
+      <orderedlist>
+        <listitem>
+          <para> It is not possible to use secure APT </para>
+        </listitem>
+        <listitem>
+          <para> You must install all appropriate packages in the <command>config/chroot_local-packages</command> directory </para>
+        </listitem>
+        <listitem>
+          <para> It does not lend itself to storing Debian Live configurations in revision control </para>
+        </listitem>
+      </orderedlist>
+    </sect3>
+    <sect3 id="custom-apt-repo">
+      <title>Using an APT repository to install custom packages</title>
+      <para> FIXME </para>
+      <para> Unlike using <filename>chroot_local-packages</filename>, when using a custom APT repository you must ensure that you specify the packages elsewhere. See <xref linkend="lh-packages"/> for details. </para>
+      <para> Whilst it may seem unnecessary effort to create an APT repository to install custom packages, the infrastructure can be easily re-used at a later date to offer updates of the modified packages. </para>
+    </sect3>
+    <sect3 id="custom-packages-apt">
+      <title>Custom packages and APT</title>
+      <para> &live-helper; uses APT to install all packages into the live system so will therefore inherit behaviours from this program. One relevant example is that (assuming a default configuration) given a package available in two different repositories with different version numbers, APT will elect to install the package with the higher version number. </para>
+      <para> Because of this, you may wish to increment the version number in your custom packages' <command>debian/changelog</command> files to ensure that your modified version is installed over one in the official Debian repositories. This may also be achieved by altering the live system's APT pinning preferences - see <xref linkend="apt-preferences"/> for more information. </para>
+    </sect3>
+    <sect3 id="apt-preferences">
+      <title>Altering APT preferences during Live system</title>
+      <para> FIXME </para>
+      <para> Whilst it may seem unnecessary effort to create an APT repository to install custom packages, the infrastructure can be easily re-used at a later date to offer updates of the modified package. </para>
+    </sect3>
+  </sect2>
 </sect1>
diff --git a/manual/en/faq.xml b/manual/en/faq.xml
index 0a11f7f..73b898c 100644
--- a/manual/en/faq.xml
+++ b/manual/en/faq.xml
@@ -1,507 +1,217 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <chapter id="faq">
-<title>Frequently asked questions (FAQ)</title>
-
-<itemizedlist>
-
-<listitem>
-	<para>Q: I downloaded a prebuilt live image. How do I put it on a USB stick?</para>
-	<para>A:  See  <xref linkend="image_copying" /> "Copying USB/HDD image to a USB stick"</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I log my build?</para>
-	<para>A: You could use script, screen or tee:
-		<screen>$ lh_build 2>&amp;1 | tee build.log</screen>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Q: How can I convert an already installed standard Debian partition into a Debian Live system?</para>
-	<para>A: Save the list of installed packages and load it into your new Debian Live System. Copy your /etc to config/chroot_local-includes</para>
-</listitem>
-
-<listitem>
-	<para>Q: What does 'losetup: could not find any free loop device' mean and how do I fix it?</para>
-	<para>A: Loop devices are used during the build; there probably aren't any free if you've aborted several builds. Something like: for l in /dev/loop* ; do losetup -d $l ; done should rectify the situation (assuming all loop devices in use were created by lh_build; if in doubt, check the contents of each loop device before deleting them with losetup -d).</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I launch an interactive shell during the chroot stage?</para>
-	<para>A: To enable interactive shell:
-		<screen>$ lh_config --interactive shell</screen>
-		To continue the build process:
-		<screen># logout</screen>
-		or
-		<screen># exit</screen>
-		To disable interactive shell, set LH_INTERACTIVE to "disabled" in config/chroot.
-	</para>
-</listitem>
-
-<listitem>
-	<para>Q: What is the root /user password?</para>
-	<para>A: The user password for the live user is 'live'. By default, there is not any root password. You can switch to root with <screen> sudo -i </screen> or set a password for root with  <screen>sudo passwd</screen></para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I change root or any user password?</para>
-	<para>A: Add a chroot local hook script to change root or any user password each time you build an image.</para>
-	<para>e.g. config/chroot_local-hooks/01-update_password.sh to set root password to "nopasswd"</para>
-	<para>
-		<screen>#!/bin/sh
-echo "I: update password"
-echo "root:nopasswd" | chpasswd</screen>
-		<screen>$ chmod +x config/chroot_local-hooks/01-update_password.sh</screen>
-<note>For live user; you need to copy the /usr/share/initramfs-tools/scripts/live-bottom/10adduser your build folder:
-		<screen>mkdir -p config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/
-cp /usr/share/initramfs-tools/scripts/live-bottom/10adduser config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/</screen></note>
-		Then edit the config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/10adduser and paste in the new user_crypted password that you make with: <screen> echo "newlivepass" | mkpasswd -s.</screen>
-		<para> Or add an hook file in config/chroot_local-hooks/ with something like the below: </para>
-		<screen> #!/bin/sh
-# Change the autogenerated user password to "debianlive"
-plain_password="debianlive"
-password=$(echo "${plain_password}" | mkpasswd -s)
-sed -i -e 's/\(user_crypted=\)\(.*\)\( #.*\)/\1\"'${password}'\"\3/' /usr/share/initramfs-tools/scripts/live-bottom/10adduser
-update-initramfs -tu -kall</screen>
-<para> The latter (hook model) could be more future proof than the former solution since it modifies just one string selectively but it requires the package "whois" to be installed on the target system (for mkpasswd) or that you generate the $password string not at build time and include it crypted in the above script. </para>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Q: How to disable autologin?</para>
-	<para>A1: use the commandline parameter
-	<screen>lh config --bootappend-live "noautologin"</screen>
-	<para>A2: You need to set boot=noautologin noxautologin as described in man <filename>live-initramfs</filename> If you boot via TFTP you want to insert the option to pxelinux.cfg/default</para>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I change default hostname or username?</para>
-	<para>A: To change default hostname or username:
-	<screen>$ lh_config --hostname myhostname
-$ lh_config --username myusername</screen>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I make the final image smaller?</para>
-	<para>A: Clean orphaned apps/libs: Install package "deborphan" and then run 'sudo deborphan -n' . Delete unwanted packages. Remove the apt cache. Purge unwanted locales (see "localepurge" package).
-	</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I customize bash-config permanently (aliases, bash-completion etc.)?</para>
-	<para>A: Add your own .bashrc config/chroot_local-includes/etc/skel/.bashrc</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I disable services permanently? (Be careful!)</para>
-	<para> A:  Add a chroot local hook script to disable a service each time you build an image:	</para>
-	<para>e.g. config/chroot_local-hooks/01-disable_service.sh
-	<screen>#!/bin/sh
-echo "I: disable service"
-update-rc.d -f   &#9001;service name &#9002; remove </screen>
-<screen> $ chmod +x config/chroot_local-hooks/01-disable_service.sh </screen>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I enable | disable the md5checksum at the ISO building?
-	<screen>lh_config --checksums enabled|disabled </screen>
-	Or change the LH_CHECKSUMS value. 
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How to disable the generation of the .tar.gz file?
-	<screen>lh_config --net-tarball none|gzip </screen>
-	Or change the LH_NET_TARBALL value. (only available in snapsshot version at the moment 2008/Feb/28) 
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I "build a new image" ?</para>
-	<para> A:  Run commands: 
-	<screen>$ sudo lh_clean --binary
-$ sudo lh_build </screen>
-<emphasis>Hint:</emphasis>  If the configuration had changed you should leave "--binary" out. This will clean your chroot directory too. 
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I use Fluxbox ?
-	<para>A: Add a new lists file with the fluxbox packages you want. </para>
-	<para>Create /home/$USERNAME/.dmrc file (default username is "user").</para>
-	<screen>$ cat .dmrc
-[Desktop]
-Session=fluxbox</screen>
-	<note>.dmrc is owned by $USERNAME:$USERNAME. </note>
-	<para>See also <ulink url="http://wiki.debian.org/Fluxbox/">http://wiki.debian.org/Fluxbox</ulink></para>
-	<para> A short HOWTO can be found here:
-	 <ulink url=" http://wiki.debian.org/MichaelAblassmeier/CustomLiveCD"> http://wiki.debian.org/MichaelAblassmeier/CustomLiveCD</ulink></para>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I use custom repositories?</para>
-	<para>A: <ulink url="http://wiki.debian.org/DebianLive/Configuration">See DebianLive/Configuration.</ulink></para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I customize the artwork for the live CD (grub or syslinux boot splash, usplash, etc.)?</para>
-	<para>A: <ulink url="http://wiki.debian.org/DebianLive/Howto/Custom_Artwork"> See DebianLive/Howto/Custom_Artwork. </ulink> FIXME: NEED TO UPDATE</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I customize desktop environment (KDE, GNOME, XFCE, etc...) look?
-	<para>A:  Start the live system in qemu:  </para>
-	<screen>$ qemu -m 256 -cdrom binary.iso -boot d -redir tcp:4222:10.0.2.15:22</screen>
-	<note>the -redir argument must be changed to meet your needs </note>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I execute a custom shell script inside the chroot system after the chroot stage?</para>
-	<para>A:  Add your script in config/chroot_local-hooks. </para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I add a script running immediately after all other scripts when the live system boots?
-	<para>A:  Add your script in config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/99script </para>
-	<screen>$ chmod +x config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/99script</screen>
-	<note>The hook script must be executable. Do not forget to lh_clean --chroot after making this change before you build again. </note>
-	<para>You must also use the example script /usr/share/live-helper/examples/hooks/update-initramfs.sh to ensure your script gets built into the initramfs (read the comment header for instructions). </para>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I add software not in Debian ?</para>
-	<para>A: See  <xref linkend="packages" /> Customising package installation</para>
-</listitem>
-
-<listitem>
-	<para>Q: What is the manifest with Ubuntu used for?</para>
-	<para>A:  Manifest is just the package list, which ubuntu does $something with. Don't worry about it. </para>
-</listitem>
-
-<listitem>
-	<para>Q: What is this {p} syntax with mtools{p} and parted{p} ?</para>
-	<para>A:  That's aptitude. </para>
-</listitem>
-
-<listitem>
-	<para>Q: Do I need to write the image on USB stick to test it?
-	<note>you must use qemu >= 0.8. </note>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: What is /cow ?</para>
-	<para>A:  Copy-on-write, the 'diff' from unionfs. </para>
-</listitem>
-
-<listitem>
-	<para>Q: Is /usr/share/live-helper/lists/standard-x11 like preseed or is preseed something else entirely?</para>
-	<para>A:  It is not. It is a package list, not a debconf preseeding. </para>
-</listitem>
-
-<listitem>
-	<para>Q: What is the difference between standard and minimal?
-	<para>standard: packages of priority standard and higher;</para>
-	<para>minimal: packages of priority essential and higher; </para>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Q: What can the sections be used for? Aren't they BIG?</para>
-	<para>A:  Someone maybe wants to include packages from contrib or non-free. </para>
-</listitem>
-
-<listitem>
-	<para>Q: memtest86+ ... is that used?</para>
-	<para>A: Yes </para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I build using predefined packages lists?
-	<para>A:  e.g. to build using standard-x11 packages list:  </para>
-	<screen>$ sudo lh_config -p standard-x11
-$ sudo lh_build</screen>
-	<note>The packages lists can be found in /usr/share/live-helper/lists/ directory. </note>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I rebuild without downloading all the packages again?
-	<para>A:  All packages are cached in cache subdirectory. They remain until a clean purge: </para>
-	<screen>$ sudo lh_clean --purge</screen>
-	<para>You do not have to do anything to prevent packages from being re-downloaded. You need to remember to clean whichever stages you want to rebuild first. </para>
-	<para>e.g. to rebuild from the cached bootstrap, chroot packages and build a new image. </para>
-	<screen>$ sudo lh_clean
-$ sudo lh_build</screen>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I boot USB debian-live on systems not supporting USB boot?
-	<para>A:  Make a boot CD with grub, configured to boot from a debian-live kernel copied on the cd structure.</para>
-	<screen>$ mkdir -p iso/boot/grub
-$ cp /usr/lib/grub/i386-pc/stage2_eltorito iso/boot/grub
-$ cp chroot/boot/* iso/boot/</screen>
-	<para>Create iso/boot/grub/menu.lst  </para>
-	<screen>default 0
-timeout 5
-color cyan/blue white/blue
-title Debian Live
-root (cd)
-kernel /boot/vmlinuz boot=live
-initrd /boot/initrd.img</screen>
-<para>Create the iso image </para>
-	<screen>$ mkisofs -R -b boot/grub/stage2_eltorito -no-emul-boot \
--boot-load-size 4 -boot-info-table -o grub.iso iso</screen>
-<para>Burn the image. </para>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I boot debian-live on systems not supporting CDROM or USB boot?</para>
-	<para>A:  If you have a floppy drive, you may be able to use it, otherwise you will need to use loadlin/grub4dos/win32-loader. If you have a second system to serve up the image over the network, <ulink url="DebianLive/Howto/Creating_a_Netboot_Image"> See DebianLive/Howto/Creating_a_Netboot_Image. </ulink> FIXME LINK
-	</para>
-</listitem>
-
-<listitem>
-	<para>Q: The X configuration does not seems to work, the resolution is too low. What can I do?
-	<para>A:  Use xdebconfigurator </para>
-	<screen>$ lh_config --bootappend xdebconf
-$ lh_config --packages xdebconfigurator</screen>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: Apache has problems with static files
-	<para>A:  Sendfile does not work well on the unionfs used by Debian Live. Add the following to apache's configuration: </para>
-	<screen>EnableSendfile off</screen>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I make hard disk partitions auto-mountable?
-	<para><command>A: Short answer:</command> Right now the best is to use a script that will populate the fstab when the CD is booting. Such a script can be found <ulink url="https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-includes/sbin/diskmounter.sh"> FIXME BROKEN LINK </ulink>. A proper solution based on HAL will be described here in a hopefully near future. </para>
-	<para><command>A: Long Answer: </command> Since 55_nonpolkit-mount-policy.patch in HAL, debian-storage-policy-fixed-drives.fdi is not available anymore and the previous trick that consisted to remove this file to enable automounting of fixed drives as a consequence is obsolete.</para>
-	<para>Eventually, it will be possible to combine HAL and PolicyKit to enable different permissions and actions to achieve advanced (auto)mounting for non-root users. Until then, because the live scripts are only touching to the fstab to add a swap partition if discovered at boot time, the only way to have fixed drives mounted automatically is to use a script that will populate the fstab file at the end of the multiuser runlevel. </para>
-	<para>To achieve this, you can do, for example, the following: 
-	<para>download the  <ulink url="https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-includes/sbin/diskmounter.sh"> diskmounter.sh script FIXME BROKEN LINK </ulink> </para>
-	<para>Create the chroot_local-includes/sbin directory, and move the script inside</para>
-	<para>Make sure the script is executable (chmod +x diskmounter.sh)</para>
-	<para>create the chroot_local-includes/etc/rc.local file and call the diskmounter from there (see this   <ulink url="https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-includes/etc/rc.local"> rc.local FIXME BROKEN LINK </ulink> </para>	
-	</para>
-When called correctly, the script detects ext2, ext3, reiserfs, xfs, FAT32, HFS+ and NTFS partitions and mount them read-write, except for NTFS. This will change soon and an option will be available to use ntfs-3g to mount NTFS as read-write.
-<para>comments, patches and other things about this script and issue: http://code.goto10.org/projects/puredyne/ticket/463</para>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: Boot fails with panic: can't open /scripts/live </para>
-	<para>A:  Add latest live-initramfs deb package into config/chroot_local-packages directory and rebuild. </para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I configure the locale and the keyboard? </para>
-	<para>A:  See  <xref linkend="internalization" /> 10n</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I get past boot prompt without a working keyboard? </para>
-	<para>A:  See  <xref linkend="bootup" /> Customising the bootup process</para>
-	<note>Boot from an USB-HDD on an iMac with GRUB did not work. </note>
-</listitem>
-
-<listitem>
-	<para>Q: Can I serve the root image from a web or ftp server?
-	<para>A:  Since live-initramfs 1.99, it should be possible to use the fetch= argument on the kernel command line. You can build a netboot image as usual, and when you are done edit the tftpboot/pxelinux.cfg/default file. Remove the references to network boot (netboot, nfsroot, nfsopts), and replace with fetch= &#9001;url where you placed the root image>. </para>
-	<note>You have to include wget in the chroot. It could work for other boot methods as well. However, I am not sure the live scripts configure the network when booting from a CD or USB disk.</note>
-	<screen>$ lh_config --packages wget</screen>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: Why doesn't quickreboot (or some other boot parameter) work?
-	<para>A:  If you are building an etch image (which was the default up to 2007/09/14) you have a very old version of casper which does not support quickreboot and possibly other boot parameters as well. You could configure your sources to use live-backports (see /usr/share/live-helper/examples/sources/live-backports) and switch to live-initramfs, or better yet, build a lenny image instead, which is the new default. </para>
-	<screen>$ lh_config --distribution lenny
-$ lh_config --initramfs live-initramfs</screen>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I fix "Could not find kernel image" issue with syslinux bootloader?
-	<para>A:  Add a binary local hook script to fix kernel and initrd path each time you build an image. </para>
-	e.g. config/binary_local-hooks/01-fix_syslinux.sh 
-	<screen>#!/bin/sh
-SYSLINUXCFG=`find binary -type f -name syslinux.cfg`
-sed -i "s|kernel /vmlinuz|kernel vmlinuz|g" ${SYSLINUXCFG}
-sed -i "s|initrd=/initrd|initrd=initrd|g" ${SYSLINUXCFG}</screen>
-	<screen>$ chmod +x config/binary_local-hooks/01-fix_syslinux.sh</screen>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I use a newer kernel with lenny?
-	<para>A:  A build with backports.org kernels will fail as that repository lacks the necessary module packages (linux-modules-extra-2.6, aufs, etc.). Use the kernel backports  <ulink url="http://unsupported.debian-maintainers.org/backports-kernel/"> http://unsupported.debian-maintainers.org/backports-kernel/. </ulink> </para>
-	The quick way to success: 
-	<screen>$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6 squashfs-modules-2.6'
-
-$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.chroot
-$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.binary
-
-$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.chroot.gpg
-$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.binary.gpg
-
-$ lh_build</screen>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I use a custom kernel?
-	<para>&#9002; Is there a nice way of booting debian-live with a custom kernel (not in an apt repo)?  </para>
-	<para>A:  Copy it into config/chroot_local-packages and set LH_LINUX_PACKAGES="none" or use  lh config --linux-packages " " </para>
-	<para>Don't forget to compile your kernel with an union filesystem (unionfs or aufs), squashfs modules, and initrd support. </para>
-	<para>&#9002; I can cause the kernel to be installed but it seems this happens later than grub/syslinux is configured so it's not listed and casper/ and the menu require munging. </para>
-	 <para>You need to follow the debian scheme, e.g. placing the files in /boot as vmlinuz-$version and initrd.img-$version etc. </para>
-	 <para>I personally wouldn't go that way which is too much of a hassle, and just use make-kpkg to produce custom kernel deb packages. They should integrate nicely if you just put them into config/chroot_local-packages and set LH_LINUX_PACKAGES="". </para>
-	   <para><emphasis>Hint:</emphasis>  to work around an error, which lh_binary_syslinux will throw on custom kernels if there is not an 468/686 in the kernel-name, you need to set CONFIG_LOCALVERSION="-486" or "-686" within the kernel configuration (-> General setup -> Local version set to -486 or -686) corresponding to LH_LINUX_FLAVOURS="" or "686". this at least up till live-helper version 1.0~a40-1</para>
-	  see 
-	   <para><ulink url="http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-July/001947.html"> http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-July/001947.html</ulink>  </para> and
-	    <para><ulink url="http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-November/002581.html">http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-November/002581.html</ulink></para>
-
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I create a cross arch live CD image?
-	<para><command>A: In short:</command> You can't. Read on:  </para>
-	<para>The procedure to create a live CD is based on creating a chroot that contains the files that will be finally available on the live CD. The live CD building procedure includes chrooting into the chroot dir and so some operations. chrooting means that the terminal you chroot on will behave as a different system so your real system and the chroot environment is decoupled somehow.</para>
-	<para>Once the live CD scripts chroots into the chroot dir they have some operations to do inside that environment and your real system won't be able to run them unless you are using the same architecture.</para>
-	<para>So you only are able to make live CD for the arch you run on. But this doesn't prevent you run qemu or some other machine emulator that make this possible.</para>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: When is a lh_clean necessary?
-	<para>lh_clean is a script in /usr/bin/ </para>
-	<para>A: That depends what you've changed between builds
-	<para>If, for example, you've built an iso image and you want a usb image, you only need to run <command> lh_clean --binary </command> before you run lh_build again. </para>
-	<para>If you've <command> changed anything in the chroot </command> , you'll need to cleanup both chroot and binary with  <command> lh_clean </command>before continuing </para>
-	</para>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Q: How can i set boot= parameters?</para>
-	<para>A: Set LH_BOOTAPPEND_LIVE in config/binary </para>
-
-</listitem>
-
-<listitem>
-	<para>Q: How do I include different modules to load when the live system boots?
-	<para>A: Configure config/chroot_local-includes/etc/initramfs-tools/ </para>
-	<para>The lh_chroot_hacks helper rebuilds the live/initrd1.img using the default initramfs.conf "MODULES = most". You may override that by supplying your own initramfs.conf, or else just add your own modules, e.g. </para>
-	<screen>mkdir -p config/chroot_local-includes/etc/initramfs-tools/
-echo "atl2" >> config/chroot_local-includes/etc/initramfs-tools/modules</screen>
-<note>Even though initramfs.conf(5) says "most adds all the framebuffer, acpi, file system, ide, sata, scsi and usb drivers", it actually includes network drivers as well. See auto_add_modules() in /usr/share/initramfs-tools/hook-functions for the complete list. </note>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: Can I have a splash screen?
-	<para>A:  Yes you can </para>
-	You will not know what is going on when the splash screen is active, it may fail to activate on some hardware or break X on other (both usplash and splashy use libdirectfb which does some evil voodoo and may break you graphics or input until you reboot). However, you can install and activate it just as you would on any other Debian system.
-	<para>To use splashy: </para>
-	<para> 1) install splashy and read the README, the manpages are useless for setting it up. Add some parameters to your kernel command line, such as in your pxelinux configuration or in LH_BOOTAPPEND_LIVE in config/binary in debian-live configuration: </para>
-	<screen>vga=792 splash quiet</screen>
-	<para><filename>vga </filename>to select video mode, <filename>splash </filename>to activate splashy, <filename>quiet</filename> to suppress most kernel messages that you cannot see anyway but would scroll past before splashy manages to paint the graphics on your screen.</para>
-	You might want to add splashy to the list of packages installed in your image: 
-	<screen>echo splashy > config/chroot_local-packageslists/splashy
-echo splashy-themes >> config/chroot_local-packageslists/splashy</screen>
-<para>and select a theme:</para>
-	<screen>echo '#!/bin/sh' > config/chroot_local-hooks/splashy
-echo splashy_config -s debian-moreblue '||' true >> config/chroot_local-hooks/splashy
-# update the ramdisk to include the splash screen
-echo update-initramfs -u -k all >> config/chroot_local-hooks/splashy
-chmod 755 config/chroot_local-hooks/splashy 	</screen>
-<para> After you rebuild your live system you should observe a bluish splash screen while booting. Nothing happens while initramfs is running because there is no splashy support in initramfs-tools. Once the init starts the progress bar should start to fill.</para>
-<para>If <filename> vga=something</filename> sets a mode that your screen cannot show or your card cannot do vesa 2.0 (and thus you get plain text mode and no splashy) read the splashy faq.</para>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: Howto use my Broadcom eXtrem 2 network card (module bnx2) ?
-	<para>A: Add the firmwares to the initrd image. </para>
-	<para>You need to install the non-free package "firmware-bnx2". Uncompress your initrd image, then copy files : </para>
-	<screen>cp /lib/firmware/bnx2* ${INITRD}/lib/firmware/
-cp /lib/udev/firmware.agent ${INITRD}/lib/udev/</screen>
-Recompress your initrd image and boot: it works ! 
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: X is broken (the system boots, messages scroll by, and then the screen goes blank). What do I do?
-	<para>On my system starting X completely disables graphics so that I do not see anything even after X bails out and I am back to the console. To prevent this you can change the driver Xorg uses.</para>
-	<para>If you have a working splash screen or at least graphical console you can use </para>
-	<filename>live xdriver=fbdev</filename>
-	<para>when booting the live system (instead of just enter). </para>
-	Another driver you might want to try is <filename> vesa. </filename>
-	<para>If all fails you might try to set xdriver to some wrong value so that Xorg fails to start and you can examine the system while you still see something on the console. </para>
-	<filename>live xdriver=none</filename>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How can I get Debian first stable versions?</para>
-	<para>I'm developing software and testing it on Live-CD. Thanks for the LiveCD project. To be sure my development is fully compatible with the "etch" version, I need the same scenario when Debian GNU/Linux 4.0 was published as stable (I believe 2007.04.08). If there was some bug on 2007.04.08 that was corrected one week later, I need to test software foreseeing that scenario without the bug solved.</para>
-</listitem>
-
-<listitem>
-	<para>Q: I get "fopen: Permission denied"-warnings from apt on building/at the live-system</para>
-	<para>That's a harmless bug in apt. However, if you want to get off this warnings in the live-system, add a file in chroot_local-hooks with follow row: </para>
-	<screen> chown -R man.man /var/cache/man </screen>
-</listitem>
-
-<listitem>
-	<para>Q: Why I always fail during "Retrieving Packages" stage when running lh_build? I have already set apt-http-proxy and so on.</para>
-	<para>A:  lh_build retrieves packages via wget, as a result you need to enable the proxy settings in /etc/wgetrc before running lh_build.</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I edit Xorg.conf?
-	<para>A:  Xorg.conf is generated every time system boots, so it's useless to put modifed Xorg.conf in config/choort_local-includes/etc/X11, because it will be overwritten during boot. However, you can edit /usr/bin/dexconf, which generate xorg.conf during boot, so the result will be modified Xorg.conf. The modified dexconf has to be put in config/choort_local-includes/usr/bin. e.g.: you can configure Xorg.conf for two or more keyboards layouts with alt+shift toggle by editing dexconf and replacing the line:</para>
-	<screen>Option          "XkbLayout"     "$XKB_LAYOUT"</screen>
-	<para>with the lines: </para>
-	<screen>Option             "XkbLayout"     "us,il"
-Option             "XkbOptions"   "grp:alt_shift_toggle,grp_led:scroll"</screen>
-	<para>when "us,il" are the wanted keyboard layouts.</para>
-	<para>You can force default screen resulotion (e.g. 1024*768) by adding the lines: .</para>
-	<screen>  SubSection     "Display"
-               Modes  "1024x768"
-               EndSubSection</screen>
-       	<para>between the lines:</para>
-	<screen>  Section "Screen"
-        Identifier      "Default Screen"
-        Monitor         "Configured Monitor"
-            . . . . . . .
-SECTION
-printf "EndSection\n" &#9002; &amp;4</screen>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: Where are the build parameters for the prebuilt images</para>
-	<para>A: See <ulink url="http://live.debian.net/README.images">http://live.debian.net/README.images.</ulink></para>
-</listitem>
-
-</itemizedlist>
-
+  <title>Frequently asked questions (FAQ)</title>
+  <itemizedlist>
+    <listitem>
+      <para>Q: I downloaded a prebuilt live image. How do I put it on a USB stick?</para>
+      <para>A: See <xref linkend="image_copying"/> "Copying USB/HDD image to a USB stick"</para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I log my build?</para>
+      <para>A: You could use script, screen or tee: <screen>$ lh_build 2&gt;&amp;1 | tee build.log</screen> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How can I convert an already installed standard Debian partition into a Debian Live system?</para>
+      <para>A: Save the list of installed packages and load it into your new Debian Live System. Copy your /etc to config/chroot_local-includes</para>
+    </listitem>
+    <listitem>
+      <para>Q: What does 'losetup: could not find any free loop device' mean and how do I fix it?</para>
+      <para>A: Loop devices are used during the build; there probably aren't any free if you've aborted several builds. Something like: for l in /dev/loop0 /dev/loop1 /dev/loop2 /dev/loop3 /dev/loop4 /dev/loop5 /dev/loop6 /dev/loop7 ; do losetup -d $l ; done should rectify the situation (assuming all loop devices in use were created by lh_build; if in doubt, check the contents of each loop device before deleting them with losetup -d).</para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I launch an interactive shell during the chroot stage?</para>
+      <para>A: To enable interactive shell: <screen>$ lh_config --interactive shell</screen> To continue the build process: <screen># logout</screen> or <screen># exit</screen> To disable interactive shell, set LH_INTERACTIVE to "disabled" in config/chroot. </para>
+    </listitem>
+    <listitem>
+      <para>Q: What is the root /user password?</para>
+      <para>A: The user password for the live user is 'live'. By default, there is not any root password. You can switch to root with <screen> sudo -i </screen> or set a password for root with <screen>sudo passwd</screen></para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I change root or any user password?</para>
+      <para>A: Add a chroot local hook script to change root or any user password each time you build an image.</para>
+      <para>e.g. config/chroot_local-hooks/01-update_password.sh to set root password to "nopasswd"</para>
+      <para><screen>#!/bin/sh echo "I: update password" echo "root:nopasswd" | chpasswd</screen><screen>$ chmod +x config/chroot_local-hooks/01-update_password.sh</screen><note>For live user; you need to copy the /usr/share/initramfs-tools/scripts/live-bottom/10adduser your build folder: <screen>mkdir -p config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/ cp /usr/share/initramfs-tools/scripts/live-bottom/10adduser config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/</screen></note> Then edit the config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/10adduser and paste in the new user_crypted password that you make with: <screen> echo "newlivepass" | mkpasswd -s.</screen> <para> Or add an hook file in config/chroot_local-hooks/ with something like the below: </para> <screen> #!/bin/sh # Change the autogenerated user password to "debianlive" plain_password="debianlive" password=$(echo "${plain_password}" | mkp
 asswd -s) sed -i -e 's/\(user_crypted=\)\(.*\)\( #.*\)/\1\"'${password}'\"\3/' /usr/share/initramfs-tools/scripts/live-bottom/10adduser update-initramfs -tu -kall</screen> <para> The latter (hook model) could be more future proof than the former solution since it modifies just one string selectively but it requires the package "whois" to be installed on the target system (for mkpasswd) or that you generate the $password string not at build time and include it crypted in the above script. </para> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How to disable autologin?</para>
+      <para>A1: use the commandline parameter <screen>lh config --bootappend-live "noautologin"</screen> <para>A2: You need to set boot=noautologin noxautologin as described in man <filename>live-initramfs</filename> If you boot via TFTP you want to insert the option to pxelinux.cfg/default</para> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I change default hostname or username?</para>
+      <para>A: To change default hostname or username: <screen>$ lh_config --hostname myhostname $ lh_config --username myusername</screen> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I make the final image smaller?</para>
+      <para>A: Clean orphaned apps/libs: Install package "deborphan" and then run 'sudo deborphan -n' . Delete unwanted packages. Remove the apt cache. Purge unwanted locales (see "localepurge" package). </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I customize bash-config permanently (aliases, bash-completion etc.)?</para>
+      <para>A: Add your own .bashrc config/chroot_local-includes/etc/skel/.bashrc</para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I disable services permanently? (Be careful!)</para>
+      <para> A: Add a chroot local hook script to disable a service each time you build an image: </para>
+      <para>e.g. config/chroot_local-hooks/01-disable_service.sh <screen>#!/bin/sh echo "I: disable service" update-rc.d -f 〈service name 〉 remove </screen> <screen> $ chmod +x config/chroot_local-hooks/01-disable_service.sh </screen> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I enable | disable the md5checksum at the ISO building? <screen>lh_config --checksums enabled|disabled </screen> Or change the LH_CHECKSUMS value. </para>
+    </listitem>
+    <listitem>
+      <para>Q: How to disable the generation of the .tar.gz file? <screen>lh_config --net-tarball none|gzip </screen> Or change the LH_NET_TARBALL value. (only available in snapsshot version at the moment 2008/Feb/28) </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I "build a new image" ?</para>
+      <para> A: Run commands: <screen>$ sudo lh_clean --binary $ sudo lh_build </screen> <emphasis>Hint:</emphasis> If the configuration had changed you should leave "--binary" out. This will clean your chroot directory too. </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I use Fluxbox ? <para>A: Add a new lists file with the fluxbox packages you want. </para> <para>Create /home/$USERNAME/.dmrc file (default username is "user").</para> <screen>$ cat .dmrc [Desktop] Session=fluxbox</screen> <note>.dmrc is owned by $USERNAME:$USERNAME. </note> <para>See also <ulink url="http://wiki.debian.org/Fluxbox/">http://wiki.debian.org/Fluxbox</ulink></para> <para> A short HOWTO can be found here: <ulink url=" http://wiki.debian.org/MichaelAblassmeier/CustomLiveCD"> http://wiki.debian.org/MichaelAblassmeier/CustomLiveCD</ulink></para> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I use custom repositories?</para>
+      <para>A: <ulink url="http://wiki.debian.org/DebianLive/Configuration">See DebianLive/Configuration.</ulink></para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I customize the artwork for the live CD (grub or syslinux boot splash, usplash, etc.)?</para>
+      <para>A: <ulink url="http://wiki.debian.org/DebianLive/Howto/Custom_Artwork"> See DebianLive/Howto/Custom_Artwork. </ulink> FIXME: NEED TO UPDATE</para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I customize desktop environment (KDE, GNOME, XFCE, etc...) look? <para>A: Start the live system in qemu: </para> <screen>$ qemu -m 256 -cdrom binary.iso -boot d -redir tcp:4222:10.0.2.15:22</screen> <note>the -redir argument must be changed to meet your needs </note> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I execute a custom shell script inside the chroot system after the chroot stage?</para>
+      <para>A: Add your script in config/chroot_local-hooks. </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I add a script running immediately after all other scripts when the live system boots? <para>A: Add your script in config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/99script </para> <screen>$ chmod +x config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/99script</screen> <note>The hook script must be executable. Do not forget to lh_clean --chroot after making this change before you build again. </note> <para>You must also use the example script /usr/share/live-helper/examples/hooks/update-initramfs.sh to ensure your script gets built into the initramfs (read the comment header for instructions). </para> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I add software not in Debian ?</para>
+      <para>A: See <xref linkend="packages"/> Customising package installation</para>
+    </listitem>
+    <listitem>
+      <para>Q: What is the manifest with Ubuntu used for?</para>
+      <para>A: Manifest is just the package list, which ubuntu does $something with. Don't worry about it. </para>
+    </listitem>
+    <listitem>
+      <para>Q: What is this {p} syntax with mtools{p} and parted{p} ?</para>
+      <para>A: That's aptitude. </para>
+    </listitem>
+    <listitem>
+      <para>Q: Do I need to write the image on USB stick to test it? <note>you must use qemu &gt;= 0.8. </note> </para>
+    </listitem>
+    <listitem>
+      <para>Q: What is /cow ?</para>
+      <para>A: Copy-on-write, the 'diff' from unionfs. </para>
+    </listitem>
+    <listitem>
+      <para>Q: Is /usr/share/live-helper/lists/standard-x11 like preseed or is preseed something else entirely?</para>
+      <para>A: It is not. It is a package list, not a debconf preseeding. </para>
+    </listitem>
+    <listitem>
+      <para>Q: What is the difference between standard and minimal? <para>standard: packages of priority standard and higher;</para> <para>minimal: packages of priority essential and higher; </para> </para>
+    </listitem>
+    <listitem>
+      <para>Q: What can the sections be used for? Aren't they BIG?</para>
+      <para>A: Someone maybe wants to include packages from contrib or non-free. </para>
+    </listitem>
+    <listitem>
+      <para>Q: memtest86+ ... is that used?</para>
+      <para>A: Yes </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I build using predefined packages lists? <para>A: e.g. to build using standard-x11 packages list: </para> <screen>$ sudo lh_config -p standard-x11 $ sudo lh_build</screen> <note>The packages lists can be found in /usr/share/live-helper/lists/ directory. </note> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I rebuild without downloading all the packages again? <para>A: All packages are cached in cache subdirectory. They remain until a clean purge: </para> <screen>$ sudo lh_clean --purge</screen> <para>You do not have to do anything to prevent packages from being re-downloaded. You need to remember to clean whichever stages you want to rebuild first. </para> <para>e.g. to rebuild from the cached bootstrap, chroot packages and build a new image. </para> <screen>$ sudo lh_clean $ sudo lh_build</screen> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I boot USB debian-live on systems not supporting USB boot? <para>A: Make a boot CD with grub, configured to boot from a debian-live kernel copied on the cd structure.</para> <screen>$ mkdir -p iso/boot/grub $ cp /usr/lib/grub/i386-pc/stage2_eltorito iso/boot/grub $ cp chroot/boot/* iso/boot/</screen> <para>Create iso/boot/grub/menu.lst </para> <screen>default 0 timeout 5 color cyan/blue white/blue title Debian Live root (cd) kernel /boot/vmlinuz boot=live initrd /boot/initrd.img</screen> <para>Create the iso image </para> <screen>$ mkisofs -R -b boot/grub/stage2_eltorito -no-emul-boot \ -boot-load-size 4 -boot-info-table -o grub.iso iso</screen> <para>Burn the image. </para> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I boot debian-live on systems not supporting CDROM or USB boot?</para>
+      <para>A: If you have a floppy drive, you may be able to use it, otherwise you will need to use loadlin/grub4dos/win32-loader. If you have a second system to serve up the image over the network, <ulink url="DebianLive/Howto/Creating_a_Netboot_Image"> See DebianLive/Howto/Creating_a_Netboot_Image. </ulink> FIXME LINK </para>
+    </listitem>
+    <listitem>
+      <para>Q: The X configuration does not seems to work, the resolution is too low. What can I do? <para>A: Use xdebconfigurator </para> <screen>$ lh_config --bootappend xdebconf $ lh_config --packages xdebconfigurator</screen> </para>
+    </listitem>
+    <listitem>
+      <para>Q: Apache has problems with static files <para>A: Sendfile does not work well on the unionfs used by Debian Live. Add the following to apache's configuration: </para> <screen>EnableSendfile off</screen> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I make hard disk partitions auto-mountable? <para><command>A: Short answer:</command> Right now the best is to use a script that will populate the fstab when the CD is booting. Such a script can be found <ulink url="https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-includes/sbin/diskmounter.sh"> FIXME BROKEN LINK </ulink>. A proper solution based on HAL will be described here in a hopefully near future. </para> <para><command>A: Long Answer: </command> Since 55_nonpolkit-mount-policy.patch in HAL, debian-storage-policy-fixed-drives.fdi is not available anymore and the previous trick that consisted to remove this file to enable automounting of fixed drives as a consequence is obsolete.</para> <para>Eventually, it will be possible to combine HAL and PolicyKit to enable different permissions and actions to achieve advanced (auto)mounting for non-root users. Until then, because the live scripts are only touching to the fstab to add a swap
  partition if discovered at boot time, the only way to have fixed drives mounted automatically is to use a script that will populate the fstab file at the end of the multiuser runlevel. </para> <para>To achieve this, you can do, for example, the following: <para>download the <ulink url="https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-includes/sbin/diskmounter.sh"> diskmounter.sh script FIXME BROKEN LINK </ulink> </para> <para>Create the chroot_local-includes/sbin directory, and move the script inside</para> <para>Make sure the script is executable (chmod +x diskmounter.sh)</para> <para>create the chroot_local-includes/etc/rc.local file and call the diskmounter from there (see this <ulink url="https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-includes/etc/rc.local"> rc.local FIXME BROKEN LINK </ulink> </para> </para> When called correctly, the script detects ext2, ext3, reiserfs, xfs, FAT32, HFS+ and NTFS partitions and mount them read-
 write, except for NTFS. This will change soon and an option will be available to use ntfs-3g to mount NTFS as read-write. <para>comments, patches and other things about this script and issue: http://code.goto10.org/projects/puredyne/ticket/463</para> </para>
+    </listitem>
+    <listitem>
+      <para>Q: Boot fails with panic: can't open /scripts/live </para>
+      <para>A: Add latest live-initramfs deb package into config/chroot_local-packages directory and rebuild. </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I configure the locale and the keyboard? </para>
+      <para>A: See <xref linkend="internalization"/> 10n</para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I get past boot prompt without a working keyboard? </para>
+      <para>A: See <xref linkend="bootup"/> Customising the bootup process</para>
+      <note>Boot from an USB-HDD on an iMac with GRUB did not work. </note>
+    </listitem>
+    <listitem>
+      <para>Q: Can I serve the root image from a web or ftp server? <para>A: Since live-initramfs 1.99, it should be possible to use the fetch= argument on the kernel command line. You can build a netboot image as usual, and when you are done edit the tftpboot/pxelinux.cfg/default file. Remove the references to network boot (netboot, nfsroot, nfsopts), and replace with fetch= 〈url where you placed the root image&gt;. </para> <note>You have to include wget in the chroot. It could work for other boot methods as well. However, I am not sure the live scripts configure the network when booting from a CD or USB disk.</note> <screen>$ lh_config --packages wget</screen> </para>
+    </listitem>
+    <listitem>
+      <para>Q: Why doesn't quickreboot (or some other boot parameter) work? <para>A: If you are building an etch image (which was the default up to 2007/09/14) you have a very old version of casper which does not support quickreboot and possibly other boot parameters as well. You could configure your sources to use live-backports (see /usr/share/live-helper/examples/sources/live-backports) and switch to live-initramfs, or better yet, build a lenny image instead, which is the new default. </para> <screen>$ lh_config --distribution lenny $ lh_config --initramfs live-initramfs</screen> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I fix "Could not find kernel image" issue with syslinux bootloader? <para>A: Add a binary local hook script to fix kernel and initrd path each time you build an image. </para> e.g. config/binary_local-hooks/01-fix_syslinux.sh <screen>#!/bin/sh SYSLINUXCFG=`find binary -type f -name syslinux.cfg` sed -i "s|kernel /vmlinuz|kernel vmlinuz|g" ${SYSLINUXCFG} sed -i "s|initrd=/initrd|initrd=initrd|g" ${SYSLINUXCFG}</screen> <screen>$ chmod +x config/binary_local-hooks/01-fix_syslinux.sh</screen> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I use a newer kernel with lenny? <para>A: A build with backports.org kernels will fail as that repository lacks the necessary module packages (linux-modules-extra-2.6, aufs, etc.). Use the kernel backports <ulink url="http://unsupported.debian-maintainers.org/backports-kernel/"> http://unsupported.debian-maintainers.org/backports-kernel/. </ulink> </para> The quick way to success: <screen>$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6 squashfs-modules-2.6' $ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' &gt; config/chroot_sources/backports-kernel.chroot $ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' &gt; config/chroot_sources/backports-kernel.binary $ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.chroot.gpg $ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_so
 urces/backports-kernel.binary.gpg $ lh_build</screen> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I use a custom kernel? <para>〉 Is there a nice way of booting debian-live with a custom kernel (not in an apt repo)? </para> <para>A: Copy it into config/chroot_local-packages and set LH_LINUX_PACKAGES="none" or use lh config --linux-packages " " </para> <para>Don't forget to compile your kernel with an union filesystem (unionfs or aufs), squashfs modules, and initrd support. </para> <para>〉 I can cause the kernel to be installed but it seems this happens later than grub/syslinux is configured so it's not listed and casper/ and the menu require munging. </para> <para>You need to follow the debian scheme, e.g. placing the files in /boot as vmlinuz-$version and initrd.img-$version etc. </para> <para>I personally wouldn't go that way which is too much of a hassle, and just use make-kpkg to produce custom kernel deb packages. They should integrate nicely if you just put them into config/chroot_local-packages and set LH_LINUX_PACKAGES="". </para> <para><
 emphasis>Hint:</emphasis> to work around an error, which lh_binary_syslinux will throw on custom kernels if there is not an 468/686 in the kernel-name, you need to set CONFIG_LOCALVERSION="-486" or "-686" within the kernel configuration (-&gt; General setup -&gt; Local version set to -486 or -686) corresponding to LH_LINUX_FLAVOURS="" or "686". this at least up till live-helper version 1.0~a40-1</para> see <para><ulink url="http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-July/001947.html"> http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-July/001947.html</ulink></para> and <para><ulink url="http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-November/002581.html">http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-November/002581.html</ulink></para> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I create a cross arch live CD image? <para><command>A: In short:</command> You can't. Read on: </para> <para>The procedure to create a live CD is based on creating a chroot that contains the files that will be finally available on the live CD. The live CD building procedure includes chrooting into the chroot dir and so some operations. chrooting means that the terminal you chroot on will behave as a different system so your real system and the chroot environment is decoupled somehow.</para> <para>Once the live CD scripts chroots into the chroot dir they have some operations to do inside that environment and your real system won't be able to run them unless you are using the same architecture.</para> <para>So you only are able to make live CD for the arch you run on. But this doesn't prevent you run qemu or some other machine emulator that make this possible.</para> </para>
+    </listitem>
+    <listitem>
+      <para>Q: When is a lh_clean necessary? <para>lh_clean is a script in /usr/bin/ </para> <para>A: That depends what you've changed between builds <para>If, for example, you've built an iso image and you want a usb image, you only need to run <command> lh_clean --binary </command> before you run lh_build again. </para> <para>If you've <command> changed anything in the chroot </command> , you'll need to cleanup both chroot and binary with <command> lh_clean </command>before continuing </para> </para> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How can i set boot= parameters?</para>
+      <para>A: Set LH_BOOTAPPEND_LIVE in config/binary </para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I include different modules to load when the live system boots? <para>A: Configure config/chroot_local-includes/etc/initramfs-tools/ </para> <para>The lh_chroot_hacks helper rebuilds the live/initrd1.img using the default initramfs.conf "MODULES = most". You may override that by supplying your own initramfs.conf, or else just add your own modules, e.g. </para> <screen>mkdir -p config/chroot_local-includes/etc/initramfs-tools/ echo "atl2" &gt;&gt; config/chroot_local-includes/etc/initramfs-tools/modules</screen> <note>Even though initramfs.conf(5) says "most adds all the framebuffer, acpi, file system, ide, sata, scsi and usb drivers", it actually includes network drivers as well. See auto_add_modules() in /usr/share/initramfs-tools/hook-functions for the complete list. </note> </para>
+    </listitem>
+    <listitem>
+      <para>Q: Can I have a splash screen? <para>A: Yes you can </para> You will not know what is going on when the splash screen is active, it may fail to activate on some hardware or break X on other (both usplash and splashy use libdirectfb which does some evil voodoo and may break you graphics or input until you reboot). However, you can install and activate it just as you would on any other Debian system. <para>To use splashy: </para> <para> 1) install splashy and read the README, the manpages are useless for setting it up. Add some parameters to your kernel command line, such as in your pxelinux configuration or in LH_BOOTAPPEND_LIVE in config/binary in debian-live configuration: </para> <screen>vga=792 splash quiet</screen> <para><filename>vga </filename>to select video mode, <filename>splash </filename>to activate splashy, <filename>quiet</filename> to suppress most kernel messages that you cannot see anyway but would scroll past before splashy manages to paint the g
 raphics on your screen.</para> You might want to add splashy to the list of packages installed in your image: <screen>echo splashy &gt; config/chroot_local-packageslists/splashy echo splashy-themes &gt;&gt; config/chroot_local-packageslists/splashy</screen> <para>and select a theme:</para> <screen>echo '#!/bin/sh' &gt; config/chroot_local-hooks/splashy echo splashy_config -s debian-moreblue '||' true &gt;&gt; config/chroot_local-hooks/splashy # update the ramdisk to include the splash screen echo update-initramfs -u -k all &gt;&gt; config/chroot_local-hooks/splashy chmod 755 config/chroot_local-hooks/splashy </screen> <para> After you rebuild your live system you should observe a bluish splash screen while booting. Nothing happens while initramfs is running because there is no splashy support in initramfs-tools. Once the init starts the progress bar should start to fill.</para> <para>If <filename> vga=something</filename> sets a mode that your screen cannot show or your card
  cannot do vesa 2.0 (and thus you get plain text mode and no splashy) read the splashy faq.</para> </para>
+    </listitem>
+    <listitem>
+      <para>Q: Howto use my Broadcom eXtrem 2 network card (module bnx2) ? <para>A: Add the firmwares to the initrd image. </para> <para>You need to install the non-free package "firmware-bnx2". Uncompress your initrd image, then copy files : </para> <screen>cp /lib/firmware/bnx2* ${INITRD}/lib/firmware/ cp /lib/udev/firmware.agent ${INITRD}/lib/udev/</screen> Recompress your initrd image and boot: it works ! </para>
+    </listitem>
+    <listitem>
+      <para>Q: X is broken (the system boots, messages scroll by, and then the screen goes blank). What do I do? <para>On my system starting X completely disables graphics so that I do not see anything even after X bails out and I am back to the console. To prevent this you can change the driver Xorg uses.</para> <para>If you have a working splash screen or at least graphical console you can use </para> <filename>live xdriver=fbdev</filename> <para>when booting the live system (instead of just enter). </para> Another driver you might want to try is <filename> vesa. </filename> <para>If all fails you might try to set xdriver to some wrong value so that Xorg fails to start and you can examine the system while you still see something on the console. </para> <filename>live xdriver=none</filename> </para>
+    </listitem>
+    <listitem>
+      <para>Q: How can I get Debian first stable versions?</para>
+      <para>I'm developing software and testing it on Live-CD. Thanks for the LiveCD project. To be sure my development is fully compatible with the "etch" version, I need the same scenario when Debian GNU/Linux 4.0 was published as stable (I believe 2007.04.08). If there was some bug on 2007.04.08 that was corrected one week later, I need to test software foreseeing that scenario without the bug solved.</para>
+    </listitem>
+    <listitem>
+      <para>Q: I get "fopen: Permission denied"-warnings from apt on building/at the live-system</para>
+      <para>That's a harmless bug in apt. However, if you want to get off this warnings in the live-system, add a file in chroot_local-hooks with follow row: </para>
+      <screen> chown -R man.man /var/cache/man </screen>
+    </listitem>
+    <listitem>
+      <para>Q: Why I always fail during "Retrieving Packages" stage when running lh_build? I have already set apt-http-proxy and so on.</para>
+      <para>A: lh_build retrieves packages via wget, as a result you need to enable the proxy settings in /etc/wgetrc before running lh_build.</para>
+    </listitem>
+    <listitem>
+      <para>Q: How do I edit Xorg.conf? <para>A: Xorg.conf is generated every time system boots, so it's useless to put modifed Xorg.conf in config/choort_local-includes/etc/X11, because it will be overwritten during boot. However, you can edit /usr/bin/dexconf, which generate xorg.conf during boot, so the result will be modified Xorg.conf. The modified dexconf has to be put in config/choort_local-includes/usr/bin. e.g.: you can configure Xorg.conf for two or more keyboards layouts with alt+shift toggle by editing dexconf and replacing the line:</para> <screen>Option "XkbLayout" "$XKB_LAYOUT"</screen> <para>with the lines: </para> <screen>Option "XkbLayout" "us,il" Option "XkbOptions" "grp:alt_shift_toggle,grp_led:scroll"</screen> <para>when "us,il" are the wanted keyboard layouts.</para> <para>You can force default screen resulotion (e.g. 1024*768) by adding the lines: .</para> <screen> SubSection "Display" Modes "1024x768" EndSubSection</screen> <para>between the lines:</p
 ara> <screen> Section "Screen" Identifier "Default Screen" Monitor "Configured Monitor" . . . . . . . SECTION printf "EndSection\n" 〉 &amp;4</screen> </para>
+    </listitem>
+    <listitem>
+      <para>Q: Where are the build parameters for the prebuilt images</para>
+      <para>A: See <ulink url="http://live.debian.net/README.images">http://live.debian.net/README.images.</ulink></para>
+    </listitem>
+  </itemizedlist>
 </chapter>
diff --git a/manual/en/index.xml b/manual/en/index.xml
index efce322..e8bc498 100644
--- a/manual/en/index.xml
+++ b/manual/en/index.xml
@@ -1,74 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-  <!ENTITY pubdate "2010-06-06">
-  <!ENTITY version "2.0~a1">
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
+<!ENTITY pubdate "2010-06-06">
+<!ENTITY version "2.0~a1">
 ]>
 <book lang="en">
-
-<title>Debian Live Manual</title>
-<bookinfo>
-<author>
- <othername>The Debian Live Project</othername>
- <email>debian-live at lists.debian.org</email>
-</author>
-
-<releaseinfo>&version;</releaseinfo>
-<pubdate>&pubdate;</pubdate>
-
-<copyright>
- <year>2008-2010</year>
- <holder>The Debian Live Project</holder>
-</copyright>
-
-<legalnotice>
-<para>
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-</para>
-<para>
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-</para>
-<para>
-A copy of the GNU General Public License is available as
-<filename>/usr/share/common-licenses/GPL</filename> in the Debian GNU/Linux
-distribution or on the World Wide Web at
-<ulink url="http://www.gnu.org/copyleft/gpl.html">the GNU web site</ulink>.
-You can also obtain it by writing to the Free Software Foundation, Inc., 59
-Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-</para>
-<para>
-If you want to print this reference, this document is also available in Portable
-Document Format (PDF).
-</para>
-</legalnotice>
-</bookinfo>
-
-<!-- Chapters -->
-<xi:include href="about.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="installation.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="basics.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="overview.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="customization.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="common-tasks.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="live-environment.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="faq.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="reporting-bugs.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="coding-style.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="procedures.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="resources.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="use-cases.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="success-stories.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="troubleshooting.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-
-<!-- Appendecis -->
-<xi:include href="appendices_configuration-layout.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="appendices_configuration-files.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-
+  <title>Debian Live Manual</title>
+  <bookinfo>
+    <author>
+      <othername>The Debian Live Project</othername>
+      <email>debian-live at lists.debian.org</email>
+    </author>
+    <releaseinfo>&version;</releaseinfo>
+    <pubdate>&pubdate;</pubdate>
+    <copyright>
+      <year>2008-2010</year>
+      <holder>The Debian Live Project</holder>
+    </copyright>
+    <legalnotice>
+      <para> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. </para>
+      <para> This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. </para>
+      <para> A copy of the GNU General Public License is available as <filename>/usr/share/common-licenses/GPL</filename> in the Debian GNU/Linux distribution or on the World Wide Web at <ulink url="http://www.gnu.org/copyleft/gpl.html">the GNU web site</ulink>. You can also obtain it by writing to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. </para>
+      <para> If you want to print this reference, this document is also available in Portable Document Format (PDF). </para>
+    </legalnotice>
+  </bookinfo>
+  <!-- Chapters -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="about.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="installation.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="basics.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="overview.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="customization.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common-tasks.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="live-environment.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="faq.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="reporting-bugs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="coding-style.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="procedures.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="resources.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="use-cases.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="success-stories.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="troubleshooting.xml"/>
+  <!-- Appendecis -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices_configuration-layout.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices_configuration-files.xml"/>
 </book>
diff --git a/manual/en/installation.xml b/manual/en/installation.xml
index 89d63f0..db07f5b 100644
--- a/manual/en/installation.xml
+++ b/manual/en/installation.xml
@@ -1,134 +1,118 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <chapter id="installation">
-<title>Installation</title>
-
-<section>
-<title>Requirements</title>
-
-<para>Building Debian Live images has very few system requirements:</para>
-
-<orderedlist>
-<listitem><para>Super user (root) access</para></listitem>
-<listitem><para>An up-to-date version of &live-helper;</para></listitem>
-<listitem><para>A POSIX-compliant shell, such as <command>bash</command> or <command>dash</command>.</para></listitem>
-<listitem><para><command>debootstrap</command> or <command>cdebootstrap</command></para></listitem>
-<listitem><para>Linux 2.6.x</para></listitem>
-</orderedlist>
-
-<para>Note that using Debian or a Debian-derived distribution is not required - &live-helper; will run on almost any operating system with the above requirements.</para>
-
-</section>
-
-<section>
-<title>Installing &live-helper;</title>
-
-<para>You can install &live-helper; in a number of different ways:</para>
-
-<orderedlist>
-<listitem><para>From the Debian repository</para></listitem>
-<listitem><para>From source</para></listitem>
-<listitem><para>From snapshots</para></listitem>
-<listitem><para>From backports.org</para></listitem>
-</orderedlist>
-
-<para>If you are using &lenny; or &sid; the recommended way is to install &live-helper; via the Debian repository.</para>
-
-<section>
-<title>From the Debian repository</title>
-
-<para>Simply install &live-helper; like any other package:</para>
-<screen># apt-get install live-helper</screen>
-<para>or</para>
-<screen># aptitude install live-helper</screen>
-
-</section>
-
-<section>
-<title>From source</title>
-
-<para>&live-helper; is developed using the Git version control system. On Debian systems, this is provided by the <command>git-core</command> package. To check out the latest code, execute:</para>
-<screen>$ git clone git://live.debian.net/git/live-helper.git</screen>
-<para>You can build and install your own Debian package by executing:</para>
-<screen>
- $ cd live-helper
- $ dpkg-buildpackage -rfakeroot -b -uc -us
- $ cd ..
- # dpkg -i live-helper*.deb
-</screen>
-<para>You can also use a local version of &live-helper; without installation:</para>
-<screen># live-helper/helpers/lh_local</screen>
-<para>Subsequent calls to <filename>lh_</filename>-prefixed helpers in that shell environment will then use the version located in the directory you executed <filename>lh_local</filename> from.</para>
-<para>You can also install &live-helper; directly to your system by executing:</para>
-<screen># make install</screen>
-
-</section>
-
-<section>
-<title>From 'snapshots'</title>
-<para>If you do not wish to build or install &live-helper; from source, you can use snapshots. These are built automatically from the latest version in Git and are available on <ulink url="http://live.debian.net/debian/">http://live.debian.net/debian</ulink>.</para>
-</section>
-
-<section>
-<title>&live-initramfs;</title>
-
-<para><emphasis>N.B. You do not need to install &live-initramfs; on your system to create customised Debian Live systems. However, doing so will do no harm.</emphasis></para>
-
-<section>
-<title>Using a customised &live-initramfs;</title>
-
-<para>To modify the code you can follow the process below. Please ensure you are familiar with the terms mentioned in <xref linkend="terms"/>.</para>
-
-<orderedlist>
-<listitem>
-<para>Checkout the &live-initramfs; source</para>
-<screen>$ git clone git://live.debian.net/git/live-initramfs.git</screen>
-</listitem>
-<listitem>
-<para>Make changes to your local copy</para>
-<para>And beware that if you want to add your pre-init script in live-bottom, you should name it without dashes '-', e.g: call it "81new_feature" and not "81new-feature".</para>
-</listitem>
-<listitem>
-<para>Build a &live-initramfs; <command>.deb</command></para>
-<para>You must build either on your target distribution or in a chroot containing your target platform: this means if your target is lenny then you should build against lenny. You can use a personal builder such as <command>pbuilder</command> to automate building packages in chroot. To build directly on the target platform, use <command>dpkg-buildpackage</command> (provided by the <command>dpkg-dev</command> package):</para>
-<screen>
-$ cd live-initramfs
-$ dpkg-buildpackage -rfakeroot -b -uc -us
-</screen>
-</listitem>
-<listitem>
-<para>Use the generated &live-initramfs; <command>.deb</command></para>
-<para>As &live-initramfs; is installed by the build system, installing the package in the host system is not sufficient: you should treat the generated <command>.deb</command> like another custom package. Please see <xref linkend="custom-packages"/> for more information. You should pay particular attention to <xref linkend="custom-packages-apt"/>.</para>
-</listitem>
-</orderedlist>
-</section>
-
-<section>
-<title>Using &live-initramfs; snapshots</title>
-
-<para>You can let &live-helper; automatically use the latest snapshot of &live-initramfs; by configuring a third-party repository in your live-system configuration. Assuming you have already created a configuration tree with <command>lh config</command>:</para>
-
-<orderedlist>
-<listitem>
-<para>Create a sources.list entry for the chroot stage:</para>
-<screen>echo "deb http://live.debian.net/ sid-snapshots main contrib non-free" > config/chroot_sources/debian-live_sid-snapshots.chroot</screen>
-</listitem>
-<listitem>
-<para>Create a sources.list entry for the binary stage:</para>
-<screen>cp config/chroot_sources/debian-live_sid-snapshots.chroot config/chroot_sources/debian-live_sid-snapshots.binary</screen>
-</listitem>
-<listitem>
-<para>Fetch the archive signing key:</para>
-<screen>
-wget http://live.debian.net/debian/project/openpgp/archive-key.asc -O config/chroot_sources/debian-live_sid-snapshots.chroot.gpg
-cp config/chroot_sources/debian-live_sid-snapshots.chroot.gpg config/chroot_sources/debian-live_sid-snapshots.binary.gpg
-</screen>
-</listitem>
-</orderedlist>
-</section>
-</section>
-</section>
+  <title>Installation</title>
+  <section>
+    <title>Requirements</title>
+    <para>Building Debian Live images has very few system requirements:</para>
+    <orderedlist>
+      <listitem>
+        <para>Super user (root) access</para>
+      </listitem>
+      <listitem>
+        <para>An up-to-date version of &live-helper;</para>
+      </listitem>
+      <listitem>
+        <para>A POSIX-compliant shell, such as <command>bash</command> or <command>dash</command>.</para>
+      </listitem>
+      <listitem>
+        <para><command>debootstrap</command> or <command>cdebootstrap</command></para>
+      </listitem>
+      <listitem>
+        <para>Linux 2.6.x</para>
+      </listitem>
+    </orderedlist>
+    <para>Note that using Debian or a Debian-derived distribution is not required - &live-helper; will run on almost any operating system with the above requirements.</para>
+  </section>
+  <section>
+    <title>Installing &live-helper;</title>
+    <para>You can install &live-helper; in a number of different ways:</para>
+    <orderedlist>
+      <listitem>
+        <para>From the Debian repository</para>
+      </listitem>
+      <listitem>
+        <para>From source</para>
+      </listitem>
+      <listitem>
+        <para>From snapshots</para>
+      </listitem>
+      <listitem>
+        <para>From backports.org</para>
+      </listitem>
+    </orderedlist>
+    <para>If you are using &lenny; or &sid; the recommended way is to install &live-helper; via the Debian repository.</para>
+    <section>
+      <title>From the Debian repository</title>
+      <para>Simply install &live-helper; like any other package:</para>
+      <screen># apt-get install live-helper</screen>
+      <para>or</para>
+      <screen># aptitude install live-helper</screen>
+    </section>
+    <section>
+      <title>From source</title>
+      <para>&live-helper; is developed using the Git version control system. On Debian systems, this is provided by the <command>git-core</command> package. To check out the latest code, execute:</para>
+      <screen>$ git clone git://live.debian.net/git/live-helper.git</screen>
+      <para>You can build and install your own Debian package by executing:</para>
+      <screen> $ cd live-helper $ dpkg-buildpackage -rfakeroot -b -uc -us $ cd .. # dpkg -i live-helper*.deb </screen>
+      <para>You can also use a local version of &live-helper; without installation:</para>
+      <screen># live-helper/helpers/lh_local</screen>
+      <para>Subsequent calls to <filename>lh_</filename>-prefixed helpers in that shell environment will then use the version located in the directory you executed <filename>lh_local</filename> from.</para>
+      <para>You can also install &live-helper; directly to your system by executing:</para>
+      <screen># make install</screen>
+    </section>
+    <section>
+      <title>From 'snapshots'</title>
+      <para>If you do not wish to build or install &live-helper; from source, you can use snapshots. These are built automatically from the latest version in Git and are available on <ulink url="http://live.debian.net/debian/">http://live.debian.net/debian</ulink>.</para>
+    </section>
+    <section>
+      <title>&live-initramfs;</title>
+      <para>
+        <emphasis>N.B. You do not need to install &live-initramfs; on your system to create customised Debian Live systems. However, doing so will do no harm.</emphasis>
+      </para>
+      <section>
+        <title>Using a customised &live-initramfs;</title>
+        <para>To modify the code you can follow the process below. Please ensure you are familiar with the terms mentioned in <xref linkend="terms"/>.</para>
+        <orderedlist>
+          <listitem>
+            <para>Checkout the &live-initramfs; source</para>
+            <screen>$ git clone git://live.debian.net/git/live-initramfs.git</screen>
+          </listitem>
+          <listitem>
+            <para>Make changes to your local copy</para>
+            <para>And beware that if you want to add your pre-init script in live-bottom, you should name it without dashes '-', e.g: call it "81new_feature" and not "81new-feature".</para>
+          </listitem>
+          <listitem>
+            <para>Build a &live-initramfs; <command>.deb</command></para>
+            <para>You must build either on your target distribution or in a chroot containing your target platform: this means if your target is lenny then you should build against lenny. You can use a personal builder such as <command>pbuilder</command> to automate building packages in chroot. To build directly on the target platform, use <command>dpkg-buildpackage</command> (provided by the <command>dpkg-dev</command> package):</para>
+            <screen> $ cd live-initramfs $ dpkg-buildpackage -rfakeroot -b -uc -us </screen>
+          </listitem>
+          <listitem>
+            <para>Use the generated &live-initramfs; <command>.deb</command></para>
+            <para>As &live-initramfs; is installed by the build system, installing the package in the host system is not sufficient: you should treat the generated <command>.deb</command> like another custom package. Please see <xref linkend="custom-packages"/> for more information. You should pay particular attention to <xref linkend="custom-packages-apt"/>.</para>
+          </listitem>
+        </orderedlist>
+      </section>
+      <section>
+        <title>Using &live-initramfs; snapshots</title>
+        <para>You can let &live-helper; automatically use the latest snapshot of &live-initramfs; by configuring a third-party repository in your live-system configuration. Assuming you have already created a configuration tree with <command>lh config</command>:</para>
+        <orderedlist>
+          <listitem>
+            <para>Create a sources.list entry for the chroot stage:</para>
+            <screen>echo "deb http://live.debian.net/ sid-snapshots main contrib non-free" &gt; config/chroot_sources/debian-live_sid-snapshots.chroot</screen>
+          </listitem>
+          <listitem>
+            <para>Create a sources.list entry for the binary stage:</para>
+            <screen>cp config/chroot_sources/debian-live_sid-snapshots.chroot config/chroot_sources/debian-live_sid-snapshots.binary</screen>
+          </listitem>
+          <listitem>
+            <para>Fetch the archive signing key:</para>
+            <screen> wget http://live.debian.net/debian/project/openpgp/archive-key.asc -O config/chroot_sources/debian-live_sid-snapshots.chroot.gpg cp config/chroot_sources/debian-live_sid-snapshots.chroot.gpg config/chroot_sources/debian-live_sid-snapshots.binary.gpg </screen>
+          </listitem>
+        </orderedlist>
+      </section>
+    </section>
+  </section>
 </chapter>
diff --git a/manual/en/live-environment.xml b/manual/en/live-environment.xml
index c82bfcc..68d3585 100644
--- a/manual/en/live-environment.xml
+++ b/manual/en/live-environment.xml
@@ -1,132 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <chapter id="live-environment">
-<title>The Live environment</title>
-
-<section>
-<title>Swap space</title>
-<para>FIXME</para>
-</section>
-
-<section id="hostname">
-<title>Hostname</title>
-<para>The name of host running live system can be set with the <command>hostname</command> parameter into the <command>--bootappend-live</command> option of <filename>lh_config</filename>, e.g.:
-
-<screen>lh_config --bootappend-live "hostname=myhost"</screen>
-This parameter can also be used in kernel command line.</para>
-</section>
-
-<section id="live-user">
-<title>The Live user</title>
-<para>Username FIXME.</para>
-<para>One important consideration is that the live user is created by &live-initramfs; during bootup, it is not created by &live-helper; when building the image.</para>
-
- <para>You can specify additional groups that the live user will belong to by preseeding the <command>passwd/user-default-groups</command> debconf value. For example, to add the live user to the <command>fuse</command> group, add the following to a file in the <filename class="directory">config/chroot_local-preseed</filename> directory:</para>
-
-<screen>
- debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse
-</screen>
-
- <para>For more information about debconf preseeding, please see <xref linkend="debconf-preseed"/>.</para>
-
-</section>
-
-<section id="language">
-<title>Language</title>
-<para>When the live system boots, language is involved in three steps:
-<itemizedlist>
-  <listitem><simpara>the locale generation</simpara></listitem>
-  <listitem><simpara>setting the keyboard layout for the console</simpara></listitem>
-  <listitem><simpara>setting the keyboard layout for X</simpara></listitem>
-</itemizedlist></para>
-
-<para>To define the locale that should be generated, use the <command>locale</command> parameter into the <command>--bootappend-live</command> option of <filename>lh_config</filename>, e.g.:
-
-<screen>lh_config --bootappend-live "locale=sv_SE.utf8"</screen>
-This parameter can also be used in kernel command line. You can specify a locale by a two-letters code, or for better control, by a full <userinput><parameter>language</parameter>_<parameter>country</parameter>.<parameter>encoding</parameter></userinput> word.</para>
-
-<para>Both the console and X keyboard configuration depends on the <command>keyb</command> parameter of the <command>--bootappend-live</command> option. Valid options for X keyboard layouts can be found in <filename>/etc/X11/xkb/base.xml</filename> (rather limited to two-letters country codes). To find the value (the two characters) corresponding to a language try searching for the english name of the nation where the language is spoken, e.g:
-
-<screen>$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name
-	&lt;name&gt;se&lt;/name&gt;
-</screen>
-
-To get the locale files for swedish generated and a swedish keyboard layout in X use:
-
-<screen>lh_config --bootappend-live "locale=sv_SE.utf8 keyb=se"</screen>
-
-</para>
-<para>
-A list of the valid values of the keyboards for the console can be figured with the following command:
-<screen>for i in `find /usr/share/keymaps/ -iname "*kmap.gz"`; do basename $i | head -c -9; echo; done | sort | less </screen>
-
-To make the console keyboard use a swedish layout use
-
-<screen>lh_config --bootappend-live "locale=sv_SE.utf8 keyb=se-latin1"</screen>
-
-</para>
-
-<para>Alternatively, you can use the <literal>console-setup</literal> package, a tool to let you configure console layout using X (XKB) definitions; you can then setup your keyboard layout more precisely with <literal>klayout</literal>, <literal>kvariant</literal>, <literal>koptions</literal> and <literal>kmodel</literal> variables; <command>live-initramfs</command> will use also these parameters for X configuration. For example, to set up a french system with a french-dvorak layout (called Bépo) on a TypeMatrix keyboard, both in console and X11, use:
-<screen>lh_config --bootappend-live \
-  "locale=fr_FR.UTF-8 klayout=fr kvariant=bepo kmodel=tm2030usb"</screen>
-
-Note that on old versions of <literal>console-setup</literal> (i.e. Lenny's one), you'll need to setup also the <literal>keyb</literal> variable to the <literal>klayout</literal>'s value.
-</para>
-</section>
-
-<section id="persistence">
-<title>Persistence</title>
-<para>A live cd paradigm is a preinstalled system which runs from read-only media, like a cdrom, where writes and modifications do not survive reboots of the host hardware which runs it.</para>
-<para>A Debian Live system is a generalization of this paradigm and thus supports other media in addition to CDs; but still, in its default behaviour, it should be considered read-only and all the runtime evolutions of the system are lost at shutdown.</para>
-
-<para>Persistence is a common name for different kinds of solutions for saving across reboots some, or all, of this runtime evolution of the system. To understand how it could work it could be handy to know that even if the system is booted and run from read-only media, modification to the files and directories are written on writable media, typically a ram disk (tmpfs) and ram disks' data do not survive reboots.</para>
-<para>The data stored on this ramdisk should be saved on a writable persistent medium like a Hard Disk, a USB key, a network share or even a session of a multisession (re)writable CD/DVD. All these media are supported in Debian Live in different ways, and all but the last one require a special boot parameter to be specified at boot time: <command>persistent</command>.</para>
-
-<section><title>Full persistence</title>
-<para>By 'full persistence' it is meant that instead of using a tmpfs for storing modifications to the read-only media (with the copy-on-write, COW, system) a writable partition is used. In order to use this feature a partition with a clean writable supported filesystem on it labeled "live-rw" must be attached on the system at bootime and the system must be started with the boot parameter 'persistent'. This partition could be an ext2 partition on the hard disk or on a usb key created with, e.g.:</para>
-
-<screen>
-# mkfs.ext2 -L live-rw /dev/sdb1
-</screen>
-
-<para>If you already have a partition on your device, you could just change the label with one of the following:</para>
-
-<screen>
-# tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems
-# dosfslabel /dev/sdb1 live-rw # for a fat filesystem
-</screen>
-
-<para>But since live system users cannot always use a hard drive partition, and considering that most USB keys have poor write speeds, 'full' persistence could be also used with just image files, so you could create a file representing a partition and put this image file even on a NTFS partition of a foreign OS, with something like:</para>
-
-<screen>
-$ dd if=/dev/null of=live-rw bs=1G seek=1	# for a 1GB sized image file
-$ /sbin/mkfs.ext2 -F live-rw
-</screen>
-
-<para>Then copy the <command>live-rw</command> file to a writable partition and reboot with the boot parameter 'persistent'.</para>
-</section>
-
-<section><title>Home automounting</title>
-<para>If during the boot a partition (filesystem) image file or a partition labeled  <command>home-rw</command> is discovered, this filesystem will be directly mounted as <command>/home</command>, thus permitting persistence of files that belong to e.g. the default user. It can be combined with full persistence.</para>
-</section>
-
-<section><title>Snapshots</title>
-<para>Snapshots are collections of files and directories which are not mounted while running but which are copied from a persistent device to the system (tmpfs) at boot and which are resynced at reboot/shutdown of the system. The content of a snapshot could reside on a partition or an image file (like the above mentioned types) labeled <command>live-sn</command>, but it defaults to a simple cpio archive named <command>live-sn.cpio.gz</command>. As above, at boot time, the block devices connected to the system are traversed to see if a partition or a file named like that could be found. A power interruption during runtime could lead to data loss, hence a tool invoked  <command>live-snapshot --refresh</command> could be called to sync important changes. This type of persistence, since it does not write continuously to the persistent media, is the most flash-based device friendly and the fastest of all the persistence systems.</para>
-<para> A /home version of snapshot exists too and its label is <command>home-sn.*</command>; it works the same as the main snapshot but it is only applied to /home.</para>
-<para>Snapshots cannot currently handle file deletion but full persistence and home automounting can.</para>
-</section>
-
-<section><title>Persistent SubText</title>
-<para>If a user would need multiple persistent storage of the same type for different locations or testing, such as <command>live-rw-nonwork</command> and <command>live-rw-work</command>, the boot parameter <command>persistent-subtext</command> used in conjuntion with the boot parameter <command>persistent</command> will allow for multiple but unique persistent media. An example would be if a user wanted to use a persistent partition labeled <command>live-sn-subText</command> they would use the boot parameters of: <command>persistent</command> <command>persistent-subtext=subText</command>.</para>
-</section>
-
-<section><title>Partial remastering</title>
-<para>The runtime modification of the tmpfs could be collected using live-snapshot in a squashfs and added to the cd by remastering the iso in the case of cd-r or adding a session to multisession cd/dvd(rw); live-initramfs mounts all /live filesystem in order or with the module bootparameter.</para>
-</section>
-
-</section>
-
+  <title>The Live environment</title>
+  <section>
+    <title>Swap space</title>
+    <para>FIXME</para>
+  </section>
+  <section id="hostname">
+    <title>Hostname</title>
+    <para>The name of host running live system can be set with the <command>hostname</command> parameter into the <command>--bootappend-live</command> option of <filename>lh_config</filename>, e.g.: <screen>lh_config --bootappend-live "hostname=myhost"</screen> This parameter can also be used in kernel command line.</para>
+  </section>
+  <section id="live-user">
+    <title>The Live user</title>
+    <para>Username FIXME.</para>
+    <para>One important consideration is that the live user is created by &live-initramfs; during bootup, it is not created by &live-helper; when building the image.</para>
+    <para>You can specify additional groups that the live user will belong to by preseeding the <command>passwd/user-default-groups</command> debconf value. For example, to add the live user to the <command>fuse</command> group, add the following to a file in the <filename class="directory">config/chroot_local-preseed</filename> directory:</para>
+    <screen> debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse </screen>
+    <para>For more information about debconf preseeding, please see <xref linkend="debconf-preseed"/>.</para>
+  </section>
+  <section id="language">
+    <title>Language</title>
+    <para>When the live system boots, language is involved in three steps: <itemizedlist><listitem><simpara>the locale generation</simpara></listitem><listitem><simpara>setting the keyboard layout for the console</simpara></listitem><listitem><simpara>setting the keyboard layout for X</simpara></listitem></itemizedlist></para>
+    <para>To define the locale that should be generated, use the <command>locale</command> parameter into the <command>--bootappend-live</command> option of <filename>lh_config</filename>, e.g.: <screen>lh_config --bootappend-live "locale=sv_SE.utf8"</screen> This parameter can also be used in kernel command line. You can specify a locale by a two-letters code, or for better control, by a full <userinput><parameter>language</parameter>_<parameter>country</parameter>.<parameter>encoding</parameter></userinput> word.</para>
+    <para>Both the console and X keyboard configuration depends on the <command>keyb</command> parameter of the <command>--bootappend-live</command> option. Valid options for X keyboard layouts can be found in <filename>/etc/X11/xkb/base.xml</filename> (rather limited to two-letters country codes). To find the value (the two characters) corresponding to a language try searching for the english name of the nation where the language is spoken, e.g: <screen>$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name &lt;name&gt;se&lt;/name&gt; </screen> To get the locale files for swedish generated and a swedish keyboard layout in X use: <screen>lh_config --bootappend-live "locale=sv_SE.utf8 keyb=se"</screen> </para>
+    <para> A list of the valid values of the keyboards for the console can be figured with the following command: <screen>for i in `find /usr/share/keymaps/ -iname "*kmap.gz"`; do basename $i | head -c -9; echo; done | sort | less </screen> To make the console keyboard use a swedish layout use <screen>lh_config --bootappend-live "locale=sv_SE.utf8 keyb=se-latin1"</screen> </para>
+    <para>Alternatively, you can use the <literal>console-setup</literal> package, a tool to let you configure console layout using X (XKB) definitions; you can then setup your keyboard layout more precisely with <literal>klayout</literal>, <literal>kvariant</literal>, <literal>koptions</literal> and <literal>kmodel</literal> variables; <command>live-initramfs</command> will use also these parameters for X configuration. For example, to set up a french system with a french-dvorak layout (called Bépo) on a TypeMatrix keyboard, both in console and X11, use: <screen>lh_config --bootappend-live \ "locale=fr_FR.UTF-8 klayout=fr kvariant=bepo kmodel=tm2030usb"</screen> Note that on old versions of <literal>console-setup</literal> (i.e. Lenny's one), you'll need to setup also the <literal>keyb</literal> variable to the <literal>klayout</literal>'s value. </para>
+  </section>
+  <section id="persistence">
+    <title>Persistence</title>
+    <para>A live cd paradigm is a preinstalled system which runs from read-only media, like a cdrom, where writes and modifications do not survive reboots of the host hardware which runs it.</para>
+    <para>A Debian Live system is a generalization of this paradigm and thus supports other media in addition to CDs; but still, in its default behaviour, it should be considered read-only and all the runtime evolutions of the system are lost at shutdown.</para>
+    <para>Persistence is a common name for different kinds of solutions for saving across reboots some, or all, of this runtime evolution of the system. To understand how it could work it could be handy to know that even if the system is booted and run from read-only media, modification to the files and directories are written on writable media, typically a ram disk (tmpfs) and ram disks' data do not survive reboots.</para>
+    <para>The data stored on this ramdisk should be saved on a writable persistent medium like a Hard Disk, a USB key, a network share or even a session of a multisession (re)writable CD/DVD. All these media are supported in Debian Live in different ways, and all but the last one require a special boot parameter to be specified at boot time: <command>persistent</command>.</para>
+    <section>
+      <title>Full persistence</title>
+      <para>By 'full persistence' it is meant that instead of using a tmpfs for storing modifications to the read-only media (with the copy-on-write, COW, system) a writable partition is used. In order to use this feature a partition with a clean writable supported filesystem on it labeled "live-rw" must be attached on the system at bootime and the system must be started with the boot parameter 'persistent'. This partition could be an ext2 partition on the hard disk or on a usb key created with, e.g.:</para>
+      <screen> # mkfs.ext2 -L live-rw /dev/sdb1 </screen>
+      <para>If you already have a partition on your device, you could just change the label with one of the following:</para>
+      <screen> # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems # dosfslabel /dev/sdb1 live-rw # for a fat filesystem </screen>
+      <para>But since live system users cannot always use a hard drive partition, and considering that most USB keys have poor write speeds, 'full' persistence could be also used with just image files, so you could create a file representing a partition and put this image file even on a NTFS partition of a foreign OS, with something like:</para>
+      <screen> $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file $ /sbin/mkfs.ext2 -F live-rw </screen>
+      <para>Then copy the <command>live-rw</command> file to a writable partition and reboot with the boot parameter 'persistent'.</para>
+    </section>
+    <section>
+      <title>Home automounting</title>
+      <para>If during the boot a partition (filesystem) image file or a partition labeled <command>home-rw</command> is discovered, this filesystem will be directly mounted as <command>/home</command>, thus permitting persistence of files that belong to e.g. the default user. It can be combined with full persistence.</para>
+    </section>
+    <section>
+      <title>Snapshots</title>
+      <para>Snapshots are collections of files and directories which are not mounted while running but which are copied from a persistent device to the system (tmpfs) at boot and which are resynced at reboot/shutdown of the system. The content of a snapshot could reside on a partition or an image file (like the above mentioned types) labeled <command>live-sn</command>, but it defaults to a simple cpio archive named <command>live-sn.cpio.gz</command>. As above, at boot time, the block devices connected to the system are traversed to see if a partition or a file named like that could be found. A power interruption during runtime could lead to data loss, hence a tool invoked <command>live-snapshot --refresh</command> could be called to sync important changes. This type of persistence, since it does not write continuously to the persistent media, is the most flash-based device friendly and the fastest of all the persistence systems.</para>
+      <para> A /home version of snapshot exists too and its label is <command>home-sn.*</command>; it works the same as the main snapshot but it is only applied to /home.</para>
+      <para>Snapshots cannot currently handle file deletion but full persistence and home automounting can.</para>
+    </section>
+    <section>
+      <title>Persistent SubText</title>
+      <para>If a user would need multiple persistent storage of the same type for different locations or testing, such as <command>live-rw-nonwork</command> and <command>live-rw-work</command>, the boot parameter <command>persistent-subtext</command> used in conjuntion with the boot parameter <command>persistent</command> will allow for multiple but unique persistent media. An example would be if a user wanted to use a persistent partition labeled <command>live-sn-subText</command> they would use the boot parameters of: <command>persistent</command> <command>persistent-subtext=subText</command>.</para>
+    </section>
+    <section>
+      <title>Partial remastering</title>
+      <para>The runtime modification of the tmpfs could be collected using live-snapshot in a squashfs and added to the cd by remastering the iso in the case of cd-r or adding a session to multisession cd/dvd(rw); live-initramfs mounts all /live filesystem in order or with the module bootparameter.</para>
+    </section>
+  </section>
 </chapter>
diff --git a/manual/en/overview.xml b/manual/en/overview.xml
index 7b06707..579186d 100644
--- a/manual/en/overview.xml
+++ b/manual/en/overview.xml
@@ -1,310 +1,90 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-	<!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
-
 <chapter id="overview">
-<title>Overview of tools</title>
-
-<para>
-	This chapter contains an overview of the two main tools used in building
-	Debian Live systems.
-</para>
-
-<section id="live-helper">
-<title>&live-helper;</title>
-
-<para>
-	&live-helper; is a collection of scripts to build Debian Live systems.
-	These scripts are also referred to as "helpers".
-</para>
-
-<para>
-	The idea behind &live-helper; is to be a framework that uses a
-	configuration directory to completely automate and customize all aspects
-	of building a Live image.
-</para>
-
-<para>
-	Many concepts are similar to those in the <command>debhelper</command>
-	Debian package tools written by Joey Hess:
-</para>
-
-<orderedlist>
-
-<listitem>
-<para>
-	The scripts have a central location for configuring their operation.
-</para>
-
-<para>
-	In <command>debhelper</command>, this is the <filename class="directory"
-	>debian</filename> subdirectory of a package tree. For example,
-	<command>dh_install</command> will look for a file called
-	<filename>debian/&lt;packagename&gt;.install</filename> to determine
-	which files should exist in a particular binary package. In much the
-	same way, &live-helper; stores its configuration entirely under a
-	<filename class="directory">config/</filename> subdirectory.
-</para>
-</listitem>
-
-<listitem>
-<para>
-	The scripts are independent - that is to say, it is always safe to run
-	each command.
-</para>
-</listitem>
-
-</orderedlist>
-
-<para>
-	Unlike <command>debhelper</command>, &live-helper; contains a tool to
-	generate a skeleton configuration directory,
-	<filename>lh config</filename>. This could be considered to be similar
-	to tools such as <command>dh-make</command>. For more information about
-	<filename>lh config</filename>, please see <xref linkend="lh-config" />.
-</para>
-
-<para>
-	Besides the common <filename>config/common</filename>, which is used by
-	all &live-helper; helper commands, some additional files can be used to
-	configure the behavior of specific helper commands. These files are
-	typically named <command>config/helper</command> or
-	<command>config/stage</command> (where "stage", of course, is replaced
-	with the name of the stage that they belong to, and "helper" with the
-	name of the helper).
-</para>
-
-<para>
-	For example, the <command>lh bootstrap debootstrap</command> helper
-	command uses files named <filename>config/bootstrap</filename> and
-	<filename>config/bootstrap_debootstrap</filename> to read the options it
-	will use. Generally, these files contain variables with values assigned,
-	one variable per line. Some programs in &live-helper; use pairs of
-	values or slightly more complicated variable assignments.
-</para>
-
-<para>
-	&live-helper; respects environment variables which are present in the
-	context of the shell it is running. If variables can be read from config
-	files, then they override environment variables, and if command line
-	options are used, they override values from config files. If no value
-	for a given variable can be found (and is thus unset), &live-helper;
-	will automatically set it to a default value.
-</para>
-
-<para>
-	All config files are shell scripts which are sourced by a &live-helper;
-	program. That means they have to follow the normal shell syntax. You can
-	also put comments in these files; lines beginning with "#" are ignored.
-</para>
-
-<para>
-	In some rare cases you may want to have different versions of these
-	files for different architectures or distributions. If files named
-	<command>config/stage.arch</command> or
-	<command>config/stage_helper.arch</command>, and
-	<command>config/stage.dist</command> or
-	<command>config/stage_helper.dist</command> exist (where "arch" is the
-	same as the output of <command>dpkg --print-architecture</command> and
-	"dist" is the same as the codename of the target distribution), then
-	they will be used in preference to the other, more general files.
-</para>
-
-<para>
-	Please see <xref linkend="installation" /> for information on how to
-	install &live-helper;.
-</para>
-
-<para>
-	The remainder of this section discusses the three most important
-	helpers:
-</para>
-
-<variablelist>
-
-<varlistentry>
-<term><filename>lh config</filename></term>
-
-<listitem>
-<para>
-	Responsible for initialising a Live system configuration directory. See
-	<xref linkend="lh-config" /> for more information.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><filename>lh build</filename></term>
-
-<listitem>
-<para>
-	Responsible for starting a Live system build. See <xref
-	linkend="lh-build" /> for more information.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><filename>lh clean</filename></term>
-
-<listitem>
-<para>
-	Responsible for removing parts of a Live system build. See <xref
-	linkend="lh-clean" /> for more information.
-</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-
-<section id="lh-config">
-<title>The <filename>lh config</filename> helper</title>
-
-<para>
-	As discussed in <xref linkend="live-helper" />, the scripts that make up
-	&live-helper; source their configuration from a single directory named
-	<command>config/</command>. As constructing this directory by hand would
-	be time-consuming and error-prone, the <filename>lh config</filename>
-	helper can be used to create skeleton configuration folders.
-</para>
-
-<para>
-	Issuing <filename>lh config</filename> without any arguments creates a
-	<command>config</command> subdirectory which it populates with some
-	default settings:
-</para>
-
-<para>
-	<screen>$ lh config
-$ ls -l
-total 4.1k
-drwxr-xr-x 19 user group 4.1k 2008-05-09 21:37 config
-$ ls -l config/
-total 104
--rw-r--r-- 1 user group 4175 2010-04-11 12:16 binary
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_debian-installer
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_debian-installer-includes
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_grub
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-debs
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-hooks
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-includes
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-packageslists
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-udebs
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_rootfs
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_syslinux
--rw-r--r-- 1 user group 2205 2010-04-11 12:16 bootstrap
--rw-r--r-- 1 user group 1599 2010-04-11 12:16 chroot
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_apt
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-hooks
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-includes
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-packages
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-packageslists
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-patches
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-preseed
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_sources
--rw-r--r-- 1 user group 2938 2010-04-11 12:16 common
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 includes
--rw-r--r-- 1 user group  206 2010-04-11 12:16 source
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 templates
-</screen>
-</para>
-
-<para>
-	Using <filename>lh config</filename> without any arguments would be
-	suitable for users who are either happy editing the generated files, or
-	are simply happy with the defaults it creates.
-</para>
-
-<para>
-	You can ask <filename>lh config</filename> to generate a <filename
-	class="directory">config/</filename> directory "preseeded" with various
-	options. This might be suitable if you do not require the default
-	settings but do not need to change a large number of options. For
-	example:
-</para>
-
-<para>
-	<screen>$ lh config -p gnome</screen>
-</para>
-
-<para>
-	will build a <filename class="directory">config/</filename> directory
-	configured to include the '<command>gnome</command>' package list. It is
-	possible to specify many options:
-</para>
-
-<para>
-	<screen>$ lh config --apt aptitude --binary-images net --hostname live-machine --username live-user ...</screen>
-</para>
-
-<para>
-	A full list of options is available in the <command>lh_config</command>
-	man page. Most options have a parallel with an "<command>LH_</command>"
-	prefixed variable.
-</para>
-
-</section>
-
-<section id="lh-build">
-<title>The <filename>lh build</filename> helper</title>
-
-<para>
-	The <filename>lh build</filename> helper reads in your configuration
-	from the <filename class="directory">config/</filename> directory. It
-	then runs the lower lower level commands needed to build your Live
-	system.
-</para>
-
-</section>
-
-<section id="lh-clean">
-<title>The <filename>lh clean</filename> helper</title>
-
-<para>
-	It is the job of the <filename>lh clean</filename> helper to remove
-	various parts of a Live helper build so subsequent builds can start
-	from a clean state.
-</para>
-
-</section>
-
-</section>
-
-<section id="live-initramfs">
-<title>The &live-initramfs; package</title>
-
-<para>
-	&live-initramfs; is a collection of scripts providing hooks for the
-	<command>initramfs-tools</command>, used to generate an initramfs
-	capable of booting live systems, such as those created by
-	<command>live-helper</command>. This includes the Debian Live isos,
-	netboot tarballs, and usb stick images.
-</para>
-
-<para>
-	At boot time it will look for read-only media containing a "/live"
-	directory where a root filesystem (often a compressed filesystem image
-	like squashfs) is stored. If found, it will create a writable
-	environment, using aufs or unionfs, for Debian like systems to boot
-	from.
-</para>
-
-<para>
-	&live-initramfs; is a fork of
-	<ulink url="http://packages.ubuntu.com/casper">casper</ulink>.
-</para>
-
-<para>
-	More information on initial ramfs in Debian can be found in the
-	<ulink url="http://kernel-handbook.alioth.debian.org/">
-	Debian Linux Kernel Handbook</ulink>'s chapter on 
-	<ulink url="http://kernel-handbook.alioth.debian.org/ch-initramfs.html">
-	initramfs</ulink>.
-</para>
-
-</section>
-
+  <title>Overview of tools</title>
+  <para> This chapter contains an overview of the two main tools used in building Debian Live systems. </para>
+  <section id="live-helper">
+    <title>&live-helper;</title>
+    <para> &live-helper; is a collection of scripts to build Debian Live systems. These scripts are also referred to as "helpers". </para>
+    <para> The idea behind &live-helper; is to be a framework that uses a configuration directory to completely automate and customize all aspects of building a Live image. </para>
+    <para> Many concepts are similar to those in the <command>debhelper</command> Debian package tools written by Joey Hess: </para>
+    <orderedlist>
+      <listitem>
+        <para> The scripts have a central location for configuring their operation. </para>
+        <para> In <command>debhelper</command>, this is the <filename class="directory">debian</filename> subdirectory of a package tree. For example, <command>dh_install</command> will look for a file called <filename>debian/&lt;packagename&gt;.install</filename> to determine which files should exist in a particular binary package. In much the same way, &live-helper; stores its configuration entirely under a <filename class="directory">config/</filename> subdirectory. </para>
+      </listitem>
+      <listitem>
+        <para> The scripts are independent - that is to say, it is always safe to run each command. </para>
+      </listitem>
+    </orderedlist>
+    <para> Unlike <command>debhelper</command>, &live-helper; contains a tool to generate a skeleton configuration directory, <filename>lh config</filename>. This could be considered to be similar to tools such as <command>dh-make</command>. For more information about <filename>lh config</filename>, please see <xref linkend="lh-config"/>. </para>
+    <para> Besides the common <filename>config/common</filename>, which is used by all &live-helper; helper commands, some additional files can be used to configure the behavior of specific helper commands. These files are typically named <command>config/helper</command> or <command>config/stage</command> (where "stage", of course, is replaced with the name of the stage that they belong to, and "helper" with the name of the helper). </para>
+    <para> For example, the <command>lh bootstrap debootstrap</command> helper command uses files named <filename>config/bootstrap</filename> and <filename>config/bootstrap_debootstrap</filename> to read the options it will use. Generally, these files contain variables with values assigned, one variable per line. Some programs in &live-helper; use pairs of values or slightly more complicated variable assignments. </para>
+    <para> &live-helper; respects environment variables which are present in the context of the shell it is running. If variables can be read from config files, then they override environment variables, and if command line options are used, they override values from config files. If no value for a given variable can be found (and is thus unset), &live-helper; will automatically set it to a default value. </para>
+    <para> All config files are shell scripts which are sourced by a &live-helper; program. That means they have to follow the normal shell syntax. You can also put comments in these files; lines beginning with "#" are ignored. </para>
+    <para> In some rare cases you may want to have different versions of these files for different architectures or distributions. If files named <command>config/stage.arch</command> or <command>config/stage_helper.arch</command>, and <command>config/stage.dist</command> or <command>config/stage_helper.dist</command> exist (where "arch" is the same as the output of <command>dpkg --print-architecture</command> and "dist" is the same as the codename of the target distribution), then they will be used in preference to the other, more general files. </para>
+    <para> Please see <xref linkend="installation"/> for information on how to install &live-helper;. </para>
+    <para> The remainder of this section discusses the three most important helpers: </para>
+    <variablelist>
+      <varlistentry>
+        <term>
+          <filename>lh config</filename>
+        </term>
+        <listitem>
+          <para> Responsible for initialising a Live system configuration directory. See <xref linkend="lh-config"/> for more information. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <filename>lh build</filename>
+        </term>
+        <listitem>
+          <para> Responsible for starting a Live system build. See <xref linkend="lh-build"/> for more information. </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <filename>lh clean</filename>
+        </term>
+        <listitem>
+          <para> Responsible for removing parts of a Live system build. See <xref linkend="lh-clean"/> for more information. </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <section id="lh-config">
+      <title>The <filename>lh config</filename> helper</title>
+      <para> As discussed in <xref linkend="live-helper"/>, the scripts that make up &live-helper; source their configuration from a single directory named <command>config/</command>. As constructing this directory by hand would be time-consuming and error-prone, the <filename>lh config</filename> helper can be used to create skeleton configuration folders. </para>
+      <para> Issuing <filename>lh config</filename> without any arguments creates a <command>config</command> subdirectory which it populates with some default settings: </para>
+      <para>
+        <screen>$ lh config $ ls -l total 4.1k drwxr-xr-x 19 user group 4.1k 2008-05-09 21:37 config $ ls -l config/ total 104 -rw-r--r-- 1 user group 4175 2010-04-11 12:16 binary drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_debian-installer drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_debian-installer-includes drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_grub drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-debs drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-hooks drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-includes drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-packageslists drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-udebs drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_rootfs drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_syslinux -rw-r--r-- 1 user group 2205 2010-04-11 12:16 bootstrap -rw-r--r-- 1 user group 1599 2010-04-11 12:16 chroot drwxr-xr-x 2 user group 4096 2010-04
 -11 12:16 chroot_apt drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-hooks drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-includes drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-packages drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-packageslists drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-patches drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-preseed drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_sources -rw-r--r-- 1 user group 2938 2010-04-11 12:16 common drwxr-xr-x 2 user group 4096 2010-04-11 12:16 includes -rw-r--r-- 1 user group 206 2010-04-11 12:16 source drwxr-xr-x 2 user group 4096 2010-04-11 12:16 templates </screen>
+      </para>
+      <para> Using <filename>lh config</filename> without any arguments would be suitable for users who are either happy editing the generated files, or are simply happy with the defaults it creates. </para>
+      <para> You can ask <filename>lh config</filename> to generate a <filename class="directory">config/</filename> directory "preseeded" with various options. This might be suitable if you do not require the default settings but do not need to change a large number of options. For example: </para>
+      <para>
+        <screen>$ lh config -p gnome</screen>
+      </para>
+      <para> will build a <filename class="directory">config/</filename> directory configured to include the '<command>gnome</command>' package list. It is possible to specify many options: </para>
+      <para>
+        <screen>$ lh config --apt aptitude --binary-images net --hostname live-machine --username live-user ...</screen>
+      </para>
+      <para> A full list of options is available in the <command>lh_config</command> man page. Most options have a parallel with an "<command>LH_</command>" prefixed variable. </para>
+    </section>
+    <section id="lh-build">
+      <title>The <filename>lh build</filename> helper</title>
+      <para> The <filename>lh build</filename> helper reads in your configuration from the <filename class="directory">config/</filename> directory. It then runs the lower lower level commands needed to build your Live system. </para>
+    </section>
+    <section id="lh-clean">
+      <title>The <filename>lh clean</filename> helper</title>
+      <para> It is the job of the <filename>lh clean</filename> helper to remove various parts of a Live helper build so subsequent builds can start from a clean state. </para>
+    </section>
+  </section>
+  <section id="live-initramfs">
+    <title>The &live-initramfs; package</title>
+    <para> &live-initramfs; is a collection of scripts providing hooks for the <command>initramfs-tools</command>, used to generate an initramfs capable of booting live systems, such as those created by <command>live-helper</command>. This includes the Debian Live isos, netboot tarballs, and usb stick images. </para>
+    <para> At boot time it will look for read-only media containing a "/live" directory where a root filesystem (often a compressed filesystem image like squashfs) is stored. If found, it will create a writable environment, using aufs or unionfs, for Debian like systems to boot from. </para>
+    <para> &live-initramfs; is a fork of <ulink url="http://packages.ubuntu.com/casper">casper</ulink>. </para>
+    <para> More information on initial ramfs in Debian can be found in the <ulink url="http://kernel-handbook.alioth.debian.org/"> Debian Linux Kernel Handbook</ulink>'s chapter on <ulink url="http://kernel-handbook.alioth.debian.org/ch-initramfs.html"> initramfs</ulink>. </para>
+  </section>
 </chapter>
diff --git a/manual/en/procedures.xml b/manual/en/procedures.xml
index 157a9af..78047b9 100644
--- a/manual/en/procedures.xml
+++ b/manual/en/procedures.xml
@@ -1,136 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <chapter id="procedures">
-<title>Procedures</title>
-
-<para>This chapter documents the procedures within the Debian Live project for various tasks that need cooperation with other teams in Debian.</para>
-
-<sect1 id="udeb-uploads">
-<title>Udeb Uploads</title>
-
-<para>Before commiting releases of a udeb in d-i svn, one has to call:</para>
-<screen><command>../../scripts/l10n/output-l10n-changes . -d</command></screen>
-</sect1>
-
-<sect1 id="major-releases">
-<title>Major Releases</title>
-
-<para>Releasing a new stable major version of Debian includes a lot of different teams working together to make it happen. At some point, the Live team comes in and builds live system images. The requirements to do this are:</para>
-
-<itemizedlist>
-	<listitem>The local debian mirror (debian, debian-security, debian-volatile) of the debian-live buildd needs to be synced against a mirror that contains the released version.</listitem>
-	<listitem>The names of the image need to be known (e.g. debian-live-VERSION-ARCH-FLAVOUR.iso).</listitem>
-	<listitem>The data from debian-cd needs to be synced (udeb exclude lists).</listitem>
-	<listitem>The includes from debian-cd needs to be synced (README.*, doc/*, etc.).</listitem>
-	<listitem>Images are built and mirrored on cdimage.debian.org.</listitem>
-</itemizedlist>
-
-</sect1>
-
-<sect1 id="point-releases">
-<title>Point Releases</title>
-
-<itemizedlist>
-	<listitem>Again, we need updated mirror of both debian and debian-security.</listitem>
-	<listitem>Before actual images can be built, the sizes of the gnome-desktop and kde-desktop CD images need to be checked that they are not too big.</listitem>
-	<listitem>Images are built and mirrored on cdimage.debian.org.</listitem>
-	<listitem>Send announcement mail.</listitem>
-</itemizedlist>
-
-<sect2 id="point-release-announce-template">
-<title>Point release announcement template</title>
-
-<para>An annoucement mail for point releases can be generated using the template below and the following command:</para>
-
-<screen>
-$ sed \
-  -e 's|%major%|5.0|g' \
-  -e 's|%minor%|5.0.2|g' \
-  -e 's|%codename%|lenny|g' \
-  -e 's|%release_mail%|2009/msg00007.html|g'
-</screen>
-
-<para>Please check the mail carefully before sending and pass it to others for proof-reading.</para>
-
-<screen>
-Debian Live images for Debian GNU/Linux %major% updated
-
-The Debian Live project is pleased to announce the availability of
-updated Live images for its stable distribution Debian GNU/Linux %major%
-(codename "%codename%").
-
-The images are available for download at:
-
-    &lt;http://cdimage.debian.org/cdimage/release/current-live/&gt;
-
-This update incorporates the changes made in the %minor% point release,
-which adds corrections for security problems to the stable release
-along with a few adjustments for serious problems. A full list of the
-changes may be viewed at:
-
-    &lt;http://lists.debian.org/debian-announce/%release_mail%&gt;
-
-It also includes the following Live-specific changes:
-
- * [INSERT LIVE-SPECIFIC CHANGE HERE]
- * [INSERT LIVE-SPECIFIC CHANGE HERE]
- * [LARGER ISSUES MAY DESERVE THEIR OWN SECTION]
-
-
-URLs
-----
-
-Download location of updated images:
-
-  &lt;http://cdimage.debian.org/cdimage/release/current-live/&gt;
-
-Debian Live project homepage:
-
-  &lt;http://live.debian.net/&gt;
-
-The current stable distribution:
-
-  &lt;http://ftp.debian.org/debian/dists/stable&gt;
-
-stable distribution information (release notes, errata etc.):
-
-  &lt;http://www.debian.org/releases/stable/&gt;
-
-Security announcements and information:
-
-  &lt;http://www.debian.org/security/&gt;
-
-
-About Debian
--------------
-
-The Debian Project is an association of Free Software developers who
-volunteer their time and effort in order to produce the completely free
-operating system Debian GNU/Linux.
-
-
-About Debian Live
------------------
-
-Debian Live is an official sub-project of Debian which produces Debian
-systems that do not require a classical installer. Images are available
-for CD/DVD discs, USB sticks and PXE netbooting as well as a bare
-filesystem images for booting directly from the internet.
-
-
-Contact Information
--------------------
-
-For further information, please visit the Debian Live web pages at
-&lt;http://live.debian.net/&gt; or alternatively send mail to
-&lt;debian-live at lists.debian.org&gt;.
-</screen>
-
-</sect2>
-
-</sect1>
-
+  <title>Procedures</title>
+  <para>This chapter documents the procedures within the Debian Live project for various tasks that need cooperation with other teams in Debian.</para>
+  <sect1 id="udeb-uploads">
+    <title>Udeb Uploads</title>
+    <para>Before commiting releases of a udeb in d-i svn, one has to call:</para>
+    <screen>
+      <command>../../scripts/l10n/output-l10n-changes . -d</command>
+    </screen>
+  </sect1>
+  <sect1 id="major-releases">
+    <title>Major Releases</title>
+    <para>Releasing a new stable major version of Debian includes a lot of different teams working together to make it happen. At some point, the Live team comes in and builds live system images. The requirements to do this are:</para>
+    <itemizedlist>
+      <listitem>The local debian mirror (debian, debian-security, debian-volatile) of the debian-live buildd needs to be synced against a mirror that contains the released version.</listitem>
+      <listitem>The names of the image need to be known (e.g. debian-live-VERSION-ARCH-FLAVOUR.iso).</listitem>
+      <listitem>The data from debian-cd needs to be synced (udeb exclude lists).</listitem>
+      <listitem>The includes from debian-cd needs to be synced (README.*, doc/*, etc.).</listitem>
+      <listitem>Images are built and mirrored on cdimage.debian.org.</listitem>
+    </itemizedlist>
+  </sect1>
+  <sect1 id="point-releases">
+    <title>Point Releases</title>
+    <itemizedlist>
+      <listitem>Again, we need updated mirror of both debian and debian-security.</listitem>
+      <listitem>Before actual images can be built, the sizes of the gnome-desktop and kde-desktop CD images need to be checked that they are not too big.</listitem>
+      <listitem>Images are built and mirrored on cdimage.debian.org.</listitem>
+      <listitem>Send announcement mail.</listitem>
+    </itemizedlist>
+    <sect2 id="point-release-announce-template">
+      <title>Point release announcement template</title>
+      <para>An annoucement mail for point releases can be generated using the template below and the following command:</para>
+      <screen> $ sed \ -e 's|%major%|5.0|g' \ -e 's|%minor%|5.0.2|g' \ -e 's|%codename%|lenny|g' \ -e 's|%release_mail%|2009/msg00007.html|g' </screen>
+      <para>Please check the mail carefully before sending and pass it to others for proof-reading.</para>
+      <screen> Debian Live images for Debian GNU/Linux %major% updated The Debian Live project is pleased to announce the availability of updated Live images for its stable distribution Debian GNU/Linux %major% (codename "%codename%"). The images are available for download at: &lt;http://cdimage.debian.org/cdimage/release/current-live/&gt; This update incorporates the changes made in the %minor% point release, which adds corrections for security problems to the stable release along with a few adjustments for serious problems. A full list of the changes may be viewed at: &lt;http://lists.debian.org/debian-announce/%release_mail%&gt; It also includes the following Live-specific changes: COPYING debian html Makefile manual VERSION xml xsl [INSERT LIVE-SPECIFIC CHANGE HERE] COPYING debian html Makefile manual VERSION xml xsl [INSERT LIVE-SPECIFIC CHANGE HERE] COPYING debian html Makefile manual VERSION xml xsl [LARGER ISSUES MAY DESERVE THEIR OWN SECTION] URLs ---- Download loca
 tion of updated images: &lt;http://cdimage.debian.org/cdimage/release/current-live/&gt; Debian Live project homepage: &lt;http://live.debian.net/&gt; The current stable distribution: &lt;http://ftp.debian.org/debian/dists/stable&gt; stable distribution information (release notes, errata etc.): &lt;http://www.debian.org/releases/stable/&gt; Security announcements and information: &lt;http://www.debian.org/security/&gt; About Debian ------------- The Debian Project is an association of Free Software developers who volunteer their time and effort in order to produce the completely free operating system Debian GNU/Linux. About Debian Live ----------------- Debian Live is an official sub-project of Debian which produces Debian systems that do not require a classical installer. Images are available for CD/DVD discs, USB sticks and PXE netbooting as well as a bare filesystem images for booting directly from the internet. Contact Information ------------------- For further informati
 on, please visit the Debian Live web pages at &lt;http://live.debian.net/&gt; or alternatively send mail to &lt;debian-live at lists.debian.org&gt;. </screen>
+    </sect2>
+  </sect1>
 </chapter>
diff --git a/manual/en/reporting-bugs.xml b/manual/en/reporting-bugs.xml
index f7452c4..bbad8d0 100644
--- a/manual/en/reporting-bugs.xml
+++ b/manual/en/reporting-bugs.xml
@@ -1,158 +1,117 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <chapter id="bugs">
-<title>Reporting bugs</title>
-
-<para>Debian Live is far from being perfect, but we want to make it as close as possible to perfect - with your help. Do not hesitate to report a bug: it is better to fill a report twice than never. However, this chapter includes recommendations how to file good bug reports.</para>
-
-<para>For the impatient:</para>
-
-<itemizedlist>
-<listitem>
-  <para>
-  Always check first the image status updates on <ulink url="http://live.debian.net/">our homepage</ulink> for known issues.
-  </para>
-</listitem>
-<listitem>
- <para>
-  Always try to reproduce the bug with the <emphasis>most recent version of &live-helper; and &live-initramfs;</emphasis> before submitting a bug report.
- </para>
-</listitem>
-<listitem>
- <para>
-  Try to give <emphasis>as specific information as possible</emphasis> about the bug. This includes (at least) the version of &live-helper; and &live-initramfs; used and the distribution of the live system you are building.
- </para>
-</listitem>
-</itemizedlist>
-
-<section id="known-issues">
-<title>Known issues</title>
-<para>Due to the nature of Debian testing and Debian unstable branches being a moving target, building a live system may not always be possible.</para>
-<para>If this is a problem, do not build a system based on testing or unstable, but go with stable. live-helper does always default to the current stable release.</para>
-<para>Currently known issues are listed under the section 'status' on <ulink url="http://live.debian.net/">our homepage</ulink>.</para>
-<para>It is out of the scope of this manual to train you in correctly identifying and fixing problems in packages of the development branches, however, there are two things you can always try: When not succeeding to build testing, try if unstable works. If unstable does not work either, revert to testing and pinning the newer version of the failing package from unstable.</para>
-</section>
-
-<section id="rebuild-from-scratch">
-<title>Rebuild from scratch</title>
-<para>To ensure that a particular bug is not caused by an unclean built system, please always rebuild the whole live system from scratch to see if the bug is reproducible.</para>
-</section>
-
-<section id="up-to-date">
-<title>Use up-to-date packages</title>
-<para>This means</para>
-
-<para>Using outdated packages can cause significant problems when trying to reproduce (and ultimately fix) your problem. If a relevant package is not available in Debian anymore, please recognize that the resources of the Debian kernel team are limited and will be unlikely to be able to fix the problem.</para>
-</section>
-
-
-<section id="collect-information">
-<title>Collect information</title>
-
-<para>Please provide enough information with your report. At a minimum, it should contain the exact version of &live-helper; version where the bug is encountered, and steps to reproduce it. Please use common sense and include other relevant information if you think that it might help in solving the problem.</para>
-
-<para>To make the most out of your bug report, we require at least the following
-information:</para>
-
-<itemizedlist>
- <listitem><para>Architecture of the host system</para></listitem>
- <listitem><para>Version of &live-helper; on the host system</para></listitem>
- <listitem><para>Version of &live-initramfs; on the live system</para></listitem>
- <listitem><para>Version of <filename>debootstrap</filename> and/or <filename>cdebootstrap</filename> on the host system</para></listitem>
- <listitem><para>Architecture of the live system</para></listitem>
- <listitem><para>Distribution of the live system</para></listitem>
- <listitem><para>Version of the kernel on the live system</para></listitem>
-</itemizedlist>
-
-<para>
- You can generate a log of the build process by using the <filename>tee</filename> command:
-</para>
-
-<screen>
- # lh_build 2>&amp;1 | tee buildlog.txt
-</screen>
-
-<para>Additionally, to rule out other errors, it is always a good idea to tar up
-your config directory and upload it somewhere (do *not* send it as an attachment
-to the mailinglist), so that we can try to reproduce the errors you
-encountered.</para>
-
-<para>Remember to send in any logs that were produced with English locale
-settings, e.g. run your live-helper commands with a leading
-<code>LC_ALL=C</code> or <code>LC_ALL=en_US</code>.</para>
-
-
-</section>
-
-<section id="correct-package">
-<title>Use the correct package to report the bug against</title>
-
-<para>Where does the bug appear?</para>
-
-<para>
-<variablelist>
-
-<varlistentry><term>At build time whilst bootstrapping</term>
-
-<listitem><para>
-<para>&live-helper; first bootstraps a basic Debian system with <command>debootstrap</command> or <command>cdebootstrap</command>. Depending on the bootstrapping tool used and the Debian distribution it is bootstrapping, it may fail. If a bug appears here, check if the error is related to a specific Debian package (most likely), or if it is related to cdebootstrap itself.</para>
-
-<para>In both cases, this is not a bug in Debian Live, but rather in Debian itself which we can not fix this directly. Please report such a bug against <command>debootstrap</command>, <command>cdebootstrap</command> or the failing package.</para>
-</para></listitem>
-</varlistentry>
-
-<varlistentry><term>At build time whilst installing packages</term>
-
-<listitem><para>&live-helper; installs additional packages from the Debian archive and depending on the Debian distribution used and the daily archive state, it can fail. If a bug appears here, check if the error is also reproducible on a normal system.</para>
-
-<para>If this is the case, this is not a bug in Debian Live, but rather in Debian - please report it against the failing package. Running <filename>debootstrap</filename> seperately from the Live system build or running <filename>lh_bootstrap</filename> with <command>--debug</command> will give you more information.</para>
-
-<para>Also, if you are using a local mirror and/or any of sort of proxy and you are experiencing a problem, please always reproduce it first by bootstrapping from an official mirror.</para>
-
-</listitem>
-
-</varlistentry>
-
-<varlistentry>
- <term>At boot-time</term>
- <listitem>
-  <para>
-   If your image does not boot, please report it to the mailing list together with the information requested in <xref linkend="collect-information"/>. Do not forget to mention, how/when the image failed, in Qemu, VMWare or real hardware. If you are using a virtualization technology of any kind, please always run it on real hardware before reporting a bug. Providing a screenshot of the failure is also very helpful.
-  </para>
- </listitem>
-</varlistentry> 
-
-<varlistentry><term>At run-time</term>
-
-<listitem><para>If a package was successfully installed, but fails while actually running the Live system, this is probably a bug in Debian Live. However, </para></listitem>
-</varlistentry>
-
-</variablelist>
-</para>
-
-</section>
-
-<section id="research">
-<title>Do the research</title>
-<para>Before filing the bug, please search the web for the particular error message or symptom you are getting. As it is highly unlikely that you are the only person experiencing a particular problem, there is always a chance that it has been discussed elsewhere, and a possible solution, patch, or workaround has been proposed.</para>
-
-<para>You should pay particular attention to the Debian Live mailing list, as well as the homepage, as these are likely to contain the most up-to-date information. If such information exists, always include the references to it in your bug report.</para>
-
-<para>In addition, you should check the <ulink url="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-helper">current bug list for &live-helper;</ulink> and the <ulink url="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-initramfs">current bug list for live-initramfs</ulink> to see whether something similar has been reported already.</para>
-</section>
-
-<section id="where">
-<title>Where to report bugs</title>
-
-<para>The Debian Live project keeps track of all bugs in the Debian Bug Tracking System (BTS). For information on how to use the system, please see <ulink url="http://bugs.debian.org">http://bugs.debian.org</ulink>. You can also submit the bugs by using the <command>reportbug</command> command from the package with the same name.</para>
-
-<para>In general, you should report build time errors against the <ulink url="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-helper">live-helper</ulink> package and run time errors against <ulink url="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-initramfs">live-initramfs</ulink>. If you are unsure of which package is appropriate or need more help before submitting a bug report, please send a message to the mailing list and we will help you to figure it out.</para>
-
-<para>Please note that bugs found in distributions derived from Debian (such as Ubuntu, Knoppix, Xandros, etc.) should <emphasis>not</emphasis> be reported to the Debian BTS unless they can be also reproduced on a Debian system using official Debian packages.</para>
-
-</section>
-
+  <title>Reporting bugs</title>
+  <para>Debian Live is far from being perfect, but we want to make it as close as possible to perfect - with your help. Do not hesitate to report a bug: it is better to fill a report twice than never. However, this chapter includes recommendations how to file good bug reports.</para>
+  <para>For the impatient:</para>
+  <itemizedlist>
+    <listitem>
+      <para> Always check first the image status updates on <ulink url="http://live.debian.net/">our homepage</ulink> for known issues. </para>
+    </listitem>
+    <listitem>
+      <para> Always try to reproduce the bug with the <emphasis>most recent version of &live-helper; and &live-initramfs;</emphasis> before submitting a bug report. </para>
+    </listitem>
+    <listitem>
+      <para> Try to give <emphasis>as specific information as possible</emphasis> about the bug. This includes (at least) the version of &live-helper; and &live-initramfs; used and the distribution of the live system you are building. </para>
+    </listitem>
+  </itemizedlist>
+  <section id="known-issues">
+    <title>Known issues</title>
+    <para>Due to the nature of Debian testing and Debian unstable branches being a moving target, building a live system may not always be possible.</para>
+    <para>If this is a problem, do not build a system based on testing or unstable, but go with stable. live-helper does always default to the current stable release.</para>
+    <para>Currently known issues are listed under the section 'status' on <ulink url="http://live.debian.net/">our homepage</ulink>.</para>
+    <para>It is out of the scope of this manual to train you in correctly identifying and fixing problems in packages of the development branches, however, there are two things you can always try: When not succeeding to build testing, try if unstable works. If unstable does not work either, revert to testing and pinning the newer version of the failing package from unstable.</para>
+  </section>
+  <section id="rebuild-from-scratch">
+    <title>Rebuild from scratch</title>
+    <para>To ensure that a particular bug is not caused by an unclean built system, please always rebuild the whole live system from scratch to see if the bug is reproducible.</para>
+  </section>
+  <section id="up-to-date">
+    <title>Use up-to-date packages</title>
+    <para>This means</para>
+    <para>Using outdated packages can cause significant problems when trying to reproduce (and ultimately fix) your problem. If a relevant package is not available in Debian anymore, please recognize that the resources of the Debian kernel team are limited and will be unlikely to be able to fix the problem.</para>
+  </section>
+  <section id="collect-information">
+    <title>Collect information</title>
+    <para>Please provide enough information with your report. At a minimum, it should contain the exact version of &live-helper; version where the bug is encountered, and steps to reproduce it. Please use common sense and include other relevant information if you think that it might help in solving the problem.</para>
+    <para>To make the most out of your bug report, we require at least the following information:</para>
+    <itemizedlist>
+      <listitem>
+        <para>Architecture of the host system</para>
+      </listitem>
+      <listitem>
+        <para>Version of &live-helper; on the host system</para>
+      </listitem>
+      <listitem>
+        <para>Version of &live-initramfs; on the live system</para>
+      </listitem>
+      <listitem>
+        <para>Version of <filename>debootstrap</filename> and/or <filename>cdebootstrap</filename> on the host system</para>
+      </listitem>
+      <listitem>
+        <para>Architecture of the live system</para>
+      </listitem>
+      <listitem>
+        <para>Distribution of the live system</para>
+      </listitem>
+      <listitem>
+        <para>Version of the kernel on the live system</para>
+      </listitem>
+    </itemizedlist>
+    <para> You can generate a log of the build process by using the <filename>tee</filename> command: </para>
+    <screen> # lh_build 2&gt;&amp;1 | tee buildlog.txt </screen>
+    <para>Additionally, to rule out other errors, it is always a good idea to tar up your config directory and upload it somewhere (do *not* send it as an attachment to the mailinglist), so that we can try to reproduce the errors you encountered.</para>
+    <para>Remember to send in any logs that were produced with English locale settings, e.g. run your live-helper commands with a leading <code>LC_ALL=C</code> or <code>LC_ALL=en_US</code>.</para>
+  </section>
+  <section id="correct-package">
+    <title>Use the correct package to report the bug against</title>
+    <para>Where does the bug appear?</para>
+    <para>
+      <variablelist>
+        <varlistentry>
+          <term>At build time whilst bootstrapping</term>
+          <listitem>
+            <para>
+              <para>&live-helper; first bootstraps a basic Debian system with <command>debootstrap</command> or <command>cdebootstrap</command>. Depending on the bootstrapping tool used and the Debian distribution it is bootstrapping, it may fail. If a bug appears here, check if the error is related to a specific Debian package (most likely), or if it is related to cdebootstrap itself.</para>
+              <para>In both cases, this is not a bug in Debian Live, but rather in Debian itself which we can not fix this directly. Please report such a bug against <command>debootstrap</command>, <command>cdebootstrap</command> or the failing package.</para>
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>At build time whilst installing packages</term>
+          <listitem>
+            <para>&live-helper; installs additional packages from the Debian archive and depending on the Debian distribution used and the daily archive state, it can fail. If a bug appears here, check if the error is also reproducible on a normal system.</para>
+            <para>If this is the case, this is not a bug in Debian Live, but rather in Debian - please report it against the failing package. Running <filename>debootstrap</filename> seperately from the Live system build or running <filename>lh_bootstrap</filename> with <command>--debug</command> will give you more information.</para>
+            <para>Also, if you are using a local mirror and/or any of sort of proxy and you are experiencing a problem, please always reproduce it first by bootstrapping from an official mirror.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>At boot-time</term>
+          <listitem>
+            <para> If your image does not boot, please report it to the mailing list together with the information requested in <xref linkend="collect-information"/>. Do not forget to mention, how/when the image failed, in Qemu, VMWare or real hardware. If you are using a virtualization technology of any kind, please always run it on real hardware before reporting a bug. Providing a screenshot of the failure is also very helpful. </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>At run-time</term>
+          <listitem>
+            <para>If a package was successfully installed, but fails while actually running the Live system, this is probably a bug in Debian Live. However, </para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </para>
+  </section>
+  <section id="research">
+    <title>Do the research</title>
+    <para>Before filing the bug, please search the web for the particular error message or symptom you are getting. As it is highly unlikely that you are the only person experiencing a particular problem, there is always a chance that it has been discussed elsewhere, and a possible solution, patch, or workaround has been proposed.</para>
+    <para>You should pay particular attention to the Debian Live mailing list, as well as the homepage, as these are likely to contain the most up-to-date information. If such information exists, always include the references to it in your bug report.</para>
+    <para>In addition, you should check the <ulink url="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-helper">current bug list for &live-helper;</ulink> and the <ulink url="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-initramfs">current bug list for live-initramfs</ulink> to see whether something similar has been reported already.</para>
+  </section>
+  <section id="where">
+    <title>Where to report bugs</title>
+    <para>The Debian Live project keeps track of all bugs in the Debian Bug Tracking System (BTS). For information on how to use the system, please see <ulink url="http://bugs.debian.org">http://bugs.debian.org</ulink>. You can also submit the bugs by using the <command>reportbug</command> command from the package with the same name.</para>
+    <para>In general, you should report build time errors against the <ulink url="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-helper">live-helper</ulink> package and run time errors against <ulink url="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-initramfs">live-initramfs</ulink>. If you are unsure of which package is appropriate or need more help before submitting a bug report, please send a message to the mailing list and we will help you to figure it out.</para>
+    <para>Please note that bugs found in distributions derived from Debian (such as Ubuntu, Knoppix, Xandros, etc.) should <emphasis>not</emphasis> be reported to the Debian BTS unless they can be also reproduced on a Debian system using official Debian packages.</para>
+  </section>
 </chapter>
diff --git a/manual/en/resources.xml b/manual/en/resources.xml
index a7b4533..c9fc55a 100644
--- a/manual/en/resources.xml
+++ b/manual/en/resources.xml
@@ -1,43 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <chapter id="resources">
-<title>Resources and links</title>
-
-<section>
-<title>Links</title>
-<para>FIXME</para>
-
-<orderedlist>
-<listitem><para><ulink url="http://www.debian.org/">Debian homepage</ulink></para></listitem>
-</orderedlist>
-
-</section>
-
-<section>
-<title>English sources related to debian live</title>
-<itemizedlist>
-<listitem><para><ulink url="http://en.wikipedia.org/wiki/Debian_Live">Debian_Live definition  on Wikipedia </ulink></para></listitem>
-<listitem><para><ulink url="http://layer-acht.org/slides/20070115_debian-live_LCA2007.odp"> Presentation on Debian-Live </ulink></para></listitem>
-</itemizedlist>
-</section>
-
-<section>
-<title>German sources related to debian live</title>
-<itemizedlist>
-<listitem><para><ulink url="http://wiki.skolelinux.de/DebianLive"> German translation (work in progress) </ulink></para></listitem>
-<listitem><para><ulink url="http://www.linux-magazin.de/online_artikel/workshop_debian_live_system_mit_etch"> Article in linux-magazin.de </ulink></para></listitem>
-<listitem><para><ulink url="http://wiki.freenetproject.org/deDebianLiveCD"> Another german documentation </ulink></para></listitem>
-</itemizedlist>
-</section>
-
-<section>
-<title>Spanish sources related to debian live</title>
-<itemizedlist>
-<listitem><para><ulink url="http://el-directorio.org/DebianLive"> Spanish documentation project </ulink></para></listitem>
-</itemizedlist>
-</section>
-
+  <title>Resources and links</title>
+  <section>
+    <title>Links</title>
+    <para>FIXME</para>
+    <orderedlist>
+      <listitem>
+        <para>
+          <ulink url="http://www.debian.org/">Debian homepage</ulink>
+        </para>
+      </listitem>
+    </orderedlist>
+  </section>
+  <section>
+    <title>English sources related to debian live</title>
+    <itemizedlist>
+      <listitem>
+        <para>
+          <ulink url="http://en.wikipedia.org/wiki/Debian_Live">Debian_Live definition on Wikipedia </ulink>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <ulink url="http://layer-acht.org/slides/20070115_debian-live_LCA2007.odp"> Presentation on Debian-Live </ulink>
+        </para>
+      </listitem>
+    </itemizedlist>
+  </section>
+  <section>
+    <title>German sources related to debian live</title>
+    <itemizedlist>
+      <listitem>
+        <para>
+          <ulink url="http://wiki.skolelinux.de/DebianLive"> German translation (work in progress) </ulink>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <ulink url="http://www.linux-magazin.de/online_artikel/workshop_debian_live_system_mit_etch"> Article in linux-magazin.de </ulink>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          <ulink url="http://wiki.freenetproject.org/deDebianLiveCD"> Another german documentation </ulink>
+        </para>
+      </listitem>
+    </itemizedlist>
+  </section>
+  <section>
+    <title>Spanish sources related to debian live</title>
+    <itemizedlist>
+      <listitem>
+        <para>
+          <ulink url="http://el-directorio.org/DebianLive"> Spanish documentation project </ulink>
+        </para>
+      </listitem>
+    </itemizedlist>
+  </section>
 </chapter>
diff --git a/manual/en/success-stories.xml b/manual/en/success-stories.xml
index 6226b91..4db8208 100644
--- a/manual/en/success-stories.xml
+++ b/manual/en/success-stories.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <chapter id="success-stories">
-<title>Success Stories</title>
-
-<para>This chapter documents success stories with Debian Live applied.</para>
-
-<para>FIXME</para>
-
+  <title>Success Stories</title>
+  <para>This chapter documents success stories with Debian Live applied.</para>
+  <para>FIXME</para>
 </chapter>
diff --git a/manual/en/troubleshooting.xml b/manual/en/troubleshooting.xml
index ef2738b..db415d8 100644
--- a/manual/en/troubleshooting.xml
+++ b/manual/en/troubleshooting.xml
@@ -1,28 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <chapter id="troubleshooting">
-<title>Hints for troubleshooting</title>
-
-<para>To check on the client </para>
-
-<itemizedlist>
-<listitem>
-	<para> look at /live.log and /netboot.conf</para>
-</listitem>
-<listitem>
-	<para> could the image be mounted </para>
-</listitem>
-</itemizedlist>
-
-<para>To check on the pc that creates the image </para>
-
-<itemizedlist>
-<listitem>
-	<para>was chroot unmounted after build? (it should) </para>
-</listitem>
-</itemizedlist>
-
+  <title>Hints for troubleshooting</title>
+  <para>To check on the client </para>
+  <itemizedlist>
+    <listitem>
+      <para> look at /live.log and /netboot.conf</para>
+    </listitem>
+    <listitem>
+      <para> could the image be mounted </para>
+    </listitem>
+  </itemizedlist>
+  <para>To check on the pc that creates the image </para>
+  <itemizedlist>
+    <listitem>
+      <para>was chroot unmounted after build? (it should) </para>
+    </listitem>
+  </itemizedlist>
 </chapter>
diff --git a/manual/en/use-cases.xml b/manual/en/use-cases.xml
index 8bfb394..23ca078 100644
--- a/manual/en/use-cases.xml
+++ b/manual/en/use-cases.xml
@@ -1,67 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!ENTITY % commondata SYSTEM "common.ent">
 ]>
 <chapter id="use-cases">
-<title>Use Cases</title>
-
-<para>This chapter is for users to document their use cases with Debian Live.</para>
-
-<sect1 id="vnc-kiosk-client">
-<title>VNC Kiosk Client</title>
-<para>Create an image with &live-helper; to boot directly to a VNC server.</para>
-<itemizedlist>
-
-<listitem>
-	<para>Make a build directory:
-		<screen>$ mkdir vncBuild</screen>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Move to the build directory:
-		<screen>$ cd vncBuild</screen>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Example to config the build directory to include gdm metacity xtightvncviewer:
-		<screen>$ lh config --packages "gdm metacity xtightvncviewer"</screen>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Create a folder /etc/skel folder for a custom .xsession for the default user:
-		<screen>$ mkdir -p config/chroot_local-includes/etc/skel</screen>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Create the .xsession for the default user:
-		<screen>$ touch config/chroot_local-includes/etc/skel/.xsession</screen>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Edit the .xsession file to launch metacity and start xvncviewer with something similar to the below:
-	<screen>
-	#!/bin/sh
-	/usr/bin/metacity &amp;
-	/usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT
-	exit
-	</screen>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Build the image:
-		<screen># lh build</screen>
-	</para>
-</listitem>
-
-</itemizedlist>
-
-</sect1>
-
+  <title>Use Cases</title>
+  <para>This chapter is for users to document their use cases with Debian Live.</para>
+  <sect1 id="vnc-kiosk-client">
+    <title>VNC Kiosk Client</title>
+    <para>Create an image with &live-helper; to boot directly to a VNC server.</para>
+    <itemizedlist>
+      <listitem>
+        <para>Make a build directory: <screen>$ mkdir vncBuild</screen> </para>
+      </listitem>
+      <listitem>
+        <para>Move to the build directory: <screen>$ cd vncBuild</screen> </para>
+      </listitem>
+      <listitem>
+        <para>Example to config the build directory to include gdm metacity xtightvncviewer: <screen>$ lh config --packages "gdm metacity xtightvncviewer"</screen> </para>
+      </listitem>
+      <listitem>
+        <para>Create a folder /etc/skel folder for a custom .xsession for the default user: <screen>$ mkdir -p config/chroot_local-includes/etc/skel</screen> </para>
+      </listitem>
+      <listitem>
+        <para>Create the .xsession for the default user: <screen>$ touch config/chroot_local-includes/etc/skel/.xsession</screen> </para>
+      </listitem>
+      <listitem>
+        <para>Edit the .xsession file to launch metacity and start xvncviewer with something similar to the below: <screen> #!/bin/sh /usr/bin/metacity &amp; /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT exit </screen> </para>
+      </listitem>
+      <listitem>
+        <para>Build the image: <screen># lh build</screen> </para>
+      </listitem>
+    </itemizedlist>
+  </sect1>
 </chapter>
diff --git a/manual/fr/about.xml b/manual/fr/about.xml
deleted file mode 100644
index 652f232..0000000
--- a/manual/fr/about.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-	<!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-]>
-
-<chapter>
-<title>A propos</title>
-
-<xi:include href="about_manual.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="about_project.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-
-</chapter>
diff --git a/manual/fr/about_manual.xml b/manual/fr/about_manual.xml
deleted file mode 100644
index 28979f4..0000000
--- a/manual/fr/about_manual.xml
+++ /dev/null
@@ -1,397 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-	<!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-]>
-
-<sect1 id="meta">
-<title>About this manual</title>
-
-<para>
-	The main goal of this manual is to serve as a single access point to all
-documentation related to the Debian Live project. It does not include
-end-user documentation for using a Debian Live system.
-</para>
-
-<para>
-	Some of the commands mentioned in the text must be executed with superuser
-privileges which can be obtained by becoming the root user via
-<filename>su</filename> or by using <filename>sudo</filename>. To
-distinguish between commands which may be executed by an unprivileged user
-and those requiring superuser privileges, commands are prepended by
-<command>$</command> or <command>#</command> respectively. This symbol is
-not a part of the command.
-</para>
-
-<sect2 id="terms">
-<title>Terms</title>
-
-<variablelist>
-
-<varlistentry>
-<term>Live system</term>
-
-<listitem>
-<para>
-	An operating system that can boot without installation to a hard drive.
-Live systems do not alter local operating system(s) or file(s) already
-installed on the computer hard drive unless instructed to do so. Live
-systems are typically booted from media such as CDs or DVDs, some may also
-boot with USB sticks or over the network (via netboot images).
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Debian Live</term>
-
-<listitem>
-<para>
-	The Debian sub-project which maintains the &live-helper; and
-&live-initramfs; utilities.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Debian Live system</term>
-
-<listitem>
-<para>
-	A live system that uses software from the Debian operating system that may
-be booted from CDs, DVDs, USB sticks, over the network (via netboot images),
-and over the internet (via boot parameter fetch=URL)
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Build system / host system</term>
-
-<listitem>
-<para>
-	The environment used to create the live system.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>&live-helper;</term>
-
-<listitem>
-<para>
-	A collection of scripts used to build customised Debian Live systems.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>&live-initramfs;</term>
-
-<listitem>
-<para>
-	A collection of scripts used to boot live systems. &live-initramfs; is a
-fork of <filename>casper</filename> by Canonical, Ltd.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><filename>live-package</filename></term>
-
-<listitem>
-<para>
-	The former name of &live-helper;.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Debian Installer / (d-i)</term>
-
-<listitem>
-<para>
-	The official installation system for the Debian distribution.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Cheat codes</term>
-
-<listitem>
-<para>
-	FIXME
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>chroot</term>
-
-<listitem>
-<para>
-	The chroot program, chroot(8), enables us to run different instances of the
-GNU/Linux environment on a single system simultaneously without rebooting.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>binary image</term>
-
-<listitem>
-<para>
-	On a live system, binary image refers to the binary filesystem and the
-respective extension, such as binary.iso or binary.img.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Target distribution</term>
-
-<listitem>
-<para>
-	The distribution upon which your live system will be based. This can differ
-from the distribution of your Build System.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>&lenny;/&squeeze;/&sid; stable/testing/unstable</term>
-
-<listitem>
-<para>
-	The "stable" distribution contains the latest officially released
-distribution of Debian. The "testing" distribution is the staging area for
-the next stable release. A major advantage of using this distribution is
-that it has more recent versions of software relative to the "stable"
-release. The "unstable" distribution is where active development of Debian
-occurs. Generally, this distribution is run by developers and those who like
-to live on the edge.
-</para>
-
-<para>
-	At the time of writing, &lenny; is the current "stable" release and
-&squeeze; is the current "testing" release. &sid; will always be a synonym
-for the "unstable" release.
-</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-
-</sect2>
-
-<sect2 id="authors">
-<title>Authors</title>
-
-<para>
-	A list of authors (in alphabetical order):
-</para>
-
-<itemizedlist>
-
-<listitem>
-<para>
-	Ben Armstrong
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Brendan Sleight
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Chris Lamb
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Daniel Baumann
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Franklin Piat
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Jonas Stein
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Kai Hendry
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Marco Amadori
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Mathieu Geli
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Matthias Kirschner
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Richard Nelson
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Trent W. Buck
-</para>
-</listitem>
-
-</itemizedlist>
-
-</sect2>
-
-<sect2 id="contributing">
-<title>Contributing to this document</title>
-
-<para>
-	This manual is intended as a community project and all proposals for
-improvements and contributions are extremely welcome. The preferred way to
-submit a contribution is to send it to the mailing list. Please see <xref
-linkend="contact" /> for more information.
-</para>
-
-<para>
-	When submitting a contribution please clearly identify its copyright holder
-and include the licensing statement. Note that to be accepted the
-contribution must be licensed under the same license as the rest of the
-document, namely GPL version 3 or later.
-</para>
-
-<para>
-	The sources for this manual are maintained using the Git version control
-system. You can checkout the latest copy by executing:
-</para>
-
-<para>
-	<screen>$ git clone git://live.debian.net/git/live-manual.git</screen>
-</para>
-
-<para>
-	Prior to submission of your contribution, please preview your work. To
-preview the live-manual, ensure the packages needed for building are
-installed by executing:
-</para>
-
-<para>
-	<screen># apt-get install dblatex docbook-xml docbook-xsl make po4a
-	w3m</screen>
-</para>
-
-<para>
-	You may build the live-manual from the top level directory of your git
-checkout by executing:
-</para>
-
-<para>
-	<screen>$ make build</screen>
-</para>
-
-<sect3 id="commiting">
-<title>Applying patches</title>
-
-<para>
-	Directly commiting to the repository is possible by anyone. However, we ask
-you to send bigger changes to the mailinglist to discuss them first.  In
-order to push to the repository, the following steps are required.
-</para>
-
-<itemizedlist>
-
-<listitem>
-<para>
-	Fetch the public commit key:
-</para>
-
-<para>
-	<screen>$ mkdir -p ~/.ssh/identity.d
-$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live -O ~/.ssh/identity.d/live-manual at debian-live
-$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub -O ~/.ssh/identity.d/live-manual at debian-live.pub
-$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*</screen>
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Add the following section to your openssh-client config:
-</para>
-
-<para>
-	<screen> $ cat &gt;&gt; ~/.ssh/config &lt;&lt; EOF
-Host live.debian.net
-	Hostname live.debian.net
-	User gitosis
-	IdentityFile ~/.ssh/identity.d/live-manual at debian-live
-EOF</screen>
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Checkout a clone of the manual through ssh:
-</para>
-
-<para>
-	<screen>$ git clone gitosis at live.debian.net:/live-manual.git</screen>
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Commit the file after editing. Write commit messages, that consist of full
-useful sentences, starting with a capital letter and ending with a full
-stop. Usually starting with the form 'Fixing/Adding/Removing/Correcting/':
-</para>
-
-<para>
-	<screen>$ git commit -a</screen>
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Push the commit to the server:
-</para>
-
-<para>
-	<screen>$ git push</screen>
-</para>
-</listitem>
-
-</itemizedlist>
-
-</sect3>
-
-</sect2>
-
-</sect1>
diff --git a/manual/fr/about_project.xml b/manual/fr/about_project.xml
deleted file mode 100644
index 50480ad..0000000
--- a/manual/fr/about_project.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-]>
-<sect1 id="about">
-<title>About the Debian Live Project</title>
-
-<sect2 id="motivation">
-<title>Motivation</title>
-
-<sect3>
-<title>What is wrong with current live systems</title>
-
-<para>There are already several Debian-based live systems and they are doing a
-great job. But, from the Debian perspective most of them have one or more of
-the following disadvantages:</para>
-
-<orderedlist>
-<listitem><para>They are unofficial projects, developed outside of Debian.</para></listitem>
-<listitem><para>They mix different distributions, e.g. testing and unstable.</para></listitem>
-<listitem><para>They support i386 only.</para></listitem>
-<listitem><para>They modify the behaviour and/or appearance of packages by stripping them
-down to save space.</para></listitem>
-<listitem><para>They include unofficial packages.</para></listitem>
-<listitem><para>They ship custom kernels with additional patches that are not part of
-Debian.</para></listitem>
-<listitem><para>They are large and slow due to their sheer size and thus not suitable for
-rescue issues.</para></listitem>
-<listitem><para>They are not available in different flavours, e.g. CDs, DVDs, USB-stick and
-netboot images </para></listitem>
-</orderedlist>
-</sect3>
-
-<sect3>
-<title>Why create our own live system?</title>
-
-<para>Debian is the Universal Operating System: Debian should have an official
-live system for showing around and to officially represent the true, one and
-only Debian system with the following main advantages:</para>
-
-<orderedlist>
-<listitem><para>It would be an official Debian subproject.</para></listitem>
-<listitem><para>It reflects the (current) state of one distribution.</para></listitem>
-<listitem><para>It runs on as many architectures as possible.</para></listitem>
-<listitem><para>It consists of unchanged Debian packages only.</para></listitem>
-<listitem><para>It does not contain any unofficial packages.</para></listitem>
-<listitem><para>It uses an unaltered Debian kernel-image with no additional patches.</para></listitem>
-</orderedlist>
-
-</sect3>
-
-</sect2>
-
-<sect2 id="philosophy">
-<title>Philosophy</title>
-
-<sect3>
-<title>Only unchanged, official packages</title>
-<para>We will only use official packages from the Debian repository in the "main"
-section (possibly contrib, although not decided yet). The non-free section
-is not part of Debian and therefore cannot be used at all for live systems.</para>
-
-<para>We will not change any packages. Whenever we need to change something, we
-will do that in coordination with its package maintainer in Debian.</para>
-
-<para>As an exception, our own packages such as &live-helper; or &live-initramfs;
-may temporarily be used from our own repository for development reasons
-(e.g. to create development snapshots). They will be uploaded to Debian on a
-regular basis.</para>
-</sect3>
-
-<sect3>
-<title>No package configuration of the live system</title>
-<para>In this phase we will not ship or install sample or alternative
-configurations. All packages are used in their default configuration as they
-are after a regular installation of Debian.</para>
-
-<para>Whenever we need a different default configuration, we will do that in
-coordination with its package maintainer in Debian.</para>
-
-<para>A system for configuring packages is provided using debconf in <command>lh
-config</command> (use --preseed FILE) allowing custom configured packages to
-be installed in your custom produced Debian Live images, but for official
-live images only default configuration will be used. For more information,
-please see <xref linkend="customization"/>.</para>
-
-<para>Exception: There are a few essential changes needed to bring a live system
-to life (e.g. configuring pam to allow empty passwords). These essential
-changes have to be kept as minimal as possible and should be merged within
-the Debian repository if possible.</para>
-</sect3>
-
-<sect3>
-<title>Live system to hard disk installer</title>
-<para>For the moment we will not ship an installer to copy the live system to a
-partition on the hard disk. Although we keep the changes in the live system
-as drastically minimal as possible compared to a regular Debian
-installation, the live system does differ in a few essential points (see
-exceptions, guideline 2).</para>
-
-<para> Therefore, we will ship a copy of the regular DebianInstaller (resp. Debian
-Installer, Graphical Installer) instead, to allow users to perform a regular
-Debian installation (and, of course, cdebootstrap and debootstrap are on the
-system too).</para>
-</sect3>
-
-</sect2>
-
-<sect2 id="contact">
-<title>Contact</title>
-
-<variablelist>
- <varlistentry><term>Mailing list</term>
- <listitem><para>The primary contact for the project is the <ulink
-url="http://lists.debian.org/debian-live/">mailing list</ulink>. You can
-email the list directly by addressing your mail to
-<email>debian-live at lists.debian.org</email>. The <ulink
-url="http://lists.debian.org/debian-live/">list archives</ulink> are also
-available.</para></listitem>
-</varlistentry>
-
-<varlistentry><term>IRC</term>
-<listitem><para>A number of users and developers are present in the <ulink
-url="irc://irc.debian.org/#debian-live">#debian-live</ulink> channel on
-<ulink url="http://oftc.net">OFTC</ulink>. When asking a question on IRC,
-please be patient for an answer. If no answer is forthcoming, please email
-the mailing list.</para></listitem>
-</varlistentry>
-
-<varlistentry><term>BTS</term>
-<listitem><para>The Debian Bug Tracking System (BTS) contains details of bugs reported by
-users and developers. Each bug is given a number, and is kept on file until
-it is marked as having been dealt with. For more information, please see
-<xref linkend="bugs"/>.</para></listitem>
-</varlistentry>
-
-<varlistentry><term>Wiki</term>
-<listitem><para>The <ulink url="http://wiki.debian.org/DebianLive">Debian Live wiki</ulink>
-is a place to gather information, discuss applied technologies, and document
-frameworks of Debian Live systems that go beyond the scope of this document.</para></listitem>
-</varlistentry>
-
-</variablelist>
-
-</sect2>
-
-</sect1>
diff --git a/manual/fr/appendices_configuration-files.xml b/manual/fr/appendices_configuration-files.xml
deleted file mode 100644
index d7b5481..0000000
--- a/manual/fr/appendices_configuration-files.xml
+++ /dev/null
@@ -1,531 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-]>
-
-<appendix id="configuration-files">
-<title>Configuration files</title>
-
-<section id="config-binary">
-<title>The <filename>config/binary</filename> file</title>
-
-<variablelist>
-<varlistentry>
- <term>LH_BINARY_FILESYSTEM</term>
- <listitem><para>Set image filesystem. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BINARY_IMAGES</term>
- <listitem><para>Set image type. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BINARY_INDICES</term>
- <listitem><para>Set apt/aptitude generic indices. (See <xref
-linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BOOTAPPEND_LIVE</term>
- <listitem><para>Set boot parameters. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BOOTAPPEND_INSTALL</term>
- <listitem><para>Set boot parameters. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BOOTLOADER</term>
- <listitem><para>Set bootloader. (See <xref linkend="bootloaders"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_CHECKSUMS</term>
- <listitem><para>Set checksums. (See <xref linkend="cheat-codes"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_CHROOT_BUILD</term>
- <listitem><para>Control if we build binary images chrooted. (See <xref
-linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_DEBIAN_INSTALLER</term>
- <listitem><para>Set debian-installer. (See <xref linkend="debian-installer"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_DEBIAN_INSTALLER_DAILY</term>
- <listitem><para>Set daily images. (See <xref linkend="debian-installer"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_ENCRYPTION</term>
- <listitem><para>Set encrytion. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_GRUB_SPLASH</term>
- <listitem><para>Set custom grub splash. (See <xref linkend="splash"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_HOSTNAME</term>
- <listitem><para>Set hostname. (See <xref linkend="hostname"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_ISO_APPLICATION</term>
- <listitem><para>Set iso author. (See <xref linkend="iso-metadata"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_ISO_PREPARER</term>
- <listitem><para>Set iso preparer. (See <xref linkend="iso-metadata"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_ISO_PUBLISHER</term>
- <listitem><para>Set iso publisher. (See <xref linkend="iso-metadata"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_ISO_VOLUME</term>
- <listitem><para>Set iso volume (max 32 chars). (See <xref linkend="iso-metadata"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_JFFS2_ERASEBLOCK</term>
- <listitem><para>Set jffs2 eraseblock size. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_MEMTEST</term>
- <listitem><para>Set memtest. (See <xref linkend="memtest"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_NET_ROOT_FILESYSTEM</term>
- <listitem><para>Set netboot filesystem. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_NET_ROOT_MOUNTOPTIONS</term>
- <listitem><para>Set nfsopts. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_NET_ROOT_PATH</term>
- <listitem><para>Set netboot server directory. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_NET_ROOT_SERVER</term>
- <listitem><para>Set netboot server address. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_NET_COW_FILESYSTEM</term>
- <listitem><para>Set net client cow filesystem. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_NET_COW_MOUNTOPTIONS</term>
- <listitem><para>Set cow mount options. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_NET_COW_PATH</term>
- <listitem><para>Set cow directory. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_NET_COW_SERVER</term>
- <listitem><para>Set cow server. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_NET_TARBALL</term>
- <listitem><para>Set net tarball. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SYSLINUX_SPLASH</term>
- <listitem><para>Set custom syslinux splash. (See <xref linkend="splash"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SYSLINUX_TIMEOUT</term>
- <listitem><para>Set custom syslinux timeout in seconds. (See <xref linkend="syslinux"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SYSLINUX_CFG</term>
- <listitem><para>Set custom syslinux configuration file. (See <xref linkend="syslinux"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SYSLINUX_MENU</term>
- <listitem><para>Set syslinux menu. (See <xref linkend="syslinux"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SYSLINUX_MENU_LIVE_ENTRY</term>
- <listitem><para>Set text to be used on the menu for live entries. (See <xref
-linkend="syslinux"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY</term>
- <listitem><para>Set text to be used on the menu for live entries (failsafe ones). (See <xref
-linkend="syslinux"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SYSLINUX_MENU_MEMTEST_ENTRY</term>
- <listitem><para>Set text to be used on the menu for memtest entry. (See <xref
-linkend="syslinux"/> and <xref linkend="memtest"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_USERNAME</term>
- <listitem><para>Set username. (See <xref linkend="live-user"/>)</para></listitem>
-</varlistentry>
-
-</variablelist>
-</section>
-
-<section id="config-bootstrap">
-<title>The <filename>config/bootstrap</filename> file</title>
-
-<variablelist>
-<varlistentry>
- <term>LH_ARCHITECTURE</term>
- <listitem><para>Select chroot architecture. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BOOTSTRAP_CONFIG</term>
- <listitem><para>Set distribution config directory. (See <xref
-linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BOOTSTRAP_INCLUDE</term>
- <listitem><para>Include packages on base. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BOOTSTRAP_EXCLUDE</term>
- <listitem><para>Exclude packages on base. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BOOTSTRAP_FLAVOUR</term>
- <listitem><para>Select flavour to use. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BOOTSTRAP_KEYRING</term>
- <listitem><para>Set distribution keyring. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_DISTRIBUTION</term>
- <listitem><para>Select distribution to use. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_MIRROR_BOOTSTRAP</term>
- <listitem><para>Set mirror to bootstrap from. (See <xref linkend="package-sources"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_MIRROR_CHROOT</term>
- <listitem><para>Set mirror to fetch packages from. (See <xref linkend="package-sources"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_MIRROR_CHROOT_SECURITY</term>
- <listitem><para>Set security mirror to fetch packages from. (See <xref
-linkend="package-sources"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_MIRROR_BINARY</term>
- <listitem><para>Set mirror which ends up in the image. (See <xref
-linkend="package-sources"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_MIRROR_BINARY_SECURITY</term>
- <listitem><para>Set security mirror which ends up in the image. (See <xref
-linkend="package-sources"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SECTIONS</term>
- <listitem><para>select section(s) to use. (See <xref linkend="package-sources"/>)</para></listitem>
-</varlistentry>
-</variablelist>
-</section>
-
-<section id="config-chroot">
-<title>The <filename>config/chroot</filename> file</title>
-
-<variablelist>
-<varlistentry>
- <term>LH_CHROOT_FILESYSTEM</term>
- <listitem><para>Set chroot filesystem. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_UNION_FILESYSTEM</term>
- <listitem><para>Set union filesystem. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_EXPOSED_ROOT</term>
- <listitem><para>expose root as read only. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_HOOKS</term>
- <listitem><para>Set hook commands. (See <xref linkend="hooks"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_INTERACTIVE</term>
- <listitem><para>Set interactive build. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_KEYRING_PACKAGES</term>
- <listitem><para>Set keyring packages. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_LANGUAGE</term>
- <listitem><para>Set language to use. (See <xref linkend="language"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_LINUX_FLAVOURS</term>
- <listitem><para>Set kernel flavour to use. (See <xref linkend="kernel"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_LINUX_PACKAGES</term>
- <listitem><para>Set kernel packages to use. (See <xref linkend="kernel"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_PACKAGES</term>
- <listitem><para>Set packages to install. (See <xref linkend="lh-packages"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_PACKAGES_LISTS</term>
- <listitem><para>Set package list to install. (See <xref linkend="package-lists"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_TASKS</term>
- <listitem><para>Set tasks to install. (See <xref linkend="tasks"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SECURITY</term>
- <listitem><para>enable security updates. (See <xref linkend="package-sources"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SYMLINKS</term>
- <listitem><para>enable symlink convertion. (See <xref linkend="symlinks"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SYSVINIT</term>
- <listitem><para>enable sysvinit. (See <xref linkend="startup-scripts"/>)</para></listitem>
-</varlistentry>
-
-</variablelist>
-</section>
-
-<section id="config-common">
-<title>The <filename>config/common</filename> file</title>
-
-<variablelist>
-<varlistentry>
- <term>LH_APT</term>
- <listitem><para>Set package manager. (See <xref linkend="package-installation"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_APT_FTP_PROXY</term>
- <listitem><para>Set apt/aptitude ftp proxy. (See <xref linkend="package-installation"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_APT_HTTP_PROXY</term>
- <listitem><para>Set apt/aptitude http proxy. (See <xref linkend="package-installation"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_APT_PDIFFS</term>
- <listitem><para>Set apt/aptitude pdiff indices. (See <xref linkend="package-installation"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_APT_PIPELINE</term>
- <listitem><para>Set apt/aptitude pipeline depth. (See <xref
-linkend="package-installation"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_APT_RECOMMENDS</term>
- <listitem><para>Set apt/aptitude recommends. (See <xref linkend="package-installation"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_APT_SECURE</term>
- <listitem><para>Set apt/aptitude security. (See <xref linkend="package-installation"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BOOTSTRAP</term>
- <listitem><para>Set bootstrap program. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_CACHE</term>
- <listitem><para>control cache. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_CACHE_INDICES</term>
- <listitem><para>control if downloaded package indices should be cached. (See <xref
-linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_CACHE_PACKAGES</term>
- <listitem><para>control if downloaded packages files should be cached. (See <xref
-linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_CACHE_STAGES</term>
- <listitem><para>control if completed stages should be cached. (See <xref
-linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_DEBCONF_FRONTEND</term>
- <listitem><para>Set debconf(1) frontend to use. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_DEBCONF_NOWARNINGS</term>
- <listitem><para>Set debconf(1) warnings. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_DEBCONF_PRIORITY</term>
- <listitem><para>Set debconf(1) priority to use. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_INITRAMFS</term>
- <listitem><para>Set initramfs hook. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_FDISK</term>
- <listitem><para>Set fdisk program. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_LOSETUP</term>
- <listitem><para>Set losetup program. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_MODE</term>
- <listitem><para>Set distribution mode. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_ROOT_COMMAND</term>
- <listitem><para>use sudo or equivalent. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_USE_FAKEROOT</term>
- <listitem><para>use fakeroot/fakechroot. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_TASKSEL</term>
- <listitem><para>Set tasksel program. (See <xref linkend="tasks"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_INCLUDES</term>
- <listitem><para>Set includes. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_TEMPLATES</term>
- <listitem><para>Set templates. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_BREAKPOINTS</term>
- <listitem><para>enable breakpoints. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_DEBUG</term>
- <listitem><para>enable debug. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_FORCE</term>
- <listitem><para>enable force. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_QUIET</term>
- <listitem><para>enable quiet. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_VERBOSE</term>
- <listitem><para>enable verbose. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-</variablelist>
-</section>
-
-<section id="config-source">
-<title>The <filename>config/source</filename> file</title>
-
-<variablelist>
-<varlistentry>
- <term>LH_SOURCE</term>
- <listitem><para>Set source option. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term>LH_SOURCE_IMAGES</term>
- <listitem><para>Set image type. (See <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-
-</variablelist>
-</section>
-
-</appendix>
diff --git a/manual/fr/appendices_configuration-layout.xml b/manual/fr/appendices_configuration-layout.xml
deleted file mode 100644
index 7ca45ab..0000000
--- a/manual/fr/appendices_configuration-layout.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-]>
-
-<appendix id="configuration-layout">
-<title>Configuration layout</title>
-
-<variablelist>
-<title>Layout of the <filename class="directory">config/</filename> directory</title>
-
-<varlistentry>
- <term><filename class="directory">binary_debian-installer/</filename></term>
- <listitem><para>(see <xref linkend="debian-installer"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">binary_grub/</filename></term>
- <listitem><para>(see <xref linkend="bootloaders"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">binary_local-debs/</filename></term>
- <listitem><para>(see <xref linkend="debian-installer"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">binary_local-hooks/</filename></term>
- <listitem><para>(see <xref linkend="binary-local-hooks"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">binary_local-includes/</filename></term>
- <listitem><para>(see <xref linkend="binary-includes"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">binary_local-packageslists/</filename></term>
- <listitem><para>(see <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">binary_local-udebs/</filename></term>
- <listitem><para>(see <xref linkend="debian-installer"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">binary_rootfs/</filename></term>
- <listitem><para>(see <xref linkend="configuration-layout"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">binary_syslinux/</filename></term>
- <listitem><para>(see <xref linkend="bootloaders"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">chroot_apt/</filename></term>
- <listitem><para>(see <xref linkend="custom-packages-apt"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">chroot_local-hooks/</filename></term>
- <listitem><para>(see <xref linkend="chroot-local-hooks"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">chroot_local-includes/</filename></term>
- <listitem><para>(see <xref linkend="chroot-local-includes"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">chroot_local-packages/</filename></term>
- <listitem><para>(see <xref linkend="local-packages"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">chroot_local-packageslists/</filename></term>
- <listitem><para>(see <xref linkend="package-lists"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">chroot_local-presed/</filename></term>
- <listitem><para>(see <xref linkend="debconf-preseed"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">chroot_sources/</filename></term>
- <listitem><para>(see <xref linkend="custom-apt-repo"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">includes/</filename></term>
- <listitem><para>(see <xref linkend="bootloaders"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename class="directory">templates/</filename></term>
- <listitem><para>(see <xref linkend="bootloaders"/>)</para></listitem>
-</varlistentry>
-
-<varlistentry>
- <term><filename>bootstrap</filename></term>
- <listitem><para>(see <xref linkend="config-bootstrap"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename>binary</filename></term>
- <listitem><para>(see <xref linkend="config-binary"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename>chroot</filename></term>
- <listitem><para>(see <xref linkend="config-chroot"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename>common</filename></term>
- <listitem><para>(see <xref linkend="config-common"/>)</para></listitem>
-</varlistentry>
-<varlistentry>
- <term><filename>source</filename></term>
- <listitem><para>(see <xref linkend="config-source"/>)</para></listitem>
-</varlistentry>
-
-</variablelist>
-
-</appendix>
diff --git a/manual/fr/basics.xml b/manual/fr/basics.xml
deleted file mode 100644
index 9827501..0000000
--- a/manual/fr/basics.xml
+++ /dev/null
@@ -1,665 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-	<!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-]>
-
-<chapter id="basics">
-<title>Les principes</title>
-
-<para>
-	Ce chapitre contient un bref aprçu du processus de création ainsi que des
-instructions sur la méthode de démarrage des différents types d'images
-</para>
-
-<section>
-<title>Qu'est-ce qu'un système live</title>
-
-<para>
-	A live system usually means an OS booted on a computer from a removable
-medium (such as CD-ROM, USB stick, or network), ready to use without any
-installation on the usual drive(s), with an auto-configuration done at
-runtime (see <xref linkend="terms" />).
-</para>
-
-<para>
-	Avec Debian Live, c'est un système d'exploitation Debian GNU/Linux,
-construit pour l'une des achitectures supportées (actuellement amd64, i386,
-powerpc, et sparc). Il est construit à partir des composants suivants:
-</para>
-
-<variablelist>
-
-<varlistentry>
-<term>Noyau Linux</term>
-
-<listitem>
-<para>
-	L'image du noyau Linux, habituellement nommée <filename>vmlinuz*</filename>.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Initial RAM disk image (initrd)</term>
-
-<listitem>
-<para>
-	RAM disk setup for the Linux boot, containing modules possibly needed to
-mount the filesystem's image and some scripts to do it.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>L'image du système</term>
-
-<listitem>
-<para>
-	The OS filesystem image. Debian Live uses SquashFS, a compressed filesystem,
-to minimize its image size. Note that it's read-only. So, during boot the
-Debian Live system will use a RAM disk and 'union' mechanism to enable
-writing files within the running system. However, all modifications will be
-lost upon shutdown unless optional persistence partition(s) are used. (See
-<xref linkend="persistence" />.)
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Chargeur de démarrage</term>
-
-<listitem>
-<para>
-	A small piece of code, crafted to boot up from the chosen media, possibly
-presenting a prompt or menu to allow selection of options/configuration. It
-then loads the Linux kernel and its initrd to run with an associated
-filesystem image. Different solutions can be used depending on the target
-media and format of the filesystem containing the previous components:
-Isolinux to boot from a CD or DVD in ISO9660 format, syslinux for HDD or USB
-drive booting from a VFAT partition, GRUB for ext2/3 partition, pxelinux for
-PXE netboot, etc.
-</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-
-<para>
-	The Debian Live tools will build the system image from your specifications,
-setup a Linux kernel and its initrd, a bootloader to run them, all in one
-media-dependant format(ISO9660 image, disk image, etc.)
-</para>
-
-</section>
-
-<section>
-<title>Premiers pas: Construire une image ISO</title>
-
-<para>
-	La séquence suivante de l'assistant de commandes fournit par &live-helper;
-créera une image ISO basique contenant uniquement le système Debian standard
-sans X.org. Elle peut être gravée sur un CD ou un DVD.
-</para>
-
-<para>
-	First, we run the <filename>lh config</filename> helper command which will
-create a <filename>"config/"</filename> hierarchy in the current directory
-for use by other helper commands:
-</para>
-
-<para>
-	<screen>$ lh config</screen>
-</para>
-
-<para>
-	By passing no parameters to <filename>lh config</filename> we indicated that
-we wish to use the defaults. This will create an image of type binary (see
-<xref linkend="lh-config" />).
-</para>
-
-<para>
-	Now that we have a <filename>"config/"</filename> hierarchy, we may build
-the image with the <filename>lh build</filename> helper command:
-</para>
-
-<para>
-	<screen># lh build</screen>
-</para>
-
-<para>
-	This process can take a while, depending on the speed of your network
-connection (see <xref linkend="lh-build" />).
-</para>
-
-<section>
-<title>Tester une image ISO avec Qemu</title>
-
-<para>
-	Tester une image ISO est facile
-</para>
-
-<para>
-	<screen># apt-get install qemu
-$ qemu -cdrom binary.iso</screen>
-</para>
-
-</section>
-
-<section>
-<title>Testing an ISO image with virtualbox-ose</title>
-
-<para>
-	In order to test the ISO with virtualbox-ose:
-</para>
-
-<para>
-	<screen># apt-get install virtualbox-ose</screen>
-</para>
-and either install 
-<itemizedlist>
-<listitem><para>the modules package for a stock kernel eg
-virtualbox-ose-modules-2.6.26-1-486 or</para></listitem>
-<listitem><para>the modules package compiled for your kernel using module-assistant from the
-package virtualbox-ose-source </para></listitem>
-</itemizedlist>
-<para> Run Virtualbox:</para>
-For example, in Gnome
-<para>  {{{Applications -> System Tools -> VirtualBox OSE }}}</para>
-
-<para>Create a virtual machine from your Live ISO</para>
-
-<para>To create a virtual machine "mylive" from A CDROM ISO "binary.iso" in
-VirtualBox:</para>
-<para>  {{{Machine -> New }}}</para>
-<para>In the Wizard: FIXME </para>
-</section>
-
-<section>
-<title>Testing an ISO image with VMware Workstation</title>
-
-<para>In order to test the ISO with VMware Workstation:</para>
-
-<para> Run VMware Workstation:</para>
-<para>Click on Edit virtual machine settings in the VM summary page. </para>
-<para>Then, click on the CD-ROM device and select Use ISO image. Remeber to
-connect the CD-ROM device at power on and remeber to adjust the boot order
-in the bios.</para>
-</section>
-
-<section>
-<title>Burning an ISO image to a physical medium</title>
-
-<para>
-	Graver une imgae ISO est simple
-</para>
-
-<para>
-	<screen># apt-get install wodim
-$ wodim binary.iso</screen>
-</para>
-
-</section>
-
-</section>
-
-<section>
-<title>Construire une image USB/HDD</title>
-
-<para>
-	 La séquence de commandes suivantes de l'assistant créera une image USB/HDD
-contenant uniquement le système Debian standard sans X.org. Elle peut être
-utilisée pour démarrer depuis une clef USB, une disque dur USB, ainsi que
-d'autres types variés de périphériques de stockage amovibles.
-</para>
-
-<para>
-	Note if you created an iso image with the previous example, you will need to
-clean up your working directory with the <filename>lh clean</filename>
-helper command (see <xref linkend="lh-clean" />):
-</para>
-
-<para>
-	<screen>$ lh clean --binary</screen>
-</para>
-
-<para>
-	Run the <filename>lh config</filename> helper command with the parameters to
-configure the <filename>"config/"</filename> hierarchy to create a USB/HDD
-image type:
-</para>
-
-<para>
-	<screen>$ lh config -b usb-hdd</screen>
-</para>
-
-<para>
-	Now build the image with the <filename>lh build</filename> helper command:
-</para>
-
-<para>
-	<screen># lh build</screen>
-</para>
-
-<section  id="image_copying">
-<title>Copier une image USB/HDD sur une clef USB</title>
-
-<para>
-	The generated binary image contains a <acronym>VFAT</acronym> partition and
-the <command>syslinux</command> bootloader, ready to be directly written on
-an USB stick. Plug in an USB stick with a size larger than that of
-<filename>binary.img</filename> and type:
-</para>
-
-<para>
-	<screen>$ dd if=binary.img of=${USBSTICK}</screen>
-</para>
-
-<para>
-	where <replaceable>${USBSTICK}</replaceable> is the device file of your key,
-like <filename>/dev/sdb</filename> (not a partition like
-<filename>/dev/sdb1</filename>!); you can find the right device name by
-looking in <command>dmesg</command>'s output after plugging in the stick,
-for example.
-</para>
-
-<para>
-	<important>This will definitely overwrite any previous contents on your
-	stick!</important>
-</para>
-
-</section>
-
-<section>
-<title>Tester une image USB/HDD avec Qemu</title>
-
-<para>
-	<screen># apt-get install qemu
-$ qemu -hda binary.img</screen>
-</para>
-
-</section>
-<section>
-<title>Testing an USB/HDD image with VMware Workstation</title>
-
-<para>
-	In order to test the USB/HDD image with VMware Workstation:
-</para>
-
-<para> Run VMware Workstation:</para>
-<para>Write the image to an usb stick. In VMware, click on Edit virtual machine
-settings in VM summary page. Then, add a new physical harddisk device and
-enter the device node of your usb stick.</para>
-</section>
-
-<section>
-<title>Using the space left on a USB stick</title>
-
-<para>
-	If you want to use the remaining free space after you have installed the
-<filename>binary.img</filename>, you can use a partitioning tool such as
-gparted or parted to create a new partition on the stick. The first
-partition will be used by the Debian Live system.
-</para>
-
-<para>
-	<screen># gparted ${USBSTICK}</screen>
-</para>
-
-<para>
-	After the creation of the partition you have to create a filsystem on
-it. One possible choice would be ext2 (ext3 isn't recommended because the
-journaling causes too many writes to the stick).
-</para>
-
-<para>
-	<screen># mkfs.ext2 ${USBSTICK}</screen>
-</para>
-
-<para>
-	If you want to use this data partition with Windows, use FAT32.
-</para>
-
-<para>
-	<screen># mkfs.vfat -F 32</screen>
-</para>
-
-<para>
-	<important>Remember: Every time you install a new binary.img on the
-	stick, all your data will be lost because the image includes a complete
-	partition table.</important>
-</para>
-
-<para>
-	FIXME: Describe installing Debian Live to a partition (e.g. /dev/sdc1)  AND
-using a bootloader to boot this.
-</para>
-
-</section>
-
-</section>
-
-<section>
-<title>Construire une image démarrable depuis le réseau</title>
-
-<para>
-	La séquence de commandes suivante de l'assistant créera une image basique
-pour un démarrage réseau contenant uniquement le système Debian standard
-sans X.org. Elle peut être utilisée pour démarrer depuis le réseau.
-</para>
-
-<para>
-	Note if you performed any previous examples, you will need to clean up your
-working directory with the <filename>lh clean</filename> helper command:
-</para>
-
-<para>
-	<screen>$ lh clean --binary</screen>
-</para>
-
-<para>
-	Run the <filename>lh config</filename> helper command with the parameters to
-configure the <filename>"config/"</filename> hierarchy to create our netboot
-image:
-</para>
-
-<para>
-	<screen>$ lh config -b net --net-root-path "/srv/debian-live" --net-root-server "192.168.0.1"</screen>
-</para>
-
-<para>
-	In contrast with the ISO and USB hdd images, netbooting does not support
-serving a filesystem image with the client so the files must be served via
-NFS. The <replaceable>net-root-path</replaceable> and
-<replaceable>net-root-server</replaceable> options specify the location and
-server, respectively, of the NFS server where the filesytem image will be
-located at boot-time.
-</para>
-
-<para>
-	Now build the image with the <filename>lh build</filename> helper command:
-</para>
-
-<para>
-	<screen># lh build</screen>
-</para>
-
-<para>
-	In a network boot the client runs a small piece of software, which usually
-resides on the <acronym>EEPROM</acronym> of the Ethernet card.  This program
-sends a <abbrev>DHCP</abbrev> request to get an <abbrev>IP</abbrev> address
-and information about what to do next.  Typically the next step is getting a
-higher level boot loader via the <abbrev>TFTP</abbrev> protocol. That could
-be <application>Grub</application>, <application>PXELINUX</application>, or
-even boot directly to an operating system like
-<application>Linux</application>.
-</para>
-
-<para>
-	For example, if you unpack the generated
-<filename>binary-net.tar.gz</filename> archive in the
-<filename>/srv/debian-live</filename> directory, you'll find the filesystem
-image in <filename>live/filesystem.squashfs</filename> and the kernel,
-initrd and PXE Linux bootloader in
-<filename>tftpboot/debian-live/i386</filename>.
-</para>
-
-<para>
-	We must now configure three services on the server to enable netboot:
-</para>
-
-<variablelist>
-
-<varlistentry>
-<term>Le serveur DHCP</term>
-
-<listitem>
-<para>
-	We must configure our network's DHCP server to be sure to give an
-<abbrev>IP</abbrev> address to the computer netbooting, and to advertise the
-location of the PXE bootloader.
-</para>
-
-<para>
-	Here is an example for inspiration, written for the ISC DHCP server (package
-<literal>dhcp3-server</literal>) in the
-<filename>/etc/dhcp3/dhcpd.conf</filename> configuration file:
-</para>
-
-<para>
-	<screen># Options DHCP spécifiques à Pxelinux:
-option space pxelinux;
-option pxelinux.magic      code 208 = string;
-option pxelinux.configfile code 209 = text;
-option pxelinux.pathprefix code 210 = text;
-option pxelinux.reboottime code 211 = unsigned integer 32;
-
-
-subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
-
-  # IP addresses available for guests
-  range 192.168.1.100 192.168.1.149;
-
-  # allow booting from the net
-  allow bootp;
-
-  # for net booting, server where the first file to be loaded (by TFTP
-  # protocol) ("filename" following definition) lies : so the TFTP
-  # server's name.
-  next-server myserver;
-
-  # net boot configuration for guests with a PXE client :
-  if substring (option vendor-class-identifier, 0, 9) = "PXEClient" {
-    # Note : all files for PXE are relatives to the TFTP server's root
-    # path, as usually defined in /etc/inetd.conf.
-
-    # PXE boot loader (first program to be loaded, by TFTP)
-    filename "pxelinux.0";
-
-    # describe some specific pxelinux's options through DHCP options :
-    site-option-space "pxelinux";
-    option pxelinux.magic f1:00:74:7e;
-    if exists dhcp-parameter-request-list {
-      # Always send the PXELINUX options (specified in hexadecimal)
-      option dhcp-parameter-request-list = concat(option dhcp-parameter-request-list,d0,d1,d2,d3);
-    }
-
-    # For a PXE boot menu, different versions are available : simple
-    # text, text with curses, graphic (VESA)
-    #option pxelinux.configfile "pxelinux/config_simple";
-    #option pxelinux.configfile "pxelinux/config_curses";
-    option pxelinux.configfile "pxelinux/config_vesa";
-
-    # automatically reboot after 10 minutes of no activity
-    option pxelinux.reboottime 600;
-  }
-}</screen>
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Serveur TFTPd</term>
-
-<listitem>
-<para>
-	Il fournit le noyau et la ramdisk initiale au système pendant l'e
-</para>
-
-<para>
-	You should install the <command>tftpd-hpa</command> package. It can serve
-all files contained inside a root directory, usually
-<filename>/var/lib/tftpboot/</filename>, as defined with its
-<option>-s</option> option. To let it serve files inside
-<filename>/srv/debian-live/tftpboot</filename>, modify its start definition
-in <filename>/etc/inetd.conf</filename> with:
-</para>
-
-<para>
-	<screen>tftp           dgram   udp     wait    root  /usr/sbin/in.tftpd /usr/sbin/in.tftpd -s /srv/debian-live/tftpboot -r blksize -v -v</screen>
-</para>
-
-<para>
-	et relancer le super server avec <command>/etc/init.d/openbsd-inetd
-reload</command>.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Serveur NFS</term>
-
-<listitem>
-<para>
-	Once the guest computer has downloaded and booted a Linux kernel and loaded
-its initrd, it will try to mount the Live filesystem image through a NFS
-server.
-</para>
-
-<para>
-	You should install the <command>nfs-kernel-server</command> package --
-<command>nfs-user-server</command> does not function correctly with netboot.
-</para>
-
-<para>
-	Then, make the filesystem image available through NFS by adding a line like
-the following to <filename>/etc/exports</filename>:
-</para>
-
-<para>
-	<screen>/srv/debian-live *(ro,async,subtree_check,no_root_squash)</screen>
-</para>
-
-<para>
-	and tell the NFS server about this new export with the following command:
-</para>
-
-<para>
-	<screen># exportfs -rv</screen>
-</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-
-<para>
-	Setting up these three services can be a little tricky. You might need some
-patience to get all of them working together. The Debian Installer Manual's
-<ulink url="http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html" >TFTP
-Net Booting</ulink> section might help as that process is very similar.
-</para>
-
-</section>
-
-<section>
-<title> Netboot testing HowTo </title>
-
-<para>
-	Netboot image creation is made easy with live-helper magic, but testing the
-images on physical machines can be really time consuming.
-</para>
-
-<para>
-	To make our life easier, we can use virtualization. There are two solutions:
-</para>
-
-<variablelist>
-
-<varlistentry>
-<term>VMWare Player</term>
-
-<listitem>
-<para>
-	Install VMWare Player ("free as in beer" edition)
-</para>
-
-<para>
-	Create a PXETester directory, and create a text file called pxe.vwx inside
-</para>
-
-<para>
-	Paste this text inside:
-</para>
-
-<para>
-	<screen>#!/usr/bin/vmware
-config.version = "8"
-virtualHW.version = "4"
-memsize = "512"
-MemAllowAutoScaleDown = "FALSE"
-
-ide0:0.present = "FALSE"
-ide1:0.present = "FALSE"
-floppy0.present = "FALSE"
-sound.present = "FALSE"
-tools.remindInstall = "FALSE"
-
-ethernet0.present = "TRUE"
-ethernet0.addressType = "generated"
-
-displayName = "Test Boot PXE"
-guestOS = "other"
-
-ethernet0.generatedAddress = "00:0c:29:8d:71:3b"
-uuid.location = "56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b"
-uuid.bios = "56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b"
-ethernet0.generatedAddressOffset = "0"</screen>
-</para>
-
-<para>
-	You can play with this configuration file (i.e. change memory limit to 256)
-</para>
-
-<para>
-	Double click on this file (or run VMWare player and selecet this file).
-</para>
-
-<para>
-	When running just press space if that strange question comes up...
-</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-
-<variablelist>
-
-<varlistentry>
-<term>Qemu</term>
-
-<listitem>
-<para>
-	Install qemu, bridge-utils, sudo.
-</para>
-
-<para>
-	Edit <filename>/etc/qemu-ifup</filename>:
-</para>
-
-<para>
-	<screen>#!/bin/sh
-sudo -p "Password for $0:" /sbin/ifconfig $1 172.20.0.1
-echo "Executing /etc/qemu-ifup"
-echo "Bringing up $1 for bridged mode..."
-sudo /sbin/ifconfig $1 0.0.0.0 promisc up
-echo "Adding $1 to br0..."
-sudo /usr/sbin/brctl addif br0 $1
-sleep 2</screen>
-</para>
-
-<para>
-	Get, or build a grub-floppy-netboot (in the svn).
-</para>
-
-<para>
-	Launch qemu with "-net nic,vlan=0 -net tap,vlan=0,ifname=tun0"
-</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-
-</section>
-
-</chapter>
diff --git a/manual/fr/coding-style.xml b/manual/fr/coding-style.xml
deleted file mode 100644
index d3e4e96..0000000
--- a/manual/fr/coding-style.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-]>
-<chapter id="coding-style">
-<title>Coding Style</title>
-
-<para>This chapter documents the coding style used in &live-helper; and (ideally)
-in &live-initramfs;.</para>
-
-<sect1 id="compatibilty">
-<title>Compatibility</title>
-
-<itemizedlist>
-	<listitem>Don't use syntax or semantics that are unique to the Bash shell. For example, the use of array constructs.</listitem>
-	<listitem>Only use the POSIX subset - for example, use $(foo) over `foo`.</listitem>
-	<listitem>You can check your scripts with 'sh -n' and 'checkbashisms'</listitem>
-</itemizedlist>
-</sect1>
-
-<sect1 id="indenting">
-<title>Indenting</title>
-
-<itemizedlist>
-	<listitem>Always use tabs over spaces.</listitem>
-</itemizedlist>
-
-</sect1>
-
-<sect1 id="wrapping">
-<title>Wrapping</title>
-
-<itemizedlist>
-	<listitem>Generally, lines are 80 chars at maximum.</listitem>
-
-	<listitem>Use the "Linux style" of line breaks:
-
-	<para>Bad: <screen>
-if foo; then
-	bar
-fi
-</screen>
-
-	</para>
-	<para>Good: <screen>
-if foo
-then
-	bar
-fi
-</screen>
-	</para></listitem>
-
-	<listitem>The same holds for functions:
-
-	<para>Bad: <screen>
-foo () {
-	bar
-}
-</screen>
-	</para>
-	<para>Good: <screen>
-foo ()
-{
-	bar
-}
-</screen>
-	</para></listitem>
-</itemizedlist>
-
-</sect1>
-
-<sect1 id="variables">
-<title>Variables</title>
-
-<itemizedlist>
-	<listitem>Variables are always in capital letters.</listitem>
-	<listitem>Variables that used in config always start with LH_ prefix.</listitem>
-	<listitem>Internal temporary variables should start with the _LH_ prefix.</listitem>
-	<listitem>Local variables start with __LH_ prefix.</listitem>
-	<listitem>Use braces around variables; eg. write ${FOO} instead of $FOO.</listitem>
-	<listitem>Always protect variables with respect to potential whitespaces, write "${FOO}" not ${FOO}.</listitem>
-	<listitem>For consistency reasons, always use quotes when assigning values to variables:
-
-	<para>Bad: <screen>
-FOO=bar
-</screen>
-	</para>
-	<para>Good: <screen>
-FOO="bar"
-</screen>
-
-	</para></listitem>
-
-	<listitem>If multiple variables are used, quote the full expression:
-
-	<para>Bad: <screen>
-if [ -f "${FOO}"/foo/"${BAR}"/bar ]
-then
-	foobar
-fi
-</screen>
-	</para>
-	<para>Good: <screen>
-if [ -f "${FOO}/foo/${BAR}/bar" ]
-then
-	foobar
-fi
-</screen>
-	</para></listitem>
-</itemizedlist>
-
-</sect1>
-
-<sect1 id="misc">
-<title>Miscellaneous</title>
-
-<itemizedlist>
-	<listitem>Use "|" (without the surround quotes) as a seperator in calls to sed, e.g. "sed -e 's|foo|bar|'" (without "").</listitem>
-	<listitem>Don't use the test command for comparisons or tests, use "[" "]" (without ""), e.g. "if [ -x /bin/foo ]; ..." and not "if test -x /bin/foo; ...".</listitem>
-
-</itemizedlist>
-
-</sect1>
-
-</chapter>
diff --git a/manual/fr/common-tasks.xml b/manual/fr/common-tasks.xml
deleted file mode 100644
index 95ed60e..0000000
--- a/manual/fr/common-tasks.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-]>
-<chapter id="common-tasks">
-<title>Tâche communes</title>
-
-<section id="debian-installer">
-<title>L'installeur Debian</title>
- <para>
-  Bien que l'intérêt du système live soit qu'il permet d'éviter une
-installation permanente, il est possible d'intégrer un installeur dans
-l'image. Il existe différents types d'installation, selon les images et
-comment les installer.
- </para>
-
- <note>
-  <title>
-   L'Installeur Debian
-  </title>
-  <para>
-   Notez l'utilisation de majuscules en référence à l'Installeur Debian dans
-cette section. Nous désignons ainsi explicitement l'installeur officiel pour
-le système Debian, et rien d'autre. On le trouve souvent abrégé en "d-i".
-  </para>
- </note>
- <para>
-  Les trois principaux types d'installeurs sont :
- </para>
- <variablelist>
-  <varlistentry>
-   <term>
-    L'Installeur Debian "normal"
-   </term>
-   <listitem>
-    <para>
-     C'est une image Debian live classique, pourvue d'un noyau et d'initrd
-séparés, qui, si vous sélectionnez le bootloader approprié, lance une
-instance standard de l'Installeur Debian, comme si vous démarriez d'un live
-cd Debian.
-    </para>
-    <para>
-     Cela signifie que Debian s'installe en récupérant et en installant des
-paquets <command>.deb</command> et en utilisant
-<filename>debootstrap</filename> ou <filename>cdebootstrap</filename>,
-depuis le réseau ou un média local, de sorte qu'un système Debian standard
-soit installé sur le disque dur.
-    </para>
-    <para>
-     Tout ce procédé est configurable de diverses façons, via les fichiers
-preseed. Pour plus d'informations, référez-vous à la page appropriée du wiki
-de l'Installeur Debian, ainsi qu'au guide d'installation. Ceci est désormais
-opérationnel dans &live-helper;.
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term>
-    L'Installeur "Live" Debian
-   </term>
-   <listitem>
-    <para>
-     C'est une image Debian Live, pourvue d'un noyau et d'initrd séparés, qui, si
-vous sélectionnez le bootloader approprié, lance une instance de
-l'Installeur Debian.
-    </para>
-    <para>
-     L'installation se déroule de la même façon que l'installation "normale"
-décrite plus haut, mais au moment d'installer réellement les paquets, au
-lieu d'utiliser <filename>debootstrap</filename> pour récupérer et installer
-les paquets, l'image du système de fichiers "live" est copiée sur la
-cible. Passé ce stade, l'Installeur Debian continue normalement à installer
-et configurer des éléments tels que le chargeur de boot, les utilisateurs
-locaux, etc.
-    </para>
-    <para>
-     Ceci fonctionne désormais.
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term>
-    Installeur - style "Ubuntu"
-   </term>
-   <listitem>
-    <para>
-     Cela consiste à démarrer un sytème Debian Live graphique et de lancer un
-"wizard" qui installe et configure le système live, tout en restant à
-l'intérieur de l'environnement graphique.
-    </para>
-    <para>
-     Ceci n'est pour l'instant PAS possible dans Debian Live.
-    </para>
-   </listitem>
-  </varlistentry>
- </variablelist>
-
-
-  <para>
- By default, no installer will be included in the Debian Live image. You can
-enable it by using <filename>lh_config</filename> : <screen>
-$ lh_config --help
-  ...
-  [--debian-installer enabled|cdrom|netinst|netboot|businesscard|live|disabled]
-  [--debian-installer-distribution CODENAME|daily]
-  [--debian-installer-preseedfile FILE|URL]
-  ...
- </screen>
- </para>
-
-
- <para>
-  Les valeurs "Normal", "Live" et "Ubuntu" ne sont pas valides pour <term>LH_BINARY_DEBIAN_INSTALLER</term>. Refer to the output of <filename>lh_config</filename> cited above to
-choose the appropriate values.
- </para>
-</section>
-
-<section id="wifi-connection">
-<title>WiFi Connection</title>
- <para>
-  Depending on the Debian Live image you are using and the given tools
-configured with your Debian Live image you may need to only attach to an
-available access point. If you encounter difficulty a good place to start is
-at the Debian Wiki entry for <ulink
-url="http://wiki.debian.org/WiFi">WiFi</ulink>.
- </para>
-</section>
-
-</chapter>
diff --git a/manual/fr/customization.xml b/manual/fr/customization.xml
deleted file mode 100644
index fcd7723..0000000
--- a/manual/fr/customization.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-]>
-<chapter id="customization">
-<title>Personnalisation</title>
-
-<xi:include href="customization_packages.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="customization_contents.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="customization_internationalization.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="customization_bootup.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="customization_binary.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="customization_backports.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-
-</chapter>
diff --git a/manual/fr/customization_backports.xml b/manual/fr/customization_backports.xml
deleted file mode 100644
index 7281b7d..0000000
--- a/manual/fr/customization_backports.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-]>
-<sect1 id="backports">
-
-<title>Using a newer kernel with Lenny</title>
-
-<para>The backports repository, backports.org, lacks the necessary module packages
-(linux-modules-extra-2.6, aufs, etc.) so an alternative repository has been
-set up, in order to build Lenny live images with a later kernel. Shown here
-is one way of doing it.</para>
-
-<screen>
-$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6'
-
-$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.chroot
-$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.binary
-
-$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.chroot.gpg
-$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.binary.gpg
-
-# lh_build
-</screen>
-
-</sect1>
diff --git a/manual/fr/customization_binary.xml b/manual/fr/customization_binary.xml
deleted file mode 100644
index d2991a4..0000000
--- a/manual/fr/customization_binary.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-]>
-<sect1 id="binary">
-<title>Customising the binary image</title>
-
-<para>This chapter discusses FIXME</para>
-
-<sect2 id="iso-metadata">
- <title>ISO metadata</title>
- <para>
-  When creating an ISO9660 binary image, you can use the following options to
-add various textual metadata for your image. This can help you easily
-identify the version or configuration of an image without booting it.
- </para>
-
-<variablelist>
- <varlistentry>
-  <term><command>LH_ISO_APPLICATION</command> / <command>--iso-application
-<replaceable>NAME</replaceable></command></term>
-  <listitem>
-   <para>
-    This should describe the application that will be on the image. The maximum
-length for this field is 128 characters.
-   </para>
-  </listitem>
- </varlistentry>
- <varlistentry>
-  <term><command>LH_ISO_PREPARER</command> / <command>--iso-preparer
-<replaceable>NAME</replaceable></command></term>
-  <listitem>
-   <para>
-    This should describe the preparer of the image, usually with some contact
-details. The default for this option is the &live-helper; version you are
-using, which may help with debugging later. The maximum length for this
-field is 128 characters.
-   </para>
-  </listitem>
- </varlistentry>
- <varlistentry>
-  <term><command>LH_ISO_PUBLISHER</command> / <command>--iso-publisher
-<replaceable>NAME</replaceable></command></term>
-  <listitem>
-   <para>
-    This should describe the publisher of the image, usually with some contact
-details. The maximum length for this field is 128 characters.
-   </para>
-  </listitem>
- </varlistentry>
- <varlistentry>
-  <term><command>LH_ISO_VOLUME</command> / <command>--iso-volume
-<replaceable>NAME</replaceable></command></term>
-  <listitem>
-   <para>
-    This should specify the volume ID of the image. This is used as a
-user-visible label on some platforms such as Windows and Apple Mac OS. The
-maximum length for this field is 32 characters.
-   </para>
-  </listitem>
- </varlistentry>
-</variablelist>
-
-</sect2>
-
-</sect1>
diff --git a/manual/fr/customization_bootup.xml b/manual/fr/customization_bootup.xml
deleted file mode 100644
index 7f213e0..0000000
--- a/manual/fr/customization_bootup.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-]>
-<sect1 id="bootup">
-<title>Customising the bootup process</title>
-
-<para>This chapter discusses customisation of bootup process of a live system,
-including kernel options, modifications to the bootloader, "splash" screens
-and startup scripts.</para>
-
-<para>FIXME</para>
-
-<sect2 id="kernel">
-<title>Kernel</title>
-</sect2>
-
-<sect2 id="bootloaders">
-<title>Bootloaders</title>
-<para>
- FIXME
-</para>
-
-<sect3>
-<title>Choosing a bootloader</title>
-<para>
- FIXME
-</para>
-</sect3>
-
-<sect3 id="syslinux">
-<title>Syslinux</title>
- <para>In the default configuration, Syslinux will pause indefinitely at its splash
-screen. To adjust this, modify the <command>LH_SYSLINUX_TIMEOUT</command>
-value or pass <command>--syslinux-timeout
-<replaceable>TIMEOUT</replaceable></command> to
-<filename>lh_config</filename>. The value is specified in units of 1/10s and
-the maximum possible timeout is 35996. A timeout of 0 (zero) disables the
-timeout completely. For more information please see syslinux(1).</para>
-</sect3>
-
-<sect3>
-<title>Bootloader templates</title>
-<para>
- FIXME
-</para>
-</sect3>
-
-<sect3>
-<title>Booting a Debian Live USB/HDD system from a USB stick with Grub</title>
-<para>
-Suppose you've built your Debian Live USB/HDD image, but want to install it
-on an already used USB stick with ext2/3 partition and Grub bootloader:
-</para>
-
-<para>First, copy live components in a directory on your key: the Linux kernel
-(<filename>vmlinuz*</filename>), its Initial RAM disk
-(<filename>initrd*</filename>) and the system
-(<filename>filesystem.squashfs</filename>): <screen>
-# mkdir /media/myUsb/boot/live/
-# cp binary/vmlinuz1 binary/initrd1.img binary/live/filesystem.squashfs /media/myUsb/boot/live/
-</screen>
-</para>
-
-<para>Then, add a stanza in Grub's menu definition to boot up this system:
-<screen>
-echo &gt;&gt;/media/myUsb/boot/grub/menu.lst  &lt;&lt;EOF
-
-title           my Debian Live
-root            (hd0,1)    # my Ext2 partition is the second on this stick
-kernel          /boot/live/vmlinuz1 boot=live vga=791 persistent union=aufs live-media-path=boot/live
-initrd          /boot/live/initrd1.img
-
-EOF
-</screen> The important kernel command line option
-to add here is <variablename>live-media-path</variablename>, which tells to Live initrd's script in which subdirectory to look for the
-SquashFS image.
-</para>
-
-<para>Next, umount your USB stick and reboot on it. That's all!</para>
-
-</sect3>
-</sect2>
-
-<sect2 id="splash">
-<title>Splash screens</title>
-<para>
- FIXME
-</para>
-</sect2>
-
-<sect2 id="memtest">
-<title>Memtest</title>
-<para>
- FIXME
-</para>
-</sect2>
-
-<sect2 id="startup-scripts">
-<title>Startup scripts</title>
-<para>
- FIXME
-</para>
-</sect2>
-
-<sect2 id="cheat-codes">
-<title>Cheat codes</title>
-<para>
- FIXME
-</para>
-<para>
- Checksums.
-</para>
-</sect2>
-
-</sect1>
diff --git a/manual/fr/customization_contents.xml b/manual/fr/customization_contents.xml
deleted file mode 100644
index 2634571..0000000
--- a/manual/fr/customization_contents.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-]>
-<sect1 id="contents">
-<title>Customising contents</title>
-
-<para>This chapter discusses further customisation of the live system.</para>
-
-<sect2>
- <title>Includes</title>
-
- <para>Using includes, it is possible to add (or replace) arbitrary files in your
-Debian Live image. &live-helper; provides three mechanisms for using them:</para>
-
- <variablelist>
-  <varlistentry>
-   <term>
-    Chroot local includes
-   </term>
-   <listitem>
-    <para>
-     These allow you to add or replace files to the chroot/Live
-filesystem. Please see <xref linkend="chroot-local-includes"/> for more
-information.
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term>
-    Binary local includes
-   </term>
-   <listitem>
-    <para>
-     These allow you to add or replace files in the binary image. Please see
-<xref linkend="binary-local-includes"/> for more information.
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term>
-    Binary includes
-   </term>
-   <listitem>
-    <para>
-     These allow you to add or replace Debian specific files in the binary image,
-such as the templates and tools directories. Please see <xref
-linkend="binary-includes"/> for more information.
-    </para>
-   </listitem>
-  </varlistentry>
- </variablelist>
-
- <para>
-  Please see <xref linkend="terms"/> for more information about the
-distinction between the "Live" and "binary" images.
- </para>
-
-<sect3 id="chroot-local-includes">
- <title>Live/chroot local includes</title>
- <para>
-  Chroot local includes can be used to add or replace files in the chroot/Live
-filesystem so that they are visible when the Live system is booted. Typical
-uses for them are to populate the skeleton user directory (<filename
-class="directory">/etc/skel</filename>) used by the live system to create
-the live user's home directory, or adding configuration files where
-additional processing is not required.
- </para>
-
- <para>
-  To include files, simply add them to your <filename
-class="directory">config/chroot_local-includes</filename> directory. This
-directory corresponds to the root directory (<filename
-class="directory">/</filename>) of the live system. For example, to add a
-file <filename>/var/www/index.html</filename> in the live system, use:
- </para>
-
- <screen>
-  $ mkdir -p config/chroot_local-includes/var/www
-  $ cp /path/to/my/index.html config/chroot_local-includes/var/www
- </screen>
-
- <para>
-  Your configuration will then have the following layout:
- </para>
-
- <screen>
--- config
-   [...]
-    |-- chroot_local-includes
-    |   `-- var
-    |       `-- www
-    |           `-- index.html
-   [...]
-    `-- templates
- </screen>
-
- <para>
-  Chroot local includes are installed after package installation so that files
-installed by packages are overwritten.
- </para>
-</sect3>
-
-<sect3 id="binary-local-includes">
-<title>Binary local includes</title>
- <para>
-  FIXME.
- </para>
-</sect3>
-
-<sect3 id="binary-includes">
-<title>Binary includes</title>
- <para>
-  FIXME.
- </para>
-</sect3>
-
-</sect2>
-
-<sect2 id="hooks">
-<title>Hooks</title>
-
-<para>FIXME.</para>
-<para>Enabling hooks</para>
-
-<sect3 id="chroot-local-hooks">
-<title>Live/chroot local hooks</title>
-<para>FIXME.</para>
-</sect3>
-
-<sect3 id="binary-local-hooks">
-<title>Binary local hooks</title>
-<para>FIXME.</para>
-</sect3>
-
-</sect2>
-
-<sect2 id="debconf-preseed">
- <title>Preseeding Debconf questions</title>
-
- <para>Files in the <filename
-class="directory">config/chroot_local-preseed</filename> directory are
-considered to be debconf preseed files and are installed by &live-helper;
-using <filename>debconf-set-selections</filename>.</para>
-
- <para>For more information about debconf, please see debconf(7) in the
-<command>debconf</command> package.</para>
-</sect2>
-
-<sect2 id="symlinks">
-<title>Symlink conversion</title>
-<para>FIXME. (This is probably in the wrong section)</para>
-</sect2>
-
-</sect1>
diff --git a/manual/fr/customization_internationalization.xml b/manual/fr/customization_internationalization.xml
deleted file mode 100644
index b13ad26..0000000
--- a/manual/fr/customization_internationalization.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-]>
-<sect1 id="internalization">
-<title>Customising Locale And Language</title>
-<para>This chapter discusses customisation for language specific parameters.</para>
-
-<sect2 id="locale">
-<title>Default locale and keyboard</title>
-
-<para>
-The default locale when building a live cd is "locale=en_US.UTF-8".  To set
-the locale for the UK (locale=en_GB.UTF-8)  <screen>
-$ lh_config --bootappend-live "locale=en_GB.UTF-8"
-</screen> The entry for a British keyboard would be <screen>
-$ lh_config --bootappend-live "keyb=uk"
-</screen> To configure both the locale and the keyboard for the
-UK the entry would be <screen>
-$ lh_config --bootappend-live "locale=en_GB.UTF-8 keyb=uk"
-</screen> or <screen>
-$ lh_config --bootappend-live "locale=uk"
-</screen>
-</para>
-<note>
- You can find a list of options in the manpage for live-initramfs. Only UTF8 locales are supported by live-initramfs.
-</note>
-</sect2>
-<sect2 id="default_language">
-<title>l10n Packages</title>
-
-<para>
-lh build can automatically check for each package, for which it's know that
-there are -l10n packages available and install them. To add Swedish packages
-the entry would be <screen>
-$ lh_config --language "se"
-</screen> This will also change
-the default syslinux language if <screen>
-  config/templates/syslinux/se
-</screen> is
-available. Check syslinux configuration FIXME
-</para>
-
-</sect2>
-
-</sect1>
diff --git a/manual/fr/customization_packages.xml b/manual/fr/customization_packages.xml
deleted file mode 100644
index 4833647..0000000
--- a/manual/fr/customization_packages.xml
+++ /dev/null
@@ -1,544 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-	<!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-]>
-
-<sect1 id="packages">
-<title>Customising package installation</title>
-
-<para>
-	This chapter discusses the customisation of package installation. This
-involves:
-</para>
-
-<orderedlist>
-
-<listitem>
-<para>
-	Selecting additional packages to be installed
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Installing modified packages
-</para>
-</listitem>
-
-</orderedlist>
-
-<sect2 id="package-sources">
-<title>Package sources</title>
-
-<para>
-	FIXME
-</para>
-
-<variablelist>
-
-<varlistentry>
-<term>Debian repositories</term>
-
-<listitem>
-<para>
-	To set a local mirror (used to ''build'' the live-cd)
-</para>
-
-<para>
-	<screen>$ lh config --mirror-bootstrap "http://local.intra.net/debian/" --mirror-chroot "http://local.intra.net/debian/"</screen>
-</para>
-
-<para>
-	The generic mirror is added to the live-system's /etc/apt/sources.list.
-</para>
-
-<para>
-	<screen>$ lh config --mirror-binary "http://ftp.debian.org/debian/"</screen>
-</para>
-
-<para>
-	Note: It is ''not'' used for building the live-cd but to install new
-software while using the live-cd.
-</para>
-
-<para>
-	It can be disabled by setting binary indices parameter to disabled
-</para>
-
-<para>
-	<screen>$ lh config --binary-indices disabled</screen>
-</para>
-
-<para>
-	Note: the same applies for mirror chroot security and mirror binary security
-</para>
-
-<para>
-	<screen>$ lh config --mirror-chroot-security {URL}
-$ lh config --mirror-binary-security {URL}</screen>
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Own repository</term>
-
-<listitem>
-<para>
-	To add more repositories (e.g. backports, experimental packages, etc.),
-create
-<filename>config/chroot_sources/your-cdd-repo.{chroot,binary}</filename>
-file.
-</para>
-
-<para>
-	e.g. <filename>config/chroot_sources/live.chroot</filename> allows you to
-install packages from the debian live snapshot repository at live-cd build
-time (you have to add the packages in your package list):
-</para>
-
-<para>
-	<screen>deb http://live.debian.net/ sid-snapshots main contrib non-free</screen>
-</para>
-
-<para>
-	If you add the line to
-<filename>config/chroot_sources/live.binary</filename> the repository will
-be added to your live-system's <filename>/etc/apt/sources.list</filename>.
-</para>
-
-<para>
-	If such files exist, they will be picked up automatically.
-</para>
-
-<para>
-	You can also put the gpg-key used to sign the repository into
-config/chroot_sources/foo.{binary,chroot}.gpg
-</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-
-</sect2>
-
-<sect2 id="package-installation">
-<title>Package installation</title>
-
-<para>
-	You can elect to use either <command>apt</command> or
-<command>aptitude</command> when installing packages. Which utility is used
-is governed by the <command>LH_APT</command> variable in
-<filename>config/chroot</filename> or by the <command>--apt</command>
-argument to <filename>lh config</filename>:
-</para>
-
-<variablelist>
-
-<varlistentry>
-<term><command>apt</command></term>
-
-<listitem>
-<para>
-	Specifying a missing package causes package installation to fail, which may
-not be the desired behaviour.
-</para>
-
-<para>
-	This is the default setting for building images for Lenny or later.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><command>aptitude</command></term>
-
-<listitem>
-<para>
-	Specifying a missing package causes package installation to succeed, which
-may not be the desired behaviour.
-</para>
-
-<para>
-	This is the default setting for building images for Etch.
-</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-
-</sect2>
-
-<sect2>
-<title>Installing additional packages</title>
-
-<para>
-	&live-helper; has a number of mechanisms for indicating that additional
-packages should be installed, including:
-</para>
-
-<orderedlist>
-
-<listitem>
-<para>
-	The <command>LH_PACKAGES</command> variable
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Package lists
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Local packages (<filename>chroot_local-packages/</filename>)
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Tasks
-</para>
-</listitem>
-
-</orderedlist>
-
-<sect3 id="lh-packages">
-<title>The <command>LH_PACKAGES</command> variable</title>
-
-<para>
-	To install additional packages, simply add them to the
-<command>LH_PACKAGES</command> variable in
-<filename>config/chroot</filename>. For example:
-</para>
-
-<para>
-	<screen>LH_PACKAGES="package1 package2 package3 ... "</screen>
-</para>
-
-<para>
-	You can also specify initial values on the command line:
-</para>
-
-<para>
-	<screen>$ lh config --packages "package1 package2 package3"</screen>
-</para>
-
-<para>
-	The behaviour of &live-helper; when specifying a package that does not exist
-is determined by your choice of APT utility. See <xref
-linkend="package-installation"/> for more details.
-</para>
-
-<para>
-	If you need to specify a large number of packages to be installed or you
-need flexibility regarding which packages to install, you should probably be
-using package lists. See <xref linkend="package-lists"/> for more
-information.
-</para>
-
-</sect3>
-
-<sect3 id="package-lists">
-<title>Package lists</title>
-
-<para>
-	Package lists are a powerful way of expressing which packages should be
-installed. &live-helper; ships with a number of predefined package lists
-which provide sensible default package selections for the GNOME and KDE
-desktop environments, as well as standard systems.
-</para>
-
-<para>
-	To specify a package list, add the name of the list to the
-<command>LH_PACKAGES_LISTS</command> variable in
-<filename>config/chroot</filename>. For example:
-</para>
-
-<para>
-	<screen>LH_PACKAGES_LISTS="gnome"</screen>
-</para>
-
-<para>
-	Package lists that are distributed with &live-helper; reside in the
-<command>/usr/share/live-helper/lists</command> directory.
-</para>
-
-<sect4>
-<title>Local packages lists</title>
-
-<para>
-	You may supplement the supplied lists using local package lists stored in
-<command>config/chroot_local-packageslists</command>.
-</para>
-
-<para>
-	Package lists that exist in this directory always override package lists
-distributed with &live-helper;. This can cause undesired effects when.
-</para>
-
-<note>
-<title>&live-helper; 2.x change</title>
-
-<para>
-	Any file with <command>.list</command> suffix in
-<command>config/chroot_local-packageslists</command> is automatically
-enabled, the variable LH_PACKAGES_LISTS should only be used referencing
-packages lists included in live-helper (at
-<command>/usr/share/live-helper/lists/</command>.
-</para>
-
-</note>
-
-</sect4>
-
-<sect4>
-<title>Extending a provided package list using includes</title>
-
-<para>
-	FIXME
-</para>
-
-<para>
-	<screen>#include &lt;gnome&gt;
-iceweasel</screen>
-</para>
-
-<para>
-	The package lists that are included with &live-helper; make extensive use of
-includes. They are available to view in the
-<command>/usr/share/live-helper/lists</command> directory.
-</para>
-
-</sect4>
-
-<sect4>
-<title>Using conditionals inside packages lists</title>
-
-<para>
-	FIXME
-</para>
-
-<para>
-	<screen>#if ARCHITECTURE amd64
-ia32-libs
-#endif</screen>
-</para>
-
-<para>
-	or if <command>LH_ARCHITECTURE</command> is set to <command>i386</command>
-or <command>amd64</command>:
-</para>
-
-<para>
-	<screen>#if ARCHITECTURE i386 amd64
-memtest86+
-#endif</screen>
-</para>
-
-<para>
-	or if <command>LH_SECTIONS</command> contains either
-<command>contrib</command> or <command>non-free</command>:
-</para>
-
-<para>
-	<screen>#if SECTIONS contrib non-free
-vrms
-#endif</screen>
-</para>
-
-<para>
-	A conditional may surround an <command>#include</command> directive:
-</para>
-
-<para>
-	<screen>#if ARCHITECTURE amd64
-#include &lt;gnome-full&gt;
-#endif</screen>
-</para>
-
-<para>
-	Any &live-helper; configuration variable that begins with
-<command>LH_</command> can be tested in this way.
-</para>
-
-<para>
-	The nesting of conditionals is not supported.
-</para>
-
-</sect4>
-
-</sect3>
-
-<sect3 id="tasks">
-<title>Tasks</title>
-
-<para>
-	FIXME
-</para>
-
-</sect3>
-
-</sect2>
-
-<sect2 id="custom-packages">
-<title>Installing modified or third-party packages</title>
-
-<para>
-	Whilst it is against the philosophy of Debian Live, it may sometimes be
-necessary to build a Live system with modified versions of packages that are
-in the Debian repository. This may be to modify or support additional
-features, languages and branding, or even to remove elements of existing
-packages that are undesirable. Similarly, "third-party" packages may be used
-to add bespoke and/or proprietary functionality.
-</para>
-
-<para>
-	This section does not cover advice regarding building or maintaining
-modified packages. Joachim Breitner's <ulink
-url="http://www.joachim-breitner.de/blog/archives/282-How-to-fork-privately.html"
->'How to fork privately'</ulink> may be of interest, however. The creation
-of bespoke packages is covered in the <ulink
-url="http://www.debian.org/doc/maint-guide/">Debian New Maintainers'
-Guide</ulink> and elsewhere.
-</para>
-
-<para>
-	There are two ways of installing modified custom packages:
-</para>
-
-<orderedlist>
-
-<listitem>
-<para>
-	<filename>chroot_local-packages</filename>
-</para>
-</listitem>
-
-<listitem>
-<para>
-	Using a custom APT repository
-</para>
-</listitem>
-
-</orderedlist>
-
-<para>
-	The <filename>chroot_local-packages</filename> is simpler to achieve and
-useful for "one-off" customisations but has a number of drawbacks, whilst
-using a custom APT repository is more time-consuming to set up.
-</para>
-
-<sect3 id="local-packages">
-<title>
-	Using <filename>chroot_local-packages</filename> to install custom packages
-</title>
-
-<para>
-	To install a custom package, simply copy it to the
-<command>config/chroot_local-packages</command> directory. Packages that are
-inside this directory will be automatically installed into the live system
-during build - you do not need to specify them elsewhere.
-</para>
-
-<para>
-	Packages <emphasis>must</emphasis> be named in the prescribed way. One
-simple way to do this is to use <command>dpkg-name</command>. FIXME
-</para>
-
-<para>
-	Using <filename>chroot_local-packages</filename> for installation of custom
-packages has disadvantages:
-</para>
-
-<orderedlist>
-
-<listitem>
-<para>
-	It is not possible to use secure APT
-</para>
-</listitem>
-
-<listitem>
-<para>
-	You must install all appropriate packages in the
-<command>config/chroot_local-packages</command> directory
-</para>
-</listitem>
-
-<listitem>
-<para>
-	It does not lend itself to storing Debian Live configurations in revision
-control
-</para>
-</listitem>
-
-</orderedlist>
-
-</sect3>
-
-<sect3 id="custom-apt-repo">
-<title>Using an APT repository to install custom packages</title>
-
-<para>
-	FIXME
-</para>
-
-<para>
-	Unlike using <filename>chroot_local-packages</filename>, when using a custom
-APT repository you must ensure that you specify the packages elsewhere. See
-<xref linkend="lh-packages"/> for details.
-</para>
-
-<para>
-	Whilst it may seem unnecessary effort to create an APT repository to install
-custom packages, the infrastructure can be easily re-used at a later date to
-offer updates of the modified packages.
-</para>
-
-</sect3>
-
-<sect3 id="custom-packages-apt">
-<title>Custom packages and APT</title>
-
-<para>
-	&live-helper; uses APT to install all packages into the live system so will
-therefore inherit behaviours from this program. One relevant example is that
-(assuming a default configuration) given a package available in two
-different repositories with different version numbers, APT will elect to
-install the package with the higher version number.
-</para>
-
-<para>
-	Because of this, you may wish to increment the version number in your custom
-packages' <command>debian/changelog</command> files to ensure that your
-modified version is installed over one in the official Debian
-repositories. This may also be achieved by altering the live system's APT
-pinning preferences - see <xref linkend="apt-preferences"/> for more
-information.
-</para>
-
-</sect3>
-
-<sect3 id="apt-preferences">
-<title>Altering APT preferences during Live system</title>
-
-<para>
-	FIXME
-</para>
-
-<para>
-	Whilst it may seem unnecessary effort to create an APT repository to install
-custom packages, the infrastructure can be easily re-used at a later date to
-offer updates of the modified package.
-</para>
-
-</sect3>
-
-</sect2>
-
-</sect1>
diff --git a/manual/fr/faq.xml b/manual/fr/faq.xml
deleted file mode 100644
index 6c9d638..0000000
--- a/manual/fr/faq.xml
+++ /dev/null
@@ -1,657 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-]>
-<chapter id="faq">
-<title>Questions frequemment posées (FAQ)</title>
-
-<itemizedlist>
-
-<listitem>
-	<para>Q: I downloaded a prebuilt live image. How do I put it on a USB stick?</para>
-	<para>A: See <xref linkend="image_copying" /> "Copying USB/HDD image to a USB
-stick"</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I log my build?</para>
-	<para>A: You could use script, screen or tee: <screen>$ lh_build 2>&amp;1 | tee build.log</screen>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Q: How can I convert an already installed standard Debian partition into a
-Debian Live system?</para>
-	<para>A: Save the list of installed packages and load it into your new Debian Live
-System. Copy your /etc to config/chroot_local-includes</para>
-</listitem>
-
-<listitem>
-	<para>Q: What does 'losetup: could not find any free loop device' mean and how do
-I fix it?</para>
-	<para>A: Loop devices are used during the build; there probably aren't any free if
-you've aborted several builds. Something like: for l in /dev/loop* ; do
-losetup -d $l ; done should rectify the situation (assuming all loop devices
-in use were created by lh_build; if in doubt, check the contents of each
-loop device before deleting them with losetup -d).</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I launch an interactive shell during the chroot stage?</para>
-	<para>A: To enable interactive shell: <screen>$ lh_config --interactive shell</screen> To
-continue the build process: <screen># logout</screen> or
-<screen># exit</screen> To disable interactive shell, set
-LH_INTERACTIVE to "disabled" in config/chroot.
-	</para>
-</listitem>
-
-<listitem>
-	<para>Q: What is the root /user password?</para>
-	<para>A: The user password for the live user is 'live'. By default, there is not
-any root password. You can switch to root with <screen> sudo -i </screen> or set a password for root with <screen>sudo passwd</screen></para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I change root or any user password?</para>
-	<para>A: Add a chroot local hook script to change root or any user password each
-time you build an image.</para>
-	<para>e.g. config/chroot_local-hooks/01-update_password.sh to set root password to
-"nopasswd"</para>
-	<para>
-		<screen>#!/bin/sh
-echo "I: update password"
-echo "root:nopasswd" | chpasswd</screen> <screen>$ chmod +x config/chroot_local-hooks/01-update_password.sh</screen>
-<note>For live user; you need to copy the
-/usr/share/initramfs-tools/scripts/live-bottom/10adduser your build folder:
-<screen>mkdir -p config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/
-cp /usr/share/initramfs-tools/scripts/live-bottom/10adduser config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/</screen></note> Then edit the
-config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/10adduser
-and paste in the new user_crypted password that you make with: <screen> echo "newlivepass" | mkpasswd -s.</screen>
-		<para> Or add an hook file in config/chroot_local-hooks/ with something like the
-below: </para>
-		<screen> #!/bin/sh
-# Change the autogenerated user password to "debianlive"
-plain_password="debianlive"
-password=$(echo "${plain_password}" | mkpasswd -s)
-sed -i -e 's/\(user_crypted=\)\(.*\)\( #.*\)/\1\"'${password}'\"\3/' /usr/share/initramfs-tools/scripts/live-bottom/10adduser
-update-initramfs -tu -kall</screen>
-<para> The latter (hook model) could be more future proof than the former solution
-since it modifies just one string selectively but it requires the package
-"whois" to be installed on the target system (for mkpasswd) or that you
-generate the $password string not at build time and include it crypted in
-the above script. </para>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Q: How to disable autologin?</para>
-	<para>A1: use the commandline parameter <screen>lh config --bootappend-live "noautologin"</screen>
-	<para>A2: You need to set boot=noautologin noxautologin as described in man
-<filename>live-initramfs</filename> If you boot via TFTP you want to insert
-the option to pxelinux.cfg/default</para>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I change default hostname or username?</para>
-	<para>A: To change default hostname or username: <screen>$ lh_config --hostname myhostname
-$ lh_config --username myusername</screen>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I make the final image smaller?</para>
-	<para>A: Clean orphaned apps/libs: Install package "deborphan" and then run 'sudo
-deborphan -n' . Delete unwanted packages. Remove the apt cache. Purge
-unwanted locales (see "localepurge" package).
-	</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I customize bash-config permanently (aliases, bash-completion
-etc.)?</para>
-	<para>A: Add your own .bashrc config/chroot_local-includes/etc/skel/.bashrc</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I disable services permanently? (Be careful!)</para>
-	<para> A: Add a chroot local hook script to disable a service each time you build
-an image:	</para>
-	<para>e.g. config/chroot_local-hooks/01-disable_service.sh <screen>#!/bin/sh
-echo "I: disable service"
-update-rc.d -f   &#9001;service name &#9002; remove </screen> <screen> $ chmod +x config/chroot_local-hooks/01-disable_service.sh </screen>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I enable | disable the md5checksum at the ISO building?
-<screen>lh_config --checksums enabled|disabled </screen> Or change the LH_CHECKSUMS value. 
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How to disable the generation of the .tar.gz file? <screen>lh_config --net-tarball none|gzip </screen> Or change the LH_NET_TARBALL value. (only available
-in snapsshot version at the moment 2008/Feb/28) 
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I "build a new image" ?</para>
-	<para> A: Run commands: <screen>$ sudo lh_clean --binary
-$ sudo lh_build </screen>
-<emphasis>Hint:</emphasis> If the configuration had changed you should leave
-"--binary" out. This will clean your chroot directory too. 
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I use Fluxbox ?
-	<para>A: Add a new lists file with the fluxbox packages you want. </para>
-	<para>Create /home/$USERNAME/.dmrc file (default username is "user").</para>
-	<screen>$ cat .dmrc
-[Desktop]
-Session=fluxbox</screen> <note>.dmrc is owned by
-$USERNAME:$USERNAME. </note>
-	<para>See also <ulink
-url="http://wiki.debian.org/Fluxbox/">http://wiki.debian.org/Fluxbox</ulink></para>
-	<para> A short HOWTO can be found here: <ulink url="
-http://wiki.debian.org/MichaelAblassmeier/CustomLiveCD">
-http://wiki.debian.org/MichaelAblassmeier/CustomLiveCD</ulink></para>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I use custom repositories?</para>
-	<para>A: <ulink url="http://wiki.debian.org/DebianLive/Configuration">See
-DebianLive/Configuration.</ulink></para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I customize the artwork for the live CD (grub or syslinux boot
-splash, usplash, etc.)?</para>
-	<para>A: <ulink url="http://wiki.debian.org/DebianLive/Howto/Custom_Artwork"> See
-DebianLive/Howto/Custom_Artwork. </ulink> FIXME: NEED TO UPDATE</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I customize desktop environment (KDE, GNOME, XFCE, etc...) look?
-	<para>A: Start the live system in qemu:  </para>
-	<screen>$ qemu -m 256 -cdrom binary.iso -boot d -redir tcp:4222:10.0.2.15:22</screen> <note>the -redir argument must be
-changed to meet your needs </note>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I execute a custom shell script inside the chroot system after the
-chroot stage?</para>
-	<para>A: Add your script in config/chroot_local-hooks. </para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I add a script running immediately after all other scripts when
-the live system boots?
-	<para>A: Add your script in
-config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/99script </para>
-	<screen>$ chmod +x config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/99script</screen> <note>The hook script must be
-executable. Do not forget to lh_clean --chroot after making this change
-before you build again. </note>
-	<para>You must also use the example script
-/usr/share/live-helper/examples/hooks/update-initramfs.sh to ensure your
-script gets built into the initramfs (read the comment header for
-instructions). </para>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I add software not in Debian ?</para>
-	<para>A: See <xref linkend="packages" /> Customising package installation</para>
-</listitem>
-
-<listitem>
-	<para>Q: What is the manifest with Ubuntu used for?</para>
-	<para>A: Manifest is just the package list, which ubuntu does $something
-with. Don't worry about it. </para>
-</listitem>
-
-<listitem>
-	<para>Q: What is this {p} syntax with mtools{p} and parted{p} ?</para>
-	<para>A: That's aptitude. </para>
-</listitem>
-
-<listitem>
-	<para>Q: Do I need to write the image on USB stick to test it? <note>you must use
-qemu >= 0.8. </note>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: What is /cow ?</para>
-	<para>A: Copy-on-write, the 'diff' from unionfs. </para>
-</listitem>
-
-<listitem>
-	<para>Q: Is /usr/share/live-helper/lists/standard-x11 like preseed or is preseed
-something else entirely?</para>
-	<para>A: It is not. It is a package list, not a debconf preseeding. </para>
-</listitem>
-
-<listitem>
-	<para>Q: What is the difference between standard and minimal?
-	<para>standard: packages of priority standard and higher;</para>
-	<para>minimal: packages of priority essential and higher; </para>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Q: What can the sections be used for? Aren't they BIG?</para>
-	<para>A: Someone maybe wants to include packages from contrib or non-free. </para>
-</listitem>
-
-<listitem>
-	<para>Q: memtest86+ ... is that used?</para>
-	<para>A: Yes </para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I build using predefined packages lists?
-	<para>A: e.g. to build using standard-x11 packages list:  </para>
-	<screen>$ sudo lh_config -p standard-x11
-$ sudo lh_build</screen> <note>The packages lists can be found in
-/usr/share/live-helper/lists/ directory. </note>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I rebuild without downloading all the packages again?
-	<para>A: All packages are cached in cache subdirectory. They remain until a clean
-purge: </para>
-	<screen>$ sudo lh_clean --purge</screen>
-	<para>You do not have to do anything to prevent packages from being
-re-downloaded. You need to remember to clean whichever stages you want to
-rebuild first. </para>
-	<para>e.g. to rebuild from the cached bootstrap, chroot packages and build a new
-image. </para>
-	<screen>$ sudo lh_clean
-$ sudo lh_build</screen>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I boot USB debian-live on systems not supporting USB boot?
-	<para>A: Make a boot CD with grub, configured to boot from a debian-live kernel
-copied on the cd structure.</para>
-	<screen>$ mkdir -p iso/boot/grub
-$ cp /usr/lib/grub/i386-pc/stage2_eltorito iso/boot/grub
-$ cp chroot/boot/* iso/boot/</screen>
-	<para>Create iso/boot/grub/menu.lst  </para>
-	<screen>default 0
-timeout 5
-color cyan/blue white/blue
-title Debian Live
-root (cd)
-kernel /boot/vmlinuz boot=live
-initrd /boot/initrd.img</screen>
-<para>Create the iso image </para>
-	<screen>$ mkisofs -R -b boot/grub/stage2_eltorito -no-emul-boot \
--boot-load-size 4 -boot-info-table -o grub.iso iso</screen>
-<para>Burn the image. </para>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I boot debian-live on systems not supporting CDROM or USB boot?</para>
-	<para>A: If you have a floppy drive, you may be able to use it, otherwise you will
-need to use loadlin/grub4dos/win32-loader. If you have a second system to
-serve up the image over the network, <ulink
-url="DebianLive/Howto/Creating_a_Netboot_Image"> See
-DebianLive/Howto/Creating_a_Netboot_Image. </ulink> FIXME LINK
-	</para>
-</listitem>
-
-<listitem>
-	<para>Q: The X configuration does not seems to work, the resolution is too
-low. What can I do?
-	<para>A: Use xdebconfigurator </para>
-	<screen>$ lh_config --bootappend xdebconf
-$ lh_config --packages xdebconfigurator</screen>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: Apache has problems with static files
-	<para>A: Sendfile does not work well on the unionfs used by Debian Live. Add the
-following to apache's configuration: </para>
-	<screen>EnableSendfile off</screen>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I make hard disk partitions auto-mountable?
-	<para><command>A: Short answer:</command> Right now the best is to use a script
-that will populate the fstab when the CD is booting. Such a script can be
-found <ulink
-url="https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-includes/sbin/diskmounter.sh">
-FIXME BROKEN LINK </ulink>. A proper solution based on HAL will be described
-here in a hopefully near future. </para>
-	<para><command>A: Long Answer: </command> Since 55_nonpolkit-mount-policy.patch in
-HAL, debian-storage-policy-fixed-drives.fdi is not available anymore and the
-previous trick that consisted to remove this file to enable automounting of
-fixed drives as a consequence is obsolete.</para>
-	<para>Eventually, it will be possible to combine HAL and PolicyKit to enable
-different permissions and actions to achieve advanced (auto)mounting for
-non-root users. Until then, because the live scripts are only touching to
-the fstab to add a swap partition if discovered at boot time, the only way
-to have fixed drives mounted automatically is to use a script that will
-populate the fstab file at the end of the multiuser runlevel. </para>
-	<para>To achieve this, you can do, for example, the following: 
-	<para>download the <ulink
-url="https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-includes/sbin/diskmounter.sh">
-diskmounter.sh script FIXME BROKEN LINK </ulink> </para>
-	<para>Create the chroot_local-includes/sbin directory, and move the script inside</para>
-	<para>Make sure the script is executable (chmod +x diskmounter.sh)</para>
-	<para>create the chroot_local-includes/etc/rc.local file and call the diskmounter
-from there (see this <ulink
-url="https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-includes/etc/rc.local">
-rc.local FIXME BROKEN LINK </ulink> </para>	
-	</para>
-When called correctly, the script detects ext2, ext3, reiserfs, xfs, FAT32,
-HFS+ and NTFS partitions and mount them read-write, except for NTFS. This
-will change soon and an option will be available to use ntfs-3g to mount
-NTFS as read-write.
-<para>comments, patches and other things about this script and issue:
-http://code.goto10.org/projects/puredyne/ticket/463</para>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: Boot fails with panic: can't open /scripts/live </para>
-	<para>A: Add latest live-initramfs deb package into config/chroot_local-packages
-directory and rebuild. </para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I configure the locale and the keyboard? </para>
-	<para>A: See <xref linkend="internalization" /> 10n</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I get past boot prompt without a working keyboard? </para>
-	<para>A: See <xref linkend="bootup" /> Customising the bootup process</para>
-	<note>Boot from an USB-HDD on an iMac with GRUB did not work. </note>
-</listitem>
-
-<listitem>
-	<para>Q: Can I serve the root image from a web or ftp server?
-	<para>A: Since live-initramfs 1.99, it should be possible to use the fetch=
-argument on the kernel command line. You can build a netboot image as usual,
-and when you are done edit the tftpboot/pxelinux.cfg/default file. Remove
-the references to network boot (netboot, nfsroot, nfsopts), and replace with
-fetch= &#9001;url where you placed the root image>. </para>
-	<note>You have to include wget in the chroot. It could work for other boot
-methods as well. However, I am not sure the live scripts configure the
-network when booting from a CD or USB disk.</note> <screen>$ lh_config --packages wget</screen>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: Why doesn't quickreboot (or some other boot parameter) work?
-	<para>A: If you are building an etch image (which was the default up to
-2007/09/14) you have a very old version of casper which does not support
-quickreboot and possibly other boot parameters as well. You could configure
-your sources to use live-backports (see
-/usr/share/live-helper/examples/sources/live-backports) and switch to
-live-initramfs, or better yet, build a lenny image instead, which is the new
-default. </para>
-	<screen>$ lh_config --distribution lenny
-$ lh_config --initramfs live-initramfs</screen>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I fix "Could not find kernel image" issue with syslinux
-bootloader?
-	<para>A: Add a binary local hook script to fix kernel and initrd path each time
-you build an image. </para>
-	e.g. config/binary_local-hooks/01-fix_syslinux.sh <screen>#!/bin/sh
-SYSLINUXCFG=`find binary -type f -name syslinux.cfg`
-sed -i "s|kernel /vmlinuz|kernel vmlinuz|g" ${SYSLINUXCFG}
-sed -i "s|initrd=/initrd|initrd=initrd|g" ${SYSLINUXCFG}</screen> <screen>$ chmod +x config/binary_local-hooks/01-fix_syslinux.sh</screen>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I use a newer kernel with lenny?
-	<para>A: A build with backports.org kernels will fail as that repository lacks the
-necessary module packages (linux-modules-extra-2.6, aufs, etc.). Use the
-kernel backports <ulink
-url="http://unsupported.debian-maintainers.org/backports-kernel/">
-http://unsupported.debian-maintainers.org/backports-kernel/. </ulink> </para>
-	The quick way to success: <screen>$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6 squashfs-modules-2.6'
-
-$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.chroot
-$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.binary
-
-$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.chroot.gpg
-$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.binary.gpg
-
-$ lh_build</screen>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I use a custom kernel?
-	<para>&#9002; Is there a nice way of booting debian-live with a custom kernel (not
-in an apt repo)?  </para>
-	<para>A: Copy it into config/chroot_local-packages and set
-LH_LINUX_PACKAGES="none" or use lh config --linux-packages " " </para>
-	<para>Don't forget to compile your kernel with an union filesystem (unionfs or
-aufs), squashfs modules, and initrd support. </para>
-	<para>&#9002; I can cause the kernel to be installed but it seems this happens
-later than grub/syslinux is configured so it's not listed and casper/ and
-the menu require munging. </para>
-	 <para>You need to follow the debian scheme, e.g. placing the files in /boot as
-vmlinuz-$version and initrd.img-$version etc. </para>
-	 <para>I personally wouldn't go that way which is too much of a hassle, and just
-use make-kpkg to produce custom kernel deb packages. They should integrate
-nicely if you just put them into config/chroot_local-packages and set
-LH_LINUX_PACKAGES="". </para>
-	   <para><emphasis>Hint:</emphasis> to work around an error, which lh_binary_syslinux
-will throw on custom kernels if there is not an 468/686 in the kernel-name,
-you need to set CONFIG_LOCALVERSION="-486" or "-686" within the kernel
-configuration (-> General setup -> Local version set to -486 or -686)
-corresponding to LH_LINUX_FLAVOURS="" or "686". this at least up till
-live-helper version 1.0~a40-1</para>
-	  see 
-	   <para><ulink
-url="http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-July/001947.html">
-http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-July/001947.html</ulink>  </para> and
-	    <para><ulink
-url="http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-November/002581.html">http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-November/002581.html</ulink></para>
-
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I create a cross arch live CD image?
-	<para><command>A: In short:</command> You can't. Read on:  </para>
-	<para>The procedure to create a live CD is based on creating a chroot that
-contains the files that will be finally available on the live CD. The live
-CD building procedure includes chrooting into the chroot dir and so some
-operations. chrooting means that the terminal you chroot on will behave as a
-different system so your real system and the chroot environment is decoupled
-somehow.</para>
-	<para>Once the live CD scripts chroots into the chroot dir they have some
-operations to do inside that environment and your real system won't be able
-to run them unless you are using the same architecture.</para>
-	<para>So you only are able to make live CD for the arch you run on. But this
-doesn't prevent you run qemu or some other machine emulator that make this
-possible.</para>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: When is a lh_clean necessary?
-	<para>lh_clean is a script in /usr/bin/ </para>
-	<para>A: That depends what you've changed between builds
-	<para>If, for example, you've built an iso image and you want a usb image, you
-only need to run <command> lh_clean --binary </command> before you run
-lh_build again. </para>
-	<para>If you've <command> changed anything in the chroot </command> , you'll need
-to cleanup both chroot and binary with <command> lh_clean </command>before
-continuing </para>
-	</para>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Q: How can i set boot= parameters?</para>
-	<para>A: Set LH_BOOTAPPEND_LIVE in config/binary </para>
-
-</listitem>
-
-<listitem>
-	<para>Q: How do I include different modules to load when the live system boots?
-	<para>A: Configure config/chroot_local-includes/etc/initramfs-tools/ </para>
-	<para>The lh_chroot_hacks helper rebuilds the live/initrd1.img using the default
-initramfs.conf "MODULES = most". You may override that by supplying your own
-initramfs.conf, or else just add your own modules, e.g. </para>
-	<screen>mkdir -p config/chroot_local-includes/etc/initramfs-tools/
-echo "atl2" >> config/chroot_local-includes/etc/initramfs-tools/modules</screen> <note>Even though initramfs.conf(5) says
-"most adds all the framebuffer, acpi, file system, ide, sata, scsi and usb
-drivers", it actually includes network drivers as well. See
-auto_add_modules() in /usr/share/initramfs-tools/hook-functions for the
-complete list. </note>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: Can I have a splash screen?
-	<para>A: Yes you can </para>
-	You will not know what is going on when the splash screen is active, it may
-fail to activate on some hardware or break X on other (both usplash and
-splashy use libdirectfb which does some evil voodoo and may break you
-graphics or input until you reboot). However, you can install and activate
-it just as you would on any other Debian system.
-	<para>To use splashy: </para>
-	<para> 1) install splashy and read the README, the manpages are useless for setting
-it up. Add some parameters to your kernel command line, such as in your
-pxelinux configuration or in LH_BOOTAPPEND_LIVE in config/binary in
-debian-live configuration: </para>
-	<screen>vga=792 splash quiet</screen>
-	<para><filename>vga </filename>to select video mode, <filename>splash
-</filename>to activate splashy, <filename>quiet</filename> to suppress most
-kernel messages that you cannot see anyway but would scroll past before
-splashy manages to paint the graphics on your screen.</para>
-	You might want to add splashy to the list of packages installed in your
-image: <screen>echo splashy > config/chroot_local-packageslists/splashy
-echo splashy-themes >> config/chroot_local-packageslists/splashy</screen>
-<para>and select a theme:</para>
-	<screen>echo '#!/bin/sh' > config/chroot_local-hooks/splashy
-echo splashy_config -s debian-moreblue '||' true >> config/chroot_local-hooks/splashy
-# update the ramdisk to include the splash screen
-echo update-initramfs -u -k all >> config/chroot_local-hooks/splashy
-chmod 755 config/chroot_local-hooks/splashy 	</screen>
-<para> After you rebuild your live system you should observe a bluish splash screen
-while booting. Nothing happens while initramfs is running because there is
-no splashy support in initramfs-tools. Once the init starts the progress bar
-should start to fill.</para>
-<para>If <filename> vga=something</filename> sets a mode that your screen cannot
-show or your card cannot do vesa 2.0 (and thus you get plain text mode and
-no splashy) read the splashy faq.</para>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: Howto use my Broadcom eXtrem 2 network card (module bnx2) ?
-	<para>A: Add the firmwares to the initrd image. </para>
-	<para>You need to install the non-free package "firmware-bnx2". Uncompress your
-initrd image, then copy files : </para>
-	<screen>cp /lib/firmware/bnx2* ${INITRD}/lib/firmware/
-cp /lib/udev/firmware.agent ${INITRD}/lib/udev/</screen> Recompress your initrd image and boot:
-it works ! 
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: X is broken (the system boots, messages scroll by, and then the screen
-goes blank). What do I do?
-	<para>On my system starting X completely disables graphics so that I do not see
-anything even after X bails out and I am back to the console. To prevent
-this you can change the driver Xorg uses.</para>
-	<para>If you have a working splash screen or at least graphical console you can
-use </para>
-	<filename>live xdriver=fbdev</filename>
-	<para>when booting the live system (instead of just enter). </para>
-	Another driver you might want to try is <filename> vesa. </filename>
-	<para>If all fails you might try to set xdriver to some wrong value so that Xorg
-fails to start and you can examine the system while you still see something
-on the console. </para>
-	<filename>live xdriver=none</filename>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: How can I get Debian first stable versions?</para>
-	<para>I'm developing software and testing it on Live-CD. Thanks for the LiveCD
-project. To be sure my development is fully compatible with the "etch"
-version, I need the same scenario when Debian GNU/Linux 4.0 was published as
-stable (I believe 2007.04.08). If there was some bug on 2007.04.08 that was
-corrected one week later, I need to test software foreseeing that scenario
-without the bug solved.</para>
-</listitem>
-
-<listitem>
-	<para>Q: I get "fopen: Permission denied"-warnings from apt on building/at the
-live-system</para>
-	<para>That's a harmless bug in apt. However, if you want to get off this warnings
-in the live-system, add a file in chroot_local-hooks with follow row: </para>
-	<screen> chown -R man.man /var/cache/man </screen>
-</listitem>
-
-<listitem>
-	<para>Q: Why I always fail during "Retrieving Packages" stage when running
-lh_build? I have already set apt-http-proxy and so on.</para>
-	<para>A: lh_build retrieves packages via wget, as a result you need to enable the
-proxy settings in /etc/wgetrc before running lh_build.</para>
-</listitem>
-
-<listitem>
-	<para>Q: How do I edit Xorg.conf?
-	<para>A: Xorg.conf is generated every time system boots, so it's useless to put
-modifed Xorg.conf in config/choort_local-includes/etc/X11, because it will
-be overwritten during boot. However, you can edit /usr/bin/dexconf, which
-generate xorg.conf during boot, so the result will be modified
-Xorg.conf. The modified dexconf has to be put in
-config/choort_local-includes/usr/bin. e.g.: you can configure Xorg.conf for
-two or more keyboards layouts with alt+shift toggle by editing dexconf and
-replacing the line:</para>
-	<screen>Option          "XkbLayout"     "$XKB_LAYOUT"</screen>
-	<para>with the lines: </para>
-	<screen>Option             "XkbLayout"     "us,il"
-Option             "XkbOptions"   "grp:alt_shift_toggle,grp_led:scroll"</screen>
-	<para>when "us,il" are the wanted keyboard layouts.</para>
-	<para>You can force default screen resulotion (e.g. 1024*768) by adding the lines:
-.</para>
-	<screen>  SubSection     "Display"
-               Modes  "1024x768"
-               EndSubSection</screen>
-       	<para>between the lines:</para>
-	<screen>  Section "Screen"
-        Identifier      "Default Screen"
-        Monitor         "Configured Monitor"
-            . . . . . . .
-SECTION
-printf "EndSection\n" &#9002; &amp;4</screen>
-</para>
-</listitem>
-
-<listitem>
-	<para>Q: Where are the build parameters for the prebuilt images</para>
-	<para>A: See <ulink
-url="http://live.debian.net/README.images">http://live.debian.net/README.images.</ulink></para>
-</listitem>
-
-</itemizedlist>
-
-</chapter>
diff --git a/manual/fr/index.html.in b/manual/fr/index.html.in
deleted file mode 100644
index a1ae5ef..0000000
--- a/manual/fr/index.html.in
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-	<title>Debian Live Project</title>
-	<link type="text/css" rel="stylesheet" href="stylesheet.css" />
-</head>
-
-<body>
-
-<h1 id="title"><a href="/">Debian Live Project</a></h1>
-<h2 id="subtitle"><a href="/">Live Debian systems!</a></h2>
-
-<div id="body">
-
-<h2>Live Manuel</h2>
-
-<dl>
-
-<dd>
-	<p>
-		<i>Ce manuel est en phase de construction intense.</i>
-	</p>
-
-	<p>
-		Please report errors, omissions, patches and suggestions to our mailinglist
-at <a
-href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>
-and read about <a href="html/meta.html#contributing">how to contribute</a>
-to the manual.
-	</p>
-</dd>
-
-<dt><h3>Formats Disponibles</h3></dt>
-
-<dd>
-	<ul>
-		<li>&rsaquo; <b><a href="html/">HTML</a></b></li>
-		<li>&rsaquo; <a href="html-single/live-manual.html">HTML (single page)</a></li>
-		<li>&rsaquo; <a href="pdf/live-manual.pdf">PDF</a></li>
-		<li>&rsaquo; <a href="txt/live-manual.txt">Plain text</a></li>
-	</ul>
-
-	<p>
-		Last updated: @DATE@
-	</p>
-</dd>
-
-<dt><h3>Source</h3></dt>
-
-<dd>
-	<p>
-		The sources for this manual is available in a <a
-href="http://git.or.cz/">git</a> repository at live.debian.net.
-	</p>
-
-	<ul>
-		<li>Browse: <a
-href="http://live.debian.net/gitweb/?p=live-manual.git"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></a></li>
-		<li>Git: <a
-href="git://live.debian.net/git/live-manual.git"><small><tt>git://live.debian.net/git/live-manual.git</tt></small></a></li>
-	</ul>
-</dd>
-
-</dl>
-</div>
-
-<div class="footer">
-
-<p>
-	<a href="http://live.debian.net/">Debian Live</a> &lt;<a
-href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>&gt;
-- <a href="http://live.debian.net/legal.html">Notice Légale</a>
-</p>
-
-</div>
-
-</body>
-</html>
diff --git a/manual/fr/index.xml b/manual/fr/index.xml
deleted file mode 100644
index 037e7f3..0000000
--- a/manual/fr/index.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-  <!ENTITY pubdate "2010-06-06">
-  <!ENTITY version "2.0~a1">
-]>
-<book lang="fr">
-
-<title>Manuel de Debian Live</title>
-<!-- Chapters -->
-<bookinfo>
-<author> <othername>Le projet Debian Live</othername>
-<email>debian-live at lists.debian.org</email> </author>
-
-<releaseinfo>&version;</releaseinfo>
-<pubdate>&pubdate;</pubdate> <copyright> <year>2008-2010</year> <holder>The
-Debian Live Project</holder> </copyright>
-
-<legalnotice>
-<para>
-Ce programme est un logiciel libre: vous pouvez le redistribuer et/ou le
-modifier selon les termes de la licence GNU General Public License publiée
-par la Free Software Foundation,que ce soit la version 3 de cette Licence,
-ou (à votre convenance) toute version ultérieure.
-</para>
-<para>
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-more details.
-</para>
-<para>
-Une copie de la licence GNU General Public License est disponible dans le
-fichier <filename>/usr/share/common-licenses/GPL</filename> dans une
-distribution Debian GNU/Linux ou sur le World Wide Web sur <ulink
-url="http://www.gnu.org/copyleft/gpl.html">le site internet
-GNU</ulink>. Vous pouvez aussi en obtenir une copie en écrivant à la Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.
-</para>
-<para>
-Si vous voulez imprimer ce guide, ce document st aussi disponible au format
-Portable Document Format (PDF).
-</para>
-</legalnotice>
-</bookinfo>
-
-
-<xi:include href="about.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="installation.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="basics.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="overview.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="customization.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="common-tasks.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="live-environment.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="faq.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="reporting-bugs.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="coding-style.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="procedures.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="resources.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="use-cases.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="success-stories.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="troubleshooting.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-
-
-<!-- Appendecis -->
-<xi:include href="appendices_configuration-layout.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-<xi:include href="appendices_configuration-files.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
-
-</book>
diff --git a/manual/fr/installation.xml b/manual/fr/installation.xml
deleted file mode 100644
index a28c96b..0000000
--- a/manual/fr/installation.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-]>
-<chapter id="installation">
-<title>Installation</title>
-
-<section>
-<title>Prérequis</title>
-
-<para>Construire des systèmes Debian Live ne nécessite que très peu de prérequis:</para>
-
-<orderedlist>
-<listitem><para>Un accès super-utilisateur (root)</para></listitem>
-<listitem><para>Une version à jour de &live-helper;</para></listitem>
-<listitem><para>Un shell compatible POSIX comme <command>bash</command> ou
-<command>dash</command>.</para></listitem>
-<listitem><para><command>debootstrap</command> ou <command>cdebootstrap</command></para></listitem>
-<listitem><para>Linux 2.6.x</para></listitem>
-</orderedlist>
-
-<para>Noter qu'il n'est pas nécessaire d'utiliser Debian ou une distribution
-dérivée de Debian.&live-helper;s'exécutera su presque tous les systèmes
-d'exploitation remplissant les conditions ci-dessus.</para>
-
-</section>
-
-<section>
-<title>Installer &live-helper;</title>
-
-<para>Vous pouvez installer &live-helper; de manière très variées:</para>
-
-<orderedlist>
-<listitem><para>Depuis le dépot Debian</para></listitem>
-<listitem><para>Depuis les sources</para></listitem>
-<listitem><para>Depuis les snapshots</para></listitem>
-<listitem><para>Depuis backports.org</para></listitem>
-</orderedlist>
-
-<para>Si vous utilisez &lenny; ou &sid; il est conseillé d'installer &live-helper;
-depuis le dépot Debian.</para>
-
-<section>
-<title>Depuis le dépot Debian</title>
-
-<para>Installer simplement &live-helper; comme n'importe quel autre paquet:</para>
-<screen># apt-get install live-helper</screen>
-<para>ou</para>
-<screen># aptitude install live-helper</screen>
-
-</section>
-
-<section>
-<title>Depuis les sources</title>
-
-<para>&live-helper; est développé avec le système de contrôle de version Git. Sur
-les systèmes Debian, il est fourni par le paquet
-<command>git-core</command>. Pour rapatrier la dernière version, exécuter:</para>
-<screen>$ git clone git://live.debian.net/git/live-helper.git</screen>
-<para>Vous pouvez construire et installer votre propre paquet Debian en exécutant:</para>
-<screen>
- $ cd live-helper
- $ dpkg-buildpackage -rfakeroot -b -uc -us
- $ cd ..
- # dpkg -i live-helper*.deb
-</screen>
-<para>Vous pouvez aussi utiliser une version locale de &live-helper; sans
-installation:</para>
-<screen># live-helper/helpers/lh_local</screen>
-<para>Subsequent calls to <filename>lh_</filename>-prefixed helpers in that shell
-environment will then use the version located in the directory you executed
-<filename>lh_local</filename> from.</para>
-<para>Vous pouvez aussi installer &live-helper; directement sur votre système en
-exécutant:</para>
-<screen># make install</screen>
-
-</section>
-
-<section>
-<title>Depuis les 'snapshots'</title>
-<para>If you do not wish to build or install &live-helper; from source, you can
-use snapshots. These are built automatically from the latest version in Git
-and are available on <ulink
-url="http://live.debian.net/debian/">http://live.debian.net/debian</ulink>.</para>
-</section>
-
-<section>
-<title>&live-initramfs;</title>
-
-<para><emphasis>N.B. Vous n'êtes pas obligé d'installer &live-initramfs; sur votre
-système pour créer des systèmes Debian Live personnalisés. Cependant,
-l'installer ne nuira pas</emphasis></para>
-
-<section>
-<title>Utiliser un &live-initramfs; personnalisé</title>
-
-<para>Pour modifer le code vous pouvez suivre la procédure suivante. Assurez-vous,
-svp, d'être familier avec les définitions mentionnées dans <xref
-linkend="terms"/>.</para>
-
-<orderedlist>
-<listitem>
-<para>Rapatrier les sources de &live-initramfs;</para>
-<screen>$ git clone git://live.debian.net/git/live-initramfs.git</screen>
-</listitem>
-<listitem>
-<para>Faites les changements sur votre copie locale</para>
-<para>Et prenez garde que si vous voulez ajouter votre script pre-init à
-live-bottom, vous devriez le nommer sans tirets '-', par exemple, appeler le
-"81nouvelle_fonctionalite" et non "81nouvelle-fonctionalite".</para>
-</listitem>
-<listitem>
-<para>Constuire un .deb de &live-initramfs;</para>
-<para>You must build either on your target distribution or in a chroot containing
-your target platform: this means if your target is lenny then you should
-build against lenny. You can use a personal builder such as
-<command>pbuilder</command> to automate building packages in chroot. To
-build directly on the target platform, use
-<command>dpkg-buildpackage</command> (provided by the
-<command>dpkg-dev</command> package):</para>
-<screen>
-$ cd live-initramfs
-$ dpkg-buildpackage -rfakeroot -b -uc -us
-</screen>
-</listitem>
-<listitem>
-<para>Utiliser le <command>.deb</command> ainsi généré de &live-initramfs;</para>
-<para>As &live-initramfs; is installed by the build system, installing the package
-in the host system is not sufficient: you should treat the generated
-<command>.deb</command> like another custom package. Please see <xref
-linkend="custom-packages"/> for more information. You should pay particular
-attention to <xref linkend="custom-packages-apt"/>.</para>
-</listitem>
-</orderedlist>
-</section>
-
-<section>
-<title>Using &live-initramfs; snapshots</title>
-
-<para>You can let &live-helper; automatically use the latest snapshot of
-&live-initramfs; by configuring a third-party repository in your live-system
-configuration. Assuming you have already created a configuration tree with
-<command>lh config</command>:</para>
-
-<orderedlist>
-<listitem>
-<para>Créer une entrée dans le fichier sources.list pour l'étape du chroot:</para>
-<screen>echo "deb http://live.debian.net/ sid-snapshots main contrib non-free" > config/chroot_sources/debian-live_sid-snapshots.chroot</screen>
-</listitem>
-<listitem>
-<para>Create a sources.list entry for the binary stage:</para>
-<screen>cp config/chroot_sources/debian-live_sid-snapshots.chroot config/chroot_sources/debian-live_sid-snapshots.binary</screen>
-</listitem>
-<listitem>
-<para>Fetch the archive signing key:</para>
-<screen>
-wget http://live.debian.net/debian/project/openpgp/archive-key.asc -O config/chroot_sources/debian-live_sid-snapshots.chroot.gpg
-cp config/chroot_sources/debian-live_sid-snapshots.chroot.gpg config/chroot_sources/debian-live_sid-snapshots.binary.gpg
-</screen>
-</listitem>
-</orderedlist>
-</section>
-</section>
-</section>
-</chapter>
diff --git a/manual/fr/live-environment.xml b/manual/fr/live-environment.xml
deleted file mode 100644
index 2544552..0000000
--- a/manual/fr/live-environment.xml
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-]>
-<chapter id="live-environment">
-<title>L'environnement Live</title>
-
-<section>
-<title>L'espace d'échange</title>
-<para>FIXME</para>
-</section>
-
-<section id="hostname">
-<title>Le nom d'hôte</title>
-<para>The name of host running live system can be set with the
-<command>hostname</command> parameter into the
-<command>--bootappend-live</command> option of
-<filename>lh_config</filename>, e.g.: <screen>lh_config --bootappend-live "hostname=myhost"</screen>
-This parameter can also be used in kernel command line.</para>
-</section>
-
-<section id="live-user">
-<title>L'utilisateur Live</title>
-<para>Utilisateur A FAIRE</para>
-<para>Il faut prendre en considération que l'utilisateur live est créé par
-&live-initramfs; pendant le démarrage, il n'est pas créé par &live-helper;
-pendant la construction de l'image.</para>
-
- <para>Vous pouvez spécifier des groupes supplémentaires auxquels l'utilisateur
-live appartiendra en configurant la valeur
-<command>passwd/user-default-groups</command> de debconf. Par exemple, pour
-ajouter l'utilisateur live au groupe <command>fuse</command> ajouter ce qui
-suit dans un fichier dans le répertoire <filename
-class="directory">config/chroot_local-preseed</filename>:</para>
-
-<screen>
- debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse
-</screen>
-
- <para>Pour plus d'informations sur la façon de configurer debconf, voir, svp,
-<xref linkend="debconf-preseed"/>.</para>
-
-</section>
-
-<section id="language">
-<title>Langue</title>
-<para>When the live system boots, language is involved in three steps:
-<itemizedlist>
-  <listitem><simpara>the locale generation</simpara></listitem>
-  <listitem><simpara>setting the keyboard layout for the console</simpara></listitem>
-  <listitem><simpara>setting the keyboard layout for X</simpara></listitem>
-</itemizedlist></para>
-
-<para>To define the locale that should be generated, use the
-<command>locale</command> parameter into the
-<command>--bootappend-live</command> option of
-<filename>lh_config</filename>, e.g.: <screen>lh_config --bootappend-live "locale=sv_SE.utf8"</screen>
-This parameter can also be used in kernel command line. You can specify a
-locale by a two-letters code, or for better control, by a full
-<userinput><parameter>language</parameter>_<parameter>country</parameter>.<parameter>encoding</parameter></userinput>
-word.</para>
-
-<para>Both the console and X keyboard configuration depends on the
-<command>keyb</command> parameter of the
-<command>--bootappend-live</command> option. Valid options for X keyboard
-layouts can be found in <filename>/etc/X11/xkb/base.xml</filename> (rather
-limited to two-letters country codes). To find the value (the two
-characters) corresponding to a language try searching for the english name
-of the nation where the language is spoken, e.g: <screen>$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name
-	&lt;name&gt;se&lt;/name&gt;
-</screen> To get the locale files for swedish generated and a swedish
-keyboard layout in X use: <screen>lh_config --bootappend-live "locale=sv_SE.utf8 keyb=se"</screen>
-
-</para>
-<para>
-A list of the valid values of the keyboards for the console can be figured
-with the following command: <screen>for i in `find /usr/share/keymaps/ -iname "*kmap.gz"`; do basename $i | head -c -9; echo; done | sort | less </screen> To make the
-console keyboard use a swedish layout use <screen>lh_config --bootappend-live "locale=sv_SE.utf8 keyb=se-latin1"</screen>
-
-</para>
-
-<para>Alternatively, you can use the <literal>console-setup</literal> package, a
-tool to let you configure console layout using X (XKB) definitions; you can
-then setup your keyboard layout more precisely with
-<literal>klayout</literal>, <literal>kvariant</literal>,
-<literal>koptions</literal> and <literal>kmodel</literal> variables;
-<command>live-initramfs</command> will use also these parameters for X
-configuration. For example, to set up a french system with a french-dvorak
-layout (called Bépo) on a TypeMatrix keyboard, both in console and X11, use:
-<screen>lh_config --bootappend-live \
-  "locale=fr_FR.UTF-8 klayout=fr kvariant=bepo kmodel=tm2030usb"</screen> Note that on old versions of
-<literal>console-setup</literal> (i.e. Lenny's one), you'll need to setup
-also the <literal>keyb</literal> variable to the
-<literal>klayout</literal>'s value.
-</para>
-</section>
-
-<section id="persistence">
-<title>Persistance</title>
-<para>A live cd paradigm is a preinstalled system which runs from read-only media,
-like a cdrom, where writes and modifications do not survive reboots of the
-host hardware which runs it.</para>
-<para>A Debian Live system is a generalization of this paradigm and thus supports
-other media in addition to CDs; but still, in its default behaviour, it
-should be considered read-only and all the runtime evolutions of the system
-are lost at shutdown.</para>
-
-<para>Persistence is a common name for different kinds of solutions for saving
-across reboots some, or all, of this runtime evolution of the system. To
-understand how it could work it could be handy to know that even if the
-system is booted and run from read-only media, modification to the files and
-directories are written on writable media, typically a ram disk (tmpfs) and
-ram disks' data do not survive reboots.</para>
-<para>The data stored on this ramdisk should be saved on a writable persistent
-medium like a Hard Disk, a USB key, a network share or even a session of a
-multisession (re)writable CD/DVD. All these media are supported in Debian
-Live in different ways, and all but the last one require a special boot
-parameter to be specified at boot time: <command>persistent</command>.</para>
-
-<section><title>Persistence complète</title>
-<para>By 'full persistence' it is meant that instead of using a tmpfs for storing
-modifications to the read-only media (with the copy-on-write, COW, system) a
-writable partition is used. In order to use this feature a partition with a
-clean writable supported filesystem on it labeled "live-rw" must be attached
-on the system at bootime and the system must be started with the boot
-parameter 'persistent'. This partition could be an ext2 partition on the
-hard disk or on a usb key created with, e.g.:</para>
-
-<screen>
-# mkfs.ext2 -L live-rw /dev/sdb1
-</screen>
-
-<para>If you already have a partition on your device, you could just change the
-label with one of the following:</para>
-
-<screen>
-# tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems
-# dosfslabel /dev/sdb1 live-rw # for a fat filesystem
-</screen>
-
-<para>But since live system users cannot always use a hard drive partition, and
-considering that most USB keys have poor write speeds, 'full' persistence
-could be also used with just image files, so you could create a file
-representing a partition and put this image file even on a NTFS partition of
-a foreign OS, with something like:</para>
-
-<screen>
-$ dd if=/dev/null of=live-rw bs=1G seek=1	# for a 1GB sized image file
-$ /sbin/mkfs.ext2 -F live-rw
-</screen>
-
-<para>Then copy the <command>live-rw</command> file to a writable partition and
-reboot with the boot parameter 'persistent'.</para>
-</section>
-
-<section><title>Montage automatique de Home</title>
-<para>If during the boot a partition (filesystem) image file or a partition
-labeled <command>home-rw</command> is discovered, this filesystem will be
-directly mounted as <command>/home</command>, thus permitting persistence of
-files that belong to e.g. the default user. It can be combined with full
-persistence.</para>
-</section>
-
-<section><title>Snapshots</title>
-<para>Snapshots are collections of files and directories which are not mounted
-while running but which are copied from a persistent device to the system
-(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The
-content of a snapshot could reside on a partition or an image file (like the
-above mentioned types) labeled <command>live-sn</command>, but it defaults
-to a simple cpio archive named <command>live-sn.cpio.gz</command>. As above,
-at boot time, the block devices connected to the system are traversed to see
-if a partition or a file named like that could be found. A power
-interruption during runtime could lead to data loss, hence a tool invoked
-<command>live-snapshot --refresh</command> could be called to sync important
-changes. This type of persistence, since it does not write continuously to
-the persistent media, is the most flash-based device friendly and the
-fastest of all the persistence systems.</para>
-<para> Un version /home des snapshots existe aussi et elle est nommée
-<command>home-sn.*</command>; elle fonctionne de la même façon que le
-snapshot principal mais elle s'applique seulement à /home</para>
-<para>Snapshots cannot currently handle file deletion but full persistence and
-home automounting can.</para>
-</section>
-
-<section><title>Persistent SubText</title>
-<para>If a user would need multiple persistent storage of the same type for
-different locations or testing, such as <command>live-rw-nonwork</command>
-and <command>live-rw-work</command>, the boot parameter
-<command>persistent-subtext</command> used in conjuntion with the boot
-parameter <command>persistent</command> will allow for multiple but unique
-persistent media. An example would be if a user wanted to use a persistent
-partition labeled <command>live-sn-subText</command> they would use the boot
-parameters of: <command>persistent</command>
-<command>persistent-subtext=subText</command>.</para>
-</section>
-
-<section><title>Partial remastering</title>
-<para>The runtime modification of the tmpfs could be collected using live-snapshot
-in a squashfs and added to the cd by remastering the iso in the case of cd-r
-or adding a session to multisession cd/dvd(rw); live-initramfs mounts all
-/live filesystem in order or with the module bootparameter.</para>
-</section>
-
-</section>
-
-</chapter>
diff --git a/manual/fr/overview.xml b/manual/fr/overview.xml
deleted file mode 100644
index 9e35a1c..0000000
--- a/manual/fr/overview.xml
+++ /dev/null
@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-	<!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-]>
-
-<chapter id="overview">
-<title>Overview of tools</title>
-
-<para>
-	This chapter contains an overview of the two main tools used in building
-Debian Live systems.
-</para>
-
-<section id="live-helper">
-<title>&live-helper;</title>
-
-<para>
-	&live-helper; is a collection of scripts to build Debian Live systems.
-These scripts are also referred to as "helpers".
-</para>
-
-<para>
-	The idea behind &live-helper; is to be a framework that uses a configuration
-directory to completely automate and customize all aspects of building a
-Live image.
-</para>
-
-<para>
-	Many concepts are similar to those in the <command>debhelper</command>
-Debian package tools written by Joey Hess:
-</para>
-
-<orderedlist>
-
-<listitem>
-<para>
-	The scripts have a central location for configuring their operation.
-</para>
-
-<para>
-	In <command>debhelper</command>, this is the <filename class="directory"
->debian</filename> subdirectory of a package tree. For example,
-<command>dh_install</command> will look for a file called
-<filename>debian/&lt;packagename&gt;.install</filename> to determine which
-files should exist in a particular binary package. In much the same way,
-&live-helper; stores its configuration entirely under a <filename
-class="directory">config/</filename> subdirectory.
-</para>
-</listitem>
-
-<listitem>
-<para>
-	The scripts are independent - that is to say, it is always safe to run each
-command.
-</para>
-</listitem>
-
-</orderedlist>
-
-<para>
-	Unlike <command>debhelper</command>, &live-helper; contains a tool to
-generate a skeleton configuration directory, <filename>lh
-config</filename>. This could be considered to be similar to tools such as
-<command>dh-make</command>. For more information about <filename>lh
-config</filename>, please see <xref linkend="lh-config" />.
-</para>
-
-<para>
-	Besides the common <filename>config/common</filename>, which is used by all
-&live-helper; helper commands, some additional files can be used to
-configure the behavior of specific helper commands. These files are
-typically named <command>config/helper</command> or
-<command>config/stage</command> (where "stage", of course, is replaced with
-the name of the stage that they belong to, and "helper" with the name of the
-helper).
-</para>
-
-<para>
-	For example, the <command>lh bootstrap debootstrap</command> helper command
-uses files named <filename>config/bootstrap</filename> and
-<filename>config/bootstrap_debootstrap</filename> to read the options it
-will use. Generally, these files contain variables with values assigned, one
-variable per line. Some programs in &live-helper; use pairs of values or
-slightly more complicated variable assignments.
-</para>
-
-<para>
-	&live-helper; respects environment variables which are present in the
-context of the shell it is running. If variables can be read from config
-files, then they override environment variables, and if command line options
-are used, they override values from config files. If no value for a given
-variable can be found (and is thus unset), &live-helper; will automatically
-set it to a default value.
-</para>
-
-<para>
-	All config files are shell scripts which are sourced by a &live-helper;
-program. That means they have to follow the normal shell syntax. You can
-also put comments in these files; lines beginning with "#" are ignored.
-</para>
-
-<para>
-	In some rare cases you may want to have different versions of these files
-for different architectures or distributions. If files named
-<command>config/stage.arch</command> or
-<command>config/stage_helper.arch</command>, and
-<command>config/stage.dist</command> or
-<command>config/stage_helper.dist</command> exist (where "arch" is the same
-as the output of <command>dpkg --print-architecture</command> and "dist" is
-the same as the codename of the target distribution), then they will be used
-in preference to the other, more general files.
-</para>
-
-<para>
-	Please see <xref linkend="installation" /> for information on how to install
-&live-helper;.
-</para>
-
-<para>
-	The remainder of this section discusses the three most important helpers:
-</para>
-
-<variablelist>
-
-<varlistentry>
-<term><filename>lh config</filename></term>
-
-<listitem>
-<para>
-	Responsible for initialising a Live system configuration directory. See
-<xref linkend="lh-config" /> for more information.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><filename>lh build</filename></term>
-
-<listitem>
-<para>
-	Responsible for starting a Live system build. See <xref linkend="lh-build"
-/> for more information.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><filename>lh clean</filename></term>
-
-<listitem>
-<para>
-	Responsible for removing parts of a Live system build. See <xref
-linkend="lh-clean" /> for more information.
-</para>
-</listitem>
-</varlistentry>
-
-</variablelist>
-
-<section id="lh-config">
-<title>The <filename>lh config</filename> helper</title>
-
-<para>
-	As discussed in <xref linkend="live-helper" />, the scripts that make up
-&live-helper; source their configuration from a single directory named
-<command>config/</command>. As constructing this directory by hand would be
-time-consuming and error-prone, the <filename>lh config</filename> helper
-can be used to create skeleton configuration folders.
-</para>
-
-<para>
-	Issuing <filename>lh config</filename> without any arguments creates a
-<command>config</command> subdirectory which it populates with some default
-settings:
-</para>
-
-<para>
-	<screen>$ lh config
-$ ls -l
-total 4.1k
-drwxr-xr-x 19 user group 4.1k 2008-05-09 21:37 config
-$ ls -l config/
-total 104
--rw-r--r-- 1 user group 4175 2010-04-11 12:16 binary
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_debian-installer
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_debian-installer-includes
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_grub
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-debs
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-hooks
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-includes
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-packageslists
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-udebs
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_rootfs
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_syslinux
--rw-r--r-- 1 user group 2205 2010-04-11 12:16 bootstrap
--rw-r--r-- 1 user group 1599 2010-04-11 12:16 chroot
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_apt
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-hooks
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-includes
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-packages
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-packageslists
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-patches
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-preseed
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_sources
--rw-r--r-- 1 user group 2938 2010-04-11 12:16 common
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 includes
--rw-r--r-- 1 user group  206 2010-04-11 12:16 source
-drwxr-xr-x 2 user group 4096 2010-04-11 12:16 templates
-</screen>
-</para>
-
-<para>
-	Using <filename>lh config</filename> without any arguments would be suitable
-for users who are either happy editing the generated files, or are simply
-happy with the defaults it creates.
-</para>
-
-<para>
-	You can ask <filename>lh config</filename> to generate a <filename
-class="directory">config/</filename> directory "preseeded" with various
-options. This might be suitable if you do not require the default settings
-but do not need to change a large number of options. For example:
-</para>
-
-<para>
-	<screen>$ lh config -p gnome</screen>
-</para>
-
-<para>
-	will build a <filename class="directory">config/</filename> directory
-configured to include the '<command>gnome</command>' package list. It is
-possible to specify many options:
-</para>
-
-<para>
-	<screen>$ lh config --apt aptitude --binary-images net --hostname live-machine --username live-user ...</screen>
-</para>
-
-<para>
-	A full list of options is available in the <command>lh_config</command> man
-page. Most options have a parallel with an "<command>LH_</command>" prefixed
-variable.
-</para>
-
-</section>
-
-<section id="lh-build">
-<title>The <filename>lh build</filename> helper</title>
-
-<para>
-	The <filename>lh build</filename> helper reads in your configuration from
-the <filename class="directory">config/</filename> directory. It then runs
-the lower lower level commands needed to build your Live system.
-</para>
-
-</section>
-
-<section id="lh-clean">
-<title>The <filename>lh clean</filename> helper</title>
-
-<para>
-	It is the job of the <filename>lh clean</filename> helper to remove various
-parts of a Live helper build so subsequent builds can start from a clean
-state.
-</para>
-
-</section>
-
-</section>
-
-<section id="live-initramfs">
-<title>The &live-initramfs; package</title>
-
-<para>
-	&live-initramfs; is a collection of scripts providing hooks for the
-<command>initramfs-tools</command>, used to generate an initramfs capable of
-booting live systems, such as those created by
-<command>live-helper</command>. This includes the Debian Live isos, netboot
-tarballs, and usb stick images.
-</para>
-
-<para>
-	At boot time it will look for read-only media containing a "/live" directory
-where a root filesystem (often a compressed filesystem image like squashfs)
-is stored. If found, it will create a writable environment, using aufs or
-unionfs, for Debian like systems to boot from.
-</para>
-
-<para>
-	&live-initramfs; is a fork of <ulink
-url="http://packages.ubuntu.com/casper">casper</ulink>.
-</para>
-
-<para>
-	More information on initial ramfs in Debian can be found in the <ulink
-url="http://kernel-handbook.alioth.debian.org/"> Debian Linux Kernel
-Handbook</ulink>'s chapter on <ulink
-url="http://kernel-handbook.alioth.debian.org/ch-initramfs.html">
-initramfs</ulink>.
-</para>
-
-</section>
-
-</chapter>
diff --git a/manual/fr/procedures.xml b/manual/fr/procedures.xml
deleted file mode 100644
index 9d58511..0000000
--- a/manual/fr/procedures.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-]>
-<chapter id="procedures">
-<title>Procédures</title>
-
-<para>Ce chapitre documente les procédures du projet Debian Live pour diverses
-tâches nécéssitant la coopération avec d'autres équipes de Debian.</para>
-
-<sect1 id="udeb-uploads">
-<title>Udeb Uploads</title>
-
-<para>Before commiting releases of a udeb in d-i svn, one has to call:</para>
-<screen><command>../../scripts/l10n/output-l10n-changes . -d</command></screen>
-</sect1>
-
-<sect1 id="major-releases">
-<title>Versions Majeurs</title>
-
-<para>Releasing a new stable major version of Debian includes a lot of different
-teams working together to make it happen. At some point, the Live team comes
-in and builds live system images. The requirements to do this are:</para>
-
-<itemizedlist>
-	<listitem>The local debian mirror (debian, debian-security, debian-volatile) of the debian-live buildd needs to be synced against a mirror that contains the released version.</listitem>
-	<listitem>The names of the image need to be known (e.g. debian-live-VERSION-ARCH-FLAVOUR.iso).</listitem>
-	<listitem>The data from debian-cd needs to be synced (udeb exclude lists).</listitem>
-	<listitem>The includes from debian-cd needs to be synced (README.*, doc/*, etc.).</listitem>
-	<listitem>Images are built and mirrored on cdimage.debian.org.</listitem>
-</itemizedlist>
-
-</sect1>
-
-<sect1 id="point-releases">
-<title>Point Releases</title>
-
-<itemizedlist>
-	<listitem>Again, we need updated mirror of both debian and debian-security.</listitem>
-	<listitem>Before actual images can be built, the sizes of the gnome-desktop and kde-desktop CD images need to be checked that they are not too big.</listitem>
-	<listitem>Images are built and mirrored on cdimage.debian.org.</listitem>
-	<listitem>Send announcement mail.</listitem>
-</itemizedlist>
-
-<sect2 id="point-release-announce-template">
-<title>Point release announcement template</title>
-
-<para>An annoucement mail for point releases can be generated using the template
-below and the following command:</para>
-
-<screen>
-$ sed \
-  -e 's|%major%|5.0|g' \
-  -e 's|%minor%|5.0.2|g' \
-  -e 's|%codename%|lenny|g' \
-  -e 's|%release_mail%|2009/msg00007.html|g'
-</screen>
-
-<para>Please check the mail carefully before sending and pass it to others for
-proof-reading.</para>
-
-<screen>
-Debian Live images for Debian GNU/Linux %major% updated
-
-The Debian Live project is pleased to announce the availability of
-updated Live images for its stable distribution Debian GNU/Linux %major%
-(codename "%codename%").
-
-The images are available for download at:
-
-    &lt;http://cdimage.debian.org/cdimage/release/current-live/&gt;
-
-This update incorporates the changes made in the %minor% point release,
-which adds corrections for security problems to the stable release
-along with a few adjustments for serious problems. A full list of the
-changes may be viewed at:
-
-    &lt;http://lists.debian.org/debian-announce/%release_mail%&gt;
-
-It also includes the following Live-specific changes:
-
- * [INSERT LIVE-SPECIFIC CHANGE HERE]
- * [INSERT LIVE-SPECIFIC CHANGE HERE]
- * [LARGER ISSUES MAY DESERVE THEIR OWN SECTION]
-
-
-URLs
-----
-
-Download location of updated images:
-
-  &lt;http://cdimage.debian.org/cdimage/release/current-live/&gt;
-
-Debian Live project homepage:
-
-  &lt;http://live.debian.net/&gt;
-
-The current stable distribution:
-
-  &lt;http://ftp.debian.org/debian/dists/stable&gt;
-
-stable distribution information (release notes, errata etc.):
-
-  &lt;http://www.debian.org/releases/stable/&gt;
-
-Security announcements and information:
-
-  &lt;http://www.debian.org/security/&gt;
-
-
-About Debian
--------------
-
-The Debian Project is an association of Free Software developers who
-volunteer their time and effort in order to produce the completely free
-operating system Debian GNU/Linux.
-
-
-About Debian Live
------------------
-
-Debian Live is an official sub-project of Debian which produces Debian
-systems that do not require a classical installer. Images are available
-for CD/DVD discs, USB sticks and PXE netbooting as well as a bare
-filesystem images for booting directly from the internet.
-
-
-Contact Information
--------------------
-
-For further information, please visit the Debian Live web pages at
-&lt;http://live.debian.net/&gt; or alternatively send mail to
-&lt;debian-live at lists.debian.org&gt;.
-</screen>
-
-</sect2>
-
-</sect1>
-
-</chapter>
diff --git a/manual/fr/reporting-bugs.xml b/manual/fr/reporting-bugs.xml
deleted file mode 100644
index 44fd575..0000000
--- a/manual/fr/reporting-bugs.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-]>
-<chapter id="bugs">
-<title>Reporting bugs</title>
-
-<para>Debian Live is far from being perfect, but we want to make it as close as
-possible to perfect - with your help. Do not hesitate to report a bug: it is
-better to fill a report twice than never. However, this chapter includes
-recommendations how to file good bug reports.</para>
-
-<para>For the impatient:</para>
-
-<itemizedlist>
-<listitem>
-  <para>
-  Always check first the image status updates on <ulink
-url="http://live.debian.net/">our homepage</ulink> for known issues.
-  </para>
-</listitem>
-<listitem>
- <para>
-  Always try to reproduce the bug with the <emphasis>most recent version of
-&live-helper; and &live-initramfs;</emphasis> before submitting a bug
-report.
- </para>
-</listitem>
-<listitem>
- <para>
-  Try to give <emphasis>as specific information as possible</emphasis> about
-the bug. This includes (at least) the version of &live-helper; and
-&live-initramfs; used and the distribution of the live system you are
-building.
- </para>
-</listitem>
-</itemizedlist>
-
-<section id="known-issues">
-<title>Known issues</title>
-<para>Due to the nature of Debian testing and Debian unstable branches being a
-moving target, building a live system may not always be possible.</para>
-<para>If this is a problem, do not build a system based on testing or unstable,
-but go with stable. live-helper does always default to the current stable
-release.</para>
-<para>Currently known issues are listed under the section 'status' on <ulink
-url="http://live.debian.net/">our homepage</ulink>.</para>
-<para>It is out of the scope of this manual to train you in correctly identifying
-and fixing problems in packages of the development branches, however, there
-are two things you can always try: When not succeeding to build testing, try
-if unstable works. If unstable does not work either, revert to testing and
-pinning the newer version of the failing package from unstable.</para>
-</section>
-
-<section id="rebuild-from-scratch">
-<title>Rebuild from scratch</title>
-<para>To ensure that a particular bug is not caused by an unclean built system,
-please always rebuild the whole live system from scratch to see if the bug
-is reproducible.</para>
-</section>
-
-<section id="up-to-date">
-<title>Use up-to-date packages</title>
-<para>This means</para>
-
-<para>Using outdated packages can cause significant problems when trying to
-reproduce (and ultimately fix) your problem. If a relevant package is not
-available in Debian anymore, please recognize that the resources of the
-Debian kernel team are limited and will be unlikely to be able to fix the
-problem.</para>
-</section>
-
-
-<section id="collect-information">
-<title>Collect information</title>
-
-<para>Please provide enough information with your report. At a minimum, it should
-contain the exact version of &live-helper; version where the bug is
-encountered, and steps to reproduce it. Please use common sense and include
-other relevant information if you think that it might help in solving the
-problem.</para>
-
-<para>To make the most out of your bug report, we require at least the following
-information:</para>
-
-<itemizedlist>
- <listitem><para>Architecture of the host system</para></listitem>
- <listitem><para>Version of &live-helper; on the host system</para></listitem>
- <listitem><para>Version of &live-initramfs; on the live system</para></listitem>
- <listitem><para>Version of <filename>debootstrap</filename> and/or
-<filename>cdebootstrap</filename> on the host system</para></listitem>
- <listitem><para>Architecture of the live system</para></listitem>
- <listitem><para>Distribution of the live system</para></listitem>
- <listitem><para>Version of the kernel on the live system</para></listitem>
-</itemizedlist>
-
-<para>
- You can generate a log of the build process by using the
-<filename>tee</filename> command:
-</para>
-
-<screen>
- # lh_build 2>&amp;1 | tee buildlog.txt
-</screen>
-
-<para>Additionally, to rule out other errors, it is always a good idea to tar up
-your config directory and upload it somewhere (do *not* send it as an
-attachment to the mailinglist), so that we can try to reproduce the errors
-you encountered.</para>
-
-<para>Remember to send in any logs that were produced with English locale
-settings, e.g. run your live-helper commands with a leading
-<code>LC_ALL=C</code> or <code>LC_ALL=en_US</code>.</para>
-
-
-</section>
-
-<section id="correct-package">
-<title>Use the correct package to report the bug against</title>
-
-<para>Where does the bug appear?</para>
-
-<para>
-<variablelist>
-
-<varlistentry><term>At build time whilst bootstrapping</term>
-
-<listitem><para>
-<para>&live-helper; first bootstraps a basic Debian system with
-<command>debootstrap</command> or <command>cdebootstrap</command>. Depending
-on the bootstrapping tool used and the Debian distribution it is
-bootstrapping, it may fail. If a bug appears here, check if the error is
-related to a specific Debian package (most likely), or if it is related to
-cdebootstrap itself.</para>
-
-<para>In both cases, this is not a bug in Debian Live, but rather in Debian itself
-which we can not fix this directly. Please report such a bug against
-<command>debootstrap</command>, <command>cdebootstrap</command> or the
-failing package.</para>
-</para></listitem>
-</varlistentry>
-
-<varlistentry><term>At build time whilst installing packages</term>
-
-<listitem><para>&live-helper; installs additional packages from the Debian archive and
-depending on the Debian distribution used and the daily archive state, it
-can fail. If a bug appears here, check if the error is also reproducible on
-a normal system.</para>
-
-<para>If this is the case, this is not a bug in Debian Live, but rather in Debian
-- please report it against the failing package. Running
-<filename>debootstrap</filename> seperately from the Live system build or
-running <filename>lh_bootstrap</filename> with <command>--debug</command>
-will give you more information.</para>
-
-<para>Also, if you are using a local mirror and/or any of sort of proxy and you
-are experiencing a problem, please always reproduce it first by
-bootstrapping from an official mirror.</para>
-
-</listitem>
-
-</varlistentry>
-
-<varlistentry>
- <term>At boot-time</term>
- <listitem>
-  <para>
-   If your image does not boot, please report it to the mailing list together
-with the information requested in <xref linkend="collect-information"/>. Do
-not forget to mention, how/when the image failed, in Qemu, VMWare or real
-hardware. If you are using a virtualization technology of any kind, please
-always run it on real hardware before reporting a bug. Providing a
-screenshot of the failure is also very helpful.
-  </para>
- </listitem>
-</varlistentry> 
-
-<varlistentry><term>At run-time</term>
-
-<listitem><para>If a package was successfully installed, but fails while actually running
-the Live system, this is probably a bug in Debian Live. However, </para></listitem>
-</varlistentry>
-
-</variablelist>
-</para>
-
-</section>
-
-<section id="research">
-<title>Do the research</title>
-<para>Before filing the bug, please search the web for the particular error
-message or symptom you are getting. As it is highly unlikely that you are
-the only person experiencing a particular problem, there is always a chance
-that it has been discussed elsewhere, and a possible solution, patch, or
-workaround has been proposed.</para>
-
-<para>You should pay particular attention to the Debian Live mailing list, as well
-as the homepage, as these are likely to contain the most up-to-date
-information. If such information exists, always include the references to it
-in your bug report.</para>
-
-<para>In addition, you should check the <ulink
-url="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-helper">current
-bug list for &live-helper;</ulink> and the <ulink
-url="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-initramfs">current
-bug list for live-initramfs</ulink> to see whether something similar has
-been reported already.</para>
-</section>
-
-<section id="where">
-<title>Where to report bugs</title>
-
-<para>The Debian Live project keeps track of all bugs in the Debian Bug Tracking
-System (BTS). For information on how to use the system, please see <ulink
-url="http://bugs.debian.org">http://bugs.debian.org</ulink>. You can also
-submit the bugs by using the <command>reportbug</command> command from the
-package with the same name.</para>
-
-<para>In general, you should report build time errors against the <ulink
-url="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-helper">live-helper</ulink>
-package and run time errors against <ulink
-url="http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-initramfs">live-initramfs</ulink>.
-If you are unsure of which package is appropriate or need more help before
-submitting a bug report, please send a message to the mailing list and we
-will help you to figure it out.</para>
-
-<para>Please note that bugs found in distributions derived from Debian (such as
-Ubuntu, Knoppix, Xandros, etc.) should <emphasis>not</emphasis> be reported
-to the Debian BTS unless they can be also reproduced on a Debian system
-using official Debian packages.</para>
-
-</section>
-
-</chapter>
diff --git a/manual/fr/resources.xml b/manual/fr/resources.xml
deleted file mode 100644
index 65d5003..0000000
--- a/manual/fr/resources.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-]>
-<chapter id="resources">
-<title>Ressources et Liens</title>
-
-<section>
-<title>Liens</title>
-<para>FIXME</para>
-
-<orderedlist>
-<listitem><para><ulink url="http://www.debian.org/">Page de démarrage Debian</ulink></para></listitem>
-</orderedlist>
-
-</section>
-
-<section>
-<title>English sources related to debian live</title>
-<itemizedlist>
-<listitem><para><ulink url="http://en.wikipedia.org/wiki/Debian_Live">Debian_Live definition
-on Wikipedia </ulink></para></listitem>
-<listitem><para><ulink url="http://layer-acht.org/slides/20070115_debian-live_LCA2007.odp">
-Presentation on Debian-Live </ulink></para></listitem>
-</itemizedlist>
-</section>
-
-<section>
-<title>German sources related to debian live</title>
-<itemizedlist>
-<listitem><para><ulink url="http://wiki.skolelinux.de/DebianLive"> German translation (work
-in progress) </ulink></para></listitem>
-<listitem><para><ulink
-url="http://www.linux-magazin.de/online_artikel/workshop_debian_live_system_mit_etch">
-Article in linux-magazin.de </ulink></para></listitem>
-<listitem><para><ulink url="http://wiki.freenetproject.org/deDebianLiveCD"> Another german
-documentation </ulink></para></listitem>
-</itemizedlist>
-</section>
-
-<section>
-<title>Spanish sources related to debian live</title>
-<itemizedlist>
-<listitem><para><ulink url="http://el-directorio.org/DebianLive"> Spanish documentation
-project </ulink></para></listitem>
-</itemizedlist>
-</section>
-
-</chapter>
diff --git a/manual/fr/success-stories.xml b/manual/fr/success-stories.xml
deleted file mode 100644
index a6a3867..0000000
--- a/manual/fr/success-stories.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-]>
-<chapter id="success-stories">
-<title>Success Stories</title>
-
-<para>This chapter documents success stories with Debian Live applied.</para>
-
-<para>FIXME</para>
-
-</chapter>
diff --git a/manual/fr/troubleshooting.xml b/manual/fr/troubleshooting.xml
deleted file mode 100644
index 15778a4..0000000
--- a/manual/fr/troubleshooting.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-]>
-<chapter id="troubleshooting">
-<title>Hints for troubleshooting</title>
-
-<para>To check on the client </para>
-
-<itemizedlist>
-<listitem>
-	<para> look at /live.log and /netboot.conf</para>
-</listitem>
-<listitem>
-	<para> could the image be mounted </para>
-</listitem>
-</itemizedlist>
-
-<para>To check on the pc that creates the image </para>
-
-<itemizedlist>
-<listitem>
-	<para>was chroot unmounted after build? (it should) </para>
-</listitem>
-</itemizedlist>
-
-</chapter>
diff --git a/manual/fr/use-cases.xml b/manual/fr/use-cases.xml
deleted file mode 100644
index b132b3a..0000000
--- a/manual/fr/use-cases.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % commondata SYSTEM "common.ent" > %commondata;
-]>
-<chapter id="use-cases">
-<title>Use Cases</title>
-
-<para>This chapter is for users to document their use cases with Debian Live.</para>
-
-<sect1 id="vnc-kiosk-client">
-<title>VNC Kiosk Client</title>
-<para>Create an image with &live-helper; to boot directly to a VNC server.</para>
-<itemizedlist>
-
-<listitem>
-	<para>Make a build directory: <screen>$ mkdir vncBuild</screen>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Move to the build directory: <screen>$ cd vncBuild</screen>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Example to config the build directory to include gdm metacity
-xtightvncviewer: <screen>$ lh config --packages "gdm metacity xtightvncviewer"</screen>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Create a folder /etc/skel folder for a custom .xsession for the default
-user: <screen>$ mkdir -p config/chroot_local-includes/etc/skel</screen>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Create the .xsession for the default user: <screen>$ touch config/chroot_local-includes/etc/skel/.xsession</screen>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Edit the .xsession file to launch metacity and start xvncviewer with
-something similar to the below: <screen>
-	#!/bin/sh
-	/usr/bin/metacity &amp;
-	/usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT
-	exit
-	</screen>
-	</para>
-</listitem>
-
-<listitem>
-	<para>Build the image: <screen># lh build</screen>
-	</para>
-</listitem>
-
-</itemizedlist>
-
-</sect1>
-
-</chapter>
diff --git a/manual/po/fr/about.xml.po b/manual/old/fr/about.xml.po
similarity index 77%
copy from manual/po/fr/about.xml.po
copy to manual/old/fr/about.xml.po
index f64945a..78bc57b 100644
--- a/manual/po/fr/about.xml.po
+++ b/manual/old/fr/about.xml.po
@@ -6,19 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Debconf 8\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
+"POT-Creation-Date: 2008-11-12 22:29+0100\n"
 "PO-Revision-Date: 2009-02-25 19:06+0100\n"
-"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> "
-"<christophenagel at gmail.com>\n"
+"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> <christophenagel at gmail.com>\n"
 "Language-Team: none\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 # type: Content of: <chapter><title>
-#. type: Content of: <chapter><title>
-#: en/chapters/about.xml:9
+#: xml/chapters/about.xml:7
 msgid "About"
 msgstr "A propos"
diff --git a/manual/old/fr/basics.xml.po b/manual/old/fr/basics.xml.po
new file mode 100644
index 0000000..78a6696
--- /dev/null
+++ b/manual/old/fr/basics.xml.po
@@ -0,0 +1,769 @@
+# French translations for Debconf package
+# Copyright (C) 2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the Debconf package.
+# Automatically generated, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Debconf 8\n"
+"POT-Creation-Date: 2009-02-25 14:33+0100\n"
+"PO-Revision-Date: 2009-02-26 15:05+0100\n"
+"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> <christophenagel at gmail.com>\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+# type: Content of: <chapter><title>
+#: xml/chapters/basics.xml:7
+msgid "The basics"
+msgstr "Les principes"
+
+# type: Content of: <chapter><para>
+#: xml/chapters/basics.xml:9
+msgid ""
+"This chapter contains a brief overview of the build process as well as "
+"containing instructions on how to boot the various binary image types."
+msgstr ""
+"Ce chapitre contient un bref aprçu du processus de création ainsi que des "
+"instructions sur la méthode de démarrage des différents types d'images"
+
+# type: Content of: <chapter><section><title>
+#: xml/chapters/basics.xml:12
+msgid "What is a live system?"
+msgstr "Qu'est-ce qu'un système live"
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/basics.xml:14
+msgid ""
+"A live system usually means an OS booted on a computer from a removable "
+"support (as CD-ROM, USB stick, or network), ready to use without any "
+"installation on the usual drive(s), with an auto-configuration done at "
+"runtime (see <xref linkend=\"terms\"/>)."
+msgstr ""
+"Un système live désigne le plus souvent un Système d'Exploitation démarré "
+"sur une machine depuis un support amovible (comme un CD-ROM, une clef USB, "
+"ou depuis le réseau), prêt à l'emploi sans installation sur le(s) disque(s) "
+"traditionnel, avec une configuration automatique faite  pendant le démarrage "
+"(voir <xref linkend=\"terms\"/>)."
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/basics.xml:16
+msgid ""
+"With Debian Live, it's a Debian GNU/Linux OS, built for one of the supported "
+"architectures (currently amd64, i386, powerpc and sparc). It is made from "
+"following parts:"
+msgstr ""
+"Avec Debian Live, c'est un système d'exploitation Debian GNU/Linux, "
+"construit pour l'une des achitectures supportées (actuellement amd64, i386, "
+"powerpc, et sparc). Il est construit à partir des composants suivants:"
+
+# type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: xml/chapters/basics.xml:20
+msgid "Linux kernel"
+msgstr "Noyau Linux"
+
+# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: xml/chapters/basics.xml:21
+msgid "The Linux image, usually named <filename>vmlinuz*</filename>."
+msgstr ""
+"L'image du noyau Linux, habituellement nommée <filename>vmlinuz*</filename>."
+
+# type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: xml/chapters/basics.xml:25
+msgid "Initial RAM disk image (initrd)"
+msgstr "Initial RAM disk image (initrd)"
+
+# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: xml/chapters/basics.xml:26
+msgid ""
+"RAM disk setup for the Linux boot, containing modules possibly need to mount "
+"the filesystem's image and some scripts to do it."
+msgstr ""
+"Configuration de la RAM disque pour le démarrage de Linux, contenant les "
+"modules qui pourraient être nécessaire pour monter l'image du système de "
+"fichiers et plusieurs scripts pour le faire"
+
+# type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: xml/chapters/basics.xml:30
+msgid "System image"
+msgstr "L'image du système"
+
+# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: xml/chapters/basics.xml:31
+msgid ""
+"The O.S. image. Debian Live uses a SquashFS image, a compressed filesystem, "
+"to minimize its size. Note that it's read-only, so during boot, the Debian "
+"Live system will uses RAM disk and 'union' mechanism to be able to write "
+"files on the system, but all modifications will be lost when shutdown, until "
+"using optional persistence partition(s) (see <xref linkend=\"persistence\"/"
+">)."
+msgstr ""
+"L'image du système d'exploitation Debian Live utilise une image Squashfs, un "
+"système de fichiers compressé, pour diminuer sa taille. Noter qu'il est en "
+"lecture seule, donc pendant la phase de démarrage, le système Debian Live "
+"utilisera la RAM comme un disque et un mechanisme d'union pour pouvoir "
+"écrire des fichiers sur le système, mais toutes les modifitions seront "
+"perdues à l'arrêt de la machine à moins d'utiliser une(des) partition(s) "
+"optionnelle(s) pour la persistence.(voir <xref linkend=\"persistence\"/>)."
+
+# type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: xml/chapters/basics.xml:35
+msgid "Bootloader"
+msgstr "Chargeur de démarrage"
+
+# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: xml/chapters/basics.xml:36
+msgid ""
+"A small piece of code, crafted to boot up from the chosen media, possibly "
+"proposing a prompt or menu to let select options/configuration, then loading "
+"the Linux kernel and its initrd to let it run with associated filesystem "
+"image. Different solutions can be proposed depending of the target media and "
+"fornat of filesystem containing the previous components: Isolinux to boot "
+"from a CD or DVD in ISO9660 format, syslinux for HDD or USB drive boot from "
+"a VFAT partition, GRUB for ext2/3 partition, pxelinux for PXE netboot..."
+msgstr ""
+"Un petit morceau de code destiné à démarrer depuis le média choisi, il peut "
+"proposer une invite ou un menu pour selectionner des options, une "
+"configuration, puis il doit charger le noyau Linux et son initrd pour "
+"pouvoir utiliser l'image de système de fichiers associée à ce dernier. "
+"Différentes solutions peuvent être proposées, elles dépendent du média cible "
+"et du format du système de fichiers contenant les composants précédents: "
+"Isolinux pour démarrer depuis un CD ou un DVD au format ISO9660, syslinux "
+"pour démarrer depuis les disques durs ou les clefs USB contenant une "
+"partition vfat, GRUB pour les partitions ext2/3, pxelinux pour un démarrage "
+"réseau PXE..."
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/basics.xml:41
+msgid ""
+"The Debian Live tools will build the system image from your specifications, "
+"setup a Linux kernel and its initrd, a bootloader to run them, all in one "
+"media-dependant format(ISO9660 image, disk image, ...)."
+msgstr ""
+"Les outils de Debian Live construiront l'image du système en fonction de vos "
+"spécifications, configuration du noyau Linux et son initrd, un chargeur de "
+"démarrage pour les exécuter, tout ces composants dependent du format du "
+"media choisi(image ISO9660, image disque, ...)."
+
+# type: Content of: <chapter><section><title>
+#: xml/chapters/basics.xml:45
+msgid "First steps: building an ISO image"
+msgstr "Premiers pas: Construire une image ISO"
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/basics.xml:47
+msgid ""
+"The following sequence of helper commands, provided by &live-helper;, will "
+"create a basic ISO image containing just the Debian standard system without "
+"X.org. It is suitable for burning to CD or DVD media."
+msgstr ""
+"La séquence suivante de l'assistant de commandes fournit par &live-helper; "
+"créera une image ISO basique contenant uniquement le système Debian standard "
+"sans X.org. Elle peut être gravée sur un CD ou un DVD."
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/basics.xml:48
+msgid ""
+"First, we run the <filename>lh_config</filename> helper command which will "
+"create a <filename>\"config/\"</filename> hierarchy in the current directory "
+"for use by other helper commands:"
+msgstr ""
+"D'abord on exécute la commande <filename>lh_config</filename> de l'assistant "
+"qui créée une arborescence <filename>\"config/\"</filename> dans le "
+"répertoire courant pour une utilisation ultérieure par d'autres commandes de "
+"l'assistant:"
+
+# type: Content of: <chapter><section><screen>
+#: xml/chapters/basics.xml:49
+#, no-wrap
+msgid "$ lh_config"
+msgstr "$ lh_config"
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/basics.xml:50
+msgid ""
+"By passing no parameters to <filename>lh_config</filename>, we indicated "
+"that we wish to use the defaults, which will create an image of type binary "
+"(see <xref linkend=\"lh_config\"/>)."
+msgstr ""
+"En ne passant aucun paramètres à <filename>lh_config</filename>, on choisit "
+"d'utiliser les paramètres par défauts qui créeront une image de type binaire "
+"(voir <xref linkend=\"lh_config\"/>)."
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/basics.xml:51
+msgid ""
+"Now that we have a <filename>\"config/\"</filename> hierarchy, we may build "
+"the image with <filename>lh_build</filename> helper command:"
+msgstr ""
+"Maintenant que l'on a une arborescence <filename>\"config/\"</filename>, on "
+"devrait pouvoir construire une image avec la commande <filename>lh_build</"
+"filename> de l'assistant:"
+
+# type: Content of: <chapter><section><screen>
+#: xml/chapters/basics.xml:52 xml/chapters/basics.xml:85
+#: xml/chapters/basics.xml:115
+#, no-wrap
+msgid "# lh_build"
+msgstr "# lh_build"
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/basics.xml:53
+msgid ""
+"This process can take a while, depending on the speed of your network "
+"connection (see <xref linkend=\"lh_build\"/>)."
+msgstr ""
+"Ce processus peut prendre du temps, en fonction du débit de votre connexion "
+"réseau (voir <xref linkend=\"lh_build\"/>)."
+
+# type: Content of: <chapter><section><section><title>
+#: xml/chapters/basics.xml:56
+msgid "Testing an ISO image with Qemu"
+msgstr "Tester une image ISO avec Qemu"
+
+# type: Content of: <chapter><section><section><para>
+#: xml/chapters/basics.xml:58
+msgid "Testing an ISO is simple:"
+msgstr "Tester une image ISO est facile"
+
+# type: Content of: <chapter><section><section><screen>
+#: xml/chapters/basics.xml:59
+#, no-wrap
+msgid ""
+"\n"
+"# apt-get install qemu\n"
+"$ qemu -cdrom binary.iso\n"
+msgstr ""
+"\n"
+"# apt-get install qemu\n"
+"$ qemu -cdrom binary.iso\n"
+
+# type: Content of: <chapter><section><section><title>
+#: xml/chapters/basics.xml:66
+msgid "Burning an ISO image to physical medium"
+msgstr "Graver une image ISO sur un support physique"
+
+# type: Content of: <chapter><section><section><para>
+#: xml/chapters/basics.xml:68
+msgid "Burning an ISO image is easy:"
+msgstr "Graver une imgae ISO est simple"
+
+# type: Content of: <chapter><section><section><screen>
+#: xml/chapters/basics.xml:69
+#, no-wrap
+msgid ""
+"\n"
+"# apt-get install wodim\n"
+"$ wodim binary.iso\n"
+msgstr ""
+"\n"
+"# apt-get install wodim\n"
+"$ wodim binary.iso\n"
+
+# type: Content of: <chapter><section><title>
+#: xml/chapters/basics.xml:77
+msgid "Building an USB/HDD image"
+msgstr "Construire une image USB/HDD"
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/basics.xml:79
+msgid ""
+"The following sequence of helper commands will create a basic USB/HDD image "
+"containing just the Debian standard system without X.org. It is suitable for "
+"booting from USB sticks, USB hard drives, and various other portable storage "
+"devices."
+msgstr ""
+" La séquence de commandes suivantes de l'assistant créera une image USB/HDD "
+"contenant uniquement le système Debian standard sans X.org. Elle peut être "
+"utilisée pour démarrer depuis une clef USB, une disque dur USB, ainsi que "
+"d'autres types variés de périphériques de stockage amovibles."
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/basics.xml:80
+msgid ""
+"Note if you created an iso image with the previous example, you will need to "
+"clean up your working directory with the <filename>lh_clean</filename> "
+"helper command (see <xref linkend=\"lh_clean\"/>):"
+msgstr ""
+"Noter que si l'on a créé une image avec l'exemple précédent, on doit "
+"nettoyer le répertoire de travail avec la commande <filename>lh_clean</"
+"filename> de l'assistant (voir <xref linkend=\"lh_clean\"/>)."
+
+# type: Content of: <chapter><section><screen>
+#: xml/chapters/basics.xml:81 xml/chapters/basics.xml:110
+#, no-wrap
+msgid "$ lh_clean --binary"
+msgstr "$ lh_clean --binary"
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/basics.xml:82
+msgid ""
+"Run the <filename>lh_config</filename> helper command with the parameters to "
+"configure the <filename>\"config/\"</filename> hierarchy to create a USD/HDD "
+"image type:"
+msgstr ""
+"Exécuter la commande <filename>lh_config</filename> de l'assistant avec ces "
+"paramètres pour configurer l'arborescence <filename>\"config/\"</filename> "
+"afin de créer une image de type USB/HDD:"
+
+# type: Content of: <chapter><section><screen>
+#: xml/chapters/basics.xml:83
+#, no-wrap
+msgid "$ lh_config -b usb-hdd"
+msgstr "$ lh_config -b usb-hdd"
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/basics.xml:84 xml/chapters/basics.xml:114
+msgid "Now build the image with <filename>lh_build</filename> helper command:"
+msgstr ""
+"Maintenant construire l'image avec la commande <filename>lh_build</filename> "
+"de l'assistant"
+
+# type: Content of: <chapter><section><section><title>
+#: xml/chapters/basics.xml:88
+msgid "Copying USB/HDD image to a USB stick"
+msgstr "Copier une image USB/HDD sur une clef USB"
+
+# type: Content of: <chapter><section><section><para>
+#: xml/chapters/basics.xml:90
+msgid "The generated binary image contains a"
+msgstr "L'image binaire générée contient une partition"
+
+# type: Content of: <chapter><section><section><para><acronym>
+#: xml/chapters/basics.xml:90
+msgid "VFAT"
+msgstr "VFAT"
+
+# type: Content of: <chapter><section><section><para>
+#: xml/chapters/basics.xml:90
+msgid ""
+"partition and the <command>syslinux</command> bootloader, ready to be "
+"directly written on an USB stick. Plug in an USB stick with a size larger "
+"than <filename>binary.img</filename>'s one, and type:"
+msgstr ""
+" et le chargeur de démarrage <command>syslinux</command>, prêt à être "
+"directement écrit sur une clef USB. Brancher une ckef USB d'une taille "
+"supérieure à celle du fichier <filename>binary.img</filename>, et taper:"
+
+# type: Content of: <chapter><section><section><para><screen>
+#: xml/chapters/basics.xml:91
+#, no-wrap
+msgid "$ dd if=binary.img of=${USBSTICK}"
+msgstr "$ dd if=binary.img of=${USBSTICK}"
+
+# type: Content of: <chapter><section><section><para>
+#: xml/chapters/basics.xml:92
+msgid ""
+"where <replaceable>${USBSTICK}</replaceable> is the device file of your key, "
+"like <filename>/dev/sda</filename> (not a partition like <filename>/dev/"
+"sda1</filename>!); you can find the right device name by looking in "
+"<command>dmesg</command>'s output after plugging the stick, for example)."
+msgstr ""
+"Où <replaceable>${USBSTICK}</replaceable> est le fichier descripteur de "
+"périphérique de votre clef, comme <filename>/dev/sda</filename> (pas une "
+"partition comme <filename>/dev/sda1</filename>!); on peut trouver le fichier "
+"descripteur de périphérique adéquat en regardant la sortie de la commande "
+"<command>dmesg</command> après avoir branché la clef par exemple)"
+
+# type: Content of: <chapter><section><section><title>
+#: xml/chapters/basics.xml:97
+msgid "Testing a USB/HDD image with Qemu"
+msgstr "Tester une image USB/HDD avec Qemu"
+
+# type: Content of: <chapter><section><section><screen>
+#: xml/chapters/basics.xml:98
+#, no-wrap
+msgid ""
+"\n"
+"# apt-get install qemu\n"
+"$ qemu -hda binary.img\n"
+msgstr ""
+"\n"
+"# apt-get install qemu\n"
+"$ qemu -hda binary.img\n"
+
+# type: Content of: <chapter><section><title>
+#: xml/chapters/basics.xml:106
+msgid "Building a netboot image"
+msgstr "Construire une image démarrable depuis le réseau"
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/basics.xml:108
+msgid ""
+"The following sequence of helper commands will create a basic netboot image "
+"containing the Debian standard system without X.org. It is suitable for "
+"booting over the network."
+msgstr ""
+"La séquence de commandes suivante de l'assistant créera une image basique "
+"pour un démarrage réseau contenant uniquement le système Debian standard "
+"sans X.org. Elle peut être utilisée pour démarrer depuis le réseau."
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/basics.xml:109
+msgid ""
+"Note if you performed any previous examples, you will need to clean up your "
+"working directory with the <filename>lh_clean</filename> helper command:"
+msgstr ""
+"Noter que si l'on a réalisé l'un ou l'autre des exemples précédents, on doit "
+"nettoyer le répertoire de travail avec la commande <filename>lh_clean</"
+"filename> de l'assistant:"
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/basics.xml:111
+msgid ""
+"Run the <filename>lh_config</filename> helper command with the parameters to "
+"configure the <filename>\"config/\"</filename> hierarchy to create our "
+"netboot image:"
+msgstr ""
+"Exécuter la commande <filename>lh_config</filename>de l'assistant avec les "
+"paramètres suivants pour configurer l'arborescence <filename>\"config/\"</"
+"filename> afin de créer une image pour un démarrage réseau:"
+
+# type: Content of: <chapter><section><screen>
+#: xml/chapters/basics.xml:112
+#, no-wrap
+msgid "$ lh_config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\""
+msgstr "$ lh_config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\""
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/basics.xml:113
+msgid ""
+"In contrast with the ISO and USB hdd images, netbooting does not support "
+"serving a filesystem image with the client so the files must be served via "
+"NFS. The <replaceable>net-root-path</replaceable> and <replaceable>net-root-"
+"server</replaceable> options specify the location and server respectfully of "
+"the NFS server where the filesytem image will be located at boot-time."
+msgstr ""
+"A l'inverse des images USB/HDD ou ISO, le démarrage depuis le réseau ne "
+"permet pas de donner une image de système de fichiers au client, les "
+"fichiers doivents être fournis par NFS. Les options <replaceable>net-root-"
+"path</replaceable> et <replaceable>net-root-server</replaceable> spécifient "
+"respectivement l'emplacement et le serveur NFS où trouver l'image du système "
+"de fichiers pendant la phase de démarrage."
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/basics.xml:116
+msgid ""
+"In a network boot, the client runs a small piece of software, usually on the"
+msgstr ""
+"Lors d'un démarrage réseau, le client exécute un petit morceau de code "
+"habituellement sur l'"
+
+# type: Content of: <chapter><section><para><acronym>
+#: xml/chapters/basics.xml:116
+msgid "EEPROM"
+msgstr "EEPROM"
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/basics.xml:116
+msgid "of the Ethernet card, which sends a"
+msgstr "de la carte Ethernet, qui envoie une requête "
+
+# type: Content of: <chapter><section><para><abbrev>
+#: xml/chapters/basics.xml:116
+msgid "DHCP"
+msgstr "DHCP"
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/basics.xml:116
+msgid "request to get an"
+msgstr "pour obtenir une adresse "
+
+# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><abbrev>
+#: xml/chapters/basics.xml:116 xml/chapters/basics.xml:124
+msgid "IP"
+msgstr "IP"
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/basics.xml:116
+msgid ""
+"address and also information about what to do next; such as getting (through"
+msgstr ""
+"ainsi que des informations sur ce qui doit être fait après; comme obtenir "
+"(via le protocole "
+
+# type: Content of: <chapter><section><para><abbrev>
+#: xml/chapters/basics.xml:116
+msgid "TFTP"
+msgstr "TFTP"
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/basics.xml:116
+msgid ""
+"protocol) a higher level boot software like <application>Grub</application> "
+"or <application>PXLINUX</application>, or directly to an operating system "
+"like <application>Linux</application>."
+msgstr ""
+") un logiciel de démarrage de plus haut niveau comme <application>Grub</"
+"application> ou <application>PXLINUX</application>, ou directement un "
+"système d'exploitation comme <application>Linux</application>."
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/basics.xml:117
+msgid ""
+"For example, you can extract the generated <filename>binary-net.tar.gz</"
+"filename> archive in the <filename>/srv/debian-live</filename> directory; "
+"you'll get the filesystem image in <filename>live/filesystem.squashfs</"
+"filename>, the kernel, initrd and PXE Linux bootloader in <filename>tftpboot/"
+"debian-live/i386</filename>."
+msgstr ""
+"Par exemple, vous pouvez extraire l'archive <filename>binary-net.tar.gz</"
+"filename> dans le répertoire<filename>/srv/debian-live</filename>; vous "
+"aurez l'image du système de fichiers dans le fichier <filename>live/"
+"filesystem.squashfs</filename>, le noyau, initrd et le chargeur de démarrage "
+"PXE Linux dans le répertoire<filename>tftpboot/debian-live/i386</filename>."
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/basics.xml:118
+msgid "We must now configure three services on the server:"
+msgstr "Nous devons maintenant configurer trois services sur le serveur:"
+
+# type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: xml/chapters/basics.xml:122
+msgid "DHCP server"
+msgstr "Le serveur DHCP"
+
+# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: xml/chapters/basics.xml:124
+msgid "We must configure our network's DHCP server to be sure to give a"
+msgstr ""
+"Nous devons configurer le serveur DHCP de notre réseau pour être sure de "
+"délivrer une"
+
+# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: xml/chapters/basics.xml:124
+msgid ""
+"address to the computer netbooting, and to advertise the location of the PXE "
+"bootloader."
+msgstr ""
+"adresse à l'ordinateur qui démarre depuis le réseau et pour publier "
+"l'emplacement du programme de démarrage PXE."
+
+# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: xml/chapters/basics.xml:125
+msgid ""
+"Here is an example for inspiration, written for the ISC DHCP server (package "
+"<literal>dhcp3-server</literal>) in the <filename>/etc/dhcp3/dhcpd.conf</"
+"filename> configuration file :"
+msgstr ""
+"Voici un exemple dont on peut s'inspirer, écrit pour le serveur ISC DHCP "
+"(paquet <literal>dhcp3-server</literal>) dans le fichier de configuration "
+"<filename>/etc/dhcp3/dhcpd.conf</filename>:"
+
+# type: Content of: <chapter><section><variablelist><varlistentry><listitem><screen>
+#: xml/chapters/basics.xml:126
+#, no-wrap
+msgid ""
+"\n"
+"# Options DHCP spécifiques à Pxelinux:\n"
+"option space pxelinux;\n"
+"option pxelinux.magic      code 208 = string;\n"
+"option pxelinux.configfile code 209 = text;\n"
+"option pxelinux.pathprefix code 210 = text;\n"
+"option pxelinux.reboottime code 211 = unsigned integer 32;\n"
+"\n"
+"\n"
+"subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
+"\n"
+"  # IP addresses available for guests\n"
+"  range 192.168.1.100 192.168.1.149;\n"
+"\n"
+"  # allow booting from the net\n"
+"  allow bootp;\n"
+"\n"
+"  # for net booting, server where the first file to be loaded (by TFTP\n"
+"  # protocol) (\"filename\" following definition) lies : so the TFTP\n"
+"  # server's name.\n"
+"  next-server myserver;\n"
+"\n"
+"  # net boot configuration for guests with a PXE client :\n"
+"  if substring (option vendor-class-identifier, 0, 9) = \"PXEClient\" {\n"
+"    # Note : all files for PXE are relatives to the TFTP server's root\n"
+"    # path, as usually defined in /etc/inetd.conf.\n"
+"\n"
+"    # PXE boot loader (first program to be loaded, by TFTP)\n"
+"    filename \"pxelinux.0\";\n"
+"\n"
+"    # describe some specific pxelinux's options through DHCP options :\n"
+"    site-option-space \"pxelinux\";\n"
+"    option pxelinux.magic f1:00:74:7e;\n"
+"    if exists dhcp-parameter-request-list {\n"
+"      # Always send the PXELINUX options (specified in hexadecimal)\n"
+"      option dhcp-parameter-request-list = concat(option dhcp-parameter-request-list,d0,d1,d2,d3);\n"
+"    }\n"
+"\n"
+"    # For a PXE boot menu, different versions are available : simple\n"
+"    # text, text with curses, graphic (VESA)\n"
+"    #option pxelinux.configfile \"pxelinux/config_simple\";\n"
+"    #option pxelinux.configfile \"pxelinux/config_curses\";\n"
+"    option pxelinux.configfile \"pxelinux/config_vesa\";\n"
+"\n"
+"    # automatically reboot after 10 minutes of no activity\n"
+"    option pxelinux.reboottime 600;\n"
+"  }\n"
+"}\n"
+msgstr ""
+"\n"
+"# Options DHCP spécifiques à Pxelinux:\n"
+"option space pxelinux;\n"
+"option pxelinux.magic      code 208 = string;\n"
+"option pxelinux.configfile code 209 = text;\n"
+"option pxelinux.pathprefix code 210 = text;\n"
+"option pxelinux.reboottime code 211 = unsigned integer 32;\n"
+"\n"
+"\n"
+"subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
+"\n"
+"  # IP addresses available for guests\n"
+"  range 192.168.1.100 192.168.1.149;\n"
+"\n"
+"  # allow booting from the net\n"
+"  allow bootp;\n"
+"\n"
+"  # for net booting, server where the first file to be loaded (by TFTP\n"
+"  # protocol) (\"filename\" following definition) lies : so the TFTP\n"
+"  # server's name.\n"
+"  next-server myserver;\n"
+"\n"
+"  # net boot configuration for guests with a PXE client :\n"
+"  if substring (option vendor-class-identifier, 0, 9) = \"PXEClient\" {\n"
+"    # Note : all files for PXE are relatives to the TFTP server's root\n"
+"    # path, as usually defined in /etc/inetd.conf.\n"
+"\n"
+"    # PXE boot loader (first program to be loaded, by TFTP)\n"
+"    filename \"pxelinux.0\";\n"
+"\n"
+"    # describe some specific pxelinux's options through DHCP options :\n"
+"    site-option-space \"pxelinux\";\n"
+"    option pxelinux.magic f1:00:74:7e;\n"
+"    if exists dhcp-parameter-request-list {\n"
+"      # Always send the PXELINUX options (specified in hexadecimal)\n"
+"      option dhcp-parameter-request-list = concat(option dhcp-parameter-request-list,d0,d1,d2,d3);\n"
+"    }\n"
+"\n"
+"    # For a PXE boot menu, different versions are available : simple\n"
+"    # text, text with curses, graphic (VESA)\n"
+"    #option pxelinux.configfile \"pxelinux/config_simple\";\n"
+"    #option pxelinux.configfile \"pxelinux/config_curses\";\n"
+"    option pxelinux.configfile \"pxelinux/config_vesa\";\n"
+"\n"
+"    # automatically reboot after 10 minutes of no activity\n"
+"    option pxelinux.reboottime 600;\n"
+"  }\n"
+"}\n"
+
+# type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: xml/chapters/basics.xml:179
+msgid "TFTPd server"
+msgstr "Serveur TFTPd"
+
+# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: xml/chapters/basics.xml:181
+msgid "This serves the kernel and initial ramdisk to the system at run-time."
+msgstr "Il fournit le noyau et la ramdisk initiale au système pendant l'e"
+
+# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: xml/chapters/basics.xml:182
+msgid ""
+"You should install the <command>tftpd-hpa</command> package. It can serve "
+"all files contained inside a root directory, usually <filename>/var/lib/"
+"tftpboot/</filename>, as defined with its"
+msgstr ""
+"Vous devriez installer le paquet <command>tftpd-hpa</command>. Il peut "
+"fournir tous les fichiers contenus dans un répertoire racine, habituellement "
+"<filename>/var/lib/tftpboot/</filename>, défini par l'option"
+
+# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><option>
+#: xml/chapters/basics.xml:182
+msgid "-s"
+msgstr "-s"
+
+# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: xml/chapters/basics.xml:182
+msgid ""
+"option. To let it serves files inside <filename>/srv/debian-live/tftpboot</"
+"filename>, modify its start definition in <filename>/etc/inetd.conf</"
+"filename> with:"
+msgstr ""
+"Pour lui faire fournir les fichiers contenus dans <filename>/srv/debian-live/"
+"tftpboot</filename>, modifier sa commande de démarrage dans  <filename>/etc/"
+"inetd.conf</filename> par:"
+
+# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
+#: xml/chapters/basics.xml:183
+#, no-wrap
+msgid "tftp           dgram   udp     wait    root  /usr/sbin/in.tftpd /usr/sbin/in.tftpd -s /srv/debian-live/tftpboot -r blksize -v -v"
+msgstr "tftp           dgram   udp     wait    root  /usr/sbin/in.tftpd /usr/sbin/in.tftpd -s /srv/debian-live/tftpboot -r blksize -v -v"
+
+# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: xml/chapters/basics.xml:184
+msgid ""
+"and reload the super server with <command>/etc/init.d/openbsd-inetd reload</"
+"command>."
+msgstr ""
+"et relancer le super server avec <command>/etc/init.d/openbsd-inetd reload</"
+"command>."
+
+# type: Content of: <chapter><section><variablelist><varlistentry><term>
+#: xml/chapters/basics.xml:189
+msgid "NFS server"
+msgstr "Serveur NFS"
+
+# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: xml/chapters/basics.xml:191
+msgid ""
+"Once the guest computer will have downloaded and booted a Linux kernel and "
+"its initrd, it will try to mount the Live filesystem image through a NFS "
+"server."
+msgstr ""
+"Une fois que la machine cliente a téléchargé et démarré le noyau Linux et sa "
+"ramdisk, elle essaie de monter l'image du système de fichiers Live via un "
+"serveur NFS."
+
+# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: xml/chapters/basics.xml:192
+msgid ""
+"You should install the <command>nfs-kernel-server</command> server package "
+"-- <command>nfs-user-server</command> does not function correctly with "
+"netboot."
+msgstr ""
+"Vous devriez installer le paquet <command>nfs-kernel-server</command> --"
+"<command>nfs-user-server</command> ne fonctionne pas correctement pour le "
+"démarrage réseau."
+
+# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: xml/chapters/basics.xml:193
+msgid ""
+"Then, declare that the directory of the filesystem image is available "
+"through NFS, by writing in <filename>/etc/exports</filename> :"
+msgstr ""
+"Après, rendez le répertoire de l'image du système de fichiers disponible via "
+"NFS en ajoutant au fichier <filename>/etc/exports</filename>:"
+
+# type: Content of: <chapter><section><variablelist><varlistentry><listitem><screen>
+#: xml/chapters/basics.xml:194
+#, no-wrap
+msgid "/srv/debian-live *(ro,async,subtree_check,no_root_squash)"
+msgstr "/srv/debian-live *(ro,async,subtree_check,no_root_squash)"
+
+# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
+#: xml/chapters/basics.xml:195
+msgid "and let the NFS server knowing it typing following command :"
+msgstr "informez le serveur NFS en tapant la commande suivante:"
+
+# type: Content of: <chapter><section><variablelist><varlistentry><listitem><screen>
+#: xml/chapters/basics.xml:196
+#, no-wrap
+msgid "# exportfs -rv"
+msgstr "# exportfs -rv"
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/basics.xml:202
+msgid ""
+"Setting all these services is quite error prone, you'll need some patience "
+"to let all of them working together."
+msgstr ""
+"Configurer tout ces services peut être source d'erreurs, vous aurez besoin "
+"de patience pour qu'il fonctionnent tous ensemble."
diff --git a/manual/po/fr/binary.xml.po b/manual/old/fr/binary.xml.po
similarity index 76%
rename from manual/po/fr/binary.xml.po
rename to manual/old/fr/binary.xml.po
index da4d6d7..68b22ac 100644
--- a/manual/po/fr/binary.xml.po
+++ b/manual/old/fr/binary.xml.po
@@ -6,38 +6,32 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
+"POT-Creation-Date: 2009-02-25 14:33+0100\n"
 "PO-Revision-Date: 2009-02-25 19:29+0100\n"
-"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> "
-"<christophenagel at gmail.com>\n"
+"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> <christophenagel at gmail.com>\n"
 "Language-Team: none\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 # type: Content of: <sect1><title>
-#. type: Content of: <sect1><title>
-#: en/chapters/customization/binary.xml:7
+#: xml/chapters/customization/binary.xml:7
 msgid "Customising the binary image"
 msgstr "Personnaliser l'image binaire"
 
 # type: Content of: <sect1><para>
-#. type: Content of: <sect1><para>
-#: en/chapters/customization/binary.xml:9
+#: xml/chapters/customization/binary.xml:9
 msgid "This chapter discusses FIXME"
 msgstr "Ce chapitre aborde A FAIRE"
 
 # type: Content of: <sect1><sect2><title>
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/binary.xml:12
+#: xml/chapters/customization/binary.xml:12
 msgid "ISO metadata"
 msgstr "ISO metadata"
 
 # type: Content of: <sect1><sect2><para>
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/binary.xml:14
+#: xml/chapters/customization/binary.xml:14
 msgid ""
 "When creating an ISO9660 binary image, you can use the following options to "
 "add various textual metadata for your image. This can help you easily "
@@ -49,8 +43,7 @@ msgstr ""
 "soit nécessaire de la démarrer."
 
 # type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/customization/binary.xml:19
+#: xml/chapters/customization/binary.xml:19
 msgid ""
 "<command>LH_ISO_APPLICATION</command> / <command>--iso-application "
 "<replaceable>NAME</replaceable></command>"
@@ -59,8 +52,7 @@ msgstr ""
 "<replaceable>NOM</replaceable></command>"
 
 # type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/binary.xml:22
+#: xml/chapters/customization/binary.xml:22
 msgid ""
 "This should describe the application that will be on the image. The maximum "
 "length for this field is 128 characters."
@@ -69,8 +61,7 @@ msgstr ""
 "est de 128 caractères."
 
 # type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/customization/binary.xml:27
+#: xml/chapters/customization/binary.xml:27
 msgid ""
 "<command>LH_ISO_PREPARER</command> / <command>--iso-preparer "
 "<replaceable>NAME</replaceable></command>"
@@ -79,8 +70,7 @@ msgstr ""
 "<replaceable>NOM</replaceable></command>"
 
 # type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/binary.xml:30
+#: xml/chapters/customization/binary.xml:30
 msgid ""
 "This should describe the preparer of the image, usually with some contact "
 "details. The default for this option is the &live-helper; version you are "
@@ -93,8 +83,7 @@ msgstr ""
 "longueur maximum est de 128 caractères."
 
 # type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/customization/binary.xml:35
+#: xml/chapters/customization/binary.xml:35
 msgid ""
 "<command>LH_ISO_PUBLISHER</command> / <command>--iso-publisher "
 "<replaceable>NAME</replaceable></command>"
@@ -103,8 +92,7 @@ msgstr ""
 "<replaceable>NOM</replaceable></command>"
 
 # type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/binary.xml:38
+#: xml/chapters/customization/binary.xml:38
 msgid ""
 "This should describe the publisher of the image, usually with some contact "
 "details. The maximum length for this field is 128 characters."
@@ -113,8 +101,7 @@ msgstr ""
 "details de contacts. La longueur maximum est de 128 caractères."
 
 # type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/customization/binary.xml:43
+#: xml/chapters/customization/binary.xml:43
 msgid ""
 "<command>LH_ISO_VOLUME</command> / <command>--iso-volume <replaceable>NAME</"
 "replaceable></command>"
@@ -123,8 +110,7 @@ msgstr ""
 "replaceable></command>"
 
 # type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/binary.xml:46
+#: xml/chapters/customization/binary.xml:46
 msgid ""
 "This should specify the volume ID of the image. This is used as a user-"
 "visible label on some platforms such as Windows and Apple Mac OS. The "
diff --git a/manual/old/fr/bootup.xml.po b/manual/old/fr/bootup.xml.po
new file mode 100644
index 0000000..907285c
--- /dev/null
+++ b/manual/old/fr/bootup.xml.po
@@ -0,0 +1,35 @@
+# French translations for PACKAGE package
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# Automatically generated, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2009-02-25 14:33+0100\n"
+"PO-Revision-Date: 2009-02-27 16:19+0100\n"
+"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> <christophenagel at gmail.com>\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/about/manual.xml:46 xml/chapters/about/manual.xml:50
+#: xml/chapters/about/manual.xml:62 xml/chapters/customization/bootup.xml:11
+#: xml/chapters/customization/bootup.xml:20
+#: xml/chapters/customization/bootup.xml:26
+#: xml/chapters/customization/bootup.xml:38
+#: xml/chapters/customization/bootup.xml:85
+#: xml/chapters/customization/bootup.xml:92
+#: xml/chapters/customization/bootup.xml:99
+#: xml/chapters/customization/bootup.xml:106
+#: xml/chapters/customization/packages.xml:21
+#: xml/chapters/customization/packages.xml:138
+#: xml/chapters/customization/packages.xml:183
+#: xml/chapters/customization/packages.xml:220
+#: xml/chapters/customization/packages.xml:245
+#: xml/chapters/live-environment.xml:11 xml/chapters/live-environment.xml:16
+#: xml/chapters/overview.xml:115 xml/chapters/resources.xml:11
+ms
diff --git a/manual/old/fr/coding-style.xml.po b/manual/old/fr/coding-style.xml.po
new file mode 100644
index 0000000..53bc808
--- /dev/null
+++ b/manual/old/fr/coding-style.xml.po
@@ -0,0 +1,145 @@
+# French translations for PACKAGE package
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# Automatically generated, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2009-02-27 18:09+0100\n"
+"PO-Revision-Date: 2009-02-27 18:09+0100\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+# type: Content of: <chapter><title>
+#: xml/chapters/coding-style.xml:7
+msgid "Coding Style"
+msgstr ""
+
+# type: Content of: <chapter><para>
+#: xml/chapters/coding-style.xml:9
+msgid ""
+"This chapter documents the coding style used in &live-helper; and (ideally) "
+"in &live-initramfs;."
+msgstr ""
+
+# type: Content of: <chapter><sect1><title>
+#: xml/chapters/coding-style.xml:12
+msgid "Compatibility"
+msgstr ""
+
+# type: Content of: <chapter><sect1><title>
+#: xml/chapters/coding-style.xml:22
+msgid "Indenting"
+msgstr ""
+
+# type: Content of: <chapter><sect1><title>
+#: xml/chapters/coding-style.xml:31
+msgid "Wrapping"
+msgstr ""
+
+# type: Content of: <chapter><sect1><itemizedlist><listitem><para>
+#: xml/chapters/coding-style.xml:38 xml/chapters/coding-style.xml:59
+#: xml/chapters/coding-style.xml:92 xml/chapters/coding-style.xml:108
+msgid "Bad:"
+msgstr ""
+
+# type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
+#: xml/chapters/coding-style.xml:40
+#, no-wrap
+msgid ""
+"\n"
+"if foo; then\n"
+"\tbar\n"
+"fi\n"
+msgstr ""
+
+# type: Content of: <chapter><sect1><itemizedlist><listitem><para>
+#: xml/chapters/coding-style.xml:47 xml/chapters/coding-style.xml:67
+#: xml/chapters/coding-style.xml:98 xml/chapters/coding-style.xml:117
+msgid "Good:"
+msgstr ""
+
+# type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
+#: xml/chapters/coding-style.xml:49
+#, no-wrap
+msgid ""
+"\n"
+"if foo\n"
+"then\n"
+"\tbar\n"
+"fi\n"
+msgstr ""
+
+# type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
+#: xml/chapters/coding-style.xml:61
+#, no-wrap
+msgid ""
+"\n"
+"foo () {\n"
+"\tbar\n"
+"}\n"
+msgstr ""
+
+# type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
+#: xml/chapters/coding-style.xml:69
+#, no-wrap
+msgid ""
+"\n"
+"foo ()\n"
+"{\n"
+"\tbar\n"
+"}\n"
+msgstr ""
+
+# type: Content of: <chapter><sect1><title>
+#: xml/chapters/coding-style.xml:81
+msgid "Variables"
+msgstr ""
+
+# type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
+#: xml/chapters/coding-style.xml:94
+#, no-wrap
+msgid ""
+"\n"
+"FOO=bar\n"
+msgstr ""
+
+# type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
+#: xml/chapters/coding-style.xml:100
+#, no-wrap
+msgid ""
+"\n"
+"FOO=\"bar\"\n"
+msgstr ""
+
+# type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
+#: xml/chapters/coding-style.xml:110
+#, no-wrap
+msgid ""
+"\n"
+"if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
+"then\n"
+"\tfoobar\n"
+"fi\n"
+msgstr ""
+
+# type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
+#: xml/chapters/coding-style.xml:119
+#, no-wrap
+msgid ""
+"\n"
+"if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
+"then\n"
+"\tfoobar\n"
+"fi\n"
+msgstr ""
+
+# type: Content of: <chapter><sect1><title>
+#: xml/chapters/coding-style.xml:131
+msgid "Miscellaneous"
+msgstr ""
diff --git a/manual/po/fr/common-tasks.xml.po b/manual/old/fr/common-tasks.xml.po
similarity index 67%
rename from manual/po/fr/common-tasks.xml.po
rename to manual/old/fr/common-tasks.xml.po
index c5edcd5..2519197 100644
--- a/manual/po/fr/common-tasks.xml.po
+++ b/manual/old/fr/common-tasks.xml.po
@@ -6,32 +6,27 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Debconf 8\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
+"POT-Creation-Date: 2009-02-25 14:33+0100\n"
 "PO-Revision-Date: 2009-02-26 18:41+0100\n"
-"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> "
-"<christophenagel at gmail.com>\n"
+"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> <christophenagel at gmail.com>\n"
 "Language-Team: none\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 # type: Content of: <chapter><title>
-#. type: Content of: <chapter><title>
-#: en/chapters/common-tasks.xml:7
+#: xml/chapters/common-tasks.xml:7
 msgid "Common tasks"
 msgstr "Tâche communes"
 
 # type: Content of: <chapter><section><title>
-#. type: Content of: <chapter><section><title>
-#: en/chapters/common-tasks.xml:10
+#: xml/chapters/common-tasks.xml:10
 msgid "The Debian Installer"
 msgstr "L'installeur Debian"
 
 # type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/chapters/common-tasks.xml:12
+#: xml/chapters/common-tasks.xml:12
 msgid ""
 "Although Debian Live is mostly concerned with avoiding permanent "
 "installation, integrating some form of installer to your image is possible. "
@@ -44,14 +39,12 @@ msgstr ""
 "comment les installer."
 
 # type: Content of: <chapter><section><note><title>
-#. type: Content of: <chapter><section><note><title>
-#: en/chapters/common-tasks.xml:17
+#: xml/chapters/common-tasks.xml:16
 msgid "The \"Debian Installer\""
 msgstr "L'Installeur Debian"
 
 # type: Content of: <chapter><section><note><para>
-#. type: Content of: <chapter><section><note><para>
-#: en/chapters/common-tasks.xml:20
+#: xml/chapters/common-tasks.xml:19
 msgid ""
 "Please note the careful use of capital letters when referring to the "
 "\"Debian Installer\" in this section - when used like this we refer "
@@ -63,20 +56,17 @@ msgstr ""
 "le système Debian, et rien d'autre. On le trouve souvent abrégé en \"d-i\"."
 
 # type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/chapters/common-tasks.xml:24
+#: xml/chapters/common-tasks.xml:23
 msgid "The three main types of installer are:"
 msgstr "Les trois principaux types d'installeurs sont :"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
-#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/chapters/common-tasks.xml:29
+#: xml/chapters/common-tasks.xml:28
 msgid "\"Normal\" Debian Installer"
 msgstr "L'Installeur Debian \"normal\""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/chapters/common-tasks.xml:33
+#: xml/chapters/common-tasks.xml:32
 msgid ""
 "This is a normal Debian Live image with a seperate kernel and initrd which "
 "(when selected from the appropriate bootloader) launches into a standard "
@@ -89,8 +79,7 @@ msgstr ""
 "cd Debian."
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/chapters/common-tasks.xml:36
+#: xml/chapters/common-tasks.xml:35
 msgid ""
 "This means that Debian is installed by fetching and installing <command>."
 "deb</command> packages using <filename>debootstrap</filename> or "
@@ -105,8 +94,7 @@ msgstr ""
 "dur."
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/chapters/common-tasks.xml:39
+#: xml/chapters/common-tasks.xml:38
 msgid ""
 "This whole process can be preseeded and customised in a number of ways; see "
 "the relevant \"DebianInstaller\" wiki page and installation guide for more. "
@@ -118,14 +106,12 @@ msgstr ""
 "opérationnel dans &live-helper;."
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
-#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/chapters/common-tasks.xml:45
+#: xml/chapters/common-tasks.xml:44
 msgid "\"Live\" Debian Installer"
 msgstr "L'Installeur \"Live\" Debian"
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/chapters/common-tasks.xml:49
+#: xml/chapters/common-tasks.xml:48
 msgid ""
 "This is a Debian Live image with a seperate kernel and initrd which (when "
 "selected from the appropriate bootloader) launches into an instance of the "
@@ -136,8 +122,7 @@ msgstr ""
 "l'Installeur Debian."
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/chapters/common-tasks.xml:52
+#: xml/chapters/common-tasks.xml:51
 msgid ""
 "Installation will proceed in an identical fashion to the \"Normal\" "
 "installation described above, but at the actual package installation stage, "
@@ -155,20 +140,17 @@ msgstr ""
 "locaux, etc."
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/chapters/common-tasks.xml:55
+#: xml/chapters/common-tasks.xml:54
 msgid "This is working now."
 msgstr "Ceci fonctionne désormais."
 
 # type: Content of: <chapter><section><variablelist><varlistentry><term>
-#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/chapters/common-tasks.xml:61
+#: xml/chapters/common-tasks.xml:60
 msgid "\"Ubuntu\"-style installer"
 msgstr "Installeur - style \"Ubuntu\""
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/chapters/common-tasks.xml:65
+#: xml/chapters/common-tasks.xml:64
 msgid ""
 "This is where you boot into a graphical Debian Live system and run a wizard-"
 "based program which installs and configures the live system, all the time "
@@ -179,63 +161,22 @@ msgstr ""
 "l'intérieur de l'environnement graphique."
 
 # type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/chapters/common-tasks.xml:68
+#: xml/chapters/common-tasks.xml:67
 msgid "This is currently NOT possible with Debian Live."
 msgstr "Ceci n'est pour l'instant PAS possible dans Debian Live."
 
-#. type: Content of: <chapter><section><para><screen>
-#: en/chapters/common-tasks.xml:78
-#, no-wrap
-msgid ""
-"$ lh_config --help\n"
-"  ...\n"
-"  [--debian-installer enabled|cdrom|netinst|netboot|businesscard|live|disabled]\n"
-"  [--debian-installer-distribution CODENAME|daily]\n"
-"  [--debian-installer-preseedfile FILE|URL]\n"
-"  ...\n"
-" "
-msgstr ""
-
-#. type: Content of: <chapter><section><para>
-#: en/chapters/common-tasks.xml:76
-msgid ""
-"By default, no installer will be included in the Debian Live image. You can "
-"enable it by using <filename>lh_config</filename> : <placeholder type="
-"\"screen\" id=\"0\"/>"
-msgstr ""
-
 # type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/chapters/common-tasks.xml:89
+#: xml/chapters/common-tasks.xml:73
 msgid "The values \"Normal\", \"Live\" and \"Ubuntu\" are not valid values for"
 msgstr ""
 "Les valeurs \"Normal\", \"Live\" et \"Ubuntu\" ne sont pas valides pour"
 
 # type: Content of: <chapter><section><para><term>
-#. type: Content of: <chapter><section><para><term>
-#: en/chapters/common-tasks.xml:89
+#: xml/chapters/common-tasks.xml:73
 msgid "LH_BINARY_DEBIAN_INSTALLER"
 msgstr "LH_BINARY_DEBIAN_INSTALLER"
 
-#. type: Content of: <chapter><section><para>
-#: en/chapters/common-tasks.xml:89
-msgid ""
-". Refer to the output of <filename>lh_config</filename> cited above to "
-"choose the appropriate values."
-msgstr ""
-
-#. type: Content of: <chapter><section><title>
-#: en/chapters/common-tasks.xml:94
-msgid "WiFi Connection"
-msgstr ""
-
-#. type: Content of: <chapter><section><para>
-#: en/chapters/common-tasks.xml:96
-msgid ""
-"Depending on the Debian Live image you are using and the given tools "
-"configured with your Debian Live image you may need to only attach to an "
-"available access point. If you encounter difficulty a good place to start is "
-"at the Debian Wiki entry for <ulink url=\"http://wiki.debian.org/WiFi"
-"\">WiFi</ulink>."
+# type: Content of: <chapter><section><para>
+#: xml/chapters/common-tasks.xml:73
+msgid "."
 msgstr ""
diff --git a/manual/po/fr/configuration-files.xml.po b/manual/old/fr/configuration-files.xml.po
similarity index 60%
rename from manual/po/fr/configuration-files.xml.po
rename to manual/old/fr/configuration-files.xml.po
index 711f3b5..ac9743b 100644
--- a/manual/po/fr/configuration-files.xml.po
+++ b/manual/old/fr/configuration-files.xml.po
@@ -6,66 +6,56 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Debconf 8\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
+"POT-Creation-Date: 2008-08-09 16:50+0300\n"
 "PO-Revision-Date: 2009-02-27 15:00+0100\n"
-"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> "
-"<christophenagel at gmail.com>\n"
+"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> <christophenagel at gmail.com>\n"
 "Language-Team: none\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 # type: Content of: <appendix><title>
-#. type: Content of: <appendix><title>
-#: en/appendices/configuration-files.xml:8
+#: appendices/configuration-files.xml:8
 msgid "Configuration files"
 msgstr "Fichiers de configuration"
 
 # type: Content of: <appendix><section><title>
-#. type: Content of: <appendix><section><title>
-#: en/appendices/configuration-files.xml:11
+#: appendices/configuration-files.xml:11
 msgid "The <filename>config/binary</filename> file"
 msgstr "Le fichier <filename>config/binary</filename>."
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:15
+#: appendices/configuration-files.xml:15
 msgid "LH_BINARY_FILESYSTEM"
 msgstr "LH_BINARY_FILESYSTEM"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:16
+#: appendices/configuration-files.xml:16
 msgid "Set image filesystem. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Défini l'image du système de fichier (Voir <xref linkend=\"configuration-"
 "layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:20
+#: appendices/configuration-files.xml:20
 msgid "LH_BINARY_IMAGES"
 msgstr "LH_BINARY_IMAGES"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:21
-#: en/appendices/configuration-files.xml:512
+#: appendices/configuration-files.xml:21
+#: appendices/configuration-files.xml:512
 msgid "Set image type. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Défini le type d'image. (Voir <xref linkend=\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:25
+#: appendices/configuration-files.xml:25
 msgid "LH_BINARY_INDICES"
 msgstr "LH_BINARY_INDICES"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:26
+#: appendices/configuration-files.xml:26
 msgid ""
 "Set apt/aptitude generic indices. (See <xref linkend=\"configuration-layout"
 "\"/>)"
@@ -74,62 +64,52 @@ msgstr ""
 "\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:30
+#: appendices/configuration-files.xml:30
 msgid "LH_BOOTAPPEND_LIVE"
 msgstr "LH_BOOTAPPEND_LIVE"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:31
-#: en/appendices/configuration-files.xml:36
+#: appendices/configuration-files.xml:31 appendices/configuration-files.xml:36
 msgid "Set boot parameters. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Défini les paramètres de démarrage. (Voir <xref linkend=\"configuration-"
 "layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:35
+#: appendices/configuration-files.xml:35
 msgid "LH_BOOTAPPEND_INSTALL"
 msgstr "LH_BOOTAPPEND_INSTALL"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:40
+#: appendices/configuration-files.xml:40
 msgid "LH_BOOTLOADER"
 msgstr "LH_BOOTLOADER"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:41
+#: appendices/configuration-files.xml:41
 msgid "Set bootloader. (See <xref linkend=\"bootloaders\"/>)"
 msgstr ""
 "Défini le chargeur de démarrage. (Voir <xref linkend=\"bootloaders\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:45
+#: appendices/configuration-files.xml:45
 msgid "LH_CHECKSUMS"
 msgstr "LH_CHECKSUMS"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:46
+#: appendices/configuration-files.xml:46
 msgid "Set checksums. (See <xref linkend=\"cheat-codes\"/>)"
 msgstr ""
 "Défini les sommes de contrôle (ndt: checksums). (Voir <xref linkend=\"cheat-"
 "codes\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:50
+#: appendices/configuration-files.xml:50
 msgid "LH_CHROOT_BUILD"
 msgstr "LH_CHROOT_BUILD"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:51
+#: appendices/configuration-files.xml:51
 msgid ""
 "Control if we build binary images chrooted. (See <xref linkend="
 "\"configuration-layout\"/>)"
@@ -138,183 +118,155 @@ msgstr ""
 "linkend=\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:55
+#: appendices/configuration-files.xml:55
 msgid "LH_DEBIAN_INSTALLER"
 msgstr "LH_DEBIAN_INSTALLER"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:56
+#: appendices/configuration-files.xml:56
 msgid "Set debian-installer. (See <xref linkend=\"debian-installer\"/>)"
 msgstr ""
 "Défini l'installeur Debian (debian-installer). (See <xref linkend=\"debian-"
 "installer\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:60
+#: appendices/configuration-files.xml:60
 msgid "LH_DEBIAN_INSTALLER_DAILY"
 msgstr "LH_DEBIAN_INSTALLER_DAILY"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:61
+#: appendices/configuration-files.xml:61
 msgid "Set daily images. (See <xref linkend=\"debian-installer\"/>)"
 msgstr ""
 "Défini les images journalières. (Voir <xref linkend=\"debian-installer\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:65
+#: appendices/configuration-files.xml:65
 msgid "LH_ENCRYPTION"
 msgstr "LH_ENCRYPTION"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:66
+#: appendices/configuration-files.xml:66
 msgid "Set encrytion. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr "Défini le cryptage. (Voir <xref linkend=\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:70
+#: appendices/configuration-files.xml:70
 msgid "LH_GRUB_SPLASH"
 msgstr "LH_GRUB_SPLASH"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:71
+#: appendices/configuration-files.xml:71
 msgid "Set custom grub splash. (See <xref linkend=\"splash\"/>)"
 msgstr ""
 "Défini un écran de démarrage personnalisé pour grub. (Voir <xref linkend="
 "\"splash\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:75
+#: appendices/configuration-files.xml:75
 msgid "LH_HOSTNAME"
 msgstr "LH_HOSTNAME"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:76
+#: appendices/configuration-files.xml:76
 msgid "Set hostname. (See <xref linkend=\"hostname\"/>)"
 msgstr "Défini le nom d'hôte. (Voir <xref linkend=\"hostname\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:80
+#: appendices/configuration-files.xml:80
 msgid "LH_ISO_APPLICATION"
 msgstr "LH_ISO_APPLICATION"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:81
+#: appendices/configuration-files.xml:81
 msgid "Set iso author. (See <xref linkend=\"iso-metadata\"/>)"
 msgstr "défin l'auteur de l'iso. (Voir <xref linkend=\"iso-metadata\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:85
+#: appendices/configuration-files.xml:85
 msgid "LH_ISO_PREPARER"
 msgstr "LH_ISO_PREPARER"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:86
+#: appendices/configuration-files.xml:86
 msgid "Set iso preparer. (See <xref linkend=\"iso-metadata\"/>)"
 msgstr ""
 "Défini le préparateur de l'iso. (Voir <xref linkend=\"iso-metadata\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:90
+#: appendices/configuration-files.xml:90
 msgid "LH_ISO_PUBLISHER"
 msgstr "LH_ISO_PUBLISHER"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:91
+#: appendices/configuration-files.xml:91
 msgid "Set iso publisher. (See <xref linkend=\"iso-metadata\"/>)"
 msgstr "Défini le distributeur. (Voir <xref linkend=\"iso-metadata\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:95
+#: appendices/configuration-files.xml:95
 msgid "LH_ISO_VOLUME"
 msgstr "LH_ISO_VOLUME"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:96
+#: appendices/configuration-files.xml:96
 msgid "Set iso volume (max 32 chars). (See <xref linkend=\"iso-metadata\"/>)"
 msgstr ""
 "Défini le nom \"iso volume\" (max 32 caractères). (Voir <xref linkend=\"iso-"
 "metadata\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:100
+#: appendices/configuration-files.xml:100
 msgid "LH_JFFS2_ERASEBLOCK"
 msgstr "LH_JFFS2_ERASEBLOCK"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:101
+#: appendices/configuration-files.xml:101
 msgid ""
 "Set jffs2 eraseblock size. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Défini jffs2 eraseblock size. (Voir <xref linkend=\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:105
+#: appendices/configuration-files.xml:105
 msgid "LH_MEMTEST"
 msgstr "LH_MEMTEST"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:106
+#: appendices/configuration-files.xml:106
 msgid "Set memtest. (See <xref linkend=\"memtest\"/>)"
 msgstr "Défini memtest. (Voir <xref linkend=\"memtest\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:110
+#: appendices/configuration-files.xml:110
 msgid "LH_NET_ROOT_FILESYSTEM"
 msgstr "LH_NET_ROOT_FILESYSTEM"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:111
+#: appendices/configuration-files.xml:111
 msgid "Set netboot filesystem. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Défini le système de fichier pour le démarrage réseau. (Voir <xref linkend="
 "\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:115
+#: appendices/configuration-files.xml:115
 msgid "LH_NET_ROOT_MOUNTOPTIONS"
 msgstr "LH_NET_ROOT_MOUNTOPTIONS"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:116
+#: appendices/configuration-files.xml:116
 msgid "Set nfsopts. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Défini les options NFS. (Voir <xref linkend=\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:120
+#: appendices/configuration-files.xml:120
 msgid "LH_NET_ROOT_PATH"
 msgstr "LH_NET_ROOT_PATH"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:121
+#: appendices/configuration-files.xml:121
 msgid ""
 "Set netboot server directory. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
@@ -322,14 +274,12 @@ msgstr ""
 "\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:125
+#: appendices/configuration-files.xml:125
 msgid "LH_NET_ROOT_SERVER"
 msgstr "LH_NET_ROOT_SERVER"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:126
+#: appendices/configuration-files.xml:126
 msgid ""
 "Set netboot server address. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
@@ -337,14 +287,12 @@ msgstr ""
 "\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:130
+#: appendices/configuration-files.xml:130
 msgid "LH_NET_COW_FILESYSTEM"
 msgstr "LH_NET_COW_FILESYSTEM"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:131
+#: appendices/configuration-files.xml:131
 msgid ""
 "Set net client cow filesystem. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
@@ -352,82 +300,70 @@ msgstr ""
 "\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:135
+#: appendices/configuration-files.xml:135
 msgid "LH_NET_COW_MOUNTOPTIONS"
 msgstr "LH_NET_COW_MOUNTOPTIONS"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:136
+#: appendices/configuration-files.xml:136
 msgid "Set cow mount options. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Défini les options de montage pour le COW. (Voir <xref linkend="
 "\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:140
+#: appendices/configuration-files.xml:140
 msgid "LH_NET_COW_PATH"
 msgstr "LH_NET_COW_PATH"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:141
+#: appendices/configuration-files.xml:141
 msgid "Set cow directory. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Défini le répertoire du COW. (Voir <xref linkend=\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:145
+#: appendices/configuration-files.xml:145
 msgid "LH_NET_COW_SERVER"
 msgstr "LH_NET_COW_SERVER"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:146
+#: appendices/configuration-files.xml:146
 msgid "Set cow server. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Défini le serveur pour le COW. (Voir <xref linkend=\"configuration-layout\"/"
 ">)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:150
+#: appendices/configuration-files.xml:150
 msgid "LH_NET_TARBALL"
 msgstr "LH_NET_TARBALL"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:151
+#: appendices/configuration-files.xml:151
 msgid "Set net tarball. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Défini l'archive réseau. (Voir <xref linkend=\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:155
+#: appendices/configuration-files.xml:155
 msgid "LH_SYSLINUX_SPLASH"
 msgstr "LH_SYSLINUX_SPLASH"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:156
+#: appendices/configuration-files.xml:156
 msgid "Set custom syslinux splash. (See <xref linkend=\"splash\"/>)"
 msgstr ""
 "Défini un écran d'accueil personnalisé.pour syslinux. (Voir <xref linkend="
 "\"splash\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:160
+#: appendices/configuration-files.xml:160
 msgid "LH_SYSLINUX_TIMEOUT"
 msgstr "LH_SYSLINUX_TIMEOUT"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:161
+#: appendices/configuration-files.xml:161
 msgid ""
 "Set custom syslinux timeout in seconds. (See <xref linkend=\"syslinux\"/>)"
 msgstr ""
@@ -435,14 +371,12 @@ msgstr ""
 "\"syslinux\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:165
+#: appendices/configuration-files.xml:165
 msgid "LH_SYSLINUX_CFG"
 msgstr "LH_SYSLINUX_CFG"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:166
+#: appendices/configuration-files.xml:166
 msgid ""
 "Set custom syslinux configuration file. (See <xref linkend=\"syslinux\"/>)"
 msgstr ""
@@ -450,26 +384,22 @@ msgstr ""
 "<xref linkend=\"syslinux\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:170
+#: appendices/configuration-files.xml:170
 msgid "LH_SYSLINUX_MENU"
 msgstr "LH_SYSLINUX_MENU"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:171
+#: appendices/configuration-files.xml:171
 msgid "Set syslinux menu. (See <xref linkend=\"syslinux\"/>)"
 msgstr "Défini le menu de syslinux. (Voir <xref linkend=\"syslinux\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:175
+#: appendices/configuration-files.xml:175
 msgid "LH_SYSLINUX_MENU_LIVE_ENTRY"
 msgstr "LH_SYSLINUX_MENU_LIVE_ENTRY"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:176
+#: appendices/configuration-files.xml:176
 msgid ""
 "Set text to be used on the menu for live entries. (See <xref linkend="
 "\"syslinux\"/>)"
@@ -478,14 +408,12 @@ msgstr ""
 "<xref linkend=\"syslinux\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:180
+#: appendices/configuration-files.xml:180
 msgid "LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY"
 msgstr "LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:181
+#: appendices/configuration-files.xml:181
 msgid ""
 "Set text to be used on the menu for live entries (failsafe ones). (See <xref "
 "linkend=\"syslinux\"/>)"
@@ -494,14 +422,12 @@ msgstr ""
 "linkend=\"syslinux\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:185
+#: appendices/configuration-files.xml:185
 msgid "LH_SYSLINUX_MENU_MEMTEST_ENTRY"
 msgstr "LH_SYSLINUX_MENU_MEMTEST_ENTRY"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:186
+#: appendices/configuration-files.xml:186
 msgid ""
 "Set text to be used on the menu for memtest entry. (See <xref linkend="
 "\"syslinux\"/> and <xref linkend=\"memtest\"/>)"
@@ -510,32 +436,27 @@ msgstr ""
 "\"syslinux\"/> and <xref linkend=\"memtest\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:190
+#: appendices/configuration-files.xml:190
 msgid "LH_USERNAME"
 msgstr "LH_USERNAME"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:191
+#: appendices/configuration-files.xml:191
 msgid "Set username. (See <xref linkend=\"live-user\"/>)"
 msgstr "Défini l'utilisateur. (Voir <xref linkend=\"live-user\"/>)"
 
 # type: Content of: <appendix><section><title>
-#. type: Content of: <appendix><section><title>
-#: en/appendices/configuration-files.xml:198
+#: appendices/configuration-files.xml:198
 msgid "The <filename>config/bootstrap</filename> file"
 msgstr "Le fichier <filename>config/bootstrap</filename>."
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:202
+#: appendices/configuration-files.xml:202
 msgid "LH_ARCHITECTURE"
 msgstr "LH_ARCHITECTURE"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:203
+#: appendices/configuration-files.xml:203
 msgid ""
 "Select chroot architecture. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
@@ -543,14 +464,12 @@ msgstr ""
 "\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:207
+#: appendices/configuration-files.xml:207
 msgid "LH_BOOTSTRAP_CONFIG"
 msgstr "LH_BOOTSTRAP_CONFIG"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:208
+#: appendices/configuration-files.xml:208
 msgid ""
 "Set distribution config directory. (See <xref linkend=\"configuration-layout"
 "\"/>)"
@@ -559,14 +478,12 @@ msgstr ""
 "linkend=\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:212
+#: appendices/configuration-files.xml:212
 msgid "LH_BOOTSTRAP_INCLUDE"
 msgstr "LH_BOOTSTRAP_INCLUDE"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:213
+#: appendices/configuration-files.xml:213
 msgid ""
 "Include packages on base. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
@@ -574,14 +491,12 @@ msgstr ""
 "\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:217
+#: appendices/configuration-files.xml:217
 msgid "LH_BOOTSTRAP_EXCLUDE"
 msgstr "LH_BOOTSTRAP_EXCLUDE"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:218
+#: appendices/configuration-files.xml:218
 msgid ""
 "Exclude packages on base. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
@@ -589,28 +504,24 @@ msgstr ""
 ">)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:222
+#: appendices/configuration-files.xml:222
 msgid "LH_BOOTSTRAP_FLAVOUR"
 msgstr "LH_BOOTSTRAP_FLAVOUR"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:223
+#: appendices/configuration-files.xml:223
 msgid "Select flavour to use. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Défini la \"saveur\"(ndt:flavour) à utiliser. (Voir <xref linkend="
 "\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:227
+#: appendices/configuration-files.xml:227
 msgid "LH_BOOTSTRAP_KEYRING"
 msgstr "LH_BOOTSTRAP_KEYRING"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:228
+#: appendices/configuration-files.xml:228
 msgid ""
 "Set distribution keyring. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
@@ -618,14 +529,12 @@ msgstr ""
 "layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:232
+#: appendices/configuration-files.xml:232
 msgid "LH_DISTRIBUTION"
 msgstr "LH_DISTRIBUTION"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:233
+#: appendices/configuration-files.xml:233
 msgid ""
 "Select distribution to use. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
@@ -633,28 +542,24 @@ msgstr ""
 "layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:237
+#: appendices/configuration-files.xml:237
 msgid "LH_MIRROR_BOOTSTRAP"
 msgstr "LH_MIRROR_BOOTSTRAP"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:238
+#: appendices/configuration-files.xml:238
 msgid "Set mirror to bootstrap from. (See <xref linkend=\"package-sources\"/>)"
 msgstr ""
 "Défini le mirroir pour l'étape de bootstrap. (Voir <xref linkend=\"package-"
 "sources\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:242
+#: appendices/configuration-files.xml:242
 msgid "LH_MIRROR_CHROOT"
 msgstr "LH_MIRROR_CHROOT"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:243
+#: appendices/configuration-files.xml:243
 msgid ""
 "Set mirror to fetch packages from. (See <xref linkend=\"package-sources\"/>)"
 msgstr ""
@@ -662,14 +567,12 @@ msgstr ""
 "sources\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:247
+#: appendices/configuration-files.xml:247
 msgid "LH_MIRROR_CHROOT_SECURITY"
 msgstr "LH_MIRROR_CHROOT_SECURITY"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:248
+#: appendices/configuration-files.xml:248
 msgid ""
 "Set security mirror to fetch packages from. (See <xref linkend=\"package-"
 "sources\"/>)"
@@ -678,14 +581,12 @@ msgstr ""
 "linkend=\"package-sources\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:252
+#: appendices/configuration-files.xml:252
 msgid "LH_MIRROR_BINARY"
 msgstr "LH_MIRROR_BINARY"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:253
+#: appendices/configuration-files.xml:253
 msgid ""
 "Set mirror which ends up in the image. (See <xref linkend=\"package-sources"
 "\"/>)"
@@ -694,14 +595,12 @@ msgstr ""
 "\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:257
+#: appendices/configuration-files.xml:257
 msgid "LH_MIRROR_BINARY_SECURITY"
 msgstr "LH_MIRROR_BINARY_SECURITY"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:258
+#: appendices/configuration-files.xml:258
 msgid ""
 "Set security mirror which ends up in the image. (See <xref linkend=\"package-"
 "sources\"/>)"
@@ -710,62 +609,53 @@ msgstr ""
 "\"package-sources\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:262
+#: appendices/configuration-files.xml:262
 msgid "LH_SECTIONS"
 msgstr "LH_SECTIONS"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:263
+#: appendices/configuration-files.xml:263
 msgid "select section(s) to use. (See <xref linkend=\"package-sources\"/>)"
 msgstr ""
 "Défini la(es) section(s) à utiliser. (Voir <xref linkend=\"package-sources\"/"
 ">)"
 
 # type: Content of: <appendix><section><title>
-#. type: Content of: <appendix><section><title>
-#: en/appendices/configuration-files.xml:269
+#: appendices/configuration-files.xml:269
 msgid "The <filename>config/chroot</filename> file"
 msgstr "Le fichier <filename>config/chroot</filename>."
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:273
+#: appendices/configuration-files.xml:273
 msgid "LH_CHROOT_FILESYSTEM"
 msgstr "LH_CHROOT_FILESYSTEM"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:274
+#: appendices/configuration-files.xml:274
 msgid "Set chroot filesystem. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Défini le système de fichiers du chroot. (Voir <xref linkend=\"configuration-"
 "layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:278
+#: appendices/configuration-files.xml:278
 msgid "LH_UNION_FILESYSTEM"
 msgstr "LH_UNION_FILESYSTEM"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:279
+#: appendices/configuration-files.xml:279
 msgid "Set union filesystem. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Défini le système de fichier pour l'union. (Voir <xref linkend="
 "\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:283
+#: appendices/configuration-files.xml:283
 msgid "LH_EXPOSED_ROOT"
 msgstr "LH_EXPOSED_ROOT"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:284
+#: appendices/configuration-files.xml:284
 msgid ""
 "expose root as read only. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
@@ -773,190 +663,161 @@ msgstr ""
 "\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:288
+#: appendices/configuration-files.xml:288
 msgid "LH_HOOKS"
 msgstr "LH_HOOKS"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:289
+#: appendices/configuration-files.xml:289
 msgid "Set hook commands. (See <xref linkend=\"hooks\"/>)"
 msgstr "Définir les hooks. (Voir <xref linkend=\"hooks\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:293
+#: appendices/configuration-files.xml:293
 msgid "LH_INTERACTIVE"
 msgstr "LH_INTERACTIVE"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:294
+#: appendices/configuration-files.xml:294
 msgid "Set interactive build. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Défini une construction interactive. (Voir <xref linkend=\"configuration-"
 "layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:298
+#: appendices/configuration-files.xml:298
 msgid "LH_KEYRING_PACKAGES"
 msgstr "LH_KEYRING_PACKAGES"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:299
+#: appendices/configuration-files.xml:299
 msgid "Set keyring packages. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Défini les paquets de keyring (ndt: authentification). (Voir <xref linkend="
 "\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:303
+#: appendices/configuration-files.xml:303
 msgid "LH_LANGUAGE"
 msgstr "LH_LANGUAGE"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:304
+#: appendices/configuration-files.xml:304
 msgid "Set language to use. (See <xref linkend=\"language\"/>)"
 msgstr "Défini la langue à utiliser. (Voir <xref linkend=\"language\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:308
+#: appendices/configuration-files.xml:308
 msgid "LH_LINUX_FLAVOURS"
 msgstr "LH_LINUX_FLAVOURS"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:309
+#: appendices/configuration-files.xml:309
 msgid "Set kernel flavour to use. (See <xref linkend=\"kernel\"/>)"
 msgstr ""
 "Défini la \"saveur\" (ndt:flavour) du noyau à utiliser. (Voir <xref linkend="
 "\"kernel\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:313
+#: appendices/configuration-files.xml:313
 msgid "LH_LINUX_PACKAGES"
 msgstr "LH_LINUX_PACKAGES"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:314
+#: appendices/configuration-files.xml:314
 msgid "Set kernel packages to use. (See <xref linkend=\"kernel\"/>)"
 msgstr "Défini les paquets noyau à utiliser. (Voir <xref linkend=\"kernel\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:318
+#: appendices/configuration-files.xml:318
 msgid "LH_PACKAGES"
 msgstr "LH_PACKAGES"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:319
+#: appendices/configuration-files.xml:319
 msgid "Set packages to install. (See <xref linkend=\"lh-packages\"/>)"
 msgstr "Défini les paquets à installer. (Voir <xref linkend=\"lh-packages\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:323
+#: appendices/configuration-files.xml:323
 msgid "LH_PACKAGES_LISTS"
 msgstr "LH_PACKAGES_LISTS"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:324
+#: appendices/configuration-files.xml:324
 msgid "Set package list to install. (See <xref linkend=\"package-lists\"/>)"
 msgstr ""
 "Défini une liste de paquets à installer. (Voir <xref linkend=\"package-lists"
 "\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:328
+#: appendices/configuration-files.xml:328
 msgid "LH_TASKS"
 msgstr "LH_TASKS"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:329
+#: appendices/configuration-files.xml:329
 msgid "Set tasks to install. (See <xref linkend=\"tasks\"/>)"
 msgstr "Défini les tâches à installer. (Voir <xref linkend=\"tasks\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:333
+#: appendices/configuration-files.xml:333
 msgid "LH_SECURITY"
 msgstr "LH_SECURITY"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:334
+#: appendices/configuration-files.xml:334
 msgid "enable security updates. (See <xref linkend=\"package-sources\"/>)"
 msgstr ""
 "Autoriser les mises à jour de sécurité. (Voir <xref linkend=\"package-sources"
 "\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:338
+#: appendices/configuration-files.xml:338
 msgid "LH_SYMLINKS"
 msgstr "LH_SYMLINKS"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:339
+#: appendices/configuration-files.xml:339
 msgid "enable symlink convertion. (See <xref linkend=\"symlinks\"/>)"
 msgstr ""
 "Activer la conversion des liens symboliques. (Voir <xref linkend=\"symlinks"
 "\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:343
+#: appendices/configuration-files.xml:343
 msgid "LH_SYSVINIT"
 msgstr "LH_SYSVINIT"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:344
+#: appendices/configuration-files.xml:344
 msgid "enable sysvinit. (See <xref linkend=\"startup-scripts\"/>)"
 msgstr "Activer sysvinit. (Voir <xref linkend=\"startup-scripts\"/>)"
 
 # type: Content of: <appendix><section><title>
-#. type: Content of: <appendix><section><title>
-#: en/appendices/configuration-files.xml:351
+#: appendices/configuration-files.xml:351
 msgid "The <filename>config/common</filename> file"
 msgstr "Le fichier <filename>config/common</filename>."
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:355
+#: appendices/configuration-files.xml:355
 msgid "LH_APT"
 msgstr "LH_APT"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:356
+#: appendices/configuration-files.xml:356
 msgid "Set package manager. (See <xref linkend=\"package-installation\"/>)"
 msgstr ""
 "Défini le gestionnaire de paquets. (Voir <xref linkend=\"package-installation"
 "\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:360
+#: appendices/configuration-files.xml:360
 msgid "LH_APT_FTP_PROXY"
 msgstr "LH_APT_FTP_PROXY"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:361
+#: appendices/configuration-files.xml:361
 msgid ""
 "Set apt/aptitude ftp proxy. (See <xref linkend=\"package-installation\"/>)"
 msgstr ""
@@ -964,14 +825,12 @@ msgstr ""
 "installation\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:365
+#: appendices/configuration-files.xml:365
 msgid "LH_APT_HTTP_PROXY"
 msgstr "LH_APT_HTTP_PROXY"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:366
+#: appendices/configuration-files.xml:366
 msgid ""
 "Set apt/aptitude http proxy. (See <xref linkend=\"package-installation\"/>)"
 msgstr ""
@@ -979,14 +838,12 @@ msgstr ""
 "installation\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:370
+#: appendices/configuration-files.xml:370
 msgid "LH_APT_PDIFFS"
 msgstr "LH_APT_PDIFFS"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:371
+#: appendices/configuration-files.xml:371
 msgid ""
 "Set apt/aptitude pdiff indices. (See <xref linkend=\"package-installation\"/"
 ">)"
@@ -995,14 +852,12 @@ msgstr ""
 "installation\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:375
+#: appendices/configuration-files.xml:375
 msgid "LH_APT_PIPELINE"
 msgstr "LH_APT_PIPELINE"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:376
+#: appendices/configuration-files.xml:376
 msgid ""
 "Set apt/aptitude pipeline depth. (See <xref linkend=\"package-installation\"/"
 ">)"
@@ -1011,14 +866,12 @@ msgstr ""
 "\"package-installation\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:380
+#: appendices/configuration-files.xml:380
 msgid "LH_APT_RECOMMENDS"
 msgstr "LH_APT_RECOMMENDS"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:381
+#: appendices/configuration-files.xml:381
 msgid ""
 "Set apt/aptitude recommends. (See <xref linkend=\"package-installation\"/>)"
 msgstr ""
@@ -1026,14 +879,12 @@ msgstr ""
 "\"package-installation\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:385
+#: appendices/configuration-files.xml:385
 msgid "LH_APT_SECURE"
 msgstr "LH_APT_SECURE"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:386
+#: appendices/configuration-files.xml:386
 msgid ""
 "Set apt/aptitude security. (See <xref linkend=\"package-installation\"/>)"
 msgstr ""
@@ -1041,40 +892,34 @@ msgstr ""
 "installation\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:390
+#: appendices/configuration-files.xml:390
 msgid "LH_BOOTSTRAP"
 msgstr "LH_BOOTSTRAP"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:391
+#: appendices/configuration-files.xml:391
 msgid "Set bootstrap program. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Défini le programme de bootstrap. (Voir <xref linkend=\"configuration-layout"
 "\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:395
+#: appendices/configuration-files.xml:395
 msgid "LH_CACHE"
 msgstr "LH_CACHE"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:396
+#: appendices/configuration-files.xml:396
 msgid "control cache. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr "Contrôle du cache. (Voir <xref linkend=\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:400
+#: appendices/configuration-files.xml:400
 msgid "LH_CACHE_INDICES"
 msgstr "LH_CACHE_INDICES"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:401
+#: appendices/configuration-files.xml:401
 msgid ""
 "control if downloaded package indices should be cached. (See <xref linkend="
 "\"configuration-layout\"/>)"
@@ -1083,14 +928,12 @@ msgstr ""
 "(Voir <xref linkend=\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:405
+#: appendices/configuration-files.xml:405
 msgid "LH_CACHE_PACKAGES"
 msgstr "LH_CACHE_PACKAGES"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:406
+#: appendices/configuration-files.xml:406
 msgid ""
 "control if downloaded packages files should be cached. (See <xref linkend="
 "\"configuration-layout\"/>)"
@@ -1099,14 +942,12 @@ msgstr ""
 "linkend=\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:410
+#: appendices/configuration-files.xml:410
 msgid "LH_CACHE_STAGES"
 msgstr "LH_CACHE_STAGES"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:411
+#: appendices/configuration-files.xml:411
 msgid ""
 "control if completed stages should be cached. (See <xref linkend="
 "\"configuration-layout\"/>)"
@@ -1115,14 +956,12 @@ msgstr ""
 "linkend=\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:415
+#: appendices/configuration-files.xml:415
 msgid "LH_DEBCONF_FRONTEND"
 msgstr "LH_DEBCONF_FRONTEND"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:416
+#: appendices/configuration-files.xml:416
 msgid ""
 "Set debconf(1) frontend to use. (See <xref linkend=\"configuration-layout\"/"
 ">)"
@@ -1131,28 +970,24 @@ msgstr ""
 "\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:420
+#: appendices/configuration-files.xml:420
 msgid "LH_DEBCONF_NOWARNINGS"
 msgstr "LH_DEBCONF_NOWARNINGS"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:421
+#: appendices/configuration-files.xml:421
 msgid "Set debconf(1) warnings. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Défini les messages d'erreurs de debconf(1). (Voir <xref linkend="
 "\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:425
+#: appendices/configuration-files.xml:425
 msgid "LH_DEBCONF_PRIORITY"
 msgstr "LH_DEBCONF_PRIORITY"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:426
+#: appendices/configuration-files.xml:426
 msgid ""
 "Set debconf(1) priority to use. (See <xref linkend=\"configuration-layout\"/"
 ">)"
@@ -1161,207 +996,175 @@ msgstr ""
 "\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:430
+#: appendices/configuration-files.xml:430
 msgid "LH_INITRAMFS"
 msgstr "LH_INITRAMFS"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:431
+#: appendices/configuration-files.xml:431
 msgid "Set initramfs hook. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Défini le hook pour initramfs. (Voir <xref linkend=\"configuration-layout\"/"
 ">)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:435
+#: appendices/configuration-files.xml:435
 msgid "LH_FDISK"
 msgstr "LH_FDISK"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:436
+#: appendices/configuration-files.xml:436
 msgid "Set fdisk program. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Défini le programme fdisk. (Voir <xref linkend=\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:440
+#: appendices/configuration-files.xml:440
 msgid "LH_LOSETUP"
 msgstr "LH_LOSETUP"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:441
+#: appendices/configuration-files.xml:441
 msgid "Set losetup program. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Défini le programme losetup. (Voir <xref linkend=\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:445
+#: appendices/configuration-files.xml:445
 msgid "LH_MODE"
 msgstr "LH_MODE"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:446
+#: appendices/configuration-files.xml:446
 msgid "Set distribution mode. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Défini le mode de distribution. (Voir <xref linkend=\"configuration-layout\"/"
 ">)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:450
+#: appendices/configuration-files.xml:450
 msgid "LH_ROOT_COMMAND"
 msgstr "LH_ROOT_COMMAND"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:451
+#: appendices/configuration-files.xml:451
 msgid "use sudo or equivalent. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Utiliser sudo ou un équivalent. (Voir <xref linkend=\"configuration-layout\"/"
 ">)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:455
+#: appendices/configuration-files.xml:455
 msgid "LH_USE_FAKEROOT"
 msgstr "LH_USE_FAKEROOT"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:456
+#: appendices/configuration-files.xml:456
 msgid "use fakeroot/fakechroot. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Utiliser fakeroot/fakechroot. (Voir <xref linkend=\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:460
+#: appendices/configuration-files.xml:460
 msgid "LH_TASKSEL"
 msgstr "LH_TASKSEL"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:461
+#: appendices/configuration-files.xml:461
 msgid "Set tasksel program. (See <xref linkend=\"tasks\"/>)"
 msgstr "Défini le programme pour tasksel. (Voir <xref linkend=\"tasks\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:465
+#: appendices/configuration-files.xml:465
 msgid "LH_INCLUDES"
 msgstr "LH_INCLUDES"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:466
+#: appendices/configuration-files.xml:466
 msgid "Set includes. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr "Défini les includes. (See <xref linkend=\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:470
+#: appendices/configuration-files.xml:470
 msgid "LH_TEMPLATES"
 msgstr "LH_TEMPLATES"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:471
+#: appendices/configuration-files.xml:471
 msgid "Set templates. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr "Défini templates. (Voir <xref linkend=\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:475
+#: appendices/configuration-files.xml:475
 msgid "LH_BREAKPOINTS"
 msgstr "LH_BREAKPOINTS"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:476
+#: appendices/configuration-files.xml:476
 msgid "enable breakpoints. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Activer les points d'arrêts. (Voir <xref linkend=\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:480
+#: appendices/configuration-files.xml:480
 msgid "LH_DEBUG"
 msgstr "LH_DEBUG"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:481
+#: appendices/configuration-files.xml:481
 msgid "enable debug. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr "Activer le debogage. (Voir <xref linkend=\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:485
+#: appendices/configuration-files.xml:485
 msgid "LH_FORCE"
 msgstr "LH_FORCE"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:486
+#: appendices/configuration-files.xml:486
 msgid "enable force. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Activer l'option force. (Voir <xref linkend=\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:490
+#: appendices/configuration-files.xml:490
 msgid "LH_QUIET"
 msgstr "LH_QUIET"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:491
+#: appendices/configuration-files.xml:491
 msgid "enable quiet. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Activer l'option quiet. (Voir <xref linkend=\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:495
+#: appendices/configuration-files.xml:495
 msgid "LH_VERBOSE"
 msgstr "LH_VERBOSE"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:496
+#: appendices/configuration-files.xml:496
 msgid "enable verbose. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Activer l'option verbose. (Voir <xref linkend=\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><title>
-#. type: Content of: <appendix><section><title>
-#: en/appendices/configuration-files.xml:502
+#: appendices/configuration-files.xml:502
 msgid "The <filename>config/source</filename> file"
 msgstr "Le fichier <filename>config/source</filename>;"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:506
+#: appendices/configuration-files.xml:506
 msgid "LH_SOURCE"
 msgstr "LH_SOURCE"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:507
+#: appendices/configuration-files.xml:507
 msgid "Set source option. (See <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 "Défini l'option source. (Voir <xref linkend=\"configuration-layout\"/>)"
 
 # type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:511
+#: appendices/configuration-files.xml:511
 msgid "LH_SOURCE_IMAGES"
 msgstr "LH_SOURCE_IMAGES"
diff --git a/manual/po/fr/configuration-layout.xml.po b/manual/old/fr/configuration-layout.xml.po
similarity index 54%
rename from manual/po/fr/configuration-layout.xml.po
rename to manual/old/fr/configuration-layout.xml.po
index f306afc..fd998d0 100644
--- a/manual/po/fr/configuration-layout.xml.po
+++ b/manual/old/fr/configuration-layout.xml.po
@@ -6,271 +6,228 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Debconf 8\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
+"POT-Creation-Date: 2008-08-09 16:50+0300\n"
 "PO-Revision-Date: 2008-08-09 16:50+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 # type: Content of: <appendix><title>
-#. type: Content of: <appendix><title>
-#: en/appendices/configuration-layout.xml:8
+#: appendices/configuration-layout.xml:8
 msgid "Configuration layout"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><title>
-#. type: Content of: <appendix><variablelist><title>
-#: en/appendices/configuration-layout.xml:11
+#: appendices/configuration-layout.xml:11
 msgid ""
 "Layout of the <filename class=\"directory\">config/</filename> directory"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:14
+#: appendices/configuration-layout.xml:14
 msgid "<filename class=\"directory\">binary_debian-installer/</filename>"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:15
-#: en/appendices/configuration-layout.xml:23
-#: en/appendices/configuration-layout.xml:39
+#: appendices/configuration-layout.xml:15
+#: appendices/configuration-layout.xml:23
+#: appendices/configuration-layout.xml:39
 msgid "(see <xref linkend=\"debian-installer\"/>)"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:18
+#: appendices/configuration-layout.xml:18
 msgid "<filename class=\"directory\">binary_grub/</filename>"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:19
-#: en/appendices/configuration-layout.xml:47
-#: en/appendices/configuration-layout.xml:79
-#: en/appendices/configuration-layout.xml:83
+#: appendices/configuration-layout.xml:19
+#: appendices/configuration-layout.xml:47
+#: appendices/configuration-layout.xml:79
+#: appendices/configuration-layout.xml:83
 msgid "(see <xref linkend=\"bootloaders\"/>)"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:22
+#: appendices/configuration-layout.xml:22
 msgid "<filename class=\"directory\">binary_local-debs/</filename>"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:26
+#: appendices/configuration-layout.xml:26
 msgid "<filename class=\"directory\">binary_local-hooks/</filename>"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:27
+#: appendices/configuration-layout.xml:27
 msgid "(see <xref linkend=\"binary-local-hooks\"/>)"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:30
+#: appendices/configuration-layout.xml:30
 msgid "<filename class=\"directory\">binary_local-includes/</filename>"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:31
+#: appendices/configuration-layout.xml:31
 msgid "(see <xref linkend=\"binary-includes\"/>)"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:34
+#: appendices/configuration-layout.xml:34
 msgid "<filename class=\"directory\">binary_local-packageslists/</filename>"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:35
-#: en/appendices/configuration-layout.xml:43
+#: appendices/configuration-layout.xml:35
+#: appendices/configuration-layout.xml:43
 msgid "(see <xref linkend=\"configuration-layout\"/>)"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:38
+#: appendices/configuration-layout.xml:38
 msgid "<filename class=\"directory\">binary_local-udebs/</filename>"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:42
+#: appendices/configuration-layout.xml:42
 msgid "<filename class=\"directory\">binary_rootfs/</filename>"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:46
+#: appendices/configuration-layout.xml:46
 msgid "<filename class=\"directory\">binary_syslinux/</filename>"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:50
+#: appendices/configuration-layout.xml:50
 msgid "<filename class=\"directory\">chroot_apt/</filename>"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:51
+#: appendices/configuration-layout.xml:51
 msgid "(see <xref linkend=\"custom-packages-apt\"/>)"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:54
+#: appendices/configuration-layout.xml:54
 msgid "<filename class=\"directory\">chroot_local-hooks/</filename>"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:55
+#: appendices/configuration-layout.xml:55
 msgid "(see <xref linkend=\"chroot-local-hooks\"/>)"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:58
+#: appendices/configuration-layout.xml:58
 msgid "<filename class=\"directory\">chroot_local-includes/</filename>"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:59
+#: appendices/configuration-layout.xml:59
 msgid "(see <xref linkend=\"chroot-local-includes\"/>)"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:62
+#: appendices/configuration-layout.xml:62
 msgid "<filename class=\"directory\">chroot_local-packages/</filename>"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:63
+#: appendices/configuration-layout.xml:63
 msgid "(see <xref linkend=\"local-packages\"/>)"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:66
+#: appendices/configuration-layout.xml:66
 msgid "<filename class=\"directory\">chroot_local-packageslists/</filename>"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:67
+#: appendices/configuration-layout.xml:67
 msgid "(see <xref linkend=\"package-lists\"/>)"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:70
+#: appendices/configuration-layout.xml:70
 msgid "<filename class=\"directory\">chroot_local-presed/</filename>"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:71
+#: appendices/configuration-layout.xml:71
 msgid "(see <xref linkend=\"debconf-preseed\"/>)"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:74
+#: appendices/configuration-layout.xml:74
 msgid "<filename class=\"directory\">chroot_sources/</filename>"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:75
+#: appendices/configuration-layout.xml:75
 msgid "(see <xref linkend=\"custom-apt-repo\"/>)"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:78
+#: appendices/configuration-layout.xml:78
 msgid "<filename class=\"directory\">includes/</filename>"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:82
+#: appendices/configuration-layout.xml:82
 msgid "<filename class=\"directory\">templates/</filename>"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:87
+#: appendices/configuration-layout.xml:87
 msgid "<filename>bootstrap</filename>"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:88
+#: appendices/configuration-layout.xml:88
 msgid "(see <xref linkend=\"config-bootstrap\"/>)"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:91
+#: appendices/configuration-layout.xml:91
 msgid "<filename>binary</filename>"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:92
+#: appendices/configuration-layout.xml:92
 msgid "(see <xref linkend=\"config-binary\"/>)"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:95
+#: appendices/configuration-layout.xml:95
 msgid "<filename>chroot</filename>"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:96
+#: appendices/configuration-layout.xml:96
 msgid "(see <xref linkend=\"config-chroot\"/>)"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:99
+#: appendices/configuration-layout.xml:99
 msgid "<filename>common</filename>"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:100
+#: appendices/configuration-layout.xml:100
 msgid "(see <xref linkend=\"config-common\"/>)"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:103
+#: appendices/configuration-layout.xml:103
 msgid "<filename>source</filename>"
 msgstr ""
 
 # type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:104
+#: appendices/configuration-layout.xml:104
 msgid "(see <xref linkend=\"config-source\"/>)"
 msgstr ""
diff --git a/manual/po/fr/customization.xml.po b/manual/old/fr/customization.xml.po
similarity index 77%
rename from manual/po/fr/customization.xml.po
rename to manual/old/fr/customization.xml.po
index 7d03397..a68b944 100644
--- a/manual/po/fr/customization.xml.po
+++ b/manual/old/fr/customization.xml.po
@@ -6,19 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
+"POT-Creation-Date: 2008-11-12 22:29+0100\n"
 "PO-Revision-Date: 2008-11-12 22:29+0100\n"
-"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> "
-"<christophenagel at gmail.com>\n"
+"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> <christophenagel at gmail.com>\n"
 "Language-Team: none\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 # type: Content of: <chapter><title>
-#. type: Content of: <chapter><title>
-#: en/chapters/customization.xml:7
+#: xml/chapters/customization.xml:7
 msgid "Customization"
 msgstr "Personnalisation"
diff --git a/manual/po/fr/about.xml.po b/manual/old/fr/faq.xml.po
similarity index 68%
rename from manual/po/fr/about.xml.po
rename to manual/old/fr/faq.xml.po
index f64945a..3feee75 100644
--- a/manual/po/fr/about.xml.po
+++ b/manual/old/fr/faq.xml.po
@@ -6,19 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Debconf 8\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2009-02-25 19:06+0100\n"
-"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> "
-"<christophenagel at gmail.com>\n"
+"POT-Creation-Date: 2008-08-09 16:50+0300\n"
+"PO-Revision-Date: 2009-02-27 13:12+0100\n"
+"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> <christophenagel at gmail.com>\n"
 "Language-Team: none\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 # type: Content of: <chapter><title>
-#. type: Content of: <chapter><title>
-#: en/chapters/about.xml:9
-msgid "About"
-msgstr "A propos"
+#: chapters/faq.xml:7
+msgid "Frequently asked questions (FAQ)"
+msgstr "Questions frequemment posées (FAQ)"
diff --git a/manual/old/fr/index.html.in.po b/manual/old/fr/index.html.in.po
new file mode 100644
index 0000000..641a3be
--- /dev/null
+++ b/manual/old/fr/index.html.in.po
@@ -0,0 +1,124 @@
+# French translations for Debconf package
+# Copyright (C) 2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the Debconf package.
+# Automatically generated, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Debconf 8\n"
+"POT-Creation-Date: 2009-02-25 14:33+0100\n"
+"PO-Revision-Date: 2009-02-26 15:30+0100\n"
+"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> <christophenagel at gmail.com>\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+# type: Content of: <html><head><title>
+#: xml/chapters/about/manual.xml:21 html/index.html.in:8
+msgid "Debian Live"
+msgstr "Debian Live"
+
+# type: Content of: <html><body><h1>
+#: html/index.html.in:22
+msgid "<a href=\"/\">Debian Live</a>"
+msgstr "<a href=\"/\">Debian Live</a>"
+
+# type: Content of: <html><body><h2>
+#: html/index.html.in:23
+msgid "<a href=\"/\">Live Debian systems!</a>"
+msgstr "<a href=\"/\">Live Debian systems!</a>"
+
+# type: Content of: <html><body><div><h2>
+#: html/index.html.in:27
+msgid "Live Manual"
+msgstr "Live Manuel"
+
+# type: Content of: <html><body><div><dl><dd><p>
+#: html/index.html.in:33
+msgid "<i>This manual is under heavy construction.</i>"
+msgstr "<i>Ce manuel est en phase de construction intense.</i>"
+
+# type: Content of: <html><body><div><dl><dd><p>
+#: html/index.html.in:37
+msgid ""
+"Please report errors, omissions, patches and suggestions to our mailinglist "
+"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
+"org</a>."
+msgstr ""
+"Svp, rapporter toutes les erreurs, les omissions, les patches et les "
+"suggestions à notre liste de diffusion à l'adresse <a href=\"mailto:debian-"
+"live at lists.debian.org\">debian-live at lists.debian.org</a>."
+
+# type: Content of: <html><body><div><dl><dt><h3>
+#: html/index.html.in:41
+msgid "Available Formats"
+msgstr "Formats Disponibles"
+
+# type: Content of: <html><body><div><dl><dd><ul><li>
+#: html/index.html.in:45
+msgid "&rsaquo; <b><a href=\"html/@LANG@/\">HTML</a></b>"
+msgstr "&rsaquo; <b><a href=\"html/@LANG@/\">HTML</a></b>"
+
+# type: Content of: <html><body><div><dl><dd><ul><li>
+#: html/index.html.in:46
+msgid "&rsaquo; <a href=\"pdf/@LANG@/live-manual.pdf\">PDF</a>"
+msgstr "&rsaquo; <a href=\"pdf/@LANG@/live-manual.pdf\">PDF</a>"
+
+# type: Content of: <html><body><div><dl><dd><ul><li>
+#: html/index.html.in:47
+msgid "&rsaquo; <a href=\"txt/@LANG@/live-manual.txt\">Plain text</a>"
+msgstr "&rsaquo; <a href=\"txt/@LANG@/live-manual.txt\">Texte</a>"
+
+# type: Content of: <html><body><div><dl><dd><p>
+#: html/index.html.in:51
+msgid "Last updated: @DATE@"
+msgstr "Last updated: @DATE@"
+
+# type: Content of: <html><body><div><dl><dt><h3>
+#: html/index.html.in:55
+msgid "Source"
+msgstr "Source"
+
+# type: Content of: <html><body><div><dl><dd><p>
+#: html/index.html.in:59
+msgid ""
+"The sources for this manual is available in a <a href=\"http://git.or.cz/"
+"\">git</a> repository at git.debian.org."
+msgstr ""
+"Les sources pour ce manuel sont disponibles dans dépot <a href=\"http://git."
+"or.cz/\">git</a> à git.debian.org."
+
+# type: Content of: <html><body><div><dl><dd><ul><li>
+#: html/index.html.in:63
+msgid ""
+"Browse: <a href=\"http://git.debian.org/?p=debian-live/live-manual.git"
+"\"><small><tt>http://git.debian.org/?p=debian-live/live-manual.git</tt></"
+"small></a>"
+msgstr ""
+"Parcourir:  <a href=\"http://git.debian.org/?p=debian-live/live-manual.git"
+"\"><small><tt>http://git.debian.org/?p=debian-live/live-manual.git</tt></"
+"small></a>"
+
+# type: Content of: <html><body><div><dl><dd><ul><li>
+#: html/index.html.in:64
+msgid ""
+"Git: <a href=\"git://git.debian.org/git/debian-live/live-manual.git"
+"\"><small><tt>git://git.debian.org/git/debian-live/live-manual.git</tt></"
+"small></a>"
+msgstr ""
+"Git: <a href=\"git://git.debian.org/git/debian-live/live-manual.git"
+"\"><small><tt>git://git.debian.org/git/debian-live/live-manual.git</tt></"
+"small></a>"
+
+# type: Content of: <html><body><div><p>
+#: html/index.html.in:74
+msgid ""
+"<a href=\"http://live.debian.net/\">Debian Live</a> &lt;<a "
+"href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian.org</"
+"a>&gt; - <a href=\"http://live.debian.net/legal.html\">Legal Notice</a>"
+msgstr ""
+"<a href=\"http://live.debian.net/\">Debian Live</a> &lt;<a "
+"href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian.org</"
+"a>&gt; - <a href=\"http://live.debian.net/legal.html\">Notice Légale</a>"
diff --git a/manual/po/fr/index.xml.po b/manual/old/fr/index.xml.po
similarity index 76%
rename from manual/po/fr/index.xml.po
rename to manual/old/fr/index.xml.po
index aafe7e2..74f72aa 100644
--- a/manual/po/fr/index.xml.po
+++ b/manual/old/fr/index.xml.po
@@ -6,42 +6,27 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Debconf 8\n"
-"POT-Creation-Date: 2010-06-06 14:13+0300\n"
+"POT-Creation-Date: 2009-02-25 14:33+0100\n"
 "PO-Revision-Date: 2009-02-27 16:58+0100\n"
-"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> "
-"<christophenagel at gmail.com>\n"
+"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> <christophenagel at gmail.com>\n"
 "Language-Team: none\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#. type: Content of the pubdate entity
-#: en/index.xml:5
-msgid "2010-06-06"
-msgstr ""
-
-#. type: Content of the version entity
-#: en/index.xml:6
-msgid "2.0~a1"
-msgstr ""
-
 # type: Attribute 'lang' of: <book>
-#. type: Attribute 'lang' of: <book>
-#: en/index.xml:8
+#: xml/index.xml:7
 msgid "en"
 msgstr "fr"
 
 # type: Content of: <book><title>
-#. type: Content of: <book><title>
-#: en/index.xml:10
+#: xml/index.xml:9
 msgid "Debian Live Manual"
 msgstr "Manuel de Debian Live"
 
 # type: Content of: <book><bookinfo>
-#. type: Content of: <book><bookinfo>
-#: en/index.xml:12
+#: xml/index.xml:11
 msgid ""
 "<author> <othername>The Debian Live Project</othername> <email>debian-"
 "live at lists.debian.org</email> </author>"
@@ -50,21 +35,22 @@ msgstr ""
 "live at lists.debian.org</email> </author>"
 
 # type: Content of: <book><bookinfo><releaseinfo>
-#. type: Content of: <book><bookinfo><releaseinfo>
-#: en/index.xml:17
+#: xml/index.xml:16
 msgid "&version;"
 msgstr "&version;"
 
-#. type: Content of: <book><bookinfo>
-#: en/index.xml:18
-msgid ""
-"<pubdate>&pubdate;</pubdate> <copyright> <year>2008-2010</year> <holder>The "
-"Debian Live Project</holder> </copyright>"
-msgstr ""
+# type: Content of: <book><bookinfo><pubdate>
+#: xml/index.xml:17
+msgid "&pubdate;"
+msgstr "&pubdate;"
+
+# type: Content of: <book><bookinfo><copyright><holder>
+#: xml/index.xml:21
+msgid "The Debian Live Project"
+msgstr "Le projet Debian Live"
 
 # type: Content of: <book><bookinfo><legalnotice><para>
-#. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:27
+#: xml/index.xml:26
 msgid ""
 "This program is free software: you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -77,8 +63,7 @@ msgstr ""
 "ou (à votre convenance) toute version ultérieure."
 
 # type: Content of: <book><bookinfo><legalnotice><para>
-#. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:33
+#: xml/index.xml:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -91,15 +76,14 @@ msgstr ""
 "more details."
 
 # type: Content of: <book><bookinfo><legalnotice><para>
-#. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:39
+#: xml/index.xml:38
 msgid ""
 "A copy of the GNU General Public License is available as <filename>/usr/"
 "share/common-licenses/GPL</filename> in the Debian GNU/Linux distribution or "
 "on the World Wide Web at <ulink url=\"http://www.gnu.org/copyleft/gpl.html"
 "\">the GNU web site</ulink>.  You can also obtain it by writing to the Free "
-"Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA "
-"02111-1307, USA."
+"Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-"
+"1307, USA."
 msgstr ""
 "Une copie de la licence GNU General Public License est disponible dans le "
 "fichier <filename>/usr/share/common-licenses/GPL</filename> dans une "
@@ -109,8 +93,7 @@ msgstr ""
 "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
 # type: Content of: <book><bookinfo><legalnotice><para>
-#. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:47
+#: xml/index.xml:46
 msgid ""
 "If you want to print this reference, this document is also available in "
 "Portable Document Format (PDF)."
diff --git a/manual/po/fr/installation.xml.po b/manual/old/fr/installation.xml.po
similarity index 61%
rename from manual/po/fr/installation.xml.po
rename to manual/old/fr/installation.xml.po
index d87c1b8..c4e9e7c 100644
--- a/manual/po/fr/installation.xml.po
+++ b/manual/old/fr/installation.xml.po
@@ -6,12 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Debconf 8\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
+"POT-Creation-Date: 2009-02-25 14:33+0100\n"
 "PO-Revision-Date: 2009-02-25 20:03+0100\n"
-"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> "
-"<christophenagel at gmail.com>\n"
+"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> <christophenagel at gmail.com>\n"
 "Language-Team: none\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,45 +22,38 @@ msgstr ""
 # type: Content of: <chapter><section><title>
 # #-#-#-#-#  manual.xml.po (PACKAGE VERSION)  #-#-#-#-#
 # type: Content of: <chapter><section><title>
-#. type: Content of: <chapter><section><section><title>
-#: en/about_manual.xml:90 en/installation.xml:76
+#: xml/chapters/about/manual.xml:37 xml/chapters/installation.xml:122
 msgid "&live-initramfs;"
 msgstr "&live-initramfs;"
 
 # type: Content of: <chapter><title>
-#. type: Content of: <chapter><title>
-#: en/installation.xml:7
+#: xml/chapters/installation.xml:7
 msgid "Installation"
 msgstr "Installation"
 
 # type: Content of: <chapter><section><title>
-#. type: Content of: <chapter><section><title>
-#: en/installation.xml:10
+#: xml/chapters/installation.xml:10
 msgid "Requirements"
 msgstr "Prérequis"
 
 # type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/installation.xml:12
+#: xml/chapters/installation.xml:12
 msgid "Building Debian Live images has very few system requirements:"
 msgstr ""
 "Construire des systèmes Debian Live ne nécessite que très peu de prérequis:"
 
 # type: Content of: <chapter><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:15
+#: xml/chapters/installation.xml:15
 msgid "Super user (root) access"
 msgstr "Un accès super-utilisateur (root)"
 
 # type: Content of: <chapter><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:16
+#: xml/chapters/installation.xml:16
 msgid "An up-to-date version of &live-helper;"
 msgstr "Une version à jour de &live-helper;"
 
 # type: Content of: <chapter><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:17
+#: xml/chapters/installation.xml:17
 msgid ""
 "A POSIX-compliant shell, such as <command>bash</command> or <command>dash</"
 "command>."
@@ -71,20 +62,17 @@ msgstr ""
 "command>."
 
 # type: Content of: <chapter><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:18
+#: xml/chapters/installation.xml:18
 msgid "<command>debootstrap</command> or <command>cdebootstrap</command>"
 msgstr "<command>debootstrap</command> ou <command>cdebootstrap</command>"
 
 # type: Content of: <chapter><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:19
+#: xml/chapters/installation.xml:19
 msgid "Linux 2.6.x"
 msgstr "Linux 2.6.x"
 
 # type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/installation.xml:22
+#: xml/chapters/installation.xml:22
 msgid ""
 "Note that using Debian or a Debian-derived distribution is not required - "
 "&live-helper; will run on almost any operating system with the above "
@@ -95,44 +83,37 @@ msgstr ""
 "d'exploitation remplissant les conditions ci-dessus."
 
 # type: Content of: <chapter><section><title>
-#. type: Content of: <chapter><section><title>
-#: en/installation.xml:27
+#: xml/chapters/installation.xml:27
 msgid "Installing &live-helper;"
 msgstr "Installer &live-helper;"
 
 # type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/installation.xml:29
+#: xml/chapters/installation.xml:29
 msgid "You can install &live-helper; in a number of different ways:"
 msgstr "Vous pouvez installer &live-helper; de manière très variées:"
 
 # type: Content of: <chapter><section><section><title>
-#. type: Content of: <chapter><section><section><title>
-#: en/installation.xml:32 en/installation.xml:41
+#: xml/chapters/installation.xml:32 xml/chapters/installation.xml:41
 msgid "From the Debian repository"
 msgstr "Depuis le dépot Debian"
 
 # type: Content of: <chapter><section><section><title>
-#. type: Content of: <chapter><section><section><title>
-#: en/installation.xml:33 en/installation.xml:51
+#: xml/chapters/installation.xml:33 xml/chapters/installation.xml:51
 msgid "From source"
 msgstr "Depuis les sources"
 
 # type: Content of: <chapter><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:34
+#: xml/chapters/installation.xml:34
 msgid "From snapshots"
 msgstr "Depuis les snapshots"
 
 # type: Content of: <chapter><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:35
+#: xml/chapters/installation.xml:35
 msgid "From backports.org"
 msgstr "Depuis backports.org"
 
 # type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/installation.xml:38
+#: xml/chapters/installation.xml:38
 msgid ""
 "If you are using &lenny; or &sid; the recommended way is to install &live-"
 "helper; via the Debian repository."
@@ -141,34 +122,29 @@ msgstr ""
 "depuis le dépot Debian."
 
 # type: Content of: <chapter><section><section><para>
-#. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:43
+#: xml/chapters/installation.xml:43
 msgid "Simply install &live-helper; like any other package:"
 msgstr "Installer simplement &live-helper; comme n'importe quel autre paquet:"
 
 # type: Content of: <chapter><section><section><screen>
-#. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:44
+#: xml/chapters/installation.xml:44
 #, no-wrap
 msgid "# apt-get install live-helper"
 msgstr "# apt-get install live-helper"
 
 # type: Content of: <chapter><section><section><para>
-#. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:45
+#: xml/chapters/installation.xml:45
 msgid "or"
 msgstr "ou"
 
 # type: Content of: <chapter><section><section><screen>
-#. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:46
+#: xml/chapters/installation.xml:46
 #, no-wrap
 msgid "# aptitude install live-helper"
 msgstr "# aptitude install live-helper"
 
 # type: Content of: <chapter><section><section><para>
-#. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:53
+#: xml/chapters/installation.xml:53
 msgid ""
 "&live-helper; is developed using the Git version control system. On Debian "
 "systems, this is provided by the <command>git-core</command> package. To "
@@ -179,31 +155,22 @@ msgstr ""
 "command>. Pour rapatrier la dernière version, exécuter:"
 
 # type: Content of: <chapter><section><section><screen>
-#. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:54
-#, fuzzy, no-wrap
-#| msgid "$ git clone git://git.debian.net/git/debian-live/live-helper.git"
-msgid "$ git clone git://live.debian.net/git/live-helper.git"
+#: xml/chapters/installation.xml:54
+#, no-wrap
+msgid "$ git clone git://git.debian.net/git/debian-live/live-helper.git"
 msgstr "$ git clone git://git.debian.net/git/debian-live/live-helper.git"
 
 # type: Content of: <chapter><section><section><para>
-#. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:55
+#: xml/chapters/installation.xml:55
 msgid "You can build and install your own Debian package by executing:"
 msgstr ""
 "Vous pouvez construire et installer votre propre paquet Debian en exécutant:"
 
 # type: Content of: <chapter><section><section><screen>
-#. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:57
-#, fuzzy, no-wrap
-#| msgid ""
-#| "\n"
-#| " $ cd live-helper\n"
-#| " $ dpkg-buildpackage -rfakeroot -b -uc -us\n"
-#| " $ cd ..\n"
-#| " # dpkg -i live-helper*.deb\n"
+#: xml/chapters/installation.xml:56
+#, no-wrap
 msgid ""
+"\n"
 " $ cd live-helper\n"
 " $ dpkg-buildpackage -rfakeroot -b -uc -us\n"
 " $ cd ..\n"
@@ -216,23 +183,20 @@ msgstr ""
 " # dpkg -i live-helper*.deb\n"
 
 # type: Content of: <chapter><section><section><para>
-#. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:62
+#: xml/chapters/installation.xml:62
 msgid "You can also use a local version of &live-helper; without installation:"
 msgstr ""
 "Vous pouvez aussi utiliser une version locale de &live-helper; sans "
 "installation:"
 
 # type: Content of: <chapter><section><section><screen>
-#. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:63
+#: xml/chapters/installation.xml:63
 #, no-wrap
 msgid "# live-helper/helpers/lh_local"
 msgstr "# live-helper/helpers/lh_local"
 
 # type: Content of: <chapter><section><section><para>
-#. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:64
+#: xml/chapters/installation.xml:64
 msgid ""
 "Subsequent calls to <filename>lh_</filename>-prefixed helpers in that shell "
 "environment will then use the version located in the directory you executed "
@@ -240,8 +204,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><para>
-#. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:65
+#: xml/chapters/installation.xml:65
 msgid ""
 "You can also install &live-helper; directly to your system by executing:"
 msgstr ""
@@ -249,21 +212,18 @@ msgstr ""
 "exécutant:"
 
 # type: Content of: <chapter><section><section><screen>
-#. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:66
+#: xml/chapters/installation.xml:66
 #, no-wrap
 msgid "# make install"
 msgstr "# make install"
 
 # type: Content of: <chapter><section><section><title>
-#. type: Content of: <chapter><section><section><title>
-#: en/installation.xml:71
+#: xml/chapters/installation.xml:71
 msgid "From 'snapshots'"
 msgstr "Depuis les 'snapshots'"
 
 # type: Content of: <chapter><section><section><para>
-#. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:72
+#: xml/chapters/installation.xml:72
 msgid ""
 "If you do not wish to build or install &live-helper; from source, you can "
 "use snapshots. These are built automatically from the latest version in Git "
@@ -271,9 +231,125 @@ msgid ""
 "live.debian.net/debian</ulink>."
 msgstr ""
 
+# type: Content of: <chapter><section><section><title>
+#: xml/chapters/installation.xml:76
+msgid "From Backports.org"
+msgstr "Depuis Backports.org"
+
+# type: Content of: <chapter><section><section><para>
+#: xml/chapters/installation.xml:78
+msgid ""
+"Whilst &live-helper; and friends were not a part of the Debian etch release, "
+"they will work on &etch; as well. You will need the following programs:"
+msgstr ""
+
+# type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: xml/chapters/installation.xml:80
+msgid ""
+"An <emphasis>etch</emphasis> backport of either <command>debootstrap</"
+"command> or <command>cdebootstrap</command> from backports.org"
+msgstr ""
+
+# type: Content of: <chapter><section><section><orderedlist><listitem><para>
+#: xml/chapters/installation.xml:81
+msgid ""
+"The <emphasis>lenny</emphasis> or <emphasis>sid</emphasis> version of &live-"
+"helper;"
+msgstr ""
+
+# type: Content of: <chapter><section><section><section><title>
+#: xml/chapters/installation.xml:85
+msgid "Installing debootstrap or cdebootstrap from backports.org"
+msgstr ""
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: xml/chapters/installation.xml:89
+msgid "Put this in your /etc/apt/sources.list:"
+msgstr ""
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
+#: xml/chapters/installation.xml:90
+#, no-wrap
+msgid "deb http://www.backports.org/debian etch-backports main"
+msgstr "deb http://www.backports.org/debian etch-backports main"
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: xml/chapters/installation.xml:93
+msgid "Update the package indices"
+msgstr ""
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
+#: xml/chapters/installation.xml:94
+#, no-wrap
+msgid "apt-get update"
+msgstr "apt-get update"
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: xml/chapters/installation.xml:97
+msgid "Either install <command>debootstrap</command>:"
+msgstr "Installer aussi <command>debootstrap</command>:"
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
+#: xml/chapters/installation.xml:98
+#, no-wrap
+msgid "apt-get install -t etch-backports debootstrap"
+msgstr "apt-get install -t etch-backports debootstrap"
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: xml/chapters/installation.xml:99
+msgid "or install <command>cdebootstrap</command>:"
+msgstr "ou installer <command>cdebootstrap</command>:"
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
+#: xml/chapters/installation.xml:100
+#, no-wrap
+msgid "apt-get install -t etch-backports cdebootstrap"
+msgstr "apt-get install -t etch-backports cdebootstrap"
+
+# type: Content of: <chapter><section><section><section><title>
+#: xml/chapters/installation.xml:106
+msgid "Installing &live-helper; on etch"
+msgstr "Installer &live-helper; sur etch"
+
+# type: Content of: <chapter><section><section><section><para>
+#: xml/chapters/installation.xml:108
+msgid ""
+"It is not recommended that you use &live-helper; from backports.org as it is "
+"likely to be out of date. The &live-helper; package from &lenny; or &sid; "
+"can be installed on Etch (without upgrading other packages, such as libc6; "
+"it's just shell scripts)."
+msgstr ""
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: xml/chapters/installation.xml:110
+msgid ""
+"Install debootstrap or cdebootstrap from backports.org (as indicated above)."
+msgstr ""
+"Installer debootstrap ou cdebootstrap depuis backports.org (comme indiqué ci-"
+"dessus)."
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
+#: xml/chapters/installation.xml:112
+msgid "Install &live-helper; from testing or unstable"
+msgstr "Installer &live-helper; depuis testing ou unsatble"
+
+# type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
+#: xml/chapters/installation.xml:113
+#, no-wrap
+msgid "# apt-get install -t unstable live-helper"
+msgstr "# apt-get install -t unstable live-helper"
+
+# type: Content of: <chapter><section><section><section><para>
+#: xml/chapters/installation.xml:116
+msgid ""
+"Of course you need the testing or unstable sources in /etc/apt/sources.list "
+"for this."
+msgstr ""
+"Bien sur, pour ça, vous devez avoir les sources pour testing ou unstable "
+"dans /etc/apt/sources.list"
+
 # type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:78
+#: xml/chapters/installation.xml:124
 msgid ""
 "<emphasis>N.B. You do not need to install &live-initramfs; on your system to "
 "create customised Debian Live systems. However, doing so will do no harm.</"
@@ -284,14 +360,12 @@ msgstr ""
 "l'installer ne nuira pas</emphasis>"
 
 # type: Content of: <chapter><section><section><title>
-#. type: Content of: <chapter><section><section><section><title>
-#: en/installation.xml:81
+#: xml/chapters/installation.xml:127
 msgid "Using a customised &live-initramfs;"
 msgstr "Utiliser un &live-initramfs; personnalisé"
 
 # type: Content of: <chapter><section><section><para>
-#. type: Content of: <chapter><section><section><section><para>
-#: en/installation.xml:83
+#: xml/chapters/installation.xml:129
 msgid ""
 "To modify the code you can follow the process below. Please ensure you are "
 "familiar with the terms mentioned in <xref linkend=\"terms\"/>."
@@ -301,28 +375,23 @@ msgstr ""
 "\"terms\"/>."
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:87
+#: xml/chapters/installation.xml:133
 msgid "Checkout the &live-initramfs; source"
 msgstr "Rapatrier les sources de &live-initramfs;"
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><screen>
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: en/installation.xml:88
-#, fuzzy, no-wrap
-#| msgid "$ git clone git://git.debian.net/git/debian-live/live-initramfs.git"
-msgid "$ git clone git://live.debian.net/git/live-initramfs.git"
+#: xml/chapters/installation.xml:134
+#, no-wrap
+msgid "$ git clone git://git.debian.net/git/debian-live/live-initramfs.git"
 msgstr "$ git clone git://git.debian.net/git/debian-live/live-initramfs.git"
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:91
+#: xml/chapters/installation.xml:137
 msgid "Make changes to your local copy"
 msgstr "Faites les changements sur votre copie locale"
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:92
+#: xml/chapters/installation.xml:138
 msgid ""
 "And beware that if you want to add your pre-init script in live-bottom, you "
 "should name it without dashes '-', e.g: call it \"81new_feature\" and not "
@@ -333,14 +402,12 @@ msgstr ""
 "\"81nouvelle_fonctionalite\" et non \"81nouvelle-fonctionalite\"."
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:95
+#: xml/chapters/installation.xml:141
 msgid "Build a &live-initramfs; <command>.deb</command>"
 msgstr "Constuire un .deb de &live-initramfs;"
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:96
+#: xml/chapters/installation.xml:142
 msgid ""
 "You must build either on your target distribution or in a chroot containing "
 "your target platform: this means if your target is lenny then you should "
@@ -351,14 +418,10 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><screen>
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: en/installation.xml:98
-#, fuzzy, no-wrap
-#| msgid ""
-#| "\n"
-#| "$ cd live-initramfs\n"
-#| "$ dpkg-buildpackage -rfakeroot -b -uc -us\n"
+#: xml/chapters/installation.xml:143
+#, no-wrap
 msgid ""
+"\n"
 "$ cd live-initramfs\n"
 "$ dpkg-buildpackage -rfakeroot -b -uc -us\n"
 msgstr ""
@@ -367,14 +430,12 @@ msgstr ""
 "$ dpkg-buildpackage -rfakeroot -b -uc -us\n"
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:103
+#: xml/chapters/installation.xml:149
 msgid "Use the generated &live-initramfs; <command>.deb</command>"
 msgstr "Utiliser le <command>.deb</command> ainsi généré de &live-initramfs;"
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:104
+#: xml/chapters/installation.xml:150
 msgid ""
 "As &live-initramfs; is installed by the build system, installing the package "
 "in the host system is not sufficient: you should treat the generated "
@@ -384,71 +445,53 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><section><title>
-#. type: Content of: <chapter><section><section><section><title>
-#: en/installation.xml:110
-#, fuzzy
-#| msgid "Using a &live-initramfs; snapshots"
-msgid "Using &live-initramfs; snapshots"
+#: xml/chapters/installation.xml:156
+msgid "Using a &live-initramfs; snapshots"
 msgstr "Utiliser un 'snapshot' de &live-initramfs;"
 
-#. type: Content of: <chapter><section><section><section><para>
-#: en/installation.xml:112
+# type: Content of: <chapter><section><section><para>
+#: xml/chapters/installation.xml:158
 msgid ""
 "You can let &live-helper; automatically use the latest snapshot of &live-"
 "initramfs; by configuring a third-party repository in your live-system "
-"configuration. Assuming you have already created a configuration tree with "
-"<command>lh config</command>:"
+"configuration. Assumed you have already created a configuration tree with "
+"<command>lh_config</command>"
 msgstr ""
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:116
+#: xml/chapters/installation.xml:162
 msgid "Create a sources.list entry for the chroot stage:"
 msgstr "Créer une entrée dans le fichier sources.list pour l'étape du chroot:"
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><screen>
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: en/installation.xml:117
-#, fuzzy, no-wrap
-#| msgid "echo \"deb http://live.debian.net/debian/ ./\" > config/chroot_sources/live-snapshots.chroot"
-msgid "echo \"deb http://live.debian.net/ sid-snapshots main contrib non-free\" > config/chroot_sources/debian-live_sid-snapshots.chroot"
+#: xml/chapters/installation.xml:163
+#, no-wrap
+msgid "echo \"deb http://live.debian.net/debian/ ./\" > config/chroot_sources/live-snapshots.chroot"
 msgstr "echo \"deb http://live.debian.net/debian/ ./\" > config/chroot_sources/live-snapshots.chroot"
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:120
-#, fuzzy
-#| msgid "Create a sources.list entry fro the binary stage:"
-msgid "Create a sources.list entry for the binary stage:"
+#: xml/chapters/installation.xml:166
+msgid "Create a sources.list entry fro the binary stage:"
 msgstr "Créer une entrée dans le fichier soures.list pour l'étape binaire:"
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><screen>
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: en/installation.xml:121
-#, fuzzy, no-wrap
-#| msgid "cp config/chroot_sources/live-snapshots.chroot config/chroot_sources/live-snapshots.binary"
-msgid "cp config/chroot_sources/debian-live_sid-snapshots.chroot config/chroot_sources/debian-live_sid-snapshots.binary"
+#: xml/chapters/installation.xml:167
+#, no-wrap
+msgid "cp config/chroot_sources/live-snapshots.chroot config/chroot_sources/live-snapshots.binary"
 msgstr "cp config/chroot_sources/live-snapshots.chroot config/chroot_sources/live-snapshots.binary"
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:124
-#, fuzzy
-#| msgid "Fetcht the archive signing key:"
-msgid "Fetch the archive signing key:"
+#: xml/chapters/installation.xml:170
+msgid "Fetcht the archive signing key:"
 msgstr "Récuperer le fichier de signature du dépot:"
 
 # type: Content of: <chapter><section><section><orderedlist><listitem><screen>
-#. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: en/installation.xml:126
-#, fuzzy, no-wrap
-#| msgid ""
-#| "\n"
-#| "wget http://live.debian.net/debian/archive-key.asc -O config/chroot_sources/live-snapshots.chroot.gpg\n"
-#| "cp config/chroot_sources/live-snapshots.chroot.gpg config/chroot_sources/live-snapshots.binary.gpg\n"
+#: xml/chapters/installation.xml:171
+#, no-wrap
 msgid ""
-"wget http://live.debian.net/debian/project/openpgp/archive-key.asc -O config/chroot_sources/debian-live_sid-snapshots.chroot.gpg\n"
-"cp config/chroot_sources/debian-live_sid-snapshots.chroot.gpg config/chroot_sources/debian-live_sid-snapshots.binary.gpg\n"
+"\n"
+"wget http://live.debian.net/debian/archive-key.asc -O config/chroot_sources/live-snapshots.chroot.gpg\n"
+"cp config/chroot_sources/live-snapshots.chroot.gpg config/chroot_sources/live-snapshots.binary.gpg\n"
 msgstr ""
 "\n"
 "wget http://live.debian.net/debian/archive-key.asc -O config/chroot_sources/live-snapshots.chroot.gpg\n"
diff --git a/manual/old/fr/live-environment.xml.po b/manual/old/fr/live-environment.xml.po
new file mode 100644
index 0000000..6c7778d
--- /dev/null
+++ b/manual/old/fr/live-environment.xml.po
@@ -0,0 +1,444 @@
+# French translations for Debconf package
+# Copyright (C) 2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the Debconf package.
+# Automatically generated, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Debconf 8\n"
+"POT-Creation-Date: 2009-02-25 14:33+0100\n"
+"PO-Revision-Date: 2009-02-27 12:49+0100\n"
+"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> <christophenagel at gmail.com>\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/about/manual.xml:46 xml/chapters/about/manual.xml:50
+#: xml/chapters/about/manual.xml:62 xml/chapters/customization/bootup.xml:11
+#: xml/chapters/customization/bootup.xml:20
+#: xml/chapters/customization/bootup.xml:26
+#: xml/chapters/customization/bootup.xml:38
+#: xml/chapters/customization/bootup.xml:85
+#: xml/chapters/customization/bootup.xml:92
+#: xml/chapters/customization/bootup.xml:99
+#: xml/chapters/customization/bootup.xml:106
+#: xml/chapters/customization/packages.xml:21
+#: xml/chapters/customization/packages.xml:138
+#: xml/chapters/customization/packages.xml:183
+#: xml/chapters/customization/packages.xml:220
+#: xml/chapters/customization/packages.xml:245
+#: xml/chapters/live-environment.xml:11 xml/chapters/live-environment.xml:16
+#: xml/chapters/overview.xml:115 xml/chapters/resources.xml:11
+msgid "FIXME"
+msgstr "FIXME"
+
+# type: Content of: <chapter><title>
+#: xml/chapters/live-environment.xml:7
+msgid "The Live environment"
+msgstr "L'environnement Live"
+
+# type: Content of: <chapter><section><title>
+#: xml/chapters/live-environment.xml:10
+msgid "Swap space"
+msgstr "L'espace d'échange"
+
+# type: Content of: <chapter><section><title>
+#: xml/chapters/live-environment.xml:15
+msgid "Hostname"
+msgstr "Le nom d'hôte"
+
+# type: Content of: <chapter><section><title>
+#: xml/chapters/live-environment.xml:20
+msgid "The Live user"
+msgstr "L'utilisateur Live"
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/live-environment.xml:21
+msgid "Username FIXME."
+msgstr "Utilisateur A FAIRE"
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/live-environment.xml:22
+msgid ""
+"One important consideration is that the live user is created by &live-"
+"initramfs; during bootup, it is not created by &live-helper; when building "
+"the image."
+msgstr ""
+"Il faut prendre en considération que l'utilisateur live est créé par &live-"
+"initramfs; pendant le démarrage, il n'est pas créé par &live-helper; pendant "
+"la construction de l'image."
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/live-environment.xml:24
+msgid ""
+"You can specify additional groups that the live user will belong to by "
+"preseeding the <command>passwd/user-default-groups</command> debconf value. "
+"For example, to add the live user to the <command>fuse</command> group, add "
+"the following to a file in the <filename class=\"directory\">config/"
+"chroot_local-preseed</filename> directory:"
+msgstr ""
+"Vous pouvez spécifier des groupes supplémentaires auxquels l'utilisateur "
+"live appartiendra en configurant la valeur <command>passwd/user-default-"
+"groups</command> de debconf. Par exemple, pour ajouter l'utilisateur live au "
+"groupe <command>fuse</command> ajouter ce qui suit dans un fichier dans le "
+"répertoire <filename class=\"directory\">config/chroot_local-preseed</"
+"filename>:"
+
+# type: Content of: <chapter><section><screen>
+#: xml/chapters/live-environment.xml:26
+#, no-wrap
+msgid ""
+"\n"
+" debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse\n"
+msgstr ""
+"\n"
+" debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse\n"
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/live-environment.xml:30
+msgid ""
+"For more information about debconf preseeding, please see <xref linkend="
+"\"debconf-preseed\"/>."
+msgstr ""
+"Pour plus d'informations sur la façon de configurer debconf, voir, svp, "
+"<xref linkend=\"debconf-preseed\"/>."
+
+# type: Content of: <chapter><section><title>
+#: xml/chapters/live-environment.xml:35
+msgid "Language"
+msgstr "Langue"
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/live-environment.xml:36
+msgid ""
+"When the live system boots there are three process which concerns language: "
+"the locale generation, setting the keyboard layout for the console and "
+"setting the keyboard layout for X. To define the locale that should be "
+"generated, use the <command>locale</command> parameter to the <command>--"
+"bootappend-live</command> option of <filename>lh_config</filename>, e.g.:"
+msgstr ""
+"Lorsque le système live démarre, il y a trois processus qui concernent la "
+"langue: la génération des locales, la mise en place de la langue du clavier "
+"pour la console et la mise en place de la langue du clavier pour "
+"l'environnement X. Pour définir la locale qui devrait être configurée, "
+"utiliser le paramètre <command>locale</command> de l'option <command>--"
+"bootappend-live</command> de la commande <filename>lh_config</filename> de "
+"l'assistant, par exemple:"
+
+# type: Content of: <chapter><section><para><screen>
+#: xml/chapters/live-environment.xml:38
+#, no-wrap
+msgid "lh_config --bootappend-live \"locale=sv_SE.utf8\""
+msgstr "lh_config --bootappend-live \"locale=sv_SE.utf8\""
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/live-environment.xml:40
+msgid ""
+"Both the console and X keyboard configuration depends on the <command>keyb</"
+"command> parameter of the <command>--bootappend-live</command>option. Valid "
+"options for X keyboard layouts can be found in <filename>/etc/X11/xkb/base."
+"xml</filename>. To find the value (the two characters) corresponding to a "
+"language try searching for the english name of the nation where the language "
+"is spoken, e.g:"
+msgstr ""
+"La configuration du clavier pour la console et pour X dépend du paramètre "
+"<command>keyb</command>de l'option <command>--bootappend-live</command>. Les "
+"options valides pour la langue du clavier pour X peuvent être consultées "
+"dans le fichier <filename>/etc/X11/xkb/base.xml</filename>. Pour trouver une "
+"valeur (les deux caractères) qui correspondent à une langue, essayer de "
+"chercher le nom anglais du pays où la langue est parlée, par exmple:"
+
+# type: Content of: <chapter><section><para><screen>
+#: xml/chapters/live-environment.xml:42
+#, no-wrap
+msgid ""
+"$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name\n"
+"\t&lt;name&gt;se&lt;name&gt;\n"
+msgstr ""
+"$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name\n"
+"\t&lt;name&gt;se&lt;name&gt;\n"
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/live-environment.xml:46
+msgid ""
+"To get the locale files for swedish generated and a swedish keyboard layout "
+"in X use:"
+msgstr ""
+"Pour que les fichiers de locales soient générés en suédois et que le clavier "
+"suédois soit utilisé pour X, utiliser:"
+
+# type: Content of: <chapter><section><para><screen>
+#: xml/chapters/live-environment.xml:48
+#, no-wrap
+msgid "lh_config --bootappend-live \"locale=sv_SE.utf8 keyb=se\""
+msgstr "lh_config --bootappend-live \"locale=sv_SE.utf8 keyb=se\""
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/live-environment.xml:52
+msgid ""
+"A list of the valid values of the keyboards for the console can be figured "
+"with the following command:"
+msgstr ""
+"Une liste des valeurs valides pour le type de clavier pour la console peut "
+"être obtenue avec la commande suivante:"
+
+# type: Content of: <chapter><section><para><screen>
+#: xml/chapters/live-environment.xml:53
+#, no-wrap
+msgid "for i in `find /usr/share/keymaps/ -iname \"*kmap.gz\"`; do basename $i | head -c -9; echo; done | sort | less "
+msgstr "for i in `find /usr/share/keymaps/ -iname \"*kmap.gz\"`; do basename $i | head -c -9; echo; done | sort | less "
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/live-environment.xml:55
+msgid "To make the console keyboard use a swedish layout use"
+msgstr "Pour avoir un clavier de type suédois dans la console, utiliser:"
+
+# type: Content of: <chapter><section><para><screen>
+#: xml/chapters/live-environment.xml:57
+#, no-wrap
+msgid "lh_config --bootappend-live \"locale=sv_SE.utf8 keyb=se-latin1\""
+msgstr "lh_config --bootappend-live \"locale=sv_SE.utf8 keyb=se-latin1\""
+
+# type: Content of: <chapter><section><title>
+#: xml/chapters/live-environment.xml:63
+msgid "Persistence"
+msgstr "Persistance"
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/live-environment.xml:64
+msgid ""
+"A live cd paradigm is a preinstalled system which runs from a read-only "
+"media, like a cdrom, were writes and modifications does not survive reboots "
+"of the host hardware which runs it."
+msgstr ""
+"Le paradigme du live cd, c'est un système préinstallé qui s'éxécute à partir "
+"d'une source en lecture seule, comme un cdrom, les écritures et les "
+"modfications ne survivent pas à un redémarrage du système hôte exécutant le "
+"système live."
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/live-environment.xml:65
+msgid ""
+"A Debian Live system is a generalization of this paradigm and thus supports "
+"more media, and not only cds; but stills, in its default behaviour, it "
+"should be considered read only and all the runtime evolutions of the system "
+"are lost with a shutdown."
+msgstr ""
+"Un système Debian Live est une généralisation de ce paradigme et supporte "
+"plus de medias source, et pas seulement les cdroms; malgré tout, dans son "
+"comportement par défaut, il devrait être considéré comme étant en lecture "
+"seule et toutes les modifications faites pendant l'exécution sont perdues "
+"avec un arrêt."
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/live-environment.xml:67
+msgid ""
+"Persistence is a common name for different kinds of solutions for saving "
+"across reboots some or all of this runtime evolution of the system; to "
+"undestand how it could work it could be handy to know that even if the "
+"system is booted and runt from a read only media, modification to the files "
+"and directories are wrote on a writable media , tipically a ram disk (tmpfs) "
+"and ram disk's data do not survive reboots."
+msgstr ""
+"Persistence est un terme commun pour désigner diférents types de solutions "
+"pour sauvagarder, entre les redémarrages, tout ou une partie des "
+"modifications faites au système pendant son exécution; pour comprendre "
+"comment cela peut fonctionner, il faut savoir que même si le système "
+"s'exécute à partir d'un support en lecture seule, les modifications des "
+"fichiers et des répertoires durant l'exécution sont écrites sur un support "
+"accessible en lecture ecriture, habituellement une ram-disk (tmpfs) et les "
+"données d'une ram-disk ne survivent pas à un redémarrage."
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/live-environment.xml:68
+msgid ""
+"The data stored on this ramdisk should be saved in a writable persistent "
+"media like on an Hard Disk, a USB key, a network \"share\" or even a session "
+"of a multisession (re)writable CD/DVD. All this cited media are supported in "
+"Debian Live in different ways, all but latest one requires a special boot "
+"parameter to be specified at boot: <command>persistent</command>."
+msgstr ""
+"Les données stockées sur cette ramdisk devraient être sauvegardées sur un "
+"support accessible en lecture et persistant comme un disque dur, une clef "
+"USB, un partage réseau ou même dans une session sur CD/DVD (re)inscriptible "
+"multi-session. Tous les supports précités sont disponibles pour Debian Live "
+"de différentes façons, toutes, sauf la dernière, requierent un paramètre de "
+"démarrage spécifique: <command>persistent</command>."
+
+# type: Content of: <chapter><section><section><title>
+#: xml/chapters/live-environment.xml:70
+msgid "Full persistence"
+msgstr "Persistence complète"
+
+# type: Content of: <chapter><section><section><para>
+#: xml/chapters/live-environment.xml:71
+msgid ""
+"With \"full persistence\" it is meant that instead of using a tmpfs for "
+"storing modifications to the read-only media (with the copy-on-write, COW, "
+"system) a writable partition is used. In order to use this feature a "
+"partition with a clean writable supported filesystem on it labeled \"live-rw"
+"\" must be attached on the system at bootime and the system must be started "
+"with \"persistent\" boot parameter; this partition could be an ext2 "
+"partition on the hard disk or on a usb key created with, e.g.:"
+msgstr ""
+"La \"persistence complète\" induit qu' au lieu d'utiliser un tmpfs pour "
+"stocker les modifications pour le support en lecture seule (avec le copy-on-"
+"write, COW system), una partitin est utilisée. Afin de pouvoir utiliser "
+"cette fonction, une partition nommée \"live-rw\" contenant système de "
+"fichiers propre et accessible en écriture doit être disponible sur le "
+"système au moment du démarrage et le système doit être démarrer avec "
+"l'option de démarrage \"persistent\"; cette partition peut être une "
+"partition ext2 sur le disque dur ou sur une clef USB créé comme suit:"
+
+# type: Content of: <chapter><section><section><screen>
+#: xml/chapters/live-environment.xml:73
+#, no-wrap
+msgid ""
+"\n"
+"# mkfs.ext2 -L live-rw /dev/sdb1\n"
+msgstr ""
+"\n"
+"# mkfs.ext2 -L live-rw /dev/sdb1\n"
+
+# type: Content of: <chapter><section><section><para>
+#: xml/chapters/live-environment.xml:77
+msgid ""
+"But since live system users, not always can use an hard drive partition, "
+"maybe because they aren't allowed or they wan't to repartition a drive, and "
+"considering that most USB keys have laughables write speeds, \"full\" "
+"persistence could be also used with just image files, so you could create a "
+"file representing a partition and put this image file even on a NTFS "
+"partition of a foreign OS, with something like:"
+msgstr ""
+"Mais, comme les utilisateurs du système live ne peuvent pas toujours "
+"utiliser une partition sur le disque dur, peut être parce qu'ils n'en ont "
+"pas le droit ou parce qu'ils ne veulent pas repartitionner le disque et en "
+"considérant que la plupart des clefs USB ont des vitesses d'écriture "
+"risibles, la persistence complète peut aussi être utilisé avec seulement des "
+"fichiers images, donc vous pouvez créer un fichier représentant un partition "
+"et mettre ce fichier image même sur une partition NTFS d'un système "
+"d'exploitation étranger avec quelque chose comme:"
+
+# type: Content of: <chapter><section><section><screen>
+#: xml/chapters/live-environment.xml:79
+#, no-wrap
+msgid ""
+"\n"
+"$ dd if=/dev/null of=live-rw bs=1G seek=1\t# for a 1GB sized image file\n"
+"$ /sbin/mkfs.ext2 -F live-rw\n"
+msgstr ""
+"\n"
+"$ dd if=/dev/null of=live-rw bs=1G seek=1\t# for a 1GB sized image file\n"
+"$ /sbin/mkfs.ext2 -F live-rw\n"
+
+# type: Content of: <chapter><section><section><para>
+#: xml/chapters/live-environment.xml:84
+msgid ""
+"Then copy the <command>live-rw</command> file in a writable partition and "
+"reboot with \"persistent\" boot parameter."
+msgstr ""
+"Après, copier le fichier <command>live-rw</command> sur une partition "
+"accessible en écriture et redémarrer avec l'option de démarrage \"persistent"
+"\""
+
+# type: Content of: <chapter><section><section><title>
+#: xml/chapters/live-environment.xml:87
+msgid "Home automounting"
+msgstr "Montage automatique de Home"
+
+# type: Content of: <chapter><section><section><para>
+#: xml/chapters/live-environment.xml:88
+msgid ""
+"If during the boot a partition (filesystem) image file or a partition "
+"labeled <command>home-rw</command> will be discovered, this filesystem will "
+"be directly mounted as <command>/home</command>, thus permitting persistence "
+"of files that belong to the e.g. default user. It can be combined with full "
+"persistence."
+msgstr ""
+"Si pendant le démarrage un fichier image de partition (système de fichiers) "
+"ou une partition nommée <command>home-rw</command> est découverte ce système "
+"de fichiers sera directement monté comme <command>/home</command>, et "
+"permettant ainsi la persistence de fichiers qui appartiennent par exemple à "
+"l'utilisateur par défaut. Ceci peut être combiné avec la persistence "
+"complète."
+
+# type: Content of: <chapter><section><section><title>
+#: xml/chapters/live-environment.xml:91
+msgid "Snapshots"
+msgstr "Snapshots"
+
+# type: Content of: <chapter><section><section><para>
+#: xml/chapters/live-environment.xml:92
+msgid ""
+"Snapshots are collection of files and directories which are not mounted "
+"while running but which are copied from a persistent device to the system "
+"(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The "
+"content of a snapshot could reside on a partition or an image file (like the "
+"above mentioned types) labeled <command>live-sn</command>, but it defaults "
+"to a simple cpio archive named <command>live-sn.cpio.gz</command>. As above "
+"at boot time, the block devices connected to the system are traversed to see "
+"if a partition or a file named like that could be found. A power "
+"interruption during runtime could lead to data lost hence a tool invoked "
+"<command>live-snapshot --refresh</command> could be called to sync important "
+"changes. This type of persistence since it does not write continuosly to the "
+"persistent media is the most flash-based device friendly and the fastest of "
+"all the persistence systems."
+msgstr ""
+"Les Snpashots sont une collection de fichiers et de répertoires qui ne sont "
+"pas montés pendant l'exécution du système mais qui sont copiés depuis un "
+"support persistant vers le système (tmpfs) pendant le démarrage et qui sont "
+"resynchronisés au redémarrage/arrêt du système. Le contenu d'un snapshot "
+"peut se situer sur une partition ou dans un fichier image (comme les types "
+"mentionnés plus haut) nommés <command>live-sn</command>, mais il fait par "
+"défaut une simple archive cpio nommée <command>live-sn.cpio.gz</command>. "
+"Comme précédemment, au démarrage, les périphériques de stockages connectés "
+"au système sont explorés à la recherche d'une partition ou d'un fichier de "
+"ce nom là.Une coupure d'alimentation pendant l'exécution peut conduire à une "
+"perte de données à moins que la commande <command>live-snapshot --refresh</"
+"command>puisse être appelée pour synchroniser les changements importants.Ce "
+"type de persistance, comme il n'écrit pas continuellement sur le media "
+"persistant est très interessant à utiliser pour les supports basés sur de la "
+"mémoire flash, c'est aussi le mode de persistance le plus rapide."
+
+# type: Content of: <chapter><section><section><para>
+#: xml/chapters/live-environment.xml:93
+msgid ""
+"A /home version of snapshot exists too and its label is <command>home-sn.*</"
+"command>; it works the same as the main snapshot but it is only applied to /"
+"home."
+msgstr ""
+"Un version /home des snapshots existe aussi et elle est nommée <command>home-"
+"sn.*</command>; elle fonctionne de la même façon que le snapshot principal "
+"mais elle s'applique seulement à /home"
+
+# type: Content of: <chapter><section><section><para>
+#: xml/chapters/live-environment.xml:94
+msgid ""
+"All kind of snapshots cannot currently handle file deleting while full "
+"persistence and obviously home automounting could."
+msgstr ""
+"Toutes les formes de snapshots ne peuvent pas pour l'instant prendre en "
+"compte la suppression de fichiers alors que la persistence complète et "
+"évidemment le montage automatique du /home le peuvent."
+
+# type: Content of: <chapter><section><section><title>
+#: xml/chapters/live-environment.xml:97
+msgid "Partial remasterings"
+msgstr "Remastérisation partielle"
+
+# type: Content of: <chapter><section><section><para>
+#: xml/chapters/live-environment.xml:98
+msgid ""
+"The runtime modification of the tmpfs could be collected usign live-snapshot "
+"in a squashfs and added to the cd by remastering the iso in case of cd-r or "
+"adding a session to multisession cd/dvd(rw); live-initramfs mounts all /live "
+"filesystem in order or with the module bootparameter."
+msgstr ""
+"Les modifications faites pendant l'exécution peuvent être collectées en "
+"utilisant live-snapshot dans un squashfs et ajoutées au cd en remastérisant "
+"l'iso dans le cas de cd-r ou en ajoutant une session à un CD/DVD(rw) multi-"
+"session; live-initramfs monte tout les système de fichiers /live dans "
+"l'ordre ou avec le paramètre de démarrage module."
diff --git a/manual/old/fr/manual.xml.po b/manual/old/fr/manual.xml.po
new file mode 100644
index 0000000..0fbaee6
--- /dev/null
+++ b/manual/old/fr/manual.xml.po
@@ -0,0 +1,398 @@
+# French translations for PACKAGE package
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# Automatically generated, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2009-02-25 14:33+0100\n"
+"PO-Revision-Date: 2009-02-27 10:34+0100\n"
+"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> <christophenagel at gmail.com>\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+# type: Content of: <sect1><title>
+#: xml/chapters/about/manual.xml:7
+msgid "About this manual"
+msgstr "A propos de ce manuel"
+
+# type: Content of: <sect1><para>
+#: xml/chapters/about/manual.xml:9
+msgid ""
+"The main goal of this manual is to serve as a single access point to all "
+"documentation related to the Debian Live project. It does not include end-"
+"user documentation for using a Debian Live system."
+msgstr ""
+"Le but principal de ce manuel est de servir de seul point d'entrée pour "
+"toute la documentation relative au projet Debian Live. Il n'inclut pas la "
+"documentation utilisateur final pour utiliser un système Debian Live."
+
+# type: Content of: <sect1><para>
+#: xml/chapters/about/manual.xml:11
+msgid ""
+"Some of the commands mentioned in the text must be executed with superuser "
+"privileges which can be obtained by becoming the root user via <filename>su</"
+"filename> or by using <filename>sudo</filename>. To distinguish between "
+"commands which may be executed by an unprivileged user and those requiring "
+"superuser privileges, commands are prepended by <command>$</command> or "
+"<command>#</command> respectively. This symbol is not a part of the command."
+msgstr ""
+"Quelques unes des commandes mentionnées dans le texte doivent être exécutées "
+"avec lesprivilèges du super-utilisateur, soit en devenant le root ou en "
+"utilisant <filename>sudo</filename> Pour distinguer entre les commandes qui "
+"doivent être exécutés par un utilisateur non priviligié et celles qui "
+"nécessitent les droits super-utilisateurs, les commandes sont préfixées par "
+"<computeroutput>$</computeroutput> ou <computeroutput>#</"
+"computeroutput>respectivement. Ce symbole ne fait pas parti de la commande."
+
+# type: Content of: <sect1><sect2><title>
+#: xml/chapters/about/manual.xml:14
+msgid "Terms"
+msgstr "Définitions"
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
+#: xml/chapters/about/manual.xml:17
+msgid "Live system"
+msgstr "Système Live"
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
+#: xml/chapters/about/manual.xml:18
+msgid ""
+"An operating system that can boot without installation to a hard drive. Live "
+"systems do not alter local operating system(s) or file(s) already installed "
+"on the computer hard drive unless instructed to do so. Live systems are "
+"typically booted from media such as CDs or DVDs, some may also boot with USB "
+"sticks or over the network (via netboot images)."
+msgstr ""
+"Un système d'exploitatioin qui peut démarrer sans installation sur un disque "
+"dur.Un système live ne modifie pas les systèmes d'exploitation ou les "
+"fichiers précédemment installés sur le disque dur de l'ordinateur à moins de "
+"lui demander de la faire. Les systèmes live démarrent le plus souvent depuis "
+"un CD ou un DVD mais aussi depuis une clef USB et depuis le reséau."
+
+# type: Content of: <html><head><title>
+#: xml/chapters/about/manual.xml:21 html/index.html.in:8
+msgid "Debian Live"
+msgstr "Debian Live"
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
+#: xml/chapters/about/manual.xml:22
+msgid ""
+"The Debian sub-project which maintains the &live-helper; and &live-"
+"initramfs; utilities."
+msgstr ""
+"Le sous projet Debian qui maintient les utilitaires &live-helper; et &live-"
+"initramfs;"
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
+#: xml/chapters/about/manual.xml:25
+msgid "Debian Live system"
+msgstr "Système Debian Live"
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
+#: xml/chapters/about/manual.xml:26
+msgid ""
+"A live system that uses software from the Debian operating system that may "
+"be booted from CDs, DVDs, USB sticks, over the network (via netboot images), "
+"and over the internet (via boot parameter fetch=URL)"
+msgstr ""
+"Un système Debian Live est un système live qui utilise des logiciels du "
+"système d'exploitation Debian"
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
+#: xml/chapters/about/manual.xml:29
+msgid "Build system / host system"
+msgstr "Système de construction / système hôte"
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
+#: xml/chapters/about/manual.xml:30
+msgid "The environment used to create the live system."
+msgstr "L'environnement utilisé pour crée le système live."
+
+# type: Content of: <chapter><section><title>
+#: xml/chapters/about/manual.xml:33 xml/chapters/overview.xml:12
+msgid "&live-helper;"
+msgstr "&live-helper;"
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
+#: xml/chapters/about/manual.xml:34
+msgid "A collection of scripts used to build customised Debian Live systems."
+msgstr ""
+"Une collection de scripts utilisés pour construire des systèmes Debian Live "
+"personnalisés."
+
+# #-#-#-#-#  installation.xml.po (Debconf 8)  #-#-#-#-#
+# #-#-#-#-#  installation.xml.po (Debconf 8)  #-#-#-#-#
+# type: Content of: <chapter><section><variablelist><varlistentry><term>
+# #-#-#-#-#  manual.xml.po (PACKAGE VERSION)  #-#-#-#-#
+# type: Content of: <chapter><section><title>
+# #-#-#-#-#  manual.xml.po (PACKAGE VERSION)  #-#-#-#-#
+# type: Content of: <chapter><section><title>
+#: xml/chapters/about/manual.xml:37 xml/chapters/installation.xml:122
+msgid "&live-initramfs;"
+msgstr "&live-initramfs;"
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
+#: xml/chapters/about/manual.xml:38
+msgid ""
+"A collection of scripts used to boot live systems. &live-initramfs; is a "
+"fork of <filename>casper</filename> by Canonical, Ltd."
+msgstr ""
+"Une collection de scripts utilisés pour démarrer un système live. &live-"
+"initramfs; est un fork de <filename>casper</filename> par Canonical, Ltd."
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
+#: xml/chapters/about/manual.xml:41
+msgid "<filename>live-package</filename>"
+msgstr "<filename>live-package</filename>"
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
+#: xml/chapters/about/manual.xml:42
+msgid "The former name of &live-helper;."
+msgstr "L'ancien nom de &live-initramfs;."
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
+#: xml/chapters/about/manual.xml:45
+msgid "Debian Installer / (d-i)"
+msgstr "Installeur Debian / (d-i)"
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/about/manual.xml:46 xml/chapters/about/manual.xml:50
+#: xml/chapters/about/manual.xml:62 xml/chapters/customization/bootup.xml:11
+#: xml/chapters/customization/bootup.xml:20
+#: xml/chapters/customization/bootup.xml:26
+#: xml/chapters/customization/bootup.xml:38
+#: xml/chapters/customization/bootup.xml:85
+#: xml/chapters/customization/bootup.xml:92
+#: xml/chapters/customization/bootup.xml:99
+#: xml/chapters/customization/bootup.xml:106
+#: xml/chapters/customization/packages.xml:21
+#: xml/chapters/customization/packages.xml:138
+#: xml/chapters/customization/packages.xml:183
+#: xml/chapters/customization/packages.xml:220
+#: xml/chapters/customization/packages.xml:245
+#: xml/chapters/live-environment.xml:11 xml/chapters/live-environment.xml:16
+#: xml/chapters/overview.xml:115 xml/chapters/resources.xml:11
+msgid "FIXME"
+msgstr "FIXME"
+
+# type: Content of: <sect1><sect2><title>
+#: xml/chapters/about/manual.xml:49 xml/chapters/customization/bootup.xml:104
+msgid "Cheat codes"
+msgstr "Codes de triche"
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
+#: xml/chapters/about/manual.xml:53
+msgid "chroot"
+msgstr "chroot"
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
+#: xml/chapters/about/manual.xml:54
+msgid ""
+"The chroot program, chroot(8), enables us to run different instances of the "
+"GNU/Linux environment on a single system simultaneously without rebooting."
+msgstr ""
+"Le programme, chroot(8), permet d'exécuter différentes instances du système "
+"GNU/Linux simultanement sur une seule machine sans redémarrage."
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
+#: xml/chapters/about/manual.xml:57
+msgid "binary image"
+msgstr "image binaire"
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
+#: xml/chapters/about/manual.xml:58
+msgid ""
+"On a live system, binary image refers to the binary filesystem and the "
+"respective extension, such as binary.iso or binary.img."
+msgstr ""
+"Sur un système live, l'image binaire fait référence au système de fichiers "
+"binaire ainsi qu'à son extension, comme binary.iso ou binary.img."
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
+#: xml/chapters/about/manual.xml:61
+msgid "Target distribution"
+msgstr "Distribution cible"
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
+#: xml/chapters/about/manual.xml:65
+msgid "&lenny;/&squeeze;/&sid; stable/testing/unstable"
+msgstr "etch/lenny/sid stable/testing/unstable"
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
+#: xml/chapters/about/manual.xml:66
+msgid ""
+"The \"stable\" distribution contains the latest officially released "
+"distribution of Debian. The \"testing\" distribution is the staging area for "
+"the next stable release a - the main advantage of using this distribution is "
+"that it has more recent versions of software relative to the \"stable\" "
+"release.. The \"unstable\" distribution is where active development of "
+"Debian occurs. Generally, this distribution is run by developers and those "
+"who like to live on the edge."
+msgstr ""
+"La distribution \"stable\" contient la dernière version offcielle de Debian. "
+"La distributioin \"testing\" désigne la prochaine version stable -le "
+"principal interêt de cette distribution est de posséder des versions de "
+"logiciels plus récentes que ceux de la version stable. La distributin "
+"\"unstable\" désigne la distribution où se fait activement le développement "
+"de Debian. Généralement, cette distribution est utilisée par les "
+"développeurs et par ceux qui aiment vivre sur sur le fil."
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
+#: xml/chapters/about/manual.xml:67
+msgid ""
+"At the time of writing, &lenny; is the current \"stable\" release and "
+"&squeeze; is the current \"testing\" release. &sid; will always be a synonym "
+"for the \"unstable\" release."
+msgstr ""
+"Au moment de l'écriture de ce document, &lenny; est la version stable "
+"courante et &squeeze; est la version \"testing\" courante. &sid; sera "
+"toujours un synonyme pour la version \"unstable\"."
+
+# type: Content of: <sect1><sect2><title>
+#: xml/chapters/about/manual.xml:76
+msgid "Authors"
+msgstr "Auteurs"
+
+# type: Content of: <sect1><sect2><para>
+#: xml/chapters/about/manual.xml:77
+msgid "A list of authors (in alphabetical order):"
+msgstr "Une liste des auteurs (par ordre alphabétique):"
+
+# type: Content of: <sect1><sect2><itemizedlist><listitem><para>
+#: xml/chapters/about/manual.xml:80
+msgid "Ben Armstrong"
+msgstr "Ben Armstrong"
+
+# type: Content of: <sect1><sect2><itemizedlist><listitem><para>
+#: xml/chapters/about/manual.xml:81
+msgid "Brendan Sleight"
+msgstr "Brendan Sleight"
+
+# type: Content of: <sect1><sect2><itemizedlist><listitem><para>
+#: xml/chapters/about/manual.xml:82
+msgid "Chris Lamb"
+msgstr "Chris Lamb"
+
+# type: Content of: <sect1><sect2><itemizedlist><listitem><para>
+#: xml/chapters/about/manual.xml:83
+msgid "Daniel Baumann"
+msgstr "Daniel Baumann"
+
+# type: Content of: <sect1><sect2><itemizedlist><listitem><para>
+#: xml/chapters/about/manual.xml:84
+msgid "Franklin Piat"
+msgstr "Franklin Piat"
+
+# type: Content of: <sect1><sect2><itemizedlist><listitem><para>
+#: xml/chapters/about/manual.xml:85
+msgid "Kai Hendry"
+msgstr "Kai Hendry"
+
+# type: Content of: <sect1><sect2><itemizedlist><listitem><para>
+#: xml/chapters/about/manual.xml:86
+msgid "Marco Amadori"
+msgstr "Marco Amadori"
+
+# type: Content of: <sect1><sect2><itemizedlist><listitem><para>
+#: xml/chapters/about/manual.xml:87
+msgid "Mathieu Geli"
+msgstr "Mathieu Geli"
+
+# type: Content of: <sect1><sect2><itemizedlist><listitem><para>
+#: xml/chapters/about/manual.xml:88
+msgid "Matthias Kirschner"
+msgstr "Matthias Kirschner"
+
+# type: Content of: <sect1><sect2><itemizedlist><listitem><para>
+#: xml/chapters/about/manual.xml:89
+msgid "Richard Nelson"
+msgstr "Richard Nelson"
+
+# type: Content of: <sect1><sect2><itemizedlist><listitem><para>
+#: xml/chapters/about/manual.xml:90
+msgid "Trent W. Buck"
+msgstr "Trent W. Buck"
+
+# type: Content of: <sect1><sect2><title>
+#: xml/chapters/about/manual.xml:96
+msgid "Contributing to this document"
+msgstr "Contribuer à ce document"
+
+# type: Content of: <sect1><sect2><para>
+#: xml/chapters/about/manual.xml:97
+msgid ""
+"This manual is intended as a community project and all proposals for "
+"improvements and contributions are extremely welcome. The preferred way to "
+"submit a contribution is to send it to the mailing list. Please see <xref "
+"linkend=\"contact\"/> for more information."
+msgstr ""
+"Ce manuel a vocation à être un projet communautaire et toutes les "
+"propositions pour son amélioration et toutes les contibutions sont "
+"extrèmement bienvenues. Le moyen privilégié pour soumettre une contribution "
+"est de l'envoyer à la liste de diffusion. Voir svp <xref linkend=\"contact\"/"
+"> pour plus d'informations."
+
+# type: Content of: <sect1><sect2><para>
+#: xml/chapters/about/manual.xml:99
+msgid ""
+"When submitting a contribution please clearly identify its copyright holder "
+"and include the licensing statement. Note that to be accepted the "
+"contribution must be licensed under the same license as the rest of the "
+"document, namely GPL version 3 or later."
+msgstr ""
+"Quand vous soumettez une contribution, identifier clairement.le détenteur du "
+"copyright et inclure le paragraphe de licence. Noter que pour être accepté, "
+"la contribution doit être sous la même licence que le reste du document, a "
+"savoir GPL version 3 ou supérieure."
+
+# type: Content of: <sect1><sect2><para>
+#: xml/chapters/about/manual.xml:101
+msgid ""
+"The sources for this manual are maintained using the Git version control "
+"system. You can checkout the latest copy by executing:"
+msgstr ""
+"Les sources de ce manuel sont maintenues via le système de contrôle de "
+"version Git. Vous pouvez obtenir la dernière copie en exécutant:"
+
+# type: Content of: <sect1><sect2><screen>
+#: xml/chapters/about/manual.xml:103
+#, no-wrap
+msgid "$ git clone git://git.debian.org/git/debian-live/live-manual.git"
+msgstr "$ git clone git://git.debian.org/git/debian-live/live-manual.git"
+
+# type: Content of: <sect1><sect2><para>
+#: xml/chapters/about/manual.xml:105
+msgid ""
+"Prior to submission of your contribution, please preview your work. To "
+"preview the live-manual, ensure the packages needed for building are "
+"installed by executing:"
+msgstr ""
+"Avant de soumettre votre contribution, reliser, svp, votre travail. Pour "
+"avoir un aperçu du manuel live, assurez-vous que les paquets suivants sont "
+"installés sur votre système en exécutant:"
+
+# type: Content of: <sect1><sect2><screen>
+#: xml/chapters/about/manual.xml:107
+#, no-wrap
+msgid "# apt-get install dblatex docbook-xml docbook-xsl make po4a w3m"
+msgstr "# apt-get install dblatex docbook-xml docbook-xsl make po4a w3m"
+
+# type: Content of: <sect1><sect2><para>
+#: xml/chapters/about/manual.xml:109
+msgid ""
+"You may build the live-manual from the top level directory of your git "
+"checkout by executing:"
+msgstr ""
+"Vous devriez pouvoir construire le manuel depuis le répertoire racine de "
+"votre copie locale du git en exécutant:"
+
+# type: Content of: <sect1><sect2><screen>
+#: xml/chapters/about/manual.xml:111
+#, no-wrap
+msgid "$ make build"
+msgstr "$ make build"
diff --git a/manual/po/fr/meta.xml.po b/manual/old/fr/meta.xml.po
similarity index 100%
rename from manual/po/fr/meta.xml.po
rename to manual/old/fr/meta.xml.po
diff --git a/manual/old/fr/overview.xml.po b/manual/old/fr/overview.xml.po
new file mode 100644
index 0000000..cf0c2b5
--- /dev/null
+++ b/manual/old/fr/overview.xml.po
@@ -0,0 +1,353 @@
+# French translations for Debconf package
+# Copyright (C) 2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the Debconf package.
+# Automatically generated, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Debconf 8\n"
+"POT-Creation-Date: 2008-11-12 22:29+0100\n"
+"PO-Revision-Date: 2008-08-09 16:50+0300\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+# type: Content of: <chapter><section><title>
+#: xml/chapters/about/manual.xml:34 xml/chapters/overview.xml:12
+msgid "&live-helper;"
+msgstr ""
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/about/manual.xml:47 xml/chapters/about/manual.xml:51
+#: xml/chapters/about/manual.xml:55 xml/chapters/about/manual.xml:59
+#: xml/chapters/about/manual.xml:63 xml/chapters/about/manual.xml:67
+#: xml/chapters/basics.xml:151 xml/chapters/basics.xml:182
+#: xml/chapters/customization/bootup.xml:11
+#: xml/chapters/customization/bootup.xml:20
+#: xml/chapters/customization/bootup.xml:26
+#: xml/chapters/customization/bootup.xml:38
+#: xml/chapters/customization/bootup.xml:46
+#: xml/chapters/customization/bootup.xml:53
+#: xml/chapters/customization/bootup.xml:60
+#: xml/chapters/customization/bootup.xml:67
+#: xml/chapters/customization/packages.xml:21
+#: xml/chapters/customization/packages.xml:138
+#: xml/chapters/customization/packages.xml:183
+#: xml/chapters/customization/packages.xml:220
+#: xml/chapters/customization/packages.xml:245
+#: xml/chapters/live-environment.xml:11 xml/chapters/live-environment.xml:16
+#: xml/chapters/overview.xml:115 xml/chapters/resources.xml:11
+msgid "FIXME"
+msgstr ""
+
+# type: Content of: <chapter><title>
+#: xml/chapters/overview.xml:7
+msgid "Overview of tools"
+msgstr ""
+
+# type: Content of: <chapter><para>
+#: xml/chapters/overview.xml:9
+msgid ""
+"This chapter contains an overview of the two main tools used in building "
+"Debian Live systems."
+msgstr ""
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/overview.xml:13
+msgid ""
+"&live-helper; is a collection of scripts that build Debian Live systems."
+msgstr ""
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/overview.xml:15
+msgid ""
+"The idea behind live-helper is a framework that uses a configuration "
+"directory to completely automate and customize all aspects of building a "
+"Live image."
+msgstr ""
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/overview.xml:17
+msgid ""
+"Many concepts are similar with the <computeroutput>debhelper</"
+"computeroutput> Debian package tools written by Joey Hess:"
+msgstr ""
+
+# type: Content of: <chapter><section><orderedlist><listitem><para>
+#: xml/chapters/overview.xml:21
+msgid "The scripts have a central location for configuring their operation."
+msgstr ""
+
+# type: Content of: <chapter><section><orderedlist><listitem><para>
+#: xml/chapters/overview.xml:22
+msgid ""
+"In <computeroutput>debhelper</computeroutput>, this is the <filename class="
+"\"directory\">debian</filename> subdirectory of a package tree. For example, "
+"<computeroutput>dh_install</computeroutput> will look for file called "
+"<filename>debian/&lt;packagename&gt;.install</filename> to determine which "
+"files should exist in a particular binary package. In much the same way, "
+"&live-helper; stores its configuration entirely under a <filename class="
+"\"directory\">config/</filename> subdirectory."
+msgstr ""
+
+# type: Content of: <chapter><section><orderedlist><listitem><para>
+#: xml/chapters/overview.xml:25
+msgid ""
+"The scripts are independent - that is to say, it is always safe to run each "
+"command."
+msgstr ""
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/overview.xml:29
+msgid ""
+"Unlike <computeroutput>debhelper</computeroutput>, &live-helper; contains a "
+"tool to generate a skeleton configuration directory, <filename>lh_config</"
+"filename>. This could be considered to be similar to tools such as "
+"<computeroutput>dh-make</computeroutput>. For more information about "
+"<filename>lh_config</filename>, please see <xref linkend=\"lh_config\"/>."
+msgstr ""
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/overview.xml:31
+msgid ""
+"Besides the common <filename>config/common</filename>, which is used by all "
+"&live-helper; commands, some additional files can be used to configure the "
+"behavior of specific helpers. These files are typically named "
+"<computeroutput>config/foo</computeroutput> or <computeroutput>config/stage</"
+"computeroutput> (where \"stage\", of course, is replaced with the name of "
+"the stage that they belong to, and \"helper\" with the name of the helper)."
+msgstr ""
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/overview.xml:33
+msgid ""
+"For example, <computeroutput>lh_bootstrap_debootstrap</computeroutput> uses "
+"files named <filename>config/bootstrap</filename> and <filename>config/"
+"bootstrap_debootstrap</filename> to read the options it will use. Generally, "
+"these files contain variables with values assigned, one variable per line. "
+"Some programs in &live-helper; use pairs of values or slightly more "
+"complicated variable assignments."
+msgstr ""
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/overview.xml:35
+msgid ""
+"&live-helper; respects environment variables which are present in the "
+"context of the shell it is running. If variables can be read from config "
+"files, then they override environment variables, and if command line options "
+"are used, they override values from config files. If no value for a given "
+"variable can be found (and is thus unset), &live-helper; will automatically "
+"set it to a default value."
+msgstr ""
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/overview.xml:37
+msgid ""
+"All config files are shell scripts which are sourced by a live-helper "
+"program. That means they have to follow the normal shell syntax. You can "
+"also put comments in these files; lines beginning with \"#\" are ignored."
+msgstr ""
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/overview.xml:39
+msgid ""
+"In some rare cases, you may want to have different versions of these files "
+"for different architectures or distributions. If files named "
+"<computeroutput>config/stage.arch</computeroutput> or <computeroutput>config/"
+"stage_helper.arch</computeroutput>, and <computeroutput>config/stage.dist</"
+"computeroutput> or <computeroutput>config/stage_helper.dist</computeroutput> "
+"exist (where \"arch\" is the same as the output of <computeroutput>dpkg --"
+"print-architecture</computeroutput> and \"dist\" is the same as the codename "
+"of the target distribution), then they will be used in preference to the "
+"other, more general files."
+msgstr ""
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/overview.xml:41
+msgid ""
+"Please see <xref linkend=\"installation\"/> for information on how to "
+"install &live-helper;."
+msgstr ""
+
+# type: Content of: <chapter><section><para><para>
+#: xml/chapters/overview.xml:43
+msgid ""
+"The remainder of this section discusses the three most important helpers:"
+msgstr ""
+
+# type: Content of: <chapter><section><para><variablelist><varlistentry><term>
+#: xml/chapters/overview.xml:45
+msgid "<filename>lh_config</filename>"
+msgstr ""
+
+# type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
+#: xml/chapters/overview.xml:46
+msgid ""
+"Responsible for initialising a Live system configuration directory. See "
+"<xref linkend=\"lh_config\"/> for more information."
+msgstr ""
+
+# type: Content of: <chapter><section><para><variablelist><varlistentry><term>
+#: xml/chapters/overview.xml:49
+msgid "<filename>lh_build</filename>"
+msgstr ""
+
+# type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
+#: xml/chapters/overview.xml:50
+msgid ""
+"Responsible for starting a Live system build. See <xref linkend=\"lh_build\"/"
+"> for more information."
+msgstr ""
+
+# type: Content of: <chapter><section><para><variablelist><varlistentry><term>
+#: xml/chapters/overview.xml:53
+msgid "<filename>lh_clean</filename>"
+msgstr ""
+
+# type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
+#: xml/chapters/overview.xml:54
+msgid ""
+"Responsible for removing parts of a Live system build. <xref linkend="
+"\"lh_clean\"/> for more information."
+msgstr ""
+
+# type: Content of: <chapter><section><section><title>
+#: xml/chapters/overview.xml:60
+msgid "The <filename>lh_config</filename> helper"
+msgstr ""
+
+# type: Content of: <chapter><section><section><para>
+#: xml/chapters/overview.xml:61
+msgid ""
+"As discussed in <xref linkend=\"live-helper\"/>, the scripts that make up "
+"&live-helper; source their configuration from a single directory named "
+"<computeroutput>config/</computeroutput>. As constructing this directory by "
+"hand would be time-consuming and error-prone, the <filename>lh_config</"
+"filename> helper can be used to create skeleton configuration folders."
+msgstr ""
+
+# type: Content of: <chapter><section><section><para>
+#: xml/chapters/overview.xml:63
+msgid ""
+"Issuing <filename>lh_config</filename> without any arguments creates a "
+"<computeroutput>config</computeroutput> subdirectory which it populates with "
+"some default settings:"
+msgstr ""
+
+# type: Content of: <chapter><section><section><screen>
+#: xml/chapters/overview.xml:64
+#, no-wrap
+msgid ""
+"\n"
+"$ lh_config\n"
+"$ ls -l\n"
+"total 4.1k\n"
+"drwxr-xr-x 19 user group 4.1k 2008-05-09 21:37 config\n"
+"$ ls -l config/\n"
+"total 91k\n"
+"-rw-r--r-- 1 user group 4.0k 2008-05-09 21:37 binary\n"
+"drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 binary_debian-installer\n"
+"drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 binary_grub\n"
+"drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 binary_local-debs\n"
+"drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 binary_local-hooks\n"
+"drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 binary_local-includes\n"
+"drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 binary_local-packageslists\n"
+"drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 binary_local-udebs\n"
+"drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 binary_rootfs\n"
+"drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 binary_syslinux\n"
+"-rw-r--r-- 1 user group 1.7k 2008-05-09 21:37 bootstrap\n"
+"-rw-r--r-- 1 user group 1.5k 2008-05-09 21:37 chroot\n"
+"drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 chroot_apt\n"
+"drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 chroot_local-hooks\n"
+"drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 chroot_local-includes\n"
+"drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 chroot_local-packages\n"
+"drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 chroot_local-packageslists\n"
+"drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 chroot_sources\n"
+"-rw-r--r-- 1 user group 2.9k 2008-05-09 21:37 common\n"
+"drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 includes\n"
+"-rw-r--r-- 1 user group  212 2008-05-09 21:37 source\n"
+"drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 templates\n"
+msgstr ""
+
+# type: Content of: <chapter><section><section><para>
+#: xml/chapters/overview.xml:95
+msgid ""
+"Using <filename>lh_config</filename> without any arguments would be suitable "
+"for users who are either happy editing the generated files, or are simply "
+"happy with the defaults it creates."
+msgstr ""
+
+# type: Content of: <chapter><section><section><para>
+#: xml/chapters/overview.xml:97
+msgid ""
+"You can ask <filename>lh_config</filename> to generate <filename class="
+"\"directory\">config/</filename> directory \"preseeded\" with various "
+"options. This might be suitable if you do not require the default settings "
+"but do not need to change a large number of options. For example:"
+msgstr ""
+
+# type: Content of: <chapter><section><section><screen>
+#: xml/chapters/overview.xml:99
+#, no-wrap
+msgid ""
+"\n"
+"$ lh_config -p gnome\n"
+msgstr ""
+
+# type: Content of: <chapter><section><section><para>
+#: xml/chapters/overview.xml:103
+msgid ""
+"will build a <filename class=\"directory\">config/</filename> directory "
+"configured to include the '<computeroutput>gnome</computeroutput>' package "
+"list. It is possible to specify many options:"
+msgstr ""
+
+# type: Content of: <chapter><section><section><screen>
+#: xml/chapters/overview.xml:105
+#, no-wrap
+msgid ""
+"\n"
+"$ lh_config --apt aptitude --binary-images net --hostname live-machine --username live-user ...\n"
+msgstr ""
+
+# type: Content of: <chapter><section><section><para>
+#: xml/chapters/overview.xml:109
+msgid ""
+"A full list of options is available FIXME. Most options have a parallel with "
+"an \"<computeroutput>LH_</computeroutput>\" prefixed variable."
+msgstr ""
+
+# type: Content of: <chapter><section><section><title>
+#: xml/chapters/overview.xml:114
+msgid "The <filename>lh_build</filename> helper"
+msgstr ""
+
+# type: Content of: <chapter><section><section><title>
+#: xml/chapters/overview.xml:119
+msgid "The <filename>lh_clean</filename> helper"
+msgstr ""
+
+# type: Content of: <chapter><section><section><para>
+#: xml/chapters/overview.xml:120
+msgid ""
+"It is the job of the <filename>lh_clean</filename> helper to remove various "
+"parts of a Live helper build."
+msgstr ""
+
+# type: Content of: <chapter><section><title>
+#: xml/chapters/overview.xml:125
+msgid "The &live-initramfs; package"
+msgstr ""
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/overview.xml:126
+msgid "&live-initramfs; is a collection of scripts."
+msgstr ""
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/overview.xml:127
+msgid "FIXME link to Kernel Handbook"
+msgstr ""
diff --git a/manual/old/fr/packages.xml.po b/manual/old/fr/packages.xml.po
new file mode 100644
index 0000000..49ec1aa
--- /dev/null
+++ b/manual/old/fr/packages.xml.po
@@ -0,0 +1,625 @@
+# French translations for PACKAGE package
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# Automatically generated, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2009-02-25 14:33+0100\n"
+"PO-Revision-Date: 2009-02-27 15:31+0100\n"
+"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> <christophenagel at gmail.com>\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+# type: Content of: <chapter><section><para>
+#: xml/chapters/about/manual.xml:46 xml/chapters/about/manual.xml:50
+#: xml/chapters/about/manual.xml:62 xml/chapters/customization/bootup.xml:11
+#: xml/chapters/customization/bootup.xml:20
+#: xml/chapters/customization/bootup.xml:26
+#: xml/chapters/customization/bootup.xml:38
+#: xml/chapters/customization/bootup.xml:85
+#: xml/chapters/customization/bootup.xml:92
+#: xml/chapters/customization/bootup.xml:99
+#: xml/chapters/customization/bootup.xml:106
+#: xml/chapters/customization/packages.xml:21
+#: xml/chapters/customization/packages.xml:138
+#: xml/chapters/customization/packages.xml:183
+#: xml/chapters/customization/packages.xml:220
+#: xml/chapters/customization/packages.xml:245
+#: xml/chapters/live-environment.xml:11 xml/chapters/live-environment.xml:16
+#: xml/chapters/overview.xml:115 xml/chapters/resources.xml:11
+msgid "FIXME"
+msgstr "FIXME"
+
+# type: Content of: <sect1><sect2><sect3><sect4><para>
+#: xml/chapters/customization/contents.xml:91
+#: xml/chapters/customization/contents.xml:98
+#: xml/chapters/customization/contents.xml:107
+#: xml/chapters/customization/contents.xml:112
+#: xml/chapters/customization/contents.xml:117
+#: xml/chapters/customization/packages.xml:124
+#, fuzzy
+msgid "FIXME."
+msgstr ""
+"#-#-#-#-#  packages.xml.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"À corriger\n"
+"#-#-#-#-#  contents.xml.po (PACKAGE VERSION)  #-#-#-#-#\n"
+"A FAIRE"
+
+# type: Content of: <sect1><title>
+#: xml/chapters/customization/packages.xml:7
+msgid "Customising package installation"
+msgstr "Installation personnalisée des paquets"
+
+# type: Content of: <sect1><para>
+#: xml/chapters/customization/packages.xml:10
+msgid ""
+"This chapter discusses the customisation of package installation. This "
+"involves:"
+msgstr ""
+"Ce chapitre décrit comment personnaliser l'installation des paquets. Cela "
+"implique :"
+
+# type: Content of: <sect1><orderedlist><listitem><para>
+#: xml/chapters/customization/packages.xml:14
+msgid "Selecting additional packages to be installed"
+msgstr "La sélection de paquets additionnels à installer"
+
+# type: Content of: <sect1><orderedlist><listitem><para>
+#: xml/chapters/customization/packages.xml:15
+msgid "Installing modified packages"
+msgstr "L'installation de paquets modifiés"
+
+# type: Content of: <sect1><sect2><title>
+#: xml/chapters/customization/packages.xml:19
+msgid "Package sources"
+msgstr "Les sources des paquets"
+
+# type: Content of: <sect1><sect2><title>
+#: xml/chapters/customization/packages.xml:26
+msgid "Package installation"
+msgstr "L'installation des paquets"
+
+# type: Content of: <sect1><sect2><para>
+#: xml/chapters/customization/packages.xml:28
+msgid ""
+"You can elect to use either <command>apt</command> or <command>aptitude</"
+"command> when installing packages. Which utility is used is governed by the "
+"<command>LH_APT</command> variable in <filename>config/chroot</filename> or "
+"by the <command>--apt</command> argument to <filename>lh_config</filename>:"
+msgstr ""
+"Vous pouvez choisir d'utiliser <command>apt</command> ou <command>aptitude</"
+"command> pour installer les paquets. Ce choix est paramétré par la variable "
+"<command>LH_APT</command> dans <filename>config/chroot</filename>, ou par "
+"l'argument <command>--apt</command> dans <filename>lh_config</filename>:"
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
+#: xml/chapters/customization/packages.xml:33
+msgid "<command>apt</command>"
+msgstr "<command>apt</command>"
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
+#: xml/chapters/customization/packages.xml:36
+msgid ""
+"Specifying a missing package causes package installation to fail, which may "
+"not be the desired behaviour."
+msgstr ""
+"La spécification d'un paquet manquant causera une erreur à l'installation et "
+"risque d'entraîner un comportement non-désiré du système."
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
+#: xml/chapters/customization/packages.xml:39
+msgid "This is the default setting for building images for Lenny or later."
+msgstr ""
+"C'est le réglage par défaut lors de la création d'images pour Lenny et les "
+"versions suivantes."
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
+#: xml/chapters/customization/packages.xml:44
+msgid "<command>aptitude</command>"
+msgstr "<command>aptitude</command>"
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
+#: xml/chapters/customization/packages.xml:47
+msgid ""
+"Specifying a missing package causes package installation to succeed, which "
+"may not be the desired behaviour."
+msgstr ""
+"La spécification d'un paquet manquant ne causera pas d'erreur à "
+"l'installation et risque d'entraîner un comportement non-désiré du système."
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
+#: xml/chapters/customization/packages.xml:50
+msgid "This is the default setting for building images for Etch."
+msgstr "C'est le réglage par défaut lors de la création d'images pour Lenny."
+
+# type: Content of: <sect1><sect2><title>
+#: xml/chapters/customization/packages.xml:59
+msgid "Installing additional packages"
+msgstr "Installer des paquets supplémentaires"
+
+# type: Content of: <sect1><sect2><para>
+#: xml/chapters/customization/packages.xml:62
+msgid ""
+"&live-helper; has a number of mechanisms for indicating that additional "
+"packages should be installed, including:"
+msgstr ""
+"&live-helper; possède un certain nombre de fonctionnalités permettant "
+"d'indiquer si des paquets supplémentaires doivent être installés, incluant :"
+
+# type: Content of: <sect1><sect2><sect3><title>
+#: xml/chapters/customization/packages.xml:66
+#: xml/chapters/customization/packages.xml:73
+msgid "The <command>LH_PACKAGES</command> variable"
+msgstr "La variable <command>LH_PACKAGES</command>"
+
+# type: Content of: <sect1><sect2><sect3><title>
+#: xml/chapters/customization/packages.xml:67
+#: xml/chapters/customization/packages.xml:98
+msgid "Package lists"
+msgstr "Les listes de paquets"
+
+# type: Content of: <sect1><sect2><orderedlist><listitem><para>
+#: xml/chapters/customization/packages.xml:68
+msgid "Local packages (<filename>chroot_local-packages/</filename>)"
+msgstr "Les paquets locaux (<filename>chroot_local-packages/</filename>)"
+
+# type: Content of: <sect1><sect2><sect3><title>
+#: xml/chapters/customization/packages.xml:69
+#: xml/chapters/customization/packages.xml:182
+msgid "Tasks"
+msgstr "Les tâches"
+
+# type: Content of: <sect1><sect2><sect3><para>
+#: xml/chapters/customization/packages.xml:75
+msgid ""
+"To install additional packages, simply add them to the <command>LH_PACKAGES</"
+"command> variable in <filename>config/chroot</filename>. For example:"
+msgstr ""
+"Pour installer des paquets supplémentaires, il suffit de les ajouter à la "
+"variable <command>LH_PACKAGES</command> dans <filename>config/chroot</"
+"filename>. Par exemple :"
+
+# type: Content of: <sect1><sect2><sect3><screen>
+#: xml/chapters/customization/packages.xml:78
+#, no-wrap
+msgid ""
+"\n"
+"LH_PACKAGES=\"package1 package2 package3 ... \"\n"
+msgstr ""
+"\n"
+"LH_PACKAGES=\"package1 package2 package3 ... \"\n"
+
+# type: Content of: <sect1><sect2><sect3><para>
+#: xml/chapters/customization/packages.xml:83
+msgid "You can also specify an initial values on the command line:"
+msgstr ""
+"Il est également possible de spécifier une valeur initiale sur la ligne de "
+"commande :"
+
+# type: Content of: <sect1><sect2><sect3><screen>
+#: xml/chapters/customization/packages.xml:86
+#, no-wrap
+msgid ""
+"\n"
+"$ lh_config --packages \"package1 package2 package3\"\n"
+msgstr ""
+"\n"
+"$ lh_config --packages \"package1 package2 package3\"\n"
+
+# type: Content of: <sect1><sect2><sect3><para>
+#: xml/chapters/customization/packages.xml:90
+msgid ""
+"The behaviour of &live-helper; when specifying a package that does not exist "
+"is determined by your choice of APT utility. See <xref linkend=\"package-"
+"installation\"/> for more details."
+msgstr ""
+"Le comportement de &live-helper; lors de la spécification d'un paquet "
+"inexistant dépend de l'utilitaire APT choisi. Voir <xref linkend=\"package-"
+"installation\"/> pour plus de détails."
+
+# type: Content of: <sect1><sect2><sect3><para>
+#: xml/chapters/customization/packages.xml:93
+msgid ""
+"If you need to specify a large number of packages to be installed or you "
+"need flexibility regarding which packages to install, you should probably be "
+"using package lists. See <xref linkend=\"package-lists\"/> for more "
+"information."
+msgstr ""
+"Si vous désirez spécifier un grand nombre de paquets à installer, ou que "
+"vous désirez plus de flexibilité dans le choix des paquets, vous devriez "
+"sans doutes utiliser les listes de paquets. Voir <xref linkend=\"package-"
+"lists\"/> pour plus d'informations."
+
+# type: Content of: <sect1><sect2><sect3><para>
+#: xml/chapters/customization/packages.xml:100
+msgid ""
+"Package lists are a powerful way of expressing which packages should be "
+"installed. &live-helper; ships with a number of predefined package lists "
+"which provide sensible default package selections for the GNOME and KDE "
+"desktop environments, as well as standard systems."
+msgstr ""
+"Les listes de paquets représentent un moyen très puissant de choisir les "
+"paquets à installer. Avec &live-helper; sont fournies un grand nombre de "
+"listes de paquets prédéfinies, proposant des sélections de paquets par "
+"défaut pour les environnements de bureau GNOME et KDE, ainsi que pour les "
+"systèmes standards."
+
+# type: Content of: <sect1><sect2><sect3><para>
+#: xml/chapters/customization/packages.xml:103
+msgid ""
+"To specify a package list, add the name of the list to the "
+"<command>LH_PACKAGES_LISTS</command> variable in <filename>config/chroot</"
+"filename>. For example:"
+msgstr ""
+"Pour spécifier une liste de paquets, ajoutez le nom de cette liste à la "
+"variable<command>LH_PACKAGES_LISTS</command> dans <filename>config/chroot</"
+"filename>. Par exemple :"
+
+# type: Content of: <sect1><sect2><sect3><screen>
+#: xml/chapters/customization/packages.xml:105
+#, no-wrap
+msgid ""
+"\n"
+"LH_PACKAGES_LISTS=\"gnome\"\n"
+msgstr ""
+"\n"
+"LH_PACKAGES_LISTS=\"gnome\"\n"
+
+# type: Content of: <sect1><sect2><sect3><para>
+#: xml/chapters/customization/packages.xml:109
+msgid ""
+"Packages lists that a distributed with &live-helper; reside in view in the "
+"<command>/usr/share/live-helper/lists</command> directory."
+msgstr ""
+"Les listes de paquets distribuées avec &live-helper; résident dans le "
+"répertoire <command>/usr/share/live-helper/lists</command>."
+
+# type: Content of: <sect1><sect2><sect3><sect4><title>
+#: xml/chapters/customization/packages.xml:112
+msgid "Local packages lists"
+msgstr "Listes de paquets locaux"
+
+# type: Content of: <sect1><sect2><sect3><sect4><para>
+#: xml/chapters/customization/packages.xml:114
+msgid ""
+"You may supplement the supplied lists using local package lists stored in "
+"<command>config/chroot_local-packageslists</command>."
+msgstr ""
+"Vous pouvez ajouter des listes de paquets locaux aux listes par défaut en "
+"les insérant dans <command>config/chroot_local-packageslists</command>."
+
+# type: Content of: <sect1><sect2><sect3><sect4><para>
+#: xml/chapters/customization/packages.xml:117
+msgid ""
+"Package lists that exist in this directory always override package lists "
+"distributed with &live-helper;. This can cause undesired effects when.."
+msgstr ""
+"Les listes de paquets présentes dans ce répertoire ont systématiquement "
+"préséance sur celles fournies avec &live-helper; Ceci peut entraîner des "
+"effets non-désirés lorsque.."
+
+# type: Content of: <sect1><sect2><sect3><sect4><title>
+#: xml/chapters/customization/packages.xml:123
+msgid "Extending a provided package list using includes"
+msgstr "Extension d'une liste de paquets grâce aux \"includes\""
+
+# type: Content of: <sect1><sect2><sect3><sect4><screen>
+#: xml/chapters/customization/packages.xml:126
+#, no-wrap
+msgid ""
+"\n"
+"#include &lt;gnome&gt;\n"
+"iceweasel\n"
+msgstr ""
+"\n"
+"#include &lt;gnome&gt;\n"
+"iceweasel\n"
+
+# type: Content of: <sect1><sect2><sect3><sect4><para>
+#: xml/chapters/customization/packages.xml:132
+msgid ""
+"The package lists that are included with &live-helper; make extensive use of "
+"includes. They are available to view in the <command>/usr/share/live-helper/"
+"lists</command> directory."
+msgstr ""
+"Les listes de paquets fournies avec &live-helper; font un usage intensif des "
+"\"includes\". Elles sont disponibles dans le répertoire <command>/usr/share/"
+"live-helper/lists</command>"
+
+# type: Content of: <sect1><sect2><sect3><sect4><title>
+#: xml/chapters/customization/packages.xml:137
+msgid "Using conditionals inside packages lists"
+msgstr "Utilisation de tests dans les listes de paquets"
+
+# type: Content of: <sect1><sect2><sect3><sect4><screen>
+#: xml/chapters/customization/packages.xml:140
+#, no-wrap
+msgid ""
+"\n"
+"#if ARCHITECTURE amd64\n"
+"ia32-libs\n"
+"#endif\n"
+msgstr ""
+"\n"
+"#if ARCHITECTURE amd64\n"
+"ia32-libs\n"
+"#endif\n"
+
+# type: Content of: <sect1><sect2><sect3><sect4><para>
+#: xml/chapters/customization/packages.xml:146
+msgid ""
+"or if <command>LH_ARCHITECTURE</command> is set to <command>i386</command> "
+"or <command>amd64</command>:"
+msgstr ""
+"ou si la variable <command>LH_ARCHITECTURE</command> est positionnée sur "
+"<command>i386</command> ou <command>amd64</command>:"
+
+# type: Content of: <sect1><sect2><sect3><sect4><screen>
+#: xml/chapters/customization/packages.xml:148
+#, no-wrap
+msgid ""
+"\n"
+"#if ARCHITECTURE i386 amd64\n"
+"memtest86+\n"
+"#endif\n"
+msgstr ""
+"\n"
+"#if ARCHITECTURE i386 amd64\n"
+"memtest86+\n"
+"#endif\n"
+
+# type: Content of: <sect1><sect2><sect3><sect4><para>
+#: xml/chapters/customization/packages.xml:154
+msgid ""
+"or if <command>LH_SECTIONS</command> contains either <command>contrib</"
+"command> or <command>non-free</command>:"
+msgstr ""
+"ou si la variable <command>LH_SECTIONS</command> contient soit "
+"<command>contrib</command>, soit <command>non-free</command>:"
+
+# type: Content of: <sect1><sect2><sect3><sect4><screen>
+#: xml/chapters/customization/packages.xml:156
+#, no-wrap
+msgid ""
+"\n"
+"#if SECTIONS contrib non-free\n"
+"vrms\n"
+"#endif\n"
+msgstr ""
+"\n"
+"#if SECTIONS contrib non-free\n"
+"vrms\n"
+"#endif\n"
+
+# type: Content of: <sect1><sect2><sect3><sect4><para>
+#: xml/chapters/customization/packages.xml:162
+msgid "A conditional may surround an <command>#include</command> directive:"
+msgstr "Un test peut encadrer une directive <command>#include</command> :"
+
+# type: Content of: <sect1><sect2><sect3><sect4><screen>
+#: xml/chapters/customization/packages.xml:164
+#, no-wrap
+msgid ""
+"\n"
+"#if ARCHITECTURE amd64\n"
+"#include &lt;gnome-full&gt;\n"
+"#endif\n"
+msgstr ""
+"\n"
+"#if ARCHITECTURE amd64\n"
+"#include &lt;gnome-full&gt;\n"
+"#endif\n"
+
+# type: Content of: <sect1><sect2><sect3><sect4><para>
+#: xml/chapters/customization/packages.xml:171
+msgid ""
+"Any &live-helper; configuration variable that begins with <command>LH_</"
+"command> can be tested in this way."
+msgstr ""
+"Toute variable de configuration de &live-helper; qui commence par "
+"<command>LH_</command> peut être testée de cette manière."
+
+# type: Content of: <sect1><sect2><sect3><sect4><para>
+#: xml/chapters/customization/packages.xml:174
+msgid "The nesting of conditionals is not supported."
+msgstr "L'imbrication de tests n'est pas supportée."
+
+# type: Content of: <sect1><sect2><title>
+#: xml/chapters/customization/packages.xml:189
+msgid "Installing modified or third-party packages"
+msgstr "Installation de paquets modifiés ou de tierce partie"
+
+# type: Content of: <sect1><sect2><para>
+#: xml/chapters/customization/packages.xml:191
+msgid ""
+"Whilst it is against the philosophy of Debian Live, it may sometimes be "
+"necessary to build a Live system with modified versions of packages that are "
+"in the Debian repository. This may be to modify or support additional "
+"features, languages and branding, or even to remove elements of existing "
+"packages that are undesirable. Similarly, \"third-party\" packages may be "
+"used to add bespoke and/or proprietary functionality."
+msgstr ""
+"Bien que cela aille à l'encontre de la philosophie Debian Live, il peut "
+"s'avérer nécessaire de construire un système Live avec des versions "
+"modifiées de paquets présents sur le dépôt Debian, ceci afin de modifier ou "
+"apporter des fonctionnalités supplémentaires, des supports linguistiques, ou "
+"encore pour supprimer des éléments de paquets indésirables. De même, les "
+"paquets de \"tierce partie\" peuvent servir à ajouter des fonctionnalités "
+"\"sur demande\" et/ou propriétaires."
+
+# type: Content of: <sect1><sect2><para>
+#: xml/chapters/customization/packages.xml:193
+msgid ""
+"This section does not cover advice regarding building or maintaining "
+"modified packages. Joachim Breitner's <ulink url=\"http://www.joachim-"
+"breitner.de/blog/archives/282-How-to-fork-privately.html\">'How to fork "
+"privately'</ulink> may be of interest, however. The creation of bespoke "
+"packages is covered in the <ulink url=\"http://www.debian.org/doc/maint-"
+"guide/\">Debian New Maintainers' Guide</ulink> and elsewhere."
+msgstr ""
+"Cette section ne fournit pas d'aide sur la construction et la maintenance de "
+"paquets modifiés. L'article de Joachim Breitner <ulink url=\"http://www."
+"joachim-breitner.de/blog/archives/282-How-to-fork-privately.html\">'How to "
+"fork privately'</ulink> peut cependant vous intéresser. La création de "
+"paquets \"sur mesure\" est décrite, entre autres, à l'adresse <ulink url="
+"\"http://www.debian.org/doc/maint-guide/\">Debian New Maintainers' Guide</"
+"ulink>."
+
+# type: Content of: <sect1><sect2><para>
+#: xml/chapters/customization/packages.xml:195
+msgid "There are two ways of installing modified custom packages:"
+msgstr "Il y a deux manières d'installer des paquets modifiés :"
+
+# type: Content of: <sect1><sect2><orderedlist><listitem><para>
+#: xml/chapters/customization/packages.xml:197
+msgid "<filename>chroot_local-packages</filename>"
+msgstr "<filename>chroot_local-packages</filename>"
+
+# type: Content of: <sect1><sect2><orderedlist><listitem><para>
+#: xml/chapters/customization/packages.xml:198
+msgid "Using a custom APT repository"
+msgstr "Utilisation d'un dépôt APT \"custom\""
+
+# type: Content of: <sect1><sect2><para>
+#: xml/chapters/customization/packages.xml:201
+msgid ""
+"The <filename>chroot_local-packages</filename> is simpler to achieve and "
+"useful for \"one-off\" customisations but has a number of drawbacks, whilst "
+"using a custom APT repository is more time-consuming to setup."
+msgstr ""
+"Il est plus simple d'utiliser <filename>chroot_local-packages</filename> "
+"pour une customisation rapide, au prix de certains inconvénients, tandis que "
+"l'utilisation d'un dépôt APT spécifique prend plus de temps à mettre en "
+"place."
+
+# type: Content of: <sect1><sect2><sect3><title>
+#: xml/chapters/customization/packages.xml:204
+msgid ""
+"Using <filename>chroot_local-packages</filename> to install custom packages"
+msgstr ""
+"Utilistation de <filename>chroot_local-packages</filename> pour installer "
+"des paquets modifiés"
+
+# type: Content of: <sect1><sect2><sect3><para>
+#: xml/chapters/customization/packages.xml:205
+msgid ""
+"To install a custom package, simply copy it to the <command>config/"
+"chroot_local-packages</command> directory. Packages that are inside this "
+"directory will be automatically installed into the live system during build "
+"- you do not need to specify them elsewhere."
+msgstr ""
+"Pour installer un paquet modifié, il suffit de le placer dans le répertoire "
+"<command>config/chroot_local-packages</command>. Les paquets présents dans "
+"ce répertoire seront automatiquement installés à la construction du système "
+"live. Il n'est pas nécessaire de les spécifier ailleurs."
+
+# type: Content of: <sect1><sect2><sect3><para>
+#: xml/chapters/customization/packages.xml:207
+msgid ""
+"Packages <emphasis>must</emphasis> be named in the prescribed way. One "
+"simple way to is to use <command>dpkg-name</command>. FIXME"
+msgstr ""
+"Les paquets <emphasis>doivent</emphasis> être nommés de la façon décrite. Le "
+"plus simple est d'utiliser <command>dpkg-name</command>. À corriger"
+
+# type: Content of: <sect1><sect2><sect3><para>
+#: xml/chapters/customization/packages.xml:209
+msgid ""
+"Using <filename>chroot_local-packages</filename> for installation of custom "
+"packages has two disadvantages:"
+msgstr ""
+"L'utilisation de <filename>chroot_local-packages</filename> lors de "
+"l'installation de paquets modifiés présente deux inconvénients :"
+
+# type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
+#: xml/chapters/customization/packages.xml:211
+msgid "It is not possible to use secure APT"
+msgstr "Il n'est pas possible d'utiliser APT de façon sécurisée"
+
+# type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
+#: xml/chapters/customization/packages.xml:212
+msgid ""
+"You must install all appropriate packages in the <command>config/"
+"chroot_local-packages</command> directory"
+msgstr ""
+"Il est nécessaire d'installer tous les paquets appropriés dans le répertoire "
+"<command>config/chroot_local-packages</command>"
+
+# type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
+#: xml/chapters/customization/packages.xml:213
+msgid ""
+"Does not lend itself to storing Debian Live configurations in revision "
+"control"
+msgstr ""
+"Ça ne se prête pas à l'enregistrement de configurations Debian Live lors de "
+"contrôles de révisions"
+
+# type: Content of: <sect1><sect2><sect3><title>
+#: xml/chapters/customization/packages.xml:218
+msgid "Using an APT repository to install custom packages"
+msgstr "Utilisation de répertoires APT pour installer des paquets modifiés"
+
+# type: Content of: <sect1><sect2><sect3><para>
+#: xml/chapters/customization/packages.xml:223
+msgid ""
+"Unlike You must ensure that you specify the package elsewhere, see (FIXME)"
+msgstr ""
+"Il faut s'assurer de bien spécifier le paquet ailleurs. Voir (à corriger)"
+
+# type: Content of: <sect1><sect2><sect3><para>
+#: xml/chapters/customization/packages.xml:226
+#: xml/chapters/customization/packages.xml:248
+msgid ""
+"Whilst it may seem unnecessary effort to create an APT repository to install "
+"custom packages, the infrastructure can be easily re-used at a later date to "
+"offer updates of the modified package."
+msgstr ""
+"Bien que la création d'un dépôt APT paraisse superflue pour installer des "
+"paquets modifiés, une telle infrastructure peut aisément être réutilisée "
+"afin d'offrir ultérieurement des mises à jour des paquets modifiés."
+
+# type: Content of: <sect1><sect2><sect3><title>
+#: xml/chapters/customization/packages.xml:231
+msgid "Custom packages and APT"
+msgstr "APT et paquets modifiés"
+
+# type: Content of: <sect1><sect2><sect3><para>
+#: xml/chapters/customization/packages.xml:233
+msgid ""
+"&live-helper; uses APT to install all packages into the live system so will "
+"therefore inherit behaviours from this program. One relevant example is that "
+"(assuming a default configuration) given a package is available in two "
+"different repositories, APT will elect to install the package with a higher "
+"version number over one with the lower."
+msgstr ""
+"&live-helper; fait appel à APT pour installer tous les paquets sur le "
+"système live, et hérite donc des comportements de ce programme. Pour donner "
+"un exemple pertinent, avec une configuration par défaut, si un paquet est "
+"disponible dans deux dépôts différents, APT choisira d'installer le paquet "
+"dont le numéro de version est le plus élevé."
+
+# type: Content of: <sect1><sect2><sect3><para>
+#: xml/chapters/customization/packages.xml:237
+msgid ""
+"Because of this. you may wish to increment the version number in your custom "
+"packages' <command>debian/changelog</command> files to ensure that your "
+"modified version is installed over one in the official Debian repositories. "
+"This may also be achieved by altering the live system's APT pinning "
+"preferences - see <xref linkend=\"apt-preferences\"/> for more information."
+msgstr ""
+"Pour ces raisons, vous pouvez choisir d'incrémenter les numéros de version "
+"dans les fichiers <command>debian/changelog</command> de vos paquets "
+"modifiés afin de vous assurer qu'ils soient installés plutôt que les "
+"versions des dépôts Debian officiels. Vous pouvez également modifier les "
+"préférences de priorité APT du système live. Voir <xref linkend=\"apt-"
+"preferences\"/> pour de plus amples informations"
+
+# type: Content of: <sect1><sect2><sect3><title>
+#: xml/chapters/customization/packages.xml:243
+msgid "Altering APT preferences during Live system"
+msgstr "Modification des préférences APT lors d'une session Live"
diff --git a/manual/old/fr/procedures.xml.po b/manual/old/fr/procedures.xml.po
new file mode 100644
index 0000000..bab6e39
--- /dev/null
+++ b/manual/old/fr/procedures.xml.po
@@ -0,0 +1,47 @@
+# French translations for PACKAGE package
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# Automatically generated, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2009-02-27 18:09+0100\n"
+"PO-Revision-Date: 2009-02-27 18:09+0100\n"
+"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> <christophenagel at gmail.com>\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+# type: Content of: <chapter><title>
+#: xml/chapters/procedures.xml:7
+msgid "Procedures"
+msgstr "Procédures"
+
+# type: Content of: <chapter><para>
+#: xml/chapters/procedures.xml:9
+msgid ""
+"This chapter documents the procedures within the Debian Live project for "
+"various tasks that need cooperation with other teams in Debian."
+msgstr "Ce chapitre documente les procédures du projet Debian Live pour diverses tâches "
+"nécéssitant la coopération avec d'autres équipes de Debian."
+
+# type: Content of: <chapter><sect1><title>
+#: xml/chapters/procedures.xml:12
+msgid "Major Releases"
+msgstr "Versions Majeurs"
+
+# type: Content of: <chapter><sect1><para>
+#: xml/chapters/procedures.xml:14
+msgid ""
+"Releasing a new stable major version of Debian includes a lot of different "
+"teams working together to make it happen. At some point, the Live team comes "
+"in and builds live system images. The requirements to do this are:"
+msgstr ""
+
+# type: Content of: <chapter><sect1><title>
+#: xml/chapters/procedures.xml:28
+msgid "Point Releases"
+msgstr ""
diff --git a/manual/po/fr/project.xml.po b/manual/old/fr/project.xml.po
similarity index 70%
rename from manual/po/fr/project.xml.po
rename to manual/old/fr/project.xml.po
index 03cc043..a8340f2 100644
--- a/manual/po/fr/project.xml.po
+++ b/manual/old/fr/project.xml.po
@@ -6,46 +6,35 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
+"POT-Creation-Date: 2009-02-25 14:33+0100\n"
 "PO-Revision-Date: 2009-02-26 17:43+0100\n"
-"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> "
-"<christophenagel at gmail.com>\n"
+"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> <christophenagel at gmail.com>\n"
 "Language-Team: none\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 # type: Content of: <sect1><title>
-#. type: Content of: <sect1><title>
-#: en/chapters/about/project.xml:7
+#: xml/chapters/about/project.xml:7
 msgid "About the Debian Live Project"
 msgstr "À propos du projet Debian Live"
 
 # type: Content of: <sect1><sect2><title>
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/about/project.xml:10
+#: xml/chapters/about/project.xml:10
 msgid "Motivation"
 msgstr "Motivation"
 
 # type: Content of: <sect1><sect2><sect3><title>
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/about/project.xml:13
+#: xml/chapters/about/project.xml:13
 msgid "What is wrong with current live systems"
 msgstr "Le problème des systèmes live actuels"
 
 # type: Content of: <sect1><sect2><sect3><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:15
-#, fuzzy
-#| msgid ""
-#| "There are already several Debian-based live systems and they are doing a "
-#| "great job. But from the Debian perspective most of them have one or more "
-#| "of the following disadvantages:"
+#: xml/chapters/about/project.xml:15
 msgid ""
 "There are already several Debian-based live systems and they are doing a "
-"great job. But, from the Debian perspective most of them have one or more of "
+"great job. But from the Debian perspective most of them have one or more of "
 "the following disadvantages:"
 msgstr ""
 "Il existe actuellement plusieurs systèmes live basés sur Debian, et qui font "
@@ -53,27 +42,23 @@ msgstr ""
 "présente au moins l'un des inconvénients suivants :"
 
 # type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:18
+#: xml/chapters/about/project.xml:18
 msgid "They are unofficial projects, developed outside of Debian."
 msgstr "Ce sont des projets officieux, développés en marge de Debian."
 
 # type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:19
+#: xml/chapters/about/project.xml:19
 msgid "They mix different distributions, e.g. testing and unstable."
 msgstr ""
 "Ils mélangent plusieurs distributions (par exemple, testing et unstable)."
 
 # type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:20
+#: xml/chapters/about/project.xml:20
 msgid "They support i386 only."
 msgstr "Seules les architectures i386 sont supportées."
 
 # type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:21
+#: xml/chapters/about/project.xml:21
 msgid ""
 "They modify the behaviour and/or appearance of packages by stripping them "
 "down to save space."
@@ -82,14 +67,12 @@ msgstr ""
 "pour récupérer de l'espace."
 
 # type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:22
+#: xml/chapters/about/project.xml:22
 msgid "They include unofficial packages."
 msgstr "Ils incluent des paquets officieux."
 
 # type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:23
+#: xml/chapters/about/project.xml:23
 msgid ""
 "They ship custom kernels with additional patches that are not part of Debian."
 msgstr ""
@@ -97,8 +80,7 @@ msgstr ""
 "Debian."
 
 # type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:24
+#: xml/chapters/about/project.xml:24
 msgid ""
 "They are large and slow due to their sheer size and thus not suitable for "
 "rescue issues."
@@ -107,8 +89,7 @@ msgstr ""
 "problèmes de récupération du système."
 
 # type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:25
+#: xml/chapters/about/project.xml:25
 msgid ""
 "They are not available in different flavours, e.g. CDs, DVDs, USB-stick and "
 "netboot images"
@@ -117,14 +98,12 @@ msgstr ""
 "réseau...)"
 
 # type: Content of: <sect1><sect2><sect3><title>
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/about/project.xml:30
+#: xml/chapters/about/project.xml:30
 msgid "Why create our own live system?"
 msgstr "Pourquoi créer notre propre système live?"
 
 # type: Content of: <sect1><sect2><sect3><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:32
+#: xml/chapters/about/project.xml:32
 msgid ""
 "Debian is the Universal Operating System: Debian should have an official "
 "live system for showing around and to officially represent the true, one and "
@@ -135,56 +114,47 @@ msgstr ""
 "avec ces avantages :"
 
 # type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:35
+#: xml/chapters/about/project.xml:35
 msgid "It would be an official Debian subproject."
 msgstr "Un sous-projet Debian officiel,"
 
 # type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:36
+#: xml/chapters/about/project.xml:36
 msgid "It reflects the (current) state of one distribution."
 msgstr "qui reflète l'état courant d'une distribution,"
 
 # type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:37
+#: xml/chapters/about/project.xml:37
 msgid "It runs on as many architectures as possible."
 msgstr "qui fonctionne sur autant d'architectures que possible"
 
 # type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:38
+#: xml/chapters/about/project.xml:38
 msgid "It consists of unchanged Debian packages only."
 msgstr "qui est constitué uniquement de paquets Debian non-altérés"
 
 # type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:39
+#: xml/chapters/about/project.xml:39
 msgid "It does not contain any unofficial packages."
 msgstr "qui ne contient aucun paquet officieux"
 
 # type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:40
+#: xml/chapters/about/project.xml:40
 msgid "It uses an unaltered Debian kernel-image with no additional patches."
 msgstr "qui utilise une image du noyau inaltérée et sans patches."
 
 # type: Content of: <sect1><sect2><title>
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/about/project.xml:48
+#: xml/chapters/about/project.xml:48
 msgid "Philosophy"
 msgstr "Philosophie"
 
 # type: Content of: <sect1><sect2><sect3><title>
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/about/project.xml:51
+#: xml/chapters/about/project.xml:51
 msgid "Only unchanged, official packages"
 msgstr "Uniquement des paquets officiels et inchangés"
 
 # type: Content of: <sect1><sect2><sect3><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:52
+#: xml/chapters/about/project.xml:52
 msgid ""
 "We will only use official packages from the Debian repository in the \"main"
 "\" section (possibly contrib, although not decided yet). The non-free "
@@ -197,8 +167,7 @@ msgstr ""
 "inutilisable pour les systèmes live."
 
 # type: Content of: <sect1><sect2><sect3><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:54
+#: xml/chapters/about/project.xml:54
 msgid ""
 "We will not change any packages. Whenever we need to change something, we "
 "will do that in coordination with its package maintainer in Debian."
@@ -207,8 +176,7 @@ msgstr ""
 "faites en collaboration avec les mainteneurs de paquets Debian."
 
 # type: Content of: <sect1><sect2><sect3><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:56
+#: xml/chapters/about/project.xml:56
 msgid ""
 "As an exception, our own packages such as &live-helper; or &live-initramfs; "
 "may temporarily be used from our own repository for development reasons (e."
@@ -220,14 +188,12 @@ msgstr ""
 "développement. Ceux-ci seront régulièrement transférés à Debian."
 
 # type: Content of: <sect1><sect2><sect3><title>
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/about/project.xml:60
+#: xml/chapters/about/project.xml:60
 msgid "No package configuration of the live system"
 msgstr "Pas de configuration des paquets du système live."
 
 # type: Content of: <sect1><sect2><sect3><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:61
+#: xml/chapters/about/project.xml:61
 msgid ""
 "In this phase we will not ship or install sample or alternative "
 "configurations. All packages are used in their default configuration as they "
@@ -239,8 +205,7 @@ msgstr ""
 "classique."
 
 # type: Content of: <sect1><sect2><sect3><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:63
+#: xml/chapters/about/project.xml:63
 msgid ""
 "Whenever we need a different default configuration, we will do that in "
 "coordination with its package maintainer in Debian."
@@ -249,21 +214,13 @@ msgstr ""
 "sera faite en coordination avec le mainteneur de paquets Debian."
 
 # type: Content of: <sect1><sect2><sect3><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:65
-#, fuzzy
-#| msgid ""
-#| "A system for configuring packages is provided using debconf in lh_config "
-#| "(use --preseed FILE) allowing custom configured packages to be installed "
-#| "in your custom produced Debian Live images, but for official live images "
-#| "only default configuration will be used. For more information, please see "
-#| "<xref linkend=\"customization\"/>."
+#: xml/chapters/about/project.xml:65
 msgid ""
-"A system for configuring packages is provided using debconf in <command>lh "
-"config</command> (use --preseed FILE) allowing custom configured packages to "
-"be installed in your custom produced Debian Live images, but for official "
-"live images only default configuration will be used. For more information, "
-"please see <xref linkend=\"customization\"/>."
+"A system for configuring packages is provided using debconf in lh_config "
+"(use --preseed FILE) allowing custom configured packages to be installed in "
+"your custom produced Debian Live images, but for official live images only "
+"default configuration will be used. For more information, please see <xref "
+"linkend=\"customization\"/>."
 msgstr ""
 "Un système de configuration des paquets basé sur debconf est fourni dans "
 "lh_config (usage : --preseed FICHIER). Il permet une configuration "
@@ -273,18 +230,11 @@ msgstr ""
 "linkend=\"customization\"/>."
 
 # type: Content of: <sect1><sect2><sect3><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:67
-#, fuzzy
-#| msgid ""
-#| "Exception: There are a few essential changes needed to be make a live "
-#| "system alive (e.g. configuring pam to allow empty passwords). These "
-#| "essential changes have to be kept as minimal as possible and, should be "
-#| "merged within the Debian repository if possible."
+#: xml/chapters/about/project.xml:67
 msgid ""
-"Exception: There are a few essential changes needed to bring a live system "
-"to life (e.g. configuring pam to allow empty passwords). These essential "
-"changes have to be kept as minimal as possible and should be merged within "
+"Exception: There are a few essential changes needed to be make a live system "
+"alive (e.g. configuring pam to allow empty passwords). These essential "
+"changes have to be kept as minimal as possible and, should be merged within "
 "the Debian repository if possible."
 msgstr ""
 "Une exception: quelques modifications essentielles sont nécessaires pour "
@@ -293,14 +243,22 @@ msgstr ""
 "minimes que possible, et devrait être si possible intégrés au dépôt Debian."
 
 # type: Content of: <sect1><sect2><sect3><title>
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/about/project.xml:71
+#: xml/chapters/about/project.xml:71
+msgid "No live system to hard disk installer for etch"
+msgstr "Pas d'installeur dans la version etch."
+
+# type: Content of: <sect1><sect2><sect3><para>
+#: xml/chapters/about/project.xml:72
+msgid "Title says it all."
+msgstr "Tout est dans le titre."
+
+# type: Content of: <sect1><sect2><sect3><title>
+#: xml/chapters/about/project.xml:75
 msgid "Live system to hard disk installer"
 msgstr "Installation sur le disque dur"
 
 # type: Content of: <sect1><sect2><sect3><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:72
+#: xml/chapters/about/project.xml:76
 msgid ""
 "For the moment we will not ship an installer to copy the live system to a "
 "partition on the hard disk. Although we keep the changes in the live system "
@@ -315,8 +273,7 @@ msgstr ""
 "exceptions, guideline 2)."
 
 # type: Content of: <sect1><sect2><sect3><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:74
+#: xml/chapters/about/project.xml:78
 msgid ""
 "Therefore, we will ship a copy of the regular DebianInstaller (resp. Debian "
 "Installer, Graphical Installer) instead, to allow users to perform a regular "
@@ -329,20 +286,17 @@ msgstr ""
 "cdebootstrap et·debootstrap sont présents sur le système."
 
 # type: Content of: <sect1><sect2><title>
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/about/project.xml:80
+#: xml/chapters/about/project.xml:84
 msgid "Contact"
 msgstr "Contact"
 
 # type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/project.xml:83
+#: xml/chapters/about/project.xml:87
 msgid "Mailing list"
 msgstr "Liste de diffusion"
 
 # type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/project.xml:84
+#: xml/chapters/about/project.xml:88
 msgid ""
 "The primary contact for the project is the <ulink url=\"http://lists.debian."
 "org/debian-live/\">mailing list</ulink>. You can email the list directly by "
@@ -356,14 +310,12 @@ msgstr ""
 "url=\"http://lists.debian.org/debian-live/\">archives</ulink> "
 
 # type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/project.xml:87
+#: xml/chapters/about/project.xml:91
 msgid "IRC"
 msgstr "IRC"
 
 # type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/project.xml:88
+#: xml/chapters/about/project.xml:92
 msgid ""
 "A number of users and developers are present in the <ulink url=\"irc://irc."
 "debian.org/#debian-live\">#debian-live</ulink> channel on <ulink url="
@@ -378,14 +330,12 @@ msgstr ""
 "message sur la liste de diffusion."
 
 # type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/project.xml:91
+#: xml/chapters/about/project.xml:95
 msgid "BTS"
 msgstr "BTS"
 
 # type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/project.xml:92
+#: xml/chapters/about/project.xml:96
 msgid ""
 "The Debian Bug Tracking System (BTS) contains details of bugs reported by "
 "users and developers. Each bug is given a number, and is kept on file until "
@@ -398,14 +348,12 @@ msgstr ""
 "résolu. Pour plus d'informations, voir <xref linkend=\"bugs\"/>."
 
 # type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/project.xml:95
+#: xml/chapters/about/project.xml:99
 msgid "Wiki"
 msgstr "Wiki"
 
 # type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/project.xml:96
+#: xml/chapters/about/project.xml:100
 msgid ""
 "The <ulink url=\"http://wiki.debian.org/DebianLive\">Debian Live wiki</"
 "ulink> is a place to gather information, discuss applied technologies, and "
diff --git a/manual/po/fr/reporting-bugs.xml.po b/manual/old/fr/reporting-bugs.xml.po
similarity index 53%
rename from manual/po/fr/reporting-bugs.xml.po
rename to manual/old/fr/reporting-bugs.xml.po
index b2e914c..adc9c29 100644
--- a/manual/po/fr/reporting-bugs.xml.po
+++ b/manual/old/fr/reporting-bugs.xml.po
@@ -6,25 +6,22 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Debconf 8\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
+"POT-Creation-Date: 2008-08-09 16:50+0300\n"
 "PO-Revision-Date: 2008-08-09 16:50+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 # type: Content of: <chapter><title>
-#. type: Content of: <chapter><title>
-#: en/chapters/reporting-bugs.xml:7
+#: chapters/reporting-bugs.xml:7
 msgid "Reporting bugs"
 msgstr ""
 
 # type: Content of: <chapter><para>
-#. type: Content of: <chapter><para>
-#: en/chapters/reporting-bugs.xml:9
+#: chapters/reporting-bugs.xml:9
 msgid ""
 "Debian Live is far from being perfect, but we want to make it as close as "
 "possible to perfect - with your help. Do not hesitate to report a bug: it is "
@@ -33,81 +30,32 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><para>
-#. type: Content of: <chapter><para>
-#: en/chapters/reporting-bugs.xml:11
+#: chapters/reporting-bugs.xml:11
 msgid "For the impatient:"
 msgstr ""
 
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:16
-msgid ""
-"Always check first the image status updates on <ulink url=\"http://live."
-"debian.net/\">our homepage</ulink> for known issues."
-msgstr ""
-
 # type: Content of: <chapter><itemizedlist><listitem><para>
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:21
+#: chapters/reporting-bugs.xml:16
 msgid ""
 "Always try to reproduce the bug with the <emphasis>most recent version of "
 "&live-helper; and &live-initramfs;</emphasis> before submitting a bug report."
 msgstr ""
 
 # type: Content of: <chapter><itemizedlist><listitem><para>
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:26
+#: chapters/reporting-bugs.xml:21
 msgid ""
 "Try to give <emphasis>as specific information as possible</emphasis> about "
 "the bug. This includes (at least) the version of &live-helper; and &live-"
 "initramfs; used and the distribution of the live system you are building."
 msgstr ""
 
-#. type: Content of: <chapter><section><title>
-#: en/chapters/reporting-bugs.xml:32
-msgid "Known issues"
-msgstr ""
-
-#. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:33
-msgid ""
-"Due to the nature of Debian testing and Debian unstable branches being a "
-"moving target, building a live system may not always be possible."
-msgstr ""
-
-#. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:34
-msgid ""
-"If this is a problem, do not build a system based on testing or unstable, "
-"but go with stable. live-helper does always default to the current stable "
-"release."
-msgstr ""
-
-#. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:35
-msgid ""
-"Currently known issues are listed under the section 'status' on <ulink url="
-"\"http://live.debian.net/\">our homepage</ulink>."
-msgstr ""
-
-#. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:36
-msgid ""
-"It is out of the scope of this manual to train you in correctly identifying "
-"and fixing problems in packages of the development branches, however, there "
-"are two things you can always try: When not succeeding to build testing, try "
-"if unstable works. If unstable does not work either, revert to testing and "
-"pinning the newer version of the failing package from unstable."
-msgstr ""
-
 # type: Content of: <chapter><section><title>
-#. type: Content of: <chapter><section><title>
-#: en/chapters/reporting-bugs.xml:40
+#: chapters/reporting-bugs.xml:27
 msgid "Rebuild from scratch"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:41
+#: chapters/reporting-bugs.xml:28
 msgid ""
 "To ensure that a particular bug is not caused by an unclean built system, "
 "please always rebuild the whole live system from scratch to see if the bug "
@@ -115,20 +63,17 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
-#. type: Content of: <chapter><section><title>
-#: en/chapters/reporting-bugs.xml:45
+#: chapters/reporting-bugs.xml:32
 msgid "Use up-to-date packages"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:46
+#: chapters/reporting-bugs.xml:33
 msgid "This means"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:48
+#: chapters/reporting-bugs.xml:35
 msgid ""
 "Using outdated packages can cause significant problems when trying to "
 "reproduce (and ultimately fix) your problem. If a relevant package is not "
@@ -138,90 +83,81 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><title>
-#. type: Content of: <chapter><section><title>
-#: en/chapters/reporting-bugs.xml:53
+#: chapters/reporting-bugs.xml:40
 msgid "Collect information"
 msgstr ""
 
-#. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:55
+# type: Content of: <chapter><section><para>
+#: chapters/reporting-bugs.xml:42
 msgid ""
 "Please provide enough information with your report. At a minimum, it should "
-"contain the exact version of &live-helper; version where the bug is "
+"contain the exact version of live-helper version where the bug is "
 "encountered, and steps to reproduce it. Please use common sense and include "
 "other relevant information if you think that it might help in solving the "
 "problem."
 msgstr ""
 
 # type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:57
+#: chapters/reporting-bugs.xml:44
 msgid ""
 "To make the most out of your bug report, we require at least the following "
 "information:"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
-#. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:61
+#: chapters/reporting-bugs.xml:48
 msgid "Architecture of the host system"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
-#. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:62
+#: chapters/reporting-bugs.xml:49
 msgid "Version of &live-helper; on the host system"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
-#. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:63
+#: chapters/reporting-bugs.xml:50
 msgid "Version of &live-initramfs; on the live system"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
-#. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:64
+#: chapters/reporting-bugs.xml:51
 msgid ""
 "Version of <filename>debootstrap</filename> and/or <filename>cdebootstrap</"
 "filename> on the host system"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
-#. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:65
+#: chapters/reporting-bugs.xml:52
 msgid "Architecture of the live system"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
-#. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:66
+#: chapters/reporting-bugs.xml:53
 msgid "Distribution of the live system"
 msgstr ""
 
 # type: Content of: <chapter><section><itemizedlist><listitem><para>
-#. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:67
+#: chapters/reporting-bugs.xml:54
 msgid "Version of the kernel on the live system"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:71
+#: chapters/reporting-bugs.xml:58
 msgid ""
 "You can generate a log of the build process by using the <filename>tee</"
 "filename> command:"
 msgstr ""
 
-#. type: Content of: <chapter><section><screen>
-#: en/chapters/reporting-bugs.xml:75
+# type: Content of: <chapter><section><screen>
+#: chapters/reporting-bugs.xml:61
 #, no-wrap
-msgid " # lh_build 2>&amp;1 | tee buildlog.txt\n"
+msgid ""
+"\n"
+" # lh_build 2>&amp;1 | tee buildlog.txt\n"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:78
+#: chapters/reporting-bugs.xml:65
 msgid ""
 "Additionally, to rule out other errors, it is always a good idea to tar up "
 "your config directory and upload it somewhere (do *not* send it as an "
@@ -229,61 +165,48 @@ msgid ""
 "you encountered."
 msgstr ""
 
-#. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:83
-msgid ""
-"Remember to send in any logs that were produced with English locale "
-"settings, e.g. run your live-helper commands with a leading <code>LC_ALL=C</"
-"code> or <code>LC_ALL=en_US</code>."
-msgstr ""
-
 # type: Content of: <chapter><section><title>
-#. type: Content of: <chapter><section><title>
-#: en/chapters/reporting-bugs.xml:91
+#: chapters/reporting-bugs.xml:74
 msgid "Use the correct package to report the bug against"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:93
+#: chapters/reporting-bugs.xml:76
 msgid "Where does the bug appear?"
 msgstr ""
 
 # type: Content of: <chapter><section><para><variablelist><varlistentry><term>
-#. type: Content of: <chapter><section><para><variablelist><varlistentry><term>
-#: en/chapters/reporting-bugs.xml:98
+#: chapters/reporting-bugs.xml:81
 msgid "At build time whilst bootstrapping"
 msgstr ""
 
-#. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para><para>
-#: en/chapters/reporting-bugs.xml:101
+# type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para><para>
+#: chapters/reporting-bugs.xml:84
 msgid ""
 "&live-helper; first bootstraps a basic Debian system with "
-"<command>debootstrap</command> or <command>cdebootstrap</command>. Depending "
-"on the bootstrapping tool used and the Debian distribution it is "
-"bootstrapping, it may fail. If a bug appears here, check if the error is "
-"related to a specific Debian package (most likely), or if it is related to "
-"cdebootstrap itself."
+"<computeroutput>debootstrap</computeroutput> or "
+"<computeroutput>cdebootstrap</computeroutput>. Depending on the "
+"bootstrapping tool used and the Debian distribution it is bootstrapping, it "
+"may fail. If a bug appears here, check if the error is related to a specific "
+"Debian package (most likely), or if it is related to cdebootstrap itself."
 msgstr ""
 
-#. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para><para>
-#: en/chapters/reporting-bugs.xml:103
+# type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para><para>
+#: chapters/reporting-bugs.xml:86
 msgid ""
 "In both cases, this is not a bug in Debian Live, but rather in Debian itself "
 "which we can not fix this directly. Please report such a bug against "
-"<command>debootstrap</command>, <command>cdebootstrap</command> or the "
-"failing package."
+"<computeroutput>debootstrap</computeroutput>, <computeroutput>cdebootstrap</"
+"computeroutput> or the failing package."
 msgstr ""
 
 # type: Content of: <chapter><section><para><variablelist><varlistentry><term>
-#. type: Content of: <chapter><section><para><variablelist><varlistentry><term>
-#: en/chapters/reporting-bugs.xml:107
+#: chapters/reporting-bugs.xml:90
 msgid "At build time whilst installing packages"
 msgstr ""
 
 # type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#: en/chapters/reporting-bugs.xml:109
+#: chapters/reporting-bugs.xml:92
 msgid ""
 "&live-helper; installs additional packages from the Debian archive and "
 "depending on the Debian distribution used and the daily archive state, it "
@@ -291,19 +214,18 @@ msgid ""
 "a normal system."
 msgstr ""
 
-#. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#: en/chapters/reporting-bugs.xml:111
+# type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
+#: chapters/reporting-bugs.xml:94
 msgid ""
 "If this is the case, this is not a bug in Debian Live, but rather in Debian "
 "- please report it against the failing package. Running "
 "<filename>debootstrap</filename> seperately from the Live system build or "
-"running <filename>lh_bootstrap</filename> with <command>--debug</command> "
-"will give you more information."
+"running <filename>lh_bootstrap</filename> with <computeroutput>--debug</"
+"computeroutput> will give you more information."
 msgstr ""
 
 # type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#: en/chapters/reporting-bugs.xml:113
+#: chapters/reporting-bugs.xml:96
 msgid ""
 "Also, if you are using a local mirror and/or any of sort of proxy and you "
 "are experiencing a problem, please always reproduce it first by "
@@ -311,14 +233,12 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para><variablelist><varlistentry><term>
-#. type: Content of: <chapter><section><para><variablelist><varlistentry><term>
-#: en/chapters/reporting-bugs.xml:120
+#: chapters/reporting-bugs.xml:103
 msgid "At boot-time"
 msgstr ""
 
 # type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#: en/chapters/reporting-bugs.xml:123
+#: chapters/reporting-bugs.xml:106
 msgid ""
 "If your image does not boot, please report it to the mailing list together "
 "with the information requested in <xref linkend=\"collect-information\"/>. "
@@ -329,33 +249,24 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para><variablelist><varlistentry><term>
-#. type: Content of: <chapter><section><para><variablelist><varlistentry><term>
-#: en/chapters/reporting-bugs.xml:128
+#: chapters/reporting-bugs.xml:111
 msgid "At run-time"
 msgstr ""
 
 # type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#: en/chapters/reporting-bugs.xml:130
+#: chapters/reporting-bugs.xml:113
 msgid ""
 "If a package was successfully installed, but fails while actually running "
 "the Live system, this is probably a bug in Debian Live. However,"
 msgstr ""
 
-#. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:96
-msgid "<placeholder type=\"variablelist\" id=\"0\"/>"
-msgstr ""
-
 # type: Content of: <chapter><section><title>
-#. type: Content of: <chapter><section><title>
-#: en/chapters/reporting-bugs.xml:139
+#: chapters/reporting-bugs.xml:122
 msgid "Do the research"
 msgstr ""
 
 # type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:140
+#: chapters/reporting-bugs.xml:123
 msgid ""
 "Before filing the bug, please search the web for the particular error "
 "message or symptom you are getting. As it is highly unlikely that you are "
@@ -365,8 +276,7 @@ msgid ""
 msgstr ""
 
 # type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:142
+#: chapters/reporting-bugs.xml:125
 msgid ""
 "You should pay particular attention to the Debian Live mailing list, as well "
 "as the homepage, as these are likely to contain the most up-to-date "
@@ -374,47 +284,45 @@ msgid ""
 "in your bug report."
 msgstr ""
 
-#. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:144
+# type: Content of: <chapter><section><para>
+#: chapters/reporting-bugs.xml:127
 msgid ""
 "In addition, you should check the <ulink url=\"http://bugs.debian.org/cgi-"
-"bin/pkgreport.cgi?src=live-helper\">current bug list for &live-helper;</"
-"ulink> and the <ulink url=\"http://bugs.debian.org/cgi-bin/pkgreport.cgi?"
-"src=live-initramfs\">current bug list for live-initramfs</ulink> to see "
-"whether something similar has been reported already."
+"bin/pkgreport.cgi?src=live-helper\">current bug list for live-helper</ulink> "
+"and the <ulink url=\"http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-"
+"initramfs\">current bug list for live-initramfs</ulink> to see whether "
+"something similar has been reported already."
 msgstr ""
 
 # type: Content of: <chapter><section><title>
-#. type: Content of: <chapter><section><title>
-#: en/chapters/reporting-bugs.xml:148
+#: chapters/reporting-bugs.xml:131
 msgid "Where to report bugs"
 msgstr ""
 
-#. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:150
+# type: Content of: <chapter><section><para>
+#: chapters/reporting-bugs.xml:133
 msgid ""
 "The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
 "System (BTS). For information on how to use the system, please see <ulink "
 "url=\"http://bugs.debian.org\">http://bugs.debian.org</ulink>. You can also "
-"submit the bugs by using the <command>reportbug</command> command from the "
-"package with the same name."
+"submit the bugs by using the <computeroutput>reportbug</computeroutput> "
+"command from the package with the same name."
 msgstr ""
 
-#. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:152
+# type: Content of: <chapter><section><para>
+#: chapters/reporting-bugs.xml:135
 msgid ""
 "In general, you should report build time errors against the <ulink url="
 "\"http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-helper\">live-"
 "helper</ulink> package and run time errors against <ulink url=\"http://bugs."
-"debian.org/cgi-bin/pkgreport.cgi?src=live-initramfs\">live-initramfs</"
-"ulink>. If you are unsure of which package is appropriate or need more help "
-"before submitting a bug report, please send a message to the mailing list "
-"and we will help you to figure it out."
+"debian.org/cgi-bin/pkgreport.cgi?src=live-helper\">live-initramfs</ulink>. "
+"If you are unsure of which package is appropriate or need more help before "
+"submitting a bug report, please send a message to the mailing list and we "
+"will help you to figure it out."
 msgstr ""
 
 # type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:154
+#: chapters/reporting-bugs.xml:137
 msgid ""
 "Please note that bugs found in distributions derived from Debian (such as "
 "Ubuntu, Knoppix, Xandros, etc.) should <emphasis>not</emphasis> be reported "
diff --git a/manual/old/fr/resources.xml.po b/manual/old/fr/resources.xml.po
new file mode 100644
index 0000000..ee7fac8
--- /dev/null
+++ b/manual/old/fr/resources.xml.po
@@ -0,0 +1,150 @@
+# French translations for Debconf package
+# Copyright (C) 2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the Debconf package.
+# Automatically generated, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Debconf 8\n"
+"POT-Creation-Date: 2008-08-09 16:50+0300\n"
+"PO-Revision-Date: 2009-02-27 13:18+0100\n"
+"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> <christophenagel at gmail.com>\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+# type: Content of: <chapter><section><para>
+#: chapters/basics.xml:151 chapters/basics.xml:182
+#: chapters/customisation-bootup.xml:11 chapters/customisation-bootup.xml:20
+#: chapters/customisation-bootup.xml:26 chapters/customisation-bootup.xml:38
+#: chapters/customisation-bootup.xml:46 chapters/customisation-bootup.xml:53
+#: chapters/customisation-bootup.xml:60 chapters/customisation-bootup.xml:67
+#: chapters/customisation-packages.xml:21
+#: chapters/customisation-packages.xml:138
+#: chapters/customisation-packages.xml:183
+#: chapters/customisation-packages.xml:220
+#: chapters/customisation-packages.xml:245 chapters/live-environment.xml:11
+#: chapters/live-environment.xml:16 chapters/live-environment.xml:36
+#: chapters/live-environment.xml:41 chapters/meta.xml:47 chapters/meta.xml:51
+#: chapters/meta.xml:55 chapters/meta.xml:59 chapters/meta.xml:63
+#: chapters/meta.xml:67 chapters/overview.xml:115 chapters/resources.xml:11
+msgid "FIXME"
+msgstr "FIXME"
+
+# type: Content of: <chapter><title>
+#: chapters/resources.xml:7
+msgid "Resources and links"
+msgstr "Ressources et Liens"
+
+# type: Content of: <chapter><section><title>
+#: chapters/resources.xml:10
+msgid "Links"
+msgstr "Liens"
+
+# type: Content of: <chapter><section><orderedlist><listitem><para>
+#: chapters/resources.xml:14
+msgid "<ulink url=\"http://www.debian.org/\">Debian homepage</ulink>"
+msgstr "<ulink url=\"http://www.debian.org/\">Page de démarrage Debian</ulink>"
+
+# type: Content of: <chapter><section><title>
+#: chapters/resources.xml:20
+msgid "Who is using Debian Live?"
+msgstr "Qui utilise Debian Live?"
+
+# type: Content of: <chapter><section><para>
+#: chapters/resources.xml:22
+msgid "A number of projects are using Debian Live:"
+msgstr "Un certain nombre de projets utilisent Debian Live:"
+
+# type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: chapters/resources.xml:25
+msgid ""
+"<ulink url=\"http://pkg-kde.alioth.debian.org/kde4livecd.html\">Debian KDE4 "
+"livecd</ulink>"
+msgstr ""
+"<ulink url=\"http://pkg-kde.alioth.debian.org/kde4livecd.html\">Debian KDE4 "
+"livecd</ulink>"
+
+# type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: chapters/resources.xml:26
+msgid ""
+"<ulink url=\"http://www.gnewsense.org/\">gNewSense</ulink> \"forked\" a very "
+"early live-package"
+msgstr ""
+"<ulink url=\"http://www.gnewsense.org/\">gNewSense</ulink> \"dérive\" une "
+"des premières versions d live-package."
+
+# type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: chapters/resources.xml:27
+msgid ""
+"<ulink url=\"http://livecd.gnustep.org/\">GNUSTEP Live CD</ulink> using live-"
+"package"
+msgstr ""
+"<ulink url=\"http://livecd.gnustep.org/\">GNUSTEP Live CD</ulink> utilise "
+"live-package"
+
+# type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: chapters/resources.xml:28
+msgid ""
+"<ulink url=\"http://www.keshi.org/moin/moin.cgi/PS3/Debian/Live"
+"\">PlayStation 3 Live CD</ulink> using live-package"
+msgstr ""
+"<ulink url=\"http://www.keshi.org/moin/moin.cgi/PS3/Debian/Live"
+"\">PlayStation 3 Live CD</ulink> utilise live-package"
+
+# type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: chapters/resources.xml:29
+msgid ""
+"<ulink url=\"http://www.sidux.org/\">Sidux Live CD</ulink> \"forked\" an "
+"early live-package"
+msgstr ""
+"<ulink url=\"http://www.sidux.org/\">Sidux Live CD</ulink> \"dérive\" une "
+"des premières versions d live-package."
+
+# type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: chapters/resources.xml:30
+msgid "<ulink url=\"http://vamosproject.org\">Vamos</ulink>"
+msgstr "<ulink url=\"http://vamosproject.org\">Vamos</ulink>"
+
+# type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: chapters/resources.xml:31
+msgid ""
+"<ulink url=\"http://clonezilla.sourceforge.net/\">Clonezilla</ulink> (system "
+"image distributer)"
+msgstr ""
+"<ulink url=\"http://clonezilla.sourceforge.net/\">Clonezilla</ulink> "
+"(système de distribution d'images)"
+
+# type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: chapters/resources.xml:32
+msgid "<ulink url=\"http://www.webconverger.com/\">Webconverger</ulink>"
+msgstr "<ulink url=\"http://www.webconverger.com/\">Webconverger</ulink>"
+
+# type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: chapters/resources.xml:33
+msgid ""
+"<ulink url=\"http://updates.xorcom.com/iso/\">Xorcom Rapid live cd</ulink> - "
+"Asterisk-based live CD"
+msgstr ""
+"<ulink url=\"http://updates.xorcom.com/iso/\">Xorcom Rapid live cd</ulink> - "
+"Asterisk-based live CD"
+
+# type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: chapters/resources.xml:34
+msgid ""
+"<ulink url=\"http://pareto.uab.es/mcreel/PelicanHPC/\">PelicanHPC</ulink> "
+"uses &live-helper;"
+msgstr ""
+"<ulink url=\"http://pareto.uab.es/mcreel/PelicanHPC/\">PelicanHPC</ulink> "
+"utilise &live-helper;"
+
+# type: Content of: <chapter><section><itemizedlist><listitem><para>
+#: chapters/resources.xml:35
+msgid ""
+"IES S'Arenal, Llucmajor (Secondary school located near to Palma de "
+"Mallorca), Spain."
+msgstr ""
+"IES S'Arenal, Llucmajor (École secondaire située près de Palma de Majorque), "
+"Espagne."
diff --git a/manual/po/de/about.xml.po b/manual/po/de/about.xml.po
index 22333b1..5e377a8 100644
--- a/manual/po/de/about.xml.po
+++ b/manual/po/de/about.xml.po
@@ -1,22 +1,21 @@
-# German translations for Debconf package
-# Copyright (C) 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the Debconf package.
-# Automatically generated, 2008.
+# German translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Debconf 8\n"
+"Project-Id-Version: live-manual VERSION\n"
 "POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2008-08-09 16:50+0300\n"
+"PO-Revision-Date: 2010-06-06 12:07+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: \n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-# type: Content of: <chapter><title>
 #. type: Content of: <chapter><title>
 #: en/chapters/about.xml:9
 msgid "About"
diff --git a/manual/po/de/about_manual.xml.po b/manual/po/de/about_manual.xml.po
index 383b6c8..51ba515 100644
--- a/manual/po/de/about_manual.xml.po
+++ b/manual/po/de/about_manual.xml.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2010-06-06 12:16+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"PO-Revision-Date: 2010-06-06 17:46+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Content of: <sect1><title>
-#: en/about_manual.xml:9
+#: en/about_manual.xml:6
 msgid "About this manual"
 msgstr ""
 
 #. type: Content of: <sect1><para>
-#: en/about_manual.xml:12
+#: en/about_manual.xml:7
 msgid ""
 "The main goal of this manual is to serve as a single access point to all "
 "documentation related to the Debian Live project. It does not include end-"
@@ -30,7 +30,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><para>
-#: en/about_manual.xml:18
+#: en/about_manual.xml:8
 msgid ""
 "Some of the commands mentioned in the text must be executed with superuser "
 "privileges which can be obtained by becoming the root user via <filename>su</"
@@ -41,44 +41,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/about_manual.xml:28
+#: en/about_manual.xml:10
 msgid "Terms"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:33
+#: en/about_manual.xml:13
 msgid "Live system"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:37
+#: en/about_manual.xml:15
 msgid ""
-"An operating system that can boot without installation to a hard drive.  "
-"Live systems do not alter local operating system(s) or file(s) already "
-"installed on the computer hard drive unless instructed to do so. Live "
-"systems are typically booted from media such as CDs or DVDs, some may also "
-"boot with USB sticks or over the network (via netboot images)."
+"An operating system that can boot without installation to a hard drive. Live "
+"systems do not alter local operating system(s) or file(s) already installed "
+"on the computer hard drive unless instructed to do so. Live systems are "
+"typically booted from media such as CDs or DVDs, some may also boot with USB "
+"sticks or over the network (via netboot images)."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:47
+#: en/about_manual.xml:19
 msgid "Debian Live"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:51
+#: en/about_manual.xml:21
 msgid ""
 "The Debian sub-project which maintains the &live-helper; and &live-"
 "initramfs; utilities."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:58
+#: en/about_manual.xml:25
 msgid "Debian Live system"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:62
+#: en/about_manual.xml:27
 msgid ""
 "A live system that uses software from the Debian operating system that may "
 "be booted from CDs, DVDs, USB sticks, over the network (via netboot images), "
@@ -86,140 +86,118 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:70
+#: en/about_manual.xml:31
 msgid "Build system / host system"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:74
+#: en/about_manual.xml:33
 msgid "The environment used to create the live system."
 msgstr ""
 
-# #-#-#-#-#  overview.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: en/about_manual.xml:80 en/overview.xml:17
+#: en/about_manual.xml:37 en/overview.xml:9
 msgid "&live-helper;"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:84
+#: en/about_manual.xml:39
 msgid "A collection of scripts used to build customised Debian Live systems."
 msgstr ""
 
-# #-#-#-#-#  installation.xml.po (Debconf 8)  #-#-#-#-#
-# #-#-#-#-#  installation.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-# #-#-#-#-#  manual.xml.po (PACKAGE VERSION)  #-#-#-#-#
-# type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: en/about_manual.xml:90 en/installation.xml:76
+#: en/about_manual.xml:43 en/installation.xml:71
 msgid "&live-initramfs;"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:94
+#: en/about_manual.xml:45
 msgid ""
 "A collection of scripts used to boot live systems. &live-initramfs; is a "
 "fork of <filename>casper</filename> by Canonical, Ltd."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:101
+#: en/about_manual.xml:50
 msgid "<filename>live-package</filename>"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:105
+#: en/about_manual.xml:53
 msgid "The former name of &live-helper;."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:111
+#: en/about_manual.xml:57
 msgid "Debian Installer / (d-i)"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:115
+#: en/about_manual.xml:59
 msgid "The official installation system for the Debian distribution."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/about_manual.xml:121 en/customization_bootup.xml:104
+#: en/about_manual.xml:63 en/customization_bootup.xml:48
 msgid "Cheat codes"
 msgstr ""
 
-# #-#-#-#-#  live-environment.xml.po (Debconf 8)  #-#-#-#-#
-# #-#-#-#-#  live-environment.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  resources.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  success-stories.xml.po (live-manual VERSION)  #-#-#-#-#
-# #-#-#-#-#  live-environment.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  resources.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  resources.xml.po (Debconf 8)  #-#-#-#-#
-# #-#-#-#-#  live-environment.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  resources.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><para>
-#: en/about_manual.xml:125 en/customization_bootup.xml:11
-#: en/customization_bootup.xml:20 en/customization_bootup.xml:26
-#: en/customization_bootup.xml:38 en/customization_bootup.xml:85
-#: en/customization_bootup.xml:92 en/customization_bootup.xml:99
-#: en/customization_bootup.xml:106 en/customization_packages.xml:36
-#: en/customization_packages.xml:306 en/customization_packages.xml:326
-#: en/customization_packages.xml:384 en/customization_packages.xml:492
-#: en/customization_packages.xml:535 en/live-environment.xml:11
-#: en/resources.xml:11 en/success-stories.xml:11
+#: en/about_manual.xml:65 en/customization_bootup.xml:8
+#: en/customization_bootup.xml:14 en/customization_bootup.xml:17
+#: en/customization_bootup.xml:25 en/customization_bootup.xml:37
+#: en/customization_bootup.xml:41 en/customization_bootup.xml:45
+#: en/customization_bootup.xml:49 en/customization_packages.xml:18
+#: en/customization_packages.xml:130 en/customization_packages.xml:138
+#: en/customization_packages.xml:160 en/customization_packages.xml:198
+#: en/customization_packages.xml:209 en/live-environment.xml:9
+#: en/resources.xml:9 en/success-stories.xml:8
 msgid "FIXME"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:131
+#: en/about_manual.xml:69
 msgid "chroot"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:135
+#: en/about_manual.xml:71
 msgid ""
 "The chroot program, chroot(8), enables us to run different instances of the "
 "GNU/Linux environment on a single system simultaneously without rebooting."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:143
+#: en/about_manual.xml:75
 msgid "binary image"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:147
+#: en/about_manual.xml:77
 msgid ""
 "On a live system, binary image refers to the binary filesystem and the "
 "respective extension, such as binary.iso or binary.img."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:154
+#: en/about_manual.xml:81
 msgid "Target distribution"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:158
+#: en/about_manual.xml:83
 msgid ""
 "The distribution upon which your live system will be based. This can differ "
 "from the distribution of your Build System."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:165
+#: en/about_manual.xml:87
 msgid "&lenny;/&squeeze;/&sid; stable/testing/unstable"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:169
+#: en/about_manual.xml:89
 msgid ""
 "The \"stable\" distribution contains the latest officially released "
 "distribution of Debian. The \"testing\" distribution is the staging area for "
@@ -231,7 +209,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:179
+#: en/about_manual.xml:90
 msgid ""
 "At the time of writing, &lenny; is the current \"stable\" release and "
 "&squeeze; is the current \"testing\" release. &sid; will always be a synonym "
@@ -239,91 +217,91 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/about_manual.xml:191
+#: en/about_manual.xml:96
 msgid "Authors"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:194
+#: en/about_manual.xml:97
 msgid "A list of authors (in alphabetical order):"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:201
+#: en/about_manual.xml:100
 msgid "Ben Armstrong"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:207
+#: en/about_manual.xml:103
 msgid "Brendan Sleight"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:213
+#: en/about_manual.xml:106
 msgid "Chris Lamb"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:219
+#: en/about_manual.xml:109
 msgid "Daniel Baumann"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:225
+#: en/about_manual.xml:112
 msgid "Franklin Piat"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:231
+#: en/about_manual.xml:115
 msgid "Jonas Stein"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:237
+#: en/about_manual.xml:118
 msgid "Kai Hendry"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:243
+#: en/about_manual.xml:121
 msgid "Marco Amadori"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:249
+#: en/about_manual.xml:124
 msgid "Mathieu Geli"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:255
+#: en/about_manual.xml:127
 msgid "Matthias Kirschner"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:261
+#: en/about_manual.xml:130
 msgid "Richard Nelson"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:267
+#: en/about_manual.xml:133
 msgid "Trent W. Buck"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/about_manual.xml:276
+#: en/about_manual.xml:138
 msgid "Contributing to this document"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:279
+#: en/about_manual.xml:139
 msgid ""
 "This manual is intended as a community project and all proposals for "
 "improvements and contributions are extremely welcome. The preferred way to "
 "submit a contribution is to send it to the mailing list. Please see <xref "
-"linkend=\"contact\" /> for more information."
+"linkend=\"contact\"/> for more information."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:286
+#: en/about_manual.xml:140
 msgid ""
 "When submitting a contribution please clearly identify its copyright holder "
 "and include the licensing statement. Note that to be accepted the "
@@ -332,43 +310,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:293
+#: en/about_manual.xml:141
 msgid ""
 "The sources for this manual are maintained using the Git version control "
 "system. You can checkout the latest copy by executing:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para><screen>
-#: en/about_manual.xml:298
+#: en/about_manual.xml:143
 #, no-wrap
 msgid "$ git clone git://live.debian.net/git/live-manual.git"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/about_manual.xml:298 en/about_manual.xml:308 en/about_manual.xml:318
-#: en/about_manual.xml:338 en/about_manual.xml:351 en/about_manual.xml:366
-#: en/about_manual.xml:379 en/about_manual.xml:389 en/basics.xml:113
-#: en/basics.xml:128 en/basics.xml:144 en/basics.xml:158 en/basics.xml:194
-#: en/basics.xml:220 en/basics.xml:230 en/basics.xml:239 en/basics.xml:253
-#: en/basics.xml:275 en/basics.xml:302 en/basics.xml:312 en/basics.xml:320
-#: en/basics.xml:354 en/basics.xml:364 en/basics.xml:382 en/basics.xml:429
-#: en/basics.xml:498 en/basics.xml:530 en/basics.xml:539 en/basics.xml:590
-#: en/basics.xml:646 en/customization_packages.xml:50
-#: en/customization_packages.xml:58 en/customization_packages.xml:71
-#: en/customization_packages.xml:80 en/customization_packages.xml:104
-#: en/customization_packages.xml:222 en/customization_packages.xml:230
-#: en/customization_packages.xml:265 en/customization_packages.xml:310
-#: en/customization_packages.xml:330 en/customization_packages.xml:341
-#: en/customization_packages.xml:352 en/customization_packages.xml:362
-#: en/faq.xml:64 en/faq.xml:241 en/faq.xml:244 en/faq.xml:252 en/faq.xml:256
-#: en/faq.xml:264 en/faq.xml:279 en/faq.xml:287 en/faq.xml:334 en/faq.xml:424
-#: en/faq.xml:430 en/faq.xml:481 en/faq.xml:483 en/faq.xml:487 en/faq.xml:491
-#: en/overview.xml:181 en/overview.xml:230 en/overview.xml:240
+#: en/about_manual.xml:143 en/about_manual.xml:147 en/about_manual.xml:151
+#: en/about_manual.xml:160 en/about_manual.xml:166 en/about_manual.xml:172
+#: en/about_manual.xml:178 en/about_manual.xml:184 en/basics.xml:45
+#: en/basics.xml:50 en/basics.xml:57 en/basics.xml:60 en/basics.xml:72
+#: en/basics.xml:81 en/basics.xml:85 en/basics.xml:89 en/basics.xml:95
+#: en/basics.xml:105 en/basics.xml:118 en/basics.xml:122 en/basics.xml:126
+#: en/basics.xml:139 en/basics.xml:143 en/basics.xml:148 en/basics.xml:160
+#: en/basics.xml:170 en/basics.xml:182 en/basics.xml:186 en/basics.xml:205
+#: en/basics.xml:220 en/customization_packages.xml:25
+#: en/customization_packages.xml:29 en/customization_packages.xml:34
+#: en/customization_packages.xml:38 en/customization_packages.xml:48
+#: en/customization_packages.xml:102 en/customization_packages.xml:106
+#: en/customization_packages.xml:116 en/customization_packages.xml:132
+#: en/customization_packages.xml:140 en/customization_packages.xml:144
+#: en/customization_packages.xml:148 en/customization_packages.xml:152
+#: en/faq.xml:36 en/faq.xml:128 en/faq.xml:131 en/faq.xml:138 en/faq.xml:141
+#: en/faq.xml:163 en/faq.xml:188 en/faq.xml:210 en/overview.xml:61
+#: en/overview.xml:66 en/overview.xml:70
 msgid "<placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:302
+#: en/about_manual.xml:145
 msgid ""
 "Prior to submission of your contribution, please preview your work. To "
 "preview the live-manual, ensure the packages needed for building are "
@@ -376,84 +353,72 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para><screen>
-#: en/about_manual.xml:308
+#: en/about_manual.xml:147
 #, no-wrap
-msgid ""
-"# apt-get install dblatex docbook-xml docbook-xsl make po4a\n"
-"\tw3m"
+msgid "# apt-get install dblatex docbook-xml docbook-xsl make po4a w3m"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:313
+#: en/about_manual.xml:149
 msgid ""
 "You may build the live-manual from the top level directory of your git "
 "checkout by executing:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para><screen>
-#: en/about_manual.xml:318
+#: en/about_manual.xml:151
 #, no-wrap
 msgid "$ make build"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_manual.xml:322
+#: en/about_manual.xml:154
 msgid "Applying patches"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_manual.xml:325
+#: en/about_manual.xml:155
 msgid ""
 "Directly commiting to the repository is possible by anyone. However, we ask "
-"you to send bigger changes to the mailinglist to discuss them first.  In "
+"you to send bigger changes to the mailinglist to discuss them first. In "
 "order to push to the repository, the following steps are required."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about_manual.xml:334
+#: en/about_manual.xml:158
 msgid "Fetch the public commit key:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:338
+#: en/about_manual.xml:160
 #, no-wrap
-msgid ""
-"$ mkdir -p ~/.ssh/identity.d\n"
-"$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live -O ~/.ssh/identity.d/live-manual at debian-live\n"
-"$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub -O ~/.ssh/identity.d/live-manual at debian-live.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*"
+msgid "$ mkdir -p ~/.ssh/identity.d $ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live -O ~/.ssh/identity.d/live-manual at debian-live $ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub -O ~/.ssh/identity.d/live-manual at debian-live.pub $ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about_manual.xml:347
+#: en/about_manual.xml:164
 msgid "Add the following section to your openssh-client config:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:351
+#: en/about_manual.xml:166
 #, no-wrap
-msgid ""
-" $ cat &gt;&gt; ~/.ssh/config &lt;&lt; EOF\n"
-"Host live.debian.net\n"
-"\tHostname live.debian.net\n"
-"\tUser gitosis\n"
-"\tIdentityFile ~/.ssh/identity.d/live-manual at debian-live\n"
-"EOF"
+msgid " $ cat &gt;&gt; ~/.ssh/config &lt;&lt; EOF Host live.debian.net Hostname live.debian.net User gitosis IdentityFile ~/.ssh/identity.d/live-manual at debian-live EOF"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about_manual.xml:362
+#: en/about_manual.xml:170
 msgid "Checkout a clone of the manual through ssh:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:366
+#: en/about_manual.xml:172
 #, no-wrap
 msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about_manual.xml:372
+#: en/about_manual.xml:176
 msgid ""
 "Commit the file after editing. Write commit messages, that consist of full "
 "useful sentences, starting with a capital letter and ending with a full "
@@ -461,18 +426,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:379
+#: en/about_manual.xml:178
 #, no-wrap
 msgid "$ git commit -a"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about_manual.xml:385
+#: en/about_manual.xml:182
 msgid "Push the commit to the server:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:389
+#: en/about_manual.xml:184
 #, no-wrap
 msgid "$ git push"
 msgstr ""
diff --git a/manual/po/de/about_project.xml.po b/manual/po/de/about_project.xml.po
index 2b15408..ad99dd6 100644
--- a/manual/po/de/about_project.xml.po
+++ b/manual/po/de/about_project.xml.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2010-06-06 12:16+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"PO-Revision-Date: 2010-06-06 17:46+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
@@ -17,22 +17,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Content of: <sect1><title>
-#: en/about_project.xml:7
+#: en/about_project.xml:6
 msgid "About the Debian Live Project"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/about_project.xml:10
+#: en/about_project.xml:8
 msgid "Motivation"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_project.xml:13
+#: en/about_project.xml:10
 msgid "What is wrong with current live systems"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:15
+#: en/about_project.xml:11
 msgid ""
 "There are already several Debian-based live systems and they are doing a "
 "great job. But, from the Debian perspective most of them have one or more of "
@@ -40,12 +40,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:18
+#: en/about_project.xml:14
 msgid "They are unofficial projects, developed outside of Debian."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:19
+#: en/about_project.xml:17
 msgid "They mix different distributions, e.g. testing and unstable."
 msgstr ""
 
@@ -55,44 +55,44 @@ msgid "They support i386 only."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:21
+#: en/about_project.xml:23
 msgid ""
 "They modify the behaviour and/or appearance of packages by stripping them "
 "down to save space."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:22
+#: en/about_project.xml:26
 msgid "They include unofficial packages."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:23
+#: en/about_project.xml:29
 msgid ""
 "They ship custom kernels with additional patches that are not part of Debian."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:24
+#: en/about_project.xml:32
 msgid ""
 "They are large and slow due to their sheer size and thus not suitable for "
 "rescue issues."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:25
+#: en/about_project.xml:35
 msgid ""
 "They are not available in different flavours, e.g. CDs, DVDs, USB-stick and "
-"netboot images"
+"netboot images."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_project.xml:30
+#: en/about_project.xml:40
 msgid "Why create our own live system?"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:32
+#: en/about_project.xml:41
 msgid ""
 "Debian is the Universal Operating System: Debian should have an official "
 "live system for showing around and to officially represent the true, one and "
@@ -100,47 +100,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:35
+#: en/about_project.xml:44
 msgid "It would be an official Debian subproject."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:36
+#: en/about_project.xml:47
 msgid "It reflects the (current) state of one distribution."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:37
+#: en/about_project.xml:50
 msgid "It runs on as many architectures as possible."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:38
+#: en/about_project.xml:53
 msgid "It consists of unchanged Debian packages only."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:39
+#: en/about_project.xml:56
 msgid "It does not contain any unofficial packages."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:40
+#: en/about_project.xml:59
 msgid "It uses an unaltered Debian kernel-image with no additional patches."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/about_project.xml:48
+#: en/about_project.xml:65
 msgid "Philosophy"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_project.xml:51
+#: en/about_project.xml:67
 msgid "Only unchanged, official packages"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:52
+#: en/about_project.xml:68
 msgid ""
 "We will only use official packages from the Debian repository in the \"main"
 "\" section (possibly contrib, although not decided yet). The non-free "
@@ -149,14 +149,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:54
+#: en/about_project.xml:69
 msgid ""
 "We will not change any packages. Whenever we need to change something, we "
 "will do that in coordination with its package maintainer in Debian."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:56
+#: en/about_project.xml:70
 msgid ""
 "As an exception, our own packages such as &live-helper; or &live-initramfs; "
 "may temporarily be used from our own repository for development reasons (e."
@@ -165,12 +165,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_project.xml:60
+#: en/about_project.xml:73
 msgid "No package configuration of the live system"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:61
+#: en/about_project.xml:74
 msgid ""
 "In this phase we will not ship or install sample or alternative "
 "configurations. All packages are used in their default configuration as they "
@@ -178,14 +178,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:63
+#: en/about_project.xml:75
 msgid ""
 "Whenever we need a different default configuration, we will do that in "
 "coordination with its package maintainer in Debian."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:65
+#: en/about_project.xml:76
 msgid ""
 "A system for configuring packages is provided using debconf in <command>lh "
 "config</command> (use --preseed FILE) allowing custom configured packages to "
@@ -195,7 +195,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:67
+#: en/about_project.xml:77
 msgid ""
 "Exception: There are a few essential changes needed to bring a live system "
 "to life (e.g. configuring pam to allow empty passwords). These essential "
@@ -204,12 +204,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_project.xml:71
+#: en/about_project.xml:80
 msgid "Live system to hard disk installer"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:72
+#: en/about_project.xml:81
 msgid ""
 "For the moment we will not ship an installer to copy the live system to a "
 "partition on the hard disk. Although we keep the changes in the live system "
@@ -219,7 +219,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:74
+#: en/about_project.xml:82
 msgid ""
 "Therefore, we will ship a copy of the regular DebianInstaller (resp. Debian "
 "Installer, Graphical Installer) instead, to allow users to perform a regular "
@@ -228,17 +228,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/about_project.xml:80
+#: en/about_project.xml:86
 msgid "Contact"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_project.xml:83
+#: en/about_project.xml:89
 msgid "Mailing list"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_project.xml:84
+#: en/about_project.xml:91
 msgid ""
 "The primary contact for the project is the <ulink url=\"http://lists.debian."
 "org/debian-live/\">mailing list</ulink>. You can email the list directly by "
@@ -248,12 +248,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_project.xml:87
+#: en/about_project.xml:95
 msgid "IRC"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_project.xml:88
+#: en/about_project.xml:97
 msgid ""
 "A number of users and developers are present in the <ulink url=\"irc://irc."
 "debian.org/#debian-live\">#debian-live</ulink> channel on <ulink url="
@@ -263,12 +263,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_project.xml:91
+#: en/about_project.xml:101
 msgid "BTS"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_project.xml:92
+#: en/about_project.xml:103
 msgid ""
 "The Debian Bug Tracking System (BTS) contains details of bugs reported by "
 "users and developers. Each bug is given a number, and is kept on file until "
@@ -277,12 +277,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_project.xml:95
+#: en/about_project.xml:107
 msgid "Wiki"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_project.xml:96
+#: en/about_project.xml:109
 msgid ""
 "The <ulink url=\"http://wiki.debian.org/DebianLive\">Debian Live wiki</"
 "ulink> is a place to gather information, discuss applied technologies, and "
diff --git a/manual/po/de/backports.xml.po b/manual/po/de/backports.xml.po
deleted file mode 100644
index f9190a1..0000000
--- a/manual/po/de/backports.xml.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# German translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2010-06-06 12:07+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. type: Content of: <sect1><title>
-#: en/chapters/customization/backports.xml:8
-msgid "Using a newer kernel with Lenny"
-msgstr ""
-
-#. type: Content of: <sect1><para>
-#: en/chapters/customization/backports.xml:10
-msgid ""
-"The backports repository, backports.org, lacks the necessary module packages "
-"(linux-modules-extra-2.6, aufs, etc.) so an alternative repository has been "
-"set up, in order to build Lenny live images with a later kernel. Shown here "
-"is one way of doing it."
-msgstr ""
-
-#. type: Content of: <sect1><screen>
-#: en/chapters/customization/backports.xml:13
-#, no-wrap
-msgid ""
-"$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6'\n"
-"\n"
-"$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.chroot\n"
-"$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.binary\n"
-"\n"
-"$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.chroot.gpg\n"
-"$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.binary.gpg\n"
-"\n"
-"# lh_build\n"
-msgstr ""
diff --git a/manual/po/de/basics.xml.po b/manual/po/de/basics.xml.po
index 2c1dea0..2d3e784 100644
--- a/manual/po/de/basics.xml.po
+++ b/manual/po/de/basics.xml.po
@@ -1,74 +1,71 @@
-# German translations for Debconf package
-# Copyright (C) 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the Debconf package.
-# Automatically generated, 2008.
+# German translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Debconf 8\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2008-08-09 16:50+0300\n"
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"PO-Revision-Date: 2010-06-06 17:46+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: \n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Content of: <chapter><section><section><para>
-#: en/about_manual.xml:298 en/about_manual.xml:308 en/about_manual.xml:318
-#: en/about_manual.xml:338 en/about_manual.xml:351 en/about_manual.xml:366
-#: en/about_manual.xml:379 en/about_manual.xml:389 en/basics.xml:113
-#: en/basics.xml:128 en/basics.xml:144 en/basics.xml:158 en/basics.xml:194
-#: en/basics.xml:220 en/basics.xml:230 en/basics.xml:239 en/basics.xml:253
-#: en/basics.xml:275 en/basics.xml:302 en/basics.xml:312 en/basics.xml:320
-#: en/basics.xml:354 en/basics.xml:364 en/basics.xml:382 en/basics.xml:429
-#: en/basics.xml:498 en/basics.xml:530 en/basics.xml:539 en/basics.xml:590
-#: en/basics.xml:646 en/customization_packages.xml:50
-#: en/customization_packages.xml:58 en/customization_packages.xml:71
-#: en/customization_packages.xml:80 en/customization_packages.xml:104
-#: en/customization_packages.xml:222 en/customization_packages.xml:230
-#: en/customization_packages.xml:265 en/customization_packages.xml:310
-#: en/customization_packages.xml:330 en/customization_packages.xml:341
-#: en/customization_packages.xml:352 en/customization_packages.xml:362
-#: en/faq.xml:64 en/faq.xml:241 en/faq.xml:244 en/faq.xml:252 en/faq.xml:256
-#: en/faq.xml:264 en/faq.xml:279 en/faq.xml:287 en/faq.xml:334 en/faq.xml:424
-#: en/faq.xml:430 en/faq.xml:481 en/faq.xml:483 en/faq.xml:487 en/faq.xml:491
-#: en/overview.xml:181 en/overview.xml:230 en/overview.xml:240
+#: en/about_manual.xml:143 en/about_manual.xml:147 en/about_manual.xml:151
+#: en/about_manual.xml:160 en/about_manual.xml:166 en/about_manual.xml:172
+#: en/about_manual.xml:178 en/about_manual.xml:184 en/basics.xml:45
+#: en/basics.xml:50 en/basics.xml:57 en/basics.xml:60 en/basics.xml:72
+#: en/basics.xml:81 en/basics.xml:85 en/basics.xml:89 en/basics.xml:95
+#: en/basics.xml:105 en/basics.xml:118 en/basics.xml:122 en/basics.xml:126
+#: en/basics.xml:139 en/basics.xml:143 en/basics.xml:148 en/basics.xml:160
+#: en/basics.xml:170 en/basics.xml:182 en/basics.xml:186 en/basics.xml:205
+#: en/basics.xml:220 en/customization_packages.xml:25
+#: en/customization_packages.xml:29 en/customization_packages.xml:34
+#: en/customization_packages.xml:38 en/customization_packages.xml:48
+#: en/customization_packages.xml:102 en/customization_packages.xml:106
+#: en/customization_packages.xml:116 en/customization_packages.xml:132
+#: en/customization_packages.xml:140 en/customization_packages.xml:144
+#: en/customization_packages.xml:148 en/customization_packages.xml:152
+#: en/faq.xml:36 en/faq.xml:128 en/faq.xml:131 en/faq.xml:138 en/faq.xml:141
+#: en/faq.xml:163 en/faq.xml:188 en/faq.xml:210 en/overview.xml:61
+#: en/overview.xml:66 en/overview.xml:70
 msgid "<placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
-# type: Content of: <chapter><title>
 #. type: Content of: <chapter><title>
-#: en/basics.xml:9
+#: en/basics.xml:6
 msgid "The basics"
 msgstr ""
 
-# type: Content of: <chapter><para>
 #. type: Content of: <chapter><para>
-#: en/basics.xml:12
+#: en/basics.xml:7
 msgid ""
 "This chapter contains a brief overview of the build process as well as "
 "containing instructions on how to boot the various binary image types."
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: en/basics.xml:17
+#: en/basics.xml:9
 msgid "What is a live system?"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:20
+#: en/basics.xml:10
 msgid ""
 "A live system usually means an OS booted on a computer from a removable "
 "medium (such as CD-ROM, USB stick, or network), ready to use without any "
 "installation on the usual drive(s), with an auto-configuration done at "
-"runtime (see <xref linkend=\"terms\" />)."
+"runtime (see <xref linkend=\"terms\"/>)."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:27
+#: en/basics.xml:11
 msgid ""
 "With Debian Live, it's a Debian GNU/Linux OS, built for one of the supported "
 "architectures (currently amd64, i386, powerpc and sparc). It is made from "
@@ -76,50 +73,50 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:35
+#: en/basics.xml:14
 msgid "Linux kernel"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:39
+#: en/basics.xml:16
 msgid "The Linux image, usually named <filename>vmlinuz*</filename>."
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:45
+#: en/basics.xml:20
 msgid "Initial RAM disk image (initrd)"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:49
+#: en/basics.xml:22
 msgid ""
 "RAM disk setup for the Linux boot, containing modules possibly needed to "
 "mount the filesystem's image and some scripts to do it."
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:56
+#: en/basics.xml:26
 msgid "System image"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:60
+#: en/basics.xml:28
 msgid ""
 "The OS filesystem image. Debian Live uses SquashFS, a compressed filesystem, "
 "to minimize its image size. Note that it's read-only. So, during boot the "
 "Debian Live system will use a RAM disk and 'union' mechanism to enable "
 "writing files within the running system. However, all modifications will be "
 "lost upon shutdown unless optional persistence partition(s) are used. (See "
-"<xref linkend=\"persistence\" />.)"
+"<xref linkend=\"persistence\"/>.)"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:71
+#: en/basics.xml:32
 msgid "Bootloader"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:75
+#: en/basics.xml:34
 msgid ""
 "A small piece of code, crafted to boot up from the chosen media, possibly "
 "presenting a prompt or menu to allow selection of options/configuration. It "
@@ -132,21 +129,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:90
+#: en/basics.xml:38
 msgid ""
 "The Debian Live tools will build the system image from your specifications, "
 "setup a Linux kernel and its initrd, a bootloader to run them, all in one "
 "media-dependant format(ISO9660 image, disk image, etc.)"
 msgstr ""
 
-# type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: en/basics.xml:98
+#: en/basics.xml:41
 msgid "First steps: building an ISO image"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:101
+#: en/basics.xml:42
 msgid ""
 "The following sequence of helper commands, provided by &live-helper;, will "
 "create a basic ISO image containing just the Debian standard system without "
@@ -154,7 +150,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:107
+#: en/basics.xml:43
 msgid ""
 "First, we run the <filename>lh config</filename> helper command which will "
 "create a <filename>\"config/\"</filename> hierarchy in the current directory "
@@ -162,143 +158,139 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para><screen>
-#: en/basics.xml:113
+#: en/basics.xml:45
 #, no-wrap
 msgid "$ lh config"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:117
+#: en/basics.xml:47
 msgid ""
 "By passing no parameters to <filename>lh config</filename> we indicated that "
 "we wish to use the defaults. This will create an image of type binary (see "
-"<xref linkend=\"lh-config\" />)."
+"<xref linkend=\"lh-config\"/>)."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:123
+#: en/basics.xml:48
 msgid ""
 "Now that we have a <filename>\"config/\"</filename> hierarchy, we may build "
 "the image with the <filename>lh build</filename> helper command:"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/basics.xml:128 en/basics.xml:239 en/basics.xml:382 en/use-cases.xml:59
+#: en/basics.xml:50 en/basics.xml:89 en/basics.xml:148 en/use-cases.xml:31
 #, no-wrap
 msgid "# lh build"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:132
+#: en/basics.xml:52
 msgid ""
 "This process can take a while, depending on the speed of your network "
-"connection (see <xref linkend=\"lh-build\" />)."
+"connection (see <xref linkend=\"lh-build\"/>)."
 msgstr ""
 
-# type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:137
+#: en/basics.xml:54
 msgid "Testing an ISO image with Qemu"
 msgstr ""
 
-# type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:140
+#: en/basics.xml:55
 msgid "Testing an ISO is simple:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:144
+#: en/basics.xml:57
 #, no-wrap
-msgid ""
-"# apt-get install qemu\n"
-"$ qemu -cdrom binary.iso"
+msgid "# apt-get install qemu $ qemu -cdrom binary.iso"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:151
+#: en/basics.xml:60
 msgid "Testing an ISO image with virtualbox-ose"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:154
+#: en/basics.xml:60
 msgid "In order to test the ISO with virtualbox-ose:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:158
+#: en/basics.xml:60
 #, no-wrap
 msgid "# apt-get install virtualbox-ose"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: en/basics.xml:162
+#: en/basics.xml:60
 msgid ""
 "the modules package for a stock kernel eg virtualbox-ose-"
 "modules-2.6.26-1-486 or"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: en/basics.xml:163
+#: en/basics.xml:60
 msgid ""
 "the modules package compiled for your kernel using module-assistant from the "
 "package virtualbox-ose-source"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:165
+#: en/basics.xml:60
 msgid "Run Virtualbox:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:167
-msgid "{{{Applications -> System Tools -> VirtualBox OSE }}}"
+#: en/basics.xml:60
+msgid "{{{Applications -&gt; System Tools -&gt; VirtualBox OSE }}}"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:169
+#: en/basics.xml:60
 msgid "Create a virtual machine from your Live ISO"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:171
+#: en/basics.xml:60
 msgid ""
 "To create a virtual machine \"mylive\" from A CDROM ISO \"binary.iso\" in "
 "VirtualBox:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:172
-msgid "{{{Machine -> New }}}"
+#: en/basics.xml:60
+msgid "{{{Machine -&gt; New }}}"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:173
+#: en/basics.xml:60
 msgid "In the Wizard: FIXME"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:177
+#: en/basics.xml:62
 msgid "Testing an ISO image with VMware Workstation"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:179
+#: en/basics.xml:63
 msgid "In order to test the ISO with VMware Workstation:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:181 en/basics.xml:287
+#: en/basics.xml:64 en/basics.xml:111
 msgid "Run VMware Workstation:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:182
+#: en/basics.xml:65
 msgid "Click on Edit virtual machine settings in the VM summary page."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:183
+#: en/basics.xml:66
 msgid ""
 "Then, click on the CD-ROM device and select Use ISO image. Remeber to "
 "connect the CD-ROM device at power on and remeber to adjust the boot order "
@@ -306,32 +298,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:187
+#: en/basics.xml:69
 msgid "Burning an ISO image to a physical medium"
 msgstr ""
 
-# type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:190
+#: en/basics.xml:70
 msgid "Burning an ISO image is easy:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:194
+#: en/basics.xml:72
 #, no-wrap
-msgid ""
-"# apt-get install wodim\n"
-"$ wodim binary.iso"
+msgid "# apt-get install wodim $ wodim binary.iso"
 msgstr ""
 
-# type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: en/basics.xml:203
+#: en/basics.xml:77
 msgid "Building an USB/HDD image"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:206
+#: en/basics.xml:78
 msgid ""
 "The following sequence of helper commands will create a basic USB/HDD image "
 "containing just the Debian standard system without X.org. It is suitable for "
@@ -340,21 +328,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:213
+#: en/basics.xml:79
 msgid ""
 "Note if you created an iso image with the previous example, you will need to "
 "clean up your working directory with the <filename>lh clean</filename> "
-"helper command (see <xref linkend=\"lh-clean\" />):"
+"helper command (see <xref linkend=\"lh-clean\"/>):"
 msgstr ""
 
 #. type: Content of: <chapter><section><para><screen>
-#: en/basics.xml:220 en/basics.xml:354
+#: en/basics.xml:81 en/basics.xml:139
 #, no-wrap
 msgid "$ lh clean --binary"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:224
+#: en/basics.xml:83
 msgid ""
 "Run the <filename>lh config</filename> helper command with the parameters to "
 "configure the <filename>\"config/\"</filename> hierarchy to create a USB/HDD "
@@ -362,25 +350,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para><screen>
-#: en/basics.xml:230
+#: en/basics.xml:85
 #, no-wrap
 msgid "$ lh config -b usb-hdd"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:234 en/basics.xml:377
+#: en/basics.xml:87 en/basics.xml:146
 msgid ""
 "Now build the image with the <filename>lh build</filename> helper command:"
 msgstr ""
 
-# type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:243
+#: en/basics.xml:92
 msgid "Copying USB/HDD image to a USB stick"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:246
+#: en/basics.xml:93
 msgid ""
 "The generated binary image contains a <acronym>VFAT</acronym> partition and "
 "the <command>syslinux</command> bootloader, ready to be directly written on "
@@ -389,13 +376,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:253
+#: en/basics.xml:95
 #, no-wrap
 msgid "$ dd if=binary.img of=${USBSTICK}"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:257
+#: en/basics.xml:97
 msgid ""
 "where <replaceable>${USBSTICK}</replaceable> is the device file of your key, "
 "like <filename>/dev/sdb</filename> (not a partition like <filename>/dev/"
@@ -403,32 +390,29 @@ msgid ""
 "<command>dmesg</command>'s output after plugging in the stick, for example."
 msgstr ""
 
-# type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:272
+#: en/basics.xml:103
 msgid "Testing a USB/HDD image with Qemu"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:275
+#: en/basics.xml:105
 #, no-wrap
-msgid ""
-"# apt-get install qemu\n"
-"$ qemu -hda binary.img"
+msgid "# apt-get install qemu $ qemu -hda binary.img"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:281
+#: en/basics.xml:109
 msgid "Testing an USB/HDD image with VMware Workstation"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:284
+#: en/basics.xml:110
 msgid "In order to test the USB/HDD image with VMware Workstation:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:288
+#: en/basics.xml:112
 msgid ""
 "Write the image to an usb stick. In VMware, click on Edit virtual machine "
 "settings in VM summary page. Then, add a new physical harddisk device and "
@@ -436,12 +420,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:292
+#: en/basics.xml:115
 msgid "Using the space left on a USB stick"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:295
+#: en/basics.xml:116
 msgid ""
 "If you want to use the remaining free space after you have installed the "
 "<filename>binary.img</filename>, you can use a partitioning tool such as "
@@ -450,13 +434,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:302
+#: en/basics.xml:118
 #, no-wrap
 msgid "# gparted ${USBSTICK}"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:306
+#: en/basics.xml:120
 msgid ""
 "After the creation of the partition you have to create a filsystem on it. "
 "One possible choice would be ext2 (ext3 isn't recommended because the "
@@ -464,37 +448,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:312
+#: en/basics.xml:122
 #, no-wrap
 msgid "# mkfs.ext2 ${USBSTICK}"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:316
+#: en/basics.xml:124
 msgid "If you want to use this data partition with Windows, use FAT32."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:320
+#: en/basics.xml:126
 #, no-wrap
 msgid "# mkfs.vfat -F 32"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:330
+#: en/basics.xml:131
 msgid ""
-"FIXME: Describe installing Debian Live to a partition (e.g. /dev/sdc1)  AND "
+"FIXME: Describe installing Debian Live to a partition (e.g. /dev/sdc1) AND "
 "using a bootloader to boot this."
 msgstr ""
 
-# type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: en/basics.xml:339
+#: en/basics.xml:135
 msgid "Building a netboot image"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:342
+#: en/basics.xml:136
 msgid ""
 "The following sequence of helper commands will create a basic netboot image "
 "containing the Debian standard system without X.org. It is suitable for "
@@ -502,14 +485,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:348
+#: en/basics.xml:137
 msgid ""
 "Note if you performed any previous examples, you will need to clean up your "
 "working directory with the <filename>lh clean</filename> helper command:"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:358
+#: en/basics.xml:141
 msgid ""
 "Run the <filename>lh config</filename> helper command with the parameters to "
 "configure the <filename>\"config/\"</filename> hierarchy to create our "
@@ -517,13 +500,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para><screen>
-#: en/basics.xml:364
+#: en/basics.xml:143
 #, no-wrap
 msgid "$ lh config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:368
+#: en/basics.xml:145
 msgid ""
 "In contrast with the ISO and USB hdd images, netbooting does not support "
 "serving a filesystem image with the client so the files must be served via "
@@ -533,12 +516,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:386
+#: en/basics.xml:150
 msgid ""
 "In a network boot the client runs a small piece of software, which usually "
-"resides on the <acronym>EEPROM</acronym> of the Ethernet card.  This program "
+"resides on the <acronym>EEPROM</acronym> of the Ethernet card. This program "
 "sends a <abbrev>DHCP</abbrev> request to get an <abbrev>IP</abbrev> address "
-"and information about what to do next.  Typically the next step is getting a "
+"and information about what to do next. Typically the next step is getting a "
 "higher level boot loader via the <abbrev>TFTP</abbrev> protocol. That could "
 "be <application>Grub</application>, <application>PXELINUX</application>, or "
 "even boot directly to an operating system like <application>Linux</"
@@ -546,7 +529,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:398
+#: en/basics.xml:151
 msgid ""
 "For example, if you unpack the generated <filename>binary-net.tar.gz</"
 "filename> archive in the <filename>/srv/debian-live</filename> directory, "
@@ -556,18 +539,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:407
+#: en/basics.xml:152
 msgid "We must now configure three services on the server to enable netboot:"
 msgstr ""
 
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:413
+#: en/basics.xml:155
 msgid "DHCP server"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:417
+#: en/basics.xml:157
 msgid ""
 "We must configure our network's DHCP server to be sure to give an "
 "<abbrev>IP</abbrev> address to the computer netbooting, and to advertise the "
@@ -575,7 +557,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:423
+#: en/basics.xml:158
 msgid ""
 "Here is an example for inspiration, written for the ISC DHCP server (package "
 "<literal>dhcp3-server</literal>) in the <filename>/etc/dhcp3/dhcpd.conf</"
@@ -583,72 +565,23 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:429
+#: en/basics.xml:160
 #, no-wrap
-msgid ""
-"# Options DHCP spécifiques à Pxelinux:\n"
-"option space pxelinux;\n"
-"option pxelinux.magic      code 208 = string;\n"
-"option pxelinux.configfile code 209 = text;\n"
-"option pxelinux.pathprefix code 210 = text;\n"
-"option pxelinux.reboottime code 211 = unsigned integer 32;\n"
-"\n"
-"\n"
-"subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
-"\n"
-"  # IP addresses available for guests\n"
-"  range 192.168.1.100 192.168.1.149;\n"
-"\n"
-"  # allow booting from the net\n"
-"  allow bootp;\n"
-"\n"
-"  # for net booting, server where the first file to be loaded (by TFTP\n"
-"  # protocol) (\"filename\" following definition) lies : so the TFTP\n"
-"  # server's name.\n"
-"  next-server myserver;\n"
-"\n"
-"  # net boot configuration for guests with a PXE client :\n"
-"  if substring (option vendor-class-identifier, 0, 9) = \"PXEClient\" {\n"
-"    # Note : all files for PXE are relatives to the TFTP server's root\n"
-"    # path, as usually defined in /etc/inetd.conf.\n"
-"\n"
-"    # PXE boot loader (first program to be loaded, by TFTP)\n"
-"    filename \"pxelinux.0\";\n"
-"\n"
-"    # describe some specific pxelinux's options through DHCP options :\n"
-"    site-option-space \"pxelinux\";\n"
-"    option pxelinux.magic f1:00:74:7e;\n"
-"    if exists dhcp-parameter-request-list {\n"
-"      # Always send the PXELINUX options (specified in hexadecimal)\n"
-"      option dhcp-parameter-request-list = concat(option dhcp-parameter-request-list,d0,d1,d2,d3);\n"
-"    }\n"
-"\n"
-"    # For a PXE boot menu, different versions are available : simple\n"
-"    # text, text with curses, graphic (VESA)\n"
-"    #option pxelinux.configfile \"pxelinux/config_simple\";\n"
-"    #option pxelinux.configfile \"pxelinux/config_curses\";\n"
-"    option pxelinux.configfile \"pxelinux/config_vesa\";\n"
-"\n"
-"    # automatically reboot after 10 minutes of no activity\n"
-"    option pxelinux.reboottime 600;\n"
-"  }\n"
-"}"
-msgstr ""
-
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
+msgid "# Options DHCP spécifiques à Pxelinux: option space pxelinux; option pxelinux.magic code 208 = string; option pxelinux.configfile code 209 = text; option pxelinux.pathprefix code 210 = text; option pxelinux.reboottime code 211 = unsigned integer 32; subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24 # IP addresses available for guests range 192.168.1.100 192.168.1.149; # allow booting from the net allow bootp; # for net booting, server where the first file to be loaded (by TFTP # protocol) (\"filename\" following definition) lies : so the TFTP # server's name. next-server myserver; # net boot configuration for guests with a PXE client : if substring (option vendor-class-identifier, 0, 9) = \"PXEClient\" { # Note : all files for PXE are relatives to the TFTP server's root # path, as usually defined in /etc/inetd.conf. # PXE boot loader (first program to be loaded, by TFTP) filename \"pxelinux.0\"; # describe some specific pxelinux's options through DHCP o
 ptions : site-option-space \"pxelinux\"; option pxelinux.magic f1:00:74:7e; if exists dhcp-parameter-request-list { # Always send the PXELINUX options (specified in hexadecimal) option dhcp-parameter-request-list = concat(option dhcp-parameter-request-list,d0,d1,d2,d3); } # For a PXE boot menu, different versions are available : simple # text, text with curses, graphic (VESA) #option pxelinux.configfile \"pxelinux/config_simple\"; #option pxelinux.configfile \"pxelinux/config_curses\"; option pxelinux.configfile \"pxelinux/config_vesa\"; # automatically reboot after 10 minutes of no activity option pxelinux.reboottime 600; } }"
+msgstr ""
+
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:481
+#: en/basics.xml:165
 msgid "TFTPd server"
 msgstr ""
 
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:485
+#: en/basics.xml:167
 msgid "This serves the kernel and initial ramdisk to the system at run-time."
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:489
+#: en/basics.xml:168
 msgid ""
 "You should install the <command>tftpd-hpa</command> package. It can serve "
 "all files contained inside a root directory, usually <filename>/var/lib/"
@@ -658,26 +591,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:498
+#: en/basics.xml:170
 #, no-wrap
-msgid "tftp           dgram   udp     wait    root  /usr/sbin/in.tftpd /usr/sbin/in.tftpd -s /srv/debian-live/tftpboot -r blksize -v -v"
+msgid "tftp dgram udp wait root /usr/sbin/in.tftpd /usr/sbin/in.tftpd -s /srv/debian-live/tftpboot -r blksize -v -v"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:502
+#: en/basics.xml:172
 msgid ""
 "and reload the super server with <command>/etc/init.d/openbsd-inetd reload</"
 "command>."
 msgstr ""
 
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:509
+#: en/basics.xml:176
 msgid "NFS server"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:513
+#: en/basics.xml:178
 msgid ""
 "Once the guest computer has downloaded and booted a Linux kernel and loaded "
 "its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -685,164 +617,134 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:519
+#: en/basics.xml:179
 msgid ""
 "You should install the <command>nfs-kernel-server</command> package -- "
 "<command>nfs-user-server</command> does not function correctly with netboot."
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:525
+#: en/basics.xml:180
 msgid ""
 "Then, make the filesystem image available through NFS by adding a line like "
 "the following to <filename>/etc/exports</filename>:"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:530
+#: en/basics.xml:182
 #, no-wrap
 msgid "/srv/debian-live *(ro,async,subtree_check,no_root_squash)"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:534
+#: en/basics.xml:184
 msgid ""
 "and tell the NFS server about this new export with the following command:"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:539
+#: en/basics.xml:186
 #, no-wrap
 msgid "# exportfs -rv"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:547
+#: en/basics.xml:191
 msgid ""
 "Setting up these three services can be a little tricky. You might need some "
 "patience to get all of them working together. The Debian Installer Manual's "
-"<ulink url=\"http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html\" "
-">TFTP Net Booting</ulink> section might help as that process is very similar."
+"<ulink url=\"http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html\">TFTP "
+"Net Booting</ulink> section might help as that process is very similar."
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: en/basics.xml:558
+#: en/basics.xml:194
 msgid "Netboot testing HowTo"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:561
+#: en/basics.xml:195
 msgid ""
 "Netboot image creation is made easy with live-helper magic, but testing the "
 "images on physical machines can be really time consuming."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:566
+#: en/basics.xml:196
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions:"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:573
+#: en/basics.xml:199
 msgid "VMWare Player"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:577
+#: en/basics.xml:201
 msgid "Install VMWare Player (\"free as in beer\" edition)"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:581
+#: en/basics.xml:202
 msgid ""
 "Create a PXETester directory, and create a text file called pxe.vwx inside"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:586
+#: en/basics.xml:203
 msgid "Paste this text inside:"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:590
+#: en/basics.xml:205
 #, no-wrap
-msgid ""
-"#!/usr/bin/vmware\n"
-"config.version = \"8\"\n"
-"virtualHW.version = \"4\"\n"
-"memsize = \"512\"\n"
-"MemAllowAutoScaleDown = \"FALSE\"\n"
-"\n"
-"ide0:0.present = \"FALSE\"\n"
-"ide1:0.present = \"FALSE\"\n"
-"floppy0.present = \"FALSE\"\n"
-"sound.present = \"FALSE\"\n"
-"tools.remindInstall = \"FALSE\"\n"
-"\n"
-"ethernet0.present = \"TRUE\"\n"
-"ethernet0.addressType = \"generated\"\n"
-"\n"
-"displayName = \"Test Boot PXE\"\n"
-"guestOS = \"other\"\n"
-"\n"
-"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\"\n"
-"uuid.location = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
-"uuid.bios = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
-"ethernet0.generatedAddressOffset = \"0\""
+msgid "#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = \"512\" MemAllowAutoScaleDown = \"FALSE\" ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = \"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\" ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\" displayName = \"Test Boot PXE\" guestOS = \"other\" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" ethernet0.generatedAddressOffset = \"0\""
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:615
+#: en/basics.xml:207
 msgid ""
 "You can play with this configuration file (i.e. change memory limit to 256)"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:620
+#: en/basics.xml:208
 msgid "Double click on this file (or run VMWare player and selecet this file)."
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:624
+#: en/basics.xml:209
 msgid "When running just press space if that strange question comes up..."
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:634
+#: en/basics.xml:215
 msgid "Qemu"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:638
+#: en/basics.xml:217
 msgid "Install qemu, bridge-utils, sudo."
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:642
+#: en/basics.xml:218
 msgid "Edit <filename>/etc/qemu-ifup</filename>:"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:646
+#: en/basics.xml:220
 #, no-wrap
-msgid ""
-"#!/bin/sh\n"
-"sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1\n"
-"echo \"Executing /etc/qemu-ifup\"\n"
-"echo \"Bringing up $1 for bridged mode...\"\n"
-"sudo /sbin/ifconfig $1 0.0.0.0 promisc up\n"
-"echo \"Adding $1 to br0...\"\n"
-"sudo /usr/sbin/brctl addif br0 $1\n"
-"sleep 2"
+msgid "#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo \"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" sudo /sbin/ifconfig $1 0.0.0.0 promisc up echo \"Adding $1 to br0...\" sudo /usr/sbin/brctl addif br0 $1 sleep 2"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:657
+#: en/basics.xml:222
 msgid "Get, or build a grub-floppy-netboot (in the svn)."
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:661
+#: en/basics.xml:223
 msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
 msgstr ""
diff --git a/manual/po/de/binary.xml.po b/manual/po/de/binary.xml.po
deleted file mode 100644
index 4d86260..0000000
--- a/manual/po/de/binary.xml.po
+++ /dev/null
@@ -1,99 +0,0 @@
-# German translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2010-06-06 12:07+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. type: Content of: <sect1><title>
-#: en/chapters/customization/binary.xml:7
-msgid "Customising the binary image"
-msgstr ""
-
-#. type: Content of: <sect1><para>
-#: en/chapters/customization/binary.xml:9
-msgid "This chapter discusses FIXME"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/binary.xml:12
-msgid "ISO metadata"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/binary.xml:14
-msgid ""
-"When creating an ISO9660 binary image, you can use the following options to "
-"add various textual metadata for your image. This can help you easily "
-"identify the version or configuration of an image without booting it."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/customization/binary.xml:19
-msgid ""
-"<command>LH_ISO_APPLICATION</command> / <command>--iso-application "
-"<replaceable>NAME</replaceable></command>"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/binary.xml:22
-msgid ""
-"This should describe the application that will be on the image. The maximum "
-"length for this field is 128 characters."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/customization/binary.xml:27
-msgid ""
-"<command>LH_ISO_PREPARER</command> / <command>--iso-preparer "
-"<replaceable>NAME</replaceable></command>"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/binary.xml:30
-msgid ""
-"This should describe the preparer of the image, usually with some contact "
-"details. The default for this option is the &live-helper; version you are "
-"using, which may help with debugging later. The maximum length for this "
-"field is 128 characters."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/customization/binary.xml:35
-msgid ""
-"<command>LH_ISO_PUBLISHER</command> / <command>--iso-publisher "
-"<replaceable>NAME</replaceable></command>"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/binary.xml:38
-msgid ""
-"This should describe the publisher of the image, usually with some contact "
-"details. The maximum length for this field is 128 characters."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/customization/binary.xml:43
-msgid ""
-"<command>LH_ISO_VOLUME</command> / <command>--iso-volume <replaceable>NAME</"
-"replaceable></command>"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/binary.xml:46
-msgid ""
-"This should specify the volume ID of the image. This is used as a user-"
-"visible label on some platforms such as Windows and Apple Mac OS. The "
-"maximum length for this field is 32 characters."
-msgstr ""
diff --git a/manual/po/de/bootup.xml.po b/manual/po/de/bootup.xml.po
deleted file mode 100644
index bd24f36..0000000
--- a/manual/po/de/bootup.xml.po
+++ /dev/null
@@ -1,180 +0,0 @@
-# German translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2010-06-06 12:07+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/live-environment.xml:11 en/chapters/resources.xml:11
-#: en/chapters/success-stories.xml:11 en/chapters/about/manual.xml:125
-#: en/chapters/customization/bootup.xml:11
-#: en/chapters/customization/bootup.xml:20
-#: en/chapters/customization/bootup.xml:26
-#: en/chapters/customization/bootup.xml:38
-#: en/chapters/customization/bootup.xml:85
-#: en/chapters/customization/bootup.xml:92
-#: en/chapters/customization/bootup.xml:99
-#: en/chapters/customization/bootup.xml:106
-#: en/chapters/customization/packages.xml:36
-#: en/chapters/customization/packages.xml:306
-#: en/chapters/customization/packages.xml:326
-#: en/chapters/customization/packages.xml:384
-#: en/chapters/customization/packages.xml:492
-#: en/chapters/customization/packages.xml:535
-msgid "FIXME"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/about/manual.xml:121 en/chapters/customization/bootup.xml:104
-msgid "Cheat codes"
-msgstr ""
-
-#. type: Content of: <sect1><title>
-#: en/chapters/customization/bootup.xml:7
-msgid "Customising the bootup process"
-msgstr ""
-
-#. type: Content of: <sect1><para>
-#: en/chapters/customization/bootup.xml:9
-msgid ""
-"This chapter discusses customisation of bootup process of a live system, "
-"including kernel options, modifications to the bootloader, \"splash\" "
-"screens and startup scripts."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/bootup.xml:14
-msgid "Kernel"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/bootup.xml:18
-msgid "Bootloaders"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/bootup.xml:24
-msgid "Choosing a bootloader"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/bootup.xml:31
-msgid "Syslinux"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/bootup.xml:32
-msgid ""
-"In the default configuration, Syslinux will pause indefinitely at its splash "
-"screen. To adjust this, modify the <command>LH_SYSLINUX_TIMEOUT</command> "
-"value or pass <command>--syslinux-timeout <replaceable>TIMEOUT</"
-"replaceable></command> to <filename>lh_config</filename>. The value is "
-"specified in units of 1/10s and the maximum possible timeout is 35996. A "
-"timeout of 0 (zero) disables the timeout completely. For more information "
-"please see syslinux(1)."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/bootup.xml:36
-msgid "Bootloader templates"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/bootup.xml:43
-msgid "Booting a Debian Live USB/HDD system from a USB stick with Grub"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/bootup.xml:45
-msgid ""
-"Suppose you've built your Debian Live USB/HDD image, but want to install it "
-"on an already used USB stick with ext2/3 partition and Grub bootloader:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/chapters/customization/bootup.xml:55
-#, no-wrap
-msgid ""
-"# mkdir /media/myUsb/boot/live/\n"
-"# cp binary/vmlinuz1 binary/initrd1.img binary/live/filesystem.squashfs /media/myUsb/boot/live/\n"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/bootup.xml:50
-msgid ""
-"First, copy live components in a directory on your key: the Linux kernel "
-"(<filename>vmlinuz*</filename>), its Initial RAM disk (<filename>initrd*</"
-"filename>) and the system (<filename>filesystem.squashfs</filename>): "
-"<placeholder type=\"screen\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/chapters/customization/bootup.xml:63
-#, no-wrap
-msgid ""
-"echo &gt;&gt;/media/myUsb/boot/grub/menu.lst  &lt;&lt;EOF\n"
-"\n"
-"title           my Debian Live\n"
-"root            (hd0,1)    # my Ext2 partition is the second on this stick\n"
-"kernel          /boot/live/vmlinuz1 boot=live vga=791 persistent union=aufs live-media-path=boot/live\n"
-"initrd          /boot/live/initrd1.img\n"
-"\n"
-"EOF\n"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/bootup.xml:60
-msgid ""
-"Then, add a stanza in Grub's menu definition to boot up this system: "
-"<placeholder type=\"screen\" id=\"0\"/> The important kernel command line "
-"option to add here is"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para><variablename>
-#: en/chapters/customization/bootup.xml:73
-msgid "live-media-path"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/bootup.xml:73
-msgid ""
-", which tells to Live initrd's script in which subdirectory to look for the "
-"SquashFS image."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/bootup.xml:77
-msgid "Next, umount your USB stick and reboot on it. That's all!"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/bootup.xml:83
-msgid "Splash screens"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/bootup.xml:90
-msgid "Memtest"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/bootup.xml:97
-msgid "Startup scripts"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/bootup.xml:109
-msgid "Checksums."
-msgstr ""
diff --git a/manual/po/de/coding-style.xml.po b/manual/po/de/coding-style.xml.po
index d89ad29..b390d81 100644
--- a/manual/po/de/coding-style.xml.po
+++ b/manual/po/de/coding-style.xml.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2010-06-06 12:07+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"PO-Revision-Date: 2010-06-06 17:46+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
@@ -17,120 +17,92 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Content of: <chapter><title>
-#: en/chapters/coding-style.xml:7
+#: en/coding-style.xml:6
 msgid "Coding Style"
 msgstr ""
 
 #. type: Content of: <chapter><para>
-#: en/chapters/coding-style.xml:9
+#: en/coding-style.xml:7
 msgid ""
 "This chapter documents the coding style used in &live-helper; and (ideally) "
 "in &live-initramfs;."
 msgstr ""
 
 #. type: Content of: <chapter><sect1><title>
-#: en/chapters/coding-style.xml:12
+#: en/coding-style.xml:9
 msgid "Compatibility"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><title>
-#: en/chapters/coding-style.xml:22
+#: en/coding-style.xml:17
 msgid "Indenting"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><title>
-#: en/chapters/coding-style.xml:31
+#: en/coding-style.xml:23
 msgid "Wrapping"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/coding-style.xml:41
+#: en/coding-style.xml:26
 #, no-wrap
-msgid ""
-"if foo; then\n"
-"\tbar\n"
-"fi\n"
+msgid " if foo; then bar fi "
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/chapters/coding-style.xml:38 en/chapters/coding-style.xml:59
-#: en/chapters/coding-style.xml:92 en/chapters/coding-style.xml:108
+#: en/coding-style.xml:26 en/coding-style.xml:27 en/coding-style.xml:39
+#: en/coding-style.xml:40
 msgid "Bad: <placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/coding-style.xml:50
+#: en/coding-style.xml:26
 #, no-wrap
-msgid ""
-"if foo\n"
-"then\n"
-"\tbar\n"
-"fi\n"
+msgid " if foo then bar fi "
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/chapters/coding-style.xml:47 en/chapters/coding-style.xml:67
-#: en/chapters/coding-style.xml:98 en/chapters/coding-style.xml:117
+#: en/coding-style.xml:26 en/coding-style.xml:27 en/coding-style.xml:39
+#: en/coding-style.xml:40
 msgid "Good: <placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/coding-style.xml:62
-#, no-wrap
-msgid ""
-"foo () {\n"
-"\tbar\n"
-"}\n"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/coding-style.xml:70
+#: en/coding-style.xml:27
 #, no-wrap
-msgid ""
-"foo ()\n"
-"{\n"
-"\tbar\n"
-"}\n"
+msgid " foo () { bar } "
 msgstr ""
 
 #. type: Content of: <chapter><sect1><title>
-#: en/chapters/coding-style.xml:81
+#: en/coding-style.xml:31
 msgid "Variables"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/coding-style.xml:95
+#: en/coding-style.xml:39
 #, no-wrap
-msgid "FOO=bar\n"
+msgid " FOO=bar "
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/coding-style.xml:101
+#: en/coding-style.xml:39
 #, no-wrap
-msgid "FOO=\"bar\"\n"
+msgid " FOO=\"bar\" "
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/coding-style.xml:111
+#: en/coding-style.xml:40
 #, no-wrap
-msgid ""
-"if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
-"then\n"
-"\tfoobar\n"
-"fi\n"
+msgid " if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ] then foobar fi "
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/coding-style.xml:120
+#: en/coding-style.xml:40
 #, no-wrap
-msgid ""
-"if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
-"then\n"
-"\tfoobar\n"
-"fi\n"
+msgid " if [ -f \"${FOO}/foo/${BAR}/bar\" ] then foobar fi "
 msgstr ""
 
 #. type: Content of: <chapter><sect1><title>
-#: en/chapters/coding-style.xml:131
+#: en/coding-style.xml:44
 msgid "Miscellaneous"
 msgstr ""
diff --git a/manual/po/de/common-tasks.xml.po b/manual/po/de/common-tasks.xml.po
index 9f82ebf..6e03fae 100644
--- a/manual/po/de/common-tasks.xml.po
+++ b/manual/po/de/common-tasks.xml.po
@@ -1,36 +1,33 @@
-# German translations for Debconf package
-# Copyright (C) 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the Debconf package.
-# Automatically generated, 2008.
+# German translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Debconf 8\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2008-08-09 16:50+0300\n"
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"PO-Revision-Date: 2010-06-06 17:46+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: \n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-# type: Content of: <chapter><title>
 #. type: Content of: <chapter><title>
-#: en/chapters/common-tasks.xml:7
+#: en/common-tasks.xml:6
 msgid "Common tasks"
 msgstr ""
 
-# type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: en/chapters/common-tasks.xml:10
+#: en/common-tasks.xml:8
 msgid "The Debian Installer"
 msgstr ""
 
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: en/chapters/common-tasks.xml:12
+#: en/common-tasks.xml:9
 msgid ""
 "Although Debian Live is mostly concerned with avoiding permanent "
 "installation, integrating some form of installer to your image is possible. "
@@ -38,15 +35,13 @@ msgid ""
 "how to install the image."
 msgstr ""
 
-# type: Content of: <chapter><section><note><title>
 #. type: Content of: <chapter><section><note><title>
-#: en/chapters/common-tasks.xml:17
+#: en/common-tasks.xml:11
 msgid "The \"Debian Installer\""
 msgstr ""
 
-# type: Content of: <chapter><section><note><para>
 #. type: Content of: <chapter><section><note><para>
-#: en/chapters/common-tasks.xml:20
+#: en/common-tasks.xml:12
 msgid ""
 "Please note the careful use of capital letters when referring to the "
 "\"Debian Installer\" in this section - when used like this we refer "
@@ -54,21 +49,18 @@ msgid ""
 "else. It is often seen abbreviated to \"d-i\"."
 msgstr ""
 
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: en/chapters/common-tasks.xml:24
+#: en/common-tasks.xml:14
 msgid "The three main types of installer are:"
 msgstr ""
 
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/chapters/common-tasks.xml:29
+#: en/common-tasks.xml:17
 msgid "\"Normal\" Debian Installer"
 msgstr ""
 
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/chapters/common-tasks.xml:33
+#: en/common-tasks.xml:19
 msgid ""
 "This is a normal Debian Live image with a seperate kernel and initrd which "
 "(when selected from the appropriate bootloader) launches into a standard "
@@ -77,7 +69,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/chapters/common-tasks.xml:36
+#: en/common-tasks.xml:20
 msgid ""
 "This means that Debian is installed by fetching and installing <command>."
 "deb</command> packages using <filename>debootstrap</filename> or "
@@ -86,33 +78,29 @@ msgid ""
 "disk."
 msgstr ""
 
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/chapters/common-tasks.xml:39
+#: en/common-tasks.xml:21
 msgid ""
 "This whole process can be preseeded and customised in a number of ways; see "
 "the relevant \"DebianInstaller\" wiki page and installation guide for more. "
 "This is operational now withing &live-helper;."
 msgstr ""
 
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/chapters/common-tasks.xml:45
+#: en/common-tasks.xml:25
 msgid "\"Live\" Debian Installer"
 msgstr ""
 
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/chapters/common-tasks.xml:49
+#: en/common-tasks.xml:27
 msgid ""
 "This is a Debian Live image with a seperate kernel and initrd which (when "
 "selected from the appropriate bootloader) launches into an instance of the "
 "Debian Installer."
 msgstr ""
 
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/chapters/common-tasks.xml:52
+#: en/common-tasks.xml:28
 msgid ""
 "Installation will proceed in an identical fashion to the \"Normal\" "
 "installation described above, but at the actual package installation stage, "
@@ -122,80 +110,67 @@ msgid ""
 "items such as bootloaders and local users, etc."
 msgstr ""
 
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/chapters/common-tasks.xml:55
+#: en/common-tasks.xml:29
 msgid "This is working now."
 msgstr ""
 
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/chapters/common-tasks.xml:61
+#: en/common-tasks.xml:33
 msgid "\"Ubuntu\"-style installer"
 msgstr ""
 
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/chapters/common-tasks.xml:65
+#: en/common-tasks.xml:35
 msgid ""
 "This is where you boot into a graphical Debian Live system and run a wizard-"
 "based program which installs and configures the live system, all the time "
 "remaining inside the live graphical environment."
 msgstr ""
 
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/chapters/common-tasks.xml:68
+#: en/common-tasks.xml:36
 msgid "This is currently NOT possible with Debian Live."
 msgstr ""
 
 #. type: Content of: <chapter><section><para><screen>
-#: en/chapters/common-tasks.xml:78
+#: en/common-tasks.xml:40
 #, no-wrap
-msgid ""
-"$ lh_config --help\n"
-"  ...\n"
-"  [--debian-installer enabled|cdrom|netinst|netboot|businesscard|live|disabled]\n"
-"  [--debian-installer-distribution CODENAME|daily]\n"
-"  [--debian-installer-preseedfile FILE|URL]\n"
-"  ...\n"
-" "
+msgid " $ lh_config --help ... [--debian-installer enabled|cdrom|netinst|netboot|businesscard|live|disabled] [--debian-installer-distribution CODENAME|daily] [--debian-installer-preseedfile FILE|URL] ... "
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/common-tasks.xml:76
+#: en/common-tasks.xml:40
 msgid ""
 "By default, no installer will be included in the Debian Live image. You can "
 "enable it by using <filename>lh_config</filename> : <placeholder type="
 "\"screen\" id=\"0\"/>"
 msgstr ""
 
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: en/chapters/common-tasks.xml:89
+#: en/common-tasks.xml:41
 msgid "The values \"Normal\", \"Live\" and \"Ubuntu\" are not valid values for"
 msgstr ""
 
-# type: Content of: <chapter><section><para><term>
 #. type: Content of: <chapter><section><para><term>
-#: en/chapters/common-tasks.xml:89
+#: en/common-tasks.xml:41
 msgid "LH_BINARY_DEBIAN_INSTALLER"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/common-tasks.xml:89
+#: en/common-tasks.xml:41
 msgid ""
 ". Refer to the output of <filename>lh_config</filename> cited above to "
 "choose the appropriate values."
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: en/chapters/common-tasks.xml:94
+#: en/common-tasks.xml:44
 msgid "WiFi Connection"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/common-tasks.xml:96
+#: en/common-tasks.xml:45
 msgid ""
 "Depending on the Debian Live image you are using and the given tools "
 "configured with your Debian Live image you may need to only attach to an "
diff --git a/manual/po/de/configuration-files.xml.po b/manual/po/de/configuration-files.xml.po
deleted file mode 100644
index 009eaac..0000000
--- a/manual/po/de/configuration-files.xml.po
+++ /dev/null
@@ -1,1232 +0,0 @@
-# German translations for Debconf package
-# Copyright (C) 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the Debconf package.
-# Automatically generated, 2008.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Debconf 8\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2008-08-09 16:50+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-# type: Content of: <appendix><title>
-#. type: Content of: <appendix><title>
-#: en/appendices/configuration-files.xml:8
-msgid "Configuration files"
-msgstr ""
-
-# type: Content of: <appendix><section><title>
-#. type: Content of: <appendix><section><title>
-#: en/appendices/configuration-files.xml:11
-msgid "The <filename>config/binary</filename> file"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:15
-msgid "LH_BINARY_FILESYSTEM"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:16
-msgid "Set image filesystem. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:20
-msgid "LH_BINARY_IMAGES"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:21
-#: en/appendices/configuration-files.xml:512
-msgid "Set image type. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:25
-msgid "LH_BINARY_INDICES"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:26
-msgid ""
-"Set apt/aptitude generic indices. (See <xref linkend=\"configuration-layout"
-"\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:30
-msgid "LH_BOOTAPPEND_LIVE"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:31
-#: en/appendices/configuration-files.xml:36
-msgid "Set boot parameters. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:35
-msgid "LH_BOOTAPPEND_INSTALL"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:40
-msgid "LH_BOOTLOADER"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:41
-msgid "Set bootloader. (See <xref linkend=\"bootloaders\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:45
-msgid "LH_CHECKSUMS"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:46
-msgid "Set checksums. (See <xref linkend=\"cheat-codes\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:50
-msgid "LH_CHROOT_BUILD"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:51
-msgid ""
-"Control if we build binary images chrooted. (See <xref linkend="
-"\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:55
-msgid "LH_DEBIAN_INSTALLER"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:56
-msgid "Set debian-installer. (See <xref linkend=\"debian-installer\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:60
-msgid "LH_DEBIAN_INSTALLER_DAILY"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:61
-msgid "Set daily images. (See <xref linkend=\"debian-installer\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:65
-msgid "LH_ENCRYPTION"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:66
-msgid "Set encrytion. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:70
-msgid "LH_GRUB_SPLASH"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:71
-msgid "Set custom grub splash. (See <xref linkend=\"splash\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:75
-msgid "LH_HOSTNAME"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:76
-msgid "Set hostname. (See <xref linkend=\"hostname\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:80
-msgid "LH_ISO_APPLICATION"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:81
-msgid "Set iso author. (See <xref linkend=\"iso-metadata\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:85
-msgid "LH_ISO_PREPARER"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:86
-msgid "Set iso preparer. (See <xref linkend=\"iso-metadata\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:90
-msgid "LH_ISO_PUBLISHER"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:91
-msgid "Set iso publisher. (See <xref linkend=\"iso-metadata\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:95
-msgid "LH_ISO_VOLUME"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:96
-msgid "Set iso volume (max 32 chars). (See <xref linkend=\"iso-metadata\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:100
-msgid "LH_JFFS2_ERASEBLOCK"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:101
-msgid ""
-"Set jffs2 eraseblock size. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:105
-msgid "LH_MEMTEST"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:106
-msgid "Set memtest. (See <xref linkend=\"memtest\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:110
-msgid "LH_NET_ROOT_FILESYSTEM"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:111
-msgid "Set netboot filesystem. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:115
-msgid "LH_NET_ROOT_MOUNTOPTIONS"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:116
-msgid "Set nfsopts. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:120
-msgid "LH_NET_ROOT_PATH"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:121
-msgid ""
-"Set netboot server directory. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:125
-msgid "LH_NET_ROOT_SERVER"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:126
-msgid ""
-"Set netboot server address. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:130
-msgid "LH_NET_COW_FILESYSTEM"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:131
-msgid ""
-"Set net client cow filesystem. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:135
-msgid "LH_NET_COW_MOUNTOPTIONS"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:136
-msgid "Set cow mount options. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:140
-msgid "LH_NET_COW_PATH"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:141
-msgid "Set cow directory. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:145
-msgid "LH_NET_COW_SERVER"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:146
-msgid "Set cow server. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:150
-msgid "LH_NET_TARBALL"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:151
-msgid "Set net tarball. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:155
-msgid "LH_SYSLINUX_SPLASH"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:156
-msgid "Set custom syslinux splash. (See <xref linkend=\"splash\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:160
-msgid "LH_SYSLINUX_TIMEOUT"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:161
-msgid ""
-"Set custom syslinux timeout in seconds. (See <xref linkend=\"syslinux\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:165
-msgid "LH_SYSLINUX_CFG"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:166
-msgid ""
-"Set custom syslinux configuration file. (See <xref linkend=\"syslinux\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:170
-msgid "LH_SYSLINUX_MENU"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:171
-msgid "Set syslinux menu. (See <xref linkend=\"syslinux\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:175
-msgid "LH_SYSLINUX_MENU_LIVE_ENTRY"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:176
-msgid ""
-"Set text to be used on the menu for live entries. (See <xref linkend="
-"\"syslinux\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:180
-msgid "LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:181
-msgid ""
-"Set text to be used on the menu for live entries (failsafe ones). (See <xref "
-"linkend=\"syslinux\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:185
-msgid "LH_SYSLINUX_MENU_MEMTEST_ENTRY"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:186
-msgid ""
-"Set text to be used on the menu for memtest entry. (See <xref linkend="
-"\"syslinux\"/> and <xref linkend=\"memtest\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:190
-msgid "LH_USERNAME"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:191
-msgid "Set username. (See <xref linkend=\"live-user\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><title>
-#. type: Content of: <appendix><section><title>
-#: en/appendices/configuration-files.xml:198
-msgid "The <filename>config/bootstrap</filename> file"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:202
-msgid "LH_ARCHITECTURE"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:203
-msgid ""
-"Select chroot architecture. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:207
-msgid "LH_BOOTSTRAP_CONFIG"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:208
-msgid ""
-"Set distribution config directory. (See <xref linkend=\"configuration-layout"
-"\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:212
-msgid "LH_BOOTSTRAP_INCLUDE"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:213
-msgid ""
-"Include packages on base. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:217
-msgid "LH_BOOTSTRAP_EXCLUDE"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:218
-msgid ""
-"Exclude packages on base. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:222
-msgid "LH_BOOTSTRAP_FLAVOUR"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:223
-msgid "Select flavour to use. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:227
-msgid "LH_BOOTSTRAP_KEYRING"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:228
-msgid ""
-"Set distribution keyring. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:232
-msgid "LH_DISTRIBUTION"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:233
-msgid ""
-"Select distribution to use. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:237
-msgid "LH_MIRROR_BOOTSTRAP"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:238
-msgid "Set mirror to bootstrap from. (See <xref linkend=\"package-sources\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:242
-msgid "LH_MIRROR_CHROOT"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:243
-msgid ""
-"Set mirror to fetch packages from. (See <xref linkend=\"package-sources\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:247
-msgid "LH_MIRROR_CHROOT_SECURITY"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:248
-msgid ""
-"Set security mirror to fetch packages from. (See <xref linkend=\"package-"
-"sources\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:252
-msgid "LH_MIRROR_BINARY"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:253
-msgid ""
-"Set mirror which ends up in the image. (See <xref linkend=\"package-sources"
-"\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:257
-msgid "LH_MIRROR_BINARY_SECURITY"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:258
-msgid ""
-"Set security mirror which ends up in the image. (See <xref linkend=\"package-"
-"sources\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:262
-msgid "LH_SECTIONS"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:263
-msgid "select section(s) to use. (See <xref linkend=\"package-sources\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><title>
-#. type: Content of: <appendix><section><title>
-#: en/appendices/configuration-files.xml:269
-msgid "The <filename>config/chroot</filename> file"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:273
-msgid "LH_CHROOT_FILESYSTEM"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:274
-msgid "Set chroot filesystem. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:278
-msgid "LH_UNION_FILESYSTEM"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:279
-msgid "Set union filesystem. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:283
-msgid "LH_EXPOSED_ROOT"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:284
-msgid ""
-"expose root as read only. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:288
-msgid "LH_HOOKS"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:289
-msgid "Set hook commands. (See <xref linkend=\"hooks\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:293
-msgid "LH_INTERACTIVE"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:294
-msgid "Set interactive build. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:298
-msgid "LH_KEYRING_PACKAGES"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:299
-msgid "Set keyring packages. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:303
-msgid "LH_LANGUAGE"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:304
-msgid "Set language to use. (See <xref linkend=\"language\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:308
-msgid "LH_LINUX_FLAVOURS"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:309
-msgid "Set kernel flavour to use. (See <xref linkend=\"kernel\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:313
-msgid "LH_LINUX_PACKAGES"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:314
-msgid "Set kernel packages to use. (See <xref linkend=\"kernel\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:318
-msgid "LH_PACKAGES"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:319
-msgid "Set packages to install. (See <xref linkend=\"lh-packages\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:323
-msgid "LH_PACKAGES_LISTS"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:324
-msgid "Set package list to install. (See <xref linkend=\"package-lists\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:328
-msgid "LH_TASKS"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:329
-msgid "Set tasks to install. (See <xref linkend=\"tasks\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:333
-msgid "LH_SECURITY"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:334
-msgid "enable security updates. (See <xref linkend=\"package-sources\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:338
-msgid "LH_SYMLINKS"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:339
-msgid "enable symlink convertion. (See <xref linkend=\"symlinks\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:343
-msgid "LH_SYSVINIT"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:344
-msgid "enable sysvinit. (See <xref linkend=\"startup-scripts\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><title>
-#. type: Content of: <appendix><section><title>
-#: en/appendices/configuration-files.xml:351
-msgid "The <filename>config/common</filename> file"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:355
-msgid "LH_APT"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:356
-msgid "Set package manager. (See <xref linkend=\"package-installation\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:360
-msgid "LH_APT_FTP_PROXY"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:361
-msgid ""
-"Set apt/aptitude ftp proxy. (See <xref linkend=\"package-installation\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:365
-msgid "LH_APT_HTTP_PROXY"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:366
-msgid ""
-"Set apt/aptitude http proxy. (See <xref linkend=\"package-installation\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:370
-msgid "LH_APT_PDIFFS"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:371
-msgid ""
-"Set apt/aptitude pdiff indices. (See <xref linkend=\"package-installation\"/"
-">)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:375
-msgid "LH_APT_PIPELINE"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:376
-msgid ""
-"Set apt/aptitude pipeline depth. (See <xref linkend=\"package-installation\"/"
-">)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:380
-msgid "LH_APT_RECOMMENDS"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:381
-msgid ""
-"Set apt/aptitude recommends. (See <xref linkend=\"package-installation\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:385
-msgid "LH_APT_SECURE"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:386
-msgid ""
-"Set apt/aptitude security. (See <xref linkend=\"package-installation\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:390
-msgid "LH_BOOTSTRAP"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:391
-msgid "Set bootstrap program. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:395
-msgid "LH_CACHE"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:396
-msgid "control cache. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:400
-msgid "LH_CACHE_INDICES"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:401
-msgid ""
-"control if downloaded package indices should be cached. (See <xref linkend="
-"\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:405
-msgid "LH_CACHE_PACKAGES"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:406
-msgid ""
-"control if downloaded packages files should be cached. (See <xref linkend="
-"\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:410
-msgid "LH_CACHE_STAGES"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:411
-msgid ""
-"control if completed stages should be cached. (See <xref linkend="
-"\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:415
-msgid "LH_DEBCONF_FRONTEND"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:416
-msgid ""
-"Set debconf(1) frontend to use. (See <xref linkend=\"configuration-layout\"/"
-">)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:420
-msgid "LH_DEBCONF_NOWARNINGS"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:421
-msgid "Set debconf(1) warnings. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:425
-msgid "LH_DEBCONF_PRIORITY"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:426
-msgid ""
-"Set debconf(1) priority to use. (See <xref linkend=\"configuration-layout\"/"
-">)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:430
-msgid "LH_INITRAMFS"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:431
-msgid "Set initramfs hook. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:435
-msgid "LH_FDISK"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:436
-msgid "Set fdisk program. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:440
-msgid "LH_LOSETUP"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:441
-msgid "Set losetup program. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:445
-msgid "LH_MODE"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:446
-msgid "Set distribution mode. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:450
-msgid "LH_ROOT_COMMAND"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:451
-msgid "use sudo or equivalent. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:455
-msgid "LH_USE_FAKEROOT"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:456
-msgid "use fakeroot/fakechroot. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:460
-msgid "LH_TASKSEL"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:461
-msgid "Set tasksel program. (See <xref linkend=\"tasks\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:465
-msgid "LH_INCLUDES"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:466
-msgid "Set includes. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:470
-msgid "LH_TEMPLATES"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:471
-msgid "Set templates. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:475
-msgid "LH_BREAKPOINTS"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:476
-msgid "enable breakpoints. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:480
-msgid "LH_DEBUG"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:481
-msgid "enable debug. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:485
-msgid "LH_FORCE"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:486
-msgid "enable force. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:490
-msgid "LH_QUIET"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:491
-msgid "enable quiet. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:495
-msgid "LH_VERBOSE"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:496
-msgid "enable verbose. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><title>
-#. type: Content of: <appendix><section><title>
-#: en/appendices/configuration-files.xml:502
-msgid "The <filename>config/source</filename> file"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:506
-msgid "LH_SOURCE"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-files.xml:507
-msgid "Set source option. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices/configuration-files.xml:511
-msgid "LH_SOURCE_IMAGES"
-msgstr ""
diff --git a/manual/po/de/configuration-layout.xml.po b/manual/po/de/configuration-layout.xml.po
deleted file mode 100644
index 848125b..0000000
--- a/manual/po/de/configuration-layout.xml.po
+++ /dev/null
@@ -1,276 +0,0 @@
-# German translations for Debconf package
-# Copyright (C) 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the Debconf package.
-# Automatically generated, 2008.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Debconf 8\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2008-08-09 16:50+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-# type: Content of: <appendix><title>
-#. type: Content of: <appendix><title>
-#: en/appendices/configuration-layout.xml:8
-msgid "Configuration layout"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><title>
-#. type: Content of: <appendix><variablelist><title>
-#: en/appendices/configuration-layout.xml:11
-msgid ""
-"Layout of the <filename class=\"directory\">config/</filename> directory"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:14
-msgid "<filename class=\"directory\">binary_debian-installer/</filename>"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:15
-#: en/appendices/configuration-layout.xml:23
-#: en/appendices/configuration-layout.xml:39
-msgid "(see <xref linkend=\"debian-installer\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:18
-msgid "<filename class=\"directory\">binary_grub/</filename>"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:19
-#: en/appendices/configuration-layout.xml:47
-#: en/appendices/configuration-layout.xml:79
-#: en/appendices/configuration-layout.xml:83
-msgid "(see <xref linkend=\"bootloaders\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:22
-msgid "<filename class=\"directory\">binary_local-debs/</filename>"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:26
-msgid "<filename class=\"directory\">binary_local-hooks/</filename>"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:27
-msgid "(see <xref linkend=\"binary-local-hooks\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:30
-msgid "<filename class=\"directory\">binary_local-includes/</filename>"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:31
-msgid "(see <xref linkend=\"binary-includes\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:34
-msgid "<filename class=\"directory\">binary_local-packageslists/</filename>"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:35
-#: en/appendices/configuration-layout.xml:43
-msgid "(see <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:38
-msgid "<filename class=\"directory\">binary_local-udebs/</filename>"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:42
-msgid "<filename class=\"directory\">binary_rootfs/</filename>"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:46
-msgid "<filename class=\"directory\">binary_syslinux/</filename>"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:50
-msgid "<filename class=\"directory\">chroot_apt/</filename>"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:51
-msgid "(see <xref linkend=\"custom-packages-apt\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:54
-msgid "<filename class=\"directory\">chroot_local-hooks/</filename>"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:55
-msgid "(see <xref linkend=\"chroot-local-hooks\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:58
-msgid "<filename class=\"directory\">chroot_local-includes/</filename>"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:59
-msgid "(see <xref linkend=\"chroot-local-includes\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:62
-msgid "<filename class=\"directory\">chroot_local-packages/</filename>"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:63
-msgid "(see <xref linkend=\"local-packages\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:66
-msgid "<filename class=\"directory\">chroot_local-packageslists/</filename>"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:67
-msgid "(see <xref linkend=\"package-lists\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:70
-msgid "<filename class=\"directory\">chroot_local-presed/</filename>"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:71
-msgid "(see <xref linkend=\"debconf-preseed\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:74
-msgid "<filename class=\"directory\">chroot_sources/</filename>"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:75
-msgid "(see <xref linkend=\"custom-apt-repo\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:78
-msgid "<filename class=\"directory\">includes/</filename>"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:82
-msgid "<filename class=\"directory\">templates/</filename>"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:87
-msgid "<filename>bootstrap</filename>"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:88
-msgid "(see <xref linkend=\"config-bootstrap\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:91
-msgid "<filename>binary</filename>"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:92
-msgid "(see <xref linkend=\"config-binary\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:95
-msgid "<filename>chroot</filename>"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:96
-msgid "(see <xref linkend=\"config-chroot\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:99
-msgid "<filename>common</filename>"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:100
-msgid "(see <xref linkend=\"config-common\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices/configuration-layout.xml:103
-msgid "<filename>source</filename>"
-msgstr ""
-
-# type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices/configuration-layout.xml:104
-msgid "(see <xref linkend=\"config-source\"/>)"
-msgstr ""
diff --git a/manual/po/de/contents.xml.po b/manual/po/de/contents.xml.po
deleted file mode 100644
index ccdfc20..0000000
--- a/manual/po/de/contents.xml.po
+++ /dev/null
@@ -1,206 +0,0 @@
-# German translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2010-06-06 12:07+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. type: Content of: <sect1><title>
-#: en/chapters/customization/contents.xml:7
-msgid "Customising contents"
-msgstr ""
-
-#. type: Content of: <sect1><para>
-#: en/chapters/customization/contents.xml:9
-msgid "This chapter discusses further customisation of the live system."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/contents.xml:12
-msgid "Includes"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/contents.xml:14
-msgid ""
-"Using includes, it is possible to add (or replace) arbitrary files in your "
-"Debian Live image. &live-helper; provides three mechanisms for using them:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/customization/contents.xml:19
-msgid "Chroot local includes"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/contents.xml:23
-msgid ""
-"These allow you to add or replace files to the chroot/Live filesystem. "
-"Please see <xref linkend=\"chroot-local-includes\"/> for more information."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/contents.xml:29
-#: en/chapters/customization/contents.xml:89
-msgid "Binary local includes"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/contents.xml:33
-msgid ""
-"These allow you to add or replace files in the binary image. Please see "
-"<xref linkend=\"binary-local-includes\"/> for more information."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/contents.xml:39
-#: en/chapters/customization/contents.xml:96
-msgid "Binary includes"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/contents.xml:43
-msgid ""
-"These allow you to add or replace Debian specific files in the binary image, "
-"such as the templates and tools directories. Please see <xref linkend="
-"\"binary-includes\"/> for more information."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/contents.xml:50
-msgid ""
-"Please see <xref linkend=\"terms\"/> for more information about the "
-"distinction between the \"Live\" and \"binary\" images."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/contents.xml:54
-msgid "Live/chroot local includes"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/contents.xml:56
-msgid ""
-"Chroot local includes can be used to add or replace files in the chroot/Live "
-"filesystem so that they are visible when the Live system is booted. Typical "
-"uses for them are to populate the skeleton user directory (<filename class="
-"\"directory\">/etc/skel</filename>) used by the live system to create the "
-"live user's home directory, or adding configuration files where additional "
-"processing is not required."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/contents.xml:60
-msgid ""
-"To include files, simply add them to your <filename class=\"directory"
-"\">config/chroot_local-includes</filename> directory. This directory "
-"corresponds to the root directory (<filename class=\"directory\">/</"
-"filename>) of the live system. For example, to add a file <filename>/var/www/"
-"index.html</filename> in the live system, use:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><screen>
-#: en/chapters/customization/contents.xml:64
-#, no-wrap
-msgid ""
-"  $ mkdir -p config/chroot_local-includes/var/www\n"
-"  $ cp /path/to/my/index.html config/chroot_local-includes/var/www\n"
-" "
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/contents.xml:69
-msgid "Your configuration will then have the following layout:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><screen>
-#: en/chapters/customization/contents.xml:73
-#, no-wrap
-msgid ""
-"-- config\n"
-"   [...]\n"
-"    |-- chroot_local-includes\n"
-"    |   `-- var\n"
-"    |       `-- www\n"
-"    |           `-- index.html\n"
-"   [...]\n"
-"    `-- templates\n"
-" "
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/contents.xml:84
-msgid ""
-"Chroot local includes are installed after package installation so that files "
-"installed by packages are overwritten."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/contents.xml:91
-#: en/chapters/customization/contents.xml:98
-#: en/chapters/customization/contents.xml:107
-#: en/chapters/customization/contents.xml:112
-#: en/chapters/customization/contents.xml:117
-msgid "FIXME."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/contents.xml:105
-msgid "Hooks"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/contents.xml:108
-msgid "Enabling hooks"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/contents.xml:111
-msgid "Live/chroot local hooks"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/contents.xml:116
-msgid "Binary local hooks"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/contents.xml:123
-msgid "Preseeding Debconf questions"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/contents.xml:125
-msgid ""
-"Files in the <filename class=\"directory\">config/chroot_local-preseed</"
-"filename> directory are considered to be debconf preseed files and are "
-"installed by &live-helper; using <filename>debconf-set-selections</filename>."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/contents.xml:127
-msgid ""
-"For more information about debconf, please see debconf(7) in the "
-"<command>debconf</command> package."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/contents.xml:131
-msgid "Symlink conversion"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/contents.xml:132
-msgid "FIXME. (This is probably in the wrong section)"
-msgstr ""
diff --git a/manual/po/de/customization_backports.xml.po b/manual/po/de/customization_backports.xml.po
index 23c1be7..7f05a2c 100644
--- a/manual/po/de/customization_backports.xml.po
+++ b/manual/po/de/customization_backports.xml.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2010-06-06 12:16+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"PO-Revision-Date: 2010-06-06 17:46+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Content of: <sect1><title>
-#: en/customization_backports.xml:8
+#: en/customization_backports.xml:6
 msgid "Using a newer kernel with Lenny"
 msgstr ""
 
 #. type: Content of: <sect1><para>
-#: en/customization_backports.xml:10
+#: en/customization_backports.xml:7
 msgid ""
 "The backports repository, backports.org, lacks the necessary module packages "
 "(linux-modules-extra-2.6, aufs, etc.) so an alternative repository has been "
@@ -31,16 +31,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><screen>
-#: en/customization_backports.xml:13
+#: en/customization_backports.xml:8
 #, no-wrap
-msgid ""
-"$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6'\n"
-"\n"
-"$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.chroot\n"
-"$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.binary\n"
-"\n"
-"$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.chroot.gpg\n"
-"$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.binary.gpg\n"
-"\n"
-"# lh_build\n"
+msgid " $ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6' $ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' &gt; config/chroot_sources/backports-kernel.chroot $ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' &gt; config/chroot_sources/backports-kernel.binary $ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.chroot.gpg $ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.binary.gpg # lh_build "
 msgstr ""
diff --git a/manual/po/de/customization_bootup.xml.po b/manual/po/de/customization_bootup.xml.po
index d5a8ca5..1341336 100644
--- a/manual/po/de/customization_bootup.xml.po
+++ b/manual/po/de/customization_bootup.xml.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2010-06-06 12:16+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"PO-Revision-Date: 2010-06-06 17:46+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
@@ -17,45 +17,30 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Content of: <sect1><sect2><title>
-#: en/about_manual.xml:121 en/customization_bootup.xml:104
+#: en/about_manual.xml:63 en/customization_bootup.xml:48
 msgid "Cheat codes"
 msgstr ""
 
-# #-#-#-#-#  live-environment.xml.po (Debconf 8)  #-#-#-#-#
-# #-#-#-#-#  live-environment.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  resources.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  success-stories.xml.po (live-manual VERSION)  #-#-#-#-#
-# #-#-#-#-#  live-environment.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  resources.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  resources.xml.po (Debconf 8)  #-#-#-#-#
-# #-#-#-#-#  live-environment.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  resources.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><para>
-#: en/about_manual.xml:125 en/customization_bootup.xml:11
-#: en/customization_bootup.xml:20 en/customization_bootup.xml:26
-#: en/customization_bootup.xml:38 en/customization_bootup.xml:85
-#: en/customization_bootup.xml:92 en/customization_bootup.xml:99
-#: en/customization_bootup.xml:106 en/customization_packages.xml:36
-#: en/customization_packages.xml:306 en/customization_packages.xml:326
-#: en/customization_packages.xml:384 en/customization_packages.xml:492
-#: en/customization_packages.xml:535 en/live-environment.xml:11
-#: en/resources.xml:11 en/success-stories.xml:11
+#: en/about_manual.xml:65 en/customization_bootup.xml:8
+#: en/customization_bootup.xml:14 en/customization_bootup.xml:17
+#: en/customization_bootup.xml:25 en/customization_bootup.xml:37
+#: en/customization_bootup.xml:41 en/customization_bootup.xml:45
+#: en/customization_bootup.xml:49 en/customization_packages.xml:18
+#: en/customization_packages.xml:130 en/customization_packages.xml:138
+#: en/customization_packages.xml:160 en/customization_packages.xml:198
+#: en/customization_packages.xml:209 en/live-environment.xml:9
+#: en/resources.xml:9 en/success-stories.xml:8
 msgid "FIXME"
 msgstr ""
 
 #. type: Content of: <sect1><title>
-#: en/customization_bootup.xml:7
+#: en/customization_bootup.xml:6
 msgid "Customising the bootup process"
 msgstr ""
 
 #. type: Content of: <sect1><para>
-#: en/customization_bootup.xml:9
+#: en/customization_bootup.xml:7
 msgid ""
 "This chapter discusses customisation of bootup process of a live system, "
 "including kernel options, modifications to the bootloader, \"splash\" "
@@ -63,27 +48,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_bootup.xml:14
+#: en/customization_bootup.xml:10
 msgid "Kernel"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_bootup.xml:18
+#: en/customization_bootup.xml:13
 msgid "Bootloaders"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_bootup.xml:24
+#: en/customization_bootup.xml:16
 msgid "Choosing a bootloader"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_bootup.xml:31
+#: en/customization_bootup.xml:20
 msgid "Syslinux"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_bootup.xml:32
+#: en/customization_bootup.xml:21
 msgid ""
 "In the default configuration, Syslinux will pause indefinitely at its splash "
 "screen. To adjust this, modify the <command>LH_SYSLINUX_TIMEOUT</command> "
@@ -95,32 +80,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_bootup.xml:36
+#: en/customization_bootup.xml:24
 msgid "Bootloader templates"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_bootup.xml:43
+#: en/customization_bootup.xml:28
 msgid "Booting a Debian Live USB/HDD system from a USB stick with Grub"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_bootup.xml:45
+#: en/customization_bootup.xml:29
 msgid ""
 "Suppose you've built your Debian Live USB/HDD image, but want to install it "
 "on an already used USB stick with ext2/3 partition and Grub bootloader:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/customization_bootup.xml:55
+#: en/customization_bootup.xml:30
 #, no-wrap
-msgid ""
-"# mkdir /media/myUsb/boot/live/\n"
-"# cp binary/vmlinuz1 binary/initrd1.img binary/live/filesystem.squashfs /media/myUsb/boot/live/\n"
+msgid " # mkdir /media/myUsb/boot/live/ # cp binary/vmlinuz1 binary/initrd1.img binary/live/filesystem.squashfs /media/myUsb/boot/live/ "
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_bootup.xml:50
+#: en/customization_bootup.xml:30
 msgid ""
 "First, copy live components in a directory on your key: the Linux kernel "
 "(<filename>vmlinuz*</filename>), its Initial RAM disk (<filename>initrd*</"
@@ -129,21 +112,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/customization_bootup.xml:63
+#: en/customization_bootup.xml:31
 #, no-wrap
-msgid ""
-"echo &gt;&gt;/media/myUsb/boot/grub/menu.lst  &lt;&lt;EOF\n"
-"\n"
-"title           my Debian Live\n"
-"root            (hd0,1)    # my Ext2 partition is the second on this stick\n"
-"kernel          /boot/live/vmlinuz1 boot=live vga=791 persistent union=aufs live-media-path=boot/live\n"
-"initrd          /boot/live/initrd1.img\n"
-"\n"
-"EOF\n"
+msgid " echo &gt;&gt;/media/myUsb/boot/grub/menu.lst &lt;&lt;EOF title my Debian Live root (hd0,1) # my Ext2 partition is the second on this stick kernel /boot/live/vmlinuz1 boot=live vga=791 persistent union=aufs live-media-path=boot/live initrd /boot/live/initrd1.img EOF "
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_bootup.xml:60
+#: en/customization_bootup.xml:31
 msgid ""
 "Then, add a stanza in Grub's menu definition to boot up this system: "
 "<placeholder type=\"screen\" id=\"0\"/> The important kernel command line "
@@ -151,38 +126,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para><variablename>
-#: en/customization_bootup.xml:73
+#: en/customization_bootup.xml:31
 msgid "live-media-path"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_bootup.xml:73
+#: en/customization_bootup.xml:31
 msgid ""
 ", which tells to Live initrd's script in which subdirectory to look for the "
 "SquashFS image."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_bootup.xml:77
+#: en/customization_bootup.xml:32
 msgid "Next, umount your USB stick and reboot on it. That's all!"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_bootup.xml:83
+#: en/customization_bootup.xml:36
 msgid "Splash screens"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_bootup.xml:90
+#: en/customization_bootup.xml:40
 msgid "Memtest"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_bootup.xml:97
+#: en/customization_bootup.xml:44
 msgid "Startup scripts"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_bootup.xml:109
+#: en/customization_bootup.xml:50
 msgid "Checksums."
 msgstr ""
diff --git a/manual/po/de/customization_contents.xml.po b/manual/po/de/customization_contents.xml.po
index 01d4905..fc76227 100644
--- a/manual/po/de/customization_contents.xml.po
+++ b/manual/po/de/customization_contents.xml.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2010-06-06 12:16+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"PO-Revision-Date: 2010-06-06 17:46+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
@@ -17,58 +17,58 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Content of: <sect1><title>
-#: en/customization_contents.xml:7
+#: en/customization_contents.xml:6
 msgid "Customising contents"
 msgstr ""
 
 #. type: Content of: <sect1><para>
-#: en/customization_contents.xml:9
+#: en/customization_contents.xml:7
 msgid "This chapter discusses further customisation of the live system."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_contents.xml:12
+#: en/customization_contents.xml:9
 msgid "Includes"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:14
+#: en/customization_contents.xml:10
 msgid ""
 "Using includes, it is possible to add (or replace) arbitrary files in your "
 "Debian Live image. &live-helper; provides three mechanisms for using them:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_contents.xml:19
+#: en/customization_contents.xml:13
 msgid "Chroot local includes"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_contents.xml:23
+#: en/customization_contents.xml:15
 msgid ""
 "These allow you to add or replace files to the chroot/Live filesystem. "
 "Please see <xref linkend=\"chroot-local-includes\"/> for more information."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_contents.xml:29 en/customization_contents.xml:89
+#: en/customization_contents.xml:19 en/customization_contents.xml:42
 msgid "Binary local includes"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_contents.xml:33
+#: en/customization_contents.xml:21
 msgid ""
 "These allow you to add or replace files in the binary image. Please see "
 "<xref linkend=\"binary-local-includes\"/> for more information."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_contents.xml:39 en/customization_contents.xml:96
+#: en/customization_contents.xml:25 en/customization_contents.xml:46
 msgid "Binary includes"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_contents.xml:43
+#: en/customization_contents.xml:27
 msgid ""
 "These allow you to add or replace Debian specific files in the binary image, "
 "such as the templates and tools directories. Please see <xref linkend="
@@ -76,19 +76,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:50
+#: en/customization_contents.xml:31
 msgid ""
 "Please see <xref linkend=\"terms\"/> for more information about the "
 "distinction between the \"Live\" and \"binary\" images."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_contents.xml:54
+#: en/customization_contents.xml:33
 msgid "Live/chroot local includes"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_contents.xml:56
+#: en/customization_contents.xml:34
 msgid ""
 "Chroot local includes can be used to add or replace files in the chroot/Live "
 "filesystem so that they are visible when the Live system is booted. Typical "
@@ -99,7 +99,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_contents.xml:60
+#: en/customization_contents.xml:35
 msgid ""
 "To include files, simply add them to your <filename class=\"directory"
 "\">config/chroot_local-includes</filename> directory. This directory "
@@ -109,75 +109,63 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><screen>
-#: en/customization_contents.xml:64
+#: en/customization_contents.xml:36
 #, no-wrap
-msgid ""
-"  $ mkdir -p config/chroot_local-includes/var/www\n"
-"  $ cp /path/to/my/index.html config/chroot_local-includes/var/www\n"
-" "
+msgid " $ mkdir -p config/chroot_local-includes/var/www $ cp /path/to/my/index.html config/chroot_local-includes/var/www "
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_contents.xml:69
+#: en/customization_contents.xml:37
 msgid "Your configuration will then have the following layout:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><screen>
-#: en/customization_contents.xml:73
+#: en/customization_contents.xml:38
 #, no-wrap
-msgid ""
-"-- config\n"
-"   [...]\n"
-"    |-- chroot_local-includes\n"
-"    |   `-- var\n"
-"    |       `-- www\n"
-"    |           `-- index.html\n"
-"   [...]\n"
-"    `-- templates\n"
-" "
+msgid " -- config [...] |-- chroot_local-includes | `-- var | `-- www | `-- index.html [...] `-- templates "
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_contents.xml:84
+#: en/customization_contents.xml:39
 msgid ""
 "Chroot local includes are installed after package installation so that files "
 "installed by packages are overwritten."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_contents.xml:91 en/customization_contents.xml:98
-#: en/customization_contents.xml:107 en/customization_contents.xml:112
-#: en/customization_contents.xml:117
+#: en/customization_contents.xml:43 en/customization_contents.xml:47
+#: en/customization_contents.xml:52 en/customization_contents.xml:56
+#: en/customization_contents.xml:60
 msgid "FIXME."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_contents.xml:105
+#: en/customization_contents.xml:51
 msgid "Hooks"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:108
+#: en/customization_contents.xml:53
 msgid "Enabling hooks"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_contents.xml:111
+#: en/customization_contents.xml:55
 msgid "Live/chroot local hooks"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_contents.xml:116
+#: en/customization_contents.xml:59
 msgid "Binary local hooks"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_contents.xml:123
+#: en/customization_contents.xml:64
 msgid "Preseeding Debconf questions"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:125
+#: en/customization_contents.xml:65
 msgid ""
 "Files in the <filename class=\"directory\">config/chroot_local-preseed</"
 "filename> directory are considered to be debconf preseed files and are "
@@ -185,18 +173,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:127
+#: en/customization_contents.xml:66
 msgid ""
 "For more information about debconf, please see debconf(7) in the "
 "<command>debconf</command> package."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_contents.xml:131
+#: en/customization_contents.xml:69
 msgid "Symlink conversion"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:132
+#: en/customization_contents.xml:70
 msgid "FIXME. (This is probably in the wrong section)"
 msgstr ""
diff --git a/manual/po/de/customization_internationalization.xml.po b/manual/po/de/customization_internationalization.xml.po
index bf894a6..db76913 100644
--- a/manual/po/de/customization_internationalization.xml.po
+++ b/manual/po/de/customization_internationalization.xml.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2010-06-06 12:16+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"PO-Revision-Date: 2010-06-06 17:46+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
@@ -17,74 +17,74 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Content of: <sect1><title>
-#: en/customization_internationalization.xml:7
+#: en/customization_internationalization.xml:6
 msgid "Customising Locale And Language"
 msgstr ""
 
 #. type: Content of: <sect1><para>
-#: en/customization_internationalization.xml:8
+#: en/customization_internationalization.xml:7
 msgid "This chapter discusses customisation for language specific parameters."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_internationalization.xml:11
+#: en/customization_internationalization.xml:9
 msgid "Default locale and keyboard"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para><screen>
-#: en/customization_internationalization.xml:17
+#: en/customization_internationalization.xml:10
 #, no-wrap
-msgid "$ lh_config --bootappend-live \"locale=en_GB.UTF-8\"\n"
+msgid " $ lh_config --bootappend-live \"locale=en_GB.UTF-8\" "
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para><screen>
-#: en/customization_internationalization.xml:21
+#: en/customization_internationalization.xml:10
 #, no-wrap
-msgid "$ lh_config --bootappend-live \"keyb=uk\"\n"
+msgid " $ lh_config --bootappend-live \"keyb=uk\" "
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para><screen>
-#: en/customization_internationalization.xml:25
+#: en/customization_internationalization.xml:10
 #, no-wrap
-msgid "$ lh_config --bootappend-live \"locale=en_GB.UTF-8 keyb=uk\"\n"
+msgid " $ lh_config --bootappend-live \"locale=en_GB.UTF-8 keyb=uk\" "
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para><screen>
-#: en/customization_internationalization.xml:29
+#: en/customization_internationalization.xml:10
 #, no-wrap
-msgid "$ lh_config --bootappend-live \"locale=uk\"\n"
+msgid " $ lh_config --bootappend-live \"locale=uk\" "
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_internationalization.xml:14
+#: en/customization_internationalization.xml:10
 msgid ""
-"The default locale when building a live cd is \"locale=en_US.UTF-8\".  To "
-"set the locale for the UK (locale=en_GB.UTF-8)  <placeholder type=\"screen\" "
-"id=\"0\"/> The entry for a British keyboard would be <placeholder type="
-"\"screen\" id=\"1\"/> To configure both the locale and the keyboard for the "
-"UK the entry would be <placeholder type=\"screen\" id=\"2\"/> or "
-"<placeholder type=\"screen\" id=\"3\"/>"
+"The default locale when building a live cd is \"locale=en_US.UTF-8\". To set "
+"the locale for the UK (locale=en_GB.UTF-8) <placeholder type=\"screen\" id="
+"\"0\"/> The entry for a British keyboard would be <placeholder type=\"screen"
+"\" id=\"1\"/> To configure both the locale and the keyboard for the UK the "
+"entry would be <placeholder type=\"screen\" id=\"2\"/> or <placeholder type="
+"\"screen\" id=\"3\"/>"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_internationalization.xml:37
+#: en/customization_internationalization.xml:14
 msgid "l10n Packages"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para><screen>
-#: en/customization_internationalization.xml:42
+#: en/customization_internationalization.xml:15
 #, no-wrap
-msgid "$ lh_config --language \"se\"\n"
+msgid " $ lh_config --language \"se\" "
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para><screen>
-#: en/customization_internationalization.xml:46
+#: en/customization_internationalization.xml:15
 #, no-wrap
-msgid "  config/templates/syslinux/se\n"
+msgid " config/templates/syslinux/se "
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_internationalization.xml:40
+#: en/customization_internationalization.xml:15
 msgid ""
 "lh build can automatically check for each package, for which it's know that "
 "there are -l10n packages available and install them. To add Swedish packages "
diff --git a/manual/po/de/customization_packages.xml.po b/manual/po/de/customization_packages.xml.po
index 9eee9a0..44a5219 100644
--- a/manual/po/de/customization_packages.xml.po
+++ b/manual/po/de/customization_packages.xml.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2010-06-06 12:16+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"PO-Revision-Date: 2010-06-06 17:46+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
@@ -16,150 +16,132 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-# #-#-#-#-#  live-environment.xml.po (Debconf 8)  #-#-#-#-#
-# #-#-#-#-#  live-environment.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  resources.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  success-stories.xml.po (live-manual VERSION)  #-#-#-#-#
-# #-#-#-#-#  live-environment.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  resources.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  resources.xml.po (Debconf 8)  #-#-#-#-#
-# #-#-#-#-#  live-environment.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  resources.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><para>
-#: en/about_manual.xml:125 en/customization_bootup.xml:11
-#: en/customization_bootup.xml:20 en/customization_bootup.xml:26
-#: en/customization_bootup.xml:38 en/customization_bootup.xml:85
-#: en/customization_bootup.xml:92 en/customization_bootup.xml:99
-#: en/customization_bootup.xml:106 en/customization_packages.xml:36
-#: en/customization_packages.xml:306 en/customization_packages.xml:326
-#: en/customization_packages.xml:384 en/customization_packages.xml:492
-#: en/customization_packages.xml:535 en/live-environment.xml:11
-#: en/resources.xml:11 en/success-stories.xml:11
+#: en/about_manual.xml:65 en/customization_bootup.xml:8
+#: en/customization_bootup.xml:14 en/customization_bootup.xml:17
+#: en/customization_bootup.xml:25 en/customization_bootup.xml:37
+#: en/customization_bootup.xml:41 en/customization_bootup.xml:45
+#: en/customization_bootup.xml:49 en/customization_packages.xml:18
+#: en/customization_packages.xml:130 en/customization_packages.xml:138
+#: en/customization_packages.xml:160 en/customization_packages.xml:198
+#: en/customization_packages.xml:209 en/live-environment.xml:9
+#: en/resources.xml:9 en/success-stories.xml:8
 msgid "FIXME"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/about_manual.xml:298 en/about_manual.xml:308 en/about_manual.xml:318
-#: en/about_manual.xml:338 en/about_manual.xml:351 en/about_manual.xml:366
-#: en/about_manual.xml:379 en/about_manual.xml:389 en/basics.xml:113
-#: en/basics.xml:128 en/basics.xml:144 en/basics.xml:158 en/basics.xml:194
-#: en/basics.xml:220 en/basics.xml:230 en/basics.xml:239 en/basics.xml:253
-#: en/basics.xml:275 en/basics.xml:302 en/basics.xml:312 en/basics.xml:320
-#: en/basics.xml:354 en/basics.xml:364 en/basics.xml:382 en/basics.xml:429
-#: en/basics.xml:498 en/basics.xml:530 en/basics.xml:539 en/basics.xml:590
-#: en/basics.xml:646 en/customization_packages.xml:50
-#: en/customization_packages.xml:58 en/customization_packages.xml:71
-#: en/customization_packages.xml:80 en/customization_packages.xml:104
-#: en/customization_packages.xml:222 en/customization_packages.xml:230
-#: en/customization_packages.xml:265 en/customization_packages.xml:310
-#: en/customization_packages.xml:330 en/customization_packages.xml:341
-#: en/customization_packages.xml:352 en/customization_packages.xml:362
-#: en/faq.xml:64 en/faq.xml:241 en/faq.xml:244 en/faq.xml:252 en/faq.xml:256
-#: en/faq.xml:264 en/faq.xml:279 en/faq.xml:287 en/faq.xml:334 en/faq.xml:424
-#: en/faq.xml:430 en/faq.xml:481 en/faq.xml:483 en/faq.xml:487 en/faq.xml:491
-#: en/overview.xml:181 en/overview.xml:230 en/overview.xml:240
+#: en/about_manual.xml:143 en/about_manual.xml:147 en/about_manual.xml:151
+#: en/about_manual.xml:160 en/about_manual.xml:166 en/about_manual.xml:172
+#: en/about_manual.xml:178 en/about_manual.xml:184 en/basics.xml:45
+#: en/basics.xml:50 en/basics.xml:57 en/basics.xml:60 en/basics.xml:72
+#: en/basics.xml:81 en/basics.xml:85 en/basics.xml:89 en/basics.xml:95
+#: en/basics.xml:105 en/basics.xml:118 en/basics.xml:122 en/basics.xml:126
+#: en/basics.xml:139 en/basics.xml:143 en/basics.xml:148 en/basics.xml:160
+#: en/basics.xml:170 en/basics.xml:182 en/basics.xml:186 en/basics.xml:205
+#: en/basics.xml:220 en/customization_packages.xml:25
+#: en/customization_packages.xml:29 en/customization_packages.xml:34
+#: en/customization_packages.xml:38 en/customization_packages.xml:48
+#: en/customization_packages.xml:102 en/customization_packages.xml:106
+#: en/customization_packages.xml:116 en/customization_packages.xml:132
+#: en/customization_packages.xml:140 en/customization_packages.xml:144
+#: en/customization_packages.xml:148 en/customization_packages.xml:152
+#: en/faq.xml:36 en/faq.xml:128 en/faq.xml:131 en/faq.xml:138 en/faq.xml:141
+#: en/faq.xml:163 en/faq.xml:188 en/faq.xml:210 en/overview.xml:61
+#: en/overview.xml:66 en/overview.xml:70
 msgid "<placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <sect1><title>
-#: en/customization_packages.xml:9
+#: en/customization_packages.xml:6
 msgid "Customising package installation"
 msgstr ""
 
 #. type: Content of: <sect1><para>
-#: en/customization_packages.xml:12
+#: en/customization_packages.xml:7
 msgid ""
 "This chapter discusses the customisation of package installation. This "
 "involves:"
 msgstr ""
 
 #. type: Content of: <sect1><orderedlist><listitem><para>
-#: en/customization_packages.xml:20
+#: en/customization_packages.xml:10
 msgid "Selecting additional packages to be installed"
 msgstr ""
 
 #. type: Content of: <sect1><orderedlist><listitem><para>
-#: en/customization_packages.xml:26
+#: en/customization_packages.xml:13
 msgid "Installing modified packages"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_packages.xml:33
+#: en/customization_packages.xml:17
 msgid "Package sources"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_packages.xml:42
+#: en/customization_packages.xml:21
 msgid "Debian repositories"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:46
+#: en/customization_packages.xml:23
 msgid "To set a local mirror (used to ''build'' the live-cd)"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/customization_packages.xml:50
+#: en/customization_packages.xml:25
 #, no-wrap
 msgid "$ lh config --mirror-bootstrap \"http://local.intra.net/debian/\" --mirror-chroot \"http://local.intra.net/debian/\""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:54
+#: en/customization_packages.xml:27
 msgid "The generic mirror is added to the live-system's /etc/apt/sources.list."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/customization_packages.xml:58
+#: en/customization_packages.xml:29
 #, no-wrap
 msgid "$ lh config --mirror-binary \"http://ftp.debian.org/debian/\""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:62
+#: en/customization_packages.xml:31
 msgid ""
 "Note: It is ''not'' used for building the live-cd but to install new "
 "software while using the live-cd."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:67
+#: en/customization_packages.xml:32
 msgid "It can be disabled by setting binary indices parameter to disabled"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/customization_packages.xml:71
+#: en/customization_packages.xml:34
 #, no-wrap
 msgid "$ lh config --binary-indices disabled"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:75
+#: en/customization_packages.xml:36
 msgid ""
 "Note: the same applies for mirror chroot security and mirror binary security"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/customization_packages.xml:80
+#: en/customization_packages.xml:38
 #, no-wrap
-msgid ""
-"$ lh config --mirror-chroot-security {URL}\n"
-"$ lh config --mirror-binary-security {URL}"
+msgid "$ lh config --mirror-chroot-security {URL} $ lh config --mirror-binary-security {URL}"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_packages.xml:87
+#: en/customization_packages.xml:43
 msgid "Own repository"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:91
+#: en/customization_packages.xml:45
 msgid ""
 "To add more repositories (e.g. backports, experimental packages, etc.), "
 "create <filename>config/chroot_sources/your-cdd-repo.{chroot,binary}</"
@@ -167,7 +149,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:98
+#: en/customization_packages.xml:46
 msgid ""
 "e.g. <filename>config/chroot_sources/live.chroot</filename> allows you to "
 "install packages from the debian live snapshot repository at live-cd build "
@@ -175,13 +157,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/customization_packages.xml:104
+#: en/customization_packages.xml:48
 #, no-wrap
 msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:108
+#: en/customization_packages.xml:50
 msgid ""
 "If you add the line to <filename>config/chroot_sources/live.binary</"
 "filename> the repository will be added to your live-system's <filename>/etc/"
@@ -189,24 +171,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:115
+#: en/customization_packages.xml:51
 msgid "If such files exist, they will be picked up automatically."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:119
+#: en/customization_packages.xml:52
 msgid ""
 "You can also put the gpg-key used to sign the repository into config/"
 "chroot_sources/foo.{binary,chroot}.gpg"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_packages.xml:130
+#: en/customization_packages.xml:58
 msgid "Package installation"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:133
+#: en/customization_packages.xml:59
 msgid ""
 "You can elect to use either <command>apt</command> or <command>aptitude</"
 "command> when installing packages. Which utility is used is governed by the "
@@ -215,97 +197,97 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_packages.xml:143
+#: en/customization_packages.xml:63
 msgid "<command>apt</command>"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:147
+#: en/customization_packages.xml:66
 msgid ""
 "Specifying a missing package causes package installation to fail, which may "
 "not be the desired behaviour."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:152
+#: en/customization_packages.xml:67
 msgid "This is the default setting for building images for Lenny or later."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_packages.xml:158
+#: en/customization_packages.xml:72
 msgid "<command>aptitude</command>"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:162
+#: en/customization_packages.xml:75
 msgid ""
 "Specifying a missing package causes package installation to succeed, which "
 "may not be the desired behaviour."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:167
+#: en/customization_packages.xml:76
 msgid "This is the default setting for building images for Etch."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_packages.xml:177
+#: en/customization_packages.xml:82
 msgid "Installing additional packages"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:180
+#: en/customization_packages.xml:83
 msgid ""
 "&live-helper; has a number of mechanisms for indicating that additional "
 "packages should be installed, including:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:188 en/customization_packages.xml:213
+#: en/customization_packages.xml:86 en/customization_packages.xml:99
 msgid "The <command>LH_PACKAGES</command> variable"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:194 en/customization_packages.xml:249
+#: en/customization_packages.xml:89 en/customization_packages.xml:112
 msgid "Package lists"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><orderedlist><listitem><para>
-#: en/customization_packages.xml:200
+#: en/customization_packages.xml:92
 msgid "Local packages (<filename>chroot_local-packages/</filename>)"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:206 en/customization_packages.xml:381
+#: en/customization_packages.xml:95 en/customization_packages.xml:159
 msgid "Tasks"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:216
+#: en/customization_packages.xml:100
 msgid ""
 "To install additional packages, simply add them to the <command>LH_PACKAGES</"
 "command> variable in <filename>config/chroot</filename>. For example:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/customization_packages.xml:222
+#: en/customization_packages.xml:102
 #, no-wrap
 msgid "LH_PACKAGES=\"package1 package2 package3 ... \""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:226
+#: en/customization_packages.xml:104
 msgid "You can also specify initial values on the command line:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/customization_packages.xml:230
+#: en/customization_packages.xml:106
 #, no-wrap
 msgid "$ lh config --packages \"package1 package2 package3\""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:234
+#: en/customization_packages.xml:108
 msgid ""
 "The behaviour of &live-helper; when specifying a package that does not exist "
 "is determined by your choice of APT utility. See <xref linkend=\"package-"
@@ -313,7 +295,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:240
+#: en/customization_packages.xml:109
 msgid ""
 "If you need to specify a large number of packages to be installed or you "
 "need flexibility regarding which packages to install, you should probably be "
@@ -322,7 +304,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:252
+#: en/customization_packages.xml:113
 msgid ""
 "Package lists are a powerful way of expressing which packages should be "
 "installed. &live-helper; ships with a number of predefined package lists "
@@ -331,7 +313,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:259
+#: en/customization_packages.xml:114
 msgid ""
 "To specify a package list, add the name of the list to the "
 "<command>LH_PACKAGES_LISTS</command> variable in <filename>config/chroot</"
@@ -339,44 +321,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/customization_packages.xml:265
+#: en/customization_packages.xml:116
 #, no-wrap
 msgid "LH_PACKAGES_LISTS=\"gnome\""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:269
+#: en/customization_packages.xml:118
 msgid ""
 "Package lists that are distributed with &live-helper; reside in the "
 "<command>/usr/share/live-helper/lists</command> directory."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><title>
-#: en/customization_packages.xml:274
+#: en/customization_packages.xml:120
 msgid "Local packages lists"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:277
+#: en/customization_packages.xml:121
 msgid ""
 "You may supplement the supplied lists using local package lists stored in "
 "<command>config/chroot_local-packageslists</command>."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:282
+#: en/customization_packages.xml:122
 msgid ""
 "Package lists that exist in this directory always override package lists "
 "distributed with &live-helper;. This can cause undesired effects when."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><note><title>
-#: en/customization_packages.xml:288
+#: en/customization_packages.xml:124
 msgid "&live-helper; 2.x change"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><note><para>
-#: en/customization_packages.xml:291
+#: en/customization_packages.xml:125
 msgid ""
 "Any file with <command>.list</command> suffix in <command>config/"
 "chroot_local-packageslists</command> is automatically enabled, the variable "
@@ -385,20 +367,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><title>
-#: en/customization_packages.xml:303
+#: en/customization_packages.xml:129
 msgid "Extending a provided package list using includes"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/customization_packages.xml:310
+#: en/customization_packages.xml:132
 #, no-wrap
-msgid ""
-"#include &lt;gnome&gt;\n"
-"iceweasel"
+msgid "#include &lt;gnome&gt; iceweasel"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:315
+#: en/customization_packages.xml:134
 msgid ""
 "The package lists that are included with &live-helper; make extensive use of "
 "includes. They are available to view in the <command>/usr/share/live-helper/"
@@ -406,84 +386,72 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><title>
-#: en/customization_packages.xml:323
+#: en/customization_packages.xml:137
 msgid "Using conditionals inside packages lists"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/customization_packages.xml:330
+#: en/customization_packages.xml:140
 #, no-wrap
-msgid ""
-"#if ARCHITECTURE amd64\n"
-"ia32-libs\n"
-"#endif"
+msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:336
+#: en/customization_packages.xml:142
 msgid ""
 "or if <command>LH_ARCHITECTURE</command> is set to <command>i386</command> "
 "or <command>amd64</command>:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/customization_packages.xml:341
+#: en/customization_packages.xml:144
 #, no-wrap
-msgid ""
-"#if ARCHITECTURE i386 amd64\n"
-"memtest86+\n"
-"#endif"
+msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:347
+#: en/customization_packages.xml:146
 msgid ""
 "or if <command>LH_SECTIONS</command> contains either <command>contrib</"
 "command> or <command>non-free</command>:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/customization_packages.xml:352
+#: en/customization_packages.xml:148
 #, no-wrap
-msgid ""
-"#if SECTIONS contrib non-free\n"
-"vrms\n"
-"#endif"
+msgid "#if SECTIONS contrib non-free vrms #endif"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:358
+#: en/customization_packages.xml:150
 msgid "A conditional may surround an <command>#include</command> directive:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/customization_packages.xml:362
+#: en/customization_packages.xml:152
 #, no-wrap
-msgid ""
-"#if ARCHITECTURE amd64\n"
-"#include &lt;gnome-full&gt;\n"
-"#endif"
+msgid "#if ARCHITECTURE amd64 #include &lt;gnome-full&gt; #endif"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:368
+#: en/customization_packages.xml:154
 msgid ""
 "Any &live-helper; configuration variable that begins with <command>LH_</"
 "command> can be tested in this way."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:373
+#: en/customization_packages.xml:155
 msgid "The nesting of conditionals is not supported."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_packages.xml:392
+#: en/customization_packages.xml:164
 msgid "Installing modified or third-party packages"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:395
+#: en/customization_packages.xml:165
 msgid ""
 "Whilst it is against the philosophy of Debian Live, it may sometimes be "
 "necessary to build a Live system with modified versions of packages that are "
@@ -494,33 +462,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:404
+#: en/customization_packages.xml:166
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's <ulink url=\"http://www.joachim-"
-"breitner.de/blog/archives/282-How-to-fork-privately.html\" >'How to fork "
+"breitner.de/blog/archives/282-How-to-fork-privately.html\">'How to fork "
 "privately'</ulink> may be of interest, however. The creation of bespoke "
 "packages is covered in the <ulink url=\"http://www.debian.org/doc/maint-"
 "guide/\">Debian New Maintainers' Guide</ulink> and elsewhere."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:414
+#: en/customization_packages.xml:167
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><orderedlist><listitem><para>
-#: en/customization_packages.xml:421
+#: en/customization_packages.xml:171
 msgid "<filename>chroot_local-packages</filename>"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><orderedlist><listitem><para>
-#: en/customization_packages.xml:427
+#: en/customization_packages.xml:175
 msgid "Using a custom APT repository"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:434
+#: en/customization_packages.xml:178
 msgid ""
 "The <filename>chroot_local-packages</filename> is simpler to achieve and "
 "useful for \"one-off\" customisations but has a number of drawbacks, whilst "
@@ -528,13 +496,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:441
+#: en/customization_packages.xml:180
 msgid ""
 "Using <filename>chroot_local-packages</filename> to install custom packages"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:446
+#: en/customization_packages.xml:181
 msgid ""
 "To install a custom package, simply copy it to the <command>config/"
 "chroot_local-packages</command> directory. Packages that are inside this "
@@ -543,45 +511,45 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:453
+#: en/customization_packages.xml:182
 msgid ""
 "Packages <emphasis>must</emphasis> be named in the prescribed way. One "
 "simple way to do this is to use <command>dpkg-name</command>. FIXME"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:458
+#: en/customization_packages.xml:183
 msgid ""
 "Using <filename>chroot_local-packages</filename> for installation of custom "
 "packages has disadvantages:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/customization_packages.xml:466
+#: en/customization_packages.xml:186
 msgid "It is not possible to use secure APT"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/customization_packages.xml:472
+#: en/customization_packages.xml:189
 msgid ""
 "You must install all appropriate packages in the <command>config/"
 "chroot_local-packages</command> directory"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/customization_packages.xml:479
+#: en/customization_packages.xml:192
 msgid ""
 "It does not lend itself to storing Debian Live configurations in revision "
 "control"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:489
+#: en/customization_packages.xml:197
 msgid "Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:496
+#: en/customization_packages.xml:199
 msgid ""
 "Unlike using <filename>chroot_local-packages</filename>, when using a custom "
 "APT repository you must ensure that you specify the packages elsewhere. See "
@@ -589,7 +557,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:502
+#: en/customization_packages.xml:200
 msgid ""
 "Whilst it may seem unnecessary effort to create an APT repository to install "
 "custom packages, the infrastructure can be easily re-used at a later date to "
@@ -597,12 +565,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:510
+#: en/customization_packages.xml:203
 msgid "Custom packages and APT"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:513
+#: en/customization_packages.xml:204
 msgid ""
 "&live-helper; uses APT to install all packages into the live system so will "
 "therefore inherit behaviours from this program. One relevant example is that "
@@ -612,7 +580,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:521
+#: en/customization_packages.xml:205
 msgid ""
 "Because of this, you may wish to increment the version number in your custom "
 "packages' <command>debian/changelog</command> files to ensure that your "
@@ -622,12 +590,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:532
+#: en/customization_packages.xml:208
 msgid "Altering APT preferences during Live system"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:539
+#: en/customization_packages.xml:210
 msgid ""
 "Whilst it may seem unnecessary effort to create an APT repository to install "
 "custom packages, the infrastructure can be easily re-used at a later date to "
diff --git a/manual/po/de/faq.xml.po b/manual/po/de/faq.xml.po
index f07dd37..23539ba 100644
--- a/manual/po/de/faq.xml.po
+++ b/manual/po/de/faq.xml.po
@@ -1,136 +1,135 @@
-# German translations for Debconf package
-# Copyright (C) 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the Debconf package.
-# Automatically generated, 2008.
+# German translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Debconf 8\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2008-08-09 16:50+0300\n"
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"PO-Revision-Date: 2010-06-06 17:46+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: \n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Content of: <chapter><section><section><para>
-#: en/about_manual.xml:298 en/about_manual.xml:308 en/about_manual.xml:318
-#: en/about_manual.xml:338 en/about_manual.xml:351 en/about_manual.xml:366
-#: en/about_manual.xml:379 en/about_manual.xml:389 en/basics.xml:113
-#: en/basics.xml:128 en/basics.xml:144 en/basics.xml:158 en/basics.xml:194
-#: en/basics.xml:220 en/basics.xml:230 en/basics.xml:239 en/basics.xml:253
-#: en/basics.xml:275 en/basics.xml:302 en/basics.xml:312 en/basics.xml:320
-#: en/basics.xml:354 en/basics.xml:364 en/basics.xml:382 en/basics.xml:429
-#: en/basics.xml:498 en/basics.xml:530 en/basics.xml:539 en/basics.xml:590
-#: en/basics.xml:646 en/customization_packages.xml:50
-#: en/customization_packages.xml:58 en/customization_packages.xml:71
-#: en/customization_packages.xml:80 en/customization_packages.xml:104
-#: en/customization_packages.xml:222 en/customization_packages.xml:230
-#: en/customization_packages.xml:265 en/customization_packages.xml:310
-#: en/customization_packages.xml:330 en/customization_packages.xml:341
-#: en/customization_packages.xml:352 en/customization_packages.xml:362
-#: en/faq.xml:64 en/faq.xml:241 en/faq.xml:244 en/faq.xml:252 en/faq.xml:256
-#: en/faq.xml:264 en/faq.xml:279 en/faq.xml:287 en/faq.xml:334 en/faq.xml:424
-#: en/faq.xml:430 en/faq.xml:481 en/faq.xml:483 en/faq.xml:487 en/faq.xml:491
-#: en/overview.xml:181 en/overview.xml:230 en/overview.xml:240
+#: en/about_manual.xml:143 en/about_manual.xml:147 en/about_manual.xml:151
+#: en/about_manual.xml:160 en/about_manual.xml:166 en/about_manual.xml:172
+#: en/about_manual.xml:178 en/about_manual.xml:184 en/basics.xml:45
+#: en/basics.xml:50 en/basics.xml:57 en/basics.xml:60 en/basics.xml:72
+#: en/basics.xml:81 en/basics.xml:85 en/basics.xml:89 en/basics.xml:95
+#: en/basics.xml:105 en/basics.xml:118 en/basics.xml:122 en/basics.xml:126
+#: en/basics.xml:139 en/basics.xml:143 en/basics.xml:148 en/basics.xml:160
+#: en/basics.xml:170 en/basics.xml:182 en/basics.xml:186 en/basics.xml:205
+#: en/basics.xml:220 en/customization_packages.xml:25
+#: en/customization_packages.xml:29 en/customization_packages.xml:34
+#: en/customization_packages.xml:38 en/customization_packages.xml:48
+#: en/customization_packages.xml:102 en/customization_packages.xml:106
+#: en/customization_packages.xml:116 en/customization_packages.xml:132
+#: en/customization_packages.xml:140 en/customization_packages.xml:144
+#: en/customization_packages.xml:148 en/customization_packages.xml:152
+#: en/faq.xml:36 en/faq.xml:128 en/faq.xml:131 en/faq.xml:138 en/faq.xml:141
+#: en/faq.xml:163 en/faq.xml:188 en/faq.xml:210 en/overview.xml:61
+#: en/overview.xml:66 en/overview.xml:70
 msgid "<placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
-# type: Content of: <chapter><title>
 #. type: Content of: <chapter><title>
-#: en/faq.xml:7
+#: en/faq.xml:6
 msgid "Frequently asked questions (FAQ)"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:12
+#: en/faq.xml:9
 msgid "Q: I downloaded a prebuilt live image. How do I put it on a USB stick?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:13
+#: en/faq.xml:10
 msgid ""
-"A: See <xref linkend=\"image_copying\" /> \"Copying USB/HDD image to a USB "
+"A: See <xref linkend=\"image_copying\"/> \"Copying USB/HDD image to a USB "
 "stick\""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:17
+#: en/faq.xml:13
 msgid "Q: How do I log my build?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:19
+#: en/faq.xml:14
 #, no-wrap
-msgid "$ lh_build 2>&amp;1 | tee build.log"
+msgid "$ lh_build 2&gt;&amp;1 | tee build.log"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:18
+#: en/faq.xml:14
 msgid ""
 "A: You could use script, screen or tee: <placeholder type=\"screen\" id="
 "\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:24
+#: en/faq.xml:17
 msgid ""
 "Q: How can I convert an already installed standard Debian partition into a "
 "Debian Live system?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:25
+#: en/faq.xml:18
 msgid ""
 "A: Save the list of installed packages and load it into your new Debian Live "
 "System. Copy your /etc to config/chroot_local-includes"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:29
+#: en/faq.xml:21
 msgid ""
 "Q: What does 'losetup: could not find any free loop device' mean and how do "
 "I fix it?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:30
+#: en/faq.xml:22
 msgid ""
 "A: Loop devices are used during the build; there probably aren't any free if "
-"you've aborted several builds. Something like: for l in /dev/loop* ; do "
+"you've aborted several builds. Something like: for l in /dev/loop0 /dev/"
+"loop1 /dev/loop2 /dev/loop3 /dev/loop4 /dev/loop5 /dev/loop6 /dev/loop7 ; do "
 "losetup -d $l ; done should rectify the situation (assuming all loop devices "
 "in use were created by lh_build; if in doubt, check the contents of each "
 "loop device before deleting them with losetup -d)."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:34
+#: en/faq.xml:25
 msgid "Q: How do I launch an interactive shell during the chroot stage?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:36
+#: en/faq.xml:26
 #, no-wrap
 msgid "$ lh_config --interactive shell"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:38
+#: en/faq.xml:26
 #, no-wrap
 msgid "# logout"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:40
+#: en/faq.xml:26
 #, no-wrap
 msgid "# exit"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:35
+#: en/faq.xml:26
 msgid ""
 "A: To enable interactive shell: <placeholder type=\"screen\" id=\"0\"/> To "
 "continue the build process: <placeholder type=\"screen\" id=\"1\"/> or "
@@ -139,24 +138,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:46
+#: en/faq.xml:29
 msgid "Q: What is the root /user password?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:47
+#: en/faq.xml:30
 #, no-wrap
 msgid " sudo -i "
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:47
+#: en/faq.xml:30
 #, no-wrap
 msgid "sudo passwd"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:47
+#: en/faq.xml:30
 msgid ""
 "A: The user password for the live user is 'live'. By default, there is not "
 "any root password. You can switch to root with <placeholder type=\"screen\" "
@@ -165,58 +164,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:51
+#: en/faq.xml:33
 msgid "Q: How do I change root or any user password?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:52
+#: en/faq.xml:34
 msgid ""
 "A: Add a chroot local hook script to change root or any user password each "
 "time you build an image."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:53
+#: en/faq.xml:35
 msgid ""
 "e.g. config/chroot_local-hooks/01-update_password.sh to set root password to "
 "\"nopasswd\""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:55
+#: en/faq.xml:36
 #, no-wrap
-msgid ""
-"#!/bin/sh\n"
-"echo \"I: update password\"\n"
-"echo \"root:nopasswd\" | chpasswd"
+msgid "#!/bin/sh echo \"I: update password\" echo \"root:nopasswd\" | chpasswd"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:58
+#: en/faq.xml:36
 #, no-wrap
 msgid "$ chmod +x config/chroot_local-hooks/01-update_password.sh"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><note><screen>
-#: en/faq.xml:60
+#: en/faq.xml:36
 #, no-wrap
-msgid ""
-"mkdir -p config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/\n"
-"cp /usr/share/initramfs-tools/scripts/live-bottom/10adduser config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/"
+msgid "mkdir -p config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/ cp /usr/share/initramfs-tools/scripts/live-bottom/10adduser config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:62
+#: en/faq.xml:36
 #, no-wrap
 msgid " echo \"newlivepass\" | mkpasswd -s."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:55
+#: en/faq.xml:36
 msgid ""
-"<placeholder type=\"screen\" id=\"0\"/> <placeholder type=\"screen\" id="
-"\"1\"/> <note>For live user; you need to copy the /usr/share/initramfs-tools/"
+"<placeholder type=\"screen\" id=\"0\"/><placeholder type=\"screen\" id=\"1\"/"
+"><note>For live user; you need to copy the /usr/share/initramfs-tools/"
 "scripts/live-bottom/10adduser your build folder: <placeholder type=\"screen"
 "\" id=\"2\"/></note> Then edit the config/chroot_local-includes/usr/share/"
 "initramfs-tools/scripts/live-bottom/10adduser and paste in the new "
@@ -225,26 +219,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:63
+#: en/faq.xml:36
 msgid ""
 "Or add an hook file in config/chroot_local-hooks/ with something like the "
 "below:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:64
+#: en/faq.xml:36
 #, no-wrap
-msgid ""
-" #!/bin/sh\n"
-"# Change the autogenerated user password to \"debianlive\"\n"
-"plain_password=\"debianlive\"\n"
-"password=$(echo \"${plain_password}\" | mkpasswd -s)\n"
-"sed -i -e 's/\\(user_crypted=\\)\\(.*\\)\\( #.*\\)/\\1\\\"'${password}'\\\"\\3/' /usr/share/initramfs-tools/scripts/live-bottom/10adduser\n"
-"update-initramfs -tu -kall"
+msgid " #!/bin/sh # Change the autogenerated user password to \"debianlive\" plain_password=\"debianlive\" password=$(echo \"${plain_password}\" | mkpasswd -s) sed -i -e 's/\\(user_crypted=\\)\\(.*\\)\\( #.*\\)/\\1\\\"'${password}'\\\"\\3/' /usr/share/initramfs-tools/scripts/live-bottom/10adduser update-initramfs -tu -kall"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:70
+#: en/faq.xml:36
 msgid ""
 "The latter (hook model) could be more future proof than the former solution "
 "since it modifies just one string selectively but it requires the package "
@@ -254,24 +242,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:75
+#: en/faq.xml:39
 msgid "Q: How to disable autologin?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:77
+#: en/faq.xml:40
 #, no-wrap
 msgid "lh config --bootappend-live \"noautologin\""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:76
+#: en/faq.xml:40
 msgid ""
 "A1: use the commandline parameter <placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:78
+#: en/faq.xml:40
 msgid ""
 "A2: You need to set boot=noautologin noxautologin as described in man "
 "<filename>live-initramfs</filename> If you boot via TFTP you want to insert "
@@ -279,32 +267,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:83
+#: en/faq.xml:43
 msgid "Q: How do I change default hostname or username?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:85
+#: en/faq.xml:44
 #, no-wrap
-msgid ""
-"$ lh_config --hostname myhostname\n"
-"$ lh_config --username myusername"
+msgid "$ lh_config --hostname myhostname $ lh_config --username myusername"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:84
+#: en/faq.xml:44
 msgid ""
 "A: To change default hostname or username: <placeholder type=\"screen\" id="
 "\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:91
+#: en/faq.xml:47
 msgid "Q: How do I make the final image smaller?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:92
+#: en/faq.xml:48
 msgid ""
 "A: Clean orphaned apps/libs: Install package \"deborphan\" and then run "
 "'sudo deborphan -n' . Delete unwanted packages. Remove the apt cache. Purge "
@@ -312,72 +298,69 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:97
+#: en/faq.xml:51
 msgid ""
 "Q: How do I customize bash-config permanently (aliases, bash-completion "
 "etc.)?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:98
+#: en/faq.xml:52
 msgid "A: Add your own .bashrc config/chroot_local-includes/etc/skel/.bashrc"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:102
+#: en/faq.xml:55
 msgid "Q: How do I disable services permanently? (Be careful!)"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:103
+#: en/faq.xml:56
 msgid ""
 "A: Add a chroot local hook script to disable a service each time you build "
 "an image:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:105
+#: en/faq.xml:57
 #, no-wrap
-msgid ""
-"#!/bin/sh\n"
-"echo \"I: disable service\"\n"
-"update-rc.d -f   &#9001;service name &#9002; remove "
+msgid "#!/bin/sh echo \"I: disable service\" update-rc.d -f 〈service name 〉 remove "
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:108
+#: en/faq.xml:57
 #, no-wrap
 msgid " $ chmod +x config/chroot_local-hooks/01-disable_service.sh "
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:104
+#: en/faq.xml:57
 msgid ""
 "e.g. config/chroot_local-hooks/01-disable_service.sh <placeholder type="
 "\"screen\" id=\"0\"/> <placeholder type=\"screen\" id=\"1\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:114
+#: en/faq.xml:60
 #, no-wrap
 msgid "lh_config --checksums enabled|disabled "
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:113
+#: en/faq.xml:60
 msgid ""
 "Q: How do I enable | disable the md5checksum at the ISO building? "
 "<placeholder type=\"screen\" id=\"0\"/> Or change the LH_CHECKSUMS value."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:121
+#: en/faq.xml:63
 #, no-wrap
 msgid "lh_config --net-tarball none|gzip "
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:120
+#: en/faq.xml:63
 msgid ""
 "Q: How to disable the generation of the .tar.gz file? <placeholder type="
 "\"screen\" id=\"0\"/> Or change the LH_NET_TARBALL value. (only available in "
@@ -385,20 +368,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:127
+#: en/faq.xml:66
 msgid "Q: How do I \"build a new image\" ?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:129
+#: en/faq.xml:67
 #, no-wrap
-msgid ""
-"$ sudo lh_clean --binary\n"
-"$ sudo lh_build "
+msgid "$ sudo lh_clean --binary $ sudo lh_build "
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:128
+#: en/faq.xml:67
 msgid ""
 "A: Run commands: <placeholder type=\"screen\" id=\"0\"/> <emphasis>Hint:</"
 "emphasis> If the configuration had changed you should leave \"--binary\" "
@@ -406,45 +387,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:136
+#: en/faq.xml:70
 msgid "Q: How do I use Fluxbox ?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:137
+#: en/faq.xml:70
 msgid "A: Add a new lists file with the fluxbox packages you want."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:138
+#: en/faq.xml:70
 msgid "Create /home/$USERNAME/.dmrc file (default username is \"user\")."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:139
+#: en/faq.xml:70
 #, no-wrap
-msgid ""
-"$ cat .dmrc\n"
-"[Desktop]\n"
-"Session=fluxbox"
+msgid "$ cat .dmrc [Desktop] Session=fluxbox"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:139
+#: en/faq.xml:70
 msgid ""
 "<placeholder type=\"screen\" id=\"0\"/> <note>.dmrc is owned by $USERNAME:"
 "$USERNAME. </note>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:143
+#: en/faq.xml:70
 msgid ""
 "See also <ulink url=\"http://wiki.debian.org/Fluxbox/\">http://wiki.debian."
 "org/Fluxbox</ulink>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:144
+#: en/faq.xml:70
 msgid ""
 "A short HOWTO can be found here: <ulink url=\" http://wiki.debian.org/"
 "MichaelAblassmeier/CustomLiveCD\"> http://wiki.debian.org/MichaelAblassmeier/"
@@ -452,89 +430,89 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:150
+#: en/faq.xml:73
 msgid "Q: How do I use custom repositories?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:151
+#: en/faq.xml:74
 msgid ""
 "A: <ulink url=\"http://wiki.debian.org/DebianLive/Configuration\">See "
 "DebianLive/Configuration.</ulink>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:155
+#: en/faq.xml:77
 msgid ""
 "Q: How do I customize the artwork for the live CD (grub or syslinux boot "
 "splash, usplash, etc.)?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:156
+#: en/faq.xml:78
 msgid ""
 "A: <ulink url=\"http://wiki.debian.org/DebianLive/Howto/Custom_Artwork\"> "
 "See DebianLive/Howto/Custom_Artwork. </ulink> FIXME: NEED TO UPDATE"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:160
+#: en/faq.xml:81
 msgid ""
 "Q: How do I customize desktop environment (KDE, GNOME, XFCE, etc...) look?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:161
+#: en/faq.xml:81
 msgid "A: Start the live system in qemu:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:162
+#: en/faq.xml:81
 #, no-wrap
 msgid "$ qemu -m 256 -cdrom binary.iso -boot d -redir tcp:4222:10.0.2.15:22"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:162
+#: en/faq.xml:81
 msgid ""
 "<placeholder type=\"screen\" id=\"0\"/> <note>the -redir argument must be "
 "changed to meet your needs </note>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:168
+#: en/faq.xml:84
 msgid ""
 "Q: How do I execute a custom shell script inside the chroot system after the "
 "chroot stage?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:169
+#: en/faq.xml:85
 msgid "A: Add your script in config/chroot_local-hooks."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:173
+#: en/faq.xml:88
 msgid ""
 "Q: How do I add a script running immediately after all other scripts when "
 "the live system boots?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:174
+#: en/faq.xml:88
 msgid ""
 "A: Add your script in config/chroot_local-includes/usr/share/initramfs-tools/"
 "scripts/live-bottom/99script"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:175
+#: en/faq.xml:88
 #, no-wrap
 msgid "$ chmod +x config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/99script"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:175
+#: en/faq.xml:88
 msgid ""
 "<placeholder type=\"screen\" id=\"0\"/> <note>The hook script must be "
 "executable. Do not forget to lh_clean --chroot after making this change "
@@ -542,7 +520,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:177
+#: en/faq.xml:88
 msgid ""
 "You must also use the example script /usr/share/live-helper/examples/hooks/"
 "update-initramfs.sh to ensure your script gets built into the initramfs "
@@ -550,231 +528,215 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:182
+#: en/faq.xml:91
 msgid "Q: How do I add software not in Debian ?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:183
-msgid "A: See <xref linkend=\"packages\" /> Customising package installation"
+#: en/faq.xml:92
+msgid "A: See <xref linkend=\"packages\"/> Customising package installation"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:187
+#: en/faq.xml:95
 msgid "Q: What is the manifest with Ubuntu used for?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:188
+#: en/faq.xml:96
 msgid ""
 "A: Manifest is just the package list, which ubuntu does $something with. "
 "Don't worry about it."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:192
+#: en/faq.xml:99
 msgid "Q: What is this {p} syntax with mtools{p} and parted{p} ?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:193
+#: en/faq.xml:100
 msgid "A: That's aptitude."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:197
+#: en/faq.xml:103
 msgid ""
 "Q: Do I need to write the image on USB stick to test it? <note>you must use "
-"qemu >= 0.8. </note>"
+"qemu &gt;= 0.8. </note>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:203
+#: en/faq.xml:106
 msgid "Q: What is /cow ?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:204
+#: en/faq.xml:107
 msgid "A: Copy-on-write, the 'diff' from unionfs."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:208
+#: en/faq.xml:110
 msgid ""
 "Q: Is /usr/share/live-helper/lists/standard-x11 like preseed or is preseed "
 "something else entirely?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:209
+#: en/faq.xml:111
 msgid "A: It is not. It is a package list, not a debconf preseeding."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:213
+#: en/faq.xml:114
 msgid "Q: What is the difference between standard and minimal?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:214
+#: en/faq.xml:114
 msgid "standard: packages of priority standard and higher;"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:215
+#: en/faq.xml:114
 msgid "minimal: packages of priority essential and higher;"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:220
+#: en/faq.xml:117
 msgid "Q: What can the sections be used for? Aren't they BIG?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:221
+#: en/faq.xml:118
 msgid "A: Someone maybe wants to include packages from contrib or non-free."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:225
+#: en/faq.xml:121
 msgid "Q: memtest86+ ... is that used?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:226
+#: en/faq.xml:122
 msgid "A: Yes"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:230
+#: en/faq.xml:125
 msgid "Q: How do I build using predefined packages lists?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:231
+#: en/faq.xml:125
 msgid "A: e.g. to build using standard-x11 packages list:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:232
+#: en/faq.xml:125
 #, no-wrap
-msgid ""
-"$ sudo lh_config -p standard-x11\n"
-"$ sudo lh_build"
+msgid "$ sudo lh_config -p standard-x11 $ sudo lh_build"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:232
+#: en/faq.xml:125
 msgid ""
 "<placeholder type=\"screen\" id=\"0\"/> <note>The packages lists can be "
 "found in /usr/share/live-helper/lists/ directory. </note>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:239
+#: en/faq.xml:128
 msgid "Q: How do I rebuild without downloading all the packages again?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:240
+#: en/faq.xml:128
 msgid ""
 "A: All packages are cached in cache subdirectory. They remain until a clean "
 "purge:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:241
+#: en/faq.xml:128
 #, no-wrap
 msgid "$ sudo lh_clean --purge"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:242
+#: en/faq.xml:128
 msgid ""
 "You do not have to do anything to prevent packages from being re-downloaded. "
 "You need to remember to clean whichever stages you want to rebuild first."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:243
+#: en/faq.xml:128
 msgid ""
 "e.g. to rebuild from the cached bootstrap, chroot packages and build a new "
 "image."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:244
+#: en/faq.xml:128
 #, no-wrap
-msgid ""
-"$ sudo lh_clean\n"
-"$ sudo lh_build"
+msgid "$ sudo lh_clean $ sudo lh_build"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:250
+#: en/faq.xml:131
 msgid "Q: How do I boot USB debian-live on systems not supporting USB boot?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:251
+#: en/faq.xml:131
 msgid ""
 "A: Make a boot CD with grub, configured to boot from a debian-live kernel "
 "copied on the cd structure."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:252
+#: en/faq.xml:131
 #, no-wrap
-msgid ""
-"$ mkdir -p iso/boot/grub\n"
-"$ cp /usr/lib/grub/i386-pc/stage2_eltorito iso/boot/grub\n"
-"$ cp chroot/boot/* iso/boot/"
+msgid "$ mkdir -p iso/boot/grub $ cp /usr/lib/grub/i386-pc/stage2_eltorito iso/boot/grub $ cp chroot/boot/* iso/boot/"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:255
+#: en/faq.xml:131
 msgid "Create iso/boot/grub/menu.lst"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:256
+#: en/faq.xml:131
 #, no-wrap
-msgid ""
-"default 0\n"
-"timeout 5\n"
-"color cyan/blue white/blue\n"
-"title Debian Live\n"
-"root (cd)\n"
-"kernel /boot/vmlinuz boot=live\n"
-"initrd /boot/initrd.img"
+msgid "default 0 timeout 5 color cyan/blue white/blue title Debian Live root (cd) kernel /boot/vmlinuz boot=live initrd /boot/initrd.img"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:263
+#: en/faq.xml:131
 msgid "Create the iso image"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:264
+#: en/faq.xml:131
 #, no-wrap
-msgid ""
-"$ mkisofs -R -b boot/grub/stage2_eltorito -no-emul-boot \\\n"
-"-boot-load-size 4 -boot-info-table -o grub.iso iso"
+msgid "$ mkisofs -R -b boot/grub/stage2_eltorito -no-emul-boot \\ -boot-load-size 4 -boot-info-table -o grub.iso iso"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:266
+#: en/faq.xml:131
 msgid "Burn the image."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:271
+#: en/faq.xml:134
 msgid ""
 "Q: How do I boot debian-live on systems not supporting CDROM or USB boot?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:272
+#: en/faq.xml:135
 msgid ""
 "A: If you have a floppy drive, you may be able to use it, otherwise you will "
 "need to use loadlin/grub4dos/win32-loader. If you have a second system to "
@@ -784,50 +746,48 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:277
+#: en/faq.xml:138
 msgid ""
 "Q: The X configuration does not seems to work, the resolution is too low. "
 "What can I do?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:278
+#: en/faq.xml:138
 msgid "A: Use xdebconfigurator"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:279
+#: en/faq.xml:138
 #, no-wrap
-msgid ""
-"$ lh_config --bootappend xdebconf\n"
-"$ lh_config --packages xdebconfigurator"
+msgid "$ lh_config --bootappend xdebconf $ lh_config --packages xdebconfigurator"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:285
+#: en/faq.xml:141
 msgid "Q: Apache has problems with static files"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:286
+#: en/faq.xml:141
 msgid ""
 "A: Sendfile does not work well on the unionfs used by Debian Live. Add the "
 "following to apache's configuration:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:287
+#: en/faq.xml:141
 #, no-wrap
 msgid "EnableSendfile off"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:292
+#: en/faq.xml:144
 msgid "Q: How do I make hard disk partitions auto-mountable?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:293
+#: en/faq.xml:144
 msgid ""
 "<command>A: Short answer:</command> Right now the best is to use a script "
 "that will populate the fstab when the CD is booting. Such a script can be "
@@ -838,7 +798,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:294
+#: en/faq.xml:144
 msgid ""
 "<command>A: Long Answer: </command> Since 55_nonpolkit-mount-policy.patch in "
 "HAL, debian-storage-policy-fixed-drives.fdi is not available anymore and the "
@@ -847,7 +807,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:295
+#: en/faq.xml:144
 msgid ""
 "Eventually, it will be possible to combine HAL and PolicyKit to enable "
 "different permissions and actions to achieve advanced (auto)mounting for non-"
@@ -858,12 +818,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:296
+#: en/faq.xml:144
 msgid "To achieve this, you can do, for example, the following:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para><para>
-#: en/faq.xml:297
+#: en/faq.xml:144
 msgid ""
 "download the <ulink url=\"https://devel.goto10.org/svn/puredyne/trunk/broth/"
 "stock/chroot_local-includes/sbin/diskmounter.sh\"> diskmounter.sh script "
@@ -871,18 +831,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para><para>
-#: en/faq.xml:298
+#: en/faq.xml:144
 msgid ""
 "Create the chroot_local-includes/sbin directory, and move the script inside"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para><para>
-#: en/faq.xml:299
+#: en/faq.xml:144
 msgid "Make sure the script is executable (chmod +x diskmounter.sh)"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para><para>
-#: en/faq.xml:300
+#: en/faq.xml:144
 msgid ""
 "create the chroot_local-includes/etc/rc.local file and call the diskmounter "
 "from there (see this <ulink url=\"https://devel.goto10.org/svn/puredyne/"
@@ -891,7 +851,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:302
+#: en/faq.xml:144
 msgid ""
 "When called correctly, the script detects ext2, ext3, reiserfs, xfs, FAT32, "
 "HFS+ and NTFS partitions and mount them read-write, except for NTFS. This "
@@ -900,67 +860,67 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:303
+#: en/faq.xml:144
 msgid ""
 "comments, patches and other things about this script and issue: http://code."
 "goto10.org/projects/puredyne/ticket/463"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:308
+#: en/faq.xml:147
 msgid "Q: Boot fails with panic: can't open /scripts/live"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:309
+#: en/faq.xml:148
 msgid ""
 "A: Add latest live-initramfs deb package into config/chroot_local-packages "
 "directory and rebuild."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:313
+#: en/faq.xml:151
 msgid "Q: How do I configure the locale and the keyboard?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:314
-msgid "A: See <xref linkend=\"internalization\" /> 10n"
+#: en/faq.xml:152
+msgid "A: See <xref linkend=\"internalization\"/> 10n"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:318
+#: en/faq.xml:155
 msgid "Q: How do I get past boot prompt without a working keyboard?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:319
-msgid "A: See <xref linkend=\"bootup\" /> Customising the bootup process"
+#: en/faq.xml:156
+msgid "A: See <xref linkend=\"bootup\"/> Customising the bootup process"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:324
+#: en/faq.xml:160
 msgid "Q: Can I serve the root image from a web or ftp server?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:325
+#: en/faq.xml:160
 msgid ""
 "A: Since live-initramfs 1.99, it should be possible to use the fetch= "
 "argument on the kernel command line. You can build a netboot image as usual, "
 "and when you are done edit the tftpboot/pxelinux.cfg/default file. Remove "
 "the references to network boot (netboot, nfsroot, nfsopts), and replace with "
-"fetch= &#9001;url where you placed the root image>."
+"fetch= 〈url where you placed the root image&gt;."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:327
+#: en/faq.xml:160
 #, no-wrap
 msgid "$ lh_config --packages wget"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:326
+#: en/faq.xml:160
 msgid ""
 "<note>You have to include wget in the chroot. It could work for other boot "
 "methods as well. However, I am not sure the live scripts configure the "
@@ -969,12 +929,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:332
+#: en/faq.xml:163
 msgid "Q: Why doesn't quickreboot (or some other boot parameter) work?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:333
+#: en/faq.xml:163
 msgid ""
 "A: If you are building an etch image (which was the default up to "
 "2007/09/14) you have a very old version of casper which does not support "
@@ -985,57 +945,51 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:334
+#: en/faq.xml:163
 #, no-wrap
-msgid ""
-"$ lh_config --distribution lenny\n"
-"$ lh_config --initramfs live-initramfs"
+msgid "$ lh_config --distribution lenny $ lh_config --initramfs live-initramfs"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:340
+#: en/faq.xml:166
 msgid ""
 "Q: How do I fix \"Could not find kernel image\" issue with syslinux "
 "bootloader?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:341
+#: en/faq.xml:166
 msgid ""
 "A: Add a binary local hook script to fix kernel and initrd path each time "
 "you build an image."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:343
+#: en/faq.xml:166
 #, no-wrap
-msgid ""
-"#!/bin/sh\n"
-"SYSLINUXCFG=`find binary -type f -name syslinux.cfg`\n"
-"sed -i \"s|kernel /vmlinuz|kernel vmlinuz|g\" ${SYSLINUXCFG}\n"
-"sed -i \"s|initrd=/initrd|initrd=initrd|g\" ${SYSLINUXCFG}"
+msgid "#!/bin/sh SYSLINUXCFG=`find binary -type f -name syslinux.cfg` sed -i \"s|kernel /vmlinuz|kernel vmlinuz|g\" ${SYSLINUXCFG} sed -i \"s|initrd=/initrd|initrd=initrd|g\" ${SYSLINUXCFG}"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:347
+#: en/faq.xml:166
 #, no-wrap
 msgid "$ chmod +x config/binary_local-hooks/01-fix_syslinux.sh"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:342
+#: en/faq.xml:166
 msgid ""
 "e.g. config/binary_local-hooks/01-fix_syslinux.sh <placeholder type=\"screen"
 "\" id=\"0\"/> <placeholder type=\"screen\" id=\"1\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:352
+#: en/faq.xml:169
 msgid "Q: How do I use a newer kernel with lenny?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:353
+#: en/faq.xml:169
 msgid ""
 "A: A build with backports.org kernels will fail as that repository lacks the "
 "necessary module packages (linux-modules-extra-2.6, aufs, etc.). Use the "
@@ -1045,68 +999,59 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:355
+#: en/faq.xml:169
 #, no-wrap
-msgid ""
-"$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6 squashfs-modules-2.6'\n"
-"\n"
-"$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.chroot\n"
-"$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.binary\n"
-"\n"
-"$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.chroot.gpg\n"
-"$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.binary.gpg\n"
-"\n"
-"$ lh_build"
+msgid "$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6 squashfs-modules-2.6' $ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' &gt; config/chroot_sources/backports-kernel.chroot $ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' &gt; config/chroot_sources/backports-kernel.binary $ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.chroot.gpg $ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.binary.gpg $ lh_build"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:354
+#: en/faq.xml:169
 msgid "The quick way to success: <placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:368
+#: en/faq.xml:172
 msgid "Q: How do I use a custom kernel?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:369
+#: en/faq.xml:172
 msgid ""
-"&#9002; Is there a nice way of booting debian-live with a custom kernel (not "
-"in an apt repo)?"
+"〉 Is there a nice way of booting debian-live with a custom kernel (not in "
+"an apt repo)?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:370
+#: en/faq.xml:172
 msgid ""
 "A: Copy it into config/chroot_local-packages and set LH_LINUX_PACKAGES=\"none"
 "\" or use lh config --linux-packages \" \""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:371
+#: en/faq.xml:172
 msgid ""
 "Don't forget to compile your kernel with an union filesystem (unionfs or "
 "aufs), squashfs modules, and initrd support."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:372
+#: en/faq.xml:172
 msgid ""
-"&#9002; I can cause the kernel to be installed but it seems this happens "
-"later than grub/syslinux is configured so it's not listed and casper/ and "
-"the menu require munging."
+"〉 I can cause the kernel to be installed but it seems this happens later "
+"than grub/syslinux is configured so it's not listed and casper/ and the menu "
+"require munging."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:373
+#: en/faq.xml:172
 msgid ""
 "You need to follow the debian scheme, e.g. placing the files in /boot as "
 "vmlinuz-$version and initrd.img-$version etc."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:374
+#: en/faq.xml:172
 msgid ""
 "I personally wouldn't go that way which is too much of a hassle, and just "
 "use make-kpkg to produce custom kernel deb packages. They should integrate "
@@ -1115,23 +1060,23 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:375
+#: en/faq.xml:172
 msgid ""
 "<emphasis>Hint:</emphasis> to work around an error, which lh_binary_syslinux "
 "will throw on custom kernels if there is not an 468/686 in the kernel-name, "
 "you need to set CONFIG_LOCALVERSION=\"-486\" or \"-686\" within the kernel "
-"configuration (-> General setup -> Local version set to -486 or -686) "
+"configuration (-&gt; General setup -&gt; Local version set to -486 or -686) "
 "corresponding to LH_LINUX_FLAVOURS=\"\" or \"686\". this at least up till "
 "live-helper version 1.0~a40-1"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:376
+#: en/faq.xml:172
 msgid "see"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:377
+#: en/faq.xml:172
 msgid ""
 "<ulink url=\"http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-"
 "July/001947.html\"> http://lists.alioth.debian.org/pipermail/debian-live-"
@@ -1139,12 +1084,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:377
+#: en/faq.xml:172
 msgid "and"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:378
+#: en/faq.xml:172
 msgid ""
 "<ulink url=\"http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-"
 "November/002581.html\">http://lists.alioth.debian.org/pipermail/debian-live-"
@@ -1152,17 +1097,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:384
+#: en/faq.xml:175
 msgid "Q: How do I create a cross arch live CD image?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:385
+#: en/faq.xml:175
 msgid "<command>A: In short:</command> You can't. Read on:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:386
+#: en/faq.xml:175
 msgid ""
 "The procedure to create a live CD is based on creating a chroot that "
 "contains the files that will be finally available on the live CD. The live "
@@ -1173,7 +1118,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:387
+#: en/faq.xml:175
 msgid ""
 "Once the live CD scripts chroots into the chroot dir they have some "
 "operations to do inside that environment and your real system won't be able "
@@ -1181,7 +1126,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:388
+#: en/faq.xml:175
 msgid ""
 "So you only are able to make live CD for the arch you run on. But this "
 "doesn't prevent you run qemu or some other machine emulator that make this "
@@ -1189,22 +1134,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:393
+#: en/faq.xml:178
 msgid "Q: When is a lh_clean necessary?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:394
+#: en/faq.xml:178
 msgid "lh_clean is a script in /usr/bin/"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:395
+#: en/faq.xml:178
 msgid "A: That depends what you've changed between builds"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para><para>
-#: en/faq.xml:396
+#: en/faq.xml:178
 msgid ""
 "If, for example, you've built an iso image and you want a usb image, you "
 "only need to run <command> lh_clean --binary </command> before you run "
@@ -1212,7 +1157,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para><para>
-#: en/faq.xml:397
+#: en/faq.xml:178
 msgid ""
 "If you've <command> changed anything in the chroot </command> , you'll need "
 "to cleanup both chroot and binary with <command> lh_clean </command>before "
@@ -1220,28 +1165,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:403
+#: en/faq.xml:181
 msgid "Q: How can i set boot= parameters?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:404
+#: en/faq.xml:182
 msgid "A: Set LH_BOOTAPPEND_LIVE in config/binary"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:409
+#: en/faq.xml:185
 msgid ""
 "Q: How do I include different modules to load when the live system boots?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:410
+#: en/faq.xml:185
 msgid "A: Configure config/chroot_local-includes/etc/initramfs-tools/"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:411
+#: en/faq.xml:185
 msgid ""
 "The lh_chroot_hacks helper rebuilds the live/initrd1.img using the default "
 "initramfs.conf \"MODULES = most\". You may override that by supplying your "
@@ -1249,15 +1194,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:412
+#: en/faq.xml:185
 #, no-wrap
-msgid ""
-"mkdir -p config/chroot_local-includes/etc/initramfs-tools/\n"
-"echo \"atl2\" >> config/chroot_local-includes/etc/initramfs-tools/modules"
+msgid "mkdir -p config/chroot_local-includes/etc/initramfs-tools/ echo \"atl2\" &gt;&gt; config/chroot_local-includes/etc/initramfs-tools/modules"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:412
+#: en/faq.xml:185
 msgid ""
 "<placeholder type=\"screen\" id=\"0\"/> <note>Even though initramfs.conf(5) "
 "says \"most adds all the framebuffer, acpi, file system, ide, sata, scsi and "
@@ -1267,17 +1210,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:419
+#: en/faq.xml:188
 msgid "Q: Can I have a splash screen?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:420
+#: en/faq.xml:188
 msgid "A: Yes you can"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:421
+#: en/faq.xml:188
 msgid ""
 "You will not know what is going on when the splash screen is active, it may "
 "fail to activate on some hardware or break X on other (both usplash and "
@@ -1287,12 +1230,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:422
+#: en/faq.xml:188
 msgid "To use splashy:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:423
+#: en/faq.xml:188
 msgid ""
 "1) install splashy and read the README, the manpages are useless for setting "
 "it up. Add some parameters to your kernel command line, such as in your "
@@ -1301,13 +1244,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:424
+#: en/faq.xml:188
 #, no-wrap
 msgid "vga=792 splash quiet"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:425
+#: en/faq.xml:188
 msgid ""
 "<filename>vga </filename>to select video mode, <filename>splash </"
 "filename>to activate splashy, <filename>quiet</filename> to suppress most "
@@ -1316,38 +1259,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:427
+#: en/faq.xml:188
 #, no-wrap
-msgid ""
-"echo splashy > config/chroot_local-packageslists/splashy\n"
-"echo splashy-themes >> config/chroot_local-packageslists/splashy"
+msgid "echo splashy &gt; config/chroot_local-packageslists/splashy echo splashy-themes &gt;&gt; config/chroot_local-packageslists/splashy"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:426
+#: en/faq.xml:188
 msgid ""
 "You might want to add splashy to the list of packages installed in your "
 "image: <placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:429
+#: en/faq.xml:188
 msgid "and select a theme:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:430
+#: en/faq.xml:188
 #, no-wrap
-msgid ""
-"echo '#!/bin/sh' > config/chroot_local-hooks/splashy\n"
-"echo splashy_config -s debian-moreblue '||' true >> config/chroot_local-hooks/splashy\n"
-"# update the ramdisk to include the splash screen\n"
-"echo update-initramfs -u -k all >> config/chroot_local-hooks/splashy\n"
-"chmod 755 config/chroot_local-hooks/splashy \t"
+msgid "echo '#!/bin/sh' &gt; config/chroot_local-hooks/splashy echo splashy_config -s debian-moreblue '||' true &gt;&gt; config/chroot_local-hooks/splashy # update the ramdisk to include the splash screen echo update-initramfs -u -k all &gt;&gt; config/chroot_local-hooks/splashy chmod 755 config/chroot_local-hooks/splashy "
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:435
+#: en/faq.xml:188
 msgid ""
 "After you rebuild your live system you should observe a bluish splash screen "
 "while booting. Nothing happens while initramfs is running because there is "
@@ -1356,7 +1292,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:436
+#: en/faq.xml:188
 msgid ""
 "If <filename> vga=something</filename> sets a mode that your screen cannot "
 "show or your card cannot do vesa 2.0 (and thus you get plain text mode and "
@@ -1364,46 +1300,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:441
+#: en/faq.xml:191
 msgid "Q: Howto use my Broadcom eXtrem 2 network card (module bnx2) ?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:442
+#: en/faq.xml:191
 msgid "A: Add the firmwares to the initrd image."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:443
+#: en/faq.xml:191
 msgid ""
 "You need to install the non-free package \"firmware-bnx2\". Uncompress your "
 "initrd image, then copy files :"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:444
+#: en/faq.xml:191
 #, no-wrap
-msgid ""
-"cp /lib/firmware/bnx2* ${INITRD}/lib/firmware/\n"
-"cp /lib/udev/firmware.agent ${INITRD}/lib/udev/"
+msgid "cp /lib/firmware/bnx2* ${INITRD}/lib/firmware/ cp /lib/udev/firmware.agent ${INITRD}/lib/udev/"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:444
+#: en/faq.xml:191
 msgid ""
 "<placeholder type=\"screen\" id=\"0\"/> Recompress your initrd image and "
 "boot: it works !"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:451
+#: en/faq.xml:194
 msgid ""
 "Q: X is broken (the system boots, messages scroll by, and then the screen "
 "goes blank). What do I do?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:452
+#: en/faq.xml:194
 msgid ""
 "On my system starting X completely disables graphics so that I do not see "
 "anything even after X bails out and I am back to the console. To prevent "
@@ -1411,28 +1345,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:453
+#: en/faq.xml:194
 msgid ""
 "If you have a working splash screen or at least graphical console you can use"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:454
+#: en/faq.xml:194
 msgid "<filename>live xdriver=fbdev</filename>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:455
+#: en/faq.xml:194
 msgid "when booting the live system (instead of just enter)."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:456
+#: en/faq.xml:194
 msgid "Another driver you might want to try is <filename> vesa. </filename>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:457
+#: en/faq.xml:194
 msgid ""
 "If all fails you might try to set xdriver to some wrong value so that Xorg "
 "fails to start and you can examine the system while you still see something "
@@ -1440,17 +1374,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:458
+#: en/faq.xml:194
 msgid "<filename>live xdriver=none</filename>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:463
+#: en/faq.xml:197
 msgid "Q: How can I get Debian first stable versions?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:464
+#: en/faq.xml:198
 msgid ""
 "I'm developing software and testing it on Live-CD. Thanks for the LiveCD "
 "project. To be sure my development is fully compatible with the \"etch\" "
@@ -1461,46 +1395,46 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:468
+#: en/faq.xml:201
 msgid ""
 "Q: I get \"fopen: Permission denied\"-warnings from apt on building/at the "
 "live-system"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:469
+#: en/faq.xml:202
 msgid ""
 "That's a harmless bug in apt. However, if you want to get off this warnings "
 "in the live-system, add a file in chroot_local-hooks with follow row:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><screen>
-#: en/faq.xml:470
+#: en/faq.xml:203
 #, no-wrap
 msgid " chown -R man.man /var/cache/man "
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:474
+#: en/faq.xml:206
 msgid ""
 "Q: Why I always fail during \"Retrieving Packages\" stage when running "
 "lh_build? I have already set apt-http-proxy and so on."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:475
+#: en/faq.xml:207
 msgid ""
 "A: lh_build retrieves packages via wget, as a result you need to enable the "
 "proxy settings in /etc/wgetrc before running lh_build."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:479
+#: en/faq.xml:210
 msgid "Q: How do I edit Xorg.conf?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:480
+#: en/faq.xml:210
 msgid ""
 "A: Xorg.conf is generated every time system boots, so it's useless to put "
 "modifed Xorg.conf in config/choort_local-includes/etc/X11, because it will "
@@ -1512,69 +1446,58 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:481
+#: en/faq.xml:210
 #, no-wrap
-msgid "Option          \"XkbLayout\"     \"$XKB_LAYOUT\""
+msgid "Option \"XkbLayout\" \"$XKB_LAYOUT\""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:482
+#: en/faq.xml:210
 msgid "with the lines:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:483
+#: en/faq.xml:210
 #, no-wrap
-msgid ""
-"Option             \"XkbLayout\"     \"us,il\"\n"
-"Option             \"XkbOptions\"   \"grp:alt_shift_toggle,grp_led:scroll\""
+msgid "Option \"XkbLayout\" \"us,il\" Option \"XkbOptions\" \"grp:alt_shift_toggle,grp_led:scroll\""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:485
+#: en/faq.xml:210
 msgid "when \"us,il\" are the wanted keyboard layouts."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:486
+#: en/faq.xml:210
 msgid ""
 "You can force default screen resulotion (e.g. 1024*768) by adding the "
 "lines: ."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:487
+#: en/faq.xml:210
 #, no-wrap
-msgid ""
-"  SubSection     \"Display\"\n"
-"               Modes  \"1024x768\"\n"
-"               EndSubSection"
+msgid " SubSection \"Display\" Modes \"1024x768\" EndSubSection"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:490
+#: en/faq.xml:210
 msgid "between the lines:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:491
+#: en/faq.xml:210
 #, no-wrap
-msgid ""
-"  Section \"Screen\"\n"
-"        Identifier      \"Default Screen\"\n"
-"        Monitor         \"Configured Monitor\"\n"
-"            . . . . . . .\n"
-"SECTION\n"
-"printf \"EndSection\\n\" &#9002; &amp;4"
+msgid " Section \"Screen\" Identifier \"Default Screen\" Monitor \"Configured Monitor\" . . . . . . . SECTION printf \"EndSection\\n\" 〉 &amp;4"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:501
+#: en/faq.xml:213
 msgid "Q: Where are the build parameters for the prebuilt images"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:502
+#: en/faq.xml:214
 msgid ""
 "A: See <ulink url=\"http://live.debian.net/README.images\">http://live."
 "debian.net/README.images.</ulink>"
diff --git a/manual/po/de/index.html.in.po b/manual/po/de/index.html.in.po
index 0305f8c..a88cd44 100644
--- a/manual/po/de/index.html.in.po
+++ b/manual/po/de/index.html.in.po
@@ -1,16 +1,16 @@
-# German translations for Debconf package
-# Copyright (C) 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the Debconf package.
-# Automatically generated, 2008.
+# German translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Debconf 8\n"
+"Project-Id-Version: live-manual VERSION\n"
 "POT-Creation-Date: 2010-06-06 15:21+0300\n"
-"PO-Revision-Date: 2008-08-09 16:50+0300\n"
+"PO-Revision-Date: 2010-06-06 15:21+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: \n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/manual/po/de/index.xml.po b/manual/po/de/index.xml.po
index a982274..a373f48 100644
--- a/manual/po/de/index.xml.po
+++ b/manual/po/de/index.xml.po
@@ -1,67 +1,62 @@
-# German translations for Debconf package
-# Copyright (C) 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the Debconf package.
-# Automatically generated, 2008.
+# German translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Debconf 8\n"
-"POT-Creation-Date: 2010-06-06 14:13+0300\n"
-"PO-Revision-Date: 2008-08-09 16:50+0300\n"
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"PO-Revision-Date: 2010-06-06 17:46+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: \n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Content of the pubdate entity
-#: en/index.xml:5
+#: en/index.xml:4
 msgid "2010-06-06"
 msgstr ""
 
 #. type: Content of the version entity
-#: en/index.xml:6
+#: en/index.xml:5
 msgid "2.0~a1"
 msgstr ""
 
-# type: Attribute 'lang' of: <book>
 #. type: Attribute 'lang' of: <book>
-#: en/index.xml:8
+#: en/index.xml:7
 msgid "en"
 msgstr ""
 
-# type: Content of: <book><title>
 #. type: Content of: <book><title>
-#: en/index.xml:10
+#: en/index.xml:8
 msgid "Debian Live Manual"
 msgstr ""
 
-# type: Content of: <book><bookinfo>
 #. type: Content of: <book><bookinfo>
-#: en/index.xml:12
+#: en/index.xml:10
 msgid ""
 "<author> <othername>The Debian Live Project</othername> <email>debian-"
 "live at lists.debian.org</email> </author>"
 msgstr ""
 
-# type: Content of: <book><bookinfo><releaseinfo>
 #. type: Content of: <book><bookinfo><releaseinfo>
-#: en/index.xml:17
+#: en/index.xml:14
 msgid "&version;"
 msgstr ""
 
 #. type: Content of: <book><bookinfo>
-#: en/index.xml:18
+#: en/index.xml:15
 msgid ""
 "<pubdate>&pubdate;</pubdate> <copyright> <year>2008-2010</year> <holder>The "
 "Debian Live Project</holder> </copyright>"
 msgstr ""
 
-# type: Content of: <book><bookinfo><legalnotice><para>
 #. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:27
+#: en/index.xml:21
 msgid ""
 "This program is free software: you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -69,9 +64,8 @@ msgid ""
 "any later version."
 msgstr ""
 
-# type: Content of: <book><bookinfo><legalnotice><para>
 #. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:33
+#: en/index.xml:22
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -79,21 +73,19 @@ msgid ""
 "more details."
 msgstr ""
 
-# type: Content of: <book><bookinfo><legalnotice><para>
 #. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:39
+#: en/index.xml:23
 msgid ""
 "A copy of the GNU General Public License is available as <filename>/usr/"
 "share/common-licenses/GPL</filename> in the Debian GNU/Linux distribution or "
 "on the World Wide Web at <ulink url=\"http://www.gnu.org/copyleft/gpl.html"
-"\">the GNU web site</ulink>.  You can also obtain it by writing to the Free "
+"\">the GNU web site</ulink>. You can also obtain it by writing to the Free "
 "Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA "
 "02111-1307, USA."
 msgstr ""
 
-# type: Content of: <book><bookinfo><legalnotice><para>
 #. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:47
+#: en/index.xml:24
 msgid ""
 "If you want to print this reference, this document is also available in "
 "Portable Document Format (PDF)."
diff --git a/manual/po/de/installation.xml.po b/manual/po/de/installation.xml.po
index a2b2920..313e4e6 100644
--- a/manual/po/de/installation.xml.po
+++ b/manual/po/de/installation.xml.po
@@ -1,156 +1,137 @@
-# German translations for Debconf package
-# Copyright (C) 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the Debconf package.
-# Automatically generated, 2008.
+# German translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Debconf 8\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2008-08-09 16:50+0300\n"
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"PO-Revision-Date: 2010-06-06 17:46+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: \n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-# #-#-#-#-#  installation.xml.po (Debconf 8)  #-#-#-#-#
-# #-#-#-#-#  installation.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-# #-#-#-#-#  manual.xml.po (PACKAGE VERSION)  #-#-#-#-#
-# type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: en/about_manual.xml:90 en/installation.xml:76
+#: en/about_manual.xml:43 en/installation.xml:71
 msgid "&live-initramfs;"
 msgstr ""
 
-# type: Content of: <chapter><title>
 #. type: Content of: <chapter><title>
-#: en/installation.xml:7
+#: en/installation.xml:6
 msgid "Installation"
 msgstr ""
 
-# type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: en/installation.xml:10
+#: en/installation.xml:8
 msgid "Requirements"
 msgstr ""
 
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: en/installation.xml:12
+#: en/installation.xml:9
 msgid "Building Debian Live images has very few system requirements:"
 msgstr ""
 
-# type: Content of: <chapter><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:15
+#: en/installation.xml:12
 msgid "Super user (root) access"
 msgstr ""
 
-# type: Content of: <chapter><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:16
+#: en/installation.xml:15
 msgid "An up-to-date version of &live-helper;"
 msgstr ""
 
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:17
+#: en/installation.xml:18
 msgid ""
 "A POSIX-compliant shell, such as <command>bash</command> or <command>dash</"
 "command>."
 msgstr ""
 
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:18
+#: en/installation.xml:21
 msgid "<command>debootstrap</command> or <command>cdebootstrap</command>"
 msgstr ""
 
-# type: Content of: <chapter><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:19
+#: en/installation.xml:24
 msgid "Linux 2.6.x"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/installation.xml:22
+#: en/installation.xml:27
 msgid ""
 "Note that using Debian or a Debian-derived distribution is not required - "
 "&live-helper; will run on almost any operating system with the above "
 "requirements."
 msgstr ""
 
-# type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: en/installation.xml:27
+#: en/installation.xml:30
 msgid "Installing &live-helper;"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/installation.xml:29
+#: en/installation.xml:31
 msgid "You can install &live-helper; in a number of different ways:"
 msgstr ""
 
-# type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: en/installation.xml:32 en/installation.xml:41
+#: en/installation.xml:34 en/installation.xml:48
 msgid "From the Debian repository"
 msgstr ""
 
-# type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: en/installation.xml:33 en/installation.xml:51
+#: en/installation.xml:37 en/installation.xml:55
 msgid "From source"
 msgstr ""
 
-# type: Content of: <chapter><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:34
+#: en/installation.xml:40
 msgid "From snapshots"
 msgstr ""
 
-# type: Content of: <chapter><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:35
+#: en/installation.xml:43
 msgid "From backports.org"
 msgstr ""
 
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: en/installation.xml:38
+#: en/installation.xml:46
 msgid ""
 "If you are using &lenny; or &sid; the recommended way is to install &live-"
 "helper; via the Debian repository."
 msgstr ""
 
-# type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:43
+#: en/installation.xml:49
 msgid "Simply install &live-helper; like any other package:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:44
+#: en/installation.xml:50
 #, no-wrap
 msgid "# apt-get install live-helper"
 msgstr ""
 
-# type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:45
+#: en/installation.xml:51
 msgid "or"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:46
+#: en/installation.xml:52
 #, no-wrap
 msgid "# aptitude install live-helper"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:53
+#: en/installation.xml:56
 msgid ""
 "&live-helper; is developed using the Git version control system. On Debian "
 "systems, this is provided by the <command>git-core</command> package. To "
@@ -158,68 +139,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:54
+#: en/installation.xml:57
 #, no-wrap
 msgid "$ git clone git://live.debian.net/git/live-helper.git"
 msgstr ""
 
-# type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:55
+#: en/installation.xml:58
 msgid "You can build and install your own Debian package by executing:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:57
+#: en/installation.xml:59
 #, no-wrap
-msgid ""
-" $ cd live-helper\n"
-" $ dpkg-buildpackage -rfakeroot -b -uc -us\n"
-" $ cd ..\n"
-" # dpkg -i live-helper*.deb\n"
+msgid " $ cd live-helper $ dpkg-buildpackage -rfakeroot -b -uc -us $ cd .. # dpkg -i live-helper*.deb "
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:62
+#: en/installation.xml:60
 msgid "You can also use a local version of &live-helper; without installation:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:63
+#: en/installation.xml:61
 #, no-wrap
 msgid "# live-helper/helpers/lh_local"
 msgstr ""
 
-# type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:64
+#: en/installation.xml:62
 msgid ""
 "Subsequent calls to <filename>lh_</filename>-prefixed helpers in that shell "
 "environment will then use the version located in the directory you executed "
 "<filename>lh_local</filename> from."
 msgstr ""
 
-# type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:65
+#: en/installation.xml:63
 msgid ""
 "You can also install &live-helper; directly to your system by executing:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:66
+#: en/installation.xml:64
 #, no-wrap
 msgid "# make install"
 msgstr ""
 
-# type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: en/installation.xml:71
+#: en/installation.xml:67
 msgid "From 'snapshots'"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:72
+#: en/installation.xml:68
 msgid ""
 "If you do not wish to build or install &live-helper; from source, you can "
 "use snapshots. These are built automatically from the latest version in Git "
@@ -228,48 +201,43 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:78
+#: en/installation.xml:73
 msgid ""
 "<emphasis>N.B. You do not need to install &live-initramfs; on your system to "
 "create customised Debian Live systems. However, doing so will do no harm.</"
 "emphasis>"
 msgstr ""
 
-# type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><section><title>
-#: en/installation.xml:81
+#: en/installation.xml:76
 msgid "Using a customised &live-initramfs;"
 msgstr ""
 
-# type: Content of: <chapter><section><section><para>
 #. type: Content of: <chapter><section><section><section><para>
-#: en/installation.xml:83
+#: en/installation.xml:77
 msgid ""
 "To modify the code you can follow the process below. Please ensure you are "
 "familiar with the terms mentioned in <xref linkend=\"terms\"/>."
 msgstr ""
 
-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:87
+#: en/installation.xml:80
 msgid "Checkout the &live-initramfs; source"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: en/installation.xml:88
+#: en/installation.xml:81
 #, no-wrap
 msgid "$ git clone git://live.debian.net/git/live-initramfs.git"
 msgstr ""
 
-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:91
+#: en/installation.xml:84
 msgid "Make changes to your local copy"
 msgstr ""
 
-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:92
+#: en/installation.xml:85
 msgid ""
 "And beware that if you want to add your pre-init script in live-bottom, you "
 "should name it without dashes '-', e.g: call it \"81new_feature\" and not "
@@ -277,12 +245,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:95
+#: en/installation.xml:88
 msgid "Build a &live-initramfs; <command>.deb</command>"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:96
+#: en/installation.xml:89
 msgid ""
 "You must build either on your target distribution or in a chroot containing "
 "your target platform: this means if your target is lenny then you should "
@@ -293,20 +261,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: en/installation.xml:98
+#: en/installation.xml:90
 #, no-wrap
-msgid ""
-"$ cd live-initramfs\n"
-"$ dpkg-buildpackage -rfakeroot -b -uc -us\n"
+msgid " $ cd live-initramfs $ dpkg-buildpackage -rfakeroot -b -uc -us "
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:103
+#: en/installation.xml:93
 msgid "Use the generated &live-initramfs; <command>.deb</command>"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:104
+#: en/installation.xml:94
 msgid ""
 "As &live-initramfs; is installed by the build system, installing the package "
 "in the host system is not sufficient: you should treat the generated "
@@ -316,12 +282,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
-#: en/installation.xml:110
+#: en/installation.xml:99
 msgid "Using &live-initramfs; snapshots"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: en/installation.xml:112
+#: en/installation.xml:100
 msgid ""
 "You can let &live-helper; automatically use the latest snapshot of &live-"
 "initramfs; by configuring a third-party repository in your live-system "
@@ -330,36 +296,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:116
+#: en/installation.xml:103
 msgid "Create a sources.list entry for the chroot stage:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: en/installation.xml:117
+#: en/installation.xml:104
 #, no-wrap
-msgid "echo \"deb http://live.debian.net/ sid-snapshots main contrib non-free\" > config/chroot_sources/debian-live_sid-snapshots.chroot"
+msgid "echo \"deb http://live.debian.net/ sid-snapshots main contrib non-free\" &gt; config/chroot_sources/debian-live_sid-snapshots.chroot"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:120
+#: en/installation.xml:107
 msgid "Create a sources.list entry for the binary stage:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: en/installation.xml:121
+#: en/installation.xml:108
 #, no-wrap
 msgid "cp config/chroot_sources/debian-live_sid-snapshots.chroot config/chroot_sources/debian-live_sid-snapshots.binary"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:124
+#: en/installation.xml:111
 msgid "Fetch the archive signing key:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: en/installation.xml:126
+#: en/installation.xml:112
 #, no-wrap
-msgid ""
-"wget http://live.debian.net/debian/project/openpgp/archive-key.asc -O config/chroot_sources/debian-live_sid-snapshots.chroot.gpg\n"
-"cp config/chroot_sources/debian-live_sid-snapshots.chroot.gpg config/chroot_sources/debian-live_sid-snapshots.binary.gpg\n"
+msgid " wget http://live.debian.net/debian/project/openpgp/archive-key.asc -O config/chroot_sources/debian-live_sid-snapshots.chroot.gpg cp config/chroot_sources/debian-live_sid-snapshots.chroot.gpg config/chroot_sources/debian-live_sid-snapshots.binary.gpg "
 msgstr ""
diff --git a/manual/po/de/internationalization.xml.po b/manual/po/de/internationalization.xml.po
deleted file mode 100644
index dac5dd9..0000000
--- a/manual/po/de/internationalization.xml.po
+++ /dev/null
@@ -1,94 +0,0 @@
-# German translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2010-06-06 12:07+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. type: Content of: <sect1><title>
-#: en/chapters/customization/internationalization.xml:7
-msgid "Customising Locale And Language"
-msgstr ""
-
-#. type: Content of: <sect1><para>
-#: en/chapters/customization/internationalization.xml:8
-msgid "This chapter discusses customisation for language specific parameters."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/internationalization.xml:11
-msgid "Default locale and keyboard"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para><screen>
-#: en/chapters/customization/internationalization.xml:17
-#, no-wrap
-msgid "$ lh_config --bootappend-live \"locale=en_GB.UTF-8\"\n"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para><screen>
-#: en/chapters/customization/internationalization.xml:21
-#, no-wrap
-msgid "$ lh_config --bootappend-live \"keyb=uk\"\n"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para><screen>
-#: en/chapters/customization/internationalization.xml:25
-#, no-wrap
-msgid "$ lh_config --bootappend-live \"locale=en_GB.UTF-8 keyb=uk\"\n"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para><screen>
-#: en/chapters/customization/internationalization.xml:29
-#, no-wrap
-msgid "$ lh_config --bootappend-live \"locale=uk\"\n"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/internationalization.xml:14
-msgid ""
-"The default locale when building a live cd is \"locale=en_US.UTF-8\".  To "
-"set the locale for the UK (locale=en_GB.UTF-8)  <placeholder type=\"screen\" "
-"id=\"0\"/> The entry for a British keyboard would be <placeholder type="
-"\"screen\" id=\"1\"/> To configure both the locale and the keyboard for the "
-"UK the entry would be <placeholder type=\"screen\" id=\"2\"/> or "
-"<placeholder type=\"screen\" id=\"3\"/>"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/internationalization.xml:37
-msgid "l10n Packages"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para><screen>
-#: en/chapters/customization/internationalization.xml:42
-#, no-wrap
-msgid "$ lh_config --language \"se\"\n"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para><screen>
-#: en/chapters/customization/internationalization.xml:46
-#, no-wrap
-msgid "  config/templates/syslinux/se\n"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/internationalization.xml:40
-msgid ""
-"lh build can automatically check for each package, for which it's know that "
-"there are -l10n packages available and install them. To add Swedish packages "
-"the entry would be <placeholder type=\"screen\" id=\"0\"/> This will also "
-"change the default syslinux language if <placeholder type=\"screen\" id="
-"\"1\"/> is available. Check syslinux configuration FIXME"
-msgstr ""
diff --git a/manual/po/de/live-environment.xml.po b/manual/po/de/live-environment.xml.po
index bc86c7a..ec1ab74 100644
--- a/manual/po/de/live-environment.xml.po
+++ b/manual/po/de/live-environment.xml.po
@@ -1,75 +1,57 @@
-# German translations for Debconf package
-# Copyright (C) 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the Debconf package.
-# Automatically generated, 2008.
+# German translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Debconf 8\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2008-08-09 16:50+0300\n"
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"PO-Revision-Date: 2010-06-06 17:46+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: \n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-# #-#-#-#-#  live-environment.xml.po (Debconf 8)  #-#-#-#-#
-# #-#-#-#-#  live-environment.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  resources.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  success-stories.xml.po (live-manual VERSION)  #-#-#-#-#
-# #-#-#-#-#  live-environment.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  resources.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  resources.xml.po (Debconf 8)  #-#-#-#-#
-# #-#-#-#-#  live-environment.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  resources.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><para>
-#: en/about_manual.xml:125 en/customization_bootup.xml:11
-#: en/customization_bootup.xml:20 en/customization_bootup.xml:26
-#: en/customization_bootup.xml:38 en/customization_bootup.xml:85
-#: en/customization_bootup.xml:92 en/customization_bootup.xml:99
-#: en/customization_bootup.xml:106 en/customization_packages.xml:36
-#: en/customization_packages.xml:306 en/customization_packages.xml:326
-#: en/customization_packages.xml:384 en/customization_packages.xml:492
-#: en/customization_packages.xml:535 en/live-environment.xml:11
-#: en/resources.xml:11 en/success-stories.xml:11
+#: en/about_manual.xml:65 en/customization_bootup.xml:8
+#: en/customization_bootup.xml:14 en/customization_bootup.xml:17
+#: en/customization_bootup.xml:25 en/customization_bootup.xml:37
+#: en/customization_bootup.xml:41 en/customization_bootup.xml:45
+#: en/customization_bootup.xml:49 en/customization_packages.xml:18
+#: en/customization_packages.xml:130 en/customization_packages.xml:138
+#: en/customization_packages.xml:160 en/customization_packages.xml:198
+#: en/customization_packages.xml:209 en/live-environment.xml:9
+#: en/resources.xml:9 en/success-stories.xml:8
 msgid "FIXME"
 msgstr ""
 
-# type: Content of: <chapter><title>
 #. type: Content of: <chapter><title>
-#: en/live-environment.xml:7
+#: en/live-environment.xml:6
 msgid "The Live environment"
 msgstr ""
 
-# type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: en/live-environment.xml:10
+#: en/live-environment.xml:8
 msgid "Swap space"
 msgstr ""
 
-# type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: en/live-environment.xml:15
+#: en/live-environment.xml:12
 msgid "Hostname"
 msgstr ""
 
 #. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:18
+#: en/live-environment.xml:13
 #, no-wrap
 msgid "lh_config --bootappend-live \"hostname=myhost\""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:16
+#: en/live-environment.xml:13
 msgid ""
 "The name of host running live system can be set with the <command>hostname</"
 "command> parameter into the <command>--bootappend-live</command> option of "
@@ -77,21 +59,18 @@ msgid ""
 "> This parameter can also be used in kernel command line."
 msgstr ""
 
-# type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: en/live-environment.xml:23
+#: en/live-environment.xml:16
 msgid "The Live user"
 msgstr ""
 
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:24
+#: en/live-environment.xml:17
 msgid "Username FIXME."
 msgstr ""
 
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:25
+#: en/live-environment.xml:18
 msgid ""
 "One important consideration is that the live user is created by &live-"
 "initramfs; during bootup, it is not created by &live-helper; when building "
@@ -99,7 +78,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:27
+#: en/live-environment.xml:19
 msgid ""
 "You can specify additional groups that the live user will belong to by "
 "preseeding the <command>passwd/user-default-groups</command> debconf value. "
@@ -109,54 +88,51 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><screen>
-#: en/live-environment.xml:30
+#: en/live-environment.xml:20
 #, no-wrap
-msgid " debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse\n"
+msgid " debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse "
 msgstr ""
 
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:33
+#: en/live-environment.xml:21
 msgid ""
 "For more information about debconf preseeding, please see <xref linkend="
 "\"debconf-preseed\"/>."
 msgstr ""
 
-# type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: en/live-environment.xml:38
+#: en/live-environment.xml:24
 msgid "Language"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:39
+#: en/live-environment.xml:25
 msgid "When the live system boots, language is involved in three steps:"
 msgstr ""
 
 #. type: Content of: <chapter><section><para><itemizedlist><listitem><simpara>
-#: en/live-environment.xml:41
+#: en/live-environment.xml:25
 msgid "the locale generation"
 msgstr ""
 
 #. type: Content of: <chapter><section><para><itemizedlist><listitem><simpara>
-#: en/live-environment.xml:42
+#: en/live-environment.xml:25
 msgid "setting the keyboard layout for the console"
 msgstr ""
 
 #. type: Content of: <chapter><section><para><itemizedlist><listitem><simpara>
-#: en/live-environment.xml:43
+#: en/live-environment.xml:25
 msgid "setting the keyboard layout for X"
 msgstr ""
 
-# type: Content of: <chapter><section><para><screen>
 #. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:48
+#: en/live-environment.xml:26
 #, no-wrap
 msgid "lh_config --bootappend-live \"locale=sv_SE.utf8\""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:46
+#: en/live-environment.xml:26
 msgid ""
 "To define the locale that should be generated, use the <command>locale</"
 "command> parameter into the <command>--bootappend-live</command> option of "
@@ -168,22 +144,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:53
+#: en/live-environment.xml:27
 #, no-wrap
-msgid ""
-"$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name\n"
-"\t&lt;name&gt;se&lt;/name&gt;\n"
+msgid "$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name &lt;name&gt;se&lt;/name&gt; "
 msgstr ""
 
-# type: Content of: <chapter><section><para><screen>
 #. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:59
+#: en/live-environment.xml:27
 #, no-wrap
 msgid "lh_config --bootappend-live \"locale=sv_SE.utf8 keyb=se\""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:51
+#: en/live-environment.xml:27
 msgid ""
 "Both the console and X keyboard configuration depends on the <command>keyb</"
 "command> parameter of the <command>--bootappend-live</command> option. Valid "
@@ -195,22 +168,20 @@ msgid ""
 "a swedish keyboard layout in X use: <placeholder type=\"screen\" id=\"1\"/>"
 msgstr ""
 
-# type: Content of: <chapter><section><para><screen>
 #. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:64
+#: en/live-environment.xml:28
 #, no-wrap
 msgid "for i in `find /usr/share/keymaps/ -iname \"*kmap.gz\"`; do basename $i | head -c -9; echo; done | sort | less "
 msgstr ""
 
-# type: Content of: <chapter><section><para><screen>
 #. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:68
+#: en/live-environment.xml:28
 #, no-wrap
 msgid "lh_config --bootappend-live \"locale=sv_SE.utf8 keyb=se-latin1\""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:63
+#: en/live-environment.xml:28
 msgid ""
 "A list of the valid values of the keyboards for the console can be figured "
 "with the following command: <placeholder type=\"screen\" id=\"0\"/> To make "
@@ -219,15 +190,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:73
+#: en/live-environment.xml:29
 #, no-wrap
-msgid ""
-"lh_config --bootappend-live \\\n"
-"  \"locale=fr_FR.UTF-8 klayout=fr kvariant=bepo kmodel=tm2030usb\""
+msgid "lh_config --bootappend-live \\ \"locale=fr_FR.UTF-8 klayout=fr kvariant=bepo kmodel=tm2030usb\""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:72
+#: en/live-environment.xml:29
 msgid ""
 "Alternatively, you can use the <literal>console-setup</literal> package, a "
 "tool to let you configure console layout using X (XKB) definitions; you can "
@@ -242,14 +211,13 @@ msgid ""
 "to the <literal>klayout</literal>'s value."
 msgstr ""
 
-# type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: en/live-environment.xml:81
+#: en/live-environment.xml:32
 msgid "Persistence"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:82
+#: en/live-environment.xml:33
 msgid ""
 "A live cd paradigm is a preinstalled system which runs from read-only media, "
 "like a cdrom, where writes and modifications do not survive reboots of the "
@@ -257,7 +225,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:83
+#: en/live-environment.xml:34
 msgid ""
 "A Debian Live system is a generalization of this paradigm and thus supports "
 "other media in addition to CDs; but still, in its default behaviour, it "
@@ -266,7 +234,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:85
+#: en/live-environment.xml:35
 msgid ""
 "Persistence is a common name for different kinds of solutions for saving "
 "across reboots some, or all, of this runtime evolution of the system. To "
@@ -277,7 +245,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:86
+#: en/live-environment.xml:36
 msgid ""
 "The data stored on this ramdisk should be saved on a writable persistent "
 "medium like a Hard Disk, a USB key, a network share or even a session of a "
@@ -286,14 +254,13 @@ msgid ""
 "parameter to be specified at boot time: <command>persistent</command>."
 msgstr ""
 
-# type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: en/live-environment.xml:88
+#: en/live-environment.xml:38
 msgid "Full persistence"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:89
+#: en/live-environment.xml:39
 msgid ""
 "By 'full persistence' it is meant that instead of using a tmpfs for storing "
 "modifications to the read-only media (with the copy-on-write, COW, system) a "
@@ -305,28 +272,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
-#: en/live-environment.xml:92
+#: en/live-environment.xml:40
 #, no-wrap
-msgid "# mkfs.ext2 -L live-rw /dev/sdb1\n"
+msgid " # mkfs.ext2 -L live-rw /dev/sdb1 "
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:95
+#: en/live-environment.xml:41
 msgid ""
 "If you already have a partition on your device, you could just change the "
 "label with one of the following:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
-#: en/live-environment.xml:98
+#: en/live-environment.xml:42
 #, no-wrap
-msgid ""
-"# tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
-"# dosfslabel /dev/sdb1 live-rw # for a fat filesystem\n"
+msgid " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems # dosfslabel /dev/sdb1 live-rw # for a fat filesystem "
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:102
+#: en/live-environment.xml:43
 msgid ""
 "But since live system users cannot always use a hard drive partition, and "
 "considering that most USB keys have poor write speeds, 'full' persistence "
@@ -336,28 +301,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
-#: en/live-environment.xml:105
+#: en/live-environment.xml:44
 #, no-wrap
-msgid ""
-"$ dd if=/dev/null of=live-rw bs=1G seek=1\t# for a 1GB sized image file\n"
-"$ /sbin/mkfs.ext2 -F live-rw\n"
+msgid " $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file $ /sbin/mkfs.ext2 -F live-rw "
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:109
+#: en/live-environment.xml:45
 msgid ""
 "Then copy the <command>live-rw</command> file to a writable partition and "
 "reboot with the boot parameter 'persistent'."
 msgstr ""
 
-# type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: en/live-environment.xml:112
+#: en/live-environment.xml:48
 msgid "Home automounting"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:113
+#: en/live-environment.xml:49
 msgid ""
 "If during the boot a partition (filesystem) image file or a partition "
 "labeled <command>home-rw</command> is discovered, this filesystem will be "
@@ -366,14 +328,13 @@ msgid ""
 "persistence."
 msgstr ""
 
-# type: Content of: <chapter><section><section><title>
 #. type: Content of: <chapter><section><section><title>
-#: en/live-environment.xml:116
+#: en/live-environment.xml:52
 msgid "Snapshots"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:117
+#: en/live-environment.xml:53
 msgid ""
 "Snapshots are collections of files and directories which are not mounted "
 "while running but which are copied from a persistent device to the system "
@@ -391,7 +352,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:118
+#: en/live-environment.xml:54
 msgid ""
 "A /home version of snapshot exists too and its label is <command>home-sn.*</"
 "command>; it works the same as the main snapshot but it is only applied to /"
@@ -399,19 +360,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:119
+#: en/live-environment.xml:55
 msgid ""
 "Snapshots cannot currently handle file deletion but full persistence and "
 "home automounting can."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/live-environment.xml:122
+#: en/live-environment.xml:58
 msgid "Persistent SubText"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:123
+#: en/live-environment.xml:59
 msgid ""
 "If a user would need multiple persistent storage of the same type for "
 "different locations or testing, such as <command>live-rw-nonwork</command> "
@@ -425,12 +386,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/live-environment.xml:126
+#: en/live-environment.xml:62
 msgid "Partial remastering"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:127
+#: en/live-environment.xml:63
 msgid ""
 "The runtime modification of the tmpfs could be collected using live-snapshot "
 "in a squashfs and added to the cd by remastering the iso in the case of cd-r "
diff --git a/manual/po/de/manual.xml.po b/manual/po/de/manual.xml.po
deleted file mode 100644
index 814133c..0000000
--- a/manual/po/de/manual.xml.po
+++ /dev/null
@@ -1,478 +0,0 @@
-# German translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2010-06-06 12:07+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/chapters/basics.xml:113 en/chapters/basics.xml:128
-#: en/chapters/basics.xml:144 en/chapters/basics.xml:158
-#: en/chapters/basics.xml:194 en/chapters/basics.xml:220
-#: en/chapters/basics.xml:230 en/chapters/basics.xml:239
-#: en/chapters/basics.xml:253 en/chapters/basics.xml:275
-#: en/chapters/basics.xml:302 en/chapters/basics.xml:312
-#: en/chapters/basics.xml:320 en/chapters/basics.xml:354
-#: en/chapters/basics.xml:364 en/chapters/basics.xml:382
-#: en/chapters/basics.xml:429 en/chapters/basics.xml:498
-#: en/chapters/basics.xml:530 en/chapters/basics.xml:539
-#: en/chapters/basics.xml:590 en/chapters/basics.xml:646
-#: en/chapters/faq.xml:64 en/chapters/faq.xml:241 en/chapters/faq.xml:244
-#: en/chapters/faq.xml:252 en/chapters/faq.xml:256 en/chapters/faq.xml:264
-#: en/chapters/faq.xml:279 en/chapters/faq.xml:287 en/chapters/faq.xml:334
-#: en/chapters/faq.xml:424 en/chapters/faq.xml:430 en/chapters/faq.xml:481
-#: en/chapters/faq.xml:483 en/chapters/faq.xml:487 en/chapters/faq.xml:491
-#: en/chapters/overview.xml:181 en/chapters/overview.xml:230
-#: en/chapters/overview.xml:240 en/chapters/about/manual.xml:298
-#: en/chapters/about/manual.xml:308 en/chapters/about/manual.xml:318
-#: en/chapters/about/manual.xml:338 en/chapters/about/manual.xml:351
-#: en/chapters/about/manual.xml:366 en/chapters/about/manual.xml:379
-#: en/chapters/about/manual.xml:389 en/chapters/customization/packages.xml:50
-#: en/chapters/customization/packages.xml:58
-#: en/chapters/customization/packages.xml:71
-#: en/chapters/customization/packages.xml:80
-#: en/chapters/customization/packages.xml:104
-#: en/chapters/customization/packages.xml:222
-#: en/chapters/customization/packages.xml:230
-#: en/chapters/customization/packages.xml:265
-#: en/chapters/customization/packages.xml:310
-#: en/chapters/customization/packages.xml:330
-#: en/chapters/customization/packages.xml:341
-#: en/chapters/customization/packages.xml:352
-#: en/chapters/customization/packages.xml:362
-msgid "<placeholder type=\"screen\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/installation.xml:76 en/chapters/about/manual.xml:90
-msgid "&live-initramfs;"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/live-environment.xml:11 en/chapters/resources.xml:11
-#: en/chapters/success-stories.xml:11 en/chapters/about/manual.xml:125
-#: en/chapters/customization/bootup.xml:11
-#: en/chapters/customization/bootup.xml:20
-#: en/chapters/customization/bootup.xml:26
-#: en/chapters/customization/bootup.xml:38
-#: en/chapters/customization/bootup.xml:85
-#: en/chapters/customization/bootup.xml:92
-#: en/chapters/customization/bootup.xml:99
-#: en/chapters/customization/bootup.xml:106
-#: en/chapters/customization/packages.xml:36
-#: en/chapters/customization/packages.xml:306
-#: en/chapters/customization/packages.xml:326
-#: en/chapters/customization/packages.xml:384
-#: en/chapters/customization/packages.xml:492
-#: en/chapters/customization/packages.xml:535
-msgid "FIXME"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/overview.xml:17 en/chapters/about/manual.xml:80
-msgid "&live-helper;"
-msgstr ""
-
-#. type: Content of: <sect1><title>
-#: en/chapters/about/manual.xml:9
-msgid "About this manual"
-msgstr ""
-
-#. type: Content of: <sect1><para>
-#: en/chapters/about/manual.xml:12
-msgid ""
-"The main goal of this manual is to serve as a single access point to all "
-"documentation related to the Debian Live project. It does not include end-"
-"user documentation for using a Debian Live system."
-msgstr ""
-
-#. type: Content of: <sect1><para>
-#: en/chapters/about/manual.xml:18
-msgid ""
-"Some of the commands mentioned in the text must be executed with superuser "
-"privileges which can be obtained by becoming the root user via <filename>su</"
-"filename> or by using <filename>sudo</filename>. To distinguish between "
-"commands which may be executed by an unprivileged user and those requiring "
-"superuser privileges, commands are prepended by <command>$</command> or "
-"<command>#</command> respectively. This symbol is not a part of the command."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/about/manual.xml:28
-msgid "Terms"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:33
-msgid "Live system"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:37
-msgid ""
-"An operating system that can boot without installation to a hard drive.  "
-"Live systems do not alter local operating system(s) or file(s) already "
-"installed on the computer hard drive unless instructed to do so. Live "
-"systems are typically booted from media such as CDs or DVDs, some may also "
-"boot with USB sticks or over the network (via netboot images)."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:47
-msgid "Debian Live"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:51
-msgid ""
-"The Debian sub-project which maintains the &live-helper; and &live-"
-"initramfs; utilities."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:58
-msgid "Debian Live system"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:62
-msgid ""
-"A live system that uses software from the Debian operating system that may "
-"be booted from CDs, DVDs, USB sticks, over the network (via netboot images), "
-"and over the internet (via boot parameter fetch=URL)"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:70
-msgid "Build system / host system"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:74
-msgid "The environment used to create the live system."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:84
-msgid "A collection of scripts used to build customised Debian Live systems."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:94
-msgid ""
-"A collection of scripts used to boot live systems. &live-initramfs; is a "
-"fork of <filename>casper</filename> by Canonical, Ltd."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:101
-msgid "<filename>live-package</filename>"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:105
-msgid "The former name of &live-helper;."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:111
-msgid "Debian Installer / (d-i)"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:115
-msgid "The official installation system for the Debian distribution."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/about/manual.xml:121 en/chapters/customization/bootup.xml:104
-msgid "Cheat codes"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:131
-msgid "chroot"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:135
-msgid ""
-"The chroot program, chroot(8), enables us to run different instances of the "
-"GNU/Linux environment on a single system simultaneously without rebooting."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:143
-msgid "binary image"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:147
-msgid ""
-"On a live system, binary image refers to the binary filesystem and the "
-"respective extension, such as binary.iso or binary.img."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:154
-msgid "Target distribution"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:158
-msgid ""
-"The distribution upon which your live system will be based. This can differ "
-"from the distribution of your Build System."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:165
-msgid "&lenny;/&squeeze;/&sid; stable/testing/unstable"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:169
-msgid ""
-"The \"stable\" distribution contains the latest officially released "
-"distribution of Debian. The \"testing\" distribution is the staging area for "
-"the next stable release. A major advantage of using this distribution is "
-"that it has more recent versions of software relative to the \"stable\" "
-"release. The \"unstable\" distribution is where active development of Debian "
-"occurs. Generally, this distribution is run by developers and those who like "
-"to live on the edge."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:179
-msgid ""
-"At the time of writing, &lenny; is the current \"stable\" release and "
-"&squeeze; is the current \"testing\" release. &sid; will always be a synonym "
-"for the \"unstable\" release."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/about/manual.xml:191
-msgid "Authors"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/about/manual.xml:194
-msgid "A list of authors (in alphabetical order):"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:201
-msgid "Ben Armstrong"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:207
-msgid "Brendan Sleight"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:213
-msgid "Chris Lamb"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:219
-msgid "Daniel Baumann"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:225
-msgid "Franklin Piat"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:231
-msgid "Jonas Stein"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:237
-msgid "Kai Hendry"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:243
-msgid "Marco Amadori"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:249
-msgid "Mathieu Geli"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:255
-msgid "Matthias Kirschner"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:261
-msgid "Richard Nelson"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:267
-msgid "Trent W. Buck"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/about/manual.xml:276
-msgid "Contributing to this document"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/about/manual.xml:279
-msgid ""
-"This manual is intended as a community project and all proposals for "
-"improvements and contributions are extremely welcome. The preferred way to "
-"submit a contribution is to send it to the mailing list. Please see <xref "
-"linkend=\"contact\" /> for more information."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/about/manual.xml:286
-msgid ""
-"When submitting a contribution please clearly identify its copyright holder "
-"and include the licensing statement. Note that to be accepted the "
-"contribution must be licensed under the same license as the rest of the "
-"document, namely GPL version 3 or later."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/about/manual.xml:293
-msgid ""
-"The sources for this manual are maintained using the Git version control "
-"system. You can checkout the latest copy by executing:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para><screen>
-#: en/chapters/about/manual.xml:298
-#, no-wrap
-msgid "$ git clone git://live.debian.net/git/live-manual.git"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/about/manual.xml:302
-msgid ""
-"Prior to submission of your contribution, please preview your work. To "
-"preview the live-manual, ensure the packages needed for building are "
-"installed by executing:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para><screen>
-#: en/chapters/about/manual.xml:308
-#, no-wrap
-msgid ""
-"# apt-get install dblatex docbook-xml docbook-xsl make po4a\n"
-"\tw3m"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/about/manual.xml:313
-msgid ""
-"You may build the live-manual from the top level directory of your git "
-"checkout by executing:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para><screen>
-#: en/chapters/about/manual.xml:318
-#, no-wrap
-msgid "$ make build"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/about/manual.xml:322
-msgid "Applying patches"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/manual.xml:325
-msgid ""
-"Directly commiting to the repository is possible by anyone. However, we ask "
-"you to send bigger changes to the mailinglist to discuss them first.  In "
-"order to push to the repository, the following steps are required."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:334
-msgid "Fetch the public commit key:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/chapters/about/manual.xml:338
-#, no-wrap
-msgid ""
-"$ mkdir -p ~/.ssh/identity.d\n"
-"$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live -O ~/.ssh/identity.d/live-manual at debian-live\n"
-"$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub -O ~/.ssh/identity.d/live-manual at debian-live.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:347
-msgid "Add the following section to your openssh-client config:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/chapters/about/manual.xml:351
-#, no-wrap
-msgid ""
-" $ cat &gt;&gt; ~/.ssh/config &lt;&lt; EOF\n"
-"Host live.debian.net\n"
-"\tHostname live.debian.net\n"
-"\tUser gitosis\n"
-"\tIdentityFile ~/.ssh/identity.d/live-manual at debian-live\n"
-"EOF"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:362
-msgid "Checkout a clone of the manual through ssh:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/chapters/about/manual.xml:366
-#, no-wrap
-msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:372
-msgid ""
-"Commit the file after editing. Write commit messages, that consist of full "
-"useful sentences, starting with a capital letter and ending with a full "
-"stop. Usually starting with the form 'Fixing/Adding/Removing/Correcting/':"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/chapters/about/manual.xml:379
-#, no-wrap
-msgid "$ git commit -a"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:385
-msgid "Push the commit to the server:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/chapters/about/manual.xml:389
-#, no-wrap
-msgid "$ git push"
-msgstr ""
diff --git a/manual/po/de/meta.xml.po b/manual/po/de/meta.xml.po
deleted file mode 100644
index dc76b4e..0000000
--- a/manual/po/de/meta.xml.po
+++ /dev/null
@@ -1,271 +0,0 @@
-# German translations for Debconf package
-# Copyright (C) 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the Debconf package.
-# Automatically generated, 2008.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Debconf 8\n"
-"POT-Creation-Date: 2008-08-09 16:50+0300\n"
-"PO-Revision-Date: 2008-08-09 16:50+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-# type: Content of: <chapter><section><para>
-#: chapters/basics.xml:151 chapters/basics.xml:182
-#: chapters/customisation-bootup.xml:11 chapters/customisation-bootup.xml:20
-#: chapters/customisation-bootup.xml:26 chapters/customisation-bootup.xml:38
-#: chapters/customisation-bootup.xml:46 chapters/customisation-bootup.xml:53
-#: chapters/customisation-bootup.xml:60 chapters/customisation-bootup.xml:67
-#: chapters/customisation-packages.xml:21
-#: chapters/customisation-packages.xml:138
-#: chapters/customisation-packages.xml:183
-#: chapters/customisation-packages.xml:220
-#: chapters/customisation-packages.xml:245 chapters/live-environment.xml:11
-#: chapters/live-environment.xml:16 chapters/live-environment.xml:36
-#: chapters/live-environment.xml:41 chapters/meta.xml:47 chapters/meta.xml:51
-#: chapters/meta.xml:55 chapters/meta.xml:59 chapters/meta.xml:63
-#: chapters/meta.xml:67 chapters/overview.xml:115 chapters/resources.xml:11
-msgid "FIXME"
-msgstr ""
-
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: chapters/customisation-bootup.xml:65 chapters/meta.xml:50
-msgid "Cheat codes"
-msgstr ""
-
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: chapters/installation.xml:170 chapters/meta.xml:38
-msgid "&live-initramfs;"
-msgstr ""
-
-# type: Content of: <chapter><title>
-#: chapters/meta.xml:7
-msgid "About this manual"
-msgstr ""
-
-# type: Content of: <chapter><para>
-#: chapters/meta.xml:10
-msgid ""
-"The main goal of this manual is to serve as a single access point to all "
-"documentation related to the Debian Live project. It does not include end-"
-"user documentation for using a Debian Live system."
-msgstr ""
-
-# type: Content of: <chapter><para>
-#: chapters/meta.xml:12
-msgid ""
-"Some of the commands mentioned in the text must be executed with superuser "
-"privileges, either by becoming the root user or by using <filename>sudo</"
-"filename>. To distinguish between commands which may be executed by an "
-"unprivileged user and those requiring superuser privileges, commands are "
-"prepended by <computeroutput>$</computeroutput> or <computeroutput>#</"
-"computeroutput> respectively. This symbol is not a part of the command."
-msgstr ""
-
-# type: Content of: <chapter><section><title>
-#: chapters/meta.xml:15
-msgid "Terms"
-msgstr ""
-
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: chapters/meta.xml:18
-msgid "Live system"
-msgstr ""
-
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: chapters/meta.xml:19
-msgid ""
-"An operating system that can boot without installation to a hard drive. Live "
-"systems does not alter operating systems or files already installed on the "
-"computer hard drive unless instructed to do so. Live systems are typically "
-"booted from CD or DVD media as well as USB sticks and via netboot."
-msgstr ""
-
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: chapters/meta.xml:22
-msgid "Debian Live"
-msgstr ""
-
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: chapters/meta.xml:23
-msgid ""
-"The Debian sub-project which maintains the &live-helper; and &live-"
-"initramfs; utilities."
-msgstr ""
-
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: chapters/meta.xml:26
-msgid "Debian Live system"
-msgstr ""
-
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: chapters/meta.xml:27
-msgid ""
-"A Debian Live system is a live system that uses software from the Debian "
-"operating system."
-msgstr ""
-
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: chapters/meta.xml:30
-msgid "Build system / host system"
-msgstr ""
-
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: chapters/meta.xml:31
-msgid "The environment used to create the live system."
-msgstr ""
-
-# type: Content of: <chapter><section><title>
-#: chapters/meta.xml:34 chapters/overview.xml:12
-msgid "&live-helper;"
-msgstr ""
-
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: chapters/meta.xml:35
-msgid "A collection of scripts used to build customised Debian Live systems."
-msgstr ""
-
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: chapters/meta.xml:39
-msgid ""
-"A collection of scripts used to boot live systems. &live-initramfs; is a "
-"fork of <filename>casper</filename> by Canonical, Ltd."
-msgstr ""
-
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: chapters/meta.xml:42
-msgid "<filename>live-package</filename>"
-msgstr ""
-
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: chapters/meta.xml:43
-msgid "The former name of &live-initramfs;."
-msgstr ""
-
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: chapters/meta.xml:46
-msgid "Debian Installer / (d-i)"
-msgstr ""
-
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: chapters/meta.xml:54
-msgid "chroot"
-msgstr ""
-
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: chapters/meta.xml:58
-msgid "binary image"
-msgstr ""
-
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: chapters/meta.xml:62
-msgid "Target distribution"
-msgstr ""
-
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: chapters/meta.xml:66
-msgid "etch/lenny/sid stable/testing/unstable"
-msgstr ""
-
-# type: Content of: <chapter><section><title>
-#: chapters/meta.xml:75
-msgid "Authors"
-msgstr ""
-
-# type: Content of: <chapter><section><para>
-#: chapters/meta.xml:76
-msgid "A list of authors (in alphabetical order):"
-msgstr ""
-
-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: chapters/meta.xml:79
-msgid "Ben Armstrong"
-msgstr ""
-
-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: chapters/meta.xml:80
-msgid "Brendan Sleight"
-msgstr ""
-
-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: chapters/meta.xml:81
-msgid "Chris Lamb"
-msgstr ""
-
-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: chapters/meta.xml:82
-msgid "Daniel Baumann"
-msgstr ""
-
-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: chapters/meta.xml:83
-msgid "Franklin Piat"
-msgstr ""
-
-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: chapters/meta.xml:84
-msgid "Kai Hendry"
-msgstr ""
-
-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: chapters/meta.xml:85
-msgid "Marco Amadori"
-msgstr ""
-
-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: chapters/meta.xml:86
-msgid "Mathieu Geli"
-msgstr ""
-
-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: chapters/meta.xml:87
-msgid "Matthias Kirschner"
-msgstr ""
-
-# type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: chapters/meta.xml:88
-msgid "Trent W. Buck"
-msgstr ""
-
-# type: Content of: <chapter><section><title>
-#: chapters/meta.xml:94
-msgid "Contributing to this document"
-msgstr ""
-
-# type: Content of: <chapter><section><para>
-#: chapters/meta.xml:95
-msgid ""
-"This manual is intended as a community project and all proposals for "
-"improvements and contributions are extremely welcome. The preferred way to "
-"submit a contribution is to send it to the mailing list. Please see <xref "
-"linkend=\"contact\"/> for more information."
-msgstr ""
-
-# type: Content of: <chapter><section><para>
-#: chapters/meta.xml:97
-msgid ""
-"When submitting a contribution please clearly identify its copyright holder "
-"and include the licensing statement. Note that to be accepted the "
-"contribution must be licensed under the same license as the rest of the "
-"document, namely GPL version 3 or later."
-msgstr ""
-
-# type: Content of: <chapter><section><para>
-#: chapters/meta.xml:99
-msgid ""
-"The sources for this manual are maintained using the Git version control "
-"system. You can checkout the latest copy by executing:"
-msgstr ""
-
-# type: Content of: <chapter><section><screen>
-#: chapters/meta.xml:101
-#, no-wrap
-msgid ""
-"\n"
-"$ git clone git://git.debian.org/git/debian-live/live-manual.git\n"
-msgstr ""
diff --git a/manual/po/de/overview.xml.po b/manual/po/de/overview.xml.po
index 4739299..674289d 100644
--- a/manual/po/de/overview.xml.po
+++ b/manual/po/de/overview.xml.po
@@ -1,74 +1,69 @@
-# German translations for Debconf package
-# Copyright (C) 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the Debconf package.
-# Automatically generated, 2008.
+# German translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Debconf 8\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2008-08-09 16:50+0300\n"
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"PO-Revision-Date: 2010-06-06 17:46+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: \n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-# #-#-#-#-#  overview.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: en/about_manual.xml:80 en/overview.xml:17
+#: en/about_manual.xml:37 en/overview.xml:9
 msgid "&live-helper;"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/about_manual.xml:298 en/about_manual.xml:308 en/about_manual.xml:318
-#: en/about_manual.xml:338 en/about_manual.xml:351 en/about_manual.xml:366
-#: en/about_manual.xml:379 en/about_manual.xml:389 en/basics.xml:113
-#: en/basics.xml:128 en/basics.xml:144 en/basics.xml:158 en/basics.xml:194
-#: en/basics.xml:220 en/basics.xml:230 en/basics.xml:239 en/basics.xml:253
-#: en/basics.xml:275 en/basics.xml:302 en/basics.xml:312 en/basics.xml:320
-#: en/basics.xml:354 en/basics.xml:364 en/basics.xml:382 en/basics.xml:429
-#: en/basics.xml:498 en/basics.xml:530 en/basics.xml:539 en/basics.xml:590
-#: en/basics.xml:646 en/customization_packages.xml:50
-#: en/customization_packages.xml:58 en/customization_packages.xml:71
-#: en/customization_packages.xml:80 en/customization_packages.xml:104
-#: en/customization_packages.xml:222 en/customization_packages.xml:230
-#: en/customization_packages.xml:265 en/customization_packages.xml:310
-#: en/customization_packages.xml:330 en/customization_packages.xml:341
-#: en/customization_packages.xml:352 en/customization_packages.xml:362
-#: en/faq.xml:64 en/faq.xml:241 en/faq.xml:244 en/faq.xml:252 en/faq.xml:256
-#: en/faq.xml:264 en/faq.xml:279 en/faq.xml:287 en/faq.xml:334 en/faq.xml:424
-#: en/faq.xml:430 en/faq.xml:481 en/faq.xml:483 en/faq.xml:487 en/faq.xml:491
-#: en/overview.xml:181 en/overview.xml:230 en/overview.xml:240
+#: en/about_manual.xml:143 en/about_manual.xml:147 en/about_manual.xml:151
+#: en/about_manual.xml:160 en/about_manual.xml:166 en/about_manual.xml:172
+#: en/about_manual.xml:178 en/about_manual.xml:184 en/basics.xml:45
+#: en/basics.xml:50 en/basics.xml:57 en/basics.xml:60 en/basics.xml:72
+#: en/basics.xml:81 en/basics.xml:85 en/basics.xml:89 en/basics.xml:95
+#: en/basics.xml:105 en/basics.xml:118 en/basics.xml:122 en/basics.xml:126
+#: en/basics.xml:139 en/basics.xml:143 en/basics.xml:148 en/basics.xml:160
+#: en/basics.xml:170 en/basics.xml:182 en/basics.xml:186 en/basics.xml:205
+#: en/basics.xml:220 en/customization_packages.xml:25
+#: en/customization_packages.xml:29 en/customization_packages.xml:34
+#: en/customization_packages.xml:38 en/customization_packages.xml:48
+#: en/customization_packages.xml:102 en/customization_packages.xml:106
+#: en/customization_packages.xml:116 en/customization_packages.xml:132
+#: en/customization_packages.xml:140 en/customization_packages.xml:144
+#: en/customization_packages.xml:148 en/customization_packages.xml:152
+#: en/faq.xml:36 en/faq.xml:128 en/faq.xml:131 en/faq.xml:138 en/faq.xml:141
+#: en/faq.xml:163 en/faq.xml:188 en/faq.xml:210 en/overview.xml:61
+#: en/overview.xml:66 en/overview.xml:70
 msgid "<placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
-# type: Content of: <chapter><title>
 #. type: Content of: <chapter><title>
-#: en/overview.xml:9
+#: en/overview.xml:6
 msgid "Overview of tools"
 msgstr ""
 
-# type: Content of: <chapter><para>
 #. type: Content of: <chapter><para>
-#: en/overview.xml:12
+#: en/overview.xml:7
 msgid ""
 "This chapter contains an overview of the two main tools used in building "
 "Debian Live systems."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:20
+#: en/overview.xml:10
 msgid ""
-"&live-helper; is a collection of scripts to build Debian Live systems.  "
-"These scripts are also referred to as \"helpers\"."
+"&live-helper; is a collection of scripts to build Debian Live systems. These "
+"scripts are also referred to as \"helpers\"."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:25
+#: en/overview.xml:11
 msgid ""
 "The idea behind &live-helper; is to be a framework that uses a configuration "
 "directory to completely automate and customize all aspects of building a "
@@ -76,23 +71,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:31
+#: en/overview.xml:12
 msgid ""
 "Many concepts are similar to those in the <command>debhelper</command> "
 "Debian package tools written by Joey Hess:"
 msgstr ""
 
-# type: Content of: <chapter><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/overview.xml:39
+#: en/overview.xml:15
 msgid "The scripts have a central location for configuring their operation."
 msgstr ""
 
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/overview.xml:43
+#: en/overview.xml:16
 msgid ""
-"In <command>debhelper</command>, this is the <filename class=\"directory\" "
-">debian</filename> subdirectory of a package tree. For example, "
+"In <command>debhelper</command>, this is the <filename class=\"directory"
+"\">debian</filename> subdirectory of a package tree. For example, "
 "<command>dh_install</command> will look for a file called <filename>debian/"
 "&lt;packagename&gt;.install</filename> to determine which files should exist "
 "in a particular binary package. In much the same way, &live-helper; stores "
@@ -100,26 +94,25 @@ msgid ""
 "filename> subdirectory."
 msgstr ""
 
-# type: Content of: <chapter><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/overview.xml:55
+#: en/overview.xml:19
 msgid ""
 "The scripts are independent - that is to say, it is always safe to run each "
 "command."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:63
+#: en/overview.xml:22
 msgid ""
 "Unlike <command>debhelper</command>, &live-helper; contains a tool to "
 "generate a skeleton configuration directory, <filename>lh config</filename>. "
 "This could be considered to be similar to tools such as <command>dh-make</"
 "command>. For more information about <filename>lh config</filename>, please "
-"see <xref linkend=\"lh-config\" />."
+"see <xref linkend=\"lh-config\"/>."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:71
+#: en/overview.xml:23
 msgid ""
 "Besides the common <filename>config/common</filename>, which is used by all "
 "&live-helper; helper commands, some additional files can be used to "
@@ -130,7 +123,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:81
+#: en/overview.xml:24
 msgid ""
 "For example, the <command>lh bootstrap debootstrap</command> helper command "
 "uses files named <filename>config/bootstrap</filename> and <filename>config/"
@@ -140,9 +133,8 @@ msgid ""
 "complicated variable assignments."
 msgstr ""
 
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:90
+#: en/overview.xml:25
 msgid ""
 "&live-helper; respects environment variables which are present in the "
 "context of the shell it is running. If variables can be read from config "
@@ -153,7 +145,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:99
+#: en/overview.xml:26
 msgid ""
 "All config files are shell scripts which are sourced by a &live-helper; "
 "program. That means they have to follow the normal shell syntax. You can "
@@ -161,7 +153,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:105
+#: en/overview.xml:27
 msgid ""
 "In some rare cases you may want to have different versions of these files "
 "for different architectures or distributions. If files named <command>config/"
@@ -174,64 +166,63 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:117
+#: en/overview.xml:28
 msgid ""
-"Please see <xref linkend=\"installation\" /> for information on how to "
+"Please see <xref linkend=\"installation\"/> for information on how to "
 "install &live-helper;."
 msgstr ""
 
-# type: Content of: <chapter><section><para><para>
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:122
+#: en/overview.xml:29
 msgid ""
 "The remainder of this section discusses the three most important helpers:"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/overview.xml:129
+#: en/overview.xml:33
 msgid "<filename>lh config</filename>"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/overview.xml:133
+#: en/overview.xml:36
 msgid ""
 "Responsible for initialising a Live system configuration directory. See "
-"<xref linkend=\"lh-config\" /> for more information."
+"<xref linkend=\"lh-config\"/> for more information."
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/overview.xml:140
+#: en/overview.xml:41
 msgid "<filename>lh build</filename>"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/overview.xml:144
+#: en/overview.xml:44
 msgid ""
-"Responsible for starting a Live system build. See <xref linkend=\"lh-build"
-"\" /> for more information."
+"Responsible for starting a Live system build. See <xref linkend=\"lh-build\"/"
+"> for more information."
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/overview.xml:151
+#: en/overview.xml:49
 msgid "<filename>lh clean</filename>"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/overview.xml:155
+#: en/overview.xml:52
 msgid ""
 "Responsible for removing parts of a Live system build. See <xref linkend="
-"\"lh-clean\" /> for more information."
+"\"lh-clean\"/> for more information."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/overview.xml:164
+#: en/overview.xml:57
 msgid "The <filename>lh config</filename> helper"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:167
+#: en/overview.xml:58
 msgid ""
-"As discussed in <xref linkend=\"live-helper\" />, the scripts that make up "
+"As discussed in <xref linkend=\"live-helper\"/>, the scripts that make up "
 "&live-helper; source their configuration from a single directory named "
 "<command>config/</command>. As constructing this directory by hand would be "
 "time-consuming and error-prone, the <filename>lh config</filename> helper "
@@ -239,7 +230,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:175
+#: en/overview.xml:59
 msgid ""
 "Issuing <filename>lh config</filename> without any arguments creates a "
 "<command>config</command> subdirectory which it populates with some default "
@@ -247,44 +238,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para><screen>
-#: en/overview.xml:181
+#: en/overview.xml:61
 #, no-wrap
-msgid ""
-"$ lh config\n"
-"$ ls -l\n"
-"total 4.1k\n"
-"drwxr-xr-x 19 user group 4.1k 2008-05-09 21:37 config\n"
-"$ ls -l config/\n"
-"total 104\n"
-"-rw-r--r-- 1 user group 4175 2010-04-11 12:16 binary\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_debian-installer\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_debian-installer-includes\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_grub\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-debs\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-hooks\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-includes\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-packageslists\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-udebs\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_rootfs\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_syslinux\n"
-"-rw-r--r-- 1 user group 2205 2010-04-11 12:16 bootstrap\n"
-"-rw-r--r-- 1 user group 1599 2010-04-11 12:16 chroot\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_apt\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-hooks\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-includes\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-packages\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-packageslists\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-patches\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-preseed\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_sources\n"
-"-rw-r--r-- 1 user group 2938 2010-04-11 12:16 common\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 includes\n"
-"-rw-r--r-- 1 user group  206 2010-04-11 12:16 source\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 templates\n"
+msgid "$ lh config $ ls -l total 4.1k drwxr-xr-x 19 user group 4.1k 2008-05-09 21:37 config $ ls -l config/ total 104 -rw-r--r-- 1 user group 4175 2010-04-11 12:16 binary drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_debian-installer drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_debian-installer-includes drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_grub drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-debs drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-hooks drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-includes drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-packageslists drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-udebs drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_rootfs drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_syslinux -rw-r--r-- 1 user group 2205 2010-04-11 12:16 bootstrap -rw-r--r-- 1 user group 1599 2010-04-11 12:16 chroot drwxr-xr-x 2 user group 4096 2010-04-11 12:16
  chroot_apt drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-hooks drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-includes drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-packages drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-packageslists drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-patches drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-preseed drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_sources -rw-r--r-- 1 user group 2938 2010-04-11 12:16 common drwxr-xr-x 2 user group 4096 2010-04-11 12:16 includes -rw-r--r-- 1 user group 206 2010-04-11 12:16 source drwxr-xr-x 2 user group 4096 2010-04-11 12:16 templates "
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:216
+#: en/overview.xml:63
 msgid ""
 "Using <filename>lh config</filename> without any arguments would be suitable "
 "for users who are either happy editing the generated files, or are simply "
@@ -292,7 +252,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:222
+#: en/overview.xml:64
 msgid ""
 "You can ask <filename>lh config</filename> to generate a <filename class="
 "\"directory\">config/</filename> directory \"preseeded\" with various "
@@ -301,13 +261,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para><screen>
-#: en/overview.xml:230
+#: en/overview.xml:66
 #, no-wrap
 msgid "$ lh config -p gnome"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:234
+#: en/overview.xml:68
 msgid ""
 "will build a <filename class=\"directory\">config/</filename> directory "
 "configured to include the '<command>gnome</command>' package list. It is "
@@ -315,13 +275,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para><screen>
-#: en/overview.xml:240
+#: en/overview.xml:70
 #, no-wrap
 msgid "$ lh config --apt aptitude --binary-images net --hostname live-machine --username live-user ..."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:244
+#: en/overview.xml:72
 msgid ""
 "A full list of options is available in the <command>lh_config</command> man "
 "page. Most options have a parallel with an \"<command>LH_</command>\" "
@@ -329,12 +289,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/overview.xml:252
+#: en/overview.xml:75
 msgid "The <filename>lh build</filename> helper"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:255
+#: en/overview.xml:76
 msgid ""
 "The <filename>lh build</filename> helper reads in your configuration from "
 "the <filename class=\"directory\">config/</filename> directory. It then runs "
@@ -342,26 +302,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/overview.xml:264
+#: en/overview.xml:79
 msgid "The <filename>lh clean</filename> helper"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:267
+#: en/overview.xml:80
 msgid ""
 "It is the job of the <filename>lh clean</filename> helper to remove various "
 "parts of a Live helper build so subsequent builds can start from a clean "
 "state."
 msgstr ""
 
-# type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: en/overview.xml:277
+#: en/overview.xml:84
 msgid "The &live-initramfs; package"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:280
+#: en/overview.xml:85
 msgid ""
 "&live-initramfs; is a collection of scripts providing hooks for the "
 "<command>initramfs-tools</command>, used to generate an initramfs capable of "
@@ -371,7 +330,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:288
+#: en/overview.xml:86
 msgid ""
 "At boot time it will look for read-only media containing a \"/live\" "
 "directory where a root filesystem (often a compressed filesystem image like "
@@ -380,14 +339,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:296
+#: en/overview.xml:87
 msgid ""
 "&live-initramfs; is a fork of <ulink url=\"http://packages.ubuntu.com/casper"
 "\">casper</ulink>."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:301
+#: en/overview.xml:88
 msgid ""
 "More information on initial ramfs in Debian can be found in the <ulink url="
 "\"http://kernel-handbook.alioth.debian.org/\"> Debian Linux Kernel Handbook</"
diff --git a/manual/po/de/packages.xml.po b/manual/po/de/packages.xml.po
deleted file mode 100644
index 2837f17..0000000
--- a/manual/po/de/packages.xml.po
+++ /dev/null
@@ -1,645 +0,0 @@
-# German translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2010-06-06 12:07+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/chapters/basics.xml:113 en/chapters/basics.xml:128
-#: en/chapters/basics.xml:144 en/chapters/basics.xml:158
-#: en/chapters/basics.xml:194 en/chapters/basics.xml:220
-#: en/chapters/basics.xml:230 en/chapters/basics.xml:239
-#: en/chapters/basics.xml:253 en/chapters/basics.xml:275
-#: en/chapters/basics.xml:302 en/chapters/basics.xml:312
-#: en/chapters/basics.xml:320 en/chapters/basics.xml:354
-#: en/chapters/basics.xml:364 en/chapters/basics.xml:382
-#: en/chapters/basics.xml:429 en/chapters/basics.xml:498
-#: en/chapters/basics.xml:530 en/chapters/basics.xml:539
-#: en/chapters/basics.xml:590 en/chapters/basics.xml:646
-#: en/chapters/faq.xml:64 en/chapters/faq.xml:241 en/chapters/faq.xml:244
-#: en/chapters/faq.xml:252 en/chapters/faq.xml:256 en/chapters/faq.xml:264
-#: en/chapters/faq.xml:279 en/chapters/faq.xml:287 en/chapters/faq.xml:334
-#: en/chapters/faq.xml:424 en/chapters/faq.xml:430 en/chapters/faq.xml:481
-#: en/chapters/faq.xml:483 en/chapters/faq.xml:487 en/chapters/faq.xml:491
-#: en/chapters/overview.xml:181 en/chapters/overview.xml:230
-#: en/chapters/overview.xml:240 en/chapters/about/manual.xml:298
-#: en/chapters/about/manual.xml:308 en/chapters/about/manual.xml:318
-#: en/chapters/about/manual.xml:338 en/chapters/about/manual.xml:351
-#: en/chapters/about/manual.xml:366 en/chapters/about/manual.xml:379
-#: en/chapters/about/manual.xml:389 en/chapters/customization/packages.xml:50
-#: en/chapters/customization/packages.xml:58
-#: en/chapters/customization/packages.xml:71
-#: en/chapters/customization/packages.xml:80
-#: en/chapters/customization/packages.xml:104
-#: en/chapters/customization/packages.xml:222
-#: en/chapters/customization/packages.xml:230
-#: en/chapters/customization/packages.xml:265
-#: en/chapters/customization/packages.xml:310
-#: en/chapters/customization/packages.xml:330
-#: en/chapters/customization/packages.xml:341
-#: en/chapters/customization/packages.xml:352
-#: en/chapters/customization/packages.xml:362
-msgid "<placeholder type=\"screen\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/live-environment.xml:11 en/chapters/resources.xml:11
-#: en/chapters/success-stories.xml:11 en/chapters/about/manual.xml:125
-#: en/chapters/customization/bootup.xml:11
-#: en/chapters/customization/bootup.xml:20
-#: en/chapters/customization/bootup.xml:26
-#: en/chapters/customization/bootup.xml:38
-#: en/chapters/customization/bootup.xml:85
-#: en/chapters/customization/bootup.xml:92
-#: en/chapters/customization/bootup.xml:99
-#: en/chapters/customization/bootup.xml:106
-#: en/chapters/customization/packages.xml:36
-#: en/chapters/customization/packages.xml:306
-#: en/chapters/customization/packages.xml:326
-#: en/chapters/customization/packages.xml:384
-#: en/chapters/customization/packages.xml:492
-#: en/chapters/customization/packages.xml:535
-msgid "FIXME"
-msgstr ""
-
-#. type: Content of: <sect1><title>
-#: en/chapters/customization/packages.xml:9
-msgid "Customising package installation"
-msgstr ""
-
-#. type: Content of: <sect1><para>
-#: en/chapters/customization/packages.xml:12
-msgid ""
-"This chapter discusses the customisation of package installation. This "
-"involves:"
-msgstr ""
-
-#. type: Content of: <sect1><orderedlist><listitem><para>
-#: en/chapters/customization/packages.xml:20
-msgid "Selecting additional packages to be installed"
-msgstr ""
-
-#. type: Content of: <sect1><orderedlist><listitem><para>
-#: en/chapters/customization/packages.xml:26
-msgid "Installing modified packages"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/packages.xml:33
-msgid "Package sources"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/customization/packages.xml:42
-msgid "Debian repositories"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:46
-msgid "To set a local mirror (used to ''build'' the live-cd)"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/chapters/customization/packages.xml:50
-#, no-wrap
-msgid "$ lh config --mirror-bootstrap \"http://local.intra.net/debian/\" --mirror-chroot \"http://local.intra.net/debian/\""
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:54
-msgid "The generic mirror is added to the live-system's /etc/apt/sources.list."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/chapters/customization/packages.xml:58
-#, no-wrap
-msgid "$ lh config --mirror-binary \"http://ftp.debian.org/debian/\""
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:62
-msgid ""
-"Note: It is ''not'' used for building the live-cd but to install new "
-"software while using the live-cd."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:67
-msgid "It can be disabled by setting binary indices parameter to disabled"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/chapters/customization/packages.xml:71
-#, no-wrap
-msgid "$ lh config --binary-indices disabled"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:75
-msgid ""
-"Note: the same applies for mirror chroot security and mirror binary security"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/chapters/customization/packages.xml:80
-#, no-wrap
-msgid ""
-"$ lh config --mirror-chroot-security {URL}\n"
-"$ lh config --mirror-binary-security {URL}"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/customization/packages.xml:87
-msgid "Own repository"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:91
-msgid ""
-"To add more repositories (e.g. backports, experimental packages, etc.), "
-"create <filename>config/chroot_sources/your-cdd-repo.{chroot,binary}</"
-"filename> file."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:98
-msgid ""
-"e.g. <filename>config/chroot_sources/live.chroot</filename> allows you to "
-"install packages from the debian live snapshot repository at live-cd build "
-"time (you have to add the packages in your package list):"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/chapters/customization/packages.xml:104
-#, no-wrap
-msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:108
-msgid ""
-"If you add the line to <filename>config/chroot_sources/live.binary</"
-"filename> the repository will be added to your live-system's <filename>/etc/"
-"apt/sources.list</filename>."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:115
-msgid "If such files exist, they will be picked up automatically."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:119
-msgid ""
-"You can also put the gpg-key used to sign the repository into config/"
-"chroot_sources/foo.{binary,chroot}.gpg"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/packages.xml:130
-msgid "Package installation"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/packages.xml:133
-msgid ""
-"You can elect to use either <command>apt</command> or <command>aptitude</"
-"command> when installing packages. Which utility is used is governed by the "
-"<command>LH_APT</command> variable in <filename>config/chroot</filename> or "
-"by the <command>--apt</command> argument to <filename>lh config</filename>:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/customization/packages.xml:143
-msgid "<command>apt</command>"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:147
-msgid ""
-"Specifying a missing package causes package installation to fail, which may "
-"not be the desired behaviour."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:152
-msgid "This is the default setting for building images for Lenny or later."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/customization/packages.xml:158
-msgid "<command>aptitude</command>"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:162
-msgid ""
-"Specifying a missing package causes package installation to succeed, which "
-"may not be the desired behaviour."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:167
-msgid "This is the default setting for building images for Etch."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/packages.xml:177
-msgid "Installing additional packages"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/packages.xml:180
-msgid ""
-"&live-helper; has a number of mechanisms for indicating that additional "
-"packages should be installed, including:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/packages.xml:188
-#: en/chapters/customization/packages.xml:213
-msgid "The <command>LH_PACKAGES</command> variable"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/packages.xml:194
-#: en/chapters/customization/packages.xml:249
-msgid "Package lists"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><orderedlist><listitem><para>
-#: en/chapters/customization/packages.xml:200
-msgid "Local packages (<filename>chroot_local-packages/</filename>)"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/packages.xml:206
-#: en/chapters/customization/packages.xml:381
-msgid "Tasks"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:216
-msgid ""
-"To install additional packages, simply add them to the <command>LH_PACKAGES</"
-"command> variable in <filename>config/chroot</filename>. For example:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/chapters/customization/packages.xml:222
-#, no-wrap
-msgid "LH_PACKAGES=\"package1 package2 package3 ... \""
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:226
-msgid "You can also specify initial values on the command line:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/chapters/customization/packages.xml:230
-#, no-wrap
-msgid "$ lh config --packages \"package1 package2 package3\""
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:234
-msgid ""
-"The behaviour of &live-helper; when specifying a package that does not exist "
-"is determined by your choice of APT utility. See <xref linkend=\"package-"
-"installation\"/> for more details."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:240
-msgid ""
-"If you need to specify a large number of packages to be installed or you "
-"need flexibility regarding which packages to install, you should probably be "
-"using package lists. See <xref linkend=\"package-lists\"/> for more "
-"information."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:252
-msgid ""
-"Package lists are a powerful way of expressing which packages should be "
-"installed. &live-helper; ships with a number of predefined package lists "
-"which provide sensible default package selections for the GNOME and KDE "
-"desktop environments, as well as standard systems."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:259
-msgid ""
-"To specify a package list, add the name of the list to the "
-"<command>LH_PACKAGES_LISTS</command> variable in <filename>config/chroot</"
-"filename>. For example:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/chapters/customization/packages.xml:265
-#, no-wrap
-msgid "LH_PACKAGES_LISTS=\"gnome\""
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:269
-msgid ""
-"Package lists that are distributed with &live-helper; reside in the "
-"<command>/usr/share/live-helper/lists</command> directory."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><title>
-#: en/chapters/customization/packages.xml:274
-msgid "Local packages lists"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/chapters/customization/packages.xml:277
-msgid ""
-"You may supplement the supplied lists using local package lists stored in "
-"<command>config/chroot_local-packageslists</command>."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/chapters/customization/packages.xml:282
-msgid ""
-"Package lists that exist in this directory always override package lists "
-"distributed with &live-helper;. This can cause undesired effects when."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><note><title>
-#: en/chapters/customization/packages.xml:288
-msgid "&live-helper; 2.x change"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><note><para>
-#: en/chapters/customization/packages.xml:291
-msgid ""
-"Any file with <command>.list</command> suffix in <command>config/"
-"chroot_local-packageslists</command> is automatically enabled, the variable "
-"LH_PACKAGES_LISTS should only be used referencing packages lists included in "
-"live-helper (at <command>/usr/share/live-helper/lists/</command>."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><title>
-#: en/chapters/customization/packages.xml:303
-msgid "Extending a provided package list using includes"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/chapters/customization/packages.xml:310
-#, no-wrap
-msgid ""
-"#include &lt;gnome&gt;\n"
-"iceweasel"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/chapters/customization/packages.xml:315
-msgid ""
-"The package lists that are included with &live-helper; make extensive use of "
-"includes. They are available to view in the <command>/usr/share/live-helper/"
-"lists</command> directory."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><title>
-#: en/chapters/customization/packages.xml:323
-msgid "Using conditionals inside packages lists"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/chapters/customization/packages.xml:330
-#, no-wrap
-msgid ""
-"#if ARCHITECTURE amd64\n"
-"ia32-libs\n"
-"#endif"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/chapters/customization/packages.xml:336
-msgid ""
-"or if <command>LH_ARCHITECTURE</command> is set to <command>i386</command> "
-"or <command>amd64</command>:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/chapters/customization/packages.xml:341
-#, no-wrap
-msgid ""
-"#if ARCHITECTURE i386 amd64\n"
-"memtest86+\n"
-"#endif"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/chapters/customization/packages.xml:347
-msgid ""
-"or if <command>LH_SECTIONS</command> contains either <command>contrib</"
-"command> or <command>non-free</command>:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/chapters/customization/packages.xml:352
-#, no-wrap
-msgid ""
-"#if SECTIONS contrib non-free\n"
-"vrms\n"
-"#endif"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/chapters/customization/packages.xml:358
-msgid "A conditional may surround an <command>#include</command> directive:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/chapters/customization/packages.xml:362
-#, no-wrap
-msgid ""
-"#if ARCHITECTURE amd64\n"
-"#include &lt;gnome-full&gt;\n"
-"#endif"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/chapters/customization/packages.xml:368
-msgid ""
-"Any &live-helper; configuration variable that begins with <command>LH_</"
-"command> can be tested in this way."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/chapters/customization/packages.xml:373
-msgid "The nesting of conditionals is not supported."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/packages.xml:392
-msgid "Installing modified or third-party packages"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/packages.xml:395
-msgid ""
-"Whilst it is against the philosophy of Debian Live, it may sometimes be "
-"necessary to build a Live system with modified versions of packages that are "
-"in the Debian repository. This may be to modify or support additional "
-"features, languages and branding, or even to remove elements of existing "
-"packages that are undesirable. Similarly, \"third-party\" packages may be "
-"used to add bespoke and/or proprietary functionality."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/packages.xml:404
-msgid ""
-"This section does not cover advice regarding building or maintaining "
-"modified packages. Joachim Breitner's <ulink url=\"http://www.joachim-"
-"breitner.de/blog/archives/282-How-to-fork-privately.html\" >'How to fork "
-"privately'</ulink> may be of interest, however. The creation of bespoke "
-"packages is covered in the <ulink url=\"http://www.debian.org/doc/maint-"
-"guide/\">Debian New Maintainers' Guide</ulink> and elsewhere."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/packages.xml:414
-msgid "There are two ways of installing modified custom packages:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><orderedlist><listitem><para>
-#: en/chapters/customization/packages.xml:421
-msgid "<filename>chroot_local-packages</filename>"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><orderedlist><listitem><para>
-#: en/chapters/customization/packages.xml:427
-msgid "Using a custom APT repository"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/packages.xml:434
-msgid ""
-"The <filename>chroot_local-packages</filename> is simpler to achieve and "
-"useful for \"one-off\" customisations but has a number of drawbacks, whilst "
-"using a custom APT repository is more time-consuming to set up."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/packages.xml:441
-msgid ""
-"Using <filename>chroot_local-packages</filename> to install custom packages"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:446
-msgid ""
-"To install a custom package, simply copy it to the <command>config/"
-"chroot_local-packages</command> directory. Packages that are inside this "
-"directory will be automatically installed into the live system during build "
-"- you do not need to specify them elsewhere."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:453
-msgid ""
-"Packages <emphasis>must</emphasis> be named in the prescribed way. One "
-"simple way to do this is to use <command>dpkg-name</command>. FIXME"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:458
-msgid ""
-"Using <filename>chroot_local-packages</filename> for installation of custom "
-"packages has disadvantages:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/customization/packages.xml:466
-msgid "It is not possible to use secure APT"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/customization/packages.xml:472
-msgid ""
-"You must install all appropriate packages in the <command>config/"
-"chroot_local-packages</command> directory"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/customization/packages.xml:479
-msgid ""
-"It does not lend itself to storing Debian Live configurations in revision "
-"control"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/packages.xml:489
-msgid "Using an APT repository to install custom packages"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:496
-msgid ""
-"Unlike using <filename>chroot_local-packages</filename>, when using a custom "
-"APT repository you must ensure that you specify the packages elsewhere. See "
-"<xref linkend=\"lh-packages\"/> for details."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:502
-msgid ""
-"Whilst it may seem unnecessary effort to create an APT repository to install "
-"custom packages, the infrastructure can be easily re-used at a later date to "
-"offer updates of the modified packages."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/packages.xml:510
-msgid "Custom packages and APT"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:513
-msgid ""
-"&live-helper; uses APT to install all packages into the live system so will "
-"therefore inherit behaviours from this program. One relevant example is that "
-"(assuming a default configuration) given a package available in two "
-"different repositories with different version numbers, APT will elect to "
-"install the package with the higher version number."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:521
-msgid ""
-"Because of this, you may wish to increment the version number in your custom "
-"packages' <command>debian/changelog</command> files to ensure that your "
-"modified version is installed over one in the official Debian repositories. "
-"This may also be achieved by altering the live system's APT pinning "
-"preferences - see <xref linkend=\"apt-preferences\"/> for more information."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/packages.xml:532
-msgid "Altering APT preferences during Live system"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:539
-msgid ""
-"Whilst it may seem unnecessary effort to create an APT repository to install "
-"custom packages, the infrastructure can be easily re-used at a later date to "
-"offer updates of the modified package."
-msgstr ""
diff --git a/manual/po/de/procedures.xml.po b/manual/po/de/procedures.xml.po
index 640e634..e79058b 100644
--- a/manual/po/de/procedures.xml.po
+++ b/manual/po/de/procedures.xml.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2010-06-06 12:07+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"PO-Revision-Date: 2010-06-06 17:46+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
@@ -17,40 +17,42 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Content of: <chapter><title>
-#: en/chapters/procedures.xml:7
+#: en/procedures.xml:6
 msgid "Procedures"
 msgstr ""
 
 #. type: Content of: <chapter><para>
-#: en/chapters/procedures.xml:9
+#: en/procedures.xml:7
 msgid ""
 "This chapter documents the procedures within the Debian Live project for "
 "various tasks that need cooperation with other teams in Debian."
 msgstr ""
 
 #. type: Content of: <chapter><sect1><title>
-#: en/chapters/procedures.xml:12
+#: en/procedures.xml:9
 msgid "Udeb Uploads"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><para>
-#: en/chapters/procedures.xml:14
+#: en/procedures.xml:10
 msgid "Before commiting releases of a udeb in d-i svn, one has to call:"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><screen>
-#: en/chapters/procedures.xml:15
+#: en/procedures.xml:12
 #, no-wrap
-msgid "<command>../../scripts/l10n/output-l10n-changes . -d</command>"
+msgid ""
+"      <command>../../scripts/l10n/output-l10n-changes . -d</command>\n"
+"    "
 msgstr ""
 
 #. type: Content of: <chapter><sect1><title>
-#: en/chapters/procedures.xml:19
+#: en/procedures.xml:16
 msgid "Major Releases"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><para>
-#: en/chapters/procedures.xml:21
+#: en/procedures.xml:17
 msgid ""
 "Releasing a new stable major version of Debian includes a lot of different "
 "teams working together to make it happen. At some point, the Live team comes "
@@ -58,113 +60,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><sect1><title>
-#: en/chapters/procedures.xml:34
+#: en/procedures.xml:27
 msgid "Point Releases"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><sect2><title>
-#: en/chapters/procedures.xml:44
+#: en/procedures.xml:35
 msgid "Point release announcement template"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><sect2><para>
-#: en/chapters/procedures.xml:46
+#: en/procedures.xml:36
 msgid ""
 "An annoucement mail for point releases can be generated using the template "
 "below and the following command:"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><sect2><screen>
-#: en/chapters/procedures.xml:49
+#: en/procedures.xml:37
 #, no-wrap
-msgid ""
-"$ sed \\\n"
-"  -e 's|%major%|5.0|g' \\\n"
-"  -e 's|%minor%|5.0.2|g' \\\n"
-"  -e 's|%codename%|lenny|g' \\\n"
-"  -e 's|%release_mail%|2009/msg00007.html|g'\n"
+msgid " $ sed \\ -e 's|%major%|5.0|g' \\ -e 's|%minor%|5.0.2|g' \\ -e 's|%codename%|lenny|g' \\ -e 's|%release_mail%|2009/msg00007.html|g' "
 msgstr ""
 
 #. type: Content of: <chapter><sect1><sect2><para>
-#: en/chapters/procedures.xml:56
+#: en/procedures.xml:38
 msgid ""
 "Please check the mail carefully before sending and pass it to others for "
 "proof-reading."
 msgstr ""
 
 #. type: Content of: <chapter><sect1><sect2><screen>
-#: en/chapters/procedures.xml:59
+#: en/procedures.xml:39
 #, no-wrap
-msgid ""
-"Debian Live images for Debian GNU/Linux %major% updated\n"
-"\n"
-"The Debian Live project is pleased to announce the availability of\n"
-"updated Live images for its stable distribution Debian GNU/Linux %major%\n"
-"(codename \"%codename%\").\n"
-"\n"
-"The images are available for download at:\n"
-"\n"
-"    &lt;http://cdimage.debian.org/cdimage/release/current-live/&gt;\n"
-"\n"
-"This update incorporates the changes made in the %minor% point release,\n"
-"which adds corrections for security problems to the stable release\n"
-"along with a few adjustments for serious problems. A full list of the\n"
-"changes may be viewed at:\n"
-"\n"
-"    &lt;http://lists.debian.org/debian-announce/%release_mail%&gt;\n"
-"\n"
-"It also includes the following Live-specific changes:\n"
-"\n"
-" * [INSERT LIVE-SPECIFIC CHANGE HERE]\n"
-" * [INSERT LIVE-SPECIFIC CHANGE HERE]\n"
-" * [LARGER ISSUES MAY DESERVE THEIR OWN SECTION]\n"
-"\n"
-"\n"
-"URLs\n"
-"----\n"
-"\n"
-"Download location of updated images:\n"
-"\n"
-"  &lt;http://cdimage.debian.org/cdimage/release/current-live/&gt;\n"
-"\n"
-"Debian Live project homepage:\n"
-"\n"
-"  &lt;http://live.debian.net/&gt;\n"
-"\n"
-"The current stable distribution:\n"
-"\n"
-"  &lt;http://ftp.debian.org/debian/dists/stable&gt;\n"
-"\n"
-"stable distribution information (release notes, errata etc.):\n"
-"\n"
-"  &lt;http://www.debian.org/releases/stable/&gt;\n"
-"\n"
-"Security announcements and information:\n"
-"\n"
-"  &lt;http://www.debian.org/security/&gt;\n"
-"\n"
-"\n"
-"About Debian\n"
-"-------------\n"
-"\n"
-"The Debian Project is an association of Free Software developers who\n"
-"volunteer their time and effort in order to produce the completely free\n"
-"operating system Debian GNU/Linux.\n"
-"\n"
-"\n"
-"About Debian Live\n"
-"-----------------\n"
-"\n"
-"Debian Live is an official sub-project of Debian which produces Debian\n"
-"systems that do not require a classical installer. Images are available\n"
-"for CD/DVD discs, USB sticks and PXE netbooting as well as a bare\n"
-"filesystem images for booting directly from the internet.\n"
-"\n"
-"\n"
-"Contact Information\n"
-"-------------------\n"
-"\n"
-"For further information, please visit the Debian Live web pages at\n"
-"&lt;http://live.debian.net/&gt; or alternatively send mail to\n"
-"&lt;debian-live at lists.debian.org&gt;.\n"
+msgid " Debian Live images for Debian GNU/Linux %major% updated The Debian Live project is pleased to announce the availability of updated Live images for its stable distribution Debian GNU/Linux %major% (codename \"%codename%\"). The images are available for download at: &lt;http://cdimage.debian.org/cdimage/release/current-live/&gt; This update incorporates the changes made in the %minor% point release, which adds corrections for security problems to the stable release along with a few adjustments for serious problems. A full list of the changes may be viewed at: &lt;http://lists.debian.org/debian-announce/%release_mail%&gt; It also includes the following Live-specific changes: COPYING debian html Makefile manual VERSION xml xsl [INSERT LIVE-SPECIFIC CHANGE HERE] COPYING debian html Makefile manual VERSION xml xsl [INSERT LIVE-SPECIFIC CHANGE HERE] COPYING debian html Makefile manual VERSION xml xsl [LARGER ISSUES MAY DESERVE THEIR OWN SECTION] URLs ---- Download location 
 of updated images: &lt;http://cdimage.debian.org/cdimage/release/current-live/&gt; Debian Live project homepage: &lt;http://live.debian.net/&gt; The current stable distribution: &lt;http://ftp.debian.org/debian/dists/stable&gt; stable distribution information (release notes, errata etc.): &lt;http://www.debian.org/releases/stable/&gt; Security announcements and information: &lt;http://www.debian.org/security/&gt; About Debian ------------- The Debian Project is an association of Free Software developers who volunteer their time and effort in order to produce the completely free operating system Debian GNU/Linux. About Debian Live ----------------- Debian Live is an official sub-project of Debian which produces Debian systems that do not require a classical installer. Images are available for CD/DVD discs, USB sticks and PXE netbooting as well as a bare filesystem images for booting directly from the internet. Contact Information ------------------- For further information, p
 lease visit the Debian Live web pages at &lt;http://live.debian.net/&gt; or alternatively send mail to &lt;debian-live at lists.debian.org&gt;. "
 msgstr ""
diff --git a/manual/po/de/project.xml.po b/manual/po/de/project.xml.po
deleted file mode 100644
index 81e630c..0000000
--- a/manual/po/de/project.xml.po
+++ /dev/null
@@ -1,291 +0,0 @@
-# German translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2010-06-06 12:07+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. type: Content of: <sect1><title>
-#: en/chapters/about/project.xml:7
-msgid "About the Debian Live Project"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/about/project.xml:10
-msgid "Motivation"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/about/project.xml:13
-msgid "What is wrong with current live systems"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:15
-msgid ""
-"There are already several Debian-based live systems and they are doing a "
-"great job. But, from the Debian perspective most of them have one or more of "
-"the following disadvantages:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:18
-msgid "They are unofficial projects, developed outside of Debian."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:19
-msgid "They mix different distributions, e.g. testing and unstable."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:20
-msgid "They support i386 only."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:21
-msgid ""
-"They modify the behaviour and/or appearance of packages by stripping them "
-"down to save space."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:22
-msgid "They include unofficial packages."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:23
-msgid ""
-"They ship custom kernels with additional patches that are not part of Debian."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:24
-msgid ""
-"They are large and slow due to their sheer size and thus not suitable for "
-"rescue issues."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:25
-msgid ""
-"They are not available in different flavours, e.g. CDs, DVDs, USB-stick and "
-"netboot images"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/about/project.xml:30
-msgid "Why create our own live system?"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:32
-msgid ""
-"Debian is the Universal Operating System: Debian should have an official "
-"live system for showing around and to officially represent the true, one and "
-"only Debian system with the following main advantages:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:35
-msgid "It would be an official Debian subproject."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:36
-msgid "It reflects the (current) state of one distribution."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:37
-msgid "It runs on as many architectures as possible."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:38
-msgid "It consists of unchanged Debian packages only."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:39
-msgid "It does not contain any unofficial packages."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/about/project.xml:40
-msgid "It uses an unaltered Debian kernel-image with no additional patches."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/about/project.xml:48
-msgid "Philosophy"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/about/project.xml:51
-msgid "Only unchanged, official packages"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:52
-msgid ""
-"We will only use official packages from the Debian repository in the \"main"
-"\" section (possibly contrib, although not decided yet). The non-free "
-"section is not part of Debian and therefore cannot be used at all for live "
-"systems."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:54
-msgid ""
-"We will not change any packages. Whenever we need to change something, we "
-"will do that in coordination with its package maintainer in Debian."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:56
-msgid ""
-"As an exception, our own packages such as &live-helper; or &live-initramfs; "
-"may temporarily be used from our own repository for development reasons (e."
-"g. to create development snapshots). They will be uploaded to Debian on a "
-"regular basis."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/about/project.xml:60
-msgid "No package configuration of the live system"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:61
-msgid ""
-"In this phase we will not ship or install sample or alternative "
-"configurations. All packages are used in their default configuration as they "
-"are after a regular installation of Debian."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:63
-msgid ""
-"Whenever we need a different default configuration, we will do that in "
-"coordination with its package maintainer in Debian."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:65
-msgid ""
-"A system for configuring packages is provided using debconf in <command>lh "
-"config</command> (use --preseed FILE) allowing custom configured packages to "
-"be installed in your custom produced Debian Live images, but for official "
-"live images only default configuration will be used. For more information, "
-"please see <xref linkend=\"customization\"/>."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:67
-msgid ""
-"Exception: There are a few essential changes needed to bring a live system "
-"to life (e.g. configuring pam to allow empty passwords). These essential "
-"changes have to be kept as minimal as possible and should be merged within "
-"the Debian repository if possible."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/about/project.xml:71
-msgid "Live system to hard disk installer"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:72
-msgid ""
-"For the moment we will not ship an installer to copy the live system to a "
-"partition on the hard disk. Although we keep the changes in the live system "
-"as drastically minimal as possible compared to a regular Debian "
-"installation, the live system does differ in a few essential points (see "
-"exceptions, guideline 2)."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/project.xml:74
-msgid ""
-"Therefore, we will ship a copy of the regular DebianInstaller (resp. Debian "
-"Installer, Graphical Installer) instead, to allow users to perform a regular "
-"Debian installation (and, of course, cdebootstrap and debootstrap are on the "
-"system too)."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/about/project.xml:80
-msgid "Contact"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/project.xml:83
-msgid "Mailing list"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/project.xml:84
-msgid ""
-"The primary contact for the project is the <ulink url=\"http://lists.debian."
-"org/debian-live/\">mailing list</ulink>. You can email the list directly by "
-"addressing your mail to <email>debian-live at lists.debian.org</email>. The "
-"<ulink url=\"http://lists.debian.org/debian-live/\">list archives</ulink> "
-"are also available."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/project.xml:87
-msgid "IRC"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/project.xml:88
-msgid ""
-"A number of users and developers are present in the <ulink url=\"irc://irc."
-"debian.org/#debian-live\">#debian-live</ulink> channel on <ulink url="
-"\"http://oftc.net\">OFTC</ulink>. When asking a question on IRC, please be "
-"patient for an answer. If no answer is forthcoming, please email the mailing "
-"list."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/project.xml:91
-msgid "BTS"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/project.xml:92
-msgid ""
-"The Debian Bug Tracking System (BTS) contains details of bugs reported by "
-"users and developers. Each bug is given a number, and is kept on file until "
-"it is marked as having been dealt with. For more information, please see "
-"<xref linkend=\"bugs\"/>."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/project.xml:95
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/project.xml:96
-msgid ""
-"The <ulink url=\"http://wiki.debian.org/DebianLive\">Debian Live wiki</"
-"ulink> is a place to gather information, discuss applied technologies, and "
-"document frameworks of Debian Live systems that go beyond the scope of this "
-"document."
-msgstr ""
diff --git a/manual/po/de/reporting-bugs.xml.po b/manual/po/de/reporting-bugs.xml.po
index 33dc489..bcf4b34 100644
--- a/manual/po/de/reporting-bugs.xml.po
+++ b/manual/po/de/reporting-bugs.xml.po
@@ -1,30 +1,28 @@
-# German translations for Debconf package
-# Copyright (C) 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the Debconf package.
-# Automatically generated, 2008.
+# German translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Debconf 8\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2008-08-09 16:50+0300\n"
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"PO-Revision-Date: 2010-06-06 17:46+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: \n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-# type: Content of: <chapter><title>
 #. type: Content of: <chapter><title>
-#: en/chapters/reporting-bugs.xml:7
+#: en/reporting-bugs.xml:6
 msgid "Reporting bugs"
 msgstr ""
 
-# type: Content of: <chapter><para>
 #. type: Content of: <chapter><para>
-#: en/chapters/reporting-bugs.xml:9
+#: en/reporting-bugs.xml:7
 msgid ""
 "Debian Live is far from being perfect, but we want to make it as close as "
 "possible to perfect - with your help. Do not hesitate to report a bug: it is "
@@ -32,30 +30,27 @@ msgid ""
 "recommendations how to file good bug reports."
 msgstr ""
 
-# type: Content of: <chapter><para>
 #. type: Content of: <chapter><para>
-#: en/chapters/reporting-bugs.xml:11
+#: en/reporting-bugs.xml:8
 msgid "For the impatient:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:16
+#: en/reporting-bugs.xml:11
 msgid ""
 "Always check first the image status updates on <ulink url=\"http://live."
 "debian.net/\">our homepage</ulink> for known issues."
 msgstr ""
 
-# type: Content of: <chapter><itemizedlist><listitem><para>
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:21
+#: en/reporting-bugs.xml:14
 msgid ""
 "Always try to reproduce the bug with the <emphasis>most recent version of "
 "&live-helper; and &live-initramfs;</emphasis> before submitting a bug report."
 msgstr ""
 
-# type: Content of: <chapter><itemizedlist><listitem><para>
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:26
+#: en/reporting-bugs.xml:17
 msgid ""
 "Try to give <emphasis>as specific information as possible</emphasis> about "
 "the bug. This includes (at least) the version of &live-helper; and &live-"
@@ -63,19 +58,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: en/chapters/reporting-bugs.xml:32
+#: en/reporting-bugs.xml:21
 msgid "Known issues"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:33
+#: en/reporting-bugs.xml:22
 msgid ""
 "Due to the nature of Debian testing and Debian unstable branches being a "
 "moving target, building a live system may not always be possible."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:34
+#: en/reporting-bugs.xml:23
 msgid ""
 "If this is a problem, do not build a system based on testing or unstable, "
 "but go with stable. live-helper does always default to the current stable "
@@ -83,14 +78,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:35
+#: en/reporting-bugs.xml:24
 msgid ""
 "Currently known issues are listed under the section 'status' on <ulink url="
 "\"http://live.debian.net/\">our homepage</ulink>."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:36
+#: en/reporting-bugs.xml:25
 msgid ""
 "It is out of the scope of this manual to train you in correctly identifying "
 "and fixing problems in packages of the development branches, however, there "
@@ -99,36 +94,31 @@ msgid ""
 "pinning the newer version of the failing package from unstable."
 msgstr ""
 
-# type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: en/chapters/reporting-bugs.xml:40
+#: en/reporting-bugs.xml:28
 msgid "Rebuild from scratch"
 msgstr ""
 
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:41
+#: en/reporting-bugs.xml:29
 msgid ""
 "To ensure that a particular bug is not caused by an unclean built system, "
 "please always rebuild the whole live system from scratch to see if the bug "
 "is reproducible."
 msgstr ""
 
-# type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: en/chapters/reporting-bugs.xml:45
+#: en/reporting-bugs.xml:32
 msgid "Use up-to-date packages"
 msgstr ""
 
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:46
+#: en/reporting-bugs.xml:33
 msgid "This means"
 msgstr ""
 
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:48
+#: en/reporting-bugs.xml:34
 msgid ""
 "Using outdated packages can cause significant problems when trying to "
 "reproduce (and ultimately fix) your problem. If a relevant package is not "
@@ -137,14 +127,13 @@ msgid ""
 "problem."
 msgstr ""
 
-# type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: en/chapters/reporting-bugs.xml:53
+#: en/reporting-bugs.xml:37
 msgid "Collect information"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:55
+#: en/reporting-bugs.xml:38
 msgid ""
 "Please provide enough information with your report. At a minimum, it should "
 "contain the exact version of &live-helper; version where the bug is "
@@ -153,75 +142,65 @@ msgid ""
 "problem."
 msgstr ""
 
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:57
+#: en/reporting-bugs.xml:39
 msgid ""
 "To make the most out of your bug report, we require at least the following "
 "information:"
 msgstr ""
 
-# type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:61
+#: en/reporting-bugs.xml:42
 msgid "Architecture of the host system"
 msgstr ""
 
-# type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:62
+#: en/reporting-bugs.xml:45
 msgid "Version of &live-helper; on the host system"
 msgstr ""
 
-# type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:63
+#: en/reporting-bugs.xml:48
 msgid "Version of &live-initramfs; on the live system"
 msgstr ""
 
-# type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:64
+#: en/reporting-bugs.xml:51
 msgid ""
 "Version of <filename>debootstrap</filename> and/or <filename>cdebootstrap</"
 "filename> on the host system"
 msgstr ""
 
-# type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:65
+#: en/reporting-bugs.xml:54
 msgid "Architecture of the live system"
 msgstr ""
 
-# type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:66
+#: en/reporting-bugs.xml:57
 msgid "Distribution of the live system"
 msgstr ""
 
-# type: Content of: <chapter><section><itemizedlist><listitem><para>
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:67
+#: en/reporting-bugs.xml:60
 msgid "Version of the kernel on the live system"
 msgstr ""
 
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:71
+#: en/reporting-bugs.xml:63
 msgid ""
 "You can generate a log of the build process by using the <filename>tee</"
 "filename> command:"
 msgstr ""
 
 #. type: Content of: <chapter><section><screen>
-#: en/chapters/reporting-bugs.xml:75
+#: en/reporting-bugs.xml:64
 #, no-wrap
-msgid " # lh_build 2>&amp;1 | tee buildlog.txt\n"
+msgid " # lh_build 2&gt;&amp;1 | tee buildlog.txt "
 msgstr ""
 
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:78
+#: en/reporting-bugs.xml:65
 msgid ""
 "Additionally, to rule out other errors, it is always a good idea to tar up "
 "your config directory and upload it somewhere (do *not* send it as an "
@@ -230,33 +209,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:83
+#: en/reporting-bugs.xml:66
 msgid ""
 "Remember to send in any logs that were produced with English locale "
 "settings, e.g. run your live-helper commands with a leading <code>LC_ALL=C</"
 "code> or <code>LC_ALL=en_US</code>."
 msgstr ""
 
-# type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: en/chapters/reporting-bugs.xml:91
+#: en/reporting-bugs.xml:69
 msgid "Use the correct package to report the bug against"
 msgstr ""
 
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:93
+#: en/reporting-bugs.xml:70
 msgid "Where does the bug appear?"
 msgstr ""
 
-# type: Content of: <chapter><section><para><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><para><variablelist><varlistentry><term>
-#: en/chapters/reporting-bugs.xml:98
+#: en/reporting-bugs.xml:74
 msgid "At build time whilst bootstrapping"
 msgstr ""
 
 #. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para><para>
-#: en/chapters/reporting-bugs.xml:101
+#: en/reporting-bugs.xml:77
 msgid ""
 "&live-helper; first bootstraps a basic Debian system with "
 "<command>debootstrap</command> or <command>cdebootstrap</command>. Depending "
@@ -267,7 +243,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para><para>
-#: en/chapters/reporting-bugs.xml:103
+#: en/reporting-bugs.xml:78
 msgid ""
 "In both cases, this is not a bug in Debian Live, but rather in Debian itself "
 "which we can not fix this directly. Please report such a bug against "
@@ -275,15 +251,13 @@ msgid ""
 "failing package."
 msgstr ""
 
-# type: Content of: <chapter><section><para><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><para><variablelist><varlistentry><term>
-#: en/chapters/reporting-bugs.xml:107
+#: en/reporting-bugs.xml:83
 msgid "At build time whilst installing packages"
 msgstr ""
 
-# type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#: en/chapters/reporting-bugs.xml:109
+#: en/reporting-bugs.xml:85
 msgid ""
 "&live-helper; installs additional packages from the Debian archive and "
 "depending on the Debian distribution used and the daily archive state, it "
@@ -292,7 +266,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#: en/chapters/reporting-bugs.xml:111
+#: en/reporting-bugs.xml:86
 msgid ""
 "If this is the case, this is not a bug in Debian Live, but rather in Debian "
 "- please report it against the failing package. Running "
@@ -301,24 +275,21 @@ msgid ""
 "will give you more information."
 msgstr ""
 
-# type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#: en/chapters/reporting-bugs.xml:113
+#: en/reporting-bugs.xml:87
 msgid ""
 "Also, if you are using a local mirror and/or any of sort of proxy and you "
 "are experiencing a problem, please always reproduce it first by "
 "bootstrapping from an official mirror."
 msgstr ""
 
-# type: Content of: <chapter><section><para><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><para><variablelist><varlistentry><term>
-#: en/chapters/reporting-bugs.xml:120
+#: en/reporting-bugs.xml:91
 msgid "At boot-time"
 msgstr ""
 
-# type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#: en/chapters/reporting-bugs.xml:123
+#: en/reporting-bugs.xml:93
 msgid ""
 "If your image does not boot, please report it to the mailing list together "
 "with the information requested in <xref linkend=\"collect-information\"/>. "
@@ -328,34 +299,30 @@ msgid ""
 "screenshot of the failure is also very helpful."
 msgstr ""
 
-# type: Content of: <chapter><section><para><variablelist><varlistentry><term>
 #. type: Content of: <chapter><section><para><variablelist><varlistentry><term>
-#: en/chapters/reporting-bugs.xml:128
+#: en/reporting-bugs.xml:97
 msgid "At run-time"
 msgstr ""
 
-# type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#: en/chapters/reporting-bugs.xml:130
+#: en/reporting-bugs.xml:99
 msgid ""
 "If a package was successfully installed, but fails while actually running "
 "the Live system, this is probably a bug in Debian Live. However,"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:96
+#: en/reporting-bugs.xml:72
 msgid "<placeholder type=\"variablelist\" id=\"0\"/>"
 msgstr ""
 
-# type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: en/chapters/reporting-bugs.xml:139
+#: en/reporting-bugs.xml:106
 msgid "Do the research"
 msgstr ""
 
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:140
+#: en/reporting-bugs.xml:107
 msgid ""
 "Before filing the bug, please search the web for the particular error "
 "message or symptom you are getting. As it is highly unlikely that you are "
@@ -364,9 +331,8 @@ msgid ""
 "workaround has been proposed."
 msgstr ""
 
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:142
+#: en/reporting-bugs.xml:108
 msgid ""
 "You should pay particular attention to the Debian Live mailing list, as well "
 "as the homepage, as these are likely to contain the most up-to-date "
@@ -375,7 +341,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:144
+#: en/reporting-bugs.xml:109
 msgid ""
 "In addition, you should check the <ulink url=\"http://bugs.debian.org/cgi-"
 "bin/pkgreport.cgi?src=live-helper\">current bug list for &live-helper;</"
@@ -384,14 +350,13 @@ msgid ""
 "whether something similar has been reported already."
 msgstr ""
 
-# type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
-#: en/chapters/reporting-bugs.xml:148
+#: en/reporting-bugs.xml:112
 msgid "Where to report bugs"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:150
+#: en/reporting-bugs.xml:113
 msgid ""
 "The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
 "System (BTS). For information on how to use the system, please see <ulink "
@@ -401,7 +366,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:152
+#: en/reporting-bugs.xml:114
 msgid ""
 "In general, you should report build time errors against the <ulink url="
 "\"http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-helper\">live-"
@@ -412,9 +377,8 @@ msgid ""
 "and we will help you to figure it out."
 msgstr ""
 
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:154
+#: en/reporting-bugs.xml:115
 msgid ""
 "Please note that bugs found in distributions derived from Debian (such as "
 "Ubuntu, Knoppix, Xandros, etc.) should <emphasis>not</emphasis> be reported "
diff --git a/manual/po/de/resources.xml.po b/manual/po/de/resources.xml.po
index 0056db1..14f4b4e 100644
--- a/manual/po/de/resources.xml.po
+++ b/manual/po/de/resources.xml.po
@@ -1,36 +1,21 @@
-# German translations for Debconf package
-# Copyright (C) 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the Debconf package.
-# Automatically generated, 2008.
+# German translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Debconf 8\n"
+"Project-Id-Version: live-manual VERSION\n"
 "POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2008-08-09 16:50+0300\n"
+"PO-Revision-Date: 2010-06-06 12:16+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: \n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-# #-#-#-#-#  live-environment.xml.po (Debconf 8)  #-#-#-#-#
-# #-#-#-#-#  live-environment.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  resources.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  success-stories.xml.po (live-manual VERSION)  #-#-#-#-#
-# #-#-#-#-#  live-environment.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  resources.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  resources.xml.po (Debconf 8)  #-#-#-#-#
-# #-#-#-#-#  live-environment.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  resources.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><para>
 #: en/about_manual.xml:125 en/customization_bootup.xml:11
 #: en/customization_bootup.xml:20 en/customization_bootup.xml:26
@@ -44,19 +29,16 @@ msgstr ""
 msgid "FIXME"
 msgstr ""
 
-# type: Content of: <chapter><title>
 #. type: Content of: <chapter><title>
 #: en/resources.xml:7
 msgid "Resources and links"
 msgstr ""
 
-# type: Content of: <chapter><section><title>
 #. type: Content of: <chapter><section><title>
 #: en/resources.xml:10
 msgid "Links"
 msgstr ""
 
-# type: Content of: <chapter><section><orderedlist><listitem><para>
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
 #: en/resources.xml:14
 msgid "<ulink url=\"http://www.debian.org/\">Debian homepage</ulink>"
diff --git a/manual/po/de/success-stories.xml.po b/manual/po/de/success-stories.xml.po
index fff7285..7fd10c3 100644
--- a/manual/po/de/success-stories.xml.po
+++ b/manual/po/de/success-stories.xml.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
 "POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2010-06-06 12:07+0300\n"
+"PO-Revision-Date: 2010-06-06 12:16+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
@@ -16,21 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-# #-#-#-#-#  live-environment.xml.po (Debconf 8)  #-#-#-#-#
-# #-#-#-#-#  live-environment.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  resources.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  success-stories.xml.po (live-manual VERSION)  #-#-#-#-#
-# #-#-#-#-#  live-environment.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  resources.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  resources.xml.po (Debconf 8)  #-#-#-#-#
-# #-#-#-#-#  live-environment.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
-# #-#-#-#-#  resources.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><para>
 #. type: Content of: <chapter><para>
 #: en/about_manual.xml:125 en/customization_bootup.xml:11
 #: en/customization_bootup.xml:20 en/customization_bootup.xml:26
diff --git a/manual/po/de/use-cases.xml.po b/manual/po/de/use-cases.xml.po
index 0d77631..087fc6a 100644
--- a/manual/po/de/use-cases.xml.po
+++ b/manual/po/de/use-cases.xml.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2010-06-06 12:07+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
+"PO-Revision-Date: 2010-06-06 17:46+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
@@ -17,112 +17,106 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/basics.xml:128 en/chapters/basics.xml:239
-#: en/chapters/basics.xml:382 en/chapters/use-cases.xml:59
+#: en/basics.xml:50 en/basics.xml:89 en/basics.xml:148 en/use-cases.xml:31
 #, no-wrap
 msgid "# lh build"
 msgstr ""
 
 #. type: Content of: <chapter><title>
-#: en/chapters/use-cases.xml:7
+#: en/use-cases.xml:6
 msgid "Use Cases"
 msgstr ""
 
 #. type: Content of: <chapter><para>
-#: en/chapters/use-cases.xml:9
+#: en/use-cases.xml:7
 msgid "This chapter is for users to document their use cases with Debian Live."
 msgstr ""
 
 #. type: Content of: <chapter><sect1><title>
-#: en/chapters/use-cases.xml:12
+#: en/use-cases.xml:9
 msgid "VNC Kiosk Client"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><para>
-#: en/chapters/use-cases.xml:13
+#: en/use-cases.xml:10
 msgid "Create an image with &live-helper; to boot directly to a VNC server."
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/use-cases.xml:18
+#: en/use-cases.xml:13
 #, no-wrap
 msgid "$ mkdir vncBuild"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/chapters/use-cases.xml:17
+#: en/use-cases.xml:13
 msgid "Make a build directory: <placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/use-cases.xml:24
+#: en/use-cases.xml:16
 #, no-wrap
 msgid "$ cd vncBuild"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/chapters/use-cases.xml:23
+#: en/use-cases.xml:16
 msgid "Move to the build directory: <placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/use-cases.xml:30
+#: en/use-cases.xml:19
 #, no-wrap
 msgid "$ lh config --packages \"gdm metacity xtightvncviewer\""
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/chapters/use-cases.xml:29
+#: en/use-cases.xml:19
 msgid ""
 "Example to config the build directory to include gdm metacity "
 "xtightvncviewer: <placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/use-cases.xml:36
+#: en/use-cases.xml:22
 #, no-wrap
 msgid "$ mkdir -p config/chroot_local-includes/etc/skel"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/chapters/use-cases.xml:35
+#: en/use-cases.xml:22
 msgid ""
 "Create a folder /etc/skel folder for a custom .xsession for the default "
 "user: <placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/use-cases.xml:42
+#: en/use-cases.xml:25
 #, no-wrap
 msgid "$ touch config/chroot_local-includes/etc/skel/.xsession"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/chapters/use-cases.xml:41
+#: en/use-cases.xml:25
 msgid ""
 "Create the .xsession for the default user: <placeholder type=\"screen\" id="
 "\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/use-cases.xml:49
+#: en/use-cases.xml:28
 #, no-wrap
-msgid ""
-"\t#!/bin/sh\n"
-"\t/usr/bin/metacity &amp;\n"
-"\t/usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT\n"
-"\texit\n"
-"\t"
+msgid " #!/bin/sh /usr/bin/metacity &amp; /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT exit "
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/chapters/use-cases.xml:47
+#: en/use-cases.xml:28
 msgid ""
 "Edit the .xsession file to launch metacity and start xvncviewer with "
 "something similar to the below: <placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/chapters/use-cases.xml:58
+#: en/use-cases.xml:31
 msgid "Build the image: <placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
diff --git a/manual/po/fr/about_manual.xml.po b/manual/po/fr/about_manual.xml.po
deleted file mode 100644
index ec2b1b5..0000000
--- a/manual/po/fr/about_manual.xml.po
+++ /dev/null
@@ -1,498 +0,0 @@
-# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2010-06-06 12:16+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. type: Content of: <sect1><title>
-#: en/about_manual.xml:9
-msgid "About this manual"
-msgstr ""
-
-#. type: Content of: <sect1><para>
-#: en/about_manual.xml:12
-msgid ""
-"The main goal of this manual is to serve as a single access point to all "
-"documentation related to the Debian Live project. It does not include end-"
-"user documentation for using a Debian Live system."
-msgstr ""
-
-#. type: Content of: <sect1><para>
-#: en/about_manual.xml:18
-msgid ""
-"Some of the commands mentioned in the text must be executed with superuser "
-"privileges which can be obtained by becoming the root user via <filename>su</"
-"filename> or by using <filename>sudo</filename>. To distinguish between "
-"commands which may be executed by an unprivileged user and those requiring "
-"superuser privileges, commands are prepended by <command>$</command> or "
-"<command>#</command> respectively. This symbol is not a part of the command."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/about_manual.xml:28
-msgid "Terms"
-msgstr ""
-
-# type: Content of: <chapter><section><title>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:33
-#, fuzzy
-#| msgid "What is a live system?"
-msgid "Live system"
-msgstr "Qu'est-ce qu'un système live"
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:37
-msgid ""
-"An operating system that can boot without installation to a hard drive.  "
-"Live systems do not alter local operating system(s) or file(s) already "
-"installed on the computer hard drive unless instructed to do so. Live "
-"systems are typically booted from media such as CDs or DVDs, some may also "
-"boot with USB sticks or over the network (via netboot images)."
-msgstr ""
-
-# type: Content of: <book><title>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:47
-#, fuzzy
-#| msgid "Debian Live Manual"
-msgid "Debian Live"
-msgstr "Manuel de Debian Live"
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:51
-msgid ""
-"The Debian sub-project which maintains the &live-helper; and &live-"
-"initramfs; utilities."
-msgstr ""
-
-# type: Content of: <book><bookinfo><copyright><holder>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:58
-#, fuzzy
-#| msgid "The Debian Live Project"
-msgid "Debian Live system"
-msgstr "Le projet Debian Live"
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:62
-msgid ""
-"A live system that uses software from the Debian operating system that may "
-"be booted from CDs, DVDs, USB sticks, over the network (via netboot images), "
-"and over the internet (via boot parameter fetch=URL)"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:70
-msgid "Build system / host system"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:74
-msgid "The environment used to create the live system."
-msgstr ""
-
-# type: Content of: <chapter><section><title>
-#. type: Content of: <chapter><section><title>
-#: en/about_manual.xml:80 en/overview.xml:17
-msgid "&live-helper;"
-msgstr "&live-helper;"
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:84
-msgid "A collection of scripts used to build customised Debian Live systems."
-msgstr ""
-
-# #-#-#-#-#  installation.xml.po (Debconf 8)  #-#-#-#-#
-# #-#-#-#-#  installation.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-# #-#-#-#-#  manual.xml.po (PACKAGE VERSION)  #-#-#-#-#
-# type: Content of: <chapter><section><title>
-# #-#-#-#-#  manual.xml.po (PACKAGE VERSION)  #-#-#-#-#
-# type: Content of: <chapter><section><title>
-#. type: Content of: <chapter><section><section><title>
-#: en/about_manual.xml:90 en/installation.xml:76
-msgid "&live-initramfs;"
-msgstr "&live-initramfs;"
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:94
-msgid ""
-"A collection of scripts used to boot live systems. &live-initramfs; is a "
-"fork of <filename>casper</filename> by Canonical, Ltd."
-msgstr ""
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:101
-#, fuzzy
-#| msgid "<filename>live-package</filename>"
-msgid "<filename>live-package</filename>"
-msgstr "<filename>live-package</filename>"
-
-# type: Content of: <chapter><section><orderedlist><listitem><para>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:105
-#, fuzzy
-#| msgid "An up-to-date version of &live-helper;"
-msgid "The former name of &live-helper;."
-msgstr "Une version à jour de &live-helper;"
-
-# type: Content of: <chapter><section><title>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:111
-#, fuzzy
-#| msgid "The Debian Installer"
-msgid "Debian Installer / (d-i)"
-msgstr "L'installeur Debian"
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:115
-msgid "The official installation system for the Debian distribution."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/about_manual.xml:121 en/customization_bootup.xml:104
-msgid "Cheat codes"
-msgstr ""
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><para>
-#: en/about_manual.xml:125 en/customization_bootup.xml:11
-#: en/customization_bootup.xml:20 en/customization_bootup.xml:26
-#: en/customization_bootup.xml:38 en/customization_bootup.xml:85
-#: en/customization_bootup.xml:92 en/customization_bootup.xml:99
-#: en/customization_bootup.xml:106 en/customization_packages.xml:36
-#: en/customization_packages.xml:306 en/customization_packages.xml:326
-#: en/customization_packages.xml:384 en/customization_packages.xml:492
-#: en/customization_packages.xml:535 en/live-environment.xml:11
-#: en/resources.xml:11 en/success-stories.xml:11
-msgid "FIXME"
-msgstr "FIXME"
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:131
-msgid "chroot"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:135
-msgid ""
-"The chroot program, chroot(8), enables us to run different instances of the "
-"GNU/Linux environment on a single system simultaneously without rebooting."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:143
-msgid "binary image"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:147
-msgid ""
-"On a live system, binary image refers to the binary filesystem and the "
-"respective extension, such as binary.iso or binary.img."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:154
-msgid "Target distribution"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:158
-msgid ""
-"The distribution upon which your live system will be based. This can differ "
-"from the distribution of your Build System."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:165
-msgid "&lenny;/&squeeze;/&sid; stable/testing/unstable"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:169
-msgid ""
-"The \"stable\" distribution contains the latest officially released "
-"distribution of Debian. The \"testing\" distribution is the staging area for "
-"the next stable release. A major advantage of using this distribution is "
-"that it has more recent versions of software relative to the \"stable\" "
-"release. The \"unstable\" distribution is where active development of Debian "
-"occurs. Generally, this distribution is run by developers and those who like "
-"to live on the edge."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:179
-msgid ""
-"At the time of writing, &lenny; is the current \"stable\" release and "
-"&squeeze; is the current \"testing\" release. &sid; will always be a synonym "
-"for the \"unstable\" release."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/about_manual.xml:191
-msgid "Authors"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:194
-msgid "A list of authors (in alphabetical order):"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:201
-msgid "Ben Armstrong"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:207
-msgid "Brendan Sleight"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:213
-msgid "Chris Lamb"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:219
-msgid "Daniel Baumann"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:225
-msgid "Franklin Piat"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:231
-msgid "Jonas Stein"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:237
-msgid "Kai Hendry"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:243
-msgid "Marco Amadori"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:249
-msgid "Mathieu Geli"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:255
-msgid "Matthias Kirschner"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:261
-msgid "Richard Nelson"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:267
-msgid "Trent W. Buck"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/about_manual.xml:276
-msgid "Contributing to this document"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:279
-msgid ""
-"This manual is intended as a community project and all proposals for "
-"improvements and contributions are extremely welcome. The preferred way to "
-"submit a contribution is to send it to the mailing list. Please see <xref "
-"linkend=\"contact\" /> for more information."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:286
-msgid ""
-"When submitting a contribution please clearly identify its copyright holder "
-"and include the licensing statement. Note that to be accepted the "
-"contribution must be licensed under the same license as the rest of the "
-"document, namely GPL version 3 or later."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:293
-msgid ""
-"The sources for this manual are maintained using the Git version control "
-"system. You can checkout the latest copy by executing:"
-msgstr ""
-
-# type: Content of: <chapter><section><section><screen>
-#. type: Content of: <sect1><sect2><para><screen>
-#: en/about_manual.xml:298
-#, fuzzy, no-wrap
-#| msgid "$ git clone git://git.debian.net/git/debian-live/live-helper.git"
-msgid "$ git clone git://live.debian.net/git/live-manual.git"
-msgstr "$ git clone git://git.debian.net/git/debian-live/live-helper.git"
-
-#. type: Content of: <chapter><section><section><para>
-#: en/about_manual.xml:298 en/about_manual.xml:308 en/about_manual.xml:318
-#: en/about_manual.xml:338 en/about_manual.xml:351 en/about_manual.xml:366
-#: en/about_manual.xml:379 en/about_manual.xml:389 en/basics.xml:113
-#: en/basics.xml:128 en/basics.xml:144 en/basics.xml:158 en/basics.xml:194
-#: en/basics.xml:220 en/basics.xml:230 en/basics.xml:239 en/basics.xml:253
-#: en/basics.xml:275 en/basics.xml:302 en/basics.xml:312 en/basics.xml:320
-#: en/basics.xml:354 en/basics.xml:364 en/basics.xml:382 en/basics.xml:429
-#: en/basics.xml:498 en/basics.xml:530 en/basics.xml:539 en/basics.xml:590
-#: en/basics.xml:646 en/customization_packages.xml:50
-#: en/customization_packages.xml:58 en/customization_packages.xml:71
-#: en/customization_packages.xml:80 en/customization_packages.xml:104
-#: en/customization_packages.xml:222 en/customization_packages.xml:230
-#: en/customization_packages.xml:265 en/customization_packages.xml:310
-#: en/customization_packages.xml:330 en/customization_packages.xml:341
-#: en/customization_packages.xml:352 en/customization_packages.xml:362
-#: en/faq.xml:64 en/faq.xml:241 en/faq.xml:244 en/faq.xml:252 en/faq.xml:256
-#: en/faq.xml:264 en/faq.xml:279 en/faq.xml:287 en/faq.xml:334 en/faq.xml:424
-#: en/faq.xml:430 en/faq.xml:481 en/faq.xml:483 en/faq.xml:487 en/faq.xml:491
-#: en/overview.xml:181 en/overview.xml:230 en/overview.xml:240
-msgid "<placeholder type=\"screen\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:302
-msgid ""
-"Prior to submission of your contribution, please preview your work. To "
-"preview the live-manual, ensure the packages needed for building are "
-"installed by executing:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para><screen>
-#: en/about_manual.xml:308
-#, no-wrap
-msgid ""
-"# apt-get install dblatex docbook-xml docbook-xsl make po4a\n"
-"\tw3m"
-msgstr ""
-
-# type: Content of: <chapter><section><section><para>
-#. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:313
-#, fuzzy
-#| msgid ""
-#| "You can also install &live-helper; directly to your system by executing:"
-msgid ""
-"You may build the live-manual from the top level directory of your git "
-"checkout by executing:"
-msgstr ""
-"Vous pouvez aussi installer &live-helper; directement sur votre système en "
-"exécutant:"
-
-# type: Content of: <sect1><sect2><screen>
-#. type: Content of: <sect1><sect2><para><screen>
-#: en/about_manual.xml:318
-#, fuzzy, no-wrap
-#| msgid "$ make build"
-msgid "$ make build"
-msgstr "$ make build"
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_manual.xml:322
-msgid "Applying patches"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_manual.xml:325
-msgid ""
-"Directly commiting to the repository is possible by anyone. However, we ask "
-"you to send bigger changes to the mailinglist to discuss them first.  In "
-"order to push to the repository, the following steps are required."
-msgstr ""
-
-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about_manual.xml:334
-#, fuzzy
-#| msgid "Fetcht the archive signing key:"
-msgid "Fetch the public commit key:"
-msgstr "Récuperer le fichier de signature du dépot:"
-
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:338
-#, no-wrap
-msgid ""
-"$ mkdir -p ~/.ssh/identity.d\n"
-"$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live -O ~/.ssh/identity.d/live-manual at debian-live\n"
-"$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub -O ~/.ssh/identity.d/live-manual at debian-live.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about_manual.xml:347
-msgid "Add the following section to your openssh-client config:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:351
-#, no-wrap
-msgid ""
-" $ cat &gt;&gt; ~/.ssh/config &lt;&lt; EOF\n"
-"Host live.debian.net\n"
-"\tHostname live.debian.net\n"
-"\tUser gitosis\n"
-"\tIdentityFile ~/.ssh/identity.d/live-manual at debian-live\n"
-"EOF"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about_manual.xml:362
-msgid "Checkout a clone of the manual through ssh:"
-msgstr ""
-
-# type: Content of: <chapter><section><section><screen>
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:366
-#, fuzzy, no-wrap
-#| msgid "$ git clone git://git.debian.net/git/debian-live/live-helper.git"
-msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
-msgstr "$ git clone git://git.debian.net/git/debian-live/live-helper.git"
-
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about_manual.xml:372
-msgid ""
-"Commit the file after editing. Write commit messages, that consist of full "
-"useful sentences, starting with a capital letter and ending with a full "
-"stop. Usually starting with the form 'Fixing/Adding/Removing/Correcting/':"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:379
-#, no-wrap
-msgid "$ git commit -a"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about_manual.xml:385
-msgid "Push the commit to the server:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:389
-#, no-wrap
-msgid "$ git push"
-msgstr ""
diff --git a/manual/po/fr/about_project.xml.po b/manual/po/fr/about_project.xml.po
deleted file mode 100644
index 66c570e..0000000
--- a/manual/po/fr/about_project.xml.po
+++ /dev/null
@@ -1,303 +0,0 @@
-# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2010-06-06 12:16+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-# type: Content of: <book><bookinfo><copyright><holder>
-#. type: Content of: <sect1><title>
-#: en/about_project.xml:7
-#, fuzzy
-#| msgid "The Debian Live Project"
-msgid "About the Debian Live Project"
-msgstr "Le projet Debian Live"
-
-# type: Content of: <chapter><title>
-#. type: Content of: <sect1><sect2><title>
-#: en/about_project.xml:10
-#, fuzzy
-#| msgid "Customization"
-msgid "Motivation"
-msgstr "Personnalisation"
-
-# type: Content of: <chapter><section><title>
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_project.xml:13
-#, fuzzy
-#| msgid "What is a live system?"
-msgid "What is wrong with current live systems"
-msgstr "Qu'est-ce qu'un système live"
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:15
-msgid ""
-"There are already several Debian-based live systems and they are doing a "
-"great job. But, from the Debian perspective most of them have one or more of "
-"the following disadvantages:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:18
-msgid "They are unofficial projects, developed outside of Debian."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:19
-msgid "They mix different distributions, e.g. testing and unstable."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:20
-msgid "They support i386 only."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:21
-msgid ""
-"They modify the behaviour and/or appearance of packages by stripping them "
-"down to save space."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:22
-msgid "They include unofficial packages."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:23
-msgid ""
-"They ship custom kernels with additional patches that are not part of Debian."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:24
-msgid ""
-"They are large and slow due to their sheer size and thus not suitable for "
-"rescue issues."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:25
-msgid ""
-"They are not available in different flavours, e.g. CDs, DVDs, USB-stick and "
-"netboot images"
-msgstr ""
-
-# type: Content of: <chapter><section><title>
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_project.xml:30
-#, fuzzy
-#| msgid "What is a live system?"
-msgid "Why create our own live system?"
-msgstr "Qu'est-ce qu'un système live"
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:32
-msgid ""
-"Debian is the Universal Operating System: Debian should have an official "
-"live system for showing around and to officially represent the true, one and "
-"only Debian system with the following main advantages:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:35
-msgid "It would be an official Debian subproject."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:36
-msgid "It reflects the (current) state of one distribution."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:37
-msgid "It runs on as many architectures as possible."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:38
-msgid "It consists of unchanged Debian packages only."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:39
-msgid "It does not contain any unofficial packages."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:40
-msgid "It uses an unaltered Debian kernel-image with no additional patches."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/about_project.xml:48
-msgid "Philosophy"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_project.xml:51
-msgid "Only unchanged, official packages"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:52
-msgid ""
-"We will only use official packages from the Debian repository in the \"main"
-"\" section (possibly contrib, although not decided yet). The non-free "
-"section is not part of Debian and therefore cannot be used at all for live "
-"systems."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:54
-msgid ""
-"We will not change any packages. Whenever we need to change something, we "
-"will do that in coordination with its package maintainer in Debian."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:56
-msgid ""
-"As an exception, our own packages such as &live-helper; or &live-initramfs; "
-"may temporarily be used from our own repository for development reasons (e."
-"g. to create development snapshots). They will be uploaded to Debian on a "
-"regular basis."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_project.xml:60
-msgid "No package configuration of the live system"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:61
-msgid ""
-"In this phase we will not ship or install sample or alternative "
-"configurations. All packages are used in their default configuration as they "
-"are after a regular installation of Debian."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:63
-msgid ""
-"Whenever we need a different default configuration, we will do that in "
-"coordination with its package maintainer in Debian."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:65
-msgid ""
-"A system for configuring packages is provided using debconf in <command>lh "
-"config</command> (use --preseed FILE) allowing custom configured packages to "
-"be installed in your custom produced Debian Live images, but for official "
-"live images only default configuration will be used. For more information, "
-"please see <xref linkend=\"customization\"/>."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:67
-msgid ""
-"Exception: There are a few essential changes needed to bring a live system "
-"to life (e.g. configuring pam to allow empty passwords). These essential "
-"changes have to be kept as minimal as possible and should be merged within "
-"the Debian repository if possible."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_project.xml:71
-msgid "Live system to hard disk installer"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:72
-msgid ""
-"For the moment we will not ship an installer to copy the live system to a "
-"partition on the hard disk. Although we keep the changes in the live system "
-"as drastically minimal as possible compared to a regular Debian "
-"installation, the live system does differ in a few essential points (see "
-"exceptions, guideline 2)."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:74
-msgid ""
-"Therefore, we will ship a copy of the regular DebianInstaller (resp. Debian "
-"Installer, Graphical Installer) instead, to allow users to perform a regular "
-"Debian installation (and, of course, cdebootstrap and debootstrap are on the "
-"system too)."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/about_project.xml:80
-msgid "Contact"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_project.xml:83
-msgid "Mailing list"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_project.xml:84
-msgid ""
-"The primary contact for the project is the <ulink url=\"http://lists.debian."
-"org/debian-live/\">mailing list</ulink>. You can email the list directly by "
-"addressing your mail to <email>debian-live at lists.debian.org</email>. The "
-"<ulink url=\"http://lists.debian.org/debian-live/\">list archives</ulink> "
-"are also available."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_project.xml:87
-msgid "IRC"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_project.xml:88
-msgid ""
-"A number of users and developers are present in the <ulink url=\"irc://irc."
-"debian.org/#debian-live\">#debian-live</ulink> channel on <ulink url="
-"\"http://oftc.net\">OFTC</ulink>. When asking a question on IRC, please be "
-"patient for an answer. If no answer is forthcoming, please email the mailing "
-"list."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_project.xml:91
-msgid "BTS"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_project.xml:92
-msgid ""
-"The Debian Bug Tracking System (BTS) contains details of bugs reported by "
-"users and developers. Each bug is given a number, and is kept on file until "
-"it is marked as having been dealt with. For more information, please see "
-"<xref linkend=\"bugs\"/>."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_project.xml:95
-msgid "Wiki"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_project.xml:96
-msgid ""
-"The <ulink url=\"http://wiki.debian.org/DebianLive\">Debian Live wiki</"
-"ulink> is a place to gather information, discuss applied technologies, and "
-"document frameworks of Debian Live systems that go beyond the scope of this "
-"document."
-msgstr ""
diff --git a/manual/po/fr/appendices_configuration-files.xml.po b/manual/po/fr/appendices_configuration-files.xml.po
deleted file mode 100644
index 4f1639c..0000000
--- a/manual/po/fr/appendices_configuration-files.xml.po
+++ /dev/null
@@ -1,1079 +0,0 @@
-# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2010-06-06 12:16+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. type: Content of: <appendix><title>
-#: en/appendices_configuration-files.xml:8
-msgid "Configuration files"
-msgstr ""
-
-# type: Content of: <appendix><section><title>
-#. type: Content of: <appendix><section><title>
-#: en/appendices_configuration-files.xml:11
-#, fuzzy
-#| msgid "The <filename>config/binary</filename> file"
-msgid "The <filename>config/binary</filename> file"
-msgstr "Le fichier <filename>config/binary</filename>."
-
-# type: Content of: <chapter><section><para><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:15
-#, fuzzy
-#| msgid "LH_BINARY_DEBIAN_INSTALLER"
-msgid "LH_BINARY_FILESYSTEM"
-msgstr "LH_BINARY_DEBIAN_INSTALLER"
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:16
-msgid "Set image filesystem. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <chapter><section><para><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:20
-#, fuzzy
-#| msgid "LH_BINARY_DEBIAN_INSTALLER"
-msgid "LH_BINARY_IMAGES"
-msgstr "LH_BINARY_DEBIAN_INSTALLER"
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:21
-#: en/appendices_configuration-files.xml:512
-msgid "Set image type. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <chapter><section><para><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:25
-#, fuzzy
-#| msgid "LH_BINARY_DEBIAN_INSTALLER"
-msgid "LH_BINARY_INDICES"
-msgstr "LH_BINARY_DEBIAN_INSTALLER"
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:26
-msgid ""
-"Set apt/aptitude generic indices. (See <xref linkend=\"configuration-layout"
-"\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:30
-#, fuzzy
-#| msgid "LH_BOOTAPPEND_LIVE"
-msgid "LH_BOOTAPPEND_LIVE"
-msgstr "LH_BOOTAPPEND_LIVE"
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:31
-#: en/appendices_configuration-files.xml:36
-msgid "Set boot parameters. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <chapter><section><para><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:35
-#, fuzzy
-#| msgid "LH_BINARY_DEBIAN_INSTALLER"
-msgid "LH_BOOTAPPEND_INSTALL"
-msgstr "LH_BINARY_DEBIAN_INSTALLER"
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:40
-msgid "LH_BOOTLOADER"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:41
-msgid "Set bootloader. (See <xref linkend=\"bootloaders\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:45
-msgid "LH_CHECKSUMS"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:46
-msgid "Set checksums. (See <xref linkend=\"cheat-codes\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:50
-msgid "LH_CHROOT_BUILD"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:51
-msgid ""
-"Control if we build binary images chrooted. (See <xref linkend="
-"\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <chapter><section><para><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:55
-#, fuzzy
-#| msgid "LH_BINARY_DEBIAN_INSTALLER"
-msgid "LH_DEBIAN_INSTALLER"
-msgstr "LH_BINARY_DEBIAN_INSTALLER"
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:56
-msgid "Set debian-installer. (See <xref linkend=\"debian-installer\"/>)"
-msgstr ""
-
-# type: Content of: <chapter><section><para><term>
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:60
-#, fuzzy
-#| msgid "LH_BINARY_DEBIAN_INSTALLER"
-msgid "LH_DEBIAN_INSTALLER_DAILY"
-msgstr "LH_BINARY_DEBIAN_INSTALLER"
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:61
-msgid "Set daily images. (See <xref linkend=\"debian-installer\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:65
-msgid "LH_ENCRYPTION"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:66
-msgid "Set encrytion. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:70
-msgid "LH_GRUB_SPLASH"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:71
-msgid "Set custom grub splash. (See <xref linkend=\"splash\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:75
-msgid "LH_HOSTNAME"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:76
-msgid "Set hostname. (See <xref linkend=\"hostname\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:80
-msgid "LH_ISO_APPLICATION"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:81
-msgid "Set iso author. (See <xref linkend=\"iso-metadata\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:85
-msgid "LH_ISO_PREPARER"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:86
-msgid "Set iso preparer. (See <xref linkend=\"iso-metadata\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:90
-msgid "LH_ISO_PUBLISHER"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:91
-msgid "Set iso publisher. (See <xref linkend=\"iso-metadata\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:95
-msgid "LH_ISO_VOLUME"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:96
-msgid "Set iso volume (max 32 chars). (See <xref linkend=\"iso-metadata\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:100
-msgid "LH_JFFS2_ERASEBLOCK"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:101
-msgid ""
-"Set jffs2 eraseblock size. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:105
-msgid "LH_MEMTEST"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:106
-msgid "Set memtest. (See <xref linkend=\"memtest\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:110
-msgid "LH_NET_ROOT_FILESYSTEM"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:111
-msgid "Set netboot filesystem. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:115
-msgid "LH_NET_ROOT_MOUNTOPTIONS"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:116
-msgid "Set nfsopts. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:120
-msgid "LH_NET_ROOT_PATH"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:121
-msgid ""
-"Set netboot server directory. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:125
-msgid "LH_NET_ROOT_SERVER"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:126
-msgid ""
-"Set netboot server address. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:130
-msgid "LH_NET_COW_FILESYSTEM"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:131
-msgid ""
-"Set net client cow filesystem. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:135
-msgid "LH_NET_COW_MOUNTOPTIONS"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:136
-msgid "Set cow mount options. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:140
-msgid "LH_NET_COW_PATH"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:141
-msgid "Set cow directory. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:145
-msgid "LH_NET_COW_SERVER"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:146
-msgid "Set cow server. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:150
-msgid "LH_NET_TARBALL"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:151
-msgid "Set net tarball. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:155
-msgid "LH_SYSLINUX_SPLASH"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:156
-msgid "Set custom syslinux splash. (See <xref linkend=\"splash\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:160
-msgid "LH_SYSLINUX_TIMEOUT"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:161
-msgid ""
-"Set custom syslinux timeout in seconds. (See <xref linkend=\"syslinux\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:165
-msgid "LH_SYSLINUX_CFG"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:166
-msgid ""
-"Set custom syslinux configuration file. (See <xref linkend=\"syslinux\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:170
-msgid "LH_SYSLINUX_MENU"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:171
-msgid "Set syslinux menu. (See <xref linkend=\"syslinux\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:175
-msgid "LH_SYSLINUX_MENU_LIVE_ENTRY"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:176
-msgid ""
-"Set text to be used on the menu for live entries. (See <xref linkend="
-"\"syslinux\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:180
-msgid "LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:181
-msgid ""
-"Set text to be used on the menu for live entries (failsafe ones). (See <xref "
-"linkend=\"syslinux\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:185
-msgid "LH_SYSLINUX_MENU_MEMTEST_ENTRY"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:186
-msgid ""
-"Set text to be used on the menu for memtest entry. (See <xref linkend="
-"\"syslinux\"/> and <xref linkend=\"memtest\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:190
-msgid "LH_USERNAME"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:191
-msgid "Set username. (See <xref linkend=\"live-user\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><title>
-#. type: Content of: <appendix><section><title>
-#: en/appendices_configuration-files.xml:198
-#, fuzzy
-#| msgid "The <filename>config/binary</filename> file"
-msgid "The <filename>config/bootstrap</filename> file"
-msgstr "Le fichier <filename>config/binary</filename>."
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:202
-msgid "LH_ARCHITECTURE"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:203
-msgid ""
-"Select chroot architecture. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:207
-msgid "LH_BOOTSTRAP_CONFIG"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:208
-msgid ""
-"Set distribution config directory. (See <xref linkend=\"configuration-layout"
-"\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:212
-msgid "LH_BOOTSTRAP_INCLUDE"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:213
-msgid ""
-"Include packages on base. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:217
-msgid "LH_BOOTSTRAP_EXCLUDE"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:218
-msgid ""
-"Exclude packages on base. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:222
-msgid "LH_BOOTSTRAP_FLAVOUR"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:223
-msgid "Select flavour to use. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:227
-msgid "LH_BOOTSTRAP_KEYRING"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:228
-msgid ""
-"Set distribution keyring. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:232
-msgid "LH_DISTRIBUTION"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:233
-msgid ""
-"Select distribution to use. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:237
-msgid "LH_MIRROR_BOOTSTRAP"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:238
-msgid "Set mirror to bootstrap from. (See <xref linkend=\"package-sources\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:242
-msgid "LH_MIRROR_CHROOT"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:243
-msgid ""
-"Set mirror to fetch packages from. (See <xref linkend=\"package-sources\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:247
-msgid "LH_MIRROR_CHROOT_SECURITY"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:248
-msgid ""
-"Set security mirror to fetch packages from. (See <xref linkend=\"package-"
-"sources\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:252
-msgid "LH_MIRROR_BINARY"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:253
-msgid ""
-"Set mirror which ends up in the image. (See <xref linkend=\"package-sources"
-"\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:257
-msgid "LH_MIRROR_BINARY_SECURITY"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:258
-msgid ""
-"Set security mirror which ends up in the image. (See <xref linkend=\"package-"
-"sources\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:262
-msgid "LH_SECTIONS"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:263
-msgid "select section(s) to use. (See <xref linkend=\"package-sources\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><title>
-#. type: Content of: <appendix><section><title>
-#: en/appendices_configuration-files.xml:269
-#, fuzzy
-#| msgid "The <filename>config/binary</filename> file"
-msgid "The <filename>config/chroot</filename> file"
-msgstr "Le fichier <filename>config/binary</filename>."
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:273
-msgid "LH_CHROOT_FILESYSTEM"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:274
-msgid "Set chroot filesystem. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:278
-msgid "LH_UNION_FILESYSTEM"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:279
-msgid "Set union filesystem. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:283
-msgid "LH_EXPOSED_ROOT"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:284
-msgid ""
-"expose root as read only. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:288
-msgid "LH_HOOKS"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:289
-msgid "Set hook commands. (See <xref linkend=\"hooks\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:293
-msgid "LH_INTERACTIVE"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:294
-msgid "Set interactive build. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:298
-msgid "LH_KEYRING_PACKAGES"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:299
-msgid "Set keyring packages. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:303
-msgid "LH_LANGUAGE"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:304
-msgid "Set language to use. (See <xref linkend=\"language\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:308
-msgid "LH_LINUX_FLAVOURS"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:309
-msgid "Set kernel flavour to use. (See <xref linkend=\"kernel\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:313
-msgid "LH_LINUX_PACKAGES"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:314
-msgid "Set kernel packages to use. (See <xref linkend=\"kernel\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:318
-msgid "LH_PACKAGES"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:319
-msgid "Set packages to install. (See <xref linkend=\"lh-packages\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:323
-msgid "LH_PACKAGES_LISTS"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:324
-msgid "Set package list to install. (See <xref linkend=\"package-lists\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:328
-msgid "LH_TASKS"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:329
-msgid "Set tasks to install. (See <xref linkend=\"tasks\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:333
-msgid "LH_SECURITY"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:334
-msgid "enable security updates. (See <xref linkend=\"package-sources\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:338
-msgid "LH_SYMLINKS"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:339
-msgid "enable symlink convertion. (See <xref linkend=\"symlinks\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:343
-msgid "LH_SYSVINIT"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:344
-msgid "enable sysvinit. (See <xref linkend=\"startup-scripts\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><title>
-#. type: Content of: <appendix><section><title>
-#: en/appendices_configuration-files.xml:351
-#, fuzzy
-#| msgid "The <filename>config/binary</filename> file"
-msgid "The <filename>config/common</filename> file"
-msgstr "Le fichier <filename>config/binary</filename>."
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:355
-msgid "LH_APT"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:356
-#, fuzzy
-#| msgid "Set package manager. (See <xref linkend=\"package-installation\"/>)"
-msgid "Set package manager. (See <xref linkend=\"package-installation\"/>)"
-msgstr ""
-"Défini le gestionnaire de paquets. (Voir <xref linkend=\"package-installation"
-"\"/>)"
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:360
-msgid "LH_APT_FTP_PROXY"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:361
-msgid ""
-"Set apt/aptitude ftp proxy. (See <xref linkend=\"package-installation\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:365
-msgid "LH_APT_HTTP_PROXY"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:366
-msgid ""
-"Set apt/aptitude http proxy. (See <xref linkend=\"package-installation\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:370
-msgid "LH_APT_PDIFFS"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:371
-msgid ""
-"Set apt/aptitude pdiff indices. (See <xref linkend=\"package-installation\"/"
-">)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:375
-msgid "LH_APT_PIPELINE"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:376
-msgid ""
-"Set apt/aptitude pipeline depth. (See <xref linkend=\"package-installation\"/"
-">)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:380
-msgid "LH_APT_RECOMMENDS"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:381
-msgid ""
-"Set apt/aptitude recommends. (See <xref linkend=\"package-installation\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:385
-msgid "LH_APT_SECURE"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:386
-msgid ""
-"Set apt/aptitude security. (See <xref linkend=\"package-installation\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:390
-msgid "LH_BOOTSTRAP"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:391
-msgid "Set bootstrap program. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:395
-msgid "LH_CACHE"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:396
-msgid "control cache. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:400
-msgid "LH_CACHE_INDICES"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:401
-msgid ""
-"control if downloaded package indices should be cached. (See <xref linkend="
-"\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:405
-msgid "LH_CACHE_PACKAGES"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:406
-msgid ""
-"control if downloaded packages files should be cached. (See <xref linkend="
-"\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:410
-msgid "LH_CACHE_STAGES"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:411
-msgid ""
-"control if completed stages should be cached. (See <xref linkend="
-"\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:415
-msgid "LH_DEBCONF_FRONTEND"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:416
-msgid ""
-"Set debconf(1) frontend to use. (See <xref linkend=\"configuration-layout\"/"
-">)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:420
-msgid "LH_DEBCONF_NOWARNINGS"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:421
-msgid "Set debconf(1) warnings. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:425
-msgid "LH_DEBCONF_PRIORITY"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:426
-msgid ""
-"Set debconf(1) priority to use. (See <xref linkend=\"configuration-layout\"/"
-">)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:430
-msgid "LH_INITRAMFS"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:431
-msgid "Set initramfs hook. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:435
-msgid "LH_FDISK"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:436
-msgid "Set fdisk program. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:440
-msgid "LH_LOSETUP"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:441
-msgid "Set losetup program. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:445
-msgid "LH_MODE"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:446
-msgid "Set distribution mode. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:450
-msgid "LH_ROOT_COMMAND"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:451
-msgid "use sudo or equivalent. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:455
-msgid "LH_USE_FAKEROOT"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:456
-msgid "use fakeroot/fakechroot. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:460
-msgid "LH_TASKSEL"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:461
-msgid "Set tasksel program. (See <xref linkend=\"tasks\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:465
-msgid "LH_INCLUDES"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:466
-msgid "Set includes. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:470
-msgid "LH_TEMPLATES"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:471
-msgid "Set templates. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:475
-msgid "LH_BREAKPOINTS"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:476
-msgid "enable breakpoints. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:480
-msgid "LH_DEBUG"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:481
-msgid "enable debug. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:485
-msgid "LH_FORCE"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:486
-msgid "enable force. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:490
-msgid "LH_QUIET"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:491
-msgid "enable quiet. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:495
-msgid "LH_VERBOSE"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:496
-msgid "enable verbose. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-# type: Content of: <appendix><section><title>
-#. type: Content of: <appendix><section><title>
-#: en/appendices_configuration-files.xml:502
-#, fuzzy
-#| msgid "The <filename>config/binary</filename> file"
-msgid "The <filename>config/source</filename> file"
-msgstr "Le fichier <filename>config/binary</filename>."
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:506
-msgid "LH_SOURCE"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-files.xml:507
-msgid "Set source option. (See <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><section><variablelist><varlistentry><term>
-#: en/appendices_configuration-files.xml:511
-msgid "LH_SOURCE_IMAGES"
-msgstr ""
diff --git a/manual/po/fr/appendices_configuration-layout.xml.po b/manual/po/fr/appendices_configuration-layout.xml.po
deleted file mode 100644
index 47389bf..0000000
--- a/manual/po/fr/appendices_configuration-layout.xml.po
+++ /dev/null
@@ -1,310 +0,0 @@
-# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2010-06-06 12:16+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. type: Content of: <appendix><title>
-#: en/appendices_configuration-layout.xml:8
-msgid "Configuration layout"
-msgstr ""
-
-#. type: Content of: <appendix><variablelist><title>
-#: en/appendices_configuration-layout.xml:11
-msgid ""
-"Layout of the <filename class=\"directory\">config/</filename> directory"
-msgstr ""
-
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices_configuration-layout.xml:14
-msgid "<filename class=\"directory\">binary_debian-installer/</filename>"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-layout.xml:15
-#: en/appendices_configuration-layout.xml:23
-#: en/appendices_configuration-layout.xml:39
-#, fuzzy
-#| msgid "Set package manager. (See <xref linkend=\"package-installation\"/>)"
-msgid "(see <xref linkend=\"debian-installer\"/>)"
-msgstr ""
-"Défini le gestionnaire de paquets. (Voir <xref linkend=\"package-installation"
-"\"/>)"
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices_configuration-layout.xml:18
-#, fuzzy
-#| msgid "<filename>live-package</filename>"
-msgid "<filename class=\"directory\">binary_grub/</filename>"
-msgstr "<filename>live-package</filename>"
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-layout.xml:19
-#: en/appendices_configuration-layout.xml:47
-#: en/appendices_configuration-layout.xml:79
-#: en/appendices_configuration-layout.xml:83
-#, fuzzy
-#| msgid "Set package manager. (See <xref linkend=\"package-installation\"/>)"
-msgid "(see <xref linkend=\"bootloaders\"/>)"
-msgstr ""
-"Défini le gestionnaire de paquets. (Voir <xref linkend=\"package-installation"
-"\"/>)"
-
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices_configuration-layout.xml:22
-msgid "<filename class=\"directory\">binary_local-debs/</filename>"
-msgstr ""
-
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices_configuration-layout.xml:26
-msgid "<filename class=\"directory\">binary_local-hooks/</filename>"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-layout.xml:27
-#, fuzzy
-#| msgid "Set package manager. (See <xref linkend=\"package-installation\"/>)"
-msgid "(see <xref linkend=\"binary-local-hooks\"/>)"
-msgstr ""
-"Défini le gestionnaire de paquets. (Voir <xref linkend=\"package-installation"
-"\"/>)"
-
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices_configuration-layout.xml:30
-msgid "<filename class=\"directory\">binary_local-includes/</filename>"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-layout.xml:31
-#, fuzzy
-#| msgid "Set package manager. (See <xref linkend=\"package-installation\"/>)"
-msgid "(see <xref linkend=\"binary-includes\"/>)"
-msgstr ""
-"Défini le gestionnaire de paquets. (Voir <xref linkend=\"package-installation"
-"\"/>)"
-
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices_configuration-layout.xml:34
-msgid "<filename class=\"directory\">binary_local-packageslists/</filename>"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-layout.xml:35
-#: en/appendices_configuration-layout.xml:43
-#, fuzzy
-#| msgid "Set package manager. (See <xref linkend=\"package-installation\"/>)"
-msgid "(see <xref linkend=\"configuration-layout\"/>)"
-msgstr ""
-"Défini le gestionnaire de paquets. (Voir <xref linkend=\"package-installation"
-"\"/>)"
-
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices_configuration-layout.xml:38
-msgid "<filename class=\"directory\">binary_local-udebs/</filename>"
-msgstr ""
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices_configuration-layout.xml:42
-#, fuzzy
-#| msgid "<filename>live-package</filename>"
-msgid "<filename class=\"directory\">binary_rootfs/</filename>"
-msgstr "<filename>live-package</filename>"
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices_configuration-layout.xml:46
-#, fuzzy
-#| msgid "<filename>live-package</filename>"
-msgid "<filename class=\"directory\">binary_syslinux/</filename>"
-msgstr "<filename>live-package</filename>"
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices_configuration-layout.xml:50
-#, fuzzy
-#| msgid "<filename>live-package</filename>"
-msgid "<filename class=\"directory\">chroot_apt/</filename>"
-msgstr "<filename>live-package</filename>"
-
-# type: Content of: <sect1><title>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-layout.xml:51
-#, fuzzy
-#| msgid "Customising package installation"
-msgid "(see <xref linkend=\"custom-packages-apt\"/>)"
-msgstr "Installation personnalisée des paquets"
-
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices_configuration-layout.xml:54
-msgid "<filename class=\"directory\">chroot_local-hooks/</filename>"
-msgstr ""
-
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-layout.xml:55
-msgid "(see <xref linkend=\"chroot-local-hooks\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices_configuration-layout.xml:58
-msgid "<filename class=\"directory\">chroot_local-includes/</filename>"
-msgstr ""
-
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-layout.xml:59
-msgid "(see <xref linkend=\"chroot-local-includes\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices_configuration-layout.xml:62
-msgid "<filename class=\"directory\">chroot_local-packages/</filename>"
-msgstr ""
-
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-layout.xml:63
-msgid "(see <xref linkend=\"local-packages\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices_configuration-layout.xml:66
-msgid "<filename class=\"directory\">chroot_local-packageslists/</filename>"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-layout.xml:67
-#, fuzzy
-#| msgid "Set package manager. (See <xref linkend=\"package-installation\"/>)"
-msgid "(see <xref linkend=\"package-lists\"/>)"
-msgstr ""
-"Défini le gestionnaire de paquets. (Voir <xref linkend=\"package-installation"
-"\"/>)"
-
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices_configuration-layout.xml:70
-msgid "<filename class=\"directory\">chroot_local-presed/</filename>"
-msgstr ""
-
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-layout.xml:71
-msgid "(see <xref linkend=\"debconf-preseed\"/>)"
-msgstr ""
-
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices_configuration-layout.xml:74
-msgid "<filename class=\"directory\">chroot_sources/</filename>"
-msgstr ""
-
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-layout.xml:75
-msgid "(see <xref linkend=\"custom-apt-repo\"/>)"
-msgstr ""
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices_configuration-layout.xml:78
-#, fuzzy
-#| msgid "<filename>live-package</filename>"
-msgid "<filename class=\"directory\">includes/</filename>"
-msgstr "<filename>live-package</filename>"
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices_configuration-layout.xml:82
-#, fuzzy
-#| msgid "<filename>live-package</filename>"
-msgid "<filename class=\"directory\">templates/</filename>"
-msgstr "<filename>live-package</filename>"
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices_configuration-layout.xml:87
-#, fuzzy
-#| msgid "<filename>live-package</filename>"
-msgid "<filename>bootstrap</filename>"
-msgstr "<filename>live-package</filename>"
-
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-layout.xml:88
-msgid "(see <xref linkend=\"config-bootstrap\"/>)"
-msgstr ""
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices_configuration-layout.xml:91
-#, fuzzy
-#| msgid "<filename>live-package</filename>"
-msgid "<filename>binary</filename>"
-msgstr "<filename>live-package</filename>"
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-layout.xml:92
-#, fuzzy
-#| msgid "Set package manager. (See <xref linkend=\"package-installation\"/>)"
-msgid "(see <xref linkend=\"config-binary\"/>)"
-msgstr ""
-"Défini le gestionnaire de paquets. (Voir <xref linkend=\"package-installation"
-"\"/>)"
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices_configuration-layout.xml:95
-#, fuzzy
-#| msgid "<filename>live-package</filename>"
-msgid "<filename>chroot</filename>"
-msgstr "<filename>live-package</filename>"
-
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-layout.xml:96
-msgid "(see <xref linkend=\"config-chroot\"/>)"
-msgstr ""
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices_configuration-layout.xml:99
-#, fuzzy
-#| msgid "<filename>live-package</filename>"
-msgid "<filename>common</filename>"
-msgstr "<filename>live-package</filename>"
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-layout.xml:100
-#, fuzzy
-#| msgid "Set package manager. (See <xref linkend=\"package-installation\"/>)"
-msgid "(see <xref linkend=\"config-common\"/>)"
-msgstr ""
-"Défini le gestionnaire de paquets. (Voir <xref linkend=\"package-installation"
-"\"/>)"
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <appendix><variablelist><varlistentry><term>
-#: en/appendices_configuration-layout.xml:103
-#, fuzzy
-#| msgid "<filename>live-package</filename>"
-msgid "<filename>source</filename>"
-msgstr "<filename>live-package</filename>"
-
-#. type: Content of: <appendix><variablelist><varlistentry><listitem><para>
-#: en/appendices_configuration-layout.xml:104
-msgid "(see <xref linkend=\"config-source\"/>)"
-msgstr ""
diff --git a/manual/po/fr/backports.xml.po b/manual/po/fr/backports.xml.po
deleted file mode 100644
index fd5d4a2..0000000
--- a/manual/po/fr/backports.xml.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2010-06-06 12:07+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. type: Content of: <sect1><title>
-#: en/chapters/customization/backports.xml:8
-msgid "Using a newer kernel with Lenny"
-msgstr ""
-
-#. type: Content of: <sect1><para>
-#: en/chapters/customization/backports.xml:10
-msgid ""
-"The backports repository, backports.org, lacks the necessary module packages "
-"(linux-modules-extra-2.6, aufs, etc.) so an alternative repository has been "
-"set up, in order to build Lenny live images with a later kernel. Shown here "
-"is one way of doing it."
-msgstr ""
-
-#. type: Content of: <sect1><screen>
-#: en/chapters/customization/backports.xml:13
-#, no-wrap
-msgid ""
-"$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6'\n"
-"\n"
-"$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.chroot\n"
-"$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.binary\n"
-"\n"
-"$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.chroot.gpg\n"
-"$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.binary.gpg\n"
-"\n"
-"# lh_build\n"
-msgstr ""
diff --git a/manual/po/fr/basics.xml.po b/manual/po/fr/basics.xml.po
deleted file mode 100644
index 52af048..0000000
--- a/manual/po/fr/basics.xml.po
+++ /dev/null
@@ -1,1281 +0,0 @@
-# French translations for Debconf package
-# Copyright (C) 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the Debconf package.
-# Automatically generated, 2008.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Debconf 8\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2009-02-26 15:05+0100\n"
-"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> "
-"<christophenagel at gmail.com>\n"
-"Language-Team: none\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. type: Content of: <chapter><section><section><para>
-#: en/about_manual.xml:298 en/about_manual.xml:308 en/about_manual.xml:318
-#: en/about_manual.xml:338 en/about_manual.xml:351 en/about_manual.xml:366
-#: en/about_manual.xml:379 en/about_manual.xml:389 en/basics.xml:113
-#: en/basics.xml:128 en/basics.xml:144 en/basics.xml:158 en/basics.xml:194
-#: en/basics.xml:220 en/basics.xml:230 en/basics.xml:239 en/basics.xml:253
-#: en/basics.xml:275 en/basics.xml:302 en/basics.xml:312 en/basics.xml:320
-#: en/basics.xml:354 en/basics.xml:364 en/basics.xml:382 en/basics.xml:429
-#: en/basics.xml:498 en/basics.xml:530 en/basics.xml:539 en/basics.xml:590
-#: en/basics.xml:646 en/customization_packages.xml:50
-#: en/customization_packages.xml:58 en/customization_packages.xml:71
-#: en/customization_packages.xml:80 en/customization_packages.xml:104
-#: en/customization_packages.xml:222 en/customization_packages.xml:230
-#: en/customization_packages.xml:265 en/customization_packages.xml:310
-#: en/customization_packages.xml:330 en/customization_packages.xml:341
-#: en/customization_packages.xml:352 en/customization_packages.xml:362
-#: en/faq.xml:64 en/faq.xml:241 en/faq.xml:244 en/faq.xml:252 en/faq.xml:256
-#: en/faq.xml:264 en/faq.xml:279 en/faq.xml:287 en/faq.xml:334 en/faq.xml:424
-#: en/faq.xml:430 en/faq.xml:481 en/faq.xml:483 en/faq.xml:487 en/faq.xml:491
-#: en/overview.xml:181 en/overview.xml:230 en/overview.xml:240
-msgid "<placeholder type=\"screen\" id=\"0\"/>"
-msgstr ""
-
-# type: Content of: <chapter><title>
-#. type: Content of: <chapter><title>
-#: en/basics.xml:9
-msgid "The basics"
-msgstr "Les principes"
-
-# type: Content of: <chapter><para>
-#. type: Content of: <chapter><para>
-#: en/basics.xml:12
-msgid ""
-"This chapter contains a brief overview of the build process as well as "
-"containing instructions on how to boot the various binary image types."
-msgstr ""
-"Ce chapitre contient un bref aprçu du processus de création ainsi que des "
-"instructions sur la méthode de démarrage des différents types d'images"
-
-# type: Content of: <chapter><section><title>
-#. type: Content of: <chapter><section><title>
-#: en/basics.xml:17
-msgid "What is a live system?"
-msgstr "Qu'est-ce qu'un système live"
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/basics.xml:20
-#, fuzzy
-#| msgid ""
-#| "A live system usually means an OS booted on a computer from a removable "
-#| "support (as CD-ROM, USB stick, or network), ready to use without any "
-#| "installation on the usual drive(s), with an auto-configuration done at "
-#| "runtime (see <xref linkend=\"terms\"/>)."
-msgid ""
-"A live system usually means an OS booted on a computer from a removable "
-"medium (such as CD-ROM, USB stick, or network), ready to use without any "
-"installation on the usual drive(s), with an auto-configuration done at "
-"runtime (see <xref linkend=\"terms\" />)."
-msgstr ""
-"Un système live désigne le plus souvent un Système d'Exploitation démarré "
-"sur une machine depuis un support amovible (comme un CD-ROM, une clef USB, "
-"ou depuis le réseau), prêt à l'emploi sans installation sur le(s) disque(s) "
-"traditionnel, avec une configuration automatique faite  pendant le démarrage "
-"(voir <xref linkend=\"terms\"/>)."
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/basics.xml:27
-msgid ""
-"With Debian Live, it's a Debian GNU/Linux OS, built for one of the supported "
-"architectures (currently amd64, i386, powerpc and sparc). It is made from "
-"following parts:"
-msgstr ""
-"Avec Debian Live, c'est un système d'exploitation Debian GNU/Linux, "
-"construit pour l'une des achitectures supportées (actuellement amd64, i386, "
-"powerpc, et sparc). Il est construit à partir des composants suivants:"
-
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:35
-msgid "Linux kernel"
-msgstr "Noyau Linux"
-
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:39
-msgid "The Linux image, usually named <filename>vmlinuz*</filename>."
-msgstr ""
-"L'image du noyau Linux, habituellement nommée <filename>vmlinuz*</filename>."
-
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:45
-msgid "Initial RAM disk image (initrd)"
-msgstr "Initial RAM disk image (initrd)"
-
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:49
-#, fuzzy
-#| msgid ""
-#| "RAM disk setup for the Linux boot, containing modules possibly need to "
-#| "mount the filesystem's image and some scripts to do it."
-msgid ""
-"RAM disk setup for the Linux boot, containing modules possibly needed to "
-"mount the filesystem's image and some scripts to do it."
-msgstr ""
-"Configuration de la RAM disque pour le démarrage de Linux, contenant les "
-"modules qui pourraient être nécessaire pour monter l'image du système de "
-"fichiers et plusieurs scripts pour le faire"
-
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:56
-msgid "System image"
-msgstr "L'image du système"
-
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:60
-#, fuzzy
-#| msgid ""
-#| "The O.S. image. Debian Live uses a SquashFS image, a compressed "
-#| "filesystem, to minimize its size. Note that it's read-only, so during "
-#| "boot, the Debian Live system will uses RAM disk and 'union' mechanism to "
-#| "be able to write files on the system, but all modifications will be lost "
-#| "when shutdown, until using optional persistence partition(s) (see <xref "
-#| "linkend=\"persistence\"/>)."
-msgid ""
-"The OS filesystem image. Debian Live uses SquashFS, a compressed filesystem, "
-"to minimize its image size. Note that it's read-only. So, during boot the "
-"Debian Live system will use a RAM disk and 'union' mechanism to enable "
-"writing files within the running system. However, all modifications will be "
-"lost upon shutdown unless optional persistence partition(s) are used. (See "
-"<xref linkend=\"persistence\" />.)"
-msgstr ""
-"L'image du système d'exploitation Debian Live utilise une image Squashfs, un "
-"système de fichiers compressé, pour diminuer sa taille. Noter qu'il est en "
-"lecture seule, donc pendant la phase de démarrage, le système Debian Live "
-"utilisera la RAM comme un disque et un mechanisme d'union pour pouvoir "
-"écrire des fichiers sur le système, mais toutes les modifitions seront "
-"perdues à l'arrêt de la machine à moins d'utiliser une(des) partition(s) "
-"optionnelle(s) pour la persistence.(voir <xref linkend=\"persistence\"/>)."
-
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:71
-msgid "Bootloader"
-msgstr "Chargeur de démarrage"
-
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:75
-#, fuzzy
-#| msgid ""
-#| "A small piece of code, crafted to boot up from the chosen media, possibly "
-#| "proposing a prompt or menu to let select options/configuration, then "
-#| "loading the Linux kernel and its initrd to let it run with associated "
-#| "filesystem image. Different solutions can be proposed depending of the "
-#| "target media and fornat of filesystem containing the previous components: "
-#| "Isolinux to boot from a CD or DVD in ISO9660 format, syslinux for HDD or "
-#| "USB drive boot from a VFAT partition, GRUB for ext2/3 partition, pxelinux "
-#| "for PXE netboot..."
-msgid ""
-"A small piece of code, crafted to boot up from the chosen media, possibly "
-"presenting a prompt or menu to allow selection of options/configuration. It "
-"then loads the Linux kernel and its initrd to run with an associated "
-"filesystem image. Different solutions can be used depending on the target "
-"media and format of the filesystem containing the previous components: "
-"Isolinux to boot from a CD or DVD in ISO9660 format, syslinux for HDD or USB "
-"drive booting from a VFAT partition, GRUB for ext2/3 partition, pxelinux for "
-"PXE netboot, etc."
-msgstr ""
-"Un petit morceau de code destiné à démarrer depuis le média choisi, il peut "
-"proposer une invite ou un menu pour selectionner des options, une "
-"configuration, puis il doit charger le noyau Linux et son initrd pour "
-"pouvoir utiliser l'image de système de fichiers associée à ce dernier. "
-"Différentes solutions peuvent être proposées, elles dépendent du média cible "
-"et du format du système de fichiers contenant les composants précédents: "
-"Isolinux pour démarrer depuis un CD ou un DVD au format ISO9660, syslinux "
-"pour démarrer depuis les disques durs ou les clefs USB contenant une "
-"partition vfat, GRUB pour les partitions ext2/3, pxelinux pour un démarrage "
-"réseau PXE..."
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/basics.xml:90
-#, fuzzy
-#| msgid ""
-#| "The Debian Live tools will build the system image from your "
-#| "specifications, setup a Linux kernel and its initrd, a bootloader to run "
-#| "them, all in one media-dependant format(ISO9660 image, disk image, ...)."
-msgid ""
-"The Debian Live tools will build the system image from your specifications, "
-"setup a Linux kernel and its initrd, a bootloader to run them, all in one "
-"media-dependant format(ISO9660 image, disk image, etc.)"
-msgstr ""
-"Les outils de Debian Live construiront l'image du système en fonction de vos "
-"spécifications, configuration du noyau Linux et son initrd, un chargeur de "
-"démarrage pour les exécuter, tout ces composants dependent du format du "
-"media choisi(image ISO9660, image disque, ...)."
-
-# type: Content of: <chapter><section><title>
-#. type: Content of: <chapter><section><title>
-#: en/basics.xml:98
-msgid "First steps: building an ISO image"
-msgstr "Premiers pas: Construire une image ISO"
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/basics.xml:101
-msgid ""
-"The following sequence of helper commands, provided by &live-helper;, will "
-"create a basic ISO image containing just the Debian standard system without "
-"X.org. It is suitable for burning to CD or DVD media."
-msgstr ""
-"La séquence suivante de l'assistant de commandes fournit par &live-helper; "
-"créera une image ISO basique contenant uniquement le système Debian standard "
-"sans X.org. Elle peut être gravée sur un CD ou un DVD."
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/basics.xml:107
-#, fuzzy
-#| msgid ""
-#| "First, we run the <filename>lh_config</filename> helper command which "
-#| "will create a <filename>\"config/\"</filename> hierarchy in the current "
-#| "directory for use by other helper commands:"
-msgid ""
-"First, we run the <filename>lh config</filename> helper command which will "
-"create a <filename>\"config/\"</filename> hierarchy in the current directory "
-"for use by other helper commands:"
-msgstr ""
-"D'abord on exécute la commande <filename>lh_config</filename> de l'assistant "
-"qui créée une arborescence <filename>\"config/\"</filename> dans le "
-"répertoire courant pour une utilisation ultérieure par d'autres commandes de "
-"l'assistant:"
-
-# type: Content of: <chapter><section><screen>
-#. type: Content of: <chapter><section><para><screen>
-#: en/basics.xml:113
-#, fuzzy, no-wrap
-#| msgid "$ lh_config"
-msgid "$ lh config"
-msgstr "$ lh_config"
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/basics.xml:117
-#, fuzzy
-#| msgid ""
-#| "By passing no parameters to <filename>lh_config</filename>, we indicated "
-#| "that we wish to use the defaults, which will create an image of type "
-#| "binary (see <xref linkend=\"lh_config\"/>)."
-msgid ""
-"By passing no parameters to <filename>lh config</filename> we indicated that "
-"we wish to use the defaults. This will create an image of type binary (see "
-"<xref linkend=\"lh-config\" />)."
-msgstr ""
-"En ne passant aucun paramètres à <filename>lh_config</filename>, on choisit "
-"d'utiliser les paramètres par défauts qui créeront une image de type binaire "
-"(voir <xref linkend=\"lh_config\"/>)."
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/basics.xml:123
-#, fuzzy
-#| msgid ""
-#| "Now that we have a <filename>\"config/\"</filename> hierarchy, we may "
-#| "build the image with <filename>lh_build</filename> helper command:"
-msgid ""
-"Now that we have a <filename>\"config/\"</filename> hierarchy, we may build "
-"the image with the <filename>lh build</filename> helper command:"
-msgstr ""
-"Maintenant que l'on a une arborescence <filename>\"config/\"</filename>, on "
-"devrait pouvoir construire une image avec la commande <filename>lh_build</"
-"filename> de l'assistant:"
-
-# type: Content of: <chapter><section><screen>
-#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/basics.xml:128 en/basics.xml:239 en/basics.xml:382 en/use-cases.xml:59
-#, fuzzy, no-wrap
-msgid "# lh build"
-msgstr "# lh_build"
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/basics.xml:132
-#, fuzzy
-#| msgid ""
-#| "This process can take a while, depending on the speed of your network "
-#| "connection (see <xref linkend=\"lh_build\"/>)."
-msgid ""
-"This process can take a while, depending on the speed of your network "
-"connection (see <xref linkend=\"lh-build\" />)."
-msgstr ""
-"Ce processus peut prendre du temps, en fonction du débit de votre connexion "
-"réseau (voir <xref linkend=\"lh_build\"/>)."
-
-# type: Content of: <chapter><section><section><title>
-#. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:137
-msgid "Testing an ISO image with Qemu"
-msgstr "Tester une image ISO avec Qemu"
-
-# type: Content of: <chapter><section><section><para>
-#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:140
-msgid "Testing an ISO is simple:"
-msgstr "Tester une image ISO est facile"
-
-# type: Content of: <chapter><section><section><screen>
-#. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:144
-#, fuzzy, no-wrap
-#| msgid ""
-#| "\n"
-#| "# apt-get install qemu\n"
-#| "$ qemu -cdrom binary.iso\n"
-msgid ""
-"# apt-get install qemu\n"
-"$ qemu -cdrom binary.iso"
-msgstr ""
-"\n"
-"# apt-get install qemu\n"
-"$ qemu -cdrom binary.iso\n"
-
-# type: Content of: <chapter><section><section><title>
-#. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:151
-#, fuzzy
-#| msgid "Testing an ISO image with Qemu"
-msgid "Testing an ISO image with virtualbox-ose"
-msgstr "Tester une image ISO avec Qemu"
-
-#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:154
-msgid "In order to test the ISO with virtualbox-ose:"
-msgstr ""
-
-# type: Content of: <chapter><section><section><screen>
-#. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:158
-#, fuzzy, no-wrap
-#| msgid "# apt-get install live-helper"
-msgid "# apt-get install virtualbox-ose"
-msgstr "# apt-get install live-helper"
-
-#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: en/basics.xml:162
-msgid ""
-"the modules package for a stock kernel eg virtualbox-ose-"
-"modules-2.6.26-1-486 or"
-msgstr ""
-
-#. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: en/basics.xml:163
-msgid ""
-"the modules package compiled for your kernel using module-assistant from the "
-"package virtualbox-ose-source"
-msgstr ""
-
-#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:165
-msgid "Run Virtualbox:"
-msgstr ""
-
-#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:167
-msgid "{{{Applications -> System Tools -> VirtualBox OSE }}}"
-msgstr ""
-
-#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:169
-msgid "Create a virtual machine from your Live ISO"
-msgstr ""
-
-#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:171
-msgid ""
-"To create a virtual machine \"mylive\" from A CDROM ISO \"binary.iso\" in "
-"VirtualBox:"
-msgstr ""
-
-#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:172
-msgid "{{{Machine -> New }}}"
-msgstr ""
-
-#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:173
-msgid "In the Wizard: FIXME"
-msgstr ""
-
-# type: Content of: <chapter><section><section><title>
-#. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:177
-#, fuzzy
-#| msgid "Testing an ISO image with Qemu"
-msgid "Testing an ISO image with VMware Workstation"
-msgstr "Tester une image ISO avec Qemu"
-
-#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:179
-msgid "In order to test the ISO with VMware Workstation:"
-msgstr ""
-
-#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:181 en/basics.xml:287
-msgid "Run VMware Workstation:"
-msgstr ""
-
-#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:182
-msgid "Click on Edit virtual machine settings in the VM summary page."
-msgstr ""
-
-#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:183
-msgid ""
-"Then, click on the CD-ROM device and select Use ISO image. Remeber to "
-"connect the CD-ROM device at power on and remeber to adjust the boot order "
-"in the bios."
-msgstr ""
-
-# type: Content of: <chapter><section><section><title>
-#. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:187
-#, fuzzy
-#| msgid "Burning an ISO image to physical medium"
-msgid "Burning an ISO image to a physical medium"
-msgstr "Graver une image ISO sur un support physique"
-
-# type: Content of: <chapter><section><section><para>
-#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:190
-msgid "Burning an ISO image is easy:"
-msgstr "Graver une imgae ISO est simple"
-
-# type: Content of: <chapter><section><section><screen>
-#. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:194
-#, fuzzy, no-wrap
-#| msgid ""
-#| "\n"
-#| "# apt-get install wodim\n"
-#| "$ wodim binary.iso\n"
-msgid ""
-"# apt-get install wodim\n"
-"$ wodim binary.iso"
-msgstr ""
-"\n"
-"# apt-get install wodim\n"
-"$ wodim binary.iso\n"
-
-# type: Content of: <chapter><section><title>
-#. type: Content of: <chapter><section><title>
-#: en/basics.xml:203
-msgid "Building an USB/HDD image"
-msgstr "Construire une image USB/HDD"
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/basics.xml:206
-msgid ""
-"The following sequence of helper commands will create a basic USB/HDD image "
-"containing just the Debian standard system without X.org. It is suitable for "
-"booting from USB sticks, USB hard drives, and various other portable storage "
-"devices."
-msgstr ""
-" La séquence de commandes suivantes de l'assistant créera une image USB/HDD "
-"contenant uniquement le système Debian standard sans X.org. Elle peut être "
-"utilisée pour démarrer depuis une clef USB, une disque dur USB, ainsi que "
-"d'autres types variés de périphériques de stockage amovibles."
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/basics.xml:213
-#, fuzzy
-#| msgid ""
-#| "Note if you created an iso image with the previous example, you will need "
-#| "to clean up your working directory with the <filename>lh_clean</filename> "
-#| "helper command (see <xref linkend=\"lh_clean\"/>):"
-msgid ""
-"Note if you created an iso image with the previous example, you will need to "
-"clean up your working directory with the <filename>lh clean</filename> "
-"helper command (see <xref linkend=\"lh-clean\" />):"
-msgstr ""
-"Noter que si l'on a créé une image avec l'exemple précédent, on doit "
-"nettoyer le répertoire de travail avec la commande <filename>lh_clean</"
-"filename> de l'assistant (voir <xref linkend=\"lh_clean\"/>)."
-
-# type: Content of: <chapter><section><screen>
-#. type: Content of: <chapter><section><para><screen>
-#: en/basics.xml:220 en/basics.xml:354
-#, fuzzy, no-wrap
-#| msgid "$ lh_clean --binary"
-msgid "$ lh clean --binary"
-msgstr "$ lh_clean --binary"
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/basics.xml:224
-#, fuzzy
-#| msgid ""
-#| "Run the <filename>lh_config</filename> helper command with the parameters "
-#| "to configure the <filename>\"config/\"</filename> hierarchy to create a "
-#| "USD/HDD image type:"
-msgid ""
-"Run the <filename>lh config</filename> helper command with the parameters to "
-"configure the <filename>\"config/\"</filename> hierarchy to create a USB/HDD "
-"image type:"
-msgstr ""
-"Exécuter la commande <filename>lh_config</filename> de l'assistant avec ces "
-"paramètres pour configurer l'arborescence <filename>\"config/\"</filename> "
-"afin de créer une image de type USB/HDD:"
-
-# type: Content of: <chapter><section><screen>
-#. type: Content of: <chapter><section><para><screen>
-#: en/basics.xml:230
-#, fuzzy, no-wrap
-#| msgid "$ lh_config -b usb-hdd"
-msgid "$ lh config -b usb-hdd"
-msgstr "$ lh_config -b usb-hdd"
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/basics.xml:234 en/basics.xml:377
-#, fuzzy
-#| msgid ""
-#| "Now build the image with <filename>lh_build</filename> helper command:"
-msgid ""
-"Now build the image with the <filename>lh build</filename> helper command:"
-msgstr ""
-"Maintenant construire l'image avec la commande <filename>lh_build</filename> "
-"de l'assistant"
-
-# type: Content of: <chapter><section><section><title>
-#. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:243
-msgid "Copying USB/HDD image to a USB stick"
-msgstr "Copier une image USB/HDD sur une clef USB"
-
-# type: Content of: <chapter><section><section><para>
-#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:246
-#, fuzzy
-#| msgid ""
-#| "partition and the <command>syslinux</command> bootloader, ready to be "
-#| "directly written on an USB stick. Plug in an USB stick with a size larger "
-#| "than <filename>binary.img</filename>'s one, and type:"
-msgid ""
-"The generated binary image contains a <acronym>VFAT</acronym> partition and "
-"the <command>syslinux</command> bootloader, ready to be directly written on "
-"an USB stick. Plug in an USB stick with a size larger than that of "
-"<filename>binary.img</filename> and type:"
-msgstr ""
-" et le chargeur de démarrage <command>syslinux</command>, prêt à être "
-"directement écrit sur une clef USB. Brancher une ckef USB d'une taille "
-"supérieure à celle du fichier <filename>binary.img</filename>, et taper:"
-
-# type: Content of: <chapter><section><section><para><screen>
-#. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:253
-#, no-wrap
-msgid "$ dd if=binary.img of=${USBSTICK}"
-msgstr "$ dd if=binary.img of=${USBSTICK}"
-
-# type: Content of: <chapter><section><section><para>
-#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:257
-#, fuzzy
-#| msgid ""
-#| "where <replaceable>${USBSTICK}</replaceable> is the device file of your "
-#| "key, like <filename>/dev/sda</filename> (not a partition like <filename>/"
-#| "dev/sda1</filename>!); you can find the right device name by looking in "
-#| "<command>dmesg</command>'s output after plugging the stick, for example)."
-msgid ""
-"where <replaceable>${USBSTICK}</replaceable> is the device file of your key, "
-"like <filename>/dev/sdb</filename> (not a partition like <filename>/dev/"
-"sdb1</filename>!); you can find the right device name by looking in "
-"<command>dmesg</command>'s output after plugging in the stick, for example."
-msgstr ""
-"Où <replaceable>${USBSTICK}</replaceable> est le fichier descripteur de "
-"périphérique de votre clef, comme <filename>/dev/sda</filename> (pas une "
-"partition comme <filename>/dev/sda1</filename>!); on peut trouver le fichier "
-"descripteur de périphérique adéquat en regardant la sortie de la commande "
-"<command>dmesg</command> après avoir branché la clef par exemple)"
-
-# type: Content of: <chapter><section><section><title>
-#. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:272
-msgid "Testing a USB/HDD image with Qemu"
-msgstr "Tester une image USB/HDD avec Qemu"
-
-# type: Content of: <chapter><section><section><screen>
-#. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:275
-#, fuzzy, no-wrap
-#| msgid ""
-#| "\n"
-#| "# apt-get install qemu\n"
-#| "$ qemu -hda binary.img\n"
-msgid ""
-"# apt-get install qemu\n"
-"$ qemu -hda binary.img"
-msgstr ""
-"\n"
-"# apt-get install qemu\n"
-"$ qemu -hda binary.img\n"
-
-# type: Content of: <chapter><section><section><title>
-#. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:281
-#, fuzzy
-#| msgid "Testing a USB/HDD image with Qemu"
-msgid "Testing an USB/HDD image with VMware Workstation"
-msgstr "Tester une image USB/HDD avec Qemu"
-
-#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:284
-msgid "In order to test the USB/HDD image with VMware Workstation:"
-msgstr ""
-
-#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:288
-msgid ""
-"Write the image to an usb stick. In VMware, click on Edit virtual machine "
-"settings in VM summary page. Then, add a new physical harddisk device and "
-"enter the device node of your usb stick."
-msgstr ""
-
-# type: Content of: <chapter><section><section><title>
-#. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:292
-#, fuzzy
-#| msgid "Copying USB/HDD image to a USB stick"
-msgid "Using the space left on a USB stick"
-msgstr "Copier une image USB/HDD sur une clef USB"
-
-#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:295
-msgid ""
-"If you want to use the remaining free space after you have installed the "
-"<filename>binary.img</filename>, you can use a partitioning tool such as "
-"gparted or parted to create a new partition on the stick. The first "
-"partition will be used by the Debian Live system."
-msgstr ""
-
-#. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:302
-#, no-wrap
-msgid "# gparted ${USBSTICK}"
-msgstr ""
-
-#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:306
-msgid ""
-"After the creation of the partition you have to create a filsystem on it. "
-"One possible choice would be ext2 (ext3 isn't recommended because the "
-"journaling causes too many writes to the stick)."
-msgstr ""
-
-#. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:312
-#, no-wrap
-msgid "# mkfs.ext2 ${USBSTICK}"
-msgstr ""
-
-#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:316
-msgid "If you want to use this data partition with Windows, use FAT32."
-msgstr ""
-
-#. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:320
-#, no-wrap
-msgid "# mkfs.vfat -F 32"
-msgstr ""
-
-#. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:330
-msgid ""
-"FIXME: Describe installing Debian Live to a partition (e.g. /dev/sdc1)  AND "
-"using a bootloader to boot this."
-msgstr ""
-
-# type: Content of: <chapter><section><title>
-#. type: Content of: <chapter><section><title>
-#: en/basics.xml:339
-msgid "Building a netboot image"
-msgstr "Construire une image démarrable depuis le réseau"
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/basics.xml:342
-msgid ""
-"The following sequence of helper commands will create a basic netboot image "
-"containing the Debian standard system without X.org. It is suitable for "
-"booting over the network."
-msgstr ""
-"La séquence de commandes suivante de l'assistant créera une image basique "
-"pour un démarrage réseau contenant uniquement le système Debian standard "
-"sans X.org. Elle peut être utilisée pour démarrer depuis le réseau."
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/basics.xml:348
-#, fuzzy
-#| msgid ""
-#| "Note if you performed any previous examples, you will need to clean up "
-#| "your working directory with the <filename>lh_clean</filename> helper "
-#| "command:"
-msgid ""
-"Note if you performed any previous examples, you will need to clean up your "
-"working directory with the <filename>lh clean</filename> helper command:"
-msgstr ""
-"Noter que si l'on a réalisé l'un ou l'autre des exemples précédents, on doit "
-"nettoyer le répertoire de travail avec la commande <filename>lh_clean</"
-"filename> de l'assistant:"
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/basics.xml:358
-#, fuzzy
-#| msgid ""
-#| "Run the <filename>lh_config</filename> helper command with the parameters "
-#| "to configure the <filename>\"config/\"</filename> hierarchy to create our "
-#| "netboot image:"
-msgid ""
-"Run the <filename>lh config</filename> helper command with the parameters to "
-"configure the <filename>\"config/\"</filename> hierarchy to create our "
-"netboot image:"
-msgstr ""
-"Exécuter la commande <filename>lh_config</filename>de l'assistant avec les "
-"paramètres suivants pour configurer l'arborescence <filename>\"config/\"</"
-"filename> afin de créer une image pour un démarrage réseau:"
-
-# type: Content of: <chapter><section><screen>
-#. type: Content of: <chapter><section><para><screen>
-#: en/basics.xml:364
-#, fuzzy, no-wrap
-#| msgid "$ lh_config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\""
-msgid "$ lh config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\""
-msgstr "$ lh_config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\""
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/basics.xml:368
-#, fuzzy
-#| msgid ""
-#| "In contrast with the ISO and USB hdd images, netbooting does not support "
-#| "serving a filesystem image with the client so the files must be served "
-#| "via NFS. The <replaceable>net-root-path</replaceable> and "
-#| "<replaceable>net-root-server</replaceable> options specify the location "
-#| "and server respectfully of the NFS server where the filesytem image will "
-#| "be located at boot-time."
-msgid ""
-"In contrast with the ISO and USB hdd images, netbooting does not support "
-"serving a filesystem image with the client so the files must be served via "
-"NFS. The <replaceable>net-root-path</replaceable> and <replaceable>net-root-"
-"server</replaceable> options specify the location and server, respectively, "
-"of the NFS server where the filesytem image will be located at boot-time."
-msgstr ""
-"A l'inverse des images USB/HDD ou ISO, le démarrage depuis le réseau ne "
-"permet pas de donner une image de système de fichiers au client, les "
-"fichiers doivents être fournis par NFS. Les options <replaceable>net-root-"
-"path</replaceable> et <replaceable>net-root-server</replaceable> spécifient "
-"respectivement l'emplacement et le serveur NFS où trouver l'image du système "
-"de fichiers pendant la phase de démarrage."
-
-#. type: Content of: <chapter><section><para>
-#: en/basics.xml:386
-msgid ""
-"In a network boot the client runs a small piece of software, which usually "
-"resides on the <acronym>EEPROM</acronym> of the Ethernet card.  This program "
-"sends a <abbrev>DHCP</abbrev> request to get an <abbrev>IP</abbrev> address "
-"and information about what to do next.  Typically the next step is getting a "
-"higher level boot loader via the <abbrev>TFTP</abbrev> protocol. That could "
-"be <application>Grub</application>, <application>PXELINUX</application>, or "
-"even boot directly to an operating system like <application>Linux</"
-"application>."
-msgstr ""
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/basics.xml:398
-#, fuzzy
-#| msgid ""
-#| "For example, you can extract the generated <filename>binary-net.tar.gz</"
-#| "filename> archive in the <filename>/srv/debian-live</filename> directory; "
-#| "you'll get the filesystem image in <filename>live/filesystem.squashfs</"
-#| "filename>, the kernel, initrd and PXE Linux bootloader in "
-#| "<filename>tftpboot/debian-live/i386</filename>."
-msgid ""
-"For example, if you unpack the generated <filename>binary-net.tar.gz</"
-"filename> archive in the <filename>/srv/debian-live</filename> directory, "
-"you'll find the filesystem image in <filename>live/filesystem.squashfs</"
-"filename> and the kernel, initrd and PXE Linux bootloader in "
-"<filename>tftpboot/debian-live/i386</filename>."
-msgstr ""
-"Par exemple, vous pouvez extraire l'archive <filename>binary-net.tar.gz</"
-"filename> dans le répertoire<filename>/srv/debian-live</filename>; vous "
-"aurez l'image du système de fichiers dans le fichier <filename>live/"
-"filesystem.squashfs</filename>, le noyau, initrd et le chargeur de démarrage "
-"PXE Linux dans le répertoire<filename>tftpboot/debian-live/i386</filename>."
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/basics.xml:407
-#, fuzzy
-#| msgid "We must now configure three services on the server:"
-msgid "We must now configure three services on the server to enable netboot:"
-msgstr "Nous devons maintenant configurer trois services sur le serveur:"
-
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:413
-msgid "DHCP server"
-msgstr "Le serveur DHCP"
-
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:417
-#, fuzzy
-#| msgid ""
-#| "address to the computer netbooting, and to advertise the location of the "
-#| "PXE bootloader."
-msgid ""
-"We must configure our network's DHCP server to be sure to give an "
-"<abbrev>IP</abbrev> address to the computer netbooting, and to advertise the "
-"location of the PXE bootloader."
-msgstr ""
-"adresse à l'ordinateur qui démarre depuis le réseau et pour publier "
-"l'emplacement du programme de démarrage PXE."
-
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:423
-#, fuzzy
-#| msgid ""
-#| "Here is an example for inspiration, written for the ISC DHCP server "
-#| "(package <literal>dhcp3-server</literal>) in the <filename>/etc/dhcp3/"
-#| "dhcpd.conf</filename> configuration file :"
-msgid ""
-"Here is an example for inspiration, written for the ISC DHCP server (package "
-"<literal>dhcp3-server</literal>) in the <filename>/etc/dhcp3/dhcpd.conf</"
-"filename> configuration file:"
-msgstr ""
-"Voici un exemple dont on peut s'inspirer, écrit pour le serveur ISC DHCP "
-"(paquet <literal>dhcp3-server</literal>) dans le fichier de configuration "
-"<filename>/etc/dhcp3/dhcpd.conf</filename>:"
-
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><screen>
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:429
-#, fuzzy, no-wrap
-#| msgid ""
-#| "\n"
-#| "# Options DHCP spécifiques à Pxelinux:\n"
-#| "option space pxelinux;\n"
-#| "option pxelinux.magic      code 208 = string;\n"
-#| "option pxelinux.configfile code 209 = text;\n"
-#| "option pxelinux.pathprefix code 210 = text;\n"
-#| "option pxelinux.reboottime code 211 = unsigned integer 32;\n"
-#| "\n"
-#| "\n"
-#| "subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
-#| "\n"
-#| "  # IP addresses available for guests\n"
-#| "  range 192.168.1.100 192.168.1.149;\n"
-#| "\n"
-#| "  # allow booting from the net\n"
-#| "  allow bootp;\n"
-#| "\n"
-#| "  # for net booting, server where the first file to be loaded (by TFTP\n"
-#| "  # protocol) (\"filename\" following definition) lies : so the TFTP\n"
-#| "  # server's name.\n"
-#| "  next-server myserver;\n"
-#| "\n"
-#| "  # net boot configuration for guests with a PXE client :\n"
-#| "  if substring (option vendor-class-identifier, 0, 9) = \"PXEClient\" {\n"
-#| "    # Note : all files for PXE are relatives to the TFTP server's root\n"
-#| "    # path, as usually defined in /etc/inetd.conf.\n"
-#| "\n"
-#| "    # PXE boot loader (first program to be loaded, by TFTP)\n"
-#| "    filename \"pxelinux.0\";\n"
-#| "\n"
-#| "    # describe some specific pxelinux's options through DHCP options :\n"
-#| "    site-option-space \"pxelinux\";\n"
-#| "    option pxelinux.magic f1:00:74:7e;\n"
-#| "    if exists dhcp-parameter-request-list {\n"
-#| "      # Always send the PXELINUX options (specified in hexadecimal)\n"
-#| "      option dhcp-parameter-request-list = concat(option dhcp-parameter-request-list,d0,d1,d2,d3);\n"
-#| "    }\n"
-#| "\n"
-#| "    # For a PXE boot menu, different versions are available : simple\n"
-#| "    # text, text with curses, graphic (VESA)\n"
-#| "    #option pxelinux.configfile \"pxelinux/config_simple\";\n"
-#| "    #option pxelinux.configfile \"pxelinux/config_curses\";\n"
-#| "    option pxelinux.configfile \"pxelinux/config_vesa\";\n"
-#| "\n"
-#| "    # automatically reboot after 10 minutes of no activity\n"
-#| "    option pxelinux.reboottime 600;\n"
-#| "  }\n"
-#| "}\n"
-msgid ""
-"# Options DHCP spécifiques à Pxelinux:\n"
-"option space pxelinux;\n"
-"option pxelinux.magic      code 208 = string;\n"
-"option pxelinux.configfile code 209 = text;\n"
-"option pxelinux.pathprefix code 210 = text;\n"
-"option pxelinux.reboottime code 211 = unsigned integer 32;\n"
-"\n"
-"\n"
-"subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
-"\n"
-"  # IP addresses available for guests\n"
-"  range 192.168.1.100 192.168.1.149;\n"
-"\n"
-"  # allow booting from the net\n"
-"  allow bootp;\n"
-"\n"
-"  # for net booting, server where the first file to be loaded (by TFTP\n"
-"  # protocol) (\"filename\" following definition) lies : so the TFTP\n"
-"  # server's name.\n"
-"  next-server myserver;\n"
-"\n"
-"  # net boot configuration for guests with a PXE client :\n"
-"  if substring (option vendor-class-identifier, 0, 9) = \"PXEClient\" {\n"
-"    # Note : all files for PXE are relatives to the TFTP server's root\n"
-"    # path, as usually defined in /etc/inetd.conf.\n"
-"\n"
-"    # PXE boot loader (first program to be loaded, by TFTP)\n"
-"    filename \"pxelinux.0\";\n"
-"\n"
-"    # describe some specific pxelinux's options through DHCP options :\n"
-"    site-option-space \"pxelinux\";\n"
-"    option pxelinux.magic f1:00:74:7e;\n"
-"    if exists dhcp-parameter-request-list {\n"
-"      # Always send the PXELINUX options (specified in hexadecimal)\n"
-"      option dhcp-parameter-request-list = concat(option dhcp-parameter-request-list,d0,d1,d2,d3);\n"
-"    }\n"
-"\n"
-"    # For a PXE boot menu, different versions are available : simple\n"
-"    # text, text with curses, graphic (VESA)\n"
-"    #option pxelinux.configfile \"pxelinux/config_simple\";\n"
-"    #option pxelinux.configfile \"pxelinux/config_curses\";\n"
-"    option pxelinux.configfile \"pxelinux/config_vesa\";\n"
-"\n"
-"    # automatically reboot after 10 minutes of no activity\n"
-"    option pxelinux.reboottime 600;\n"
-"  }\n"
-"}"
-msgstr ""
-"\n"
-"# Options DHCP spécifiques à Pxelinux:\n"
-"option space pxelinux;\n"
-"option pxelinux.magic      code 208 = string;\n"
-"option pxelinux.configfile code 209 = text;\n"
-"option pxelinux.pathprefix code 210 = text;\n"
-"option pxelinux.reboottime code 211 = unsigned integer 32;\n"
-"\n"
-"\n"
-"subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
-"\n"
-"  # IP addresses available for guests\n"
-"  range 192.168.1.100 192.168.1.149;\n"
-"\n"
-"  # allow booting from the net\n"
-"  allow bootp;\n"
-"\n"
-"  # for net booting, server where the first file to be loaded (by TFTP\n"
-"  # protocol) (\"filename\" following definition) lies : so the TFTP\n"
-"  # server's name.\n"
-"  next-server myserver;\n"
-"\n"
-"  # net boot configuration for guests with a PXE client :\n"
-"  if substring (option vendor-class-identifier, 0, 9) = \"PXEClient\" {\n"
-"    # Note : all files for PXE are relatives to the TFTP server's root\n"
-"    # path, as usually defined in /etc/inetd.conf.\n"
-"\n"
-"    # PXE boot loader (first program to be loaded, by TFTP)\n"
-"    filename \"pxelinux.0\";\n"
-"\n"
-"    # describe some specific pxelinux's options through DHCP options :\n"
-"    site-option-space \"pxelinux\";\n"
-"    option pxelinux.magic f1:00:74:7e;\n"
-"    if exists dhcp-parameter-request-list {\n"
-"      # Always send the PXELINUX options (specified in hexadecimal)\n"
-"      option dhcp-parameter-request-list = concat(option dhcp-parameter-request-list,d0,d1,d2,d3);\n"
-"    }\n"
-"\n"
-"    # For a PXE boot menu, different versions are available : simple\n"
-"    # text, text with curses, graphic (VESA)\n"
-"    #option pxelinux.configfile \"pxelinux/config_simple\";\n"
-"    #option pxelinux.configfile \"pxelinux/config_curses\";\n"
-"    option pxelinux.configfile \"pxelinux/config_vesa\";\n"
-"\n"
-"    # automatically reboot after 10 minutes of no activity\n"
-"    option pxelinux.reboottime 600;\n"
-"  }\n"
-"}\n"
-
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:481
-msgid "TFTPd server"
-msgstr "Serveur TFTPd"
-
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:485
-msgid "This serves the kernel and initial ramdisk to the system at run-time."
-msgstr "Il fournit le noyau et la ramdisk initiale au système pendant l'e"
-
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:489
-#, fuzzy
-#| msgid ""
-#| "You should install the <command>tftpd-hpa</command> package. It can serve "
-#| "all files contained inside a root directory, usually <filename>/var/lib/"
-#| "tftpboot/</filename>, as defined with its"
-msgid ""
-"You should install the <command>tftpd-hpa</command> package. It can serve "
-"all files contained inside a root directory, usually <filename>/var/lib/"
-"tftpboot/</filename>, as defined with its <option>-s</option> option. To let "
-"it serve files inside <filename>/srv/debian-live/tftpboot</filename>, modify "
-"its start definition in <filename>/etc/inetd.conf</filename> with:"
-msgstr ""
-"Vous devriez installer le paquet <command>tftpd-hpa</command>. Il peut "
-"fournir tous les fichiers contenus dans un répertoire racine, habituellement "
-"<filename>/var/lib/tftpboot/</filename>, défini par l'option"
-
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:498
-#, no-wrap
-msgid "tftp           dgram   udp     wait    root  /usr/sbin/in.tftpd /usr/sbin/in.tftpd -s /srv/debian-live/tftpboot -r blksize -v -v"
-msgstr "tftp           dgram   udp     wait    root  /usr/sbin/in.tftpd /usr/sbin/in.tftpd -s /srv/debian-live/tftpboot -r blksize -v -v"
-
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:502
-msgid ""
-"and reload the super server with <command>/etc/init.d/openbsd-inetd reload</"
-"command>."
-msgstr ""
-"et relancer le super server avec <command>/etc/init.d/openbsd-inetd reload</"
-"command>."
-
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:509
-msgid "NFS server"
-msgstr "Serveur NFS"
-
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:513
-#, fuzzy
-#| msgid ""
-#| "Once the guest computer will have downloaded and booted a Linux kernel "
-#| "and its initrd, it will try to mount the Live filesystem image through a "
-#| "NFS server."
-msgid ""
-"Once the guest computer has downloaded and booted a Linux kernel and loaded "
-"its initrd, it will try to mount the Live filesystem image through a NFS "
-"server."
-msgstr ""
-"Une fois que la machine cliente a téléchargé et démarré le noyau Linux et sa "
-"ramdisk, elle essaie de monter l'image du système de fichiers Live via un "
-"serveur NFS."
-
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:519
-#, fuzzy
-#| msgid ""
-#| "You should install the <command>nfs-kernel-server</command> server "
-#| "package -- <command>nfs-user-server</command> does not function correctly "
-#| "with netboot."
-msgid ""
-"You should install the <command>nfs-kernel-server</command> package -- "
-"<command>nfs-user-server</command> does not function correctly with netboot."
-msgstr ""
-"Vous devriez installer le paquet <command>nfs-kernel-server</command> --"
-"<command>nfs-user-server</command> ne fonctionne pas correctement pour le "
-"démarrage réseau."
-
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:525
-#, fuzzy
-#| msgid ""
-#| "Then, declare that the directory of the filesystem image is available "
-#| "through NFS, by writing in <filename>/etc/exports</filename> :"
-msgid ""
-"Then, make the filesystem image available through NFS by adding a line like "
-"the following to <filename>/etc/exports</filename>:"
-msgstr ""
-"Après, rendez le répertoire de l'image du système de fichiers disponible via "
-"NFS en ajoutant au fichier <filename>/etc/exports</filename>:"
-
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><screen>
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:530
-#, no-wrap
-msgid "/srv/debian-live *(ro,async,subtree_check,no_root_squash)"
-msgstr "/srv/debian-live *(ro,async,subtree_check,no_root_squash)"
-
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:534
-#, fuzzy
-#| msgid "and let the NFS server knowing it typing following command :"
-msgid ""
-"and tell the NFS server about this new export with the following command:"
-msgstr "informez le serveur NFS en tapant la commande suivante:"
-
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><screen>
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:539
-#, no-wrap
-msgid "# exportfs -rv"
-msgstr "# exportfs -rv"
-
-#. type: Content of: <chapter><section><para>
-#: en/basics.xml:547
-msgid ""
-"Setting up these three services can be a little tricky. You might need some "
-"patience to get all of them working together. The Debian Installer Manual's "
-"<ulink url=\"http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html\" "
-">TFTP Net Booting</ulink> section might help as that process is very similar."
-msgstr ""
-
-#. type: Content of: <chapter><section><title>
-#: en/basics.xml:558
-msgid "Netboot testing HowTo"
-msgstr ""
-
-#. type: Content of: <chapter><section><para>
-#: en/basics.xml:561
-msgid ""
-"Netboot image creation is made easy with live-helper magic, but testing the "
-"images on physical machines can be really time consuming."
-msgstr ""
-
-#. type: Content of: <chapter><section><para>
-#: en/basics.xml:566
-msgid ""
-"To make our life easier, we can use virtualization. There are two solutions:"
-msgstr ""
-
-#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:573
-msgid "VMWare Player"
-msgstr ""
-
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:577
-msgid "Install VMWare Player (\"free as in beer\" edition)"
-msgstr ""
-
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:581
-msgid ""
-"Create a PXETester directory, and create a text file called pxe.vwx inside"
-msgstr ""
-
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:586
-msgid "Paste this text inside:"
-msgstr ""
-
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:590
-#, no-wrap
-msgid ""
-"#!/usr/bin/vmware\n"
-"config.version = \"8\"\n"
-"virtualHW.version = \"4\"\n"
-"memsize = \"512\"\n"
-"MemAllowAutoScaleDown = \"FALSE\"\n"
-"\n"
-"ide0:0.present = \"FALSE\"\n"
-"ide1:0.present = \"FALSE\"\n"
-"floppy0.present = \"FALSE\"\n"
-"sound.present = \"FALSE\"\n"
-"tools.remindInstall = \"FALSE\"\n"
-"\n"
-"ethernet0.present = \"TRUE\"\n"
-"ethernet0.addressType = \"generated\"\n"
-"\n"
-"displayName = \"Test Boot PXE\"\n"
-"guestOS = \"other\"\n"
-"\n"
-"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\"\n"
-"uuid.location = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
-"uuid.bios = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
-"ethernet0.generatedAddressOffset = \"0\""
-msgstr ""
-
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:615
-msgid ""
-"You can play with this configuration file (i.e. change memory limit to 256)"
-msgstr ""
-
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:620
-msgid "Double click on this file (or run VMWare player and selecet this file)."
-msgstr ""
-
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:624
-msgid "When running just press space if that strange question comes up..."
-msgstr ""
-
-#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:634
-msgid "Qemu"
-msgstr ""
-
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:638
-msgid "Install qemu, bridge-utils, sudo."
-msgstr ""
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:642
-#, fuzzy
-#| msgid "<filename>live-package</filename>"
-msgid "Edit <filename>/etc/qemu-ifup</filename>:"
-msgstr "<filename>live-package</filename>"
-
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:646
-#, no-wrap
-msgid ""
-"#!/bin/sh\n"
-"sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1\n"
-"echo \"Executing /etc/qemu-ifup\"\n"
-"echo \"Bringing up $1 for bridged mode...\"\n"
-"sudo /sbin/ifconfig $1 0.0.0.0 promisc up\n"
-"echo \"Adding $1 to br0...\"\n"
-"sudo /usr/sbin/brctl addif br0 $1\n"
-"sleep 2"
-msgstr ""
-
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:657
-msgid "Get, or build a grub-floppy-netboot (in the svn)."
-msgstr ""
-
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:661
-msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
-msgstr ""
diff --git a/manual/po/fr/bootup.xml.po b/manual/po/fr/bootup.xml.po
deleted file mode 100644
index 452009a..0000000
--- a/manual/po/fr/bootup.xml.po
+++ /dev/null
@@ -1,192 +0,0 @@
-# French translations for PACKAGE package
-# Copyright (C) 2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# Automatically generated, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2009-02-27 16:19+0100\n"
-"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> "
-"<christophenagel at gmail.com>\n"
-"Language-Team: none\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/live-environment.xml:11 en/chapters/resources.xml:11
-#: en/chapters/success-stories.xml:11 en/chapters/about/manual.xml:125
-#: en/chapters/customization/bootup.xml:11
-#: en/chapters/customization/bootup.xml:20
-#: en/chapters/customization/bootup.xml:26
-#: en/chapters/customization/bootup.xml:38
-#: en/chapters/customization/bootup.xml:85
-#: en/chapters/customization/bootup.xml:92
-#: en/chapters/customization/bootup.xml:99
-#: en/chapters/customization/bootup.xml:106
-#: en/chapters/customization/packages.xml:36
-#: en/chapters/customization/packages.xml:306
-#: en/chapters/customization/packages.xml:326
-#: en/chapters/customization/packages.xml:384
-#: en/chapters/customization/packages.xml:492
-#: en/chapters/customization/packages.xml:535
-msgid "FIXME"
-msgstr "FIXME"
-
-# type: Content of: <sect1><sect2><title>
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/about/manual.xml:121 en/chapters/customization/bootup.xml:104
-msgid "Cheat codes"
-msgstr "Codes de triche"
-
-# type: Content of: <sect1><title>
-#. type: Content of: <sect1><title>
-#: en/chapters/customization/bootup.xml:7
-#, fuzzy
-#| msgid "Customising the binary image"
-msgid "Customising the bootup process"
-msgstr "Personnaliser l'image binaire"
-
-#. type: Content of: <sect1><para>
-#: en/chapters/customization/bootup.xml:9
-msgid ""
-"This chapter discusses customisation of bootup process of a live system, "
-"including kernel options, modifications to the bootloader, \"splash\" "
-"screens and startup scripts."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/bootup.xml:14
-msgid "Kernel"
-msgstr ""
-
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/bootup.xml:18
-#, fuzzy
-#| msgid "Bootloader"
-msgid "Bootloaders"
-msgstr "Chargeur de démarrage"
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/bootup.xml:24
-msgid "Choosing a bootloader"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/bootup.xml:31
-msgid "Syslinux"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/bootup.xml:32
-msgid ""
-"In the default configuration, Syslinux will pause indefinitely at its splash "
-"screen. To adjust this, modify the <command>LH_SYSLINUX_TIMEOUT</command> "
-"value or pass <command>--syslinux-timeout <replaceable>TIMEOUT</"
-"replaceable></command> to <filename>lh_config</filename>. The value is "
-"specified in units of 1/10s and the maximum possible timeout is 35996. A "
-"timeout of 0 (zero) disables the timeout completely. For more information "
-"please see syslinux(1)."
-msgstr ""
-
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/bootup.xml:36
-#, fuzzy
-#| msgid "Bootloader"
-msgid "Bootloader templates"
-msgstr "Chargeur de démarrage"
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/bootup.xml:43
-msgid "Booting a Debian Live USB/HDD system from a USB stick with Grub"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/bootup.xml:45
-msgid ""
-"Suppose you've built your Debian Live USB/HDD image, but want to install it "
-"on an already used USB stick with ext2/3 partition and Grub bootloader:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/chapters/customization/bootup.xml:55
-#, no-wrap
-msgid ""
-"# mkdir /media/myUsb/boot/live/\n"
-"# cp binary/vmlinuz1 binary/initrd1.img binary/live/filesystem.squashfs /media/myUsb/boot/live/\n"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/bootup.xml:50
-msgid ""
-"First, copy live components in a directory on your key: the Linux kernel "
-"(<filename>vmlinuz*</filename>), its Initial RAM disk (<filename>initrd*</"
-"filename>) and the system (<filename>filesystem.squashfs</filename>): "
-"<placeholder type=\"screen\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/chapters/customization/bootup.xml:63
-#, no-wrap
-msgid ""
-"echo &gt;&gt;/media/myUsb/boot/grub/menu.lst  &lt;&lt;EOF\n"
-"\n"
-"title           my Debian Live\n"
-"root            (hd0,1)    # my Ext2 partition is the second on this stick\n"
-"kernel          /boot/live/vmlinuz1 boot=live vga=791 persistent union=aufs live-media-path=boot/live\n"
-"initrd          /boot/live/initrd1.img\n"
-"\n"
-"EOF\n"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/bootup.xml:60
-msgid ""
-"Then, add a stanza in Grub's menu definition to boot up this system: "
-"<placeholder type=\"screen\" id=\"0\"/> The important kernel command line "
-"option to add here is"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para><variablename>
-#: en/chapters/customization/bootup.xml:73
-msgid "live-media-path"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/bootup.xml:73
-msgid ""
-", which tells to Live initrd's script in which subdirectory to look for the "
-"SquashFS image."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/bootup.xml:77
-msgid "Next, umount your USB stick and reboot on it. That's all!"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/bootup.xml:83
-msgid "Splash screens"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/bootup.xml:90
-msgid "Memtest"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/bootup.xml:97
-msgid "Startup scripts"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/bootup.xml:109
-msgid "Checksums."
-msgstr ""
diff --git a/manual/po/fr/coding-style.xml.po b/manual/po/fr/coding-style.xml.po
deleted file mode 100644
index 51ca7ff..0000000
--- a/manual/po/fr/coding-style.xml.po
+++ /dev/null
@@ -1,143 +0,0 @@
-# French translations for PACKAGE package
-# Copyright (C) 2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# Automatically generated, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2009-02-27 18:09+0100\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-# type: Content of: <chapter><title>
-#. type: Content of: <chapter><title>
-#: en/chapters/coding-style.xml:7
-msgid "Coding Style"
-msgstr ""
-
-# type: Content of: <chapter><para>
-#. type: Content of: <chapter><para>
-#: en/chapters/coding-style.xml:9
-msgid ""
-"This chapter documents the coding style used in &live-helper; and (ideally) "
-"in &live-initramfs;."
-msgstr ""
-
-# type: Content of: <chapter><sect1><title>
-#. type: Content of: <chapter><sect1><title>
-#: en/chapters/coding-style.xml:12
-msgid "Compatibility"
-msgstr ""
-
-# type: Content of: <chapter><sect1><title>
-#. type: Content of: <chapter><sect1><title>
-#: en/chapters/coding-style.xml:22
-msgid "Indenting"
-msgstr ""
-
-# type: Content of: <chapter><sect1><title>
-#. type: Content of: <chapter><sect1><title>
-#: en/chapters/coding-style.xml:31
-msgid "Wrapping"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/coding-style.xml:41
-#, no-wrap
-msgid ""
-"if foo; then\n"
-"\tbar\n"
-"fi\n"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/chapters/coding-style.xml:38 en/chapters/coding-style.xml:59
-#: en/chapters/coding-style.xml:92 en/chapters/coding-style.xml:108
-msgid "Bad: <placeholder type=\"screen\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/coding-style.xml:50
-#, no-wrap
-msgid ""
-"if foo\n"
-"then\n"
-"\tbar\n"
-"fi\n"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/chapters/coding-style.xml:47 en/chapters/coding-style.xml:67
-#: en/chapters/coding-style.xml:98 en/chapters/coding-style.xml:117
-msgid "Good: <placeholder type=\"screen\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/coding-style.xml:62
-#, no-wrap
-msgid ""
-"foo () {\n"
-"\tbar\n"
-"}\n"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/coding-style.xml:70
-#, no-wrap
-msgid ""
-"foo ()\n"
-"{\n"
-"\tbar\n"
-"}\n"
-msgstr ""
-
-# type: Content of: <chapter><sect1><title>
-#. type: Content of: <chapter><sect1><title>
-#: en/chapters/coding-style.xml:81
-msgid "Variables"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/coding-style.xml:95
-#, no-wrap
-msgid "FOO=bar\n"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/coding-style.xml:101
-#, no-wrap
-msgid "FOO=\"bar\"\n"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/coding-style.xml:111
-#, no-wrap
-msgid ""
-"if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
-"then\n"
-"\tfoobar\n"
-"fi\n"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/coding-style.xml:120
-#, no-wrap
-msgid ""
-"if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
-"then\n"
-"\tfoobar\n"
-"fi\n"
-msgstr ""
-
-# type: Content of: <chapter><sect1><title>
-#. type: Content of: <chapter><sect1><title>
-#: en/chapters/coding-style.xml:131
-msgid "Miscellaneous"
-msgstr ""
diff --git a/manual/po/fr/contents.xml.po b/manual/po/fr/contents.xml.po
deleted file mode 100644
index 1a79ef3..0000000
--- a/manual/po/fr/contents.xml.po
+++ /dev/null
@@ -1,229 +0,0 @@
-# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2010-06-06 12:07+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-# type: Content of: <sect1><title>
-#. type: Content of: <sect1><title>
-#: en/chapters/customization/contents.xml:7
-#, fuzzy
-#| msgid "Customising the binary image"
-msgid "Customising contents"
-msgstr "Personnaliser l'image binaire"
-
-# type: Content of: <sect1><para>
-#. type: Content of: <sect1><para>
-#: en/chapters/customization/contents.xml:9
-#, fuzzy
-#| msgid ""
-#| "This chapter discusses the customisation of package installation. This "
-#| "involves:"
-msgid "This chapter discusses further customisation of the live system."
-msgstr ""
-"Ce chapitre décrit comment personnaliser l'installation des paquets. Cela "
-"implique :"
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/contents.xml:12
-msgid "Includes"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/contents.xml:14
-msgid ""
-"Using includes, it is possible to add (or replace) arbitrary files in your "
-"Debian Live image. &live-helper; provides three mechanisms for using them:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/customization/contents.xml:19
-msgid "Chroot local includes"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/contents.xml:23
-msgid ""
-"These allow you to add or replace files to the chroot/Live filesystem. "
-"Please see <xref linkend=\"chroot-local-includes\"/> for more information."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/contents.xml:29
-#: en/chapters/customization/contents.xml:89
-msgid "Binary local includes"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/contents.xml:33
-msgid ""
-"These allow you to add or replace files in the binary image. Please see "
-"<xref linkend=\"binary-local-includes\"/> for more information."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/contents.xml:39
-#: en/chapters/customization/contents.xml:96
-msgid "Binary includes"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/contents.xml:43
-msgid ""
-"These allow you to add or replace Debian specific files in the binary image, "
-"such as the templates and tools directories. Please see <xref linkend="
-"\"binary-includes\"/> for more information."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/contents.xml:50
-msgid ""
-"Please see <xref linkend=\"terms\"/> for more information about the "
-"distinction between the \"Live\" and \"binary\" images."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/contents.xml:54
-msgid "Live/chroot local includes"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/contents.xml:56
-msgid ""
-"Chroot local includes can be used to add or replace files in the chroot/Live "
-"filesystem so that they are visible when the Live system is booted. Typical "
-"uses for them are to populate the skeleton user directory (<filename class="
-"\"directory\">/etc/skel</filename>) used by the live system to create the "
-"live user's home directory, or adding configuration files where additional "
-"processing is not required."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/contents.xml:60
-msgid ""
-"To include files, simply add them to your <filename class=\"directory"
-"\">config/chroot_local-includes</filename> directory. This directory "
-"corresponds to the root directory (<filename class=\"directory\">/</"
-"filename>) of the live system. For example, to add a file <filename>/var/www/"
-"index.html</filename> in the live system, use:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><screen>
-#: en/chapters/customization/contents.xml:64
-#, no-wrap
-msgid ""
-"  $ mkdir -p config/chroot_local-includes/var/www\n"
-"  $ cp /path/to/my/index.html config/chroot_local-includes/var/www\n"
-" "
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/contents.xml:69
-msgid "Your configuration will then have the following layout:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><screen>
-#: en/chapters/customization/contents.xml:73
-#, no-wrap
-msgid ""
-"-- config\n"
-"   [...]\n"
-"    |-- chroot_local-includes\n"
-"    |   `-- var\n"
-"    |       `-- www\n"
-"    |           `-- index.html\n"
-"   [...]\n"
-"    `-- templates\n"
-" "
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/contents.xml:84
-msgid ""
-"Chroot local includes are installed after package installation so that files "
-"installed by packages are overwritten."
-msgstr ""
-
-# type: Content of: <sect1><sect2><sect3><sect4><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/contents.xml:91
-#: en/chapters/customization/contents.xml:98
-#: en/chapters/customization/contents.xml:107
-#: en/chapters/customization/contents.xml:112
-#: en/chapters/customization/contents.xml:117
-#, fuzzy
-msgid "FIXME."
-msgstr ""
-"#-#-#-#-#  packages.xml.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"À corriger\n"
-"#-#-#-#-#  contents.xml.po (PACKAGE VERSION)  #-#-#-#-#\n"
-"A FAIRE"
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/contents.xml:105
-msgid "Hooks"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/contents.xml:108
-msgid "Enabling hooks"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/contents.xml:111
-msgid "Live/chroot local hooks"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/contents.xml:116
-msgid "Binary local hooks"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/contents.xml:123
-msgid "Preseeding Debconf questions"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/contents.xml:125
-msgid ""
-"Files in the <filename class=\"directory\">config/chroot_local-preseed</"
-"filename> directory are considered to be debconf preseed files and are "
-"installed by &live-helper; using <filename>debconf-set-selections</filename>."
-msgstr ""
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/contents.xml:127
-#, fuzzy
-#| msgid ""
-#| "For more information about debconf preseeding, please see <xref linkend="
-#| "\"debconf-preseed\"/>."
-msgid ""
-"For more information about debconf, please see debconf(7) in the "
-"<command>debconf</command> package."
-msgstr ""
-"Pour plus d'informations sur la façon de configurer debconf, voir, svp, "
-"<xref linkend=\"debconf-preseed\"/>."
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/contents.xml:131
-msgid "Symlink conversion"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/contents.xml:132
-msgid "FIXME. (This is probably in the wrong section)"
-msgstr ""
diff --git a/manual/po/fr/customization_backports.xml.po b/manual/po/fr/customization_backports.xml.po
deleted file mode 100644
index a02df3e..0000000
--- a/manual/po/fr/customization_backports.xml.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2010-06-06 12:16+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. type: Content of: <sect1><title>
-#: en/customization_backports.xml:8
-msgid "Using a newer kernel with Lenny"
-msgstr ""
-
-#. type: Content of: <sect1><para>
-#: en/customization_backports.xml:10
-msgid ""
-"The backports repository, backports.org, lacks the necessary module packages "
-"(linux-modules-extra-2.6, aufs, etc.) so an alternative repository has been "
-"set up, in order to build Lenny live images with a later kernel. Shown here "
-"is one way of doing it."
-msgstr ""
-
-#. type: Content of: <sect1><screen>
-#: en/customization_backports.xml:13
-#, no-wrap
-msgid ""
-"$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6'\n"
-"\n"
-"$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.chroot\n"
-"$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.binary\n"
-"\n"
-"$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.chroot.gpg\n"
-"$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.binary.gpg\n"
-"\n"
-"# lh_build\n"
-msgstr ""
diff --git a/manual/po/fr/customization_binary.xml.po b/manual/po/fr/customization_binary.xml.po
deleted file mode 100644
index 49a62a4..0000000
--- a/manual/po/fr/customization_binary.xml.po
+++ /dev/null
@@ -1,99 +0,0 @@
-# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2010-06-06 12:16+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. type: Content of: <sect1><title>
-#: en/customization_binary.xml:7
-msgid "Customising the binary image"
-msgstr ""
-
-#. type: Content of: <sect1><para>
-#: en/customization_binary.xml:9
-msgid "This chapter discusses FIXME"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/customization_binary.xml:12
-msgid "ISO metadata"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/customization_binary.xml:14
-msgid ""
-"When creating an ISO9660 binary image, you can use the following options to "
-"add various textual metadata for your image. This can help you easily "
-"identify the version or configuration of an image without booting it."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_binary.xml:19
-msgid ""
-"<command>LH_ISO_APPLICATION</command> / <command>--iso-application "
-"<replaceable>NAME</replaceable></command>"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_binary.xml:22
-msgid ""
-"This should describe the application that will be on the image. The maximum "
-"length for this field is 128 characters."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_binary.xml:27
-msgid ""
-"<command>LH_ISO_PREPARER</command> / <command>--iso-preparer "
-"<replaceable>NAME</replaceable></command>"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_binary.xml:30
-msgid ""
-"This should describe the preparer of the image, usually with some contact "
-"details. The default for this option is the &live-helper; version you are "
-"using, which may help with debugging later. The maximum length for this "
-"field is 128 characters."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_binary.xml:35
-msgid ""
-"<command>LH_ISO_PUBLISHER</command> / <command>--iso-publisher "
-"<replaceable>NAME</replaceable></command>"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_binary.xml:38
-msgid ""
-"This should describe the publisher of the image, usually with some contact "
-"details. The maximum length for this field is 128 characters."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_binary.xml:43
-msgid ""
-"<command>LH_ISO_VOLUME</command> / <command>--iso-volume <replaceable>NAME</"
-"replaceable></command>"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_binary.xml:46
-msgid ""
-"This should specify the volume ID of the image. This is used as a user-"
-"visible label on some platforms such as Windows and Apple Mac OS. The "
-"maximum length for this field is 32 characters."
-msgstr ""
diff --git a/manual/po/fr/customization_bootup.xml.po b/manual/po/fr/customization_bootup.xml.po
deleted file mode 100644
index 4987649..0000000
--- a/manual/po/fr/customization_bootup.xml.po
+++ /dev/null
@@ -1,180 +0,0 @@
-# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2010-06-06 12:16+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. type: Content of: <sect1><sect2><title>
-#: en/about_manual.xml:121 en/customization_bootup.xml:104
-msgid "Cheat codes"
-msgstr ""
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><para>
-#: en/about_manual.xml:125 en/customization_bootup.xml:11
-#: en/customization_bootup.xml:20 en/customization_bootup.xml:26
-#: en/customization_bootup.xml:38 en/customization_bootup.xml:85
-#: en/customization_bootup.xml:92 en/customization_bootup.xml:99
-#: en/customization_bootup.xml:106 en/customization_packages.xml:36
-#: en/customization_packages.xml:306 en/customization_packages.xml:326
-#: en/customization_packages.xml:384 en/customization_packages.xml:492
-#: en/customization_packages.xml:535 en/live-environment.xml:11
-#: en/resources.xml:11 en/success-stories.xml:11
-msgid "FIXME"
-msgstr "FIXME"
-
-#. type: Content of: <sect1><title>
-#: en/customization_bootup.xml:7
-msgid "Customising the bootup process"
-msgstr ""
-
-#. type: Content of: <sect1><para>
-#: en/customization_bootup.xml:9
-msgid ""
-"This chapter discusses customisation of bootup process of a live system, "
-"including kernel options, modifications to the bootloader, \"splash\" "
-"screens and startup scripts."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/customization_bootup.xml:14
-msgid "Kernel"
-msgstr ""
-
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#. type: Content of: <sect1><sect2><title>
-#: en/customization_bootup.xml:18
-#, fuzzy
-#| msgid "Bootloader"
-msgid "Bootloaders"
-msgstr "Chargeur de démarrage"
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_bootup.xml:24
-msgid "Choosing a bootloader"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_bootup.xml:31
-msgid "Syslinux"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_bootup.xml:32
-msgid ""
-"In the default configuration, Syslinux will pause indefinitely at its splash "
-"screen. To adjust this, modify the <command>LH_SYSLINUX_TIMEOUT</command> "
-"value or pass <command>--syslinux-timeout <replaceable>TIMEOUT</"
-"replaceable></command> to <filename>lh_config</filename>. The value is "
-"specified in units of 1/10s and the maximum possible timeout is 35996. A "
-"timeout of 0 (zero) disables the timeout completely. For more information "
-"please see syslinux(1)."
-msgstr ""
-
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_bootup.xml:36
-#, fuzzy
-#| msgid "Bootloader"
-msgid "Bootloader templates"
-msgstr "Chargeur de démarrage"
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_bootup.xml:43
-msgid "Booting a Debian Live USB/HDD system from a USB stick with Grub"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_bootup.xml:45
-msgid ""
-"Suppose you've built your Debian Live USB/HDD image, but want to install it "
-"on an already used USB stick with ext2/3 partition and Grub bootloader:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/customization_bootup.xml:55
-#, no-wrap
-msgid ""
-"# mkdir /media/myUsb/boot/live/\n"
-"# cp binary/vmlinuz1 binary/initrd1.img binary/live/filesystem.squashfs /media/myUsb/boot/live/\n"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_bootup.xml:50
-msgid ""
-"First, copy live components in a directory on your key: the Linux kernel "
-"(<filename>vmlinuz*</filename>), its Initial RAM disk (<filename>initrd*</"
-"filename>) and the system (<filename>filesystem.squashfs</filename>): "
-"<placeholder type=\"screen\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/customization_bootup.xml:63
-#, no-wrap
-msgid ""
-"echo &gt;&gt;/media/myUsb/boot/grub/menu.lst  &lt;&lt;EOF\n"
-"\n"
-"title           my Debian Live\n"
-"root            (hd0,1)    # my Ext2 partition is the second on this stick\n"
-"kernel          /boot/live/vmlinuz1 boot=live vga=791 persistent union=aufs live-media-path=boot/live\n"
-"initrd          /boot/live/initrd1.img\n"
-"\n"
-"EOF\n"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_bootup.xml:60
-msgid ""
-"Then, add a stanza in Grub's menu definition to boot up this system: "
-"<placeholder type=\"screen\" id=\"0\"/> The important kernel command line "
-"option to add here is"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para><variablename>
-#: en/customization_bootup.xml:73
-msgid "live-media-path"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_bootup.xml:73
-msgid ""
-", which tells to Live initrd's script in which subdirectory to look for the "
-"SquashFS image."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_bootup.xml:77
-msgid "Next, umount your USB stick and reboot on it. That's all!"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/customization_bootup.xml:83
-msgid "Splash screens"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/customization_bootup.xml:90
-msgid "Memtest"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/customization_bootup.xml:97
-msgid "Startup scripts"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/customization_bootup.xml:109
-msgid "Checksums."
-msgstr ""
diff --git a/manual/po/fr/customization_contents.xml.po b/manual/po/fr/customization_contents.xml.po
deleted file mode 100644
index 292b4d3..0000000
--- a/manual/po/fr/customization_contents.xml.po
+++ /dev/null
@@ -1,215 +0,0 @@
-# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2010-06-06 12:16+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-# type: Content of: <chapter><title>
-#. type: Content of: <sect1><title>
-#: en/customization_contents.xml:7
-#, fuzzy
-#| msgid "Customization"
-msgid "Customising contents"
-msgstr "Personnalisation"
-
-#. type: Content of: <sect1><para>
-#: en/customization_contents.xml:9
-msgid "This chapter discusses further customisation of the live system."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/customization_contents.xml:12
-msgid "Includes"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:14
-msgid ""
-"Using includes, it is possible to add (or replace) arbitrary files in your "
-"Debian Live image. &live-helper; provides three mechanisms for using them:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_contents.xml:19
-msgid "Chroot local includes"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_contents.xml:23
-msgid ""
-"These allow you to add or replace files to the chroot/Live filesystem. "
-"Please see <xref linkend=\"chroot-local-includes\"/> for more information."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_contents.xml:29 en/customization_contents.xml:89
-msgid "Binary local includes"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_contents.xml:33
-msgid ""
-"These allow you to add or replace files in the binary image. Please see "
-"<xref linkend=\"binary-local-includes\"/> for more information."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_contents.xml:39 en/customization_contents.xml:96
-msgid "Binary includes"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_contents.xml:43
-msgid ""
-"These allow you to add or replace Debian specific files in the binary image, "
-"such as the templates and tools directories. Please see <xref linkend="
-"\"binary-includes\"/> for more information."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:50
-msgid ""
-"Please see <xref linkend=\"terms\"/> for more information about the "
-"distinction between the \"Live\" and \"binary\" images."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_contents.xml:54
-msgid "Live/chroot local includes"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_contents.xml:56
-msgid ""
-"Chroot local includes can be used to add or replace files in the chroot/Live "
-"filesystem so that they are visible when the Live system is booted. Typical "
-"uses for them are to populate the skeleton user directory (<filename class="
-"\"directory\">/etc/skel</filename>) used by the live system to create the "
-"live user's home directory, or adding configuration files where additional "
-"processing is not required."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_contents.xml:60
-msgid ""
-"To include files, simply add them to your <filename class=\"directory"
-"\">config/chroot_local-includes</filename> directory. This directory "
-"corresponds to the root directory (<filename class=\"directory\">/</"
-"filename>) of the live system. For example, to add a file <filename>/var/www/"
-"index.html</filename> in the live system, use:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><screen>
-#: en/customization_contents.xml:64
-#, no-wrap
-msgid ""
-"  $ mkdir -p config/chroot_local-includes/var/www\n"
-"  $ cp /path/to/my/index.html config/chroot_local-includes/var/www\n"
-" "
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_contents.xml:69
-msgid "Your configuration will then have the following layout:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><screen>
-#: en/customization_contents.xml:73
-#, no-wrap
-msgid ""
-"-- config\n"
-"   [...]\n"
-"    |-- chroot_local-includes\n"
-"    |   `-- var\n"
-"    |       `-- www\n"
-"    |           `-- index.html\n"
-"   [...]\n"
-"    `-- templates\n"
-" "
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_contents.xml:84
-msgid ""
-"Chroot local includes are installed after package installation so that files "
-"installed by packages are overwritten."
-msgstr ""
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_contents.xml:91 en/customization_contents.xml:98
-#: en/customization_contents.xml:107 en/customization_contents.xml:112
-#: en/customization_contents.xml:117
-#, fuzzy
-#| msgid "FIXME"
-msgid "FIXME."
-msgstr "FIXME"
-
-#. type: Content of: <sect1><sect2><title>
-#: en/customization_contents.xml:105
-msgid "Hooks"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:108
-msgid "Enabling hooks"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_contents.xml:111
-msgid "Live/chroot local hooks"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_contents.xml:116
-msgid "Binary local hooks"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/customization_contents.xml:123
-msgid "Preseeding Debconf questions"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:125
-msgid ""
-"Files in the <filename class=\"directory\">config/chroot_local-preseed</"
-"filename> directory are considered to be debconf preseed files and are "
-"installed by &live-helper; using <filename>debconf-set-selections</filename>."
-msgstr ""
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:127
-#, fuzzy
-#| msgid ""
-#| "For more information about debconf preseeding, please see <xref linkend="
-#| "\"debconf-preseed\"/>."
-msgid ""
-"For more information about debconf, please see debconf(7) in the "
-"<command>debconf</command> package."
-msgstr ""
-"Pour plus d'informations sur la façon de configurer debconf, voir, svp, "
-"<xref linkend=\"debconf-preseed\"/>."
-
-#. type: Content of: <sect1><sect2><title>
-#: en/customization_contents.xml:131
-msgid "Symlink conversion"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:132
-msgid "FIXME. (This is probably in the wrong section)"
-msgstr ""
diff --git a/manual/po/fr/customization_internationalization.xml.po b/manual/po/fr/customization_internationalization.xml.po
deleted file mode 100644
index a560e78..0000000
--- a/manual/po/fr/customization_internationalization.xml.po
+++ /dev/null
@@ -1,108 +0,0 @@
-# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2010-06-06 12:16+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. type: Content of: <sect1><title>
-#: en/customization_internationalization.xml:7
-msgid "Customising Locale And Language"
-msgstr ""
-
-#. type: Content of: <sect1><para>
-#: en/customization_internationalization.xml:8
-msgid "This chapter discusses customisation for language specific parameters."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/customization_internationalization.xml:11
-msgid "Default locale and keyboard"
-msgstr ""
-
-# type: Content of: <chapter><section><para><screen>
-#. type: Content of: <sect1><sect2><para><screen>
-#: en/customization_internationalization.xml:17
-#, fuzzy, no-wrap
-#| msgid "lh_config --bootappend-live \"locale=sv_SE.utf8\""
-msgid "$ lh_config --bootappend-live \"locale=en_GB.UTF-8\"\n"
-msgstr "lh_config --bootappend-live \"locale=sv_SE.utf8\""
-
-# type: Content of: <chapter><section><para><screen>
-#. type: Content of: <sect1><sect2><para><screen>
-#: en/customization_internationalization.xml:21
-#, fuzzy, no-wrap
-#| msgid "lh_config --bootappend-live \"locale=sv_SE.utf8\""
-msgid "$ lh_config --bootappend-live \"keyb=uk\"\n"
-msgstr "lh_config --bootappend-live \"locale=sv_SE.utf8\""
-
-# type: Content of: <chapter><section><para><screen>
-#. type: Content of: <sect1><sect2><para><screen>
-#: en/customization_internationalization.xml:25
-#, fuzzy, no-wrap
-#| msgid "lh_config --bootappend-live \"locale=sv_SE.utf8 keyb=se\""
-msgid "$ lh_config --bootappend-live \"locale=en_GB.UTF-8 keyb=uk\"\n"
-msgstr "lh_config --bootappend-live \"locale=sv_SE.utf8 keyb=se\""
-
-# type: Content of: <chapter><section><para><screen>
-#. type: Content of: <sect1><sect2><para><screen>
-#: en/customization_internationalization.xml:29
-#, fuzzy, no-wrap
-#| msgid "lh_config --bootappend-live \"locale=sv_SE.utf8\""
-msgid "$ lh_config --bootappend-live \"locale=uk\"\n"
-msgstr "lh_config --bootappend-live \"locale=sv_SE.utf8\""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/customization_internationalization.xml:14
-msgid ""
-"The default locale when building a live cd is \"locale=en_US.UTF-8\".  To "
-"set the locale for the UK (locale=en_GB.UTF-8)  <placeholder type=\"screen\" "
-"id=\"0\"/> The entry for a British keyboard would be <placeholder type="
-"\"screen\" id=\"1\"/> To configure both the locale and the keyboard for the "
-"UK the entry would be <placeholder type=\"screen\" id=\"2\"/> or "
-"<placeholder type=\"screen\" id=\"3\"/>"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/customization_internationalization.xml:37
-msgid "l10n Packages"
-msgstr ""
-
-# type: Content of: <sect1><sect2><sect3><screen>
-#. type: Content of: <sect1><sect2><para><screen>
-#: en/customization_internationalization.xml:42
-#, fuzzy, no-wrap
-#| msgid ""
-#| "\n"
-#| "$ lh_config --packages \"package1 package2 package3\"\n"
-msgid "$ lh_config --language \"se\"\n"
-msgstr ""
-"\n"
-"$ lh_config --packages \"package1 package2 package3\"\n"
-
-#. type: Content of: <sect1><sect2><para><screen>
-#: en/customization_internationalization.xml:46
-#, no-wrap
-msgid "  config/templates/syslinux/se\n"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/customization_internationalization.xml:40
-msgid ""
-"lh build can automatically check for each package, for which it's know that "
-"there are -l10n packages available and install them. To add Swedish packages "
-"the entry would be <placeholder type=\"screen\" id=\"0\"/> This will also "
-"change the default syslinux language if <placeholder type=\"screen\" id="
-"\"1\"/> is available. Check syslinux configuration FIXME"
-msgstr ""
diff --git a/manual/po/fr/customization_packages.xml.po b/manual/po/fr/customization_packages.xml.po
deleted file mode 100644
index 49e0161..0000000
--- a/manual/po/fr/customization_packages.xml.po
+++ /dev/null
@@ -1,656 +0,0 @@
-# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2010-06-06 12:16+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><para>
-#: en/about_manual.xml:125 en/customization_bootup.xml:11
-#: en/customization_bootup.xml:20 en/customization_bootup.xml:26
-#: en/customization_bootup.xml:38 en/customization_bootup.xml:85
-#: en/customization_bootup.xml:92 en/customization_bootup.xml:99
-#: en/customization_bootup.xml:106 en/customization_packages.xml:36
-#: en/customization_packages.xml:306 en/customization_packages.xml:326
-#: en/customization_packages.xml:384 en/customization_packages.xml:492
-#: en/customization_packages.xml:535 en/live-environment.xml:11
-#: en/resources.xml:11 en/success-stories.xml:11
-msgid "FIXME"
-msgstr "FIXME"
-
-#. type: Content of: <chapter><section><section><para>
-#: en/about_manual.xml:298 en/about_manual.xml:308 en/about_manual.xml:318
-#: en/about_manual.xml:338 en/about_manual.xml:351 en/about_manual.xml:366
-#: en/about_manual.xml:379 en/about_manual.xml:389 en/basics.xml:113
-#: en/basics.xml:128 en/basics.xml:144 en/basics.xml:158 en/basics.xml:194
-#: en/basics.xml:220 en/basics.xml:230 en/basics.xml:239 en/basics.xml:253
-#: en/basics.xml:275 en/basics.xml:302 en/basics.xml:312 en/basics.xml:320
-#: en/basics.xml:354 en/basics.xml:364 en/basics.xml:382 en/basics.xml:429
-#: en/basics.xml:498 en/basics.xml:530 en/basics.xml:539 en/basics.xml:590
-#: en/basics.xml:646 en/customization_packages.xml:50
-#: en/customization_packages.xml:58 en/customization_packages.xml:71
-#: en/customization_packages.xml:80 en/customization_packages.xml:104
-#: en/customization_packages.xml:222 en/customization_packages.xml:230
-#: en/customization_packages.xml:265 en/customization_packages.xml:310
-#: en/customization_packages.xml:330 en/customization_packages.xml:341
-#: en/customization_packages.xml:352 en/customization_packages.xml:362
-#: en/faq.xml:64 en/faq.xml:241 en/faq.xml:244 en/faq.xml:252 en/faq.xml:256
-#: en/faq.xml:264 en/faq.xml:279 en/faq.xml:287 en/faq.xml:334 en/faq.xml:424
-#: en/faq.xml:430 en/faq.xml:481 en/faq.xml:483 en/faq.xml:487 en/faq.xml:491
-#: en/overview.xml:181 en/overview.xml:230 en/overview.xml:240
-msgid "<placeholder type=\"screen\" id=\"0\"/>"
-msgstr ""
-
-# type: Content of: <sect1><title>
-#. type: Content of: <sect1><title>
-#: en/customization_packages.xml:9
-#, fuzzy
-#| msgid "Customising package installation"
-msgid "Customising package installation"
-msgstr "Installation personnalisée des paquets"
-
-#. type: Content of: <sect1><para>
-#: en/customization_packages.xml:12
-msgid ""
-"This chapter discusses the customisation of package installation. This "
-"involves:"
-msgstr ""
-
-#. type: Content of: <sect1><orderedlist><listitem><para>
-#: en/customization_packages.xml:20
-msgid "Selecting additional packages to be installed"
-msgstr ""
-
-#. type: Content of: <sect1><orderedlist><listitem><para>
-#: en/customization_packages.xml:26
-msgid "Installing modified packages"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/customization_packages.xml:33
-msgid "Package sources"
-msgstr ""
-
-# type: Content of: <chapter><section><section><title>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_packages.xml:42
-#, fuzzy
-#| msgid "From the Debian repository"
-msgid "Debian repositories"
-msgstr "Depuis le dépot Debian"
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:46
-msgid "To set a local mirror (used to ''build'' the live-cd)"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/customization_packages.xml:50
-#, no-wrap
-msgid "$ lh config --mirror-bootstrap \"http://local.intra.net/debian/\" --mirror-chroot \"http://local.intra.net/debian/\""
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:54
-msgid "The generic mirror is added to the live-system's /etc/apt/sources.list."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/customization_packages.xml:58
-#, no-wrap
-msgid "$ lh config --mirror-binary \"http://ftp.debian.org/debian/\""
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:62
-msgid ""
-"Note: It is ''not'' used for building the live-cd but to install new "
-"software while using the live-cd."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:67
-msgid "It can be disabled by setting binary indices parameter to disabled"
-msgstr ""
-
-# type: Content of: <chapter><section><screen>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/customization_packages.xml:71
-#, fuzzy, no-wrap
-#| msgid "$ lh_config -b usb-hdd"
-msgid "$ lh config --binary-indices disabled"
-msgstr "$ lh_config -b usb-hdd"
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:75
-msgid ""
-"Note: the same applies for mirror chroot security and mirror binary security"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/customization_packages.xml:80
-#, no-wrap
-msgid ""
-"$ lh config --mirror-chroot-security {URL}\n"
-"$ lh config --mirror-binary-security {URL}"
-msgstr ""
-
-# type: Content of: <chapter><section><section><title>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_packages.xml:87
-#, fuzzy
-#| msgid "From the Debian repository"
-msgid "Own repository"
-msgstr "Depuis le dépot Debian"
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:91
-msgid ""
-"To add more repositories (e.g. backports, experimental packages, etc.), "
-"create <filename>config/chroot_sources/your-cdd-repo.{chroot,binary}</"
-"filename> file."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:98
-msgid ""
-"e.g. <filename>config/chroot_sources/live.chroot</filename> allows you to "
-"install packages from the debian live snapshot repository at live-cd build "
-"time (you have to add the packages in your package list):"
-msgstr ""
-
-# type: Content of: <chapter><section><section><orderedlist><listitem><screen>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/customization_packages.xml:104
-#, fuzzy, no-wrap
-#| msgid "echo \"deb http://live.debian.net/debian/ ./\" > config/chroot_sources/live-snapshots.chroot"
-msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
-msgstr "echo \"deb http://live.debian.net/debian/ ./\" > config/chroot_sources/live-snapshots.chroot"
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:108
-msgid ""
-"If you add the line to <filename>config/chroot_sources/live.binary</"
-"filename> the repository will be added to your live-system's <filename>/etc/"
-"apt/sources.list</filename>."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:115
-msgid "If such files exist, they will be picked up automatically."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:119
-msgid ""
-"You can also put the gpg-key used to sign the repository into config/"
-"chroot_sources/foo.{binary,chroot}.gpg"
-msgstr ""
-
-# type: Content of: <chapter><title>
-#. type: Content of: <sect1><sect2><title>
-#: en/customization_packages.xml:130
-#, fuzzy
-#| msgid "Installation"
-msgid "Package installation"
-msgstr "Installation"
-
-#. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:133
-msgid ""
-"You can elect to use either <command>apt</command> or <command>aptitude</"
-"command> when installing packages. Which utility is used is governed by the "
-"<command>LH_APT</command> variable in <filename>config/chroot</filename> or "
-"by the <command>--apt</command> argument to <filename>lh config</filename>:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_packages.xml:143
-msgid "<command>apt</command>"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:147
-msgid ""
-"Specifying a missing package causes package installation to fail, which may "
-"not be the desired behaviour."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:152
-msgid "This is the default setting for building images for Lenny or later."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_packages.xml:158
-msgid "<command>aptitude</command>"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:162
-msgid ""
-"Specifying a missing package causes package installation to succeed, which "
-"may not be the desired behaviour."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:167
-msgid "This is the default setting for building images for Etch."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/customization_packages.xml:177
-msgid "Installing additional packages"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:180
-msgid ""
-"&live-helper; has a number of mechanisms for indicating that additional "
-"packages should be installed, including:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:188 en/customization_packages.xml:213
-msgid "The <command>LH_PACKAGES</command> variable"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:194 en/customization_packages.xml:249
-msgid "Package lists"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><orderedlist><listitem><para>
-#: en/customization_packages.xml:200
-msgid "Local packages (<filename>chroot_local-packages/</filename>)"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:206 en/customization_packages.xml:381
-msgid "Tasks"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:216
-msgid ""
-"To install additional packages, simply add them to the <command>LH_PACKAGES</"
-"command> variable in <filename>config/chroot</filename>. For example:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/customization_packages.xml:222
-#, no-wrap
-msgid "LH_PACKAGES=\"package1 package2 package3 ... \""
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:226
-msgid "You can also specify initial values on the command line:"
-msgstr ""
-
-# type: Content of: <sect1><sect2><sect3><screen>
-#. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/customization_packages.xml:230
-#, fuzzy, no-wrap
-#| msgid ""
-#| "\n"
-#| "$ lh_config --packages \"package1 package2 package3\"\n"
-msgid "$ lh config --packages \"package1 package2 package3\""
-msgstr ""
-"\n"
-"$ lh_config --packages \"package1 package2 package3\"\n"
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:234
-msgid ""
-"The behaviour of &live-helper; when specifying a package that does not exist "
-"is determined by your choice of APT utility. See <xref linkend=\"package-"
-"installation\"/> for more details."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:240
-msgid ""
-"If you need to specify a large number of packages to be installed or you "
-"need flexibility regarding which packages to install, you should probably be "
-"using package lists. See <xref linkend=\"package-lists\"/> for more "
-"information."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:252
-msgid ""
-"Package lists are a powerful way of expressing which packages should be "
-"installed. &live-helper; ships with a number of predefined package lists "
-"which provide sensible default package selections for the GNOME and KDE "
-"desktop environments, as well as standard systems."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:259
-msgid ""
-"To specify a package list, add the name of the list to the "
-"<command>LH_PACKAGES_LISTS</command> variable in <filename>config/chroot</"
-"filename>. For example:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/customization_packages.xml:265
-#, no-wrap
-msgid "LH_PACKAGES_LISTS=\"gnome\""
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:269
-msgid ""
-"Package lists that are distributed with &live-helper; reside in the "
-"<command>/usr/share/live-helper/lists</command> directory."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><title>
-#: en/customization_packages.xml:274
-msgid "Local packages lists"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:277
-msgid ""
-"You may supplement the supplied lists using local package lists stored in "
-"<command>config/chroot_local-packageslists</command>."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:282
-msgid ""
-"Package lists that exist in this directory always override package lists "
-"distributed with &live-helper;. This can cause undesired effects when."
-msgstr ""
-
-# type: Content of: <chapter><section><title>
-#. type: Content of: <sect1><sect2><sect3><sect4><note><title>
-#: en/customization_packages.xml:288
-#, fuzzy
-#| msgid "&live-helper;"
-msgid "&live-helper; 2.x change"
-msgstr "&live-helper;"
-
-#. type: Content of: <sect1><sect2><sect3><sect4><note><para>
-#: en/customization_packages.xml:291
-msgid ""
-"Any file with <command>.list</command> suffix in <command>config/"
-"chroot_local-packageslists</command> is automatically enabled, the variable "
-"LH_PACKAGES_LISTS should only be used referencing packages lists included in "
-"live-helper (at <command>/usr/share/live-helper/lists/</command>."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><title>
-#: en/customization_packages.xml:303
-msgid "Extending a provided package list using includes"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/customization_packages.xml:310
-#, no-wrap
-msgid ""
-"#include &lt;gnome&gt;\n"
-"iceweasel"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:315
-msgid ""
-"The package lists that are included with &live-helper; make extensive use of "
-"includes. They are available to view in the <command>/usr/share/live-helper/"
-"lists</command> directory."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><title>
-#: en/customization_packages.xml:323
-msgid "Using conditionals inside packages lists"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/customization_packages.xml:330
-#, no-wrap
-msgid ""
-"#if ARCHITECTURE amd64\n"
-"ia32-libs\n"
-"#endif"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:336
-msgid ""
-"or if <command>LH_ARCHITECTURE</command> is set to <command>i386</command> "
-"or <command>amd64</command>:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/customization_packages.xml:341
-#, no-wrap
-msgid ""
-"#if ARCHITECTURE i386 amd64\n"
-"memtest86+\n"
-"#endif"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:347
-msgid ""
-"or if <command>LH_SECTIONS</command> contains either <command>contrib</"
-"command> or <command>non-free</command>:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/customization_packages.xml:352
-#, no-wrap
-msgid ""
-"#if SECTIONS contrib non-free\n"
-"vrms\n"
-"#endif"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:358
-msgid "A conditional may surround an <command>#include</command> directive:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/customization_packages.xml:362
-#, no-wrap
-msgid ""
-"#if ARCHITECTURE amd64\n"
-"#include &lt;gnome-full&gt;\n"
-"#endif"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:368
-msgid ""
-"Any &live-helper; configuration variable that begins with <command>LH_</"
-"command> can be tested in this way."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:373
-msgid "The nesting of conditionals is not supported."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><title>
-#: en/customization_packages.xml:392
-msgid "Installing modified or third-party packages"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:395
-msgid ""
-"Whilst it is against the philosophy of Debian Live, it may sometimes be "
-"necessary to build a Live system with modified versions of packages that are "
-"in the Debian repository. This may be to modify or support additional "
-"features, languages and branding, or even to remove elements of existing "
-"packages that are undesirable. Similarly, \"third-party\" packages may be "
-"used to add bespoke and/or proprietary functionality."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:404
-msgid ""
-"This section does not cover advice regarding building or maintaining "
-"modified packages. Joachim Breitner's <ulink url=\"http://www.joachim-"
-"breitner.de/blog/archives/282-How-to-fork-privately.html\" >'How to fork "
-"privately'</ulink> may be of interest, however. The creation of bespoke "
-"packages is covered in the <ulink url=\"http://www.debian.org/doc/maint-"
-"guide/\">Debian New Maintainers' Guide</ulink> and elsewhere."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:414
-msgid "There are two ways of installing modified custom packages:"
-msgstr ""
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <sect1><sect2><orderedlist><listitem><para>
-#: en/customization_packages.xml:421
-#, fuzzy
-#| msgid "<filename>live-package</filename>"
-msgid "<filename>chroot_local-packages</filename>"
-msgstr "<filename>live-package</filename>"
-
-#. type: Content of: <sect1><sect2><orderedlist><listitem><para>
-#: en/customization_packages.xml:427
-msgid "Using a custom APT repository"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:434
-msgid ""
-"The <filename>chroot_local-packages</filename> is simpler to achieve and "
-"useful for \"one-off\" customisations but has a number of drawbacks, whilst "
-"using a custom APT repository is more time-consuming to set up."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:441
-msgid ""
-"Using <filename>chroot_local-packages</filename> to install custom packages"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:446
-msgid ""
-"To install a custom package, simply copy it to the <command>config/"
-"chroot_local-packages</command> directory. Packages that are inside this "
-"directory will be automatically installed into the live system during build "
-"- you do not need to specify them elsewhere."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:453
-msgid ""
-"Packages <emphasis>must</emphasis> be named in the prescribed way. One "
-"simple way to do this is to use <command>dpkg-name</command>. FIXME"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:458
-msgid ""
-"Using <filename>chroot_local-packages</filename> for installation of custom "
-"packages has disadvantages:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/customization_packages.xml:466
-msgid "It is not possible to use secure APT"
-msgstr ""
-
-# type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/customization_packages.xml:472
-#, fuzzy
-#| msgid ""
-#| "You must install all appropriate packages in the <command>config/"
-#| "chroot_local-packages</command> directory"
-msgid ""
-"You must install all appropriate packages in the <command>config/"
-"chroot_local-packages</command> directory"
-msgstr ""
-"Il est nécessaire d'installer tous les paquets appropriés dans le répertoire "
-"<command>config/chroot_local-packages</command>"
-
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/customization_packages.xml:479
-msgid ""
-"It does not lend itself to storing Debian Live configurations in revision "
-"control"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:489
-msgid "Using an APT repository to install custom packages"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:496
-msgid ""
-"Unlike using <filename>chroot_local-packages</filename>, when using a custom "
-"APT repository you must ensure that you specify the packages elsewhere. See "
-"<xref linkend=\"lh-packages\"/> for details."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:502
-msgid ""
-"Whilst it may seem unnecessary effort to create an APT repository to install "
-"custom packages, the infrastructure can be easily re-used at a later date to "
-"offer updates of the modified packages."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:510
-msgid "Custom packages and APT"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:513
-msgid ""
-"&live-helper; uses APT to install all packages into the live system so will "
-"therefore inherit behaviours from this program. One relevant example is that "
-"(assuming a default configuration) given a package available in two "
-"different repositories with different version numbers, APT will elect to "
-"install the package with the higher version number."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:521
-msgid ""
-"Because of this, you may wish to increment the version number in your custom "
-"packages' <command>debian/changelog</command> files to ensure that your "
-"modified version is installed over one in the official Debian repositories. "
-"This may also be achieved by altering the live system's APT pinning "
-"preferences - see <xref linkend=\"apt-preferences\"/> for more information."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:532
-msgid "Altering APT preferences during Live system"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:539
-msgid ""
-"Whilst it may seem unnecessary effort to create an APT repository to install "
-"custom packages, the infrastructure can be easily re-used at a later date to "
-"offer updates of the modified package."
-msgstr ""
diff --git a/manual/po/fr/faq.xml.po b/manual/po/fr/faq.xml.po
deleted file mode 100644
index 35c03bd..0000000
--- a/manual/po/fr/faq.xml.po
+++ /dev/null
@@ -1,1629 +0,0 @@
-# French translations for Debconf package
-# Copyright (C) 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the Debconf package.
-# Automatically generated, 2008.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Debconf 8\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2009-02-27 13:12+0100\n"
-"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> "
-"<christophenagel at gmail.com>\n"
-"Language-Team: none\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. type: Content of: <chapter><section><section><para>
-#: en/about_manual.xml:298 en/about_manual.xml:308 en/about_manual.xml:318
-#: en/about_manual.xml:338 en/about_manual.xml:351 en/about_manual.xml:366
-#: en/about_manual.xml:379 en/about_manual.xml:389 en/basics.xml:113
-#: en/basics.xml:128 en/basics.xml:144 en/basics.xml:158 en/basics.xml:194
-#: en/basics.xml:220 en/basics.xml:230 en/basics.xml:239 en/basics.xml:253
-#: en/basics.xml:275 en/basics.xml:302 en/basics.xml:312 en/basics.xml:320
-#: en/basics.xml:354 en/basics.xml:364 en/basics.xml:382 en/basics.xml:429
-#: en/basics.xml:498 en/basics.xml:530 en/basics.xml:539 en/basics.xml:590
-#: en/basics.xml:646 en/customization_packages.xml:50
-#: en/customization_packages.xml:58 en/customization_packages.xml:71
-#: en/customization_packages.xml:80 en/customization_packages.xml:104
-#: en/customization_packages.xml:222 en/customization_packages.xml:230
-#: en/customization_packages.xml:265 en/customization_packages.xml:310
-#: en/customization_packages.xml:330 en/customization_packages.xml:341
-#: en/customization_packages.xml:352 en/customization_packages.xml:362
-#: en/faq.xml:64 en/faq.xml:241 en/faq.xml:244 en/faq.xml:252 en/faq.xml:256
-#: en/faq.xml:264 en/faq.xml:279 en/faq.xml:287 en/faq.xml:334 en/faq.xml:424
-#: en/faq.xml:430 en/faq.xml:481 en/faq.xml:483 en/faq.xml:487 en/faq.xml:491
-#: en/overview.xml:181 en/overview.xml:230 en/overview.xml:240
-msgid "<placeholder type=\"screen\" id=\"0\"/>"
-msgstr ""
-
-# type: Content of: <chapter><title>
-#. type: Content of: <chapter><title>
-#: en/faq.xml:7
-msgid "Frequently asked questions (FAQ)"
-msgstr "Questions frequemment posées (FAQ)"
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:12
-msgid "Q: I downloaded a prebuilt live image. How do I put it on a USB stick?"
-msgstr ""
-
-# type: Content of: <chapter><section><section><title>
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:13
-#, fuzzy
-#| msgid "Copying USB/HDD image to a USB stick"
-msgid ""
-"A: See <xref linkend=\"image_copying\" /> \"Copying USB/HDD image to a USB "
-"stick\""
-msgstr "Copier une image USB/HDD sur une clef USB"
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:17
-msgid "Q: How do I log my build?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:19
-#, no-wrap
-msgid "$ lh_build 2>&amp;1 | tee build.log"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:18
-msgid ""
-"A: You could use script, screen or tee: <placeholder type=\"screen\" id="
-"\"0\"/>"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:24
-msgid ""
-"Q: How can I convert an already installed standard Debian partition into a "
-"Debian Live system?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:25
-msgid ""
-"A: Save the list of installed packages and load it into your new Debian Live "
-"System. Copy your /etc to config/chroot_local-includes"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:29
-msgid ""
-"Q: What does 'losetup: could not find any free loop device' mean and how do "
-"I fix it?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:30
-msgid ""
-"A: Loop devices are used during the build; there probably aren't any free if "
-"you've aborted several builds. Something like: for l in /dev/loop* ; do "
-"losetup -d $l ; done should rectify the situation (assuming all loop devices "
-"in use were created by lh_build; if in doubt, check the contents of each "
-"loop device before deleting them with losetup -d)."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:34
-msgid "Q: How do I launch an interactive shell during the chroot stage?"
-msgstr ""
-
-# type: Content of: <chapter><section><screen>
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:36
-#, fuzzy, no-wrap
-#| msgid "$ lh_config -b usb-hdd"
-msgid "$ lh_config --interactive shell"
-msgstr "$ lh_config -b usb-hdd"
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:38
-#, no-wrap
-msgid "# logout"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:40
-#, no-wrap
-msgid "# exit"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:35
-msgid ""
-"A: To enable interactive shell: <placeholder type=\"screen\" id=\"0\"/> To "
-"continue the build process: <placeholder type=\"screen\" id=\"1\"/> or "
-"<placeholder type=\"screen\" id=\"2\"/> To disable interactive shell, set "
-"LH_INTERACTIVE to \"disabled\" in config/chroot."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:46
-msgid "Q: What is the root /user password?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:47
-#, no-wrap
-msgid " sudo -i "
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:47
-#, no-wrap
-msgid "sudo passwd"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:47
-msgid ""
-"A: The user password for the live user is 'live'. By default, there is not "
-"any root password. You can switch to root with <placeholder type=\"screen\" "
-"id=\"0\"/> or set a password for root with <placeholder type=\"screen\" id="
-"\"1\"/>"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:51
-msgid "Q: How do I change root or any user password?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:52
-msgid ""
-"A: Add a chroot local hook script to change root or any user password each "
-"time you build an image."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:53
-msgid ""
-"e.g. config/chroot_local-hooks/01-update_password.sh to set root password to "
-"\"nopasswd\""
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:55
-#, no-wrap
-msgid ""
-"#!/bin/sh\n"
-"echo \"I: update password\"\n"
-"echo \"root:nopasswd\" | chpasswd"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:58
-#, no-wrap
-msgid "$ chmod +x config/chroot_local-hooks/01-update_password.sh"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><note><screen>
-#: en/faq.xml:60
-#, no-wrap
-msgid ""
-"mkdir -p config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/\n"
-"cp /usr/share/initramfs-tools/scripts/live-bottom/10adduser config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:62
-#, no-wrap
-msgid " echo \"newlivepass\" | mkpasswd -s."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:55
-msgid ""
-"<placeholder type=\"screen\" id=\"0\"/> <placeholder type=\"screen\" id="
-"\"1\"/> <note>For live user; you need to copy the /usr/share/initramfs-tools/"
-"scripts/live-bottom/10adduser your build folder: <placeholder type=\"screen"
-"\" id=\"2\"/></note> Then edit the config/chroot_local-includes/usr/share/"
-"initramfs-tools/scripts/live-bottom/10adduser and paste in the new "
-"user_crypted password that you make with: <placeholder type=\"screen\" id="
-"\"3\"/>"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:63
-msgid ""
-"Or add an hook file in config/chroot_local-hooks/ with something like the "
-"below:"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:64
-#, no-wrap
-msgid ""
-" #!/bin/sh\n"
-"# Change the autogenerated user password to \"debianlive\"\n"
-"plain_password=\"debianlive\"\n"
-"password=$(echo \"${plain_password}\" | mkpasswd -s)\n"
-"sed -i -e 's/\\(user_crypted=\\)\\(.*\\)\\( #.*\\)/\\1\\\"'${password}'\\\"\\3/' /usr/share/initramfs-tools/scripts/live-bottom/10adduser\n"
-"update-initramfs -tu -kall"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:70
-msgid ""
-"The latter (hook model) could be more future proof than the former solution "
-"since it modifies just one string selectively but it requires the package "
-"\"whois\" to be installed on the target system (for mkpasswd) or that you "
-"generate the $password string not at build time and include it crypted in "
-"the above script."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:75
-msgid "Q: How to disable autologin?"
-msgstr ""
-
-# type: Content of: <chapter><section><para><screen>
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:77
-#, fuzzy, no-wrap
-#| msgid "lh_config --bootappend-live \"locale=sv_SE.utf8\""
-msgid "lh config --bootappend-live \"noautologin\""
-msgstr "lh_config --bootappend-live \"locale=sv_SE.utf8\""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:76
-msgid ""
-"A1: use the commandline parameter <placeholder type=\"screen\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:78
-msgid ""
-"A2: You need to set boot=noautologin noxautologin as described in man "
-"<filename>live-initramfs</filename> If you boot via TFTP you want to insert "
-"the option to pxelinux.cfg/default"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:83
-msgid "Q: How do I change default hostname or username?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:85
-#, no-wrap
-msgid ""
-"$ lh_config --hostname myhostname\n"
-"$ lh_config --username myusername"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:84
-msgid ""
-"A: To change default hostname or username: <placeholder type=\"screen\" id="
-"\"0\"/>"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:91
-msgid "Q: How do I make the final image smaller?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:92
-msgid ""
-"A: Clean orphaned apps/libs: Install package \"deborphan\" and then run "
-"'sudo deborphan -n' . Delete unwanted packages. Remove the apt cache. Purge "
-"unwanted locales (see \"localepurge\" package)."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:97
-msgid ""
-"Q: How do I customize bash-config permanently (aliases, bash-completion "
-"etc.)?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:98
-msgid "A: Add your own .bashrc config/chroot_local-includes/etc/skel/.bashrc"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:102
-msgid "Q: How do I disable services permanently? (Be careful!)"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:103
-msgid ""
-"A: Add a chroot local hook script to disable a service each time you build "
-"an image:"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:105
-#, no-wrap
-msgid ""
-"#!/bin/sh\n"
-"echo \"I: disable service\"\n"
-"update-rc.d -f   &#9001;service name &#9002; remove "
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:108
-#, no-wrap
-msgid " $ chmod +x config/chroot_local-hooks/01-disable_service.sh "
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:104
-msgid ""
-"e.g. config/chroot_local-hooks/01-disable_service.sh <placeholder type="
-"\"screen\" id=\"0\"/> <placeholder type=\"screen\" id=\"1\"/>"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:114
-#, no-wrap
-msgid "lh_config --checksums enabled|disabled "
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:113
-msgid ""
-"Q: How do I enable | disable the md5checksum at the ISO building? "
-"<placeholder type=\"screen\" id=\"0\"/> Or change the LH_CHECKSUMS value."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:121
-#, no-wrap
-msgid "lh_config --net-tarball none|gzip "
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:120
-msgid ""
-"Q: How to disable the generation of the .tar.gz file? <placeholder type="
-"\"screen\" id=\"0\"/> Or change the LH_NET_TARBALL value. (only available in "
-"snapsshot version at the moment 2008/Feb/28)"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:127
-msgid "Q: How do I \"build a new image\" ?"
-msgstr ""
-
-# type: Content of: <chapter><section><screen>
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:129
-#, fuzzy, no-wrap
-#| msgid "$ lh_clean --binary"
-msgid ""
-"$ sudo lh_clean --binary\n"
-"$ sudo lh_build "
-msgstr "$ lh_clean --binary"
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:128
-msgid ""
-"A: Run commands: <placeholder type=\"screen\" id=\"0\"/> <emphasis>Hint:</"
-"emphasis> If the configuration had changed you should leave \"--binary\" "
-"out. This will clean your chroot directory too."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:136
-msgid "Q: How do I use Fluxbox ?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:137
-msgid "A: Add a new lists file with the fluxbox packages you want."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:138
-msgid "Create /home/$USERNAME/.dmrc file (default username is \"user\")."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:139
-#, no-wrap
-msgid ""
-"$ cat .dmrc\n"
-"[Desktop]\n"
-"Session=fluxbox"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:139
-msgid ""
-"<placeholder type=\"screen\" id=\"0\"/> <note>.dmrc is owned by $USERNAME:"
-"$USERNAME. </note>"
-msgstr ""
-
-# type: Content of: <chapter><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:143
-#, fuzzy
-#| msgid "<ulink url=\"http://www.debian.org/\">Debian homepage</ulink>"
-msgid ""
-"See also <ulink url=\"http://wiki.debian.org/Fluxbox/\">http://wiki.debian."
-"org/Fluxbox</ulink>"
-msgstr "<ulink url=\"http://www.debian.org/\">Page de démarrage Debian</ulink>"
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:144
-msgid ""
-"A short HOWTO can be found here: <ulink url=\" http://wiki.debian.org/"
-"MichaelAblassmeier/CustomLiveCD\"> http://wiki.debian.org/MichaelAblassmeier/"
-"CustomLiveCD</ulink>"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:150
-msgid "Q: How do I use custom repositories?"
-msgstr ""
-
-# type: Content of: <chapter><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:151
-#, fuzzy
-#| msgid "<ulink url=\"http://www.debian.org/\">Debian homepage</ulink>"
-msgid ""
-"A: <ulink url=\"http://wiki.debian.org/DebianLive/Configuration\">See "
-"DebianLive/Configuration.</ulink>"
-msgstr "<ulink url=\"http://www.debian.org/\">Page de démarrage Debian</ulink>"
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:155
-msgid ""
-"Q: How do I customize the artwork for the live CD (grub or syslinux boot "
-"splash, usplash, etc.)?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:156
-msgid ""
-"A: <ulink url=\"http://wiki.debian.org/DebianLive/Howto/Custom_Artwork\"> "
-"See DebianLive/Howto/Custom_Artwork. </ulink> FIXME: NEED TO UPDATE"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:160
-msgid ""
-"Q: How do I customize desktop environment (KDE, GNOME, XFCE, etc...) look?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:161
-msgid "A: Start the live system in qemu:"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:162
-#, no-wrap
-msgid "$ qemu -m 256 -cdrom binary.iso -boot d -redir tcp:4222:10.0.2.15:22"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:162
-msgid ""
-"<placeholder type=\"screen\" id=\"0\"/> <note>the -redir argument must be "
-"changed to meet your needs </note>"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:168
-msgid ""
-"Q: How do I execute a custom shell script inside the chroot system after the "
-"chroot stage?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:169
-msgid "A: Add your script in config/chroot_local-hooks."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:173
-msgid ""
-"Q: How do I add a script running immediately after all other scripts when "
-"the live system boots?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:174
-msgid ""
-"A: Add your script in config/chroot_local-includes/usr/share/initramfs-tools/"
-"scripts/live-bottom/99script"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:175
-#, no-wrap
-msgid "$ chmod +x config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/99script"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:175
-msgid ""
-"<placeholder type=\"screen\" id=\"0\"/> <note>The hook script must be "
-"executable. Do not forget to lh_clean --chroot after making this change "
-"before you build again. </note>"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:177
-msgid ""
-"You must also use the example script /usr/share/live-helper/examples/hooks/"
-"update-initramfs.sh to ensure your script gets built into the initramfs "
-"(read the comment header for instructions)."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:182
-msgid "Q: How do I add software not in Debian ?"
-msgstr ""
-
-# type: Content of: <sect1><title>
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:183
-#, fuzzy
-#| msgid "Customising package installation"
-msgid "A: See <xref linkend=\"packages\" /> Customising package installation"
-msgstr "Installation personnalisée des paquets"
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:187
-msgid "Q: What is the manifest with Ubuntu used for?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:188
-msgid ""
-"A: Manifest is just the package list, which ubuntu does $something with. "
-"Don't worry about it."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:192
-msgid "Q: What is this {p} syntax with mtools{p} and parted{p} ?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:193
-msgid "A: That's aptitude."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:197
-msgid ""
-"Q: Do I need to write the image on USB stick to test it? <note>you must use "
-"qemu >= 0.8. </note>"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:203
-msgid "Q: What is /cow ?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:204
-msgid "A: Copy-on-write, the 'diff' from unionfs."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:208
-msgid ""
-"Q: Is /usr/share/live-helper/lists/standard-x11 like preseed or is preseed "
-"something else entirely?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:209
-msgid "A: It is not. It is a package list, not a debconf preseeding."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:213
-msgid "Q: What is the difference between standard and minimal?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:214
-msgid "standard: packages of priority standard and higher;"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:215
-msgid "minimal: packages of priority essential and higher;"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:220
-msgid "Q: What can the sections be used for? Aren't they BIG?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:221
-msgid "A: Someone maybe wants to include packages from contrib or non-free."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:225
-msgid "Q: memtest86+ ... is that used?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:226
-msgid "A: Yes"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:230
-msgid "Q: How do I build using predefined packages lists?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:231
-msgid "A: e.g. to build using standard-x11 packages list:"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:232
-#, no-wrap
-msgid ""
-"$ sudo lh_config -p standard-x11\n"
-"$ sudo lh_build"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:232
-msgid ""
-"<placeholder type=\"screen\" id=\"0\"/> <note>The packages lists can be "
-"found in /usr/share/live-helper/lists/ directory. </note>"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:239
-msgid "Q: How do I rebuild without downloading all the packages again?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:240
-msgid ""
-"A: All packages are cached in cache subdirectory. They remain until a clean "
-"purge:"
-msgstr ""
-
-# type: Content of: <chapter><section><screen>
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:241
-#, fuzzy, no-wrap
-#| msgid "$ lh_clean --binary"
-msgid "$ sudo lh_clean --purge"
-msgstr "$ lh_clean --binary"
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:242
-msgid ""
-"You do not have to do anything to prevent packages from being re-downloaded. "
-"You need to remember to clean whichever stages you want to rebuild first."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:243
-msgid ""
-"e.g. to rebuild from the cached bootstrap, chroot packages and build a new "
-"image."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:244
-#, no-wrap
-msgid ""
-"$ sudo lh_clean\n"
-"$ sudo lh_build"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:250
-msgid "Q: How do I boot USB debian-live on systems not supporting USB boot?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:251
-msgid ""
-"A: Make a boot CD with grub, configured to boot from a debian-live kernel "
-"copied on the cd structure."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:252
-#, no-wrap
-msgid ""
-"$ mkdir -p iso/boot/grub\n"
-"$ cp /usr/lib/grub/i386-pc/stage2_eltorito iso/boot/grub\n"
-"$ cp chroot/boot/* iso/boot/"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:255
-msgid "Create iso/boot/grub/menu.lst"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:256
-#, no-wrap
-msgid ""
-"default 0\n"
-"timeout 5\n"
-"color cyan/blue white/blue\n"
-"title Debian Live\n"
-"root (cd)\n"
-"kernel /boot/vmlinuz boot=live\n"
-"initrd /boot/initrd.img"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:263
-msgid "Create the iso image"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:264
-#, no-wrap
-msgid ""
-"$ mkisofs -R -b boot/grub/stage2_eltorito -no-emul-boot \\\n"
-"-boot-load-size 4 -boot-info-table -o grub.iso iso"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:266
-msgid "Burn the image."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:271
-msgid ""
-"Q: How do I boot debian-live on systems not supporting CDROM or USB boot?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:272
-msgid ""
-"A: If you have a floppy drive, you may be able to use it, otherwise you will "
-"need to use loadlin/grub4dos/win32-loader. If you have a second system to "
-"serve up the image over the network, <ulink url=\"DebianLive/Howto/"
-"Creating_a_Netboot_Image\"> See DebianLive/Howto/Creating_a_Netboot_Image. </"
-"ulink> FIXME LINK"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:277
-msgid ""
-"Q: The X configuration does not seems to work, the resolution is too low. "
-"What can I do?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:278
-msgid "A: Use xdebconfigurator"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:279
-#, no-wrap
-msgid ""
-"$ lh_config --bootappend xdebconf\n"
-"$ lh_config --packages xdebconfigurator"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:285
-msgid "Q: Apache has problems with static files"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:286
-msgid ""
-"A: Sendfile does not work well on the unionfs used by Debian Live. Add the "
-"following to apache's configuration:"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:287
-#, no-wrap
-msgid "EnableSendfile off"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:292
-msgid "Q: How do I make hard disk partitions auto-mountable?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:293
-msgid ""
-"<command>A: Short answer:</command> Right now the best is to use a script "
-"that will populate the fstab when the CD is booting. Such a script can be "
-"found <ulink url=\"https://devel.goto10.org/svn/puredyne/trunk/broth/stock/"
-"chroot_local-includes/sbin/diskmounter.sh\"> FIXME BROKEN LINK </ulink>. A "
-"proper solution based on HAL will be described here in a hopefully near "
-"future."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:294
-msgid ""
-"<command>A: Long Answer: </command> Since 55_nonpolkit-mount-policy.patch in "
-"HAL, debian-storage-policy-fixed-drives.fdi is not available anymore and the "
-"previous trick that consisted to remove this file to enable automounting of "
-"fixed drives as a consequence is obsolete."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:295
-msgid ""
-"Eventually, it will be possible to combine HAL and PolicyKit to enable "
-"different permissions and actions to achieve advanced (auto)mounting for non-"
-"root users. Until then, because the live scripts are only touching to the "
-"fstab to add a swap partition if discovered at boot time, the only way to "
-"have fixed drives mounted automatically is to use a script that will "
-"populate the fstab file at the end of the multiuser runlevel."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:296
-msgid "To achieve this, you can do, for example, the following:"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para><para>
-#: en/faq.xml:297
-msgid ""
-"download the <ulink url=\"https://devel.goto10.org/svn/puredyne/trunk/broth/"
-"stock/chroot_local-includes/sbin/diskmounter.sh\"> diskmounter.sh script "
-"FIXME BROKEN LINK </ulink>"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para><para>
-#: en/faq.xml:298
-msgid ""
-"Create the chroot_local-includes/sbin directory, and move the script inside"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para><para>
-#: en/faq.xml:299
-msgid "Make sure the script is executable (chmod +x diskmounter.sh)"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para><para>
-#: en/faq.xml:300
-msgid ""
-"create the chroot_local-includes/etc/rc.local file and call the diskmounter "
-"from there (see this <ulink url=\"https://devel.goto10.org/svn/puredyne/"
-"trunk/broth/stock/chroot_local-includes/etc/rc.local\"> rc.local FIXME "
-"BROKEN LINK </ulink>"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:302
-msgid ""
-"When called correctly, the script detects ext2, ext3, reiserfs, xfs, FAT32, "
-"HFS+ and NTFS partitions and mount them read-write, except for NTFS. This "
-"will change soon and an option will be available to use ntfs-3g to mount "
-"NTFS as read-write."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:303
-msgid ""
-"comments, patches and other things about this script and issue: http://code."
-"goto10.org/projects/puredyne/ticket/463"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:308
-msgid "Q: Boot fails with panic: can't open /scripts/live"
-msgstr ""
-
-# type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:309
-#, fuzzy
-#| msgid ""
-#| "You must install all appropriate packages in the <command>config/"
-#| "chroot_local-packages</command> directory"
-msgid ""
-"A: Add latest live-initramfs deb package into config/chroot_local-packages "
-"directory and rebuild."
-msgstr ""
-"Il est nécessaire d'installer tous les paquets appropriés dans le répertoire "
-"<command>config/chroot_local-packages</command>"
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:313
-msgid "Q: How do I configure the locale and the keyboard?"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:314
-#, fuzzy
-#| msgid "Set package manager. (See <xref linkend=\"package-installation\"/>)"
-msgid "A: See <xref linkend=\"internalization\" /> 10n"
-msgstr ""
-"Défini le gestionnaire de paquets. (Voir <xref linkend=\"package-installation"
-"\"/>)"
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:318
-msgid "Q: How do I get past boot prompt without a working keyboard?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:319
-msgid "A: See <xref linkend=\"bootup\" /> Customising the bootup process"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:324
-msgid "Q: Can I serve the root image from a web or ftp server?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:325
-msgid ""
-"A: Since live-initramfs 1.99, it should be possible to use the fetch= "
-"argument on the kernel command line. You can build a netboot image as usual, "
-"and when you are done edit the tftpboot/pxelinux.cfg/default file. Remove "
-"the references to network boot (netboot, nfsroot, nfsopts), and replace with "
-"fetch= &#9001;url where you placed the root image>."
-msgstr ""
-
-# type: Content of: <sect1><sect2><sect3><screen>
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:327
-#, fuzzy, no-wrap
-#| msgid ""
-#| "\n"
-#| "$ lh_config --packages \"package1 package2 package3\"\n"
-msgid "$ lh_config --packages wget"
-msgstr ""
-"\n"
-"$ lh_config --packages \"package1 package2 package3\"\n"
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:326
-msgid ""
-"<note>You have to include wget in the chroot. It could work for other boot "
-"methods as well. However, I am not sure the live scripts configure the "
-"network when booting from a CD or USB disk.</note> <placeholder type=\"screen"
-"\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:332
-msgid "Q: Why doesn't quickreboot (or some other boot parameter) work?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:333
-msgid ""
-"A: If you are building an etch image (which was the default up to "
-"2007/09/14) you have a very old version of casper which does not support "
-"quickreboot and possibly other boot parameters as well. You could configure "
-"your sources to use live-backports (see /usr/share/live-helper/examples/"
-"sources/live-backports) and switch to live-initramfs, or better yet, build a "
-"lenny image instead, which is the new default."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:334
-#, no-wrap
-msgid ""
-"$ lh_config --distribution lenny\n"
-"$ lh_config --initramfs live-initramfs"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:340
-msgid ""
-"Q: How do I fix \"Could not find kernel image\" issue with syslinux "
-"bootloader?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:341
-msgid ""
-"A: Add a binary local hook script to fix kernel and initrd path each time "
-"you build an image."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:343
-#, no-wrap
-msgid ""
-"#!/bin/sh\n"
-"SYSLINUXCFG=`find binary -type f -name syslinux.cfg`\n"
-"sed -i \"s|kernel /vmlinuz|kernel vmlinuz|g\" ${SYSLINUXCFG}\n"
-"sed -i \"s|initrd=/initrd|initrd=initrd|g\" ${SYSLINUXCFG}"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:347
-#, no-wrap
-msgid "$ chmod +x config/binary_local-hooks/01-fix_syslinux.sh"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:342
-msgid ""
-"e.g. config/binary_local-hooks/01-fix_syslinux.sh <placeholder type=\"screen"
-"\" id=\"0\"/> <placeholder type=\"screen\" id=\"1\"/>"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:352
-msgid "Q: How do I use a newer kernel with lenny?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:353
-msgid ""
-"A: A build with backports.org kernels will fail as that repository lacks the "
-"necessary module packages (linux-modules-extra-2.6, aufs, etc.). Use the "
-"kernel backports <ulink url=\"http://unsupported.debian-maintainers.org/"
-"backports-kernel/\"> http://unsupported.debian-maintainers.org/backports-"
-"kernel/. </ulink>"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:355
-#, no-wrap
-msgid ""
-"$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6 squashfs-modules-2.6'\n"
-"\n"
-"$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.chroot\n"
-"$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.binary\n"
-"\n"
-"$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.chroot.gpg\n"
-"$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.binary.gpg\n"
-"\n"
-"$ lh_build"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:354
-msgid "The quick way to success: <placeholder type=\"screen\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:368
-msgid "Q: How do I use a custom kernel?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:369
-msgid ""
-"&#9002; Is there a nice way of booting debian-live with a custom kernel (not "
-"in an apt repo)?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:370
-msgid ""
-"A: Copy it into config/chroot_local-packages and set LH_LINUX_PACKAGES=\"none"
-"\" or use lh config --linux-packages \" \""
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:371
-msgid ""
-"Don't forget to compile your kernel with an union filesystem (unionfs or "
-"aufs), squashfs modules, and initrd support."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:372
-msgid ""
-"&#9002; I can cause the kernel to be installed but it seems this happens "
-"later than grub/syslinux is configured so it's not listed and casper/ and "
-"the menu require munging."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:373
-msgid ""
-"You need to follow the debian scheme, e.g. placing the files in /boot as "
-"vmlinuz-$version and initrd.img-$version etc."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:374
-msgid ""
-"I personally wouldn't go that way which is too much of a hassle, and just "
-"use make-kpkg to produce custom kernel deb packages. They should integrate "
-"nicely if you just put them into config/chroot_local-packages and set "
-"LH_LINUX_PACKAGES=\"\"."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:375
-msgid ""
-"<emphasis>Hint:</emphasis> to work around an error, which lh_binary_syslinux "
-"will throw on custom kernels if there is not an 468/686 in the kernel-name, "
-"you need to set CONFIG_LOCALVERSION=\"-486\" or \"-686\" within the kernel "
-"configuration (-> General setup -> Local version set to -486 or -686) "
-"corresponding to LH_LINUX_FLAVOURS=\"\" or \"686\". this at least up till "
-"live-helper version 1.0~a40-1"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:376
-msgid "see"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:377
-msgid ""
-"<ulink url=\"http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-"
-"July/001947.html\"> http://lists.alioth.debian.org/pipermail/debian-live-"
-"devel/2007-July/001947.html</ulink>"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:377
-msgid "and"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:378
-msgid ""
-"<ulink url=\"http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-"
-"November/002581.html\">http://lists.alioth.debian.org/pipermail/debian-live-"
-"devel/2007-November/002581.html</ulink>"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:384
-msgid "Q: How do I create a cross arch live CD image?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:385
-msgid "<command>A: In short:</command> You can't. Read on:"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:386
-msgid ""
-"The procedure to create a live CD is based on creating a chroot that "
-"contains the files that will be finally available on the live CD. The live "
-"CD building procedure includes chrooting into the chroot dir and so some "
-"operations. chrooting means that the terminal you chroot on will behave as a "
-"different system so your real system and the chroot environment is decoupled "
-"somehow."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:387
-msgid ""
-"Once the live CD scripts chroots into the chroot dir they have some "
-"operations to do inside that environment and your real system won't be able "
-"to run them unless you are using the same architecture."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:388
-msgid ""
-"So you only are able to make live CD for the arch you run on. But this "
-"doesn't prevent you run qemu or some other machine emulator that make this "
-"possible."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:393
-msgid "Q: When is a lh_clean necessary?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:394
-msgid "lh_clean is a script in /usr/bin/"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:395
-msgid "A: That depends what you've changed between builds"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para><para>
-#: en/faq.xml:396
-msgid ""
-"If, for example, you've built an iso image and you want a usb image, you "
-"only need to run <command> lh_clean --binary </command> before you run "
-"lh_build again."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para><para>
-#: en/faq.xml:397
-msgid ""
-"If you've <command> changed anything in the chroot </command> , you'll need "
-"to cleanup both chroot and binary with <command> lh_clean </command>before "
-"continuing"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:403
-msgid "Q: How can i set boot= parameters?"
-msgstr ""
-
-# type: Content of: <appendix><section><variablelist><varlistentry><term>
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:404
-#, fuzzy
-#| msgid "LH_BOOTAPPEND_LIVE"
-msgid "A: Set LH_BOOTAPPEND_LIVE in config/binary"
-msgstr "LH_BOOTAPPEND_LIVE"
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:409
-msgid ""
-"Q: How do I include different modules to load when the live system boots?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:410
-msgid "A: Configure config/chroot_local-includes/etc/initramfs-tools/"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:411
-msgid ""
-"The lh_chroot_hacks helper rebuilds the live/initrd1.img using the default "
-"initramfs.conf \"MODULES = most\". You may override that by supplying your "
-"own initramfs.conf, or else just add your own modules, e.g."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:412
-#, no-wrap
-msgid ""
-"mkdir -p config/chroot_local-includes/etc/initramfs-tools/\n"
-"echo \"atl2\" >> config/chroot_local-includes/etc/initramfs-tools/modules"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:412
-msgid ""
-"<placeholder type=\"screen\" id=\"0\"/> <note>Even though initramfs.conf(5) "
-"says \"most adds all the framebuffer, acpi, file system, ide, sata, scsi and "
-"usb drivers\", it actually includes network drivers as well. See "
-"auto_add_modules() in /usr/share/initramfs-tools/hook-functions for the "
-"complete list. </note>"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:419
-msgid "Q: Can I have a splash screen?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:420
-msgid "A: Yes you can"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:421
-msgid ""
-"You will not know what is going on when the splash screen is active, it may "
-"fail to activate on some hardware or break X on other (both usplash and "
-"splashy use libdirectfb which does some evil voodoo and may break you "
-"graphics or input until you reboot). However, you can install and activate "
-"it just as you would on any other Debian system."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:422
-msgid "To use splashy:"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:423
-msgid ""
-"1) install splashy and read the README, the manpages are useless for setting "
-"it up. Add some parameters to your kernel command line, such as in your "
-"pxelinux configuration or in LH_BOOTAPPEND_LIVE in config/binary in debian-"
-"live configuration:"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:424
-#, no-wrap
-msgid "vga=792 splash quiet"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:425
-msgid ""
-"<filename>vga </filename>to select video mode, <filename>splash </"
-"filename>to activate splashy, <filename>quiet</filename> to suppress most "
-"kernel messages that you cannot see anyway but would scroll past before "
-"splashy manages to paint the graphics on your screen."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:427
-#, no-wrap
-msgid ""
-"echo splashy > config/chroot_local-packageslists/splashy\n"
-"echo splashy-themes >> config/chroot_local-packageslists/splashy"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:426
-msgid ""
-"You might want to add splashy to the list of packages installed in your "
-"image: <placeholder type=\"screen\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:429
-msgid "and select a theme:"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:430
-#, no-wrap
-msgid ""
-"echo '#!/bin/sh' > config/chroot_local-hooks/splashy\n"
-"echo splashy_config -s debian-moreblue '||' true >> config/chroot_local-hooks/splashy\n"
-"# update the ramdisk to include the splash screen\n"
-"echo update-initramfs -u -k all >> config/chroot_local-hooks/splashy\n"
-"chmod 755 config/chroot_local-hooks/splashy \t"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:435
-msgid ""
-"After you rebuild your live system you should observe a bluish splash screen "
-"while booting. Nothing happens while initramfs is running because there is "
-"no splashy support in initramfs-tools. Once the init starts the progress bar "
-"should start to fill."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:436
-msgid ""
-"If <filename> vga=something</filename> sets a mode that your screen cannot "
-"show or your card cannot do vesa 2.0 (and thus you get plain text mode and "
-"no splashy) read the splashy faq."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:441
-msgid "Q: Howto use my Broadcom eXtrem 2 network card (module bnx2) ?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:442
-msgid "A: Add the firmwares to the initrd image."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:443
-msgid ""
-"You need to install the non-free package \"firmware-bnx2\". Uncompress your "
-"initrd image, then copy files :"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:444
-#, no-wrap
-msgid ""
-"cp /lib/firmware/bnx2* ${INITRD}/lib/firmware/\n"
-"cp /lib/udev/firmware.agent ${INITRD}/lib/udev/"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:444
-msgid ""
-"<placeholder type=\"screen\" id=\"0\"/> Recompress your initrd image and "
-"boot: it works !"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:451
-msgid ""
-"Q: X is broken (the system boots, messages scroll by, and then the screen "
-"goes blank). What do I do?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:452
-msgid ""
-"On my system starting X completely disables graphics so that I do not see "
-"anything even after X bails out and I am back to the console. To prevent "
-"this you can change the driver Xorg uses."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:453
-msgid ""
-"If you have a working splash screen or at least graphical console you can use"
-msgstr ""
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:454
-#, fuzzy
-#| msgid "<filename>live-package</filename>"
-msgid "<filename>live xdriver=fbdev</filename>"
-msgstr "<filename>live-package</filename>"
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:455
-msgid "when booting the live system (instead of just enter)."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:456
-msgid "Another driver you might want to try is <filename> vesa. </filename>"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:457
-msgid ""
-"If all fails you might try to set xdriver to some wrong value so that Xorg "
-"fails to start and you can examine the system while you still see something "
-"on the console."
-msgstr ""
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:458
-#, fuzzy
-#| msgid "<filename>live-package</filename>"
-msgid "<filename>live xdriver=none</filename>"
-msgstr "<filename>live-package</filename>"
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:463
-msgid "Q: How can I get Debian first stable versions?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:464
-msgid ""
-"I'm developing software and testing it on Live-CD. Thanks for the LiveCD "
-"project. To be sure my development is fully compatible with the \"etch\" "
-"version, I need the same scenario when Debian GNU/Linux 4.0 was published as "
-"stable (I believe 2007.04.08). If there was some bug on 2007.04.08 that was "
-"corrected one week later, I need to test software foreseeing that scenario "
-"without the bug solved."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:468
-msgid ""
-"Q: I get \"fopen: Permission denied\"-warnings from apt on building/at the "
-"live-system"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:469
-msgid ""
-"That's a harmless bug in apt. However, if you want to get off this warnings "
-"in the live-system, add a file in chroot_local-hooks with follow row:"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><screen>
-#: en/faq.xml:470
-#, no-wrap
-msgid " chown -R man.man /var/cache/man "
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:474
-msgid ""
-"Q: Why I always fail during \"Retrieving Packages\" stage when running "
-"lh_build? I have already set apt-http-proxy and so on."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:475
-msgid ""
-"A: lh_build retrieves packages via wget, as a result you need to enable the "
-"proxy settings in /etc/wgetrc before running lh_build."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:479
-msgid "Q: How do I edit Xorg.conf?"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:480
-msgid ""
-"A: Xorg.conf is generated every time system boots, so it's useless to put "
-"modifed Xorg.conf in config/choort_local-includes/etc/X11, because it will "
-"be overwritten during boot. However, you can edit /usr/bin/dexconf, which "
-"generate xorg.conf during boot, so the result will be modified Xorg.conf. "
-"The modified dexconf has to be put in config/choort_local-includes/usr/bin. "
-"e.g.: you can configure Xorg.conf for two or more keyboards layouts with alt"
-"+shift toggle by editing dexconf and replacing the line:"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:481
-#, no-wrap
-msgid "Option          \"XkbLayout\"     \"$XKB_LAYOUT\""
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:482
-msgid "with the lines:"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:483
-#, no-wrap
-msgid ""
-"Option             \"XkbLayout\"     \"us,il\"\n"
-"Option             \"XkbOptions\"   \"grp:alt_shift_toggle,grp_led:scroll\""
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:485
-msgid "when \"us,il\" are the wanted keyboard layouts."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:486
-msgid ""
-"You can force default screen resulotion (e.g. 1024*768) by adding the "
-"lines: ."
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:487
-#, no-wrap
-msgid ""
-"  SubSection     \"Display\"\n"
-"               Modes  \"1024x768\"\n"
-"               EndSubSection"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:490
-msgid "between the lines:"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:491
-#, no-wrap
-msgid ""
-"  Section \"Screen\"\n"
-"        Identifier      \"Default Screen\"\n"
-"        Monitor         \"Configured Monitor\"\n"
-"            . . . . . . .\n"
-"SECTION\n"
-"printf \"EndSection\\n\" &#9002; &amp;4"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:501
-msgid "Q: Where are the build parameters for the prebuilt images"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:502
-msgid ""
-"A: See <ulink url=\"http://live.debian.net/README.images\">http://live."
-"debian.net/README.images.</ulink>"
-msgstr ""
diff --git a/manual/po/fr/index.html.in.po b/manual/po/fr/index.html.in.po
deleted file mode 100644
index 21b99b1..0000000
--- a/manual/po/fr/index.html.in.po
+++ /dev/null
@@ -1,180 +0,0 @@
-# French translations for Debconf package
-# Copyright (C) 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the Debconf package.
-# Automatically generated, 2008.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Debconf 8\n"
-"POT-Creation-Date: 2010-06-06 15:21+0300\n"
-"PO-Revision-Date: 2009-02-26 15:30+0100\n"
-"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> "
-"<christophenagel at gmail.com>\n"
-"Language-Team: none\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-# type: Content of: <book><bookinfo><copyright><holder>
-#. type: Content of: <html><head><title>
-#: en/index.html.in:8
-#, fuzzy
-#| msgid "The Debian Live Project"
-msgid "Debian Live Project"
-msgstr "Le projet Debian Live"
-
-# type: Content of: <html><body><h1>
-#. type: Content of: <html><body><h1>
-#: en/index.html.in:14
-#, fuzzy
-#| msgid "<a href=\"/\">Debian Live</a>"
-msgid "<a href=\"/\">Debian Live Project</a>"
-msgstr "<a href=\"/\">Debian Live</a>"
-
-# type: Content of: <html><body><h2>
-#. type: Content of: <html><body><h2>
-#: en/index.html.in:15
-msgid "<a href=\"/\">Live Debian systems!</a>"
-msgstr "<a href=\"/\">Live Debian systems!</a>"
-
-# type: Content of: <html><body><div><h2>
-#. type: Content of: <html><body><div><h2>
-#: en/index.html.in:19
-msgid "Live Manual"
-msgstr "Live Manuel"
-
-# type: Content of: <html><body><div><dl><dd><p>
-#. type: Content of: <html><body><div><dl><dd><p>
-#: en/index.html.in:25
-msgid "<i>This manual is under heavy construction.</i>"
-msgstr "<i>Ce manuel est en phase de construction intense.</i>"
-
-# type: Content of: <html><body><div><dl><dd><p>
-#. type: Content of: <html><body><div><dl><dd><p>
-#: en/index.html.in:29
-#, fuzzy
-#| msgid ""
-#| "Please report errors, omissions, patches and suggestions to our "
-#| "mailinglist at <a href=\"mailto:debian-live at lists.debian.org\">debian-"
-#| "live at lists.debian.org</a>."
-msgid ""
-"Please report errors, omissions, patches and suggestions to our mailinglist "
-"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/meta.html#contributing\">how to "
-"contribute</a> to the manual."
-msgstr ""
-"Svp, rapporter toutes les erreurs, les omissions, les patches et les "
-"suggestions à notre liste de diffusion à l'adresse <a href=\"mailto:debian-"
-"live at lists.debian.org\">debian-live at lists.debian.org</a>."
-
-# type: Content of: <html><body><div><dl><dt><h3>
-#. type: Content of: <html><body><div><dl><dt><h3>
-#: en/index.html.in:33
-msgid "Available Formats"
-msgstr "Formats Disponibles"
-
-# type: Content of: <html><body><div><dl><dd><ul><li>
-#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:37
-#, fuzzy
-#| msgid "&rsaquo; <b><a href=\"html/@LANG@/\">HTML</a></b>"
-msgid "&rsaquo; <b><a href=\"html/\">HTML</a></b>"
-msgstr "&rsaquo; <b><a href=\"html/@LANG@/\">HTML</a></b>"
-
-# type: Content of: <html><body><div><dl><dd><ul><li>
-#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:38
-#, fuzzy
-#| msgid "&rsaquo; <a href=\"txt/@LANG@/live-manual.txt\">Plain text</a>"
-msgid ""
-"&rsaquo; <a href=\"html-single/live-manual.html\">HTML (single page)</a>"
-msgstr "&rsaquo; <a href=\"txt/@LANG@/live-manual.txt\">Texte</a>"
-
-# type: Content of: <html><body><div><dl><dd><ul><li>
-#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:39
-#, fuzzy
-#| msgid "&rsaquo; <a href=\"pdf/@LANG@/live-manual.pdf\">PDF</a>"
-msgid "&rsaquo; <a href=\"pdf/live-manual.pdf\">PDF</a>"
-msgstr "&rsaquo; <a href=\"pdf/@LANG@/live-manual.pdf\">PDF</a>"
-
-# type: Content of: <html><body><div><dl><dd><ul><li>
-#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:40
-#, fuzzy
-#| msgid "&rsaquo; <a href=\"txt/@LANG@/live-manual.txt\">Plain text</a>"
-msgid "&rsaquo; <a href=\"txt/live-manual.txt\">Plain text</a>"
-msgstr "&rsaquo; <a href=\"txt/@LANG@/live-manual.txt\">Texte</a>"
-
-# type: Content of: <html><body><div><dl><dd><p>
-#. type: Content of: <html><body><div><dl><dd><p>
-#: en/index.html.in:44
-msgid "Last updated: @DATE@"
-msgstr "Last updated: @DATE@"
-
-# type: Content of: <html><body><div><dl><dt><h3>
-#. type: Content of: <html><body><div><dl><dt><h3>
-#: en/index.html.in:48
-msgid "Source"
-msgstr "Source"
-
-# type: Content of: <html><body><div><dl><dd><p>
-#. type: Content of: <html><body><div><dl><dd><p>
-#: en/index.html.in:52
-#, fuzzy
-#| msgid ""
-#| "The sources for this manual is available in a <a href=\"http://git.or.cz/"
-#| "\">git</a> repository at git.debian.org."
-msgid ""
-"The sources for this manual is available in a <a href=\"http://git.or.cz/"
-"\">git</a> repository at live.debian.net."
-msgstr ""
-"Les sources pour ce manuel sont disponibles dans dépot <a href=\"http://git."
-"or.cz/\">git</a> à git.debian.org."
-
-# type: Content of: <html><body><div><dl><dd><ul><li>
-#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:56
-#, fuzzy
-#| msgid ""
-#| "Browse: <a href=\"http://git.debian.org/?p=debian-live/live-manual.git"
-#| "\"><small><tt>http://git.debian.org/?p=debian-live/live-manual.git</tt></"
-#| "small></a>"
-msgid ""
-"Browse: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
-"\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
-"a>"
-msgstr ""
-"Parcourir:  <a href=\"http://git.debian.org/?p=debian-live/live-manual.git"
-"\"><small><tt>http://git.debian.org/?p=debian-live/live-manual.git</tt></"
-"small></a>"
-
-# type: Content of: <html><body><div><dl><dd><ul><li>
-#. type: Content of: <html><body><div><dl><dd><ul><li>
-#: en/index.html.in:57
-#, fuzzy
-#| msgid ""
-#| "Git: <a href=\"git://git.debian.org/git/debian-live/live-manual.git"
-#| "\"><small><tt>git://git.debian.org/git/debian-live/live-manual.git</tt></"
-#| "small></a>"
-msgid ""
-"Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
-"live.debian.net/git/live-manual.git</tt></small></a>"
-msgstr ""
-"Git: <a href=\"git://git.debian.org/git/debian-live/live-manual.git"
-"\"><small><tt>git://git.debian.org/git/debian-live/live-manual.git</tt></"
-"small></a>"
-
-# type: Content of: <html><body><div><p>
-#. type: Content of: <html><body><div><p>
-#: en/index.html.in:67
-msgid ""
-"<a href=\"http://live.debian.net/\">Debian Live</a> &lt;<a href=\"mailto:"
-"debian-live at lists.debian.org\">debian-live at lists.debian.org</a>&gt; - <a "
-"href=\"http://live.debian.net/legal.html\">Legal Notice</a>"
-msgstr ""
-"<a href=\"http://live.debian.net/\">Debian Live</a> &lt;<a href=\"mailto:"
-"debian-live at lists.debian.org\">debian-live at lists.debian.org</a>&gt; - <a "
-"href=\"http://live.debian.net/legal.html\">Notice Légale</a>"
diff --git a/manual/po/fr/internationalization.xml.po b/manual/po/fr/internationalization.xml.po
deleted file mode 100644
index d1d2145..0000000
--- a/manual/po/fr/internationalization.xml.po
+++ /dev/null
@@ -1,117 +0,0 @@
-# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2010-06-06 12:07+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-# type: Content of: <sect1><title>
-#. type: Content of: <sect1><title>
-#: en/chapters/customization/internationalization.xml:7
-#, fuzzy
-#| msgid "Customising the binary image"
-msgid "Customising Locale And Language"
-msgstr "Personnaliser l'image binaire"
-
-# type: Content of: <sect1><para>
-#. type: Content of: <sect1><para>
-#: en/chapters/customization/internationalization.xml:8
-#, fuzzy
-#| msgid ""
-#| "This chapter discusses the customisation of package installation. This "
-#| "involves:"
-msgid "This chapter discusses customisation for language specific parameters."
-msgstr ""
-"Ce chapitre décrit comment personnaliser l'installation des paquets. Cela "
-"implique :"
-
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/internationalization.xml:11
-msgid "Default locale and keyboard"
-msgstr ""
-
-# type: Content of: <chapter><section><para><screen>
-#. type: Content of: <sect1><sect2><para><screen>
-#: en/chapters/customization/internationalization.xml:17
-#, fuzzy, no-wrap
-#| msgid "lh_config --bootappend-live \"locale=sv_SE.utf8\""
-msgid "$ lh_config --bootappend-live \"locale=en_GB.UTF-8\"\n"
-msgstr "lh_config --bootappend-live \"locale=sv_SE.utf8\""
-
-# type: Content of: <chapter><section><para><screen>
-#. type: Content of: <sect1><sect2><para><screen>
-#: en/chapters/customization/internationalization.xml:21
-#, fuzzy, no-wrap
-#| msgid "lh_config --bootappend-live \"locale=sv_SE.utf8\""
-msgid "$ lh_config --bootappend-live \"keyb=uk\"\n"
-msgstr "lh_config --bootappend-live \"locale=sv_SE.utf8\""
-
-# type: Content of: <chapter><section><para><screen>
-#. type: Content of: <sect1><sect2><para><screen>
-#: en/chapters/customization/internationalization.xml:25
-#, fuzzy, no-wrap
-#| msgid "lh_config --bootappend-live \"locale=sv_SE.utf8 keyb=se\""
-msgid "$ lh_config --bootappend-live \"locale=en_GB.UTF-8 keyb=uk\"\n"
-msgstr "lh_config --bootappend-live \"locale=sv_SE.utf8 keyb=se\""
-
-# type: Content of: <chapter><section><para><screen>
-#. type: Content of: <sect1><sect2><para><screen>
-#: en/chapters/customization/internationalization.xml:29
-#, fuzzy, no-wrap
-#| msgid "lh_config --bootappend-live \"locale=sv_SE.utf8\""
-msgid "$ lh_config --bootappend-live \"locale=uk\"\n"
-msgstr "lh_config --bootappend-live \"locale=sv_SE.utf8\""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/internationalization.xml:14
-msgid ""
-"The default locale when building a live cd is \"locale=en_US.UTF-8\".  To "
-"set the locale for the UK (locale=en_GB.UTF-8)  <placeholder type=\"screen\" "
-"id=\"0\"/> The entry for a British keyboard would be <placeholder type="
-"\"screen\" id=\"1\"/> To configure both the locale and the keyboard for the "
-"UK the entry would be <placeholder type=\"screen\" id=\"2\"/> or "
-"<placeholder type=\"screen\" id=\"3\"/>"
-msgstr ""
-
-# type: Content of: <sect1><sect2><sect3><title>
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/internationalization.xml:37
-#, fuzzy
-#| msgid "Package lists"
-msgid "l10n Packages"
-msgstr "Les listes de paquets"
-
-# type: Content of: <chapter><section><screen>
-#. type: Content of: <sect1><sect2><para><screen>
-#: en/chapters/customization/internationalization.xml:42
-#, fuzzy, no-wrap
-#| msgid "$ lh_config -b usb-hdd"
-msgid "$ lh_config --language \"se\"\n"
-msgstr "$ lh_config -b usb-hdd"
-
-#. type: Content of: <sect1><sect2><para><screen>
-#: en/chapters/customization/internationalization.xml:46
-#, no-wrap
-msgid "  config/templates/syslinux/se\n"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/internationalization.xml:40
-msgid ""
-"lh build can automatically check for each package, for which it's know that "
-"there are -l10n packages available and install them. To add Swedish packages "
-"the entry would be <placeholder type=\"screen\" id=\"0\"/> This will also "
-"change the default syslinux language if <placeholder type=\"screen\" id="
-"\"1\"/> is available. Check syslinux configuration FIXME"
-msgstr ""
diff --git a/manual/po/fr/live-environment.xml.po b/manual/po/fr/live-environment.xml.po
deleted file mode 100644
index 5ab8786..0000000
--- a/manual/po/fr/live-environment.xml.po
+++ /dev/null
@@ -1,662 +0,0 @@
-# French translations for Debconf package
-# Copyright (C) 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the Debconf package.
-# Automatically generated, 2008.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Debconf 8\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2009-02-27 12:49+0100\n"
-"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> "
-"<christophenagel at gmail.com>\n"
-"Language-Team: none\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><para>
-#: en/about_manual.xml:125 en/customization_bootup.xml:11
-#: en/customization_bootup.xml:20 en/customization_bootup.xml:26
-#: en/customization_bootup.xml:38 en/customization_bootup.xml:85
-#: en/customization_bootup.xml:92 en/customization_bootup.xml:99
-#: en/customization_bootup.xml:106 en/customization_packages.xml:36
-#: en/customization_packages.xml:306 en/customization_packages.xml:326
-#: en/customization_packages.xml:384 en/customization_packages.xml:492
-#: en/customization_packages.xml:535 en/live-environment.xml:11
-#: en/resources.xml:11 en/success-stories.xml:11
-msgid "FIXME"
-msgstr "FIXME"
-
-# type: Content of: <chapter><title>
-#. type: Content of: <chapter><title>
-#: en/live-environment.xml:7
-msgid "The Live environment"
-msgstr "L'environnement Live"
-
-# type: Content of: <chapter><section><title>
-#. type: Content of: <chapter><section><title>
-#: en/live-environment.xml:10
-msgid "Swap space"
-msgstr "L'espace d'échange"
-
-# type: Content of: <chapter><section><title>
-#. type: Content of: <chapter><section><title>
-#: en/live-environment.xml:15
-msgid "Hostname"
-msgstr "Le nom d'hôte"
-
-# type: Content of: <chapter><section><para><screen>
-#. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:18
-#, fuzzy, no-wrap
-#| msgid "lh_config --bootappend-live \"locale=sv_SE.utf8\""
-msgid "lh_config --bootappend-live \"hostname=myhost\""
-msgstr "lh_config --bootappend-live \"locale=sv_SE.utf8\""
-
-#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:16
-msgid ""
-"The name of host running live system can be set with the <command>hostname</"
-"command> parameter into the <command>--bootappend-live</command> option of "
-"<filename>lh_config</filename>, e.g.: <placeholder type=\"screen\" id=\"0\"/"
-"> This parameter can also be used in kernel command line."
-msgstr ""
-
-# type: Content of: <chapter><section><title>
-#. type: Content of: <chapter><section><title>
-#: en/live-environment.xml:23
-msgid "The Live user"
-msgstr "L'utilisateur Live"
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:24
-msgid "Username FIXME."
-msgstr "Utilisateur A FAIRE"
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:25
-msgid ""
-"One important consideration is that the live user is created by &live-"
-"initramfs; during bootup, it is not created by &live-helper; when building "
-"the image."
-msgstr ""
-"Il faut prendre en considération que l'utilisateur live est créé par &live-"
-"initramfs; pendant le démarrage, il n'est pas créé par &live-helper; pendant "
-"la construction de l'image."
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:27
-msgid ""
-"You can specify additional groups that the live user will belong to by "
-"preseeding the <command>passwd/user-default-groups</command> debconf value. "
-"For example, to add the live user to the <command>fuse</command> group, add "
-"the following to a file in the <filename class=\"directory\">config/"
-"chroot_local-preseed</filename> directory:"
-msgstr ""
-"Vous pouvez spécifier des groupes supplémentaires auxquels l'utilisateur "
-"live appartiendra en configurant la valeur <command>passwd/user-default-"
-"groups</command> de debconf. Par exemple, pour ajouter l'utilisateur live au "
-"groupe <command>fuse</command> ajouter ce qui suit dans un fichier dans le "
-"répertoire <filename class=\"directory\">config/chroot_local-preseed</"
-"filename>:"
-
-# type: Content of: <chapter><section><screen>
-#. type: Content of: <chapter><section><screen>
-#: en/live-environment.xml:30
-#, fuzzy, no-wrap
-#| msgid ""
-#| "\n"
-#| " debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse\n"
-msgid " debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse\n"
-msgstr ""
-"\n"
-" debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse\n"
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:33
-msgid ""
-"For more information about debconf preseeding, please see <xref linkend="
-"\"debconf-preseed\"/>."
-msgstr ""
-"Pour plus d'informations sur la façon de configurer debconf, voir, svp, "
-"<xref linkend=\"debconf-preseed\"/>."
-
-# type: Content of: <chapter><section><title>
-#. type: Content of: <chapter><section><title>
-#: en/live-environment.xml:38
-msgid "Language"
-msgstr "Langue"
-
-#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:39
-msgid "When the live system boots, language is involved in three steps:"
-msgstr ""
-
-#. type: Content of: <chapter><section><para><itemizedlist><listitem><simpara>
-#: en/live-environment.xml:41
-msgid "the locale generation"
-msgstr ""
-
-#. type: Content of: <chapter><section><para><itemizedlist><listitem><simpara>
-#: en/live-environment.xml:42
-msgid "setting the keyboard layout for the console"
-msgstr ""
-
-#. type: Content of: <chapter><section><para><itemizedlist><listitem><simpara>
-#: en/live-environment.xml:43
-msgid "setting the keyboard layout for X"
-msgstr ""
-
-# type: Content of: <chapter><section><para><screen>
-#. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:48
-#, no-wrap
-msgid "lh_config --bootappend-live \"locale=sv_SE.utf8\""
-msgstr "lh_config --bootappend-live \"locale=sv_SE.utf8\""
-
-#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:46
-msgid ""
-"To define the locale that should be generated, use the <command>locale</"
-"command> parameter into the <command>--bootappend-live</command> option of "
-"<filename>lh_config</filename>, e.g.: <placeholder type=\"screen\" id=\"0\"/"
-"> This parameter can also be used in kernel command line. You can specify a "
-"locale by a two-letters code, or for better control, by a full "
-"<userinput><parameter>language</parameter>_<parameter>country</parameter>."
-"<parameter>encoding</parameter></userinput> word."
-msgstr ""
-
-# type: Content of: <chapter><section><para><screen>
-#. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:53
-#, fuzzy, no-wrap
-#| msgid ""
-#| "$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name\n"
-#| "\t&lt;name&gt;se&lt;name&gt;\n"
-msgid ""
-"$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name\n"
-"\t&lt;name&gt;se&lt;/name&gt;\n"
-msgstr ""
-"$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name\n"
-"\t&lt;name&gt;se&lt;name&gt;\n"
-
-# type: Content of: <chapter><section><para><screen>
-#. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:59
-#, no-wrap
-msgid "lh_config --bootappend-live \"locale=sv_SE.utf8 keyb=se\""
-msgstr "lh_config --bootappend-live \"locale=sv_SE.utf8 keyb=se\""
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:51
-#, fuzzy
-#| msgid ""
-#| "Both the console and X keyboard configuration depends on the "
-#| "<command>keyb</command> parameter of the <command>--bootappend-live</"
-#| "command>option. Valid options for X keyboard layouts can be found in "
-#| "<filename>/etc/X11/xkb/base.xml</filename>. To find the value (the two "
-#| "characters) corresponding to a language try searching for the english "
-#| "name of the nation where the language is spoken, e.g:"
-msgid ""
-"Both the console and X keyboard configuration depends on the <command>keyb</"
-"command> parameter of the <command>--bootappend-live</command> option. Valid "
-"options for X keyboard layouts can be found in <filename>/etc/X11/xkb/base."
-"xml</filename> (rather limited to two-letters country codes). To find the "
-"value (the two characters) corresponding to a language try searching for the "
-"english name of the nation where the language is spoken, e.g: <placeholder "
-"type=\"screen\" id=\"0\"/> To get the locale files for swedish generated and "
-"a swedish keyboard layout in X use: <placeholder type=\"screen\" id=\"1\"/>"
-msgstr ""
-"La configuration du clavier pour la console et pour X dépend du paramètre "
-"<command>keyb</command>de l'option <command>--bootappend-live</command>. Les "
-"options valides pour la langue du clavier pour X peuvent être consultées "
-"dans le fichier <filename>/etc/X11/xkb/base.xml</filename>. Pour trouver une "
-"valeur (les deux caractères) qui correspondent à une langue, essayer de "
-"chercher le nom anglais du pays où la langue est parlée, par exmple:"
-
-# type: Content of: <chapter><section><para><screen>
-#. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:64
-#, no-wrap
-msgid "for i in `find /usr/share/keymaps/ -iname \"*kmap.gz\"`; do basename $i | head -c -9; echo; done | sort | less "
-msgstr "for i in `find /usr/share/keymaps/ -iname \"*kmap.gz\"`; do basename $i | head -c -9; echo; done | sort | less "
-
-# type: Content of: <chapter><section><para><screen>
-#. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:68
-#, no-wrap
-msgid "lh_config --bootappend-live \"locale=sv_SE.utf8 keyb=se-latin1\""
-msgstr "lh_config --bootappend-live \"locale=sv_SE.utf8 keyb=se-latin1\""
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:63
-#, fuzzy
-#| msgid ""
-#| "A list of the valid values of the keyboards for the console can be "
-#| "figured with the following command:"
-msgid ""
-"A list of the valid values of the keyboards for the console can be figured "
-"with the following command: <placeholder type=\"screen\" id=\"0\"/> To make "
-"the console keyboard use a swedish layout use <placeholder type=\"screen\" "
-"id=\"1\"/>"
-msgstr ""
-"Une liste des valeurs valides pour le type de clavier pour la console peut "
-"être obtenue avec la commande suivante:"
-
-# type: Content of: <chapter><section><para><screen>
-#. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:73
-#, fuzzy, no-wrap
-#| msgid "lh_config --bootappend-live \"locale=sv_SE.utf8 keyb=se\""
-msgid ""
-"lh_config --bootappend-live \\\n"
-"  \"locale=fr_FR.UTF-8 klayout=fr kvariant=bepo kmodel=tm2030usb\""
-msgstr "lh_config --bootappend-live \"locale=sv_SE.utf8 keyb=se\""
-
-#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:72
-msgid ""
-"Alternatively, you can use the <literal>console-setup</literal> package, a "
-"tool to let you configure console layout using X (XKB) definitions; you can "
-"then setup your keyboard layout more precisely with <literal>klayout</"
-"literal>, <literal>kvariant</literal>, <literal>koptions</literal> and "
-"<literal>kmodel</literal> variables; <command>live-initramfs</command> will "
-"use also these parameters for X configuration. For example, to set up a "
-"french system with a french-dvorak layout (called Bépo) on a TypeMatrix "
-"keyboard, both in console and X11, use: <placeholder type=\"screen\" id="
-"\"0\"/> Note that on old versions of <literal>console-setup</literal> (i.e. "
-"Lenny's one), you'll need to setup also the <literal>keyb</literal> variable "
-"to the <literal>klayout</literal>'s value."
-msgstr ""
-
-# type: Content of: <chapter><section><title>
-#. type: Content of: <chapter><section><title>
-#: en/live-environment.xml:81
-msgid "Persistence"
-msgstr "Persistance"
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:82
-#, fuzzy
-#| msgid ""
-#| "A live cd paradigm is a preinstalled system which runs from a read-only "
-#| "media, like a cdrom, were writes and modifications does not survive "
-#| "reboots of the host hardware which runs it."
-msgid ""
-"A live cd paradigm is a preinstalled system which runs from read-only media, "
-"like a cdrom, where writes and modifications do not survive reboots of the "
-"host hardware which runs it."
-msgstr ""
-"Le paradigme du live cd, c'est un système préinstallé qui s'éxécute à partir "
-"d'une source en lecture seule, comme un cdrom, les écritures et les "
-"modfications ne survivent pas à un redémarrage du système hôte exécutant le "
-"système live."
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:83
-#, fuzzy
-#| msgid ""
-#| "A Debian Live system is a generalization of this paradigm and thus "
-#| "supports more media, and not only cds; but stills, in its default "
-#| "behaviour, it should be considered read only and all the runtime "
-#| "evolutions of the system are lost with a shutdown."
-msgid ""
-"A Debian Live system is a generalization of this paradigm and thus supports "
-"other media in addition to CDs; but still, in its default behaviour, it "
-"should be considered read-only and all the runtime evolutions of the system "
-"are lost at shutdown."
-msgstr ""
-"Un système Debian Live est une généralisation de ce paradigme et supporte "
-"plus de medias source, et pas seulement les cdroms; malgré tout, dans son "
-"comportement par défaut, il devrait être considéré comme étant en lecture "
-"seule et toutes les modifications faites pendant l'exécution sont perdues "
-"avec un arrêt."
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:85
-#, fuzzy
-#| msgid ""
-#| "Persistence is a common name for different kinds of solutions for saving "
-#| "across reboots some or all of this runtime evolution of the system; to "
-#| "undestand how it could work it could be handy to know that even if the "
-#| "system is booted and runt from a read only media, modification to the "
-#| "files and directories are wrote on a writable media , tipically a ram "
-#| "disk (tmpfs) and ram disk's data do not survive reboots."
-msgid ""
-"Persistence is a common name for different kinds of solutions for saving "
-"across reboots some, or all, of this runtime evolution of the system. To "
-"understand how it could work it could be handy to know that even if the "
-"system is booted and run from read-only media, modification to the files and "
-"directories are written on writable media, typically a ram disk (tmpfs) and "
-"ram disks' data do not survive reboots."
-msgstr ""
-"Persistence est un terme commun pour désigner diférents types de solutions "
-"pour sauvagarder, entre les redémarrages, tout ou une partie des "
-"modifications faites au système pendant son exécution; pour comprendre "
-"comment cela peut fonctionner, il faut savoir que même si le système "
-"s'exécute à partir d'un support en lecture seule, les modifications des "
-"fichiers et des répertoires durant l'exécution sont écrites sur un support "
-"accessible en lecture ecriture, habituellement une ram-disk (tmpfs) et les "
-"données d'une ram-disk ne survivent pas à un redémarrage."
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:86
-#, fuzzy
-#| msgid ""
-#| "The data stored on this ramdisk should be saved in a writable persistent "
-#| "media like on an Hard Disk, a USB key, a network \"share\" or even a "
-#| "session of a multisession (re)writable CD/DVD. All this cited media are "
-#| "supported in Debian Live in different ways, all but latest one requires a "
-#| "special boot parameter to be specified at boot: <command>persistent</"
-#| "command>."
-msgid ""
-"The data stored on this ramdisk should be saved on a writable persistent "
-"medium like a Hard Disk, a USB key, a network share or even a session of a "
-"multisession (re)writable CD/DVD. All these media are supported in Debian "
-"Live in different ways, and all but the last one require a special boot "
-"parameter to be specified at boot time: <command>persistent</command>."
-msgstr ""
-"Les données stockées sur cette ramdisk devraient être sauvegardées sur un "
-"support accessible en lecture et persistant comme un disque dur, une clef "
-"USB, un partage réseau ou même dans une session sur CD/DVD (re)inscriptible "
-"multi-session. Tous les supports précités sont disponibles pour Debian Live "
-"de différentes façons, toutes, sauf la dernière, requierent un paramètre de "
-"démarrage spécifique: <command>persistent</command>."
-
-# type: Content of: <chapter><section><section><title>
-#. type: Content of: <chapter><section><section><title>
-#: en/live-environment.xml:88
-msgid "Full persistence"
-msgstr "Persistence complète"
-
-# type: Content of: <chapter><section><section><para>
-#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:89
-#, fuzzy
-#| msgid ""
-#| "With \"full persistence\" it is meant that instead of using a tmpfs for "
-#| "storing modifications to the read-only media (with the copy-on-write, "
-#| "COW, system) a writable partition is used. In order to use this feature a "
-#| "partition with a clean writable supported filesystem on it labeled \"live-"
-#| "rw\" must be attached on the system at bootime and the system must be "
-#| "started with \"persistent\" boot parameter; this partition could be an "
-#| "ext2 partition on the hard disk or on a usb key created with, e.g.:"
-msgid ""
-"By 'full persistence' it is meant that instead of using a tmpfs for storing "
-"modifications to the read-only media (with the copy-on-write, COW, system) a "
-"writable partition is used. In order to use this feature a partition with a "
-"clean writable supported filesystem on it labeled \"live-rw\" must be "
-"attached on the system at bootime and the system must be started with the "
-"boot parameter 'persistent'. This partition could be an ext2 partition on "
-"the hard disk or on a usb key created with, e.g.:"
-msgstr ""
-"La \"persistence complète\" induit qu' au lieu d'utiliser un tmpfs pour "
-"stocker les modifications pour le support en lecture seule (avec le copy-on-"
-"write, COW system), una partitin est utilisée. Afin de pouvoir utiliser "
-"cette fonction, une partition nommée \"live-rw\" contenant système de "
-"fichiers propre et accessible en écriture doit être disponible sur le "
-"système au moment du démarrage et le système doit être démarrer avec "
-"l'option de démarrage \"persistent\"; cette partition peut être une "
-"partition ext2 sur le disque dur ou sur une clef USB créé comme suit:"
-
-# type: Content of: <chapter><section><section><screen>
-#. type: Content of: <chapter><section><section><screen>
-#: en/live-environment.xml:92
-#, fuzzy, no-wrap
-#| msgid ""
-#| "\n"
-#| "# mkfs.ext2 -L live-rw /dev/sdb1\n"
-msgid "# mkfs.ext2 -L live-rw /dev/sdb1\n"
-msgstr ""
-"\n"
-"# mkfs.ext2 -L live-rw /dev/sdb1\n"
-
-#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:95
-msgid ""
-"If you already have a partition on your device, you could just change the "
-"label with one of the following:"
-msgstr ""
-
-#. type: Content of: <chapter><section><section><screen>
-#: en/live-environment.xml:98
-#, no-wrap
-msgid ""
-"# tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
-"# dosfslabel /dev/sdb1 live-rw # for a fat filesystem\n"
-msgstr ""
-
-# type: Content of: <chapter><section><section><para>
-#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:102
-#, fuzzy
-#| msgid ""
-#| "But since live system users, not always can use an hard drive partition, "
-#| "maybe because they aren't allowed or they wan't to repartition a drive, "
-#| "and considering that most USB keys have laughables write speeds, \"full\" "
-#| "persistence could be also used with just image files, so you could create "
-#| "a file representing a partition and put this image file even on a NTFS "
-#| "partition of a foreign OS, with something like:"
-msgid ""
-"But since live system users cannot always use a hard drive partition, and "
-"considering that most USB keys have poor write speeds, 'full' persistence "
-"could be also used with just image files, so you could create a file "
-"representing a partition and put this image file even on a NTFS partition of "
-"a foreign OS, with something like:"
-msgstr ""
-"Mais, comme les utilisateurs du système live ne peuvent pas toujours "
-"utiliser une partition sur le disque dur, peut être parce qu'ils n'en ont "
-"pas le droit ou parce qu'ils ne veulent pas repartitionner le disque et en "
-"considérant que la plupart des clefs USB ont des vitesses d'écriture "
-"risibles, la persistence complète peut aussi être utilisé avec seulement des "
-"fichiers images, donc vous pouvez créer un fichier représentant un partition "
-"et mettre ce fichier image même sur une partition NTFS d'un système "
-"d'exploitation étranger avec quelque chose comme:"
-
-# type: Content of: <chapter><section><section><screen>
-#. type: Content of: <chapter><section><section><screen>
-#: en/live-environment.xml:105
-#, fuzzy, no-wrap
-#| msgid ""
-#| "\n"
-#| "$ dd if=/dev/null of=live-rw bs=1G seek=1\t# for a 1GB sized image file\n"
-#| "$ /sbin/mkfs.ext2 -F live-rw\n"
-msgid ""
-"$ dd if=/dev/null of=live-rw bs=1G seek=1\t# for a 1GB sized image file\n"
-"$ /sbin/mkfs.ext2 -F live-rw\n"
-msgstr ""
-"\n"
-"$ dd if=/dev/null of=live-rw bs=1G seek=1\t# for a 1GB sized image file\n"
-"$ /sbin/mkfs.ext2 -F live-rw\n"
-
-# type: Content of: <chapter><section><section><para>
-#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:109
-#, fuzzy
-#| msgid ""
-#| "Then copy the <command>live-rw</command> file in a writable partition and "
-#| "reboot with \"persistent\" boot parameter."
-msgid ""
-"Then copy the <command>live-rw</command> file to a writable partition and "
-"reboot with the boot parameter 'persistent'."
-msgstr ""
-"Après, copier le fichier <command>live-rw</command> sur une partition "
-"accessible en écriture et redémarrer avec l'option de démarrage \"persistent"
-"\""
-
-# type: Content of: <chapter><section><section><title>
-#. type: Content of: <chapter><section><section><title>
-#: en/live-environment.xml:112
-msgid "Home automounting"
-msgstr "Montage automatique de Home"
-
-# type: Content of: <chapter><section><section><para>
-#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:113
-#, fuzzy
-#| msgid ""
-#| "If during the boot a partition (filesystem) image file or a partition "
-#| "labeled <command>home-rw</command> will be discovered, this filesystem "
-#| "will be directly mounted as <command>/home</command>, thus permitting "
-#| "persistence of files that belong to the e.g. default user. It can be "
-#| "combined with full persistence."
-msgid ""
-"If during the boot a partition (filesystem) image file or a partition "
-"labeled <command>home-rw</command> is discovered, this filesystem will be "
-"directly mounted as <command>/home</command>, thus permitting persistence of "
-"files that belong to e.g. the default user. It can be combined with full "
-"persistence."
-msgstr ""
-"Si pendant le démarrage un fichier image de partition (système de fichiers) "
-"ou une partition nommée <command>home-rw</command> est découverte ce système "
-"de fichiers sera directement monté comme <command>/home</command>, et "
-"permettant ainsi la persistence de fichiers qui appartiennent par exemple à "
-"l'utilisateur par défaut. Ceci peut être combiné avec la persistence "
-"complète."
-
-# type: Content of: <chapter><section><section><title>
-#. type: Content of: <chapter><section><section><title>
-#: en/live-environment.xml:116
-msgid "Snapshots"
-msgstr "Snapshots"
-
-# type: Content of: <chapter><section><section><para>
-#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:117
-#, fuzzy
-#| msgid ""
-#| "Snapshots are collection of files and directories which are not mounted "
-#| "while running but which are copied from a persistent device to the system "
-#| "(tmpfs) at boot and which are resynced at reboot/shutdown of the system. "
-#| "The content of a snapshot could reside on a partition or an image file "
-#| "(like the above mentioned types) labeled <command>live-sn</command>, but "
-#| "it defaults to a simple cpio archive named <command>live-sn.cpio.gz</"
-#| "command>. As above at boot time, the block devices connected to the "
-#| "system are traversed to see if a partition or a file named like that "
-#| "could be found. A power interruption during runtime could lead to data "
-#| "lost hence a tool invoked <command>live-snapshot --refresh</command> "
-#| "could be called to sync important changes. This type of persistence since "
-#| "it does not write continuosly to the persistent media is the most flash-"
-#| "based device friendly and the fastest of all the persistence systems."
-msgid ""
-"Snapshots are collections of files and directories which are not mounted "
-"while running but which are copied from a persistent device to the system "
-"(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The "
-"content of a snapshot could reside on a partition or an image file (like the "
-"above mentioned types) labeled <command>live-sn</command>, but it defaults "
-"to a simple cpio archive named <command>live-sn.cpio.gz</command>. As above, "
-"at boot time, the block devices connected to the system are traversed to see "
-"if a partition or a file named like that could be found. A power "
-"interruption during runtime could lead to data loss, hence a tool invoked "
-"<command>live-snapshot --refresh</command> could be called to sync important "
-"changes. This type of persistence, since it does not write continuously to "
-"the persistent media, is the most flash-based device friendly and the "
-"fastest of all the persistence systems."
-msgstr ""
-"Les Snpashots sont une collection de fichiers et de répertoires qui ne sont "
-"pas montés pendant l'exécution du système mais qui sont copiés depuis un "
-"support persistant vers le système (tmpfs) pendant le démarrage et qui sont "
-"resynchronisés au redémarrage/arrêt du système. Le contenu d'un snapshot "
-"peut se situer sur une partition ou dans un fichier image (comme les types "
-"mentionnés plus haut) nommés <command>live-sn</command>, mais il fait par "
-"défaut une simple archive cpio nommée <command>live-sn.cpio.gz</command>. "
-"Comme précédemment, au démarrage, les périphériques de stockages connectés "
-"au système sont explorés à la recherche d'une partition ou d'un fichier de "
-"ce nom là.Une coupure d'alimentation pendant l'exécution peut conduire à une "
-"perte de données à moins que la commande <command>live-snapshot --refresh</"
-"command>puisse être appelée pour synchroniser les changements importants.Ce "
-"type de persistance, comme il n'écrit pas continuellement sur le media "
-"persistant est très interessant à utiliser pour les supports basés sur de la "
-"mémoire flash, c'est aussi le mode de persistance le plus rapide."
-
-# type: Content of: <chapter><section><section><para>
-#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:118
-msgid ""
-"A /home version of snapshot exists too and its label is <command>home-sn.*</"
-"command>; it works the same as the main snapshot but it is only applied to /"
-"home."
-msgstr ""
-"Un version /home des snapshots existe aussi et elle est nommée <command>home-"
-"sn.*</command>; elle fonctionne de la même façon que le snapshot principal "
-"mais elle s'applique seulement à /home"
-
-# type: Content of: <chapter><section><section><para>
-#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:119
-#, fuzzy
-#| msgid ""
-#| "All kind of snapshots cannot currently handle file deleting while full "
-#| "persistence and obviously home automounting could."
-msgid ""
-"Snapshots cannot currently handle file deletion but full persistence and "
-"home automounting can."
-msgstr ""
-"Toutes les formes de snapshots ne peuvent pas pour l'instant prendre en "
-"compte la suppression de fichiers alors que la persistence complète et "
-"évidemment le montage automatique du /home le peuvent."
-
-# type: Content of: <chapter><section><title>
-#. type: Content of: <chapter><section><section><title>
-#: en/live-environment.xml:122
-#, fuzzy
-#| msgid "Persistence"
-msgid "Persistent SubText"
-msgstr "Persistance"
-
-#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:123
-msgid ""
-"If a user would need multiple persistent storage of the same type for "
-"different locations or testing, such as <command>live-rw-nonwork</command> "
-"and <command>live-rw-work</command>, the boot parameter <command>persistent-"
-"subtext</command> used in conjuntion with the boot parameter "
-"<command>persistent</command> will allow for multiple but unique persistent "
-"media. An example would be if a user wanted to use a persistent partition "
-"labeled <command>live-sn-subText</command> they would use the boot "
-"parameters of: <command>persistent</command> <command>persistent-"
-"subtext=subText</command>."
-msgstr ""
-
-# type: Content of: <chapter><section><section><title>
-#. type: Content of: <chapter><section><section><title>
-#: en/live-environment.xml:126
-#, fuzzy
-#| msgid "Partial remasterings"
-msgid "Partial remastering"
-msgstr "Remastérisation partielle"
-
-# type: Content of: <chapter><section><section><para>
-#. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:127
-#, fuzzy
-#| msgid ""
-#| "The runtime modification of the tmpfs could be collected usign live-"
-#| "snapshot in a squashfs and added to the cd by remastering the iso in case "
-#| "of cd-r or adding a session to multisession cd/dvd(rw); live-initramfs "
-#| "mounts all /live filesystem in order or with the module bootparameter."
-msgid ""
-"The runtime modification of the tmpfs could be collected using live-snapshot "
-"in a squashfs and added to the cd by remastering the iso in the case of cd-r "
-"or adding a session to multisession cd/dvd(rw); live-initramfs mounts all /"
-"live filesystem in order or with the module bootparameter."
-msgstr ""
-"Les modifications faites pendant l'exécution peuvent être collectées en "
-"utilisant live-snapshot dans un squashfs et ajoutées au cd en remastérisant "
-"l'iso dans le cas de cd-r ou en ajoutant une session à un CD/DVD(rw) multi-"
-"session; live-initramfs monte tout les système de fichiers /live dans "
-"l'ordre ou avec le paramètre de démarrage module."
diff --git a/manual/po/fr/manual.xml.po b/manual/po/fr/manual.xml.po
deleted file mode 100644
index 40c1f4c..0000000
--- a/manual/po/fr/manual.xml.po
+++ /dev/null
@@ -1,618 +0,0 @@
-# French translations for PACKAGE package
-# Copyright (C) 2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# Automatically generated, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2009-02-27 10:34+0100\n"
-"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> "
-"<christophenagel at gmail.com>\n"
-"Language-Team: none\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/chapters/basics.xml:113 en/chapters/basics.xml:128
-#: en/chapters/basics.xml:144 en/chapters/basics.xml:158
-#: en/chapters/basics.xml:194 en/chapters/basics.xml:220
-#: en/chapters/basics.xml:230 en/chapters/basics.xml:239
-#: en/chapters/basics.xml:253 en/chapters/basics.xml:275
-#: en/chapters/basics.xml:302 en/chapters/basics.xml:312
-#: en/chapters/basics.xml:320 en/chapters/basics.xml:354
-#: en/chapters/basics.xml:364 en/chapters/basics.xml:382
-#: en/chapters/basics.xml:429 en/chapters/basics.xml:498
-#: en/chapters/basics.xml:530 en/chapters/basics.xml:539
-#: en/chapters/basics.xml:590 en/chapters/basics.xml:646
-#: en/chapters/faq.xml:64 en/chapters/faq.xml:241 en/chapters/faq.xml:244
-#: en/chapters/faq.xml:252 en/chapters/faq.xml:256 en/chapters/faq.xml:264
-#: en/chapters/faq.xml:279 en/chapters/faq.xml:287 en/chapters/faq.xml:334
-#: en/chapters/faq.xml:424 en/chapters/faq.xml:430 en/chapters/faq.xml:481
-#: en/chapters/faq.xml:483 en/chapters/faq.xml:487 en/chapters/faq.xml:491
-#: en/chapters/overview.xml:181 en/chapters/overview.xml:230
-#: en/chapters/overview.xml:240 en/chapters/about/manual.xml:298
-#: en/chapters/about/manual.xml:308 en/chapters/about/manual.xml:318
-#: en/chapters/about/manual.xml:338 en/chapters/about/manual.xml:351
-#: en/chapters/about/manual.xml:366 en/chapters/about/manual.xml:379
-#: en/chapters/about/manual.xml:389 en/chapters/customization/packages.xml:50
-#: en/chapters/customization/packages.xml:58
-#: en/chapters/customization/packages.xml:71
-#: en/chapters/customization/packages.xml:80
-#: en/chapters/customization/packages.xml:104
-#: en/chapters/customization/packages.xml:222
-#: en/chapters/customization/packages.xml:230
-#: en/chapters/customization/packages.xml:265
-#: en/chapters/customization/packages.xml:310
-#: en/chapters/customization/packages.xml:330
-#: en/chapters/customization/packages.xml:341
-#: en/chapters/customization/packages.xml:352
-#: en/chapters/customization/packages.xml:362
-msgid "<placeholder type=\"screen\" id=\"0\"/>"
-msgstr ""
-
-# #-#-#-#-#  installation.xml.po (Debconf 8)  #-#-#-#-#
-# #-#-#-#-#  installation.xml.po (Debconf 8)  #-#-#-#-#
-# type: Content of: <chapter><section><variablelist><varlistentry><term>
-# #-#-#-#-#  manual.xml.po (PACKAGE VERSION)  #-#-#-#-#
-# type: Content of: <chapter><section><title>
-# #-#-#-#-#  manual.xml.po (PACKAGE VERSION)  #-#-#-#-#
-# type: Content of: <chapter><section><title>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/installation.xml:76 en/chapters/about/manual.xml:90
-msgid "&live-initramfs;"
-msgstr "&live-initramfs;"
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/live-environment.xml:11 en/chapters/resources.xml:11
-#: en/chapters/success-stories.xml:11 en/chapters/about/manual.xml:125
-#: en/chapters/customization/bootup.xml:11
-#: en/chapters/customization/bootup.xml:20
-#: en/chapters/customization/bootup.xml:26
-#: en/chapters/customization/bootup.xml:38
-#: en/chapters/customization/bootup.xml:85
-#: en/chapters/customization/bootup.xml:92
-#: en/chapters/customization/bootup.xml:99
-#: en/chapters/customization/bootup.xml:106
-#: en/chapters/customization/packages.xml:36
-#: en/chapters/customization/packages.xml:306
-#: en/chapters/customization/packages.xml:326
-#: en/chapters/customization/packages.xml:384
-#: en/chapters/customization/packages.xml:492
-#: en/chapters/customization/packages.xml:535
-msgid "FIXME"
-msgstr "FIXME"
-
-# type: Content of: <chapter><section><title>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/overview.xml:17 en/chapters/about/manual.xml:80
-msgid "&live-helper;"
-msgstr "&live-helper;"
-
-# type: Content of: <sect1><title>
-#. type: Content of: <sect1><title>
-#: en/chapters/about/manual.xml:9
-msgid "About this manual"
-msgstr "A propos de ce manuel"
-
-# type: Content of: <sect1><para>
-#. type: Content of: <sect1><para>
-#: en/chapters/about/manual.xml:12
-msgid ""
-"The main goal of this manual is to serve as a single access point to all "
-"documentation related to the Debian Live project. It does not include end-"
-"user documentation for using a Debian Live system."
-msgstr ""
-"Le but principal de ce manuel est de servir de seul point d'entrée pour "
-"toute la documentation relative au projet Debian Live. Il n'inclut pas la "
-"documentation utilisateur final pour utiliser un système Debian Live."
-
-# type: Content of: <sect1><para>
-#. type: Content of: <sect1><para>
-#: en/chapters/about/manual.xml:18
-msgid ""
-"Some of the commands mentioned in the text must be executed with superuser "
-"privileges which can be obtained by becoming the root user via <filename>su</"
-"filename> or by using <filename>sudo</filename>. To distinguish between "
-"commands which may be executed by an unprivileged user and those requiring "
-"superuser privileges, commands are prepended by <command>$</command> or "
-"<command>#</command> respectively. This symbol is not a part of the command."
-msgstr ""
-"Quelques unes des commandes mentionnées dans le texte doivent être exécutées "
-"avec lesprivilèges du super-utilisateur, soit en devenant le root ou en "
-"utilisant <filename>sudo</filename> Pour distinguer entre les commandes qui "
-"doivent être exécutés par un utilisateur non priviligié et celles qui "
-"nécessitent les droits super-utilisateurs, les commandes sont préfixées par "
-"<computeroutput>$</computeroutput> ou <computeroutput>#</"
-"computeroutput>respectivement. Ce symbole ne fait pas parti de la commande."
-
-# type: Content of: <sect1><sect2><title>
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/about/manual.xml:28
-msgid "Terms"
-msgstr "Définitions"
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:33
-msgid "Live system"
-msgstr "Système Live"
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:37
-#, fuzzy
-#| msgid ""
-#| "An operating system that can boot without installation to a hard drive. "
-#| "Live systems do not alter local operating system(s) or file(s) already "
-#| "installed on the computer hard drive unless instructed to do so. Live "
-#| "systems are typically booted from media such as CDs or DVDs, some may "
-#| "also boot with USB sticks or over the network (via netboot images)."
-msgid ""
-"An operating system that can boot without installation to a hard drive.  "
-"Live systems do not alter local operating system(s) or file(s) already "
-"installed on the computer hard drive unless instructed to do so. Live "
-"systems are typically booted from media such as CDs or DVDs, some may also "
-"boot with USB sticks or over the network (via netboot images)."
-msgstr ""
-"Un système d'exploitatioin qui peut démarrer sans installation sur un disque "
-"dur.Un système live ne modifie pas les systèmes d'exploitation ou les "
-"fichiers précédemment installés sur le disque dur de l'ordinateur à moins de "
-"lui demander de la faire. Les systèmes live démarrent le plus souvent depuis "
-"un CD ou un DVD mais aussi depuis une clef USB et depuis le reséau."
-
-# type: Content of: <html><head><title>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:47
-msgid "Debian Live"
-msgstr "Debian Live"
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:51
-msgid ""
-"The Debian sub-project which maintains the &live-helper; and &live-"
-"initramfs; utilities."
-msgstr ""
-"Le sous projet Debian qui maintient les utilitaires &live-helper; et &live-"
-"initramfs;"
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:58
-msgid "Debian Live system"
-msgstr "Système Debian Live"
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:62
-msgid ""
-"A live system that uses software from the Debian operating system that may "
-"be booted from CDs, DVDs, USB sticks, over the network (via netboot images), "
-"and over the internet (via boot parameter fetch=URL)"
-msgstr ""
-"Un système Debian Live est un système live qui utilise des logiciels du "
-"système d'exploitation Debian"
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:70
-msgid "Build system / host system"
-msgstr "Système de construction / système hôte"
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:74
-msgid "The environment used to create the live system."
-msgstr "L'environnement utilisé pour crée le système live."
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:84
-msgid "A collection of scripts used to build customised Debian Live systems."
-msgstr ""
-"Une collection de scripts utilisés pour construire des systèmes Debian Live "
-"personnalisés."
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:94
-msgid ""
-"A collection of scripts used to boot live systems. &live-initramfs; is a "
-"fork of <filename>casper</filename> by Canonical, Ltd."
-msgstr ""
-"Une collection de scripts utilisés pour démarrer un système live. &live-"
-"initramfs; est un fork de <filename>casper</filename> par Canonical, Ltd."
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:101
-msgid "<filename>live-package</filename>"
-msgstr "<filename>live-package</filename>"
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:105
-msgid "The former name of &live-helper;."
-msgstr "L'ancien nom de &live-initramfs;."
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:111
-msgid "Debian Installer / (d-i)"
-msgstr "Installeur Debian / (d-i)"
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:115
-msgid "The official installation system for the Debian distribution."
-msgstr ""
-
-# type: Content of: <sect1><sect2><title>
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/about/manual.xml:121 en/chapters/customization/bootup.xml:104
-msgid "Cheat codes"
-msgstr "Codes de triche"
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:131
-msgid "chroot"
-msgstr "chroot"
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:135
-msgid ""
-"The chroot program, chroot(8), enables us to run different instances of the "
-"GNU/Linux environment on a single system simultaneously without rebooting."
-msgstr ""
-"Le programme, chroot(8), permet d'exécuter différentes instances du système "
-"GNU/Linux simultanement sur une seule machine sans redémarrage."
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:143
-msgid "binary image"
-msgstr "image binaire"
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:147
-msgid ""
-"On a live system, binary image refers to the binary filesystem and the "
-"respective extension, such as binary.iso or binary.img."
-msgstr ""
-"Sur un système live, l'image binaire fait référence au système de fichiers "
-"binaire ainsi qu'à son extension, comme binary.iso ou binary.img."
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:154
-msgid "Target distribution"
-msgstr "Distribution cible"
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:158
-msgid ""
-"The distribution upon which your live system will be based. This can differ "
-"from the distribution of your Build System."
-msgstr ""
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/about/manual.xml:165
-msgid "&lenny;/&squeeze;/&sid; stable/testing/unstable"
-msgstr "etch/lenny/sid stable/testing/unstable"
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:169
-#, fuzzy
-#| msgid ""
-#| "The \"stable\" distribution contains the latest officially released "
-#| "distribution of Debian. The \"testing\" distribution is the staging area "
-#| "for the next stable release a - the main advantage of using this "
-#| "distribution is that it has more recent versions of software relative to "
-#| "the \"stable\" release.. The \"unstable\" distribution is where active "
-#| "development of Debian occurs. Generally, this distribution is run by "
-#| "developers and those who like to live on the edge."
-msgid ""
-"The \"stable\" distribution contains the latest officially released "
-"distribution of Debian. The \"testing\" distribution is the staging area for "
-"the next stable release. A major advantage of using this distribution is "
-"that it has more recent versions of software relative to the \"stable\" "
-"release. The \"unstable\" distribution is where active development of Debian "
-"occurs. Generally, this distribution is run by developers and those who like "
-"to live on the edge."
-msgstr ""
-"La distribution \"stable\" contient la dernière version offcielle de Debian. "
-"La distributioin \"testing\" désigne la prochaine version stable -le "
-"principal interêt de cette distribution est de posséder des versions de "
-"logiciels plus récentes que ceux de la version stable. La distributin "
-"\"unstable\" désigne la distribution où se fait activement le développement "
-"de Debian. Généralement, cette distribution est utilisée par les "
-"développeurs et par ceux qui aiment vivre sur sur le fil."
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/about/manual.xml:179
-msgid ""
-"At the time of writing, &lenny; is the current \"stable\" release and "
-"&squeeze; is the current \"testing\" release. &sid; will always be a synonym "
-"for the \"unstable\" release."
-msgstr ""
-"Au moment de l'écriture de ce document, &lenny; est la version stable "
-"courante et &squeeze; est la version \"testing\" courante. &sid; sera "
-"toujours un synonyme pour la version \"unstable\"."
-
-# type: Content of: <sect1><sect2><title>
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/about/manual.xml:191
-msgid "Authors"
-msgstr "Auteurs"
-
-# type: Content of: <sect1><sect2><para>
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/about/manual.xml:194
-msgid "A list of authors (in alphabetical order):"
-msgstr "Une liste des auteurs (par ordre alphabétique):"
-
-# type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:201
-msgid "Ben Armstrong"
-msgstr "Ben Armstrong"
-
-# type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:207
-msgid "Brendan Sleight"
-msgstr "Brendan Sleight"
-
-# type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:213
-msgid "Chris Lamb"
-msgstr "Chris Lamb"
-
-# type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:219
-msgid "Daniel Baumann"
-msgstr "Daniel Baumann"
-
-# type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:225
-msgid "Franklin Piat"
-msgstr "Franklin Piat"
-
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:231
-msgid "Jonas Stein"
-msgstr ""
-
-# type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:237
-msgid "Kai Hendry"
-msgstr "Kai Hendry"
-
-# type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:243
-msgid "Marco Amadori"
-msgstr "Marco Amadori"
-
-# type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:249
-msgid "Mathieu Geli"
-msgstr "Mathieu Geli"
-
-# type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:255
-msgid "Matthias Kirschner"
-msgstr "Matthias Kirschner"
-
-# type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:261
-msgid "Richard Nelson"
-msgstr "Richard Nelson"
-
-# type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:267
-msgid "Trent W. Buck"
-msgstr "Trent W. Buck"
-
-# type: Content of: <sect1><sect2><title>
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/about/manual.xml:276
-msgid "Contributing to this document"
-msgstr "Contribuer à ce document"
-
-# type: Content of: <sect1><sect2><para>
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/about/manual.xml:279
-#, fuzzy
-#| msgid ""
-#| "This manual is intended as a community project and all proposals for "
-#| "improvements and contributions are extremely welcome. The preferred way "
-#| "to submit a contribution is to send it to the mailing list. Please see "
-#| "<xref linkend=\"contact\"/> for more information."
-msgid ""
-"This manual is intended as a community project and all proposals for "
-"improvements and contributions are extremely welcome. The preferred way to "
-"submit a contribution is to send it to the mailing list. Please see <xref "
-"linkend=\"contact\" /> for more information."
-msgstr ""
-"Ce manuel a vocation à être un projet communautaire et toutes les "
-"propositions pour son amélioration et toutes les contibutions sont "
-"extrèmement bienvenues. Le moyen privilégié pour soumettre une contribution "
-"est de l'envoyer à la liste de diffusion. Voir svp <xref linkend=\"contact\"/"
-"> pour plus d'informations."
-
-# type: Content of: <sect1><sect2><para>
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/about/manual.xml:286
-msgid ""
-"When submitting a contribution please clearly identify its copyright holder "
-"and include the licensing statement. Note that to be accepted the "
-"contribution must be licensed under the same license as the rest of the "
-"document, namely GPL version 3 or later."
-msgstr ""
-"Quand vous soumettez une contribution, identifier clairement.le détenteur du "
-"copyright et inclure le paragraphe de licence. Noter que pour être accepté, "
-"la contribution doit être sous la même licence que le reste du document, a "
-"savoir GPL version 3 ou supérieure."
-
-# type: Content of: <sect1><sect2><para>
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/about/manual.xml:293
-msgid ""
-"The sources for this manual are maintained using the Git version control "
-"system. You can checkout the latest copy by executing:"
-msgstr ""
-"Les sources de ce manuel sont maintenues via le système de contrôle de "
-"version Git. Vous pouvez obtenir la dernière copie en exécutant:"
-
-# type: Content of: <sect1><sect2><screen>
-#. type: Content of: <sect1><sect2><para><screen>
-#: en/chapters/about/manual.xml:298
-#, fuzzy, no-wrap
-#| msgid "$ git clone git://git.debian.org/git/debian-live/live-manual.git"
-msgid "$ git clone git://live.debian.net/git/live-manual.git"
-msgstr "$ git clone git://git.debian.org/git/debian-live/live-manual.git"
-
-# type: Content of: <sect1><sect2><para>
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/about/manual.xml:302
-msgid ""
-"Prior to submission of your contribution, please preview your work. To "
-"preview the live-manual, ensure the packages needed for building are "
-"installed by executing:"
-msgstr ""
-"Avant de soumettre votre contribution, reliser, svp, votre travail. Pour "
-"avoir un aperçu du manuel live, assurez-vous que les paquets suivants sont "
-"installés sur votre système en exécutant:"
-
-# type: Content of: <sect1><sect2><screen>
-#. type: Content of: <sect1><sect2><para><screen>
-#: en/chapters/about/manual.xml:308
-#, fuzzy, no-wrap
-#| msgid "# apt-get install dblatex docbook-xml docbook-xsl make po4a w3m"
-msgid ""
-"# apt-get install dblatex docbook-xml docbook-xsl make po4a\n"
-"\tw3m"
-msgstr "# apt-get install dblatex docbook-xml docbook-xsl make po4a w3m"
-
-# type: Content of: <sect1><sect2><para>
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/about/manual.xml:313
-msgid ""
-"You may build the live-manual from the top level directory of your git "
-"checkout by executing:"
-msgstr ""
-"Vous devriez pouvoir construire le manuel depuis le répertoire racine de "
-"votre copie locale du git en exécutant:"
-
-# type: Content of: <sect1><sect2><screen>
-#. type: Content of: <sect1><sect2><para><screen>
-#: en/chapters/about/manual.xml:318
-#, no-wrap
-msgid "$ make build"
-msgstr "$ make build"
-
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/about/manual.xml:322
-msgid "Applying patches"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/about/manual.xml:325
-msgid ""
-"Directly commiting to the repository is possible by anyone. However, we ask "
-"you to send bigger changes to the mailinglist to discuss them first.  In "
-"order to push to the repository, the following steps are required."
-msgstr ""
-
-# type: Content of: <chapter><section><section><orderedlist><listitem><para>
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:334
-#, fuzzy
-#| msgid "Fetcht the archive signing key:"
-msgid "Fetch the public commit key:"
-msgstr "Récuperer le fichier de signature du dépot:"
-
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/chapters/about/manual.xml:338
-#, no-wrap
-msgid ""
-"$ mkdir -p ~/.ssh/identity.d\n"
-"$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live -O ~/.ssh/identity.d/live-manual at debian-live\n"
-"$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub -O ~/.ssh/identity.d/live-manual at debian-live.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:347
-msgid "Add the following section to your openssh-client config:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/chapters/about/manual.xml:351
-#, no-wrap
-msgid ""
-" $ cat &gt;&gt; ~/.ssh/config &lt;&lt; EOF\n"
-"Host live.debian.net\n"
-"\tHostname live.debian.net\n"
-"\tUser gitosis\n"
-"\tIdentityFile ~/.ssh/identity.d/live-manual at debian-live\n"
-"EOF"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:362
-msgid "Checkout a clone of the manual through ssh:"
-msgstr ""
-
-# type: Content of: <sect1><sect2><screen>
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/chapters/about/manual.xml:366
-#, fuzzy, no-wrap
-#| msgid "$ git clone git://git.debian.org/git/debian-live/live-manual.git"
-msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
-msgstr "$ git clone git://git.debian.org/git/debian-live/live-manual.git"
-
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:372
-msgid ""
-"Commit the file after editing. Write commit messages, that consist of full "
-"useful sentences, starting with a capital letter and ending with a full "
-"stop. Usually starting with the form 'Fixing/Adding/Removing/Correcting/':"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/chapters/about/manual.xml:379
-#, no-wrap
-msgid "$ git commit -a"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/chapters/about/manual.xml:385
-msgid "Push the commit to the server:"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/chapters/about/manual.xml:389
-#, no-wrap
-msgid "$ git push"
-msgstr ""
diff --git a/manual/po/fr/overview.xml.po b/manual/po/fr/overview.xml.po
deleted file mode 100644
index 947c550..0000000
--- a/manual/po/fr/overview.xml.po
+++ /dev/null
@@ -1,415 +0,0 @@
-# French translations for Debconf package
-# Copyright (C) 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the Debconf package.
-# Automatically generated, 2008.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Debconf 8\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2008-08-09 16:50+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-# type: Content of: <chapter><section><title>
-#. type: Content of: <chapter><section><title>
-#: en/about_manual.xml:80 en/overview.xml:17
-msgid "&live-helper;"
-msgstr "&live-helper;"
-
-#. type: Content of: <chapter><section><section><para>
-#: en/about_manual.xml:298 en/about_manual.xml:308 en/about_manual.xml:318
-#: en/about_manual.xml:338 en/about_manual.xml:351 en/about_manual.xml:366
-#: en/about_manual.xml:379 en/about_manual.xml:389 en/basics.xml:113
-#: en/basics.xml:128 en/basics.xml:144 en/basics.xml:158 en/basics.xml:194
-#: en/basics.xml:220 en/basics.xml:230 en/basics.xml:239 en/basics.xml:253
-#: en/basics.xml:275 en/basics.xml:302 en/basics.xml:312 en/basics.xml:320
-#: en/basics.xml:354 en/basics.xml:364 en/basics.xml:382 en/basics.xml:429
-#: en/basics.xml:498 en/basics.xml:530 en/basics.xml:539 en/basics.xml:590
-#: en/basics.xml:646 en/customization_packages.xml:50
-#: en/customization_packages.xml:58 en/customization_packages.xml:71
-#: en/customization_packages.xml:80 en/customization_packages.xml:104
-#: en/customization_packages.xml:222 en/customization_packages.xml:230
-#: en/customization_packages.xml:265 en/customization_packages.xml:310
-#: en/customization_packages.xml:330 en/customization_packages.xml:341
-#: en/customization_packages.xml:352 en/customization_packages.xml:362
-#: en/faq.xml:64 en/faq.xml:241 en/faq.xml:244 en/faq.xml:252 en/faq.xml:256
-#: en/faq.xml:264 en/faq.xml:279 en/faq.xml:287 en/faq.xml:334 en/faq.xml:424
-#: en/faq.xml:430 en/faq.xml:481 en/faq.xml:483 en/faq.xml:487 en/faq.xml:491
-#: en/overview.xml:181 en/overview.xml:230 en/overview.xml:240
-msgid "<placeholder type=\"screen\" id=\"0\"/>"
-msgstr ""
-
-# type: Content of: <chapter><title>
-#. type: Content of: <chapter><title>
-#: en/overview.xml:9
-msgid "Overview of tools"
-msgstr ""
-
-# type: Content of: <chapter><para>
-#. type: Content of: <chapter><para>
-#: en/overview.xml:12
-msgid ""
-"This chapter contains an overview of the two main tools used in building "
-"Debian Live systems."
-msgstr ""
-
-#. type: Content of: <chapter><section><para>
-#: en/overview.xml:20
-msgid ""
-"&live-helper; is a collection of scripts to build Debian Live systems.  "
-"These scripts are also referred to as \"helpers\"."
-msgstr ""
-
-#. type: Content of: <chapter><section><para>
-#: en/overview.xml:25
-msgid ""
-"The idea behind &live-helper; is to be a framework that uses a configuration "
-"directory to completely automate and customize all aspects of building a "
-"Live image."
-msgstr ""
-
-#. type: Content of: <chapter><section><para>
-#: en/overview.xml:31
-msgid ""
-"Many concepts are similar to those in the <command>debhelper</command> "
-"Debian package tools written by Joey Hess:"
-msgstr ""
-
-# type: Content of: <chapter><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/overview.xml:39
-msgid "The scripts have a central location for configuring their operation."
-msgstr ""
-
-#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/overview.xml:43
-msgid ""
-"In <command>debhelper</command>, this is the <filename class=\"directory\" "
-">debian</filename> subdirectory of a package tree. For example, "
-"<command>dh_install</command> will look for a file called <filename>debian/"
-"&lt;packagename&gt;.install</filename> to determine which files should exist "
-"in a particular binary package. In much the same way, &live-helper; stores "
-"its configuration entirely under a <filename class=\"directory\">config/</"
-"filename> subdirectory."
-msgstr ""
-
-# type: Content of: <chapter><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/overview.xml:55
-msgid ""
-"The scripts are independent - that is to say, it is always safe to run each "
-"command."
-msgstr ""
-
-#. type: Content of: <chapter><section><para>
-#: en/overview.xml:63
-msgid ""
-"Unlike <command>debhelper</command>, &live-helper; contains a tool to "
-"generate a skeleton configuration directory, <filename>lh config</filename>. "
-"This could be considered to be similar to tools such as <command>dh-make</"
-"command>. For more information about <filename>lh config</filename>, please "
-"see <xref linkend=\"lh-config\" />."
-msgstr ""
-
-#. type: Content of: <chapter><section><para>
-#: en/overview.xml:71
-msgid ""
-"Besides the common <filename>config/common</filename>, which is used by all "
-"&live-helper; helper commands, some additional files can be used to "
-"configure the behavior of specific helper commands. These files are "
-"typically named <command>config/helper</command> or <command>config/stage</"
-"command> (where \"stage\", of course, is replaced with the name of the stage "
-"that they belong to, and \"helper\" with the name of the helper)."
-msgstr ""
-
-#. type: Content of: <chapter><section><para>
-#: en/overview.xml:81
-msgid ""
-"For example, the <command>lh bootstrap debootstrap</command> helper command "
-"uses files named <filename>config/bootstrap</filename> and <filename>config/"
-"bootstrap_debootstrap</filename> to read the options it will use. Generally, "
-"these files contain variables with values assigned, one variable per line. "
-"Some programs in &live-helper; use pairs of values or slightly more "
-"complicated variable assignments."
-msgstr ""
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><section><para>
-#: en/overview.xml:90
-msgid ""
-"&live-helper; respects environment variables which are present in the "
-"context of the shell it is running. If variables can be read from config "
-"files, then they override environment variables, and if command line options "
-"are used, they override values from config files. If no value for a given "
-"variable can be found (and is thus unset), &live-helper; will automatically "
-"set it to a default value."
-msgstr ""
-
-#. type: Content of: <chapter><section><para>
-#: en/overview.xml:99
-msgid ""
-"All config files are shell scripts which are sourced by a &live-helper; "
-"program. That means they have to follow the normal shell syntax. You can "
-"also put comments in these files; lines beginning with \"#\" are ignored."
-msgstr ""
-
-#. type: Content of: <chapter><section><para>
-#: en/overview.xml:105
-msgid ""
-"In some rare cases you may want to have different versions of these files "
-"for different architectures or distributions. If files named <command>config/"
-"stage.arch</command> or <command>config/stage_helper.arch</command>, and "
-"<command>config/stage.dist</command> or <command>config/stage_helper.dist</"
-"command> exist (where \"arch\" is the same as the output of <command>dpkg --"
-"print-architecture</command> and \"dist\" is the same as the codename of the "
-"target distribution), then they will be used in preference to the other, "
-"more general files."
-msgstr ""
-
-#. type: Content of: <chapter><section><para>
-#: en/overview.xml:117
-msgid ""
-"Please see <xref linkend=\"installation\" /> for information on how to "
-"install &live-helper;."
-msgstr ""
-
-# type: Content of: <chapter><section><para><para>
-#. type: Content of: <chapter><section><para>
-#: en/overview.xml:122
-msgid ""
-"The remainder of this section discusses the three most important helpers:"
-msgstr ""
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/overview.xml:129
-#, fuzzy
-#| msgid "<filename>live-package</filename>"
-msgid "<filename>lh config</filename>"
-msgstr "<filename>live-package</filename>"
-
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/overview.xml:133
-msgid ""
-"Responsible for initialising a Live system configuration directory. See "
-"<xref linkend=\"lh-config\" /> for more information."
-msgstr ""
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/overview.xml:140
-#, fuzzy
-#| msgid "<filename>live-package</filename>"
-msgid "<filename>lh build</filename>"
-msgstr "<filename>live-package</filename>"
-
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/overview.xml:144
-msgid ""
-"Responsible for starting a Live system build. See <xref linkend=\"lh-build"
-"\" /> for more information."
-msgstr ""
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/overview.xml:151
-#, fuzzy
-#| msgid "<filename>live-package</filename>"
-msgid "<filename>lh clean</filename>"
-msgstr "<filename>live-package</filename>"
-
-#. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/overview.xml:155
-msgid ""
-"Responsible for removing parts of a Live system build. See <xref linkend="
-"\"lh-clean\" /> for more information."
-msgstr ""
-
-# type: Content of: <appendix><section><title>
-#. type: Content of: <chapter><section><section><title>
-#: en/overview.xml:164
-#, fuzzy
-#| msgid "The <filename>config/binary</filename> file"
-msgid "The <filename>lh config</filename> helper"
-msgstr "Le fichier <filename>config/binary</filename>."
-
-#. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:167
-msgid ""
-"As discussed in <xref linkend=\"live-helper\" />, the scripts that make up "
-"&live-helper; source their configuration from a single directory named "
-"<command>config/</command>. As constructing this directory by hand would be "
-"time-consuming and error-prone, the <filename>lh config</filename> helper "
-"can be used to create skeleton configuration folders."
-msgstr ""
-
-#. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:175
-msgid ""
-"Issuing <filename>lh config</filename> without any arguments creates a "
-"<command>config</command> subdirectory which it populates with some default "
-"settings:"
-msgstr ""
-
-#. type: Content of: <chapter><section><section><para><screen>
-#: en/overview.xml:181
-#, no-wrap
-msgid ""
-"$ lh config\n"
-"$ ls -l\n"
-"total 4.1k\n"
-"drwxr-xr-x 19 user group 4.1k 2008-05-09 21:37 config\n"
-"$ ls -l config/\n"
-"total 104\n"
-"-rw-r--r-- 1 user group 4175 2010-04-11 12:16 binary\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_debian-installer\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_debian-installer-includes\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_grub\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-debs\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-hooks\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-includes\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-packageslists\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-udebs\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_rootfs\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_syslinux\n"
-"-rw-r--r-- 1 user group 2205 2010-04-11 12:16 bootstrap\n"
-"-rw-r--r-- 1 user group 1599 2010-04-11 12:16 chroot\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_apt\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-hooks\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-includes\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-packages\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-packageslists\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-patches\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-preseed\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_sources\n"
-"-rw-r--r-- 1 user group 2938 2010-04-11 12:16 common\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 includes\n"
-"-rw-r--r-- 1 user group  206 2010-04-11 12:16 source\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 templates\n"
-msgstr ""
-
-#. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:216
-msgid ""
-"Using <filename>lh config</filename> without any arguments would be suitable "
-"for users who are either happy editing the generated files, or are simply "
-"happy with the defaults it creates."
-msgstr ""
-
-#. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:222
-msgid ""
-"You can ask <filename>lh config</filename> to generate a <filename class="
-"\"directory\">config/</filename> directory \"preseeded\" with various "
-"options. This might be suitable if you do not require the default settings "
-"but do not need to change a large number of options. For example:"
-msgstr ""
-
-# type: Content of: <chapter><section><screen>
-#. type: Content of: <chapter><section><section><para><screen>
-#: en/overview.xml:230
-#, fuzzy, no-wrap
-#| msgid "$ lh_config"
-msgid "$ lh config -p gnome"
-msgstr "$ lh_config"
-
-#. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:234
-msgid ""
-"will build a <filename class=\"directory\">config/</filename> directory "
-"configured to include the '<command>gnome</command>' package list. It is "
-"possible to specify many options:"
-msgstr ""
-
-#. type: Content of: <chapter><section><section><para><screen>
-#: en/overview.xml:240
-#, no-wrap
-msgid "$ lh config --apt aptitude --binary-images net --hostname live-machine --username live-user ..."
-msgstr ""
-
-#. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:244
-msgid ""
-"A full list of options is available in the <command>lh_config</command> man "
-"page. Most options have a parallel with an \"<command>LH_</command>\" "
-"prefixed variable."
-msgstr ""
-
-# type: Content of: <appendix><section><title>
-#. type: Content of: <chapter><section><section><title>
-#: en/overview.xml:252
-#, fuzzy
-#| msgid "The <filename>config/binary</filename> file"
-msgid "The <filename>lh build</filename> helper"
-msgstr "Le fichier <filename>config/binary</filename>."
-
-#. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:255
-msgid ""
-"The <filename>lh build</filename> helper reads in your configuration from "
-"the <filename class=\"directory\">config/</filename> directory. It then runs "
-"the lower lower level commands needed to build your Live system."
-msgstr ""
-
-# type: Content of: <appendix><section><title>
-#. type: Content of: <chapter><section><section><title>
-#: en/overview.xml:264
-#, fuzzy
-#| msgid "The <filename>config/common</filename> file"
-msgid "The <filename>lh clean</filename> helper"
-msgstr "Le fichier <filename>config/common</filename>."
-
-#. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:267
-msgid ""
-"It is the job of the <filename>lh clean</filename> helper to remove various "
-"parts of a Live helper build so subsequent builds can start from a clean "
-"state."
-msgstr ""
-
-# type: Content of: <chapter><section><title>
-#. type: Content of: <chapter><section><title>
-#: en/overview.xml:277
-msgid "The &live-initramfs; package"
-msgstr ""
-
-#. type: Content of: <chapter><section><para>
-#: en/overview.xml:280
-msgid ""
-"&live-initramfs; is a collection of scripts providing hooks for the "
-"<command>initramfs-tools</command>, used to generate an initramfs capable of "
-"booting live systems, such as those created by <command>live-helper</"
-"command>. This includes the Debian Live isos, netboot tarballs, and usb "
-"stick images."
-msgstr ""
-
-#. type: Content of: <chapter><section><para>
-#: en/overview.xml:288
-msgid ""
-"At boot time it will look for read-only media containing a \"/live\" "
-"directory where a root filesystem (often a compressed filesystem image like "
-"squashfs) is stored. If found, it will create a writable environment, using "
-"aufs or unionfs, for Debian like systems to boot from."
-msgstr ""
-
-#. type: Content of: <chapter><section><para>
-#: en/overview.xml:296
-msgid ""
-"&live-initramfs; is a fork of <ulink url=\"http://packages.ubuntu.com/casper"
-"\">casper</ulink>."
-msgstr ""
-
-#. type: Content of: <chapter><section><para>
-#: en/overview.xml:301
-msgid ""
-"More information on initial ramfs in Debian can be found in the <ulink url="
-"\"http://kernel-handbook.alioth.debian.org/\"> Debian Linux Kernel Handbook</"
-"ulink>'s chapter on <ulink url=\"http://kernel-handbook.alioth.debian.org/ch-"
-"initramfs.html\"> initramfs</ulink>."
-msgstr ""
diff --git a/manual/po/fr/packages.xml.po b/manual/po/fr/packages.xml.po
deleted file mode 100644
index ea20142..0000000
--- a/manual/po/fr/packages.xml.po
+++ /dev/null
@@ -1,941 +0,0 @@
-# French translations for PACKAGE package
-# Copyright (C) 2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# Automatically generated, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2009-02-27 15:31+0100\n"
-"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> "
-"<christophenagel at gmail.com>\n"
-"Language-Team: none\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/chapters/basics.xml:113 en/chapters/basics.xml:128
-#: en/chapters/basics.xml:144 en/chapters/basics.xml:158
-#: en/chapters/basics.xml:194 en/chapters/basics.xml:220
-#: en/chapters/basics.xml:230 en/chapters/basics.xml:239
-#: en/chapters/basics.xml:253 en/chapters/basics.xml:275
-#: en/chapters/basics.xml:302 en/chapters/basics.xml:312
-#: en/chapters/basics.xml:320 en/chapters/basics.xml:354
-#: en/chapters/basics.xml:364 en/chapters/basics.xml:382
-#: en/chapters/basics.xml:429 en/chapters/basics.xml:498
-#: en/chapters/basics.xml:530 en/chapters/basics.xml:539
-#: en/chapters/basics.xml:590 en/chapters/basics.xml:646
-#: en/chapters/faq.xml:64 en/chapters/faq.xml:241 en/chapters/faq.xml:244
-#: en/chapters/faq.xml:252 en/chapters/faq.xml:256 en/chapters/faq.xml:264
-#: en/chapters/faq.xml:279 en/chapters/faq.xml:287 en/chapters/faq.xml:334
-#: en/chapters/faq.xml:424 en/chapters/faq.xml:430 en/chapters/faq.xml:481
-#: en/chapters/faq.xml:483 en/chapters/faq.xml:487 en/chapters/faq.xml:491
-#: en/chapters/overview.xml:181 en/chapters/overview.xml:230
-#: en/chapters/overview.xml:240 en/chapters/about/manual.xml:298
-#: en/chapters/about/manual.xml:308 en/chapters/about/manual.xml:318
-#: en/chapters/about/manual.xml:338 en/chapters/about/manual.xml:351
-#: en/chapters/about/manual.xml:366 en/chapters/about/manual.xml:379
-#: en/chapters/about/manual.xml:389 en/chapters/customization/packages.xml:50
-#: en/chapters/customization/packages.xml:58
-#: en/chapters/customization/packages.xml:71
-#: en/chapters/customization/packages.xml:80
-#: en/chapters/customization/packages.xml:104
-#: en/chapters/customization/packages.xml:222
-#: en/chapters/customization/packages.xml:230
-#: en/chapters/customization/packages.xml:265
-#: en/chapters/customization/packages.xml:310
-#: en/chapters/customization/packages.xml:330
-#: en/chapters/customization/packages.xml:341
-#: en/chapters/customization/packages.xml:352
-#: en/chapters/customization/packages.xml:362
-msgid "<placeholder type=\"screen\" id=\"0\"/>"
-msgstr ""
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/live-environment.xml:11 en/chapters/resources.xml:11
-#: en/chapters/success-stories.xml:11 en/chapters/about/manual.xml:125
-#: en/chapters/customization/bootup.xml:11
-#: en/chapters/customization/bootup.xml:20
-#: en/chapters/customization/bootup.xml:26
-#: en/chapters/customization/bootup.xml:38
-#: en/chapters/customization/bootup.xml:85
-#: en/chapters/customization/bootup.xml:92
-#: en/chapters/customization/bootup.xml:99
-#: en/chapters/customization/bootup.xml:106
-#: en/chapters/customization/packages.xml:36
-#: en/chapters/customization/packages.xml:306
-#: en/chapters/customization/packages.xml:326
-#: en/chapters/customization/packages.xml:384
-#: en/chapters/customization/packages.xml:492
-#: en/chapters/customization/packages.xml:535
-msgid "FIXME"
-msgstr "FIXME"
-
-# type: Content of: <sect1><title>
-#. type: Content of: <sect1><title>
-#: en/chapters/customization/packages.xml:9
-msgid "Customising package installation"
-msgstr "Installation personnalisée des paquets"
-
-# type: Content of: <sect1><para>
-#. type: Content of: <sect1><para>
-#: en/chapters/customization/packages.xml:12
-msgid ""
-"This chapter discusses the customisation of package installation. This "
-"involves:"
-msgstr ""
-"Ce chapitre décrit comment personnaliser l'installation des paquets. Cela "
-"implique :"
-
-# type: Content of: <sect1><orderedlist><listitem><para>
-#. type: Content of: <sect1><orderedlist><listitem><para>
-#: en/chapters/customization/packages.xml:20
-msgid "Selecting additional packages to be installed"
-msgstr "La sélection de paquets additionnels à installer"
-
-# type: Content of: <sect1><orderedlist><listitem><para>
-#. type: Content of: <sect1><orderedlist><listitem><para>
-#: en/chapters/customization/packages.xml:26
-msgid "Installing modified packages"
-msgstr "L'installation de paquets modifiés"
-
-# type: Content of: <sect1><sect2><title>
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/packages.xml:33
-msgid "Package sources"
-msgstr "Les sources des paquets"
-
-# type: Content of: <chapter><section><section><title>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/customization/packages.xml:42
-#, fuzzy
-#| msgid "From the Debian repository"
-msgid "Debian repositories"
-msgstr "Depuis le dépot Debian"
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:46
-msgid "To set a local mirror (used to ''build'' the live-cd)"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/chapters/customization/packages.xml:50
-#, no-wrap
-msgid "$ lh config --mirror-bootstrap \"http://local.intra.net/debian/\" --mirror-chroot \"http://local.intra.net/debian/\""
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:54
-msgid "The generic mirror is added to the live-system's /etc/apt/sources.list."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/chapters/customization/packages.xml:58
-#, no-wrap
-msgid "$ lh config --mirror-binary \"http://ftp.debian.org/debian/\""
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:62
-msgid ""
-"Note: It is ''not'' used for building the live-cd but to install new "
-"software while using the live-cd."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:67
-msgid "It can be disabled by setting binary indices parameter to disabled"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/chapters/customization/packages.xml:71
-#, no-wrap
-msgid "$ lh config --binary-indices disabled"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:75
-msgid ""
-"Note: the same applies for mirror chroot security and mirror binary security"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/chapters/customization/packages.xml:80
-#, no-wrap
-msgid ""
-"$ lh config --mirror-chroot-security {URL}\n"
-"$ lh config --mirror-binary-security {URL}"
-msgstr ""
-
-# type: Content of: <chapter><section><section><title>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/customization/packages.xml:87
-#, fuzzy
-#| msgid "From the Debian repository"
-msgid "Own repository"
-msgstr "Depuis le dépot Debian"
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:91
-msgid ""
-"To add more repositories (e.g. backports, experimental packages, etc.), "
-"create <filename>config/chroot_sources/your-cdd-repo.{chroot,binary}</"
-"filename> file."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:98
-msgid ""
-"e.g. <filename>config/chroot_sources/live.chroot</filename> allows you to "
-"install packages from the debian live snapshot repository at live-cd build "
-"time (you have to add the packages in your package list):"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/chapters/customization/packages.xml:104
-#, no-wrap
-msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:108
-msgid ""
-"If you add the line to <filename>config/chroot_sources/live.binary</"
-"filename> the repository will be added to your live-system's <filename>/etc/"
-"apt/sources.list</filename>."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:115
-msgid "If such files exist, they will be picked up automatically."
-msgstr ""
-
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:119
-msgid ""
-"You can also put the gpg-key used to sign the repository into config/"
-"chroot_sources/foo.{binary,chroot}.gpg"
-msgstr ""
-
-# type: Content of: <sect1><sect2><title>
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/packages.xml:130
-msgid "Package installation"
-msgstr "L'installation des paquets"
-
-# type: Content of: <sect1><sect2><para>
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/packages.xml:133
-#, fuzzy
-#| msgid ""
-#| "You can elect to use either <command>apt</command> or <command>aptitude</"
-#| "command> when installing packages. Which utility is used is governed by "
-#| "the <command>LH_APT</command> variable in <filename>config/chroot</"
-#| "filename> or by the <command>--apt</command> argument to "
-#| "<filename>lh_config</filename>:"
-msgid ""
-"You can elect to use either <command>apt</command> or <command>aptitude</"
-"command> when installing packages. Which utility is used is governed by the "
-"<command>LH_APT</command> variable in <filename>config/chroot</filename> or "
-"by the <command>--apt</command> argument to <filename>lh config</filename>:"
-msgstr ""
-"Vous pouvez choisir d'utiliser <command>apt</command> ou <command>aptitude</"
-"command> pour installer les paquets. Ce choix est paramétré par la variable "
-"<command>LH_APT</command> dans <filename>config/chroot</filename>, ou par "
-"l'argument <command>--apt</command> dans <filename>lh_config</filename>:"
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/customization/packages.xml:143
-msgid "<command>apt</command>"
-msgstr "<command>apt</command>"
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:147
-msgid ""
-"Specifying a missing package causes package installation to fail, which may "
-"not be the desired behaviour."
-msgstr ""
-"La spécification d'un paquet manquant causera une erreur à l'installation et "
-"risque d'entraîner un comportement non-désiré du système."
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:152
-msgid "This is the default setting for building images for Lenny or later."
-msgstr ""
-"C'est le réglage par défaut lors de la création d'images pour Lenny et les "
-"versions suivantes."
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/chapters/customization/packages.xml:158
-msgid "<command>aptitude</command>"
-msgstr "<command>aptitude</command>"
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:162
-msgid ""
-"Specifying a missing package causes package installation to succeed, which "
-"may not be the desired behaviour."
-msgstr ""
-"La spécification d'un paquet manquant ne causera pas d'erreur à "
-"l'installation et risque d'entraîner un comportement non-désiré du système."
-
-# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/chapters/customization/packages.xml:167
-msgid "This is the default setting for building images for Etch."
-msgstr "C'est le réglage par défaut lors de la création d'images pour Lenny."
-
-# type: Content of: <sect1><sect2><title>
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/packages.xml:177
-msgid "Installing additional packages"
-msgstr "Installer des paquets supplémentaires"
-
-# type: Content of: <sect1><sect2><para>
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/packages.xml:180
-msgid ""
-"&live-helper; has a number of mechanisms for indicating that additional "
-"packages should be installed, including:"
-msgstr ""
-"&live-helper; possède un certain nombre de fonctionnalités permettant "
-"d'indiquer si des paquets supplémentaires doivent être installés, incluant :"
-
-# type: Content of: <sect1><sect2><sect3><title>
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/packages.xml:188
-#: en/chapters/customization/packages.xml:213
-msgid "The <command>LH_PACKAGES</command> variable"
-msgstr "La variable <command>LH_PACKAGES</command>"
-
-# type: Content of: <sect1><sect2><sect3><title>
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/packages.xml:194
-#: en/chapters/customization/packages.xml:249
-msgid "Package lists"
-msgstr "Les listes de paquets"
-
-# type: Content of: <sect1><sect2><orderedlist><listitem><para>
-#. type: Content of: <sect1><sect2><orderedlist><listitem><para>
-#: en/chapters/customization/packages.xml:200
-msgid "Local packages (<filename>chroot_local-packages/</filename>)"
-msgstr "Les paquets locaux (<filename>chroot_local-packages/</filename>)"
-
-# type: Content of: <sect1><sect2><sect3><title>
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/packages.xml:206
-#: en/chapters/customization/packages.xml:381
-msgid "Tasks"
-msgstr "Les tâches"
-
-# type: Content of: <sect1><sect2><sect3><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:216
-msgid ""
-"To install additional packages, simply add them to the <command>LH_PACKAGES</"
-"command> variable in <filename>config/chroot</filename>. For example:"
-msgstr ""
-"Pour installer des paquets supplémentaires, il suffit de les ajouter à la "
-"variable <command>LH_PACKAGES</command> dans <filename>config/chroot</"
-"filename>. Par exemple :"
-
-# type: Content of: <sect1><sect2><sect3><screen>
-#. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/chapters/customization/packages.xml:222
-#, fuzzy, no-wrap
-#| msgid ""
-#| "\n"
-#| "LH_PACKAGES=\"package1 package2 package3 ... \"\n"
-msgid "LH_PACKAGES=\"package1 package2 package3 ... \""
-msgstr ""
-"\n"
-"LH_PACKAGES=\"package1 package2 package3 ... \"\n"
-
-# type: Content of: <sect1><sect2><sect3><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:226
-#, fuzzy
-#| msgid "You can also specify an initial values on the command line:"
-msgid "You can also specify initial values on the command line:"
-msgstr ""
-"Il est également possible de spécifier une valeur initiale sur la ligne de "
-"commande :"
-
-# type: Content of: <sect1><sect2><sect3><screen>
-#. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/chapters/customization/packages.xml:230
-#, fuzzy, no-wrap
-#| msgid ""
-#| "\n"
-#| "$ lh_config --packages \"package1 package2 package3\"\n"
-msgid "$ lh config --packages \"package1 package2 package3\""
-msgstr ""
-"\n"
-"$ lh_config --packages \"package1 package2 package3\"\n"
-
-# type: Content of: <sect1><sect2><sect3><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:234
-msgid ""
-"The behaviour of &live-helper; when specifying a package that does not exist "
-"is determined by your choice of APT utility. See <xref linkend=\"package-"
-"installation\"/> for more details."
-msgstr ""
-"Le comportement de &live-helper; lors de la spécification d'un paquet "
-"inexistant dépend de l'utilitaire APT choisi. Voir <xref linkend=\"package-"
-"installation\"/> pour plus de détails."
-
-# type: Content of: <sect1><sect2><sect3><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:240
-msgid ""
-"If you need to specify a large number of packages to be installed or you "
-"need flexibility regarding which packages to install, you should probably be "
-"using package lists. See <xref linkend=\"package-lists\"/> for more "
-"information."
-msgstr ""
-"Si vous désirez spécifier un grand nombre de paquets à installer, ou que "
-"vous désirez plus de flexibilité dans le choix des paquets, vous devriez "
-"sans doutes utiliser les listes de paquets. Voir <xref linkend=\"package-"
-"lists\"/> pour plus d'informations."
-
-# type: Content of: <sect1><sect2><sect3><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:252
-msgid ""
-"Package lists are a powerful way of expressing which packages should be "
-"installed. &live-helper; ships with a number of predefined package lists "
-"which provide sensible default package selections for the GNOME and KDE "
-"desktop environments, as well as standard systems."
-msgstr ""
-"Les listes de paquets représentent un moyen très puissant de choisir les "
-"paquets à installer. Avec &live-helper; sont fournies un grand nombre de "
-"listes de paquets prédéfinies, proposant des sélections de paquets par "
-"défaut pour les environnements de bureau GNOME et KDE, ainsi que pour les "
-"systèmes standards."
-
-# type: Content of: <sect1><sect2><sect3><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:259
-msgid ""
-"To specify a package list, add the name of the list to the "
-"<command>LH_PACKAGES_LISTS</command> variable in <filename>config/chroot</"
-"filename>. For example:"
-msgstr ""
-"Pour spécifier une liste de paquets, ajoutez le nom de cette liste à la "
-"variable<command>LH_PACKAGES_LISTS</command> dans <filename>config/chroot</"
-"filename>. Par exemple :"
-
-# type: Content of: <sect1><sect2><sect3><screen>
-#. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/chapters/customization/packages.xml:265
-#, fuzzy, no-wrap
-#| msgid ""
-#| "\n"
-#| "LH_PACKAGES_LISTS=\"gnome\"\n"
-msgid "LH_PACKAGES_LISTS=\"gnome\""
-msgstr ""
-"\n"
-"LH_PACKAGES_LISTS=\"gnome\"\n"
-
-# type: Content of: <sect1><sect2><sect3><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:269
-#, fuzzy
-#| msgid ""
-#| "Packages lists that a distributed with &live-helper; reside in view in "
-#| "the <command>/usr/share/live-helper/lists</command> directory."
-msgid ""
-"Package lists that are distributed with &live-helper; reside in the "
-"<command>/usr/share/live-helper/lists</command> directory."
-msgstr ""
-"Les listes de paquets distribuées avec &live-helper; résident dans le "
-"répertoire <command>/usr/share/live-helper/lists</command>."
-
-# type: Content of: <sect1><sect2><sect3><sect4><title>
-#. type: Content of: <sect1><sect2><sect3><sect4><title>
-#: en/chapters/customization/packages.xml:274
-msgid "Local packages lists"
-msgstr "Listes de paquets locaux"
-
-# type: Content of: <sect1><sect2><sect3><sect4><para>
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/chapters/customization/packages.xml:277
-msgid ""
-"You may supplement the supplied lists using local package lists stored in "
-"<command>config/chroot_local-packageslists</command>."
-msgstr ""
-"Vous pouvez ajouter des listes de paquets locaux aux listes par défaut en "
-"les insérant dans <command>config/chroot_local-packageslists</command>."
-
-# type: Content of: <sect1><sect2><sect3><sect4><para>
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/chapters/customization/packages.xml:282
-#, fuzzy
-#| msgid ""
-#| "Package lists that exist in this directory always override package lists "
-#| "distributed with &live-helper;. This can cause undesired effects when.."
-msgid ""
-"Package lists that exist in this directory always override package lists "
-"distributed with &live-helper;. This can cause undesired effects when."
-msgstr ""
-"Les listes de paquets présentes dans ce répertoire ont systématiquement "
-"préséance sur celles fournies avec &live-helper; Ceci peut entraîner des "
-"effets non-désirés lorsque.."
-
-# type: Content of: <chapter><section><title>
-#. type: Content of: <sect1><sect2><sect3><sect4><note><title>
-#: en/chapters/customization/packages.xml:288
-#, fuzzy
-#| msgid "&live-helper;"
-msgid "&live-helper; 2.x change"
-msgstr "&live-helper;"
-
-#. type: Content of: <sect1><sect2><sect3><sect4><note><para>
-#: en/chapters/customization/packages.xml:291
-msgid ""
-"Any file with <command>.list</command> suffix in <command>config/"
-"chroot_local-packageslists</command> is automatically enabled, the variable "
-"LH_PACKAGES_LISTS should only be used referencing packages lists included in "
-"live-helper (at <command>/usr/share/live-helper/lists/</command>."
-msgstr ""
-
-# type: Content of: <sect1><sect2><sect3><sect4><title>
-#. type: Content of: <sect1><sect2><sect3><sect4><title>
-#: en/chapters/customization/packages.xml:303
-msgid "Extending a provided package list using includes"
-msgstr "Extension d'une liste de paquets grâce aux \"includes\""
-
-# type: Content of: <sect1><sect2><sect3><sect4><screen>
-#. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/chapters/customization/packages.xml:310
-#, fuzzy, no-wrap
-#| msgid ""
-#| "\n"
-#| "#include &lt;gnome&gt;\n"
-#| "iceweasel\n"
-msgid ""
-"#include &lt;gnome&gt;\n"
-"iceweasel"
-msgstr ""
-"\n"
-"#include &lt;gnome&gt;\n"
-"iceweasel\n"
-
-# type: Content of: <sect1><sect2><sect3><sect4><para>
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/chapters/customization/packages.xml:315
-msgid ""
-"The package lists that are included with &live-helper; make extensive use of "
-"includes. They are available to view in the <command>/usr/share/live-helper/"
-"lists</command> directory."
-msgstr ""
-"Les listes de paquets fournies avec &live-helper; font un usage intensif des "
-"\"includes\". Elles sont disponibles dans le répertoire <command>/usr/share/"
-"live-helper/lists</command>"
-
-# type: Content of: <sect1><sect2><sect3><sect4><title>
-#. type: Content of: <sect1><sect2><sect3><sect4><title>
-#: en/chapters/customization/packages.xml:323
-msgid "Using conditionals inside packages lists"
-msgstr "Utilisation de tests dans les listes de paquets"
-
-# type: Content of: <sect1><sect2><sect3><sect4><screen>
-#. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/chapters/customization/packages.xml:330
-#, fuzzy, no-wrap
-#| msgid ""
-#| "\n"
-#| "#if ARCHITECTURE amd64\n"
-#| "ia32-libs\n"
-#| "#endif\n"
-msgid ""
-"#if ARCHITECTURE amd64\n"
-"ia32-libs\n"
-"#endif"
-msgstr ""
-"\n"
-"#if ARCHITECTURE amd64\n"
-"ia32-libs\n"
-"#endif\n"
-
-# type: Content of: <sect1><sect2><sect3><sect4><para>
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/chapters/customization/packages.xml:336
-msgid ""
-"or if <command>LH_ARCHITECTURE</command> is set to <command>i386</command> "
-"or <command>amd64</command>:"
-msgstr ""
-"ou si la variable <command>LH_ARCHITECTURE</command> est positionnée sur "
-"<command>i386</command> ou <command>amd64</command>:"
-
-# type: Content of: <sect1><sect2><sect3><sect4><screen>
-#. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/chapters/customization/packages.xml:341
-#, fuzzy, no-wrap
-#| msgid ""
-#| "\n"
-#| "#if ARCHITECTURE i386 amd64\n"
-#| "memtest86+\n"
-#| "#endif\n"
-msgid ""
-"#if ARCHITECTURE i386 amd64\n"
-"memtest86+\n"
-"#endif"
-msgstr ""
-"\n"
-"#if ARCHITECTURE i386 amd64\n"
-"memtest86+\n"
-"#endif\n"
-
-# type: Content of: <sect1><sect2><sect3><sect4><para>
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/chapters/customization/packages.xml:347
-msgid ""
-"or if <command>LH_SECTIONS</command> contains either <command>contrib</"
-"command> or <command>non-free</command>:"
-msgstr ""
-"ou si la variable <command>LH_SECTIONS</command> contient soit "
-"<command>contrib</command>, soit <command>non-free</command>:"
-
-# type: Content of: <sect1><sect2><sect3><sect4><screen>
-#. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/chapters/customization/packages.xml:352
-#, fuzzy, no-wrap
-#| msgid ""
-#| "\n"
-#| "#if SECTIONS contrib non-free\n"
-#| "vrms\n"
-#| "#endif\n"
-msgid ""
-"#if SECTIONS contrib non-free\n"
-"vrms\n"
-"#endif"
-msgstr ""
-"\n"
-"#if SECTIONS contrib non-free\n"
-"vrms\n"
-"#endif\n"
-
-# type: Content of: <sect1><sect2><sect3><sect4><para>
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/chapters/customization/packages.xml:358
-msgid "A conditional may surround an <command>#include</command> directive:"
-msgstr "Un test peut encadrer une directive <command>#include</command> :"
-
-# type: Content of: <sect1><sect2><sect3><sect4><screen>
-#. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/chapters/customization/packages.xml:362
-#, fuzzy, no-wrap
-#| msgid ""
-#| "\n"
-#| "#if ARCHITECTURE amd64\n"
-#| "#include &lt;gnome-full&gt;\n"
-#| "#endif\n"
-msgid ""
-"#if ARCHITECTURE amd64\n"
-"#include &lt;gnome-full&gt;\n"
-"#endif"
-msgstr ""
-"\n"
-"#if ARCHITECTURE amd64\n"
-"#include &lt;gnome-full&gt;\n"
-"#endif\n"
-
-# type: Content of: <sect1><sect2><sect3><sect4><para>
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/chapters/customization/packages.xml:368
-msgid ""
-"Any &live-helper; configuration variable that begins with <command>LH_</"
-"command> can be tested in this way."
-msgstr ""
-"Toute variable de configuration de &live-helper; qui commence par "
-"<command>LH_</command> peut être testée de cette manière."
-
-# type: Content of: <sect1><sect2><sect3><sect4><para>
-#. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/chapters/customization/packages.xml:373
-msgid "The nesting of conditionals is not supported."
-msgstr "L'imbrication de tests n'est pas supportée."
-
-# type: Content of: <sect1><sect2><title>
-#. type: Content of: <sect1><sect2><title>
-#: en/chapters/customization/packages.xml:392
-msgid "Installing modified or third-party packages"
-msgstr "Installation de paquets modifiés ou de tierce partie"
-
-# type: Content of: <sect1><sect2><para>
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/packages.xml:395
-msgid ""
-"Whilst it is against the philosophy of Debian Live, it may sometimes be "
-"necessary to build a Live system with modified versions of packages that are "
-"in the Debian repository. This may be to modify or support additional "
-"features, languages and branding, or even to remove elements of existing "
-"packages that are undesirable. Similarly, \"third-party\" packages may be "
-"used to add bespoke and/or proprietary functionality."
-msgstr ""
-"Bien que cela aille à l'encontre de la philosophie Debian Live, il peut "
-"s'avérer nécessaire de construire un système Live avec des versions "
-"modifiées de paquets présents sur le dépôt Debian, ceci afin de modifier ou "
-"apporter des fonctionnalités supplémentaires, des supports linguistiques, ou "
-"encore pour supprimer des éléments de paquets indésirables. De même, les "
-"paquets de \"tierce partie\" peuvent servir à ajouter des fonctionnalités "
-"\"sur demande\" et/ou propriétaires."
-
-# type: Content of: <sect1><sect2><para>
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/packages.xml:404
-#, fuzzy
-#| msgid ""
-#| "This section does not cover advice regarding building or maintaining "
-#| "modified packages. Joachim Breitner's <ulink url=\"http://www.joachim-"
-#| "breitner.de/blog/archives/282-How-to-fork-privately.html\">'How to fork "
-#| "privately'</ulink> may be of interest, however. The creation of bespoke "
-#| "packages is covered in the <ulink url=\"http://www.debian.org/doc/maint-"
-#| "guide/\">Debian New Maintainers' Guide</ulink> and elsewhere."
-msgid ""
-"This section does not cover advice regarding building or maintaining "
-"modified packages. Joachim Breitner's <ulink url=\"http://www.joachim-"
-"breitner.de/blog/archives/282-How-to-fork-privately.html\" >'How to fork "
-"privately'</ulink> may be of interest, however. The creation of bespoke "
-"packages is covered in the <ulink url=\"http://www.debian.org/doc/maint-"
-"guide/\">Debian New Maintainers' Guide</ulink> and elsewhere."
-msgstr ""
-"Cette section ne fournit pas d'aide sur la construction et la maintenance de "
-"paquets modifiés. L'article de Joachim Breitner <ulink url=\"http://www."
-"joachim-breitner.de/blog/archives/282-How-to-fork-privately.html\">'How to "
-"fork privately'</ulink> peut cependant vous intéresser. La création de "
-"paquets \"sur mesure\" est décrite, entre autres, à l'adresse <ulink url="
-"\"http://www.debian.org/doc/maint-guide/\">Debian New Maintainers' Guide</"
-"ulink>."
-
-# type: Content of: <sect1><sect2><para>
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/packages.xml:414
-msgid "There are two ways of installing modified custom packages:"
-msgstr "Il y a deux manières d'installer des paquets modifiés :"
-
-# type: Content of: <sect1><sect2><orderedlist><listitem><para>
-#. type: Content of: <sect1><sect2><orderedlist><listitem><para>
-#: en/chapters/customization/packages.xml:421
-msgid "<filename>chroot_local-packages</filename>"
-msgstr "<filename>chroot_local-packages</filename>"
-
-# type: Content of: <sect1><sect2><orderedlist><listitem><para>
-#. type: Content of: <sect1><sect2><orderedlist><listitem><para>
-#: en/chapters/customization/packages.xml:427
-msgid "Using a custom APT repository"
-msgstr "Utilisation d'un dépôt APT \"custom\""
-
-# type: Content of: <sect1><sect2><para>
-#. type: Content of: <sect1><sect2><para>
-#: en/chapters/customization/packages.xml:434
-#, fuzzy
-#| msgid ""
-#| "The <filename>chroot_local-packages</filename> is simpler to achieve and "
-#| "useful for \"one-off\" customisations but has a number of drawbacks, "
-#| "whilst using a custom APT repository is more time-consuming to setup."
-msgid ""
-"The <filename>chroot_local-packages</filename> is simpler to achieve and "
-"useful for \"one-off\" customisations but has a number of drawbacks, whilst "
-"using a custom APT repository is more time-consuming to set up."
-msgstr ""
-"Il est plus simple d'utiliser <filename>chroot_local-packages</filename> "
-"pour une customisation rapide, au prix de certains inconvénients, tandis que "
-"l'utilisation d'un dépôt APT spécifique prend plus de temps à mettre en "
-"place."
-
-# type: Content of: <sect1><sect2><sect3><title>
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/packages.xml:441
-msgid ""
-"Using <filename>chroot_local-packages</filename> to install custom packages"
-msgstr ""
-"Utilistation de <filename>chroot_local-packages</filename> pour installer "
-"des paquets modifiés"
-
-# type: Content of: <sect1><sect2><sect3><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:446
-msgid ""
-"To install a custom package, simply copy it to the <command>config/"
-"chroot_local-packages</command> directory. Packages that are inside this "
-"directory will be automatically installed into the live system during build "
-"- you do not need to specify them elsewhere."
-msgstr ""
-"Pour installer un paquet modifié, il suffit de le placer dans le répertoire "
-"<command>config/chroot_local-packages</command>. Les paquets présents dans "
-"ce répertoire seront automatiquement installés à la construction du système "
-"live. Il n'est pas nécessaire de les spécifier ailleurs."
-
-# type: Content of: <sect1><sect2><sect3><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:453
-#, fuzzy
-#| msgid ""
-#| "Packages <emphasis>must</emphasis> be named in the prescribed way. One "
-#| "simple way to is to use <command>dpkg-name</command>. FIXME"
-msgid ""
-"Packages <emphasis>must</emphasis> be named in the prescribed way. One "
-"simple way to do this is to use <command>dpkg-name</command>. FIXME"
-msgstr ""
-"Les paquets <emphasis>doivent</emphasis> être nommés de la façon décrite. Le "
-"plus simple est d'utiliser <command>dpkg-name</command>. À corriger"
-
-# type: Content of: <sect1><sect2><sect3><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:458
-#, fuzzy
-#| msgid ""
-#| "Using <filename>chroot_local-packages</filename> for installation of "
-#| "custom packages has two disadvantages:"
-msgid ""
-"Using <filename>chroot_local-packages</filename> for installation of custom "
-"packages has disadvantages:"
-msgstr ""
-"L'utilisation de <filename>chroot_local-packages</filename> lors de "
-"l'installation de paquets modifiés présente deux inconvénients :"
-
-# type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/customization/packages.xml:466
-msgid "It is not possible to use secure APT"
-msgstr "Il n'est pas possible d'utiliser APT de façon sécurisée"
-
-# type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/customization/packages.xml:472
-msgid ""
-"You must install all appropriate packages in the <command>config/"
-"chroot_local-packages</command> directory"
-msgstr ""
-"Il est nécessaire d'installer tous les paquets appropriés dans le répertoire "
-"<command>config/chroot_local-packages</command>"
-
-# type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/chapters/customization/packages.xml:479
-#, fuzzy
-#| msgid ""
-#| "Does not lend itself to storing Debian Live configurations in revision "
-#| "control"
-msgid ""
-"It does not lend itself to storing Debian Live configurations in revision "
-"control"
-msgstr ""
-"Ça ne se prête pas à l'enregistrement de configurations Debian Live lors de "
-"contrôles de révisions"
-
-# type: Content of: <sect1><sect2><sect3><title>
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/packages.xml:489
-msgid "Using an APT repository to install custom packages"
-msgstr "Utilisation de répertoires APT pour installer des paquets modifiés"
-
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:496
-msgid ""
-"Unlike using <filename>chroot_local-packages</filename>, when using a custom "
-"APT repository you must ensure that you specify the packages elsewhere. See "
-"<xref linkend=\"lh-packages\"/> for details."
-msgstr ""
-
-# type: Content of: <sect1><sect2><sect3><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:502
-#, fuzzy
-#| msgid ""
-#| "Whilst it may seem unnecessary effort to create an APT repository to "
-#| "install custom packages, the infrastructure can be easily re-used at a "
-#| "later date to offer updates of the modified package."
-msgid ""
-"Whilst it may seem unnecessary effort to create an APT repository to install "
-"custom packages, the infrastructure can be easily re-used at a later date to "
-"offer updates of the modified packages."
-msgstr ""
-"Bien que la création d'un dépôt APT paraisse superflue pour installer des "
-"paquets modifiés, une telle infrastructure peut aisément être réutilisée "
-"afin d'offrir ultérieurement des mises à jour des paquets modifiés."
-
-# type: Content of: <sect1><sect2><sect3><title>
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/packages.xml:510
-msgid "Custom packages and APT"
-msgstr "APT et paquets modifiés"
-
-# type: Content of: <sect1><sect2><sect3><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:513
-#, fuzzy
-#| msgid ""
-#| "&live-helper; uses APT to install all packages into the live system so "
-#| "will therefore inherit behaviours from this program. One relevant example "
-#| "is that (assuming a default configuration) given a package is available "
-#| "in two different repositories, APT will elect to install the package with "
-#| "a higher version number over one with the lower."
-msgid ""
-"&live-helper; uses APT to install all packages into the live system so will "
-"therefore inherit behaviours from this program. One relevant example is that "
-"(assuming a default configuration) given a package available in two "
-"different repositories with different version numbers, APT will elect to "
-"install the package with the higher version number."
-msgstr ""
-"&live-helper; fait appel à APT pour installer tous les paquets sur le "
-"système live, et hérite donc des comportements de ce programme. Pour donner "
-"un exemple pertinent, avec une configuration par défaut, si un paquet est "
-"disponible dans deux dépôts différents, APT choisira d'installer le paquet "
-"dont le numéro de version est le plus élevé."
-
-# type: Content of: <sect1><sect2><sect3><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:521
-#, fuzzy
-#| msgid ""
-#| "Because of this. you may wish to increment the version number in your "
-#| "custom packages' <command>debian/changelog</command> files to ensure that "
-#| "your modified version is installed over one in the official Debian "
-#| "repositories. This may also be achieved by altering the live system's APT "
-#| "pinning preferences - see <xref linkend=\"apt-preferences\"/> for more "
-#| "information."
-msgid ""
-"Because of this, you may wish to increment the version number in your custom "
-"packages' <command>debian/changelog</command> files to ensure that your "
-"modified version is installed over one in the official Debian repositories. "
-"This may also be achieved by altering the live system's APT pinning "
-"preferences - see <xref linkend=\"apt-preferences\"/> for more information."
-msgstr ""
-"Pour ces raisons, vous pouvez choisir d'incrémenter les numéros de version "
-"dans les fichiers <command>debian/changelog</command> de vos paquets "
-"modifiés afin de vous assurer qu'ils soient installés plutôt que les "
-"versions des dépôts Debian officiels. Vous pouvez également modifier les "
-"préférences de priorité APT du système live. Voir <xref linkend=\"apt-"
-"preferences\"/> pour de plus amples informations"
-
-# type: Content of: <sect1><sect2><sect3><title>
-#. type: Content of: <sect1><sect2><sect3><title>
-#: en/chapters/customization/packages.xml:532
-msgid "Altering APT preferences during Live system"
-msgstr "Modification des préférences APT lors d'une session Live"
-
-# type: Content of: <sect1><sect2><sect3><para>
-#. type: Content of: <sect1><sect2><sect3><para>
-#: en/chapters/customization/packages.xml:539
-msgid ""
-"Whilst it may seem unnecessary effort to create an APT repository to install "
-"custom packages, the infrastructure can be easily re-used at a later date to "
-"offer updates of the modified package."
-msgstr ""
-"Bien que la création d'un dépôt APT paraisse superflue pour installer des "
-"paquets modifiés, une telle infrastructure peut aisément être réutilisée "
-"afin d'offrir ultérieurement des mises à jour des paquets modifiés."
diff --git a/manual/po/fr/procedures.xml.po b/manual/po/fr/procedures.xml.po
deleted file mode 100644
index 47eee9c..0000000
--- a/manual/po/fr/procedures.xml.po
+++ /dev/null
@@ -1,178 +0,0 @@
-# French translations for PACKAGE package
-# Copyright (C) 2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# Automatically generated, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2009-02-27 18:09+0100\n"
-"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> "
-"<christophenagel at gmail.com>\n"
-"Language-Team: none\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-# type: Content of: <chapter><title>
-#. type: Content of: <chapter><title>
-#: en/chapters/procedures.xml:7
-msgid "Procedures"
-msgstr "Procédures"
-
-# type: Content of: <chapter><para>
-#. type: Content of: <chapter><para>
-#: en/chapters/procedures.xml:9
-msgid ""
-"This chapter documents the procedures within the Debian Live project for "
-"various tasks that need cooperation with other teams in Debian."
-msgstr ""
-"Ce chapitre documente les procédures du projet Debian Live pour diverses "
-"tâches nécéssitant la coopération avec d'autres équipes de Debian."
-
-#. type: Content of: <chapter><sect1><title>
-#: en/chapters/procedures.xml:12
-msgid "Udeb Uploads"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><para>
-#: en/chapters/procedures.xml:14
-msgid "Before commiting releases of a udeb in d-i svn, one has to call:"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><screen>
-#: en/chapters/procedures.xml:15
-#, no-wrap
-msgid "<command>../../scripts/l10n/output-l10n-changes . -d</command>"
-msgstr ""
-
-# type: Content of: <chapter><sect1><title>
-#. type: Content of: <chapter><sect1><title>
-#: en/chapters/procedures.xml:19
-msgid "Major Releases"
-msgstr "Versions Majeurs"
-
-# type: Content of: <chapter><sect1><para>
-#. type: Content of: <chapter><sect1><para>
-#: en/chapters/procedures.xml:21
-msgid ""
-"Releasing a new stable major version of Debian includes a lot of different "
-"teams working together to make it happen. At some point, the Live team comes "
-"in and builds live system images. The requirements to do this are:"
-msgstr ""
-
-# type: Content of: <chapter><sect1><title>
-#. type: Content of: <chapter><sect1><title>
-#: en/chapters/procedures.xml:34
-msgid "Point Releases"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><sect2><title>
-#: en/chapters/procedures.xml:44
-msgid "Point release announcement template"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><sect2><para>
-#: en/chapters/procedures.xml:46
-msgid ""
-"An annoucement mail for point releases can be generated using the template "
-"below and the following command:"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><sect2><screen>
-#: en/chapters/procedures.xml:49
-#, no-wrap
-msgid ""
-"$ sed \\\n"
-"  -e 's|%major%|5.0|g' \\\n"
-"  -e 's|%minor%|5.0.2|g' \\\n"
-"  -e 's|%codename%|lenny|g' \\\n"
-"  -e 's|%release_mail%|2009/msg00007.html|g'\n"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><sect2><para>
-#: en/chapters/procedures.xml:56
-msgid ""
-"Please check the mail carefully before sending and pass it to others for "
-"proof-reading."
-msgstr ""
-
-#. type: Content of: <chapter><sect1><sect2><screen>
-#: en/chapters/procedures.xml:59
-#, no-wrap
-msgid ""
-"Debian Live images for Debian GNU/Linux %major% updated\n"
-"\n"
-"The Debian Live project is pleased to announce the availability of\n"
-"updated Live images for its stable distribution Debian GNU/Linux %major%\n"
-"(codename \"%codename%\").\n"
-"\n"
-"The images are available for download at:\n"
-"\n"
-"    &lt;http://cdimage.debian.org/cdimage/release/current-live/&gt;\n"
-"\n"
-"This update incorporates the changes made in the %minor% point release,\n"
-"which adds corrections for security problems to the stable release\n"
-"along with a few adjustments for serious problems. A full list of the\n"
-"changes may be viewed at:\n"
-"\n"
-"    &lt;http://lists.debian.org/debian-announce/%release_mail%&gt;\n"
-"\n"
-"It also includes the following Live-specific changes:\n"
-"\n"
-" * [INSERT LIVE-SPECIFIC CHANGE HERE]\n"
-" * [INSERT LIVE-SPECIFIC CHANGE HERE]\n"
-" * [LARGER ISSUES MAY DESERVE THEIR OWN SECTION]\n"
-"\n"
-"\n"
-"URLs\n"
-"----\n"
-"\n"
-"Download location of updated images:\n"
-"\n"
-"  &lt;http://cdimage.debian.org/cdimage/release/current-live/&gt;\n"
-"\n"
-"Debian Live project homepage:\n"
-"\n"
-"  &lt;http://live.debian.net/&gt;\n"
-"\n"
-"The current stable distribution:\n"
-"\n"
-"  &lt;http://ftp.debian.org/debian/dists/stable&gt;\n"
-"\n"
-"stable distribution information (release notes, errata etc.):\n"
-"\n"
-"  &lt;http://www.debian.org/releases/stable/&gt;\n"
-"\n"
-"Security announcements and information:\n"
-"\n"
-"  &lt;http://www.debian.org/security/&gt;\n"
-"\n"
-"\n"
-"About Debian\n"
-"-------------\n"
-"\n"
-"The Debian Project is an association of Free Software developers who\n"
-"volunteer their time and effort in order to produce the completely free\n"
-"operating system Debian GNU/Linux.\n"
-"\n"
-"\n"
-"About Debian Live\n"
-"-----------------\n"
-"\n"
-"Debian Live is an official sub-project of Debian which produces Debian\n"
-"systems that do not require a classical installer. Images are available\n"
-"for CD/DVD discs, USB sticks and PXE netbooting as well as a bare\n"
-"filesystem images for booting directly from the internet.\n"
-"\n"
-"\n"
-"Contact Information\n"
-"-------------------\n"
-"\n"
-"For further information, please visit the Debian Live web pages at\n"
-"&lt;http://live.debian.net/&gt; or alternatively send mail to\n"
-"&lt;debian-live at lists.debian.org&gt;.\n"
-msgstr ""
diff --git a/manual/po/fr/resources.xml.po b/manual/po/fr/resources.xml.po
deleted file mode 100644
index d6d3737..0000000
--- a/manual/po/fr/resources.xml.po
+++ /dev/null
@@ -1,116 +0,0 @@
-# French translations for Debconf package
-# Copyright (C) 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the Debconf package.
-# Automatically generated, 2008.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Debconf 8\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2009-02-27 13:18+0100\n"
-"Last-Translator: Flori Laurent & Christophe Nagel<flori.laurent at gmail.com> "
-"<christophenagel at gmail.com>\n"
-"Language-Team: none\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><para>
-#: en/about_manual.xml:125 en/customization_bootup.xml:11
-#: en/customization_bootup.xml:20 en/customization_bootup.xml:26
-#: en/customization_bootup.xml:38 en/customization_bootup.xml:85
-#: en/customization_bootup.xml:92 en/customization_bootup.xml:99
-#: en/customization_bootup.xml:106 en/customization_packages.xml:36
-#: en/customization_packages.xml:306 en/customization_packages.xml:326
-#: en/customization_packages.xml:384 en/customization_packages.xml:492
-#: en/customization_packages.xml:535 en/live-environment.xml:11
-#: en/resources.xml:11 en/success-stories.xml:11
-msgid "FIXME"
-msgstr "FIXME"
-
-# type: Content of: <chapter><title>
-#. type: Content of: <chapter><title>
-#: en/resources.xml:7
-msgid "Resources and links"
-msgstr "Ressources et Liens"
-
-# type: Content of: <chapter><section><title>
-#. type: Content of: <chapter><section><title>
-#: en/resources.xml:10
-msgid "Links"
-msgstr "Liens"
-
-# type: Content of: <chapter><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/resources.xml:14
-msgid "<ulink url=\"http://www.debian.org/\">Debian homepage</ulink>"
-msgstr "<ulink url=\"http://www.debian.org/\">Page de démarrage Debian</ulink>"
-
-#. type: Content of: <chapter><section><title>
-#: en/resources.xml:20
-msgid "English sources related to debian live"
-msgstr ""
-
-# type: Content of: <chapter><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/resources.xml:22
-#, fuzzy
-#| msgid "<ulink url=\"http://www.debian.org/\">Debian homepage</ulink>"
-msgid ""
-"<ulink url=\"http://en.wikipedia.org/wiki/Debian_Live\">Debian_Live "
-"definition on Wikipedia </ulink>"
-msgstr "<ulink url=\"http://www.debian.org/\">Page de démarrage Debian</ulink>"
-
-#. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/resources.xml:23
-msgid ""
-"<ulink url=\"http://layer-acht.org/slides/20070115_debian-live_LCA2007.odp"
-"\"> Presentation on Debian-Live </ulink>"
-msgstr ""
-
-#. type: Content of: <chapter><section><title>
-#: en/resources.xml:28
-msgid "German sources related to debian live"
-msgstr ""
-
-#. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/resources.xml:30
-msgid ""
-"<ulink url=\"http://wiki.skolelinux.de/DebianLive\"> German translation "
-"(work in progress) </ulink>"
-msgstr ""
-
-#. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/resources.xml:31
-msgid ""
-"<ulink url=\"http://www.linux-magazin.de/online_artikel/"
-"workshop_debian_live_system_mit_etch\"> Article in linux-magazin.de </ulink>"
-msgstr ""
-
-# type: Content of: <chapter><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/resources.xml:32
-#, fuzzy
-#| msgid "<ulink url=\"http://www.debian.org/\">Debian homepage</ulink>"
-msgid ""
-"<ulink url=\"http://wiki.freenetproject.org/deDebianLiveCD\"> Another german "
-"documentation </ulink>"
-msgstr "<ulink url=\"http://www.debian.org/\">Page de démarrage Debian</ulink>"
-
-#. type: Content of: <chapter><section><title>
-#: en/resources.xml:37
-msgid "Spanish sources related to debian live"
-msgstr ""
-
-# type: Content of: <chapter><section><orderedlist><listitem><para>
-#. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/resources.xml:39
-#, fuzzy
-#| msgid "<ulink url=\"http://www.debian.org/\">Debian homepage</ulink>"
-msgid ""
-"<ulink url=\"http://el-directorio.org/DebianLive\"> Spanish documentation "
-"project </ulink>"
-msgstr "<ulink url=\"http://www.debian.org/\">Page de démarrage Debian</ulink>"
diff --git a/manual/po/fr/success-stories.xml.po b/manual/po/fr/success-stories.xml.po
deleted file mode 100644
index 22de5f5..0000000
--- a/manual/po/fr/success-stories.xml.po
+++ /dev/null
@@ -1,44 +0,0 @@
-# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
-"PO-Revision-Date: 2010-06-06 12:07+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-# type: Content of: <chapter><section><para>
-#. type: Content of: <chapter><para>
-#: en/about_manual.xml:125 en/customization_bootup.xml:11
-#: en/customization_bootup.xml:20 en/customization_bootup.xml:26
-#: en/customization_bootup.xml:38 en/customization_bootup.xml:85
-#: en/customization_bootup.xml:92 en/customization_bootup.xml:99
-#: en/customization_bootup.xml:106 en/customization_packages.xml:36
-#: en/customization_packages.xml:306 en/customization_packages.xml:326
-#: en/customization_packages.xml:384 en/customization_packages.xml:492
-#: en/customization_packages.xml:535 en/live-environment.xml:11
-#: en/resources.xml:11 en/success-stories.xml:11
-msgid "FIXME"
-msgstr "FIXME"
-
-#. type: Content of: <chapter><title>
-#: en/success-stories.xml:7
-msgid "Success Stories"
-msgstr ""
-
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><para>
-#: en/success-stories.xml:9
-#, fuzzy
-#| msgid "This is currently NOT possible with Debian Live."
-msgid "This chapter documents success stories with Debian Live applied."
-msgstr "Ceci n'est pour l'instant PAS possible dans Debian Live."
diff --git a/manual/po/fr/troubleshooting.xml.po b/manual/po/fr/troubleshooting.xml.po
deleted file mode 100644
index eff8ac1..0000000
--- a/manual/po/fr/troubleshooting.xml.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2010-06-06 12:07+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. type: Content of: <chapter><title>
-#: en/chapters/troubleshooting.xml:7
-msgid "Hints for troubleshooting"
-msgstr ""
-
-#. type: Content of: <chapter><para>
-#: en/chapters/troubleshooting.xml:9
-msgid "To check on the client"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/chapters/troubleshooting.xml:13
-msgid "look at /live.log and /netboot.conf"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/chapters/troubleshooting.xml:16
-msgid "could the image be mounted"
-msgstr ""
-
-#. type: Content of: <chapter><para>
-#: en/chapters/troubleshooting.xml:20
-msgid "To check on the pc that creates the image"
-msgstr ""
-
-#. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/chapters/troubleshooting.xml:24
-msgid "was chroot unmounted after build? (it should)"
-msgstr ""
diff --git a/manual/po/fr/use-cases.xml.po b/manual/po/fr/use-cases.xml.po
deleted file mode 100644
index 60e3319..0000000
--- a/manual/po/fr/use-cases.xml.po
+++ /dev/null
@@ -1,134 +0,0 @@
-# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
-"PO-Revision-Date: 2010-06-06 12:07+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-# type: Content of: <chapter><section><screen>
-#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/basics.xml:128 en/chapters/basics.xml:239
-#: en/chapters/basics.xml:382 en/chapters/use-cases.xml:59
-#, fuzzy, no-wrap
-msgid "# lh build"
-msgstr "# lh_build"
-
-#. type: Content of: <chapter><title>
-#: en/chapters/use-cases.xml:7
-msgid "Use Cases"
-msgstr ""
-
-# type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#. type: Content of: <chapter><para>
-#: en/chapters/use-cases.xml:9
-#, fuzzy
-#| msgid "This is currently NOT possible with Debian Live."
-msgid "This chapter is for users to document their use cases with Debian Live."
-msgstr "Ceci n'est pour l'instant PAS possible dans Debian Live."
-
-#. type: Content of: <chapter><sect1><title>
-#: en/chapters/use-cases.xml:12
-msgid "VNC Kiosk Client"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><para>
-#: en/chapters/use-cases.xml:13
-msgid "Create an image with &live-helper; to boot directly to a VNC server."
-msgstr ""
-
-# type: Content of: <sect1><sect2><screen>
-#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/use-cases.xml:18
-#, fuzzy, no-wrap
-#| msgid "$ make build"
-msgid "$ mkdir vncBuild"
-msgstr "$ make build"
-
-#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/chapters/use-cases.xml:17
-msgid "Make a build directory: <placeholder type=\"screen\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/use-cases.xml:24
-#, no-wrap
-msgid "$ cd vncBuild"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/chapters/use-cases.xml:23
-msgid "Move to the build directory: <placeholder type=\"screen\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/use-cases.xml:30
-#, no-wrap
-msgid "$ lh config --packages \"gdm metacity xtightvncviewer\""
-msgstr ""
-
-#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/chapters/use-cases.xml:29
-msgid ""
-"Example to config the build directory to include gdm metacity "
-"xtightvncviewer: <placeholder type=\"screen\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/use-cases.xml:36
-#, no-wrap
-msgid "$ mkdir -p config/chroot_local-includes/etc/skel"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/chapters/use-cases.xml:35
-msgid ""
-"Create a folder /etc/skel folder for a custom .xsession for the default "
-"user: <placeholder type=\"screen\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/use-cases.xml:42
-#, no-wrap
-msgid "$ touch config/chroot_local-includes/etc/skel/.xsession"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/chapters/use-cases.xml:41
-msgid ""
-"Create the .xsession for the default user: <placeholder type=\"screen\" id="
-"\"0\"/>"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/use-cases.xml:49
-#, no-wrap
-msgid ""
-"\t#!/bin/sh\n"
-"\t/usr/bin/metacity &amp;\n"
-"\t/usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT\n"
-"\texit\n"
-"\t"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/chapters/use-cases.xml:47
-msgid ""
-"Edit the .xsession file to launch metacity and start xvncviewer with "
-"something similar to the below: <placeholder type=\"screen\" id=\"0\"/>"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/chapters/use-cases.xml:58
-msgid "Build the image: <placeholder type=\"screen\" id=\"0\"/>"
-msgstr ""
diff --git a/manual/po4a.cfg b/manual/po4a.cfg
index ac310fa..ee8357a 100644
--- a/manual/po4a.cfg
+++ b/manual/po4a.cfg
@@ -1,4 +1,4 @@
-[po4a_langs] de fr
+[po4a_langs] de
 [po4a_paths] pot/$master.pot $lang:po/$lang/$master.po
 [type: docbook] en/about_manual.xml $lang:$lang/about_manual.xml
 [type: docbook] en/about_project.xml $lang:$lang/about_project.xml
diff --git a/manual/pot/about_manual.xml.pot b/manual/pot/about_manual.xml.pot
index 6bd8df8..ad6bf83 100644
--- a/manual/pot/about_manual.xml.pot
+++ b/manual/pot/about_manual.xml.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Transfer-Encoding: ENCODING"
 
 #. type: Content of: <sect1><title>
-#: en/about_manual.xml:9
+#: en/about_manual.xml:6
 msgid "About this manual"
 msgstr ""
 
 #. type: Content of: <sect1><para>
-#: en/about_manual.xml:12
+#: en/about_manual.xml:7
 msgid ""
 "The main goal of this manual is to serve as a single access point to all "
 "documentation related to the Debian Live project. It does not include end-"
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><para>
-#: en/about_manual.xml:18
+#: en/about_manual.xml:8
 msgid ""
 "Some of the commands mentioned in the text must be executed with superuser "
 "privileges which can be obtained by becoming the root user via <filename>su</"
@@ -40,44 +40,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/about_manual.xml:28
+#: en/about_manual.xml:10
 msgid "Terms"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:33
+#: en/about_manual.xml:13
 msgid "Live system"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:37
+#: en/about_manual.xml:15
 msgid ""
-"An operating system that can boot without installation to a hard drive.  "
-"Live systems do not alter local operating system(s) or file(s) already "
-"installed on the computer hard drive unless instructed to do so. Live "
-"systems are typically booted from media such as CDs or DVDs, some may also "
-"boot with USB sticks or over the network (via netboot images)."
+"An operating system that can boot without installation to a hard drive. Live "
+"systems do not alter local operating system(s) or file(s) already installed "
+"on the computer hard drive unless instructed to do so. Live systems are "
+"typically booted from media such as CDs or DVDs, some may also boot with USB "
+"sticks or over the network (via netboot images)."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:47
+#: en/about_manual.xml:19
 msgid "Debian Live"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:51
+#: en/about_manual.xml:21
 msgid ""
 "The Debian sub-project which maintains the &live-helper; and &live-"
 "initramfs; utilities."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:58
+#: en/about_manual.xml:25
 msgid "Debian Live system"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:62
+#: en/about_manual.xml:27
 msgid ""
 "A live system that uses software from the Debian operating system that may "
 "be booted from CDs, DVDs, USB sticks, over the network (via netboot images), "
@@ -85,118 +85,118 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:70
+#: en/about_manual.xml:31
 msgid "Build system / host system"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:74
+#: en/about_manual.xml:33
 msgid "The environment used to create the live system."
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: en/about_manual.xml:80 en/overview.xml:17
+#: en/about_manual.xml:37 en/overview.xml:9
 msgid "&live-helper;"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:84
+#: en/about_manual.xml:39
 msgid "A collection of scripts used to build customised Debian Live systems."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/about_manual.xml:90 en/installation.xml:76
+#: en/about_manual.xml:43 en/installation.xml:71
 msgid "&live-initramfs;"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:94
+#: en/about_manual.xml:45
 msgid ""
 "A collection of scripts used to boot live systems. &live-initramfs; is a "
 "fork of <filename>casper</filename> by Canonical, Ltd."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:101
+#: en/about_manual.xml:50
 msgid "<filename>live-package</filename>"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:105
+#: en/about_manual.xml:53
 msgid "The former name of &live-helper;."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:111
+#: en/about_manual.xml:57
 msgid "Debian Installer / (d-i)"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:115
+#: en/about_manual.xml:59
 msgid "The official installation system for the Debian distribution."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/about_manual.xml:121 en/customization_bootup.xml:104
+#: en/about_manual.xml:63 en/customization_bootup.xml:48
 msgid "Cheat codes"
 msgstr ""
 
 #. type: Content of: <chapter><para>
-#: en/about_manual.xml:125 en/customization_bootup.xml:11
-#: en/customization_bootup.xml:20 en/customization_bootup.xml:26
-#: en/customization_bootup.xml:38 en/customization_bootup.xml:85
-#: en/customization_bootup.xml:92 en/customization_bootup.xml:99
-#: en/customization_bootup.xml:106 en/customization_packages.xml:36
-#: en/customization_packages.xml:306 en/customization_packages.xml:326
-#: en/customization_packages.xml:384 en/customization_packages.xml:492
-#: en/customization_packages.xml:535 en/live-environment.xml:11
-#: en/resources.xml:11 en/success-stories.xml:11
+#: en/about_manual.xml:65 en/customization_bootup.xml:8
+#: en/customization_bootup.xml:14 en/customization_bootup.xml:17
+#: en/customization_bootup.xml:25 en/customization_bootup.xml:37
+#: en/customization_bootup.xml:41 en/customization_bootup.xml:45
+#: en/customization_bootup.xml:49 en/customization_packages.xml:18
+#: en/customization_packages.xml:130 en/customization_packages.xml:138
+#: en/customization_packages.xml:160 en/customization_packages.xml:198
+#: en/customization_packages.xml:209 en/live-environment.xml:9
+#: en/resources.xml:9 en/success-stories.xml:8
 msgid "FIXME"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:131
+#: en/about_manual.xml:69
 msgid "chroot"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:135
+#: en/about_manual.xml:71
 msgid ""
 "The chroot program, chroot(8), enables us to run different instances of the "
 "GNU/Linux environment on a single system simultaneously without rebooting."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:143
+#: en/about_manual.xml:75
 msgid "binary image"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:147
+#: en/about_manual.xml:77
 msgid ""
 "On a live system, binary image refers to the binary filesystem and the "
 "respective extension, such as binary.iso or binary.img."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:154
+#: en/about_manual.xml:81
 msgid "Target distribution"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:158
+#: en/about_manual.xml:83
 msgid ""
 "The distribution upon which your live system will be based. This can differ "
 "from the distribution of your Build System."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_manual.xml:165
+#: en/about_manual.xml:87
 msgid "&lenny;/&squeeze;/&sid; stable/testing/unstable"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:169
+#: en/about_manual.xml:89
 msgid ""
 "The \"stable\" distribution contains the latest officially released "
 "distribution of Debian. The \"testing\" distribution is the staging area for "
@@ -208,7 +208,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_manual.xml:179
+#: en/about_manual.xml:90
 msgid ""
 "At the time of writing, &lenny; is the current \"stable\" release and "
 "&squeeze; is the current \"testing\" release. &sid; will always be a synonym "
@@ -216,91 +216,91 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/about_manual.xml:191
+#: en/about_manual.xml:96
 msgid "Authors"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:194
+#: en/about_manual.xml:97
 msgid "A list of authors (in alphabetical order):"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:201
+#: en/about_manual.xml:100
 msgid "Ben Armstrong"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:207
+#: en/about_manual.xml:103
 msgid "Brendan Sleight"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:213
+#: en/about_manual.xml:106
 msgid "Chris Lamb"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:219
+#: en/about_manual.xml:109
 msgid "Daniel Baumann"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:225
+#: en/about_manual.xml:112
 msgid "Franklin Piat"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:231
+#: en/about_manual.xml:115
 msgid "Jonas Stein"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:237
+#: en/about_manual.xml:118
 msgid "Kai Hendry"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:243
+#: en/about_manual.xml:121
 msgid "Marco Amadori"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:249
+#: en/about_manual.xml:124
 msgid "Mathieu Geli"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:255
+#: en/about_manual.xml:127
 msgid "Matthias Kirschner"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:261
+#: en/about_manual.xml:130
 msgid "Richard Nelson"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><itemizedlist><listitem><para>
-#: en/about_manual.xml:267
+#: en/about_manual.xml:133
 msgid "Trent W. Buck"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/about_manual.xml:276
+#: en/about_manual.xml:138
 msgid "Contributing to this document"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:279
+#: en/about_manual.xml:139
 msgid ""
 "This manual is intended as a community project and all proposals for "
 "improvements and contributions are extremely welcome. The preferred way to "
 "submit a contribution is to send it to the mailing list. Please see <xref "
-"linkend=\"contact\" /> for more information."
+"linkend=\"contact\"/> for more information."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:286
+#: en/about_manual.xml:140
 msgid ""
 "When submitting a contribution please clearly identify its copyright holder "
 "and include the licensing statement. Note that to be accepted the "
@@ -309,43 +309,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:293
+#: en/about_manual.xml:141
 msgid ""
 "The sources for this manual are maintained using the Git version control "
 "system. You can checkout the latest copy by executing:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para><screen>
-#: en/about_manual.xml:298
+#: en/about_manual.xml:143
 #, no-wrap
 msgid "$ git clone git://live.debian.net/git/live-manual.git"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/about_manual.xml:298 en/about_manual.xml:308 en/about_manual.xml:318
-#: en/about_manual.xml:338 en/about_manual.xml:351 en/about_manual.xml:366
-#: en/about_manual.xml:379 en/about_manual.xml:389 en/basics.xml:113
-#: en/basics.xml:128 en/basics.xml:144 en/basics.xml:158 en/basics.xml:194
-#: en/basics.xml:220 en/basics.xml:230 en/basics.xml:239 en/basics.xml:253
-#: en/basics.xml:275 en/basics.xml:302 en/basics.xml:312 en/basics.xml:320
-#: en/basics.xml:354 en/basics.xml:364 en/basics.xml:382 en/basics.xml:429
-#: en/basics.xml:498 en/basics.xml:530 en/basics.xml:539 en/basics.xml:590
-#: en/basics.xml:646 en/customization_packages.xml:50
-#: en/customization_packages.xml:58 en/customization_packages.xml:71
-#: en/customization_packages.xml:80 en/customization_packages.xml:104
-#: en/customization_packages.xml:222 en/customization_packages.xml:230
-#: en/customization_packages.xml:265 en/customization_packages.xml:310
-#: en/customization_packages.xml:330 en/customization_packages.xml:341
-#: en/customization_packages.xml:352 en/customization_packages.xml:362
-#: en/faq.xml:64 en/faq.xml:241 en/faq.xml:244 en/faq.xml:252 en/faq.xml:256
-#: en/faq.xml:264 en/faq.xml:279 en/faq.xml:287 en/faq.xml:334 en/faq.xml:424
-#: en/faq.xml:430 en/faq.xml:481 en/faq.xml:483 en/faq.xml:487 en/faq.xml:491
-#: en/overview.xml:181 en/overview.xml:230 en/overview.xml:240
+#: en/about_manual.xml:143 en/about_manual.xml:147 en/about_manual.xml:151
+#: en/about_manual.xml:160 en/about_manual.xml:166 en/about_manual.xml:172
+#: en/about_manual.xml:178 en/about_manual.xml:184 en/basics.xml:45
+#: en/basics.xml:50 en/basics.xml:57 en/basics.xml:60 en/basics.xml:72
+#: en/basics.xml:81 en/basics.xml:85 en/basics.xml:89 en/basics.xml:95
+#: en/basics.xml:105 en/basics.xml:118 en/basics.xml:122 en/basics.xml:126
+#: en/basics.xml:139 en/basics.xml:143 en/basics.xml:148 en/basics.xml:160
+#: en/basics.xml:170 en/basics.xml:182 en/basics.xml:186 en/basics.xml:205
+#: en/basics.xml:220 en/customization_packages.xml:25
+#: en/customization_packages.xml:29 en/customization_packages.xml:34
+#: en/customization_packages.xml:38 en/customization_packages.xml:48
+#: en/customization_packages.xml:102 en/customization_packages.xml:106
+#: en/customization_packages.xml:116 en/customization_packages.xml:132
+#: en/customization_packages.xml:140 en/customization_packages.xml:144
+#: en/customization_packages.xml:148 en/customization_packages.xml:152
+#: en/faq.xml:36 en/faq.xml:128 en/faq.xml:131 en/faq.xml:138 en/faq.xml:141
+#: en/faq.xml:163 en/faq.xml:188 en/faq.xml:210 en/overview.xml:61
+#: en/overview.xml:66 en/overview.xml:70
 msgid "<placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:302
+#: en/about_manual.xml:145
 msgid ""
 "Prior to submission of your contribution, please preview your work. To "
 "preview the live-manual, ensure the packages needed for building are "
@@ -353,84 +352,72 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para><screen>
-#: en/about_manual.xml:308
+#: en/about_manual.xml:147
 #, no-wrap
-msgid ""
-"# apt-get install dblatex docbook-xml docbook-xsl make po4a\n"
-"\tw3m"
+msgid "# apt-get install dblatex docbook-xml docbook-xsl make po4a w3m"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/about_manual.xml:313
+#: en/about_manual.xml:149
 msgid ""
 "You may build the live-manual from the top level directory of your git "
 "checkout by executing:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para><screen>
-#: en/about_manual.xml:318
+#: en/about_manual.xml:151
 #, no-wrap
 msgid "$ make build"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_manual.xml:322
+#: en/about_manual.xml:154
 msgid "Applying patches"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_manual.xml:325
+#: en/about_manual.xml:155
 msgid ""
 "Directly commiting to the repository is possible by anyone. However, we ask "
-"you to send bigger changes to the mailinglist to discuss them first.  In "
+"you to send bigger changes to the mailinglist to discuss them first. In "
 "order to push to the repository, the following steps are required."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about_manual.xml:334
+#: en/about_manual.xml:158
 msgid "Fetch the public commit key:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:338
+#: en/about_manual.xml:160
 #, no-wrap
-msgid ""
-"$ mkdir -p ~/.ssh/identity.d\n"
-"$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live -O ~/.ssh/identity.d/live-manual at debian-live\n"
-"$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub -O ~/.ssh/identity.d/live-manual at debian-live.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*"
+msgid "$ mkdir -p ~/.ssh/identity.d $ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live -O ~/.ssh/identity.d/live-manual at debian-live $ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub -O ~/.ssh/identity.d/live-manual at debian-live.pub $ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about_manual.xml:347
+#: en/about_manual.xml:164
 msgid "Add the following section to your openssh-client config:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:351
+#: en/about_manual.xml:166
 #, no-wrap
-msgid ""
-" $ cat &gt;&gt; ~/.ssh/config &lt;&lt; EOF\n"
-"Host live.debian.net\n"
-"\tHostname live.debian.net\n"
-"\tUser gitosis\n"
-"\tIdentityFile ~/.ssh/identity.d/live-manual at debian-live\n"
-"EOF"
+msgid " $ cat &gt;&gt; ~/.ssh/config &lt;&lt; EOF Host live.debian.net Hostname live.debian.net User gitosis IdentityFile ~/.ssh/identity.d/live-manual at debian-live EOF"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about_manual.xml:362
+#: en/about_manual.xml:170
 msgid "Checkout a clone of the manual through ssh:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:366
+#: en/about_manual.xml:172
 #, no-wrap
 msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about_manual.xml:372
+#: en/about_manual.xml:176
 msgid ""
 "Commit the file after editing. Write commit messages, that consist of full "
 "useful sentences, starting with a capital letter and ending with a full "
@@ -438,18 +425,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:379
+#: en/about_manual.xml:178
 #, no-wrap
 msgid "$ git commit -a"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para>
-#: en/about_manual.xml:385
+#: en/about_manual.xml:182
 msgid "Push the commit to the server:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><itemizedlist><listitem><para><screen>
-#: en/about_manual.xml:389
+#: en/about_manual.xml:184
 #, no-wrap
 msgid "$ git push"
 msgstr ""
diff --git a/manual/pot/about_project.xml.pot b/manual/pot/about_project.xml.pot
index 0ed4ce9..64a46c3 100644
--- a/manual/pot/about_project.xml.pot
+++ b/manual/pot/about_project.xml.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,22 +16,22 @@ msgstr ""
 "Content-Transfer-Encoding: ENCODING"
 
 #. type: Content of: <sect1><title>
-#: en/about_project.xml:7
+#: en/about_project.xml:6
 msgid "About the Debian Live Project"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/about_project.xml:10
+#: en/about_project.xml:8
 msgid "Motivation"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_project.xml:13
+#: en/about_project.xml:10
 msgid "What is wrong with current live systems"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:15
+#: en/about_project.xml:11
 msgid ""
 "There are already several Debian-based live systems and they are doing a "
 "great job. But, from the Debian perspective most of them have one or more of "
@@ -39,12 +39,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:18
+#: en/about_project.xml:14
 msgid "They are unofficial projects, developed outside of Debian."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:19
+#: en/about_project.xml:17
 msgid "They mix different distributions, e.g. testing and unstable."
 msgstr ""
 
@@ -54,44 +54,44 @@ msgid "They support i386 only."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:21
+#: en/about_project.xml:23
 msgid ""
 "They modify the behaviour and/or appearance of packages by stripping them "
 "down to save space."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:22
+#: en/about_project.xml:26
 msgid "They include unofficial packages."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:23
+#: en/about_project.xml:29
 msgid ""
 "They ship custom kernels with additional patches that are not part of Debian."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:24
+#: en/about_project.xml:32
 msgid ""
 "They are large and slow due to their sheer size and thus not suitable for "
 "rescue issues."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:25
+#: en/about_project.xml:35
 msgid ""
 "They are not available in different flavours, e.g. CDs, DVDs, USB-stick and "
-"netboot images"
+"netboot images."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_project.xml:30
+#: en/about_project.xml:40
 msgid "Why create our own live system?"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:32
+#: en/about_project.xml:41
 msgid ""
 "Debian is the Universal Operating System: Debian should have an official "
 "live system for showing around and to officially represent the true, one and "
@@ -99,47 +99,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:35
+#: en/about_project.xml:44
 msgid "It would be an official Debian subproject."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:36
+#: en/about_project.xml:47
 msgid "It reflects the (current) state of one distribution."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:37
+#: en/about_project.xml:50
 msgid "It runs on as many architectures as possible."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:38
+#: en/about_project.xml:53
 msgid "It consists of unchanged Debian packages only."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:39
+#: en/about_project.xml:56
 msgid "It does not contain any unofficial packages."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/about_project.xml:40
+#: en/about_project.xml:59
 msgid "It uses an unaltered Debian kernel-image with no additional patches."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/about_project.xml:48
+#: en/about_project.xml:65
 msgid "Philosophy"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_project.xml:51
+#: en/about_project.xml:67
 msgid "Only unchanged, official packages"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:52
+#: en/about_project.xml:68
 msgid ""
 "We will only use official packages from the Debian repository in the \"main"
 "\" section (possibly contrib, although not decided yet). The non-free "
@@ -148,14 +148,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:54
+#: en/about_project.xml:69
 msgid ""
 "We will not change any packages. Whenever we need to change something, we "
 "will do that in coordination with its package maintainer in Debian."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:56
+#: en/about_project.xml:70
 msgid ""
 "As an exception, our own packages such as &live-helper; or &live-initramfs; "
 "may temporarily be used from our own repository for development reasons (e."
@@ -164,12 +164,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_project.xml:60
+#: en/about_project.xml:73
 msgid "No package configuration of the live system"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:61
+#: en/about_project.xml:74
 msgid ""
 "In this phase we will not ship or install sample or alternative "
 "configurations. All packages are used in their default configuration as they "
@@ -177,14 +177,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:63
+#: en/about_project.xml:75
 msgid ""
 "Whenever we need a different default configuration, we will do that in "
 "coordination with its package maintainer in Debian."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:65
+#: en/about_project.xml:76
 msgid ""
 "A system for configuring packages is provided using debconf in <command>lh "
 "config</command> (use --preseed FILE) allowing custom configured packages to "
@@ -194,7 +194,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:67
+#: en/about_project.xml:77
 msgid ""
 "Exception: There are a few essential changes needed to bring a live system "
 "to life (e.g. configuring pam to allow empty passwords). These essential "
@@ -203,12 +203,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/about_project.xml:71
+#: en/about_project.xml:80
 msgid "Live system to hard disk installer"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:72
+#: en/about_project.xml:81
 msgid ""
 "For the moment we will not ship an installer to copy the live system to a "
 "partition on the hard disk. Although we keep the changes in the live system "
@@ -218,7 +218,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/about_project.xml:74
+#: en/about_project.xml:82
 msgid ""
 "Therefore, we will ship a copy of the regular DebianInstaller (resp. Debian "
 "Installer, Graphical Installer) instead, to allow users to perform a regular "
@@ -227,17 +227,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/about_project.xml:80
+#: en/about_project.xml:86
 msgid "Contact"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_project.xml:83
+#: en/about_project.xml:89
 msgid "Mailing list"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_project.xml:84
+#: en/about_project.xml:91
 msgid ""
 "The primary contact for the project is the <ulink url=\"http://lists.debian."
 "org/debian-live/\">mailing list</ulink>. You can email the list directly by "
@@ -247,12 +247,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_project.xml:87
+#: en/about_project.xml:95
 msgid "IRC"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_project.xml:88
+#: en/about_project.xml:97
 msgid ""
 "A number of users and developers are present in the <ulink url=\"irc://irc."
 "debian.org/#debian-live\">#debian-live</ulink> channel on <ulink url="
@@ -262,12 +262,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_project.xml:91
+#: en/about_project.xml:101
 msgid "BTS"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_project.xml:92
+#: en/about_project.xml:103
 msgid ""
 "The Debian Bug Tracking System (BTS) contains details of bugs reported by "
 "users and developers. Each bug is given a number, and is kept on file until "
@@ -276,12 +276,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/about_project.xml:95
+#: en/about_project.xml:107
 msgid "Wiki"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/about_project.xml:96
+#: en/about_project.xml:109
 msgid ""
 "The <ulink url=\"http://wiki.debian.org/DebianLive\">Debian Live wiki</"
 "ulink> is a place to gather information, discuss applied technologies, and "
diff --git a/manual/pot/basics.xml.pot b/manual/pot/basics.xml.pot
index 1b5596e..792a7a2 100644
--- a/manual/pot/basics.xml.pot
+++ b/manual/pot/basics.xml.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,56 +16,55 @@ msgstr ""
 "Content-Transfer-Encoding: ENCODING"
 
 #. type: Content of: <chapter><section><section><para>
-#: en/about_manual.xml:298 en/about_manual.xml:308 en/about_manual.xml:318
-#: en/about_manual.xml:338 en/about_manual.xml:351 en/about_manual.xml:366
-#: en/about_manual.xml:379 en/about_manual.xml:389 en/basics.xml:113
-#: en/basics.xml:128 en/basics.xml:144 en/basics.xml:158 en/basics.xml:194
-#: en/basics.xml:220 en/basics.xml:230 en/basics.xml:239 en/basics.xml:253
-#: en/basics.xml:275 en/basics.xml:302 en/basics.xml:312 en/basics.xml:320
-#: en/basics.xml:354 en/basics.xml:364 en/basics.xml:382 en/basics.xml:429
-#: en/basics.xml:498 en/basics.xml:530 en/basics.xml:539 en/basics.xml:590
-#: en/basics.xml:646 en/customization_packages.xml:50
-#: en/customization_packages.xml:58 en/customization_packages.xml:71
-#: en/customization_packages.xml:80 en/customization_packages.xml:104
-#: en/customization_packages.xml:222 en/customization_packages.xml:230
-#: en/customization_packages.xml:265 en/customization_packages.xml:310
-#: en/customization_packages.xml:330 en/customization_packages.xml:341
-#: en/customization_packages.xml:352 en/customization_packages.xml:362
-#: en/faq.xml:64 en/faq.xml:241 en/faq.xml:244 en/faq.xml:252 en/faq.xml:256
-#: en/faq.xml:264 en/faq.xml:279 en/faq.xml:287 en/faq.xml:334 en/faq.xml:424
-#: en/faq.xml:430 en/faq.xml:481 en/faq.xml:483 en/faq.xml:487 en/faq.xml:491
-#: en/overview.xml:181 en/overview.xml:230 en/overview.xml:240
+#: en/about_manual.xml:143 en/about_manual.xml:147 en/about_manual.xml:151
+#: en/about_manual.xml:160 en/about_manual.xml:166 en/about_manual.xml:172
+#: en/about_manual.xml:178 en/about_manual.xml:184 en/basics.xml:45
+#: en/basics.xml:50 en/basics.xml:57 en/basics.xml:60 en/basics.xml:72
+#: en/basics.xml:81 en/basics.xml:85 en/basics.xml:89 en/basics.xml:95
+#: en/basics.xml:105 en/basics.xml:118 en/basics.xml:122 en/basics.xml:126
+#: en/basics.xml:139 en/basics.xml:143 en/basics.xml:148 en/basics.xml:160
+#: en/basics.xml:170 en/basics.xml:182 en/basics.xml:186 en/basics.xml:205
+#: en/basics.xml:220 en/customization_packages.xml:25
+#: en/customization_packages.xml:29 en/customization_packages.xml:34
+#: en/customization_packages.xml:38 en/customization_packages.xml:48
+#: en/customization_packages.xml:102 en/customization_packages.xml:106
+#: en/customization_packages.xml:116 en/customization_packages.xml:132
+#: en/customization_packages.xml:140 en/customization_packages.xml:144
+#: en/customization_packages.xml:148 en/customization_packages.xml:152
+#: en/faq.xml:36 en/faq.xml:128 en/faq.xml:131 en/faq.xml:138 en/faq.xml:141
+#: en/faq.xml:163 en/faq.xml:188 en/faq.xml:210 en/overview.xml:61
+#: en/overview.xml:66 en/overview.xml:70
 msgid "<placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><title>
-#: en/basics.xml:9
+#: en/basics.xml:6
 msgid "The basics"
 msgstr ""
 
 #. type: Content of: <chapter><para>
-#: en/basics.xml:12
+#: en/basics.xml:7
 msgid ""
 "This chapter contains a brief overview of the build process as well as "
 "containing instructions on how to boot the various binary image types."
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: en/basics.xml:17
+#: en/basics.xml:9
 msgid "What is a live system?"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:20
+#: en/basics.xml:10
 msgid ""
 "A live system usually means an OS booted on a computer from a removable "
 "medium (such as CD-ROM, USB stick, or network), ready to use without any "
 "installation on the usual drive(s), with an auto-configuration done at "
-"runtime (see <xref linkend=\"terms\" />)."
+"runtime (see <xref linkend=\"terms\"/>)."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:27
+#: en/basics.xml:11
 msgid ""
 "With Debian Live, it's a Debian GNU/Linux OS, built for one of the supported "
 "architectures (currently amd64, i386, powerpc and sparc). It is made from "
@@ -73,50 +72,50 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:35
+#: en/basics.xml:14
 msgid "Linux kernel"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:39
+#: en/basics.xml:16
 msgid "The Linux image, usually named <filename>vmlinuz*</filename>."
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:45
+#: en/basics.xml:20
 msgid "Initial RAM disk image (initrd)"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:49
+#: en/basics.xml:22
 msgid ""
 "RAM disk setup for the Linux boot, containing modules possibly needed to "
 "mount the filesystem's image and some scripts to do it."
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:56
+#: en/basics.xml:26
 msgid "System image"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:60
+#: en/basics.xml:28
 msgid ""
 "The OS filesystem image. Debian Live uses SquashFS, a compressed filesystem, "
 "to minimize its image size. Note that it's read-only. So, during boot the "
 "Debian Live system will use a RAM disk and 'union' mechanism to enable "
 "writing files within the running system. However, all modifications will be "
 "lost upon shutdown unless optional persistence partition(s) are used. (See "
-"<xref linkend=\"persistence\" />.)"
+"<xref linkend=\"persistence\"/>.)"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:71
+#: en/basics.xml:32
 msgid "Bootloader"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:75
+#: en/basics.xml:34
 msgid ""
 "A small piece of code, crafted to boot up from the chosen media, possibly "
 "presenting a prompt or menu to allow selection of options/configuration. It "
@@ -129,7 +128,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:90
+#: en/basics.xml:38
 msgid ""
 "The Debian Live tools will build the system image from your specifications, "
 "setup a Linux kernel and its initrd, a bootloader to run them, all in one "
@@ -137,12 +136,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: en/basics.xml:98
+#: en/basics.xml:41
 msgid "First steps: building an ISO image"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:101
+#: en/basics.xml:42
 msgid ""
 "The following sequence of helper commands, provided by &live-helper;, will "
 "create a basic ISO image containing just the Debian standard system without "
@@ -150,7 +149,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:107
+#: en/basics.xml:43
 msgid ""
 "First, we run the <filename>lh config</filename> helper command which will "
 "create a <filename>\"config/\"</filename> hierarchy in the current directory "
@@ -158,141 +157,139 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para><screen>
-#: en/basics.xml:113
+#: en/basics.xml:45
 #, no-wrap
 msgid "$ lh config"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:117
+#: en/basics.xml:47
 msgid ""
 "By passing no parameters to <filename>lh config</filename> we indicated that "
 "we wish to use the defaults. This will create an image of type binary (see "
-"<xref linkend=\"lh-config\" />)."
+"<xref linkend=\"lh-config\"/>)."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:123
+#: en/basics.xml:48
 msgid ""
 "Now that we have a <filename>\"config/\"</filename> hierarchy, we may build "
 "the image with the <filename>lh build</filename> helper command:"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/basics.xml:128 en/basics.xml:239 en/basics.xml:382 en/use-cases.xml:59
+#: en/basics.xml:50 en/basics.xml:89 en/basics.xml:148 en/use-cases.xml:31
 #, no-wrap
 msgid "# lh build"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:132
+#: en/basics.xml:52
 msgid ""
 "This process can take a while, depending on the speed of your network "
-"connection (see <xref linkend=\"lh-build\" />)."
+"connection (see <xref linkend=\"lh-build\"/>)."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:137
+#: en/basics.xml:54
 msgid "Testing an ISO image with Qemu"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:140
+#: en/basics.xml:55
 msgid "Testing an ISO is simple:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:144
+#: en/basics.xml:57
 #, no-wrap
-msgid ""
-"# apt-get install qemu\n"
-"$ qemu -cdrom binary.iso"
+msgid "# apt-get install qemu $ qemu -cdrom binary.iso"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:151
+#: en/basics.xml:60
 msgid "Testing an ISO image with virtualbox-ose"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:154
+#: en/basics.xml:60
 msgid "In order to test the ISO with virtualbox-ose:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:158
+#: en/basics.xml:60
 #, no-wrap
 msgid "# apt-get install virtualbox-ose"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: en/basics.xml:162
+#: en/basics.xml:60
 msgid ""
 "the modules package for a stock kernel eg virtualbox-ose-"
 "modules-2.6.26-1-486 or"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><itemizedlist><listitem><para>
-#: en/basics.xml:163
+#: en/basics.xml:60
 msgid ""
 "the modules package compiled for your kernel using module-assistant from the "
 "package virtualbox-ose-source"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:165
+#: en/basics.xml:60
 msgid "Run Virtualbox:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:167
-msgid "{{{Applications -> System Tools -> VirtualBox OSE }}}"
+#: en/basics.xml:60
+msgid "{{{Applications -&gt; System Tools -&gt; VirtualBox OSE }}}"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:169
+#: en/basics.xml:60
 msgid "Create a virtual machine from your Live ISO"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:171
+#: en/basics.xml:60
 msgid ""
 "To create a virtual machine \"mylive\" from A CDROM ISO \"binary.iso\" in "
 "VirtualBox:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:172
-msgid "{{{Machine -> New }}}"
+#: en/basics.xml:60
+msgid "{{{Machine -&gt; New }}}"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:173
+#: en/basics.xml:60
 msgid "In the Wizard: FIXME"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:177
+#: en/basics.xml:62
 msgid "Testing an ISO image with VMware Workstation"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:179
+#: en/basics.xml:63
 msgid "In order to test the ISO with VMware Workstation:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:181 en/basics.xml:287
+#: en/basics.xml:64 en/basics.xml:111
 msgid "Run VMware Workstation:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:182
+#: en/basics.xml:65
 msgid "Click on Edit virtual machine settings in the VM summary page."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:183
+#: en/basics.xml:66
 msgid ""
 "Then, click on the CD-ROM device and select Use ISO image. Remeber to "
 "connect the CD-ROM device at power on and remeber to adjust the boot order "
@@ -300,30 +297,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:187
+#: en/basics.xml:69
 msgid "Burning an ISO image to a physical medium"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:190
+#: en/basics.xml:70
 msgid "Burning an ISO image is easy:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:194
+#: en/basics.xml:72
 #, no-wrap
-msgid ""
-"# apt-get install wodim\n"
-"$ wodim binary.iso"
+msgid "# apt-get install wodim $ wodim binary.iso"
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: en/basics.xml:203
+#: en/basics.xml:77
 msgid "Building an USB/HDD image"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:206
+#: en/basics.xml:78
 msgid ""
 "The following sequence of helper commands will create a basic USB/HDD image "
 "containing just the Debian standard system without X.org. It is suitable for "
@@ -332,21 +327,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:213
+#: en/basics.xml:79
 msgid ""
 "Note if you created an iso image with the previous example, you will need to "
 "clean up your working directory with the <filename>lh clean</filename> "
-"helper command (see <xref linkend=\"lh-clean\" />):"
+"helper command (see <xref linkend=\"lh-clean\"/>):"
 msgstr ""
 
 #. type: Content of: <chapter><section><para><screen>
-#: en/basics.xml:220 en/basics.xml:354
+#: en/basics.xml:81 en/basics.xml:139
 #, no-wrap
 msgid "$ lh clean --binary"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:224
+#: en/basics.xml:83
 msgid ""
 "Run the <filename>lh config</filename> helper command with the parameters to "
 "configure the <filename>\"config/\"</filename> hierarchy to create a USB/HDD "
@@ -354,24 +349,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para><screen>
-#: en/basics.xml:230
+#: en/basics.xml:85
 #, no-wrap
 msgid "$ lh config -b usb-hdd"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:234 en/basics.xml:377
+#: en/basics.xml:87 en/basics.xml:146
 msgid ""
 "Now build the image with the <filename>lh build</filename> helper command:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:243
+#: en/basics.xml:92
 msgid "Copying USB/HDD image to a USB stick"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:246
+#: en/basics.xml:93
 msgid ""
 "The generated binary image contains a <acronym>VFAT</acronym> partition and "
 "the <command>syslinux</command> bootloader, ready to be directly written on "
@@ -380,13 +375,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:253
+#: en/basics.xml:95
 #, no-wrap
 msgid "$ dd if=binary.img of=${USBSTICK}"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:257
+#: en/basics.xml:97
 msgid ""
 "where <replaceable>${USBSTICK}</replaceable> is the device file of your key, "
 "like <filename>/dev/sdb</filename> (not a partition like <filename>/dev/"
@@ -395,30 +390,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:272
+#: en/basics.xml:103
 msgid "Testing a USB/HDD image with Qemu"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:275
+#: en/basics.xml:105
 #, no-wrap
-msgid ""
-"# apt-get install qemu\n"
-"$ qemu -hda binary.img"
+msgid "# apt-get install qemu $ qemu -hda binary.img"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:281
+#: en/basics.xml:109
 msgid "Testing an USB/HDD image with VMware Workstation"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:284
+#: en/basics.xml:110
 msgid "In order to test the USB/HDD image with VMware Workstation:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:288
+#: en/basics.xml:112
 msgid ""
 "Write the image to an usb stick. In VMware, click on Edit virtual machine "
 "settings in VM summary page. Then, add a new physical harddisk device and "
@@ -426,12 +419,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/basics.xml:292
+#: en/basics.xml:115
 msgid "Using the space left on a USB stick"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:295
+#: en/basics.xml:116
 msgid ""
 "If you want to use the remaining free space after you have installed the "
 "<filename>binary.img</filename>, you can use a partitioning tool such as "
@@ -440,13 +433,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:302
+#: en/basics.xml:118
 #, no-wrap
 msgid "# gparted ${USBSTICK}"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:306
+#: en/basics.xml:120
 msgid ""
 "After the creation of the partition you have to create a filsystem on it. "
 "One possible choice would be ext2 (ext3 isn't recommended because the "
@@ -454,36 +447,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:312
+#: en/basics.xml:122
 #, no-wrap
 msgid "# mkfs.ext2 ${USBSTICK}"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:316
+#: en/basics.xml:124
 msgid "If you want to use this data partition with Windows, use FAT32."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para><screen>
-#: en/basics.xml:320
+#: en/basics.xml:126
 #, no-wrap
 msgid "# mkfs.vfat -F 32"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/basics.xml:330
+#: en/basics.xml:131
 msgid ""
-"FIXME: Describe installing Debian Live to a partition (e.g. /dev/sdc1)  AND "
+"FIXME: Describe installing Debian Live to a partition (e.g. /dev/sdc1) AND "
 "using a bootloader to boot this."
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: en/basics.xml:339
+#: en/basics.xml:135
 msgid "Building a netboot image"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:342
+#: en/basics.xml:136
 msgid ""
 "The following sequence of helper commands will create a basic netboot image "
 "containing the Debian standard system without X.org. It is suitable for "
@@ -491,14 +484,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:348
+#: en/basics.xml:137
 msgid ""
 "Note if you performed any previous examples, you will need to clean up your "
 "working directory with the <filename>lh clean</filename> helper command:"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:358
+#: en/basics.xml:141
 msgid ""
 "Run the <filename>lh config</filename> helper command with the parameters to "
 "configure the <filename>\"config/\"</filename> hierarchy to create our "
@@ -506,13 +499,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para><screen>
-#: en/basics.xml:364
+#: en/basics.xml:143
 #, no-wrap
 msgid "$ lh config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:368
+#: en/basics.xml:145
 msgid ""
 "In contrast with the ISO and USB hdd images, netbooting does not support "
 "serving a filesystem image with the client so the files must be served via "
@@ -522,12 +515,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:386
+#: en/basics.xml:150
 msgid ""
 "In a network boot the client runs a small piece of software, which usually "
-"resides on the <acronym>EEPROM</acronym> of the Ethernet card.  This program "
+"resides on the <acronym>EEPROM</acronym> of the Ethernet card. This program "
 "sends a <abbrev>DHCP</abbrev> request to get an <abbrev>IP</abbrev> address "
-"and information about what to do next.  Typically the next step is getting a "
+"and information about what to do next. Typically the next step is getting a "
 "higher level boot loader via the <abbrev>TFTP</abbrev> protocol. That could "
 "be <application>Grub</application>, <application>PXELINUX</application>, or "
 "even boot directly to an operating system like <application>Linux</"
@@ -535,7 +528,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:398
+#: en/basics.xml:151
 msgid ""
 "For example, if you unpack the generated <filename>binary-net.tar.gz</"
 "filename> archive in the <filename>/srv/debian-live</filename> directory, "
@@ -545,17 +538,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:407
+#: en/basics.xml:152
 msgid "We must now configure three services on the server to enable netboot:"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:413
+#: en/basics.xml:155
 msgid "DHCP server"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:417
+#: en/basics.xml:157
 msgid ""
 "We must configure our network's DHCP server to be sure to give an "
 "<abbrev>IP</abbrev> address to the computer netbooting, and to advertise the "
@@ -563,7 +556,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:423
+#: en/basics.xml:158
 msgid ""
 "Here is an example for inspiration, written for the ISC DHCP server (package "
 "<literal>dhcp3-server</literal>) in the <filename>/etc/dhcp3/dhcpd.conf</"
@@ -571,70 +564,23 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:429
+#: en/basics.xml:160
 #, no-wrap
-msgid ""
-"# Options DHCP spécifiques à Pxelinux:\n"
-"option space pxelinux;\n"
-"option pxelinux.magic      code 208 = string;\n"
-"option pxelinux.configfile code 209 = text;\n"
-"option pxelinux.pathprefix code 210 = text;\n"
-"option pxelinux.reboottime code 211 = unsigned integer 32;\n"
-"\n"
-"\n"
-"subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
-"\n"
-"  # IP addresses available for guests\n"
-"  range 192.168.1.100 192.168.1.149;\n"
-"\n"
-"  # allow booting from the net\n"
-"  allow bootp;\n"
-"\n"
-"  # for net booting, server where the first file to be loaded (by TFTP\n"
-"  # protocol) (\"filename\" following definition) lies : so the TFTP\n"
-"  # server's name.\n"
-"  next-server myserver;\n"
-"\n"
-"  # net boot configuration for guests with a PXE client :\n"
-"  if substring (option vendor-class-identifier, 0, 9) = \"PXEClient\" {\n"
-"    # Note : all files for PXE are relatives to the TFTP server's root\n"
-"    # path, as usually defined in /etc/inetd.conf.\n"
-"\n"
-"    # PXE boot loader (first program to be loaded, by TFTP)\n"
-"    filename \"pxelinux.0\";\n"
-"\n"
-"    # describe some specific pxelinux's options through DHCP options :\n"
-"    site-option-space \"pxelinux\";\n"
-"    option pxelinux.magic f1:00:74:7e;\n"
-"    if exists dhcp-parameter-request-list {\n"
-"      # Always send the PXELINUX options (specified in hexadecimal)\n"
-"      option dhcp-parameter-request-list = concat(option dhcp-parameter-request-list,d0,d1,d2,d3);\n"
-"    }\n"
-"\n"
-"    # For a PXE boot menu, different versions are available : simple\n"
-"    # text, text with curses, graphic (VESA)\n"
-"    #option pxelinux.configfile \"pxelinux/config_simple\";\n"
-"    #option pxelinux.configfile \"pxelinux/config_curses\";\n"
-"    option pxelinux.configfile \"pxelinux/config_vesa\";\n"
-"\n"
-"    # automatically reboot after 10 minutes of no activity\n"
-"    option pxelinux.reboottime 600;\n"
-"  }\n"
-"}"
+msgid "# Options DHCP spécifiques à Pxelinux: option space pxelinux; option pxelinux.magic code 208 = string; option pxelinux.configfile code 209 = text; option pxelinux.pathprefix code 210 = text; option pxelinux.reboottime code 211 = unsigned integer 32; subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24 # IP addresses available for guests range 192.168.1.100 192.168.1.149; # allow booting from the net allow bootp; # for net booting, server where the first file to be loaded (by TFTP # protocol) (\"filename\" following definition) lies : so the TFTP # server's name. next-server myserver; # net boot configuration for guests with a PXE client : if substring (option vendor-class-identifier, 0, 9) = \"PXEClient\" { # Note : all files for PXE are relatives to the TFTP server's root # path, as usually defined in /etc/inetd.conf. # PXE boot loader (first program to be loaded, by TFTP) filename \"pxelinux.0\"; # describe some specific pxelinux's options through DHCP o
 ptions : site-option-space \"pxelinux\"; option pxelinux.magic f1:00:74:7e; if exists dhcp-parameter-request-list { # Always send the PXELINUX options (specified in hexadecimal) option dhcp-parameter-request-list = concat(option dhcp-parameter-request-list,d0,d1,d2,d3); } # For a PXE boot menu, different versions are available : simple # text, text with curses, graphic (VESA) #option pxelinux.configfile \"pxelinux/config_simple\"; #option pxelinux.configfile \"pxelinux/config_curses\"; option pxelinux.configfile \"pxelinux/config_vesa\"; # automatically reboot after 10 minutes of no activity option pxelinux.reboottime 600; } }"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:481
+#: en/basics.xml:165
 msgid "TFTPd server"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:485
+#: en/basics.xml:167
 msgid "This serves the kernel and initial ramdisk to the system at run-time."
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:489
+#: en/basics.xml:168
 msgid ""
 "You should install the <command>tftpd-hpa</command> package. It can serve "
 "all files contained inside a root directory, usually <filename>/var/lib/"
@@ -644,25 +590,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:498
+#: en/basics.xml:170
 #, no-wrap
-msgid "tftp           dgram   udp     wait    root  /usr/sbin/in.tftpd /usr/sbin/in.tftpd -s /srv/debian-live/tftpboot -r blksize -v -v"
+msgid "tftp dgram udp wait root /usr/sbin/in.tftpd /usr/sbin/in.tftpd -s /srv/debian-live/tftpboot -r blksize -v -v"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:502
+#: en/basics.xml:172
 msgid ""
 "and reload the super server with <command>/etc/init.d/openbsd-inetd reload</"
 "command>."
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:509
+#: en/basics.xml:176
 msgid "NFS server"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:513
+#: en/basics.xml:178
 msgid ""
 "Once the guest computer has downloaded and booted a Linux kernel and loaded "
 "its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -670,164 +616,134 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:519
+#: en/basics.xml:179
 msgid ""
 "You should install the <command>nfs-kernel-server</command> package -- "
 "<command>nfs-user-server</command> does not function correctly with netboot."
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:525
+#: en/basics.xml:180
 msgid ""
 "Then, make the filesystem image available through NFS by adding a line like "
 "the following to <filename>/etc/exports</filename>:"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:530
+#: en/basics.xml:182
 #, no-wrap
 msgid "/srv/debian-live *(ro,async,subtree_check,no_root_squash)"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:534
+#: en/basics.xml:184
 msgid ""
 "and tell the NFS server about this new export with the following command:"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:539
+#: en/basics.xml:186
 #, no-wrap
 msgid "# exportfs -rv"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:547
+#: en/basics.xml:191
 msgid ""
 "Setting up these three services can be a little tricky. You might need some "
 "patience to get all of them working together. The Debian Installer Manual's "
-"<ulink url=\"http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html\" "
-">TFTP Net Booting</ulink> section might help as that process is very similar."
+"<ulink url=\"http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html\">TFTP "
+"Net Booting</ulink> section might help as that process is very similar."
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: en/basics.xml:558
+#: en/basics.xml:194
 msgid "Netboot testing HowTo"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:561
+#: en/basics.xml:195
 msgid ""
 "Netboot image creation is made easy with live-helper magic, but testing the "
 "images on physical machines can be really time consuming."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/basics.xml:566
+#: en/basics.xml:196
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions:"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:573
+#: en/basics.xml:199
 msgid "VMWare Player"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:577
+#: en/basics.xml:201
 msgid "Install VMWare Player (\"free as in beer\" edition)"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:581
+#: en/basics.xml:202
 msgid ""
 "Create a PXETester directory, and create a text file called pxe.vwx inside"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:586
+#: en/basics.xml:203
 msgid "Paste this text inside:"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:590
+#: en/basics.xml:205
 #, no-wrap
-msgid ""
-"#!/usr/bin/vmware\n"
-"config.version = \"8\"\n"
-"virtualHW.version = \"4\"\n"
-"memsize = \"512\"\n"
-"MemAllowAutoScaleDown = \"FALSE\"\n"
-"\n"
-"ide0:0.present = \"FALSE\"\n"
-"ide1:0.present = \"FALSE\"\n"
-"floppy0.present = \"FALSE\"\n"
-"sound.present = \"FALSE\"\n"
-"tools.remindInstall = \"FALSE\"\n"
-"\n"
-"ethernet0.present = \"TRUE\"\n"
-"ethernet0.addressType = \"generated\"\n"
-"\n"
-"displayName = \"Test Boot PXE\"\n"
-"guestOS = \"other\"\n"
-"\n"
-"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\"\n"
-"uuid.location = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
-"uuid.bios = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
-"ethernet0.generatedAddressOffset = \"0\""
+msgid "#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = \"512\" MemAllowAutoScaleDown = \"FALSE\" ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = \"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\" ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\" displayName = \"Test Boot PXE\" guestOS = \"other\" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" ethernet0.generatedAddressOffset = \"0\""
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:615
+#: en/basics.xml:207
 msgid ""
 "You can play with this configuration file (i.e. change memory limit to 256)"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:620
+#: en/basics.xml:208
 msgid "Double click on this file (or run VMWare player and selecet this file)."
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:624
+#: en/basics.xml:209
 msgid "When running just press space if that strange question comes up..."
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/basics.xml:634
+#: en/basics.xml:215
 msgid "Qemu"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:638
+#: en/basics.xml:217
 msgid "Install qemu, bridge-utils, sudo."
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:642
+#: en/basics.xml:218
 msgid "Edit <filename>/etc/qemu-ifup</filename>:"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para><screen>
-#: en/basics.xml:646
+#: en/basics.xml:220
 #, no-wrap
-msgid ""
-"#!/bin/sh\n"
-"sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1\n"
-"echo \"Executing /etc/qemu-ifup\"\n"
-"echo \"Bringing up $1 for bridged mode...\"\n"
-"sudo /sbin/ifconfig $1 0.0.0.0 promisc up\n"
-"echo \"Adding $1 to br0...\"\n"
-"sudo /usr/sbin/brctl addif br0 $1\n"
-"sleep 2"
+msgid "#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo \"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" sudo /sbin/ifconfig $1 0.0.0.0 promisc up echo \"Adding $1 to br0...\" sudo /usr/sbin/brctl addif br0 $1 sleep 2"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:657
+#: en/basics.xml:222
 msgid "Get, or build a grub-floppy-netboot (in the svn)."
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/basics.xml:661
+#: en/basics.xml:223
 msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
 msgstr ""
diff --git a/manual/pot/coding-style.xml.pot b/manual/pot/coding-style.xml.pot
index 5e02d25..8776333 100644
--- a/manual/pot/coding-style.xml.pot
+++ b/manual/pot/coding-style.xml.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,120 +16,92 @@ msgstr ""
 "Content-Transfer-Encoding: ENCODING"
 
 #. type: Content of: <chapter><title>
-#: en/chapters/coding-style.xml:7
+#: en/coding-style.xml:6
 msgid "Coding Style"
 msgstr ""
 
 #. type: Content of: <chapter><para>
-#: en/chapters/coding-style.xml:9
+#: en/coding-style.xml:7
 msgid ""
 "This chapter documents the coding style used in &live-helper; and (ideally) "
 "in &live-initramfs;."
 msgstr ""
 
 #. type: Content of: <chapter><sect1><title>
-#: en/chapters/coding-style.xml:12
+#: en/coding-style.xml:9
 msgid "Compatibility"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><title>
-#: en/chapters/coding-style.xml:22
+#: en/coding-style.xml:17
 msgid "Indenting"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><title>
-#: en/chapters/coding-style.xml:31
+#: en/coding-style.xml:23
 msgid "Wrapping"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/coding-style.xml:41
+#: en/coding-style.xml:26
 #, no-wrap
-msgid ""
-"if foo; then\n"
-"\tbar\n"
-"fi\n"
+msgid " if foo; then bar fi "
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/chapters/coding-style.xml:38 en/chapters/coding-style.xml:59
-#: en/chapters/coding-style.xml:92 en/chapters/coding-style.xml:108
+#: en/coding-style.xml:26 en/coding-style.xml:27 en/coding-style.xml:39
+#: en/coding-style.xml:40
 msgid "Bad: <placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/coding-style.xml:50
+#: en/coding-style.xml:26
 #, no-wrap
-msgid ""
-"if foo\n"
-"then\n"
-"\tbar\n"
-"fi\n"
+msgid " if foo then bar fi "
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/chapters/coding-style.xml:47 en/chapters/coding-style.xml:67
-#: en/chapters/coding-style.xml:98 en/chapters/coding-style.xml:117
+#: en/coding-style.xml:26 en/coding-style.xml:27 en/coding-style.xml:39
+#: en/coding-style.xml:40
 msgid "Good: <placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/coding-style.xml:62
-#, no-wrap
-msgid ""
-"foo () {\n"
-"\tbar\n"
-"}\n"
-msgstr ""
-
-#. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/coding-style.xml:70
+#: en/coding-style.xml:27
 #, no-wrap
-msgid ""
-"foo ()\n"
-"{\n"
-"\tbar\n"
-"}\n"
+msgid " foo () { bar } "
 msgstr ""
 
 #. type: Content of: <chapter><sect1><title>
-#: en/chapters/coding-style.xml:81
+#: en/coding-style.xml:31
 msgid "Variables"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/coding-style.xml:95
+#: en/coding-style.xml:39
 #, no-wrap
-msgid "FOO=bar\n"
+msgid " FOO=bar "
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/coding-style.xml:101
+#: en/coding-style.xml:39
 #, no-wrap
-msgid "FOO=\"bar\"\n"
+msgid " FOO=\"bar\" "
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/coding-style.xml:111
+#: en/coding-style.xml:40
 #, no-wrap
-msgid ""
-"if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
-"then\n"
-"\tfoobar\n"
-"fi\n"
+msgid " if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ] then foobar fi "
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/coding-style.xml:120
+#: en/coding-style.xml:40
 #, no-wrap
-msgid ""
-"if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
-"then\n"
-"\tfoobar\n"
-"fi\n"
+msgid " if [ -f \"${FOO}/foo/${BAR}/bar\" ] then foobar fi "
 msgstr ""
 
 #. type: Content of: <chapter><sect1><title>
-#: en/chapters/coding-style.xml:131
+#: en/coding-style.xml:44
 msgid "Miscellaneous"
 msgstr ""
diff --git a/manual/pot/common-tasks.xml.pot b/manual/pot/common-tasks.xml.pot
index 665aee0..0bad204 100644
--- a/manual/pot/common-tasks.xml.pot
+++ b/manual/pot/common-tasks.xml.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,17 +16,17 @@ msgstr ""
 "Content-Transfer-Encoding: ENCODING"
 
 #. type: Content of: <chapter><title>
-#: en/chapters/common-tasks.xml:7
+#: en/common-tasks.xml:6
 msgid "Common tasks"
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: en/chapters/common-tasks.xml:10
+#: en/common-tasks.xml:8
 msgid "The Debian Installer"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/common-tasks.xml:12
+#: en/common-tasks.xml:9
 msgid ""
 "Although Debian Live is mostly concerned with avoiding permanent "
 "installation, integrating some form of installer to your image is possible. "
@@ -35,12 +35,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><note><title>
-#: en/chapters/common-tasks.xml:17
+#: en/common-tasks.xml:11
 msgid "The \"Debian Installer\""
 msgstr ""
 
 #. type: Content of: <chapter><section><note><para>
-#: en/chapters/common-tasks.xml:20
+#: en/common-tasks.xml:12
 msgid ""
 "Please note the careful use of capital letters when referring to the "
 "\"Debian Installer\" in this section - when used like this we refer "
@@ -49,17 +49,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/common-tasks.xml:24
+#: en/common-tasks.xml:14
 msgid "The three main types of installer are:"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/chapters/common-tasks.xml:29
+#: en/common-tasks.xml:17
 msgid "\"Normal\" Debian Installer"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/chapters/common-tasks.xml:33
+#: en/common-tasks.xml:19
 msgid ""
 "This is a normal Debian Live image with a seperate kernel and initrd which "
 "(when selected from the appropriate bootloader) launches into a standard "
@@ -68,7 +68,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/chapters/common-tasks.xml:36
+#: en/common-tasks.xml:20
 msgid ""
 "This means that Debian is installed by fetching and installing <command>."
 "deb</command> packages using <filename>debootstrap</filename> or "
@@ -78,7 +78,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/chapters/common-tasks.xml:39
+#: en/common-tasks.xml:21
 msgid ""
 "This whole process can be preseeded and customised in a number of ways; see "
 "the relevant \"DebianInstaller\" wiki page and installation guide for more. "
@@ -86,12 +86,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/chapters/common-tasks.xml:45
+#: en/common-tasks.xml:25
 msgid "\"Live\" Debian Installer"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/chapters/common-tasks.xml:49
+#: en/common-tasks.xml:27
 msgid ""
 "This is a Debian Live image with a seperate kernel and initrd which (when "
 "selected from the appropriate bootloader) launches into an instance of the "
@@ -99,7 +99,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/chapters/common-tasks.xml:52
+#: en/common-tasks.xml:28
 msgid ""
 "Installation will proceed in an identical fashion to the \"Normal\" "
 "installation described above, but at the actual package installation stage, "
@@ -110,17 +110,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/chapters/common-tasks.xml:55
+#: en/common-tasks.xml:29
 msgid "This is working now."
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/chapters/common-tasks.xml:61
+#: en/common-tasks.xml:33
 msgid "\"Ubuntu\"-style installer"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/chapters/common-tasks.xml:65
+#: en/common-tasks.xml:35
 msgid ""
 "This is where you boot into a graphical Debian Live system and run a wizard-"
 "based program which installs and configures the live system, all the time "
@@ -128,25 +128,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/chapters/common-tasks.xml:68
+#: en/common-tasks.xml:36
 msgid "This is currently NOT possible with Debian Live."
 msgstr ""
 
 #. type: Content of: <chapter><section><para><screen>
-#: en/chapters/common-tasks.xml:78
+#: en/common-tasks.xml:40
 #, no-wrap
-msgid ""
-"$ lh_config --help\n"
-"  ...\n"
-"  [--debian-installer enabled|cdrom|netinst|netboot|businesscard|live|disabled]\n"
-"  [--debian-installer-distribution CODENAME|daily]\n"
-"  [--debian-installer-preseedfile FILE|URL]\n"
-"  ...\n"
-" "
+msgid " $ lh_config --help ... [--debian-installer enabled|cdrom|netinst|netboot|businesscard|live|disabled] [--debian-installer-distribution CODENAME|daily] [--debian-installer-preseedfile FILE|URL] ... "
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/common-tasks.xml:76
+#: en/common-tasks.xml:40
 msgid ""
 "By default, no installer will be included in the Debian Live image. You can "
 "enable it by using <filename>lh_config</filename> : <placeholder type="
@@ -154,29 +147,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/common-tasks.xml:89
+#: en/common-tasks.xml:41
 msgid "The values \"Normal\", \"Live\" and \"Ubuntu\" are not valid values for"
 msgstr ""
 
 #. type: Content of: <chapter><section><para><term>
-#: en/chapters/common-tasks.xml:89
+#: en/common-tasks.xml:41
 msgid "LH_BINARY_DEBIAN_INSTALLER"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/common-tasks.xml:89
+#: en/common-tasks.xml:41
 msgid ""
 ". Refer to the output of <filename>lh_config</filename> cited above to "
 "choose the appropriate values."
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: en/chapters/common-tasks.xml:94
+#: en/common-tasks.xml:44
 msgid "WiFi Connection"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/common-tasks.xml:96
+#: en/common-tasks.xml:45
 msgid ""
 "Depending on the Debian Live image you are using and the given tools "
 "configured with your Debian Live image you may need to only attach to an "
diff --git a/manual/pot/customization_backports.xml.pot b/manual/pot/customization_backports.xml.pot
index d1fd8c8..c1b5e83 100644
--- a/manual/pot/customization_backports.xml.pot
+++ b/manual/pot/customization_backports.xml.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Transfer-Encoding: ENCODING"
 
 #. type: Content of: <sect1><title>
-#: en/customization_backports.xml:8
+#: en/customization_backports.xml:6
 msgid "Using a newer kernel with Lenny"
 msgstr ""
 
 #. type: Content of: <sect1><para>
-#: en/customization_backports.xml:10
+#: en/customization_backports.xml:7
 msgid ""
 "The backports repository, backports.org, lacks the necessary module packages "
 "(linux-modules-extra-2.6, aufs, etc.) so an alternative repository has been "
@@ -30,16 +30,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><screen>
-#: en/customization_backports.xml:13
+#: en/customization_backports.xml:8
 #, no-wrap
-msgid ""
-"$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6'\n"
-"\n"
-"$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.chroot\n"
-"$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.binary\n"
-"\n"
-"$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.chroot.gpg\n"
-"$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.binary.gpg\n"
-"\n"
-"# lh_build\n"
+msgid " $ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6' $ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' &gt; config/chroot_sources/backports-kernel.chroot $ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' &gt; config/chroot_sources/backports-kernel.binary $ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.chroot.gpg $ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.binary.gpg # lh_build "
 msgstr ""
diff --git a/manual/pot/customization_bootup.xml.pot b/manual/pot/customization_bootup.xml.pot
index 7203807..0385d7e 100644
--- a/manual/pot/customization_bootup.xml.pot
+++ b/manual/pot/customization_bootup.xml.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,30 +16,30 @@ msgstr ""
 "Content-Transfer-Encoding: ENCODING"
 
 #. type: Content of: <sect1><sect2><title>
-#: en/about_manual.xml:121 en/customization_bootup.xml:104
+#: en/about_manual.xml:63 en/customization_bootup.xml:48
 msgid "Cheat codes"
 msgstr ""
 
 #. type: Content of: <chapter><para>
-#: en/about_manual.xml:125 en/customization_bootup.xml:11
-#: en/customization_bootup.xml:20 en/customization_bootup.xml:26
-#: en/customization_bootup.xml:38 en/customization_bootup.xml:85
-#: en/customization_bootup.xml:92 en/customization_bootup.xml:99
-#: en/customization_bootup.xml:106 en/customization_packages.xml:36
-#: en/customization_packages.xml:306 en/customization_packages.xml:326
-#: en/customization_packages.xml:384 en/customization_packages.xml:492
-#: en/customization_packages.xml:535 en/live-environment.xml:11
-#: en/resources.xml:11 en/success-stories.xml:11
+#: en/about_manual.xml:65 en/customization_bootup.xml:8
+#: en/customization_bootup.xml:14 en/customization_bootup.xml:17
+#: en/customization_bootup.xml:25 en/customization_bootup.xml:37
+#: en/customization_bootup.xml:41 en/customization_bootup.xml:45
+#: en/customization_bootup.xml:49 en/customization_packages.xml:18
+#: en/customization_packages.xml:130 en/customization_packages.xml:138
+#: en/customization_packages.xml:160 en/customization_packages.xml:198
+#: en/customization_packages.xml:209 en/live-environment.xml:9
+#: en/resources.xml:9 en/success-stories.xml:8
 msgid "FIXME"
 msgstr ""
 
 #. type: Content of: <sect1><title>
-#: en/customization_bootup.xml:7
+#: en/customization_bootup.xml:6
 msgid "Customising the bootup process"
 msgstr ""
 
 #. type: Content of: <sect1><para>
-#: en/customization_bootup.xml:9
+#: en/customization_bootup.xml:7
 msgid ""
 "This chapter discusses customisation of bootup process of a live system, "
 "including kernel options, modifications to the bootloader, \"splash\" "
@@ -47,27 +47,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_bootup.xml:14
+#: en/customization_bootup.xml:10
 msgid "Kernel"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_bootup.xml:18
+#: en/customization_bootup.xml:13
 msgid "Bootloaders"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_bootup.xml:24
+#: en/customization_bootup.xml:16
 msgid "Choosing a bootloader"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_bootup.xml:31
+#: en/customization_bootup.xml:20
 msgid "Syslinux"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_bootup.xml:32
+#: en/customization_bootup.xml:21
 msgid ""
 "In the default configuration, Syslinux will pause indefinitely at its splash "
 "screen. To adjust this, modify the <command>LH_SYSLINUX_TIMEOUT</command> "
@@ -79,32 +79,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_bootup.xml:36
+#: en/customization_bootup.xml:24
 msgid "Bootloader templates"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_bootup.xml:43
+#: en/customization_bootup.xml:28
 msgid "Booting a Debian Live USB/HDD system from a USB stick with Grub"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_bootup.xml:45
+#: en/customization_bootup.xml:29
 msgid ""
 "Suppose you've built your Debian Live USB/HDD image, but want to install it "
 "on an already used USB stick with ext2/3 partition and Grub bootloader:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/customization_bootup.xml:55
+#: en/customization_bootup.xml:30
 #, no-wrap
-msgid ""
-"# mkdir /media/myUsb/boot/live/\n"
-"# cp binary/vmlinuz1 binary/initrd1.img binary/live/filesystem.squashfs /media/myUsb/boot/live/\n"
+msgid " # mkdir /media/myUsb/boot/live/ # cp binary/vmlinuz1 binary/initrd1.img binary/live/filesystem.squashfs /media/myUsb/boot/live/ "
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_bootup.xml:50
+#: en/customization_bootup.xml:30
 msgid ""
 "First, copy live components in a directory on your key: the Linux kernel "
 "(<filename>vmlinuz*</filename>), its Initial RAM disk (<filename>initrd*</"
@@ -113,21 +111,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/customization_bootup.xml:63
+#: en/customization_bootup.xml:31
 #, no-wrap
-msgid ""
-"echo &gt;&gt;/media/myUsb/boot/grub/menu.lst  &lt;&lt;EOF\n"
-"\n"
-"title           my Debian Live\n"
-"root            (hd0,1)    # my Ext2 partition is the second on this stick\n"
-"kernel          /boot/live/vmlinuz1 boot=live vga=791 persistent union=aufs live-media-path=boot/live\n"
-"initrd          /boot/live/initrd1.img\n"
-"\n"
-"EOF\n"
+msgid " echo &gt;&gt;/media/myUsb/boot/grub/menu.lst &lt;&lt;EOF title my Debian Live root (hd0,1) # my Ext2 partition is the second on this stick kernel /boot/live/vmlinuz1 boot=live vga=791 persistent union=aufs live-media-path=boot/live initrd /boot/live/initrd1.img EOF "
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_bootup.xml:60
+#: en/customization_bootup.xml:31
 msgid ""
 "Then, add a stanza in Grub's menu definition to boot up this system: "
 "<placeholder type=\"screen\" id=\"0\"/> The important kernel command line "
@@ -135,38 +125,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para><variablename>
-#: en/customization_bootup.xml:73
+#: en/customization_bootup.xml:31
 msgid "live-media-path"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_bootup.xml:73
+#: en/customization_bootup.xml:31
 msgid ""
 ", which tells to Live initrd's script in which subdirectory to look for the "
 "SquashFS image."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_bootup.xml:77
+#: en/customization_bootup.xml:32
 msgid "Next, umount your USB stick and reboot on it. That's all!"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_bootup.xml:83
+#: en/customization_bootup.xml:36
 msgid "Splash screens"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_bootup.xml:90
+#: en/customization_bootup.xml:40
 msgid "Memtest"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_bootup.xml:97
+#: en/customization_bootup.xml:44
 msgid "Startup scripts"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_bootup.xml:109
+#: en/customization_bootup.xml:50
 msgid "Checksums."
 msgstr ""
diff --git a/manual/pot/customization_contents.xml.pot b/manual/pot/customization_contents.xml.pot
index fd73a11..def955b 100644
--- a/manual/pot/customization_contents.xml.pot
+++ b/manual/pot/customization_contents.xml.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,58 +16,58 @@ msgstr ""
 "Content-Transfer-Encoding: ENCODING"
 
 #. type: Content of: <sect1><title>
-#: en/customization_contents.xml:7
+#: en/customization_contents.xml:6
 msgid "Customising contents"
 msgstr ""
 
 #. type: Content of: <sect1><para>
-#: en/customization_contents.xml:9
+#: en/customization_contents.xml:7
 msgid "This chapter discusses further customisation of the live system."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_contents.xml:12
+#: en/customization_contents.xml:9
 msgid "Includes"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:14
+#: en/customization_contents.xml:10
 msgid ""
 "Using includes, it is possible to add (or replace) arbitrary files in your "
 "Debian Live image. &live-helper; provides three mechanisms for using them:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_contents.xml:19
+#: en/customization_contents.xml:13
 msgid "Chroot local includes"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_contents.xml:23
+#: en/customization_contents.xml:15
 msgid ""
 "These allow you to add or replace files to the chroot/Live filesystem. "
 "Please see <xref linkend=\"chroot-local-includes\"/> for more information."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_contents.xml:29 en/customization_contents.xml:89
+#: en/customization_contents.xml:19 en/customization_contents.xml:42
 msgid "Binary local includes"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_contents.xml:33
+#: en/customization_contents.xml:21
 msgid ""
 "These allow you to add or replace files in the binary image. Please see "
 "<xref linkend=\"binary-local-includes\"/> for more information."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_contents.xml:39 en/customization_contents.xml:96
+#: en/customization_contents.xml:25 en/customization_contents.xml:46
 msgid "Binary includes"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_contents.xml:43
+#: en/customization_contents.xml:27
 msgid ""
 "These allow you to add or replace Debian specific files in the binary image, "
 "such as the templates and tools directories. Please see <xref linkend="
@@ -75,19 +75,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:50
+#: en/customization_contents.xml:31
 msgid ""
 "Please see <xref linkend=\"terms\"/> for more information about the "
 "distinction between the \"Live\" and \"binary\" images."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_contents.xml:54
+#: en/customization_contents.xml:33
 msgid "Live/chroot local includes"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_contents.xml:56
+#: en/customization_contents.xml:34
 msgid ""
 "Chroot local includes can be used to add or replace files in the chroot/Live "
 "filesystem so that they are visible when the Live system is booted. Typical "
@@ -98,7 +98,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_contents.xml:60
+#: en/customization_contents.xml:35
 msgid ""
 "To include files, simply add them to your <filename class=\"directory"
 "\">config/chroot_local-includes</filename> directory. This directory "
@@ -108,75 +108,63 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><screen>
-#: en/customization_contents.xml:64
+#: en/customization_contents.xml:36
 #, no-wrap
-msgid ""
-"  $ mkdir -p config/chroot_local-includes/var/www\n"
-"  $ cp /path/to/my/index.html config/chroot_local-includes/var/www\n"
-" "
+msgid " $ mkdir -p config/chroot_local-includes/var/www $ cp /path/to/my/index.html config/chroot_local-includes/var/www "
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_contents.xml:69
+#: en/customization_contents.xml:37
 msgid "Your configuration will then have the following layout:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><screen>
-#: en/customization_contents.xml:73
+#: en/customization_contents.xml:38
 #, no-wrap
-msgid ""
-"-- config\n"
-"   [...]\n"
-"    |-- chroot_local-includes\n"
-"    |   `-- var\n"
-"    |       `-- www\n"
-"    |           `-- index.html\n"
-"   [...]\n"
-"    `-- templates\n"
-" "
+msgid " -- config [...] |-- chroot_local-includes | `-- var | `-- www | `-- index.html [...] `-- templates "
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_contents.xml:84
+#: en/customization_contents.xml:39
 msgid ""
 "Chroot local includes are installed after package installation so that files "
 "installed by packages are overwritten."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_contents.xml:91 en/customization_contents.xml:98
-#: en/customization_contents.xml:107 en/customization_contents.xml:112
-#: en/customization_contents.xml:117
+#: en/customization_contents.xml:43 en/customization_contents.xml:47
+#: en/customization_contents.xml:52 en/customization_contents.xml:56
+#: en/customization_contents.xml:60
 msgid "FIXME."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_contents.xml:105
+#: en/customization_contents.xml:51
 msgid "Hooks"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:108
+#: en/customization_contents.xml:53
 msgid "Enabling hooks"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_contents.xml:111
+#: en/customization_contents.xml:55
 msgid "Live/chroot local hooks"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_contents.xml:116
+#: en/customization_contents.xml:59
 msgid "Binary local hooks"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_contents.xml:123
+#: en/customization_contents.xml:64
 msgid "Preseeding Debconf questions"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:125
+#: en/customization_contents.xml:65
 msgid ""
 "Files in the <filename class=\"directory\">config/chroot_local-preseed</"
 "filename> directory are considered to be debconf preseed files and are "
@@ -184,18 +172,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:127
+#: en/customization_contents.xml:66
 msgid ""
 "For more information about debconf, please see debconf(7) in the "
 "<command>debconf</command> package."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_contents.xml:131
+#: en/customization_contents.xml:69
 msgid "Symlink conversion"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_contents.xml:132
+#: en/customization_contents.xml:70
 msgid "FIXME. (This is probably in the wrong section)"
 msgstr ""
diff --git a/manual/pot/customization_internationalization.xml.pot b/manual/pot/customization_internationalization.xml.pot
index e0c4705..32280bd 100644
--- a/manual/pot/customization_internationalization.xml.pot
+++ b/manual/pot/customization_internationalization.xml.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,74 +16,74 @@ msgstr ""
 "Content-Transfer-Encoding: ENCODING"
 
 #. type: Content of: <sect1><title>
-#: en/customization_internationalization.xml:7
+#: en/customization_internationalization.xml:6
 msgid "Customising Locale And Language"
 msgstr ""
 
 #. type: Content of: <sect1><para>
-#: en/customization_internationalization.xml:8
+#: en/customization_internationalization.xml:7
 msgid "This chapter discusses customisation for language specific parameters."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_internationalization.xml:11
+#: en/customization_internationalization.xml:9
 msgid "Default locale and keyboard"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para><screen>
-#: en/customization_internationalization.xml:17
+#: en/customization_internationalization.xml:10
 #, no-wrap
-msgid "$ lh_config --bootappend-live \"locale=en_GB.UTF-8\"\n"
+msgid " $ lh_config --bootappend-live \"locale=en_GB.UTF-8\" "
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para><screen>
-#: en/customization_internationalization.xml:21
+#: en/customization_internationalization.xml:10
 #, no-wrap
-msgid "$ lh_config --bootappend-live \"keyb=uk\"\n"
+msgid " $ lh_config --bootappend-live \"keyb=uk\" "
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para><screen>
-#: en/customization_internationalization.xml:25
+#: en/customization_internationalization.xml:10
 #, no-wrap
-msgid "$ lh_config --bootappend-live \"locale=en_GB.UTF-8 keyb=uk\"\n"
+msgid " $ lh_config --bootappend-live \"locale=en_GB.UTF-8 keyb=uk\" "
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para><screen>
-#: en/customization_internationalization.xml:29
+#: en/customization_internationalization.xml:10
 #, no-wrap
-msgid "$ lh_config --bootappend-live \"locale=uk\"\n"
+msgid " $ lh_config --bootappend-live \"locale=uk\" "
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_internationalization.xml:14
+#: en/customization_internationalization.xml:10
 msgid ""
-"The default locale when building a live cd is \"locale=en_US.UTF-8\".  To "
-"set the locale for the UK (locale=en_GB.UTF-8)  <placeholder type=\"screen\" "
-"id=\"0\"/> The entry for a British keyboard would be <placeholder type="
-"\"screen\" id=\"1\"/> To configure both the locale and the keyboard for the "
-"UK the entry would be <placeholder type=\"screen\" id=\"2\"/> or "
-"<placeholder type=\"screen\" id=\"3\"/>"
+"The default locale when building a live cd is \"locale=en_US.UTF-8\". To set "
+"the locale for the UK (locale=en_GB.UTF-8) <placeholder type=\"screen\" id="
+"\"0\"/> The entry for a British keyboard would be <placeholder type=\"screen"
+"\" id=\"1\"/> To configure both the locale and the keyboard for the UK the "
+"entry would be <placeholder type=\"screen\" id=\"2\"/> or <placeholder type="
+"\"screen\" id=\"3\"/>"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_internationalization.xml:37
+#: en/customization_internationalization.xml:14
 msgid "l10n Packages"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para><screen>
-#: en/customization_internationalization.xml:42
+#: en/customization_internationalization.xml:15
 #, no-wrap
-msgid "$ lh_config --language \"se\"\n"
+msgid " $ lh_config --language \"se\" "
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para><screen>
-#: en/customization_internationalization.xml:46
+#: en/customization_internationalization.xml:15
 #, no-wrap
-msgid "  config/templates/syslinux/se\n"
+msgid " config/templates/syslinux/se "
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_internationalization.xml:40
+#: en/customization_internationalization.xml:15
 msgid ""
 "lh build can automatically check for each package, for which it's know that "
 "there are -l10n packages available and install them. To add Swedish packages "
diff --git a/manual/pot/customization_packages.xml.pot b/manual/pot/customization_packages.xml.pot
index 73671e1..dcba5fb 100644
--- a/manual/pot/customization_packages.xml.pot
+++ b/manual/pot/customization_packages.xml.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,134 +16,131 @@ msgstr ""
 "Content-Transfer-Encoding: ENCODING"
 
 #. type: Content of: <chapter><para>
-#: en/about_manual.xml:125 en/customization_bootup.xml:11
-#: en/customization_bootup.xml:20 en/customization_bootup.xml:26
-#: en/customization_bootup.xml:38 en/customization_bootup.xml:85
-#: en/customization_bootup.xml:92 en/customization_bootup.xml:99
-#: en/customization_bootup.xml:106 en/customization_packages.xml:36
-#: en/customization_packages.xml:306 en/customization_packages.xml:326
-#: en/customization_packages.xml:384 en/customization_packages.xml:492
-#: en/customization_packages.xml:535 en/live-environment.xml:11
-#: en/resources.xml:11 en/success-stories.xml:11
+#: en/about_manual.xml:65 en/customization_bootup.xml:8
+#: en/customization_bootup.xml:14 en/customization_bootup.xml:17
+#: en/customization_bootup.xml:25 en/customization_bootup.xml:37
+#: en/customization_bootup.xml:41 en/customization_bootup.xml:45
+#: en/customization_bootup.xml:49 en/customization_packages.xml:18
+#: en/customization_packages.xml:130 en/customization_packages.xml:138
+#: en/customization_packages.xml:160 en/customization_packages.xml:198
+#: en/customization_packages.xml:209 en/live-environment.xml:9
+#: en/resources.xml:9 en/success-stories.xml:8
 msgid "FIXME"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/about_manual.xml:298 en/about_manual.xml:308 en/about_manual.xml:318
-#: en/about_manual.xml:338 en/about_manual.xml:351 en/about_manual.xml:366
-#: en/about_manual.xml:379 en/about_manual.xml:389 en/basics.xml:113
-#: en/basics.xml:128 en/basics.xml:144 en/basics.xml:158 en/basics.xml:194
-#: en/basics.xml:220 en/basics.xml:230 en/basics.xml:239 en/basics.xml:253
-#: en/basics.xml:275 en/basics.xml:302 en/basics.xml:312 en/basics.xml:320
-#: en/basics.xml:354 en/basics.xml:364 en/basics.xml:382 en/basics.xml:429
-#: en/basics.xml:498 en/basics.xml:530 en/basics.xml:539 en/basics.xml:590
-#: en/basics.xml:646 en/customization_packages.xml:50
-#: en/customization_packages.xml:58 en/customization_packages.xml:71
-#: en/customization_packages.xml:80 en/customization_packages.xml:104
-#: en/customization_packages.xml:222 en/customization_packages.xml:230
-#: en/customization_packages.xml:265 en/customization_packages.xml:310
-#: en/customization_packages.xml:330 en/customization_packages.xml:341
-#: en/customization_packages.xml:352 en/customization_packages.xml:362
-#: en/faq.xml:64 en/faq.xml:241 en/faq.xml:244 en/faq.xml:252 en/faq.xml:256
-#: en/faq.xml:264 en/faq.xml:279 en/faq.xml:287 en/faq.xml:334 en/faq.xml:424
-#: en/faq.xml:430 en/faq.xml:481 en/faq.xml:483 en/faq.xml:487 en/faq.xml:491
-#: en/overview.xml:181 en/overview.xml:230 en/overview.xml:240
+#: en/about_manual.xml:143 en/about_manual.xml:147 en/about_manual.xml:151
+#: en/about_manual.xml:160 en/about_manual.xml:166 en/about_manual.xml:172
+#: en/about_manual.xml:178 en/about_manual.xml:184 en/basics.xml:45
+#: en/basics.xml:50 en/basics.xml:57 en/basics.xml:60 en/basics.xml:72
+#: en/basics.xml:81 en/basics.xml:85 en/basics.xml:89 en/basics.xml:95
+#: en/basics.xml:105 en/basics.xml:118 en/basics.xml:122 en/basics.xml:126
+#: en/basics.xml:139 en/basics.xml:143 en/basics.xml:148 en/basics.xml:160
+#: en/basics.xml:170 en/basics.xml:182 en/basics.xml:186 en/basics.xml:205
+#: en/basics.xml:220 en/customization_packages.xml:25
+#: en/customization_packages.xml:29 en/customization_packages.xml:34
+#: en/customization_packages.xml:38 en/customization_packages.xml:48
+#: en/customization_packages.xml:102 en/customization_packages.xml:106
+#: en/customization_packages.xml:116 en/customization_packages.xml:132
+#: en/customization_packages.xml:140 en/customization_packages.xml:144
+#: en/customization_packages.xml:148 en/customization_packages.xml:152
+#: en/faq.xml:36 en/faq.xml:128 en/faq.xml:131 en/faq.xml:138 en/faq.xml:141
+#: en/faq.xml:163 en/faq.xml:188 en/faq.xml:210 en/overview.xml:61
+#: en/overview.xml:66 en/overview.xml:70
 msgid "<placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <sect1><title>
-#: en/customization_packages.xml:9
+#: en/customization_packages.xml:6
 msgid "Customising package installation"
 msgstr ""
 
 #. type: Content of: <sect1><para>
-#: en/customization_packages.xml:12
+#: en/customization_packages.xml:7
 msgid ""
 "This chapter discusses the customisation of package installation. This "
 "involves:"
 msgstr ""
 
 #. type: Content of: <sect1><orderedlist><listitem><para>
-#: en/customization_packages.xml:20
+#: en/customization_packages.xml:10
 msgid "Selecting additional packages to be installed"
 msgstr ""
 
 #. type: Content of: <sect1><orderedlist><listitem><para>
-#: en/customization_packages.xml:26
+#: en/customization_packages.xml:13
 msgid "Installing modified packages"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_packages.xml:33
+#: en/customization_packages.xml:17
 msgid "Package sources"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_packages.xml:42
+#: en/customization_packages.xml:21
 msgid "Debian repositories"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:46
+#: en/customization_packages.xml:23
 msgid "To set a local mirror (used to ''build'' the live-cd)"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/customization_packages.xml:50
+#: en/customization_packages.xml:25
 #, no-wrap
 msgid "$ lh config --mirror-bootstrap \"http://local.intra.net/debian/\" --mirror-chroot \"http://local.intra.net/debian/\""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:54
+#: en/customization_packages.xml:27
 msgid "The generic mirror is added to the live-system's /etc/apt/sources.list."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/customization_packages.xml:58
+#: en/customization_packages.xml:29
 #, no-wrap
 msgid "$ lh config --mirror-binary \"http://ftp.debian.org/debian/\""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:62
+#: en/customization_packages.xml:31
 msgid ""
 "Note: It is ''not'' used for building the live-cd but to install new "
 "software while using the live-cd."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:67
+#: en/customization_packages.xml:32
 msgid "It can be disabled by setting binary indices parameter to disabled"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/customization_packages.xml:71
+#: en/customization_packages.xml:34
 #, no-wrap
 msgid "$ lh config --binary-indices disabled"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:75
+#: en/customization_packages.xml:36
 msgid ""
 "Note: the same applies for mirror chroot security and mirror binary security"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/customization_packages.xml:80
+#: en/customization_packages.xml:38
 #, no-wrap
-msgid ""
-"$ lh config --mirror-chroot-security {URL}\n"
-"$ lh config --mirror-binary-security {URL}"
+msgid "$ lh config --mirror-chroot-security {URL} $ lh config --mirror-binary-security {URL}"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_packages.xml:87
+#: en/customization_packages.xml:43
 msgid "Own repository"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:91
+#: en/customization_packages.xml:45
 msgid ""
 "To add more repositories (e.g. backports, experimental packages, etc.), "
 "create <filename>config/chroot_sources/your-cdd-repo.{chroot,binary}</"
@@ -151,7 +148,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:98
+#: en/customization_packages.xml:46
 msgid ""
 "e.g. <filename>config/chroot_sources/live.chroot</filename> allows you to "
 "install packages from the debian live snapshot repository at live-cd build "
@@ -159,13 +156,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para><screen>
-#: en/customization_packages.xml:104
+#: en/customization_packages.xml:48
 #, no-wrap
 msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:108
+#: en/customization_packages.xml:50
 msgid ""
 "If you add the line to <filename>config/chroot_sources/live.binary</"
 "filename> the repository will be added to your live-system's <filename>/etc/"
@@ -173,24 +170,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:115
+#: en/customization_packages.xml:51
 msgid "If such files exist, they will be picked up automatically."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:119
+#: en/customization_packages.xml:52
 msgid ""
 "You can also put the gpg-key used to sign the repository into config/"
 "chroot_sources/foo.{binary,chroot}.gpg"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_packages.xml:130
+#: en/customization_packages.xml:58
 msgid "Package installation"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:133
+#: en/customization_packages.xml:59
 msgid ""
 "You can elect to use either <command>apt</command> or <command>aptitude</"
 "command> when installing packages. Which utility is used is governed by the "
@@ -199,97 +196,97 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_packages.xml:143
+#: en/customization_packages.xml:63
 msgid "<command>apt</command>"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:147
+#: en/customization_packages.xml:66
 msgid ""
 "Specifying a missing package causes package installation to fail, which may "
 "not be the desired behaviour."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:152
+#: en/customization_packages.xml:67
 msgid "This is the default setting for building images for Lenny or later."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><term>
-#: en/customization_packages.xml:158
+#: en/customization_packages.xml:72
 msgid "<command>aptitude</command>"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:162
+#: en/customization_packages.xml:75
 msgid ""
 "Specifying a missing package causes package installation to succeed, which "
 "may not be the desired behaviour."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
-#: en/customization_packages.xml:167
+#: en/customization_packages.xml:76
 msgid "This is the default setting for building images for Etch."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_packages.xml:177
+#: en/customization_packages.xml:82
 msgid "Installing additional packages"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:180
+#: en/customization_packages.xml:83
 msgid ""
 "&live-helper; has a number of mechanisms for indicating that additional "
 "packages should be installed, including:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:188 en/customization_packages.xml:213
+#: en/customization_packages.xml:86 en/customization_packages.xml:99
 msgid "The <command>LH_PACKAGES</command> variable"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:194 en/customization_packages.xml:249
+#: en/customization_packages.xml:89 en/customization_packages.xml:112
 msgid "Package lists"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><orderedlist><listitem><para>
-#: en/customization_packages.xml:200
+#: en/customization_packages.xml:92
 msgid "Local packages (<filename>chroot_local-packages/</filename>)"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:206 en/customization_packages.xml:381
+#: en/customization_packages.xml:95 en/customization_packages.xml:159
 msgid "Tasks"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:216
+#: en/customization_packages.xml:100
 msgid ""
 "To install additional packages, simply add them to the <command>LH_PACKAGES</"
 "command> variable in <filename>config/chroot</filename>. For example:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/customization_packages.xml:222
+#: en/customization_packages.xml:102
 #, no-wrap
 msgid "LH_PACKAGES=\"package1 package2 package3 ... \""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:226
+#: en/customization_packages.xml:104
 msgid "You can also specify initial values on the command line:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/customization_packages.xml:230
+#: en/customization_packages.xml:106
 #, no-wrap
 msgid "$ lh config --packages \"package1 package2 package3\""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:234
+#: en/customization_packages.xml:108
 msgid ""
 "The behaviour of &live-helper; when specifying a package that does not exist "
 "is determined by your choice of APT utility. See <xref linkend=\"package-"
@@ -297,7 +294,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:240
+#: en/customization_packages.xml:109
 msgid ""
 "If you need to specify a large number of packages to be installed or you "
 "need flexibility regarding which packages to install, you should probably be "
@@ -306,7 +303,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:252
+#: en/customization_packages.xml:113
 msgid ""
 "Package lists are a powerful way of expressing which packages should be "
 "installed. &live-helper; ships with a number of predefined package lists "
@@ -315,7 +312,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:259
+#: en/customization_packages.xml:114
 msgid ""
 "To specify a package list, add the name of the list to the "
 "<command>LH_PACKAGES_LISTS</command> variable in <filename>config/chroot</"
@@ -323,44 +320,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para><screen>
-#: en/customization_packages.xml:265
+#: en/customization_packages.xml:116
 #, no-wrap
 msgid "LH_PACKAGES_LISTS=\"gnome\""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:269
+#: en/customization_packages.xml:118
 msgid ""
 "Package lists that are distributed with &live-helper; reside in the "
 "<command>/usr/share/live-helper/lists</command> directory."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><title>
-#: en/customization_packages.xml:274
+#: en/customization_packages.xml:120
 msgid "Local packages lists"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:277
+#: en/customization_packages.xml:121
 msgid ""
 "You may supplement the supplied lists using local package lists stored in "
 "<command>config/chroot_local-packageslists</command>."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:282
+#: en/customization_packages.xml:122
 msgid ""
 "Package lists that exist in this directory always override package lists "
 "distributed with &live-helper;. This can cause undesired effects when."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><note><title>
-#: en/customization_packages.xml:288
+#: en/customization_packages.xml:124
 msgid "&live-helper; 2.x change"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><note><para>
-#: en/customization_packages.xml:291
+#: en/customization_packages.xml:125
 msgid ""
 "Any file with <command>.list</command> suffix in <command>config/"
 "chroot_local-packageslists</command> is automatically enabled, the variable "
@@ -369,20 +366,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><title>
-#: en/customization_packages.xml:303
+#: en/customization_packages.xml:129
 msgid "Extending a provided package list using includes"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/customization_packages.xml:310
+#: en/customization_packages.xml:132
 #, no-wrap
-msgid ""
-"#include &lt;gnome&gt;\n"
-"iceweasel"
+msgid "#include &lt;gnome&gt; iceweasel"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:315
+#: en/customization_packages.xml:134
 msgid ""
 "The package lists that are included with &live-helper; make extensive use of "
 "includes. They are available to view in the <command>/usr/share/live-helper/"
@@ -390,84 +385,72 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><title>
-#: en/customization_packages.xml:323
+#: en/customization_packages.xml:137
 msgid "Using conditionals inside packages lists"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/customization_packages.xml:330
+#: en/customization_packages.xml:140
 #, no-wrap
-msgid ""
-"#if ARCHITECTURE amd64\n"
-"ia32-libs\n"
-"#endif"
+msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:336
+#: en/customization_packages.xml:142
 msgid ""
 "or if <command>LH_ARCHITECTURE</command> is set to <command>i386</command> "
 "or <command>amd64</command>:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/customization_packages.xml:341
+#: en/customization_packages.xml:144
 #, no-wrap
-msgid ""
-"#if ARCHITECTURE i386 amd64\n"
-"memtest86+\n"
-"#endif"
+msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:347
+#: en/customization_packages.xml:146
 msgid ""
 "or if <command>LH_SECTIONS</command> contains either <command>contrib</"
 "command> or <command>non-free</command>:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/customization_packages.xml:352
+#: en/customization_packages.xml:148
 #, no-wrap
-msgid ""
-"#if SECTIONS contrib non-free\n"
-"vrms\n"
-"#endif"
+msgid "#if SECTIONS contrib non-free vrms #endif"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:358
+#: en/customization_packages.xml:150
 msgid "A conditional may surround an <command>#include</command> directive:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><para><screen>
-#: en/customization_packages.xml:362
+#: en/customization_packages.xml:152
 #, no-wrap
-msgid ""
-"#if ARCHITECTURE amd64\n"
-"#include &lt;gnome-full&gt;\n"
-"#endif"
+msgid "#if ARCHITECTURE amd64 #include &lt;gnome-full&gt; #endif"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:368
+#: en/customization_packages.xml:154
 msgid ""
 "Any &live-helper; configuration variable that begins with <command>LH_</"
 "command> can be tested in this way."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><sect4><para>
-#: en/customization_packages.xml:373
+#: en/customization_packages.xml:155
 msgid "The nesting of conditionals is not supported."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><title>
-#: en/customization_packages.xml:392
+#: en/customization_packages.xml:164
 msgid "Installing modified or third-party packages"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:395
+#: en/customization_packages.xml:165
 msgid ""
 "Whilst it is against the philosophy of Debian Live, it may sometimes be "
 "necessary to build a Live system with modified versions of packages that are "
@@ -478,33 +461,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:404
+#: en/customization_packages.xml:166
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's <ulink url=\"http://www.joachim-"
-"breitner.de/blog/archives/282-How-to-fork-privately.html\" >'How to fork "
+"breitner.de/blog/archives/282-How-to-fork-privately.html\">'How to fork "
 "privately'</ulink> may be of interest, however. The creation of bespoke "
 "packages is covered in the <ulink url=\"http://www.debian.org/doc/maint-"
 "guide/\">Debian New Maintainers' Guide</ulink> and elsewhere."
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:414
+#: en/customization_packages.xml:167
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><orderedlist><listitem><para>
-#: en/customization_packages.xml:421
+#: en/customization_packages.xml:171
 msgid "<filename>chroot_local-packages</filename>"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><orderedlist><listitem><para>
-#: en/customization_packages.xml:427
+#: en/customization_packages.xml:175
 msgid "Using a custom APT repository"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><para>
-#: en/customization_packages.xml:434
+#: en/customization_packages.xml:178
 msgid ""
 "The <filename>chroot_local-packages</filename> is simpler to achieve and "
 "useful for \"one-off\" customisations but has a number of drawbacks, whilst "
@@ -512,13 +495,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:441
+#: en/customization_packages.xml:180
 msgid ""
 "Using <filename>chroot_local-packages</filename> to install custom packages"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:446
+#: en/customization_packages.xml:181
 msgid ""
 "To install a custom package, simply copy it to the <command>config/"
 "chroot_local-packages</command> directory. Packages that are inside this "
@@ -527,45 +510,45 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:453
+#: en/customization_packages.xml:182
 msgid ""
 "Packages <emphasis>must</emphasis> be named in the prescribed way. One "
 "simple way to do this is to use <command>dpkg-name</command>. FIXME"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:458
+#: en/customization_packages.xml:183
 msgid ""
 "Using <filename>chroot_local-packages</filename> for installation of custom "
 "packages has disadvantages:"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/customization_packages.xml:466
+#: en/customization_packages.xml:186
 msgid "It is not possible to use secure APT"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/customization_packages.xml:472
+#: en/customization_packages.xml:189
 msgid ""
 "You must install all appropriate packages in the <command>config/"
 "chroot_local-packages</command> directory"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
-#: en/customization_packages.xml:479
+#: en/customization_packages.xml:192
 msgid ""
 "It does not lend itself to storing Debian Live configurations in revision "
 "control"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:489
+#: en/customization_packages.xml:197
 msgid "Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:496
+#: en/customization_packages.xml:199
 msgid ""
 "Unlike using <filename>chroot_local-packages</filename>, when using a custom "
 "APT repository you must ensure that you specify the packages elsewhere. See "
@@ -573,7 +556,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:502
+#: en/customization_packages.xml:200
 msgid ""
 "Whilst it may seem unnecessary effort to create an APT repository to install "
 "custom packages, the infrastructure can be easily re-used at a later date to "
@@ -581,12 +564,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:510
+#: en/customization_packages.xml:203
 msgid "Custom packages and APT"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:513
+#: en/customization_packages.xml:204
 msgid ""
 "&live-helper; uses APT to install all packages into the live system so will "
 "therefore inherit behaviours from this program. One relevant example is that "
@@ -596,7 +579,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:521
+#: en/customization_packages.xml:205
 msgid ""
 "Because of this, you may wish to increment the version number in your custom "
 "packages' <command>debian/changelog</command> files to ensure that your "
@@ -606,12 +589,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><title>
-#: en/customization_packages.xml:532
+#: en/customization_packages.xml:208
 msgid "Altering APT preferences during Live system"
 msgstr ""
 
 #. type: Content of: <sect1><sect2><sect3><para>
-#: en/customization_packages.xml:539
+#: en/customization_packages.xml:210
 msgid ""
 "Whilst it may seem unnecessary effort to create an APT repository to install "
 "custom packages, the infrastructure can be easily re-used at a later date to "
diff --git a/manual/pot/faq.xml.pot b/manual/pot/faq.xml.pot
index 2caf325..09b9754 100644
--- a/manual/pot/faq.xml.pot
+++ b/manual/pot/faq.xml.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,119 +16,119 @@ msgstr ""
 "Content-Transfer-Encoding: ENCODING"
 
 #. type: Content of: <chapter><section><section><para>
-#: en/about_manual.xml:298 en/about_manual.xml:308 en/about_manual.xml:318
-#: en/about_manual.xml:338 en/about_manual.xml:351 en/about_manual.xml:366
-#: en/about_manual.xml:379 en/about_manual.xml:389 en/basics.xml:113
-#: en/basics.xml:128 en/basics.xml:144 en/basics.xml:158 en/basics.xml:194
-#: en/basics.xml:220 en/basics.xml:230 en/basics.xml:239 en/basics.xml:253
-#: en/basics.xml:275 en/basics.xml:302 en/basics.xml:312 en/basics.xml:320
-#: en/basics.xml:354 en/basics.xml:364 en/basics.xml:382 en/basics.xml:429
-#: en/basics.xml:498 en/basics.xml:530 en/basics.xml:539 en/basics.xml:590
-#: en/basics.xml:646 en/customization_packages.xml:50
-#: en/customization_packages.xml:58 en/customization_packages.xml:71
-#: en/customization_packages.xml:80 en/customization_packages.xml:104
-#: en/customization_packages.xml:222 en/customization_packages.xml:230
-#: en/customization_packages.xml:265 en/customization_packages.xml:310
-#: en/customization_packages.xml:330 en/customization_packages.xml:341
-#: en/customization_packages.xml:352 en/customization_packages.xml:362
-#: en/faq.xml:64 en/faq.xml:241 en/faq.xml:244 en/faq.xml:252 en/faq.xml:256
-#: en/faq.xml:264 en/faq.xml:279 en/faq.xml:287 en/faq.xml:334 en/faq.xml:424
-#: en/faq.xml:430 en/faq.xml:481 en/faq.xml:483 en/faq.xml:487 en/faq.xml:491
-#: en/overview.xml:181 en/overview.xml:230 en/overview.xml:240
+#: en/about_manual.xml:143 en/about_manual.xml:147 en/about_manual.xml:151
+#: en/about_manual.xml:160 en/about_manual.xml:166 en/about_manual.xml:172
+#: en/about_manual.xml:178 en/about_manual.xml:184 en/basics.xml:45
+#: en/basics.xml:50 en/basics.xml:57 en/basics.xml:60 en/basics.xml:72
+#: en/basics.xml:81 en/basics.xml:85 en/basics.xml:89 en/basics.xml:95
+#: en/basics.xml:105 en/basics.xml:118 en/basics.xml:122 en/basics.xml:126
+#: en/basics.xml:139 en/basics.xml:143 en/basics.xml:148 en/basics.xml:160
+#: en/basics.xml:170 en/basics.xml:182 en/basics.xml:186 en/basics.xml:205
+#: en/basics.xml:220 en/customization_packages.xml:25
+#: en/customization_packages.xml:29 en/customization_packages.xml:34
+#: en/customization_packages.xml:38 en/customization_packages.xml:48
+#: en/customization_packages.xml:102 en/customization_packages.xml:106
+#: en/customization_packages.xml:116 en/customization_packages.xml:132
+#: en/customization_packages.xml:140 en/customization_packages.xml:144
+#: en/customization_packages.xml:148 en/customization_packages.xml:152
+#: en/faq.xml:36 en/faq.xml:128 en/faq.xml:131 en/faq.xml:138 en/faq.xml:141
+#: en/faq.xml:163 en/faq.xml:188 en/faq.xml:210 en/overview.xml:61
+#: en/overview.xml:66 en/overview.xml:70
 msgid "<placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><title>
-#: en/faq.xml:7
+#: en/faq.xml:6
 msgid "Frequently asked questions (FAQ)"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:12
+#: en/faq.xml:9
 msgid "Q: I downloaded a prebuilt live image. How do I put it on a USB stick?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:13
+#: en/faq.xml:10
 msgid ""
-"A: See <xref linkend=\"image_copying\" /> \"Copying USB/HDD image to a USB "
+"A: See <xref linkend=\"image_copying\"/> \"Copying USB/HDD image to a USB "
 "stick\""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:17
+#: en/faq.xml:13
 msgid "Q: How do I log my build?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:19
+#: en/faq.xml:14
 #, no-wrap
-msgid "$ lh_build 2>&amp;1 | tee build.log"
+msgid "$ lh_build 2&gt;&amp;1 | tee build.log"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:18
+#: en/faq.xml:14
 msgid ""
 "A: You could use script, screen or tee: <placeholder type=\"screen\" id="
 "\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:24
+#: en/faq.xml:17
 msgid ""
 "Q: How can I convert an already installed standard Debian partition into a "
 "Debian Live system?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:25
+#: en/faq.xml:18
 msgid ""
 "A: Save the list of installed packages and load it into your new Debian Live "
 "System. Copy your /etc to config/chroot_local-includes"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:29
+#: en/faq.xml:21
 msgid ""
 "Q: What does 'losetup: could not find any free loop device' mean and how do "
 "I fix it?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:30
+#: en/faq.xml:22
 msgid ""
 "A: Loop devices are used during the build; there probably aren't any free if "
-"you've aborted several builds. Something like: for l in /dev/loop* ; do "
+"you've aborted several builds. Something like: for l in /dev/loop0 /dev/"
+"loop1 /dev/loop2 /dev/loop3 /dev/loop4 /dev/loop5 /dev/loop6 /dev/loop7 ; do "
 "losetup -d $l ; done should rectify the situation (assuming all loop devices "
 "in use were created by lh_build; if in doubt, check the contents of each "
 "loop device before deleting them with losetup -d)."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:34
+#: en/faq.xml:25
 msgid "Q: How do I launch an interactive shell during the chroot stage?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:36
+#: en/faq.xml:26
 #, no-wrap
 msgid "$ lh_config --interactive shell"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:38
+#: en/faq.xml:26
 #, no-wrap
 msgid "# logout"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:40
+#: en/faq.xml:26
 #, no-wrap
 msgid "# exit"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:35
+#: en/faq.xml:26
 msgid ""
 "A: To enable interactive shell: <placeholder type=\"screen\" id=\"0\"/> To "
 "continue the build process: <placeholder type=\"screen\" id=\"1\"/> or "
@@ -137,24 +137,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:46
+#: en/faq.xml:29
 msgid "Q: What is the root /user password?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:47
+#: en/faq.xml:30
 #, no-wrap
 msgid " sudo -i "
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:47
+#: en/faq.xml:30
 #, no-wrap
 msgid "sudo passwd"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:47
+#: en/faq.xml:30
 msgid ""
 "A: The user password for the live user is 'live'. By default, there is not "
 "any root password. You can switch to root with <placeholder type=\"screen\" "
@@ -163,58 +163,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:51
+#: en/faq.xml:33
 msgid "Q: How do I change root or any user password?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:52
+#: en/faq.xml:34
 msgid ""
 "A: Add a chroot local hook script to change root or any user password each "
 "time you build an image."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:53
+#: en/faq.xml:35
 msgid ""
 "e.g. config/chroot_local-hooks/01-update_password.sh to set root password to "
 "\"nopasswd\""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:55
+#: en/faq.xml:36
 #, no-wrap
-msgid ""
-"#!/bin/sh\n"
-"echo \"I: update password\"\n"
-"echo \"root:nopasswd\" | chpasswd"
+msgid "#!/bin/sh echo \"I: update password\" echo \"root:nopasswd\" | chpasswd"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:58
+#: en/faq.xml:36
 #, no-wrap
 msgid "$ chmod +x config/chroot_local-hooks/01-update_password.sh"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><note><screen>
-#: en/faq.xml:60
+#: en/faq.xml:36
 #, no-wrap
-msgid ""
-"mkdir -p config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/\n"
-"cp /usr/share/initramfs-tools/scripts/live-bottom/10adduser config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/"
+msgid "mkdir -p config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/ cp /usr/share/initramfs-tools/scripts/live-bottom/10adduser config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:62
+#: en/faq.xml:36
 #, no-wrap
 msgid " echo \"newlivepass\" | mkpasswd -s."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:55
+#: en/faq.xml:36
 msgid ""
-"<placeholder type=\"screen\" id=\"0\"/> <placeholder type=\"screen\" id="
-"\"1\"/> <note>For live user; you need to copy the /usr/share/initramfs-tools/"
+"<placeholder type=\"screen\" id=\"0\"/><placeholder type=\"screen\" id=\"1\"/"
+"><note>For live user; you need to copy the /usr/share/initramfs-tools/"
 "scripts/live-bottom/10adduser your build folder: <placeholder type=\"screen"
 "\" id=\"2\"/></note> Then edit the config/chroot_local-includes/usr/share/"
 "initramfs-tools/scripts/live-bottom/10adduser and paste in the new "
@@ -223,26 +218,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:63
+#: en/faq.xml:36
 msgid ""
 "Or add an hook file in config/chroot_local-hooks/ with something like the "
 "below:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:64
+#: en/faq.xml:36
 #, no-wrap
-msgid ""
-" #!/bin/sh\n"
-"# Change the autogenerated user password to \"debianlive\"\n"
-"plain_password=\"debianlive\"\n"
-"password=$(echo \"${plain_password}\" | mkpasswd -s)\n"
-"sed -i -e 's/\\(user_crypted=\\)\\(.*\\)\\( #.*\\)/\\1\\\"'${password}'\\\"\\3/' /usr/share/initramfs-tools/scripts/live-bottom/10adduser\n"
-"update-initramfs -tu -kall"
+msgid " #!/bin/sh # Change the autogenerated user password to \"debianlive\" plain_password=\"debianlive\" password=$(echo \"${plain_password}\" | mkpasswd -s) sed -i -e 's/\\(user_crypted=\\)\\(.*\\)\\( #.*\\)/\\1\\\"'${password}'\\\"\\3/' /usr/share/initramfs-tools/scripts/live-bottom/10adduser update-initramfs -tu -kall"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:70
+#: en/faq.xml:36
 msgid ""
 "The latter (hook model) could be more future proof than the former solution "
 "since it modifies just one string selectively but it requires the package "
@@ -252,24 +241,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:75
+#: en/faq.xml:39
 msgid "Q: How to disable autologin?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:77
+#: en/faq.xml:40
 #, no-wrap
 msgid "lh config --bootappend-live \"noautologin\""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:76
+#: en/faq.xml:40
 msgid ""
 "A1: use the commandline parameter <placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:78
+#: en/faq.xml:40
 msgid ""
 "A2: You need to set boot=noautologin noxautologin as described in man "
 "<filename>live-initramfs</filename> If you boot via TFTP you want to insert "
@@ -277,32 +266,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:83
+#: en/faq.xml:43
 msgid "Q: How do I change default hostname or username?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:85
+#: en/faq.xml:44
 #, no-wrap
-msgid ""
-"$ lh_config --hostname myhostname\n"
-"$ lh_config --username myusername"
+msgid "$ lh_config --hostname myhostname $ lh_config --username myusername"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:84
+#: en/faq.xml:44
 msgid ""
 "A: To change default hostname or username: <placeholder type=\"screen\" id="
 "\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:91
+#: en/faq.xml:47
 msgid "Q: How do I make the final image smaller?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:92
+#: en/faq.xml:48
 msgid ""
 "A: Clean orphaned apps/libs: Install package \"deborphan\" and then run "
 "'sudo deborphan -n' . Delete unwanted packages. Remove the apt cache. Purge "
@@ -310,72 +297,69 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:97
+#: en/faq.xml:51
 msgid ""
 "Q: How do I customize bash-config permanently (aliases, bash-completion "
 "etc.)?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:98
+#: en/faq.xml:52
 msgid "A: Add your own .bashrc config/chroot_local-includes/etc/skel/.bashrc"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:102
+#: en/faq.xml:55
 msgid "Q: How do I disable services permanently? (Be careful!)"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:103
+#: en/faq.xml:56
 msgid ""
 "A: Add a chroot local hook script to disable a service each time you build "
 "an image:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:105
+#: en/faq.xml:57
 #, no-wrap
-msgid ""
-"#!/bin/sh\n"
-"echo \"I: disable service\"\n"
-"update-rc.d -f   &#9001;service name &#9002; remove "
+msgid "#!/bin/sh echo \"I: disable service\" update-rc.d -f 〈service name 〉 remove "
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:108
+#: en/faq.xml:57
 #, no-wrap
 msgid " $ chmod +x config/chroot_local-hooks/01-disable_service.sh "
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:104
+#: en/faq.xml:57
 msgid ""
 "e.g. config/chroot_local-hooks/01-disable_service.sh <placeholder type="
 "\"screen\" id=\"0\"/> <placeholder type=\"screen\" id=\"1\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:114
+#: en/faq.xml:60
 #, no-wrap
 msgid "lh_config --checksums enabled|disabled "
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:113
+#: en/faq.xml:60
 msgid ""
 "Q: How do I enable | disable the md5checksum at the ISO building? "
 "<placeholder type=\"screen\" id=\"0\"/> Or change the LH_CHECKSUMS value."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:121
+#: en/faq.xml:63
 #, no-wrap
 msgid "lh_config --net-tarball none|gzip "
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:120
+#: en/faq.xml:63
 msgid ""
 "Q: How to disable the generation of the .tar.gz file? <placeholder type="
 "\"screen\" id=\"0\"/> Or change the LH_NET_TARBALL value. (only available in "
@@ -383,20 +367,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:127
+#: en/faq.xml:66
 msgid "Q: How do I \"build a new image\" ?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:129
+#: en/faq.xml:67
 #, no-wrap
-msgid ""
-"$ sudo lh_clean --binary\n"
-"$ sudo lh_build "
+msgid "$ sudo lh_clean --binary $ sudo lh_build "
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:128
+#: en/faq.xml:67
 msgid ""
 "A: Run commands: <placeholder type=\"screen\" id=\"0\"/> <emphasis>Hint:</"
 "emphasis> If the configuration had changed you should leave \"--binary\" "
@@ -404,45 +386,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:136
+#: en/faq.xml:70
 msgid "Q: How do I use Fluxbox ?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:137
+#: en/faq.xml:70
 msgid "A: Add a new lists file with the fluxbox packages you want."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:138
+#: en/faq.xml:70
 msgid "Create /home/$USERNAME/.dmrc file (default username is \"user\")."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:139
+#: en/faq.xml:70
 #, no-wrap
-msgid ""
-"$ cat .dmrc\n"
-"[Desktop]\n"
-"Session=fluxbox"
+msgid "$ cat .dmrc [Desktop] Session=fluxbox"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:139
+#: en/faq.xml:70
 msgid ""
 "<placeholder type=\"screen\" id=\"0\"/> <note>.dmrc is owned by $USERNAME:"
 "$USERNAME. </note>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:143
+#: en/faq.xml:70
 msgid ""
 "See also <ulink url=\"http://wiki.debian.org/Fluxbox/\">http://wiki.debian."
 "org/Fluxbox</ulink>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:144
+#: en/faq.xml:70
 msgid ""
 "A short HOWTO can be found here: <ulink url=\" http://wiki.debian.org/"
 "MichaelAblassmeier/CustomLiveCD\"> http://wiki.debian.org/MichaelAblassmeier/"
@@ -450,89 +429,89 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:150
+#: en/faq.xml:73
 msgid "Q: How do I use custom repositories?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:151
+#: en/faq.xml:74
 msgid ""
 "A: <ulink url=\"http://wiki.debian.org/DebianLive/Configuration\">See "
 "DebianLive/Configuration.</ulink>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:155
+#: en/faq.xml:77
 msgid ""
 "Q: How do I customize the artwork for the live CD (grub or syslinux boot "
 "splash, usplash, etc.)?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:156
+#: en/faq.xml:78
 msgid ""
 "A: <ulink url=\"http://wiki.debian.org/DebianLive/Howto/Custom_Artwork\"> "
 "See DebianLive/Howto/Custom_Artwork. </ulink> FIXME: NEED TO UPDATE"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:160
+#: en/faq.xml:81
 msgid ""
 "Q: How do I customize desktop environment (KDE, GNOME, XFCE, etc...) look?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:161
+#: en/faq.xml:81
 msgid "A: Start the live system in qemu:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:162
+#: en/faq.xml:81
 #, no-wrap
 msgid "$ qemu -m 256 -cdrom binary.iso -boot d -redir tcp:4222:10.0.2.15:22"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:162
+#: en/faq.xml:81
 msgid ""
 "<placeholder type=\"screen\" id=\"0\"/> <note>the -redir argument must be "
 "changed to meet your needs </note>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:168
+#: en/faq.xml:84
 msgid ""
 "Q: How do I execute a custom shell script inside the chroot system after the "
 "chroot stage?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:169
+#: en/faq.xml:85
 msgid "A: Add your script in config/chroot_local-hooks."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:173
+#: en/faq.xml:88
 msgid ""
 "Q: How do I add a script running immediately after all other scripts when "
 "the live system boots?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:174
+#: en/faq.xml:88
 msgid ""
 "A: Add your script in config/chroot_local-includes/usr/share/initramfs-tools/"
 "scripts/live-bottom/99script"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:175
+#: en/faq.xml:88
 #, no-wrap
 msgid "$ chmod +x config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/99script"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:175
+#: en/faq.xml:88
 msgid ""
 "<placeholder type=\"screen\" id=\"0\"/> <note>The hook script must be "
 "executable. Do not forget to lh_clean --chroot after making this change "
@@ -540,7 +519,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:177
+#: en/faq.xml:88
 msgid ""
 "You must also use the example script /usr/share/live-helper/examples/hooks/"
 "update-initramfs.sh to ensure your script gets built into the initramfs "
@@ -548,231 +527,215 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:182
+#: en/faq.xml:91
 msgid "Q: How do I add software not in Debian ?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:183
-msgid "A: See <xref linkend=\"packages\" /> Customising package installation"
+#: en/faq.xml:92
+msgid "A: See <xref linkend=\"packages\"/> Customising package installation"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:187
+#: en/faq.xml:95
 msgid "Q: What is the manifest with Ubuntu used for?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:188
+#: en/faq.xml:96
 msgid ""
 "A: Manifest is just the package list, which ubuntu does $something with. "
 "Don't worry about it."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:192
+#: en/faq.xml:99
 msgid "Q: What is this {p} syntax with mtools{p} and parted{p} ?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:193
+#: en/faq.xml:100
 msgid "A: That's aptitude."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:197
+#: en/faq.xml:103
 msgid ""
 "Q: Do I need to write the image on USB stick to test it? <note>you must use "
-"qemu >= 0.8. </note>"
+"qemu &gt;= 0.8. </note>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:203
+#: en/faq.xml:106
 msgid "Q: What is /cow ?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:204
+#: en/faq.xml:107
 msgid "A: Copy-on-write, the 'diff' from unionfs."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:208
+#: en/faq.xml:110
 msgid ""
 "Q: Is /usr/share/live-helper/lists/standard-x11 like preseed or is preseed "
 "something else entirely?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:209
+#: en/faq.xml:111
 msgid "A: It is not. It is a package list, not a debconf preseeding."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:213
+#: en/faq.xml:114
 msgid "Q: What is the difference between standard and minimal?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:214
+#: en/faq.xml:114
 msgid "standard: packages of priority standard and higher;"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:215
+#: en/faq.xml:114
 msgid "minimal: packages of priority essential and higher;"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:220
+#: en/faq.xml:117
 msgid "Q: What can the sections be used for? Aren't they BIG?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:221
+#: en/faq.xml:118
 msgid "A: Someone maybe wants to include packages from contrib or non-free."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:225
+#: en/faq.xml:121
 msgid "Q: memtest86+ ... is that used?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:226
+#: en/faq.xml:122
 msgid "A: Yes"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:230
+#: en/faq.xml:125
 msgid "Q: How do I build using predefined packages lists?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:231
+#: en/faq.xml:125
 msgid "A: e.g. to build using standard-x11 packages list:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:232
+#: en/faq.xml:125
 #, no-wrap
-msgid ""
-"$ sudo lh_config -p standard-x11\n"
-"$ sudo lh_build"
+msgid "$ sudo lh_config -p standard-x11 $ sudo lh_build"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:232
+#: en/faq.xml:125
 msgid ""
 "<placeholder type=\"screen\" id=\"0\"/> <note>The packages lists can be "
 "found in /usr/share/live-helper/lists/ directory. </note>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:239
+#: en/faq.xml:128
 msgid "Q: How do I rebuild without downloading all the packages again?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:240
+#: en/faq.xml:128
 msgid ""
 "A: All packages are cached in cache subdirectory. They remain until a clean "
 "purge:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:241
+#: en/faq.xml:128
 #, no-wrap
 msgid "$ sudo lh_clean --purge"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:242
+#: en/faq.xml:128
 msgid ""
 "You do not have to do anything to prevent packages from being re-downloaded. "
 "You need to remember to clean whichever stages you want to rebuild first."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:243
+#: en/faq.xml:128
 msgid ""
 "e.g. to rebuild from the cached bootstrap, chroot packages and build a new "
 "image."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:244
+#: en/faq.xml:128
 #, no-wrap
-msgid ""
-"$ sudo lh_clean\n"
-"$ sudo lh_build"
+msgid "$ sudo lh_clean $ sudo lh_build"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:250
+#: en/faq.xml:131
 msgid "Q: How do I boot USB debian-live on systems not supporting USB boot?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:251
+#: en/faq.xml:131
 msgid ""
 "A: Make a boot CD with grub, configured to boot from a debian-live kernel "
 "copied on the cd structure."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:252
+#: en/faq.xml:131
 #, no-wrap
-msgid ""
-"$ mkdir -p iso/boot/grub\n"
-"$ cp /usr/lib/grub/i386-pc/stage2_eltorito iso/boot/grub\n"
-"$ cp chroot/boot/* iso/boot/"
+msgid "$ mkdir -p iso/boot/grub $ cp /usr/lib/grub/i386-pc/stage2_eltorito iso/boot/grub $ cp chroot/boot/* iso/boot/"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:255
+#: en/faq.xml:131
 msgid "Create iso/boot/grub/menu.lst"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:256
+#: en/faq.xml:131
 #, no-wrap
-msgid ""
-"default 0\n"
-"timeout 5\n"
-"color cyan/blue white/blue\n"
-"title Debian Live\n"
-"root (cd)\n"
-"kernel /boot/vmlinuz boot=live\n"
-"initrd /boot/initrd.img"
+msgid "default 0 timeout 5 color cyan/blue white/blue title Debian Live root (cd) kernel /boot/vmlinuz boot=live initrd /boot/initrd.img"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:263
+#: en/faq.xml:131
 msgid "Create the iso image"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:264
+#: en/faq.xml:131
 #, no-wrap
-msgid ""
-"$ mkisofs -R -b boot/grub/stage2_eltorito -no-emul-boot \\\n"
-"-boot-load-size 4 -boot-info-table -o grub.iso iso"
+msgid "$ mkisofs -R -b boot/grub/stage2_eltorito -no-emul-boot \\ -boot-load-size 4 -boot-info-table -o grub.iso iso"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:266
+#: en/faq.xml:131
 msgid "Burn the image."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:271
+#: en/faq.xml:134
 msgid ""
 "Q: How do I boot debian-live on systems not supporting CDROM or USB boot?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:272
+#: en/faq.xml:135
 msgid ""
 "A: If you have a floppy drive, you may be able to use it, otherwise you will "
 "need to use loadlin/grub4dos/win32-loader. If you have a second system to "
@@ -782,50 +745,48 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:277
+#: en/faq.xml:138
 msgid ""
 "Q: The X configuration does not seems to work, the resolution is too low. "
 "What can I do?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:278
+#: en/faq.xml:138
 msgid "A: Use xdebconfigurator"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:279
+#: en/faq.xml:138
 #, no-wrap
-msgid ""
-"$ lh_config --bootappend xdebconf\n"
-"$ lh_config --packages xdebconfigurator"
+msgid "$ lh_config --bootappend xdebconf $ lh_config --packages xdebconfigurator"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:285
+#: en/faq.xml:141
 msgid "Q: Apache has problems with static files"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:286
+#: en/faq.xml:141
 msgid ""
 "A: Sendfile does not work well on the unionfs used by Debian Live. Add the "
 "following to apache's configuration:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:287
+#: en/faq.xml:141
 #, no-wrap
 msgid "EnableSendfile off"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:292
+#: en/faq.xml:144
 msgid "Q: How do I make hard disk partitions auto-mountable?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:293
+#: en/faq.xml:144
 msgid ""
 "<command>A: Short answer:</command> Right now the best is to use a script "
 "that will populate the fstab when the CD is booting. Such a script can be "
@@ -836,7 +797,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:294
+#: en/faq.xml:144
 msgid ""
 "<command>A: Long Answer: </command> Since 55_nonpolkit-mount-policy.patch in "
 "HAL, debian-storage-policy-fixed-drives.fdi is not available anymore and the "
@@ -845,7 +806,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:295
+#: en/faq.xml:144
 msgid ""
 "Eventually, it will be possible to combine HAL and PolicyKit to enable "
 "different permissions and actions to achieve advanced (auto)mounting for non-"
@@ -856,12 +817,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:296
+#: en/faq.xml:144
 msgid "To achieve this, you can do, for example, the following:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para><para>
-#: en/faq.xml:297
+#: en/faq.xml:144
 msgid ""
 "download the <ulink url=\"https://devel.goto10.org/svn/puredyne/trunk/broth/"
 "stock/chroot_local-includes/sbin/diskmounter.sh\"> diskmounter.sh script "
@@ -869,18 +830,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para><para>
-#: en/faq.xml:298
+#: en/faq.xml:144
 msgid ""
 "Create the chroot_local-includes/sbin directory, and move the script inside"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para><para>
-#: en/faq.xml:299
+#: en/faq.xml:144
 msgid "Make sure the script is executable (chmod +x diskmounter.sh)"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para><para>
-#: en/faq.xml:300
+#: en/faq.xml:144
 msgid ""
 "create the chroot_local-includes/etc/rc.local file and call the diskmounter "
 "from there (see this <ulink url=\"https://devel.goto10.org/svn/puredyne/"
@@ -889,7 +850,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:302
+#: en/faq.xml:144
 msgid ""
 "When called correctly, the script detects ext2, ext3, reiserfs, xfs, FAT32, "
 "HFS+ and NTFS partitions and mount them read-write, except for NTFS. This "
@@ -898,67 +859,67 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:303
+#: en/faq.xml:144
 msgid ""
 "comments, patches and other things about this script and issue: http://code."
 "goto10.org/projects/puredyne/ticket/463"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:308
+#: en/faq.xml:147
 msgid "Q: Boot fails with panic: can't open /scripts/live"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:309
+#: en/faq.xml:148
 msgid ""
 "A: Add latest live-initramfs deb package into config/chroot_local-packages "
 "directory and rebuild."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:313
+#: en/faq.xml:151
 msgid "Q: How do I configure the locale and the keyboard?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:314
-msgid "A: See <xref linkend=\"internalization\" /> 10n"
+#: en/faq.xml:152
+msgid "A: See <xref linkend=\"internalization\"/> 10n"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:318
+#: en/faq.xml:155
 msgid "Q: How do I get past boot prompt without a working keyboard?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:319
-msgid "A: See <xref linkend=\"bootup\" /> Customising the bootup process"
+#: en/faq.xml:156
+msgid "A: See <xref linkend=\"bootup\"/> Customising the bootup process"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:324
+#: en/faq.xml:160
 msgid "Q: Can I serve the root image from a web or ftp server?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:325
+#: en/faq.xml:160
 msgid ""
 "A: Since live-initramfs 1.99, it should be possible to use the fetch= "
 "argument on the kernel command line. You can build a netboot image as usual, "
 "and when you are done edit the tftpboot/pxelinux.cfg/default file. Remove "
 "the references to network boot (netboot, nfsroot, nfsopts), and replace with "
-"fetch= &#9001;url where you placed the root image>."
+"fetch= 〈url where you placed the root image&gt;."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:327
+#: en/faq.xml:160
 #, no-wrap
 msgid "$ lh_config --packages wget"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:326
+#: en/faq.xml:160
 msgid ""
 "<note>You have to include wget in the chroot. It could work for other boot "
 "methods as well. However, I am not sure the live scripts configure the "
@@ -967,12 +928,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:332
+#: en/faq.xml:163
 msgid "Q: Why doesn't quickreboot (or some other boot parameter) work?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:333
+#: en/faq.xml:163
 msgid ""
 "A: If you are building an etch image (which was the default up to "
 "2007/09/14) you have a very old version of casper which does not support "
@@ -983,57 +944,51 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:334
+#: en/faq.xml:163
 #, no-wrap
-msgid ""
-"$ lh_config --distribution lenny\n"
-"$ lh_config --initramfs live-initramfs"
+msgid "$ lh_config --distribution lenny $ lh_config --initramfs live-initramfs"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:340
+#: en/faq.xml:166
 msgid ""
 "Q: How do I fix \"Could not find kernel image\" issue with syslinux "
 "bootloader?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:341
+#: en/faq.xml:166
 msgid ""
 "A: Add a binary local hook script to fix kernel and initrd path each time "
 "you build an image."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:343
+#: en/faq.xml:166
 #, no-wrap
-msgid ""
-"#!/bin/sh\n"
-"SYSLINUXCFG=`find binary -type f -name syslinux.cfg`\n"
-"sed -i \"s|kernel /vmlinuz|kernel vmlinuz|g\" ${SYSLINUXCFG}\n"
-"sed -i \"s|initrd=/initrd|initrd=initrd|g\" ${SYSLINUXCFG}"
+msgid "#!/bin/sh SYSLINUXCFG=`find binary -type f -name syslinux.cfg` sed -i \"s|kernel /vmlinuz|kernel vmlinuz|g\" ${SYSLINUXCFG} sed -i \"s|initrd=/initrd|initrd=initrd|g\" ${SYSLINUXCFG}"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:347
+#: en/faq.xml:166
 #, no-wrap
 msgid "$ chmod +x config/binary_local-hooks/01-fix_syslinux.sh"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:342
+#: en/faq.xml:166
 msgid ""
 "e.g. config/binary_local-hooks/01-fix_syslinux.sh <placeholder type=\"screen"
 "\" id=\"0\"/> <placeholder type=\"screen\" id=\"1\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:352
+#: en/faq.xml:169
 msgid "Q: How do I use a newer kernel with lenny?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:353
+#: en/faq.xml:169
 msgid ""
 "A: A build with backports.org kernels will fail as that repository lacks the "
 "necessary module packages (linux-modules-extra-2.6, aufs, etc.). Use the "
@@ -1043,68 +998,59 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:355
+#: en/faq.xml:169
 #, no-wrap
-msgid ""
-"$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6 squashfs-modules-2.6'\n"
-"\n"
-"$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.chroot\n"
-"$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.binary\n"
-"\n"
-"$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.chroot.gpg\n"
-"$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.binary.gpg\n"
-"\n"
-"$ lh_build"
+msgid "$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6 squashfs-modules-2.6' $ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' &gt; config/chroot_sources/backports-kernel.chroot $ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' &gt; config/chroot_sources/backports-kernel.binary $ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.chroot.gpg $ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.binary.gpg $ lh_build"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:354
+#: en/faq.xml:169
 msgid "The quick way to success: <placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:368
+#: en/faq.xml:172
 msgid "Q: How do I use a custom kernel?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:369
+#: en/faq.xml:172
 msgid ""
-"&#9002; Is there a nice way of booting debian-live with a custom kernel (not "
-"in an apt repo)?"
+"〉 Is there a nice way of booting debian-live with a custom kernel (not in "
+"an apt repo)?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:370
+#: en/faq.xml:172
 msgid ""
 "A: Copy it into config/chroot_local-packages and set LH_LINUX_PACKAGES=\"none"
 "\" or use lh config --linux-packages \" \""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:371
+#: en/faq.xml:172
 msgid ""
 "Don't forget to compile your kernel with an union filesystem (unionfs or "
 "aufs), squashfs modules, and initrd support."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:372
+#: en/faq.xml:172
 msgid ""
-"&#9002; I can cause the kernel to be installed but it seems this happens "
-"later than grub/syslinux is configured so it's not listed and casper/ and "
-"the menu require munging."
+"〉 I can cause the kernel to be installed but it seems this happens later "
+"than grub/syslinux is configured so it's not listed and casper/ and the menu "
+"require munging."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:373
+#: en/faq.xml:172
 msgid ""
 "You need to follow the debian scheme, e.g. placing the files in /boot as "
 "vmlinuz-$version and initrd.img-$version etc."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:374
+#: en/faq.xml:172
 msgid ""
 "I personally wouldn't go that way which is too much of a hassle, and just "
 "use make-kpkg to produce custom kernel deb packages. They should integrate "
@@ -1113,23 +1059,23 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:375
+#: en/faq.xml:172
 msgid ""
 "<emphasis>Hint:</emphasis> to work around an error, which lh_binary_syslinux "
 "will throw on custom kernels if there is not an 468/686 in the kernel-name, "
 "you need to set CONFIG_LOCALVERSION=\"-486\" or \"-686\" within the kernel "
-"configuration (-> General setup -> Local version set to -486 or -686) "
+"configuration (-&gt; General setup -&gt; Local version set to -486 or -686) "
 "corresponding to LH_LINUX_FLAVOURS=\"\" or \"686\". this at least up till "
 "live-helper version 1.0~a40-1"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:376
+#: en/faq.xml:172
 msgid "see"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:377
+#: en/faq.xml:172
 msgid ""
 "<ulink url=\"http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-"
 "July/001947.html\"> http://lists.alioth.debian.org/pipermail/debian-live-"
@@ -1137,12 +1083,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:377
+#: en/faq.xml:172
 msgid "and"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:378
+#: en/faq.xml:172
 msgid ""
 "<ulink url=\"http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-"
 "November/002581.html\">http://lists.alioth.debian.org/pipermail/debian-live-"
@@ -1150,17 +1096,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:384
+#: en/faq.xml:175
 msgid "Q: How do I create a cross arch live CD image?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:385
+#: en/faq.xml:175
 msgid "<command>A: In short:</command> You can't. Read on:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:386
+#: en/faq.xml:175
 msgid ""
 "The procedure to create a live CD is based on creating a chroot that "
 "contains the files that will be finally available on the live CD. The live "
@@ -1171,7 +1117,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:387
+#: en/faq.xml:175
 msgid ""
 "Once the live CD scripts chroots into the chroot dir they have some "
 "operations to do inside that environment and your real system won't be able "
@@ -1179,7 +1125,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:388
+#: en/faq.xml:175
 msgid ""
 "So you only are able to make live CD for the arch you run on. But this "
 "doesn't prevent you run qemu or some other machine emulator that make this "
@@ -1187,22 +1133,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:393
+#: en/faq.xml:178
 msgid "Q: When is a lh_clean necessary?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:394
+#: en/faq.xml:178
 msgid "lh_clean is a script in /usr/bin/"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:395
+#: en/faq.xml:178
 msgid "A: That depends what you've changed between builds"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para><para>
-#: en/faq.xml:396
+#: en/faq.xml:178
 msgid ""
 "If, for example, you've built an iso image and you want a usb image, you "
 "only need to run <command> lh_clean --binary </command> before you run "
@@ -1210,7 +1156,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para><para>
-#: en/faq.xml:397
+#: en/faq.xml:178
 msgid ""
 "If you've <command> changed anything in the chroot </command> , you'll need "
 "to cleanup both chroot and binary with <command> lh_clean </command>before "
@@ -1218,28 +1164,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:403
+#: en/faq.xml:181
 msgid "Q: How can i set boot= parameters?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:404
+#: en/faq.xml:182
 msgid "A: Set LH_BOOTAPPEND_LIVE in config/binary"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:409
+#: en/faq.xml:185
 msgid ""
 "Q: How do I include different modules to load when the live system boots?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:410
+#: en/faq.xml:185
 msgid "A: Configure config/chroot_local-includes/etc/initramfs-tools/"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:411
+#: en/faq.xml:185
 msgid ""
 "The lh_chroot_hacks helper rebuilds the live/initrd1.img using the default "
 "initramfs.conf \"MODULES = most\". You may override that by supplying your "
@@ -1247,15 +1193,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:412
+#: en/faq.xml:185
 #, no-wrap
-msgid ""
-"mkdir -p config/chroot_local-includes/etc/initramfs-tools/\n"
-"echo \"atl2\" >> config/chroot_local-includes/etc/initramfs-tools/modules"
+msgid "mkdir -p config/chroot_local-includes/etc/initramfs-tools/ echo \"atl2\" &gt;&gt; config/chroot_local-includes/etc/initramfs-tools/modules"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:412
+#: en/faq.xml:185
 msgid ""
 "<placeholder type=\"screen\" id=\"0\"/> <note>Even though initramfs.conf(5) "
 "says \"most adds all the framebuffer, acpi, file system, ide, sata, scsi and "
@@ -1265,17 +1209,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:419
+#: en/faq.xml:188
 msgid "Q: Can I have a splash screen?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:420
+#: en/faq.xml:188
 msgid "A: Yes you can"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:421
+#: en/faq.xml:188
 msgid ""
 "You will not know what is going on when the splash screen is active, it may "
 "fail to activate on some hardware or break X on other (both usplash and "
@@ -1285,12 +1229,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:422
+#: en/faq.xml:188
 msgid "To use splashy:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:423
+#: en/faq.xml:188
 msgid ""
 "1) install splashy and read the README, the manpages are useless for setting "
 "it up. Add some parameters to your kernel command line, such as in your "
@@ -1299,13 +1243,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:424
+#: en/faq.xml:188
 #, no-wrap
 msgid "vga=792 splash quiet"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:425
+#: en/faq.xml:188
 msgid ""
 "<filename>vga </filename>to select video mode, <filename>splash </"
 "filename>to activate splashy, <filename>quiet</filename> to suppress most "
@@ -1314,38 +1258,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:427
+#: en/faq.xml:188
 #, no-wrap
-msgid ""
-"echo splashy > config/chroot_local-packageslists/splashy\n"
-"echo splashy-themes >> config/chroot_local-packageslists/splashy"
+msgid "echo splashy &gt; config/chroot_local-packageslists/splashy echo splashy-themes &gt;&gt; config/chroot_local-packageslists/splashy"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:426
+#: en/faq.xml:188
 msgid ""
 "You might want to add splashy to the list of packages installed in your "
 "image: <placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:429
+#: en/faq.xml:188
 msgid "and select a theme:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:430
+#: en/faq.xml:188
 #, no-wrap
-msgid ""
-"echo '#!/bin/sh' > config/chroot_local-hooks/splashy\n"
-"echo splashy_config -s debian-moreblue '||' true >> config/chroot_local-hooks/splashy\n"
-"# update the ramdisk to include the splash screen\n"
-"echo update-initramfs -u -k all >> config/chroot_local-hooks/splashy\n"
-"chmod 755 config/chroot_local-hooks/splashy \t"
+msgid "echo '#!/bin/sh' &gt; config/chroot_local-hooks/splashy echo splashy_config -s debian-moreblue '||' true &gt;&gt; config/chroot_local-hooks/splashy # update the ramdisk to include the splash screen echo update-initramfs -u -k all &gt;&gt; config/chroot_local-hooks/splashy chmod 755 config/chroot_local-hooks/splashy "
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:435
+#: en/faq.xml:188
 msgid ""
 "After you rebuild your live system you should observe a bluish splash screen "
 "while booting. Nothing happens while initramfs is running because there is "
@@ -1354,7 +1291,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:436
+#: en/faq.xml:188
 msgid ""
 "If <filename> vga=something</filename> sets a mode that your screen cannot "
 "show or your card cannot do vesa 2.0 (and thus you get plain text mode and "
@@ -1362,46 +1299,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:441
+#: en/faq.xml:191
 msgid "Q: Howto use my Broadcom eXtrem 2 network card (module bnx2) ?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:442
+#: en/faq.xml:191
 msgid "A: Add the firmwares to the initrd image."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:443
+#: en/faq.xml:191
 msgid ""
 "You need to install the non-free package \"firmware-bnx2\". Uncompress your "
 "initrd image, then copy files :"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:444
+#: en/faq.xml:191
 #, no-wrap
-msgid ""
-"cp /lib/firmware/bnx2* ${INITRD}/lib/firmware/\n"
-"cp /lib/udev/firmware.agent ${INITRD}/lib/udev/"
+msgid "cp /lib/firmware/bnx2* ${INITRD}/lib/firmware/ cp /lib/udev/firmware.agent ${INITRD}/lib/udev/"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:444
+#: en/faq.xml:191
 msgid ""
 "<placeholder type=\"screen\" id=\"0\"/> Recompress your initrd image and "
 "boot: it works !"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:451
+#: en/faq.xml:194
 msgid ""
 "Q: X is broken (the system boots, messages scroll by, and then the screen "
 "goes blank). What do I do?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:452
+#: en/faq.xml:194
 msgid ""
 "On my system starting X completely disables graphics so that I do not see "
 "anything even after X bails out and I am back to the console. To prevent "
@@ -1409,28 +1344,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:453
+#: en/faq.xml:194
 msgid ""
 "If you have a working splash screen or at least graphical console you can use"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:454
+#: en/faq.xml:194
 msgid "<filename>live xdriver=fbdev</filename>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:455
+#: en/faq.xml:194
 msgid "when booting the live system (instead of just enter)."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:456
+#: en/faq.xml:194
 msgid "Another driver you might want to try is <filename> vesa. </filename>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:457
+#: en/faq.xml:194
 msgid ""
 "If all fails you might try to set xdriver to some wrong value so that Xorg "
 "fails to start and you can examine the system while you still see something "
@@ -1438,17 +1373,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:458
+#: en/faq.xml:194
 msgid "<filename>live xdriver=none</filename>"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:463
+#: en/faq.xml:197
 msgid "Q: How can I get Debian first stable versions?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:464
+#: en/faq.xml:198
 msgid ""
 "I'm developing software and testing it on Live-CD. Thanks for the LiveCD "
 "project. To be sure my development is fully compatible with the \"etch\" "
@@ -1459,46 +1394,46 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:468
+#: en/faq.xml:201
 msgid ""
 "Q: I get \"fopen: Permission denied\"-warnings from apt on building/at the "
 "live-system"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:469
+#: en/faq.xml:202
 msgid ""
 "That's a harmless bug in apt. However, if you want to get off this warnings "
 "in the live-system, add a file in chroot_local-hooks with follow row:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><screen>
-#: en/faq.xml:470
+#: en/faq.xml:203
 #, no-wrap
 msgid " chown -R man.man /var/cache/man "
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:474
+#: en/faq.xml:206
 msgid ""
 "Q: Why I always fail during \"Retrieving Packages\" stage when running "
 "lh_build? I have already set apt-http-proxy and so on."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:475
+#: en/faq.xml:207
 msgid ""
 "A: lh_build retrieves packages via wget, as a result you need to enable the "
 "proxy settings in /etc/wgetrc before running lh_build."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:479
+#: en/faq.xml:210
 msgid "Q: How do I edit Xorg.conf?"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:480
+#: en/faq.xml:210
 msgid ""
 "A: Xorg.conf is generated every time system boots, so it's useless to put "
 "modifed Xorg.conf in config/choort_local-includes/etc/X11, because it will "
@@ -1510,69 +1445,58 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:481
+#: en/faq.xml:210
 #, no-wrap
-msgid "Option          \"XkbLayout\"     \"$XKB_LAYOUT\""
+msgid "Option \"XkbLayout\" \"$XKB_LAYOUT\""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:482
+#: en/faq.xml:210
 msgid "with the lines:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:483
+#: en/faq.xml:210
 #, no-wrap
-msgid ""
-"Option             \"XkbLayout\"     \"us,il\"\n"
-"Option             \"XkbOptions\"   \"grp:alt_shift_toggle,grp_led:scroll\""
+msgid "Option \"XkbLayout\" \"us,il\" Option \"XkbOptions\" \"grp:alt_shift_toggle,grp_led:scroll\""
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:485
+#: en/faq.xml:210
 msgid "when \"us,il\" are the wanted keyboard layouts."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:486
+#: en/faq.xml:210
 msgid ""
 "You can force default screen resulotion (e.g. 1024*768) by adding the "
 "lines: ."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:487
+#: en/faq.xml:210
 #, no-wrap
-msgid ""
-"  SubSection     \"Display\"\n"
-"               Modes  \"1024x768\"\n"
-"               EndSubSection"
+msgid " SubSection \"Display\" Modes \"1024x768\" EndSubSection"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><para>
-#: en/faq.xml:490
+#: en/faq.xml:210
 msgid "between the lines:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para><screen>
-#: en/faq.xml:491
+#: en/faq.xml:210
 #, no-wrap
-msgid ""
-"  Section \"Screen\"\n"
-"        Identifier      \"Default Screen\"\n"
-"        Monitor         \"Configured Monitor\"\n"
-"            . . . . . . .\n"
-"SECTION\n"
-"printf \"EndSection\\n\" &#9002; &amp;4"
+msgid " Section \"Screen\" Identifier \"Default Screen\" Monitor \"Configured Monitor\" . . . . . . . SECTION printf \"EndSection\\n\" 〉 &amp;4"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:501
+#: en/faq.xml:213
 msgid "Q: Where are the build parameters for the prebuilt images"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/faq.xml:502
+#: en/faq.xml:214
 msgid ""
 "A: See <ulink url=\"http://live.debian.net/README.images\">http://live."
 "debian.net/README.images.</ulink>"
diff --git a/manual/pot/index.xml.pot b/manual/pot/index.xml.pot
index 07079d0..e4d8c5e 100644
--- a/manual/pot/index.xml.pot
+++ b/manual/pot/index.xml.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 14:13+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,46 +16,46 @@ msgstr ""
 "Content-Transfer-Encoding: ENCODING"
 
 #. type: Content of the pubdate entity
-#: en/index.xml:5
+#: en/index.xml:4
 msgid "2010-06-06"
 msgstr ""
 
 #. type: Content of the version entity
-#: en/index.xml:6
+#: en/index.xml:5
 msgid "2.0~a1"
 msgstr ""
 
 #. type: Attribute 'lang' of: <book>
-#: en/index.xml:8
+#: en/index.xml:7
 msgid "en"
 msgstr ""
 
 #. type: Content of: <book><title>
-#: en/index.xml:10
+#: en/index.xml:8
 msgid "Debian Live Manual"
 msgstr ""
 
 #. type: Content of: <book><bookinfo>
-#: en/index.xml:12
+#: en/index.xml:10
 msgid ""
 "<author> <othername>The Debian Live Project</othername> <email>debian-"
 "live at lists.debian.org</email> </author>"
 msgstr ""
 
 #. type: Content of: <book><bookinfo><releaseinfo>
-#: en/index.xml:17
+#: en/index.xml:14
 msgid "&version;"
 msgstr ""
 
 #. type: Content of: <book><bookinfo>
-#: en/index.xml:18
+#: en/index.xml:15
 msgid ""
 "<pubdate>&pubdate;</pubdate> <copyright> <year>2008-2010</year> <holder>The "
 "Debian Live Project</holder> </copyright>"
 msgstr ""
 
 #. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:27
+#: en/index.xml:21
 msgid ""
 "This program is free software: you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -64,7 +64,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:33
+#: en/index.xml:22
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -73,18 +73,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:39
+#: en/index.xml:23
 msgid ""
 "A copy of the GNU General Public License is available as <filename>/usr/"
 "share/common-licenses/GPL</filename> in the Debian GNU/Linux distribution or "
 "on the World Wide Web at <ulink url=\"http://www.gnu.org/copyleft/gpl.html"
-"\">the GNU web site</ulink>.  You can also obtain it by writing to the Free "
+"\">the GNU web site</ulink>. You can also obtain it by writing to the Free "
 "Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA "
 "02111-1307, USA."
 msgstr ""
 
 #. type: Content of: <book><bookinfo><legalnotice><para>
-#: en/index.xml:47
+#: en/index.xml:24
 msgid ""
 "If you want to print this reference, this document is also available in "
 "Portable Document Format (PDF)."
diff --git a/manual/pot/installation.xml.pot b/manual/pot/installation.xml.pot
index f5f6232..d713981 100644
--- a/manual/pot/installation.xml.pot
+++ b/manual/pot/installation.xml.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,54 +16,54 @@ msgstr ""
 "Content-Transfer-Encoding: ENCODING"
 
 #. type: Content of: <chapter><section><section><title>
-#: en/about_manual.xml:90 en/installation.xml:76
+#: en/about_manual.xml:43 en/installation.xml:71
 msgid "&live-initramfs;"
 msgstr ""
 
 #. type: Content of: <chapter><title>
-#: en/installation.xml:7
+#: en/installation.xml:6
 msgid "Installation"
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: en/installation.xml:10
+#: en/installation.xml:8
 msgid "Requirements"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/installation.xml:12
+#: en/installation.xml:9
 msgid "Building Debian Live images has very few system requirements:"
 msgstr ""
 
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:15
+#: en/installation.xml:12
 msgid "Super user (root) access"
 msgstr ""
 
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:16
+#: en/installation.xml:15
 msgid "An up-to-date version of &live-helper;"
 msgstr ""
 
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:17
+#: en/installation.xml:18
 msgid ""
 "A POSIX-compliant shell, such as <command>bash</command> or <command>dash</"
 "command>."
 msgstr ""
 
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:18
+#: en/installation.xml:21
 msgid "<command>debootstrap</command> or <command>cdebootstrap</command>"
 msgstr ""
 
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:19
+#: en/installation.xml:24
 msgid "Linux 2.6.x"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/installation.xml:22
+#: en/installation.xml:27
 msgid ""
 "Note that using Debian or a Debian-derived distribution is not required - "
 "&live-helper; will run on almost any operating system with the above "
@@ -71,66 +71,66 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: en/installation.xml:27
+#: en/installation.xml:30
 msgid "Installing &live-helper;"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/installation.xml:29
+#: en/installation.xml:31
 msgid "You can install &live-helper; in a number of different ways:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/installation.xml:32 en/installation.xml:41
+#: en/installation.xml:34 en/installation.xml:48
 msgid "From the Debian repository"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/installation.xml:33 en/installation.xml:51
+#: en/installation.xml:37 en/installation.xml:55
 msgid "From source"
 msgstr ""
 
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:34
+#: en/installation.xml:40
 msgid "From snapshots"
 msgstr ""
 
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/installation.xml:35
+#: en/installation.xml:43
 msgid "From backports.org"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/installation.xml:38
+#: en/installation.xml:46
 msgid ""
 "If you are using &lenny; or &sid; the recommended way is to install &live-"
 "helper; via the Debian repository."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:43
+#: en/installation.xml:49
 msgid "Simply install &live-helper; like any other package:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:44
+#: en/installation.xml:50
 #, no-wrap
 msgid "# apt-get install live-helper"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:45
+#: en/installation.xml:51
 msgid "or"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:46
+#: en/installation.xml:52
 #, no-wrap
 msgid "# aptitude install live-helper"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:53
+#: en/installation.xml:56
 msgid ""
 "&live-helper; is developed using the Git version control system. On Debian "
 "systems, this is provided by the <command>git-core</command> package. To "
@@ -138,39 +138,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:54
+#: en/installation.xml:57
 #, no-wrap
 msgid "$ git clone git://live.debian.net/git/live-helper.git"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:55
+#: en/installation.xml:58
 msgid "You can build and install your own Debian package by executing:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:57
+#: en/installation.xml:59
 #, no-wrap
-msgid ""
-" $ cd live-helper\n"
-" $ dpkg-buildpackage -rfakeroot -b -uc -us\n"
-" $ cd ..\n"
-" # dpkg -i live-helper*.deb\n"
+msgid " $ cd live-helper $ dpkg-buildpackage -rfakeroot -b -uc -us $ cd .. # dpkg -i live-helper*.deb "
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:62
+#: en/installation.xml:60
 msgid "You can also use a local version of &live-helper; without installation:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:63
+#: en/installation.xml:61
 #, no-wrap
 msgid "# live-helper/helpers/lh_local"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:64
+#: en/installation.xml:62
 msgid ""
 "Subsequent calls to <filename>lh_</filename>-prefixed helpers in that shell "
 "environment will then use the version located in the directory you executed "
@@ -178,24 +174,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:65
+#: en/installation.xml:63
 msgid ""
 "You can also install &live-helper; directly to your system by executing:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
-#: en/installation.xml:66
+#: en/installation.xml:64
 #, no-wrap
 msgid "# make install"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/installation.xml:71
+#: en/installation.xml:67
 msgid "From 'snapshots'"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:72
+#: en/installation.xml:68
 msgid ""
 "If you do not wish to build or install &live-helper; from source, you can "
 "use snapshots. These are built automatically from the latest version in Git "
@@ -204,7 +200,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/installation.xml:78
+#: en/installation.xml:73
 msgid ""
 "<emphasis>N.B. You do not need to install &live-initramfs; on your system to "
 "create customised Debian Live systems. However, doing so will do no harm.</"
@@ -212,35 +208,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
-#: en/installation.xml:81
+#: en/installation.xml:76
 msgid "Using a customised &live-initramfs;"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: en/installation.xml:83
+#: en/installation.xml:77
 msgid ""
 "To modify the code you can follow the process below. Please ensure you are "
 "familiar with the terms mentioned in <xref linkend=\"terms\"/>."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:87
+#: en/installation.xml:80
 msgid "Checkout the &live-initramfs; source"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: en/installation.xml:88
+#: en/installation.xml:81
 #, no-wrap
 msgid "$ git clone git://live.debian.net/git/live-initramfs.git"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:91
+#: en/installation.xml:84
 msgid "Make changes to your local copy"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:92
+#: en/installation.xml:85
 msgid ""
 "And beware that if you want to add your pre-init script in live-bottom, you "
 "should name it without dashes '-', e.g: call it \"81new_feature\" and not "
@@ -248,12 +244,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:95
+#: en/installation.xml:88
 msgid "Build a &live-initramfs; <command>.deb</command>"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:96
+#: en/installation.xml:89
 msgid ""
 "You must build either on your target distribution or in a chroot containing "
 "your target platform: this means if your target is lenny then you should "
@@ -264,20 +260,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: en/installation.xml:98
+#: en/installation.xml:90
 #, no-wrap
-msgid ""
-"$ cd live-initramfs\n"
-"$ dpkg-buildpackage -rfakeroot -b -uc -us\n"
+msgid " $ cd live-initramfs $ dpkg-buildpackage -rfakeroot -b -uc -us "
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:103
+#: en/installation.xml:93
 msgid "Use the generated &live-initramfs; <command>.deb</command>"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:104
+#: en/installation.xml:94
 msgid ""
 "As &live-initramfs; is installed by the build system, installing the package "
 "in the host system is not sufficient: you should treat the generated "
@@ -287,12 +281,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><title>
-#: en/installation.xml:110
+#: en/installation.xml:99
 msgid "Using &live-initramfs; snapshots"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><para>
-#: en/installation.xml:112
+#: en/installation.xml:100
 msgid ""
 "You can let &live-helper; automatically use the latest snapshot of &live-"
 "initramfs; by configuring a third-party repository in your live-system "
@@ -301,36 +295,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:116
+#: en/installation.xml:103
 msgid "Create a sources.list entry for the chroot stage:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: en/installation.xml:117
+#: en/installation.xml:104
 #, no-wrap
-msgid "echo \"deb http://live.debian.net/ sid-snapshots main contrib non-free\" > config/chroot_sources/debian-live_sid-snapshots.chroot"
+msgid "echo \"deb http://live.debian.net/ sid-snapshots main contrib non-free\" &gt; config/chroot_sources/debian-live_sid-snapshots.chroot"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:120
+#: en/installation.xml:107
 msgid "Create a sources.list entry for the binary stage:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: en/installation.xml:121
+#: en/installation.xml:108
 #, no-wrap
 msgid "cp config/chroot_sources/debian-live_sid-snapshots.chroot config/chroot_sources/debian-live_sid-snapshots.binary"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><para>
-#: en/installation.xml:124
+#: en/installation.xml:111
 msgid "Fetch the archive signing key:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><section><orderedlist><listitem><screen>
-#: en/installation.xml:126
+#: en/installation.xml:112
 #, no-wrap
-msgid ""
-"wget http://live.debian.net/debian/project/openpgp/archive-key.asc -O config/chroot_sources/debian-live_sid-snapshots.chroot.gpg\n"
-"cp config/chroot_sources/debian-live_sid-snapshots.chroot.gpg config/chroot_sources/debian-live_sid-snapshots.binary.gpg\n"
+msgid " wget http://live.debian.net/debian/project/openpgp/archive-key.asc -O config/chroot_sources/debian-live_sid-snapshots.chroot.gpg cp config/chroot_sources/debian-live_sid-snapshots.chroot.gpg config/chroot_sources/debian-live_sid-snapshots.binary.gpg "
 msgstr ""
diff --git a/manual/pot/live-environment.xml.pot b/manual/pot/live-environment.xml.pot
index 3bae24a..e7a4ee6 100644
--- a/manual/pot/live-environment.xml.pot
+++ b/manual/pot/live-environment.xml.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,41 +16,41 @@ msgstr ""
 "Content-Transfer-Encoding: ENCODING"
 
 #. type: Content of: <chapter><para>
-#: en/about_manual.xml:125 en/customization_bootup.xml:11
-#: en/customization_bootup.xml:20 en/customization_bootup.xml:26
-#: en/customization_bootup.xml:38 en/customization_bootup.xml:85
-#: en/customization_bootup.xml:92 en/customization_bootup.xml:99
-#: en/customization_bootup.xml:106 en/customization_packages.xml:36
-#: en/customization_packages.xml:306 en/customization_packages.xml:326
-#: en/customization_packages.xml:384 en/customization_packages.xml:492
-#: en/customization_packages.xml:535 en/live-environment.xml:11
-#: en/resources.xml:11 en/success-stories.xml:11
+#: en/about_manual.xml:65 en/customization_bootup.xml:8
+#: en/customization_bootup.xml:14 en/customization_bootup.xml:17
+#: en/customization_bootup.xml:25 en/customization_bootup.xml:37
+#: en/customization_bootup.xml:41 en/customization_bootup.xml:45
+#: en/customization_bootup.xml:49 en/customization_packages.xml:18
+#: en/customization_packages.xml:130 en/customization_packages.xml:138
+#: en/customization_packages.xml:160 en/customization_packages.xml:198
+#: en/customization_packages.xml:209 en/live-environment.xml:9
+#: en/resources.xml:9 en/success-stories.xml:8
 msgid "FIXME"
 msgstr ""
 
 #. type: Content of: <chapter><title>
-#: en/live-environment.xml:7
+#: en/live-environment.xml:6
 msgid "The Live environment"
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: en/live-environment.xml:10
+#: en/live-environment.xml:8
 msgid "Swap space"
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: en/live-environment.xml:15
+#: en/live-environment.xml:12
 msgid "Hostname"
 msgstr ""
 
 #. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:18
+#: en/live-environment.xml:13
 #, no-wrap
 msgid "lh_config --bootappend-live \"hostname=myhost\""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:16
+#: en/live-environment.xml:13
 msgid ""
 "The name of host running live system can be set with the <command>hostname</"
 "command> parameter into the <command>--bootappend-live</command> option of "
@@ -59,17 +59,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: en/live-environment.xml:23
+#: en/live-environment.xml:16
 msgid "The Live user"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:24
+#: en/live-environment.xml:17
 msgid "Username FIXME."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:25
+#: en/live-environment.xml:18
 msgid ""
 "One important consideration is that the live user is created by &live-"
 "initramfs; during bootup, it is not created by &live-helper; when building "
@@ -77,7 +77,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:27
+#: en/live-environment.xml:19
 msgid ""
 "You can specify additional groups that the live user will belong to by "
 "preseeding the <command>passwd/user-default-groups</command> debconf value. "
@@ -87,51 +87,51 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><screen>
-#: en/live-environment.xml:30
+#: en/live-environment.xml:20
 #, no-wrap
-msgid " debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse\n"
+msgid " debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse "
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:33
+#: en/live-environment.xml:21
 msgid ""
 "For more information about debconf preseeding, please see <xref linkend="
 "\"debconf-preseed\"/>."
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: en/live-environment.xml:38
+#: en/live-environment.xml:24
 msgid "Language"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:39
+#: en/live-environment.xml:25
 msgid "When the live system boots, language is involved in three steps:"
 msgstr ""
 
 #. type: Content of: <chapter><section><para><itemizedlist><listitem><simpara>
-#: en/live-environment.xml:41
+#: en/live-environment.xml:25
 msgid "the locale generation"
 msgstr ""
 
 #. type: Content of: <chapter><section><para><itemizedlist><listitem><simpara>
-#: en/live-environment.xml:42
+#: en/live-environment.xml:25
 msgid "setting the keyboard layout for the console"
 msgstr ""
 
 #. type: Content of: <chapter><section><para><itemizedlist><listitem><simpara>
-#: en/live-environment.xml:43
+#: en/live-environment.xml:25
 msgid "setting the keyboard layout for X"
 msgstr ""
 
 #. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:48
+#: en/live-environment.xml:26
 #, no-wrap
 msgid "lh_config --bootappend-live \"locale=sv_SE.utf8\""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:46
+#: en/live-environment.xml:26
 msgid ""
 "To define the locale that should be generated, use the <command>locale</"
 "command> parameter into the <command>--bootappend-live</command> option of "
@@ -143,21 +143,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:53
+#: en/live-environment.xml:27
 #, no-wrap
-msgid ""
-"$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name\n"
-"\t&lt;name&gt;se&lt;/name&gt;\n"
+msgid "$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name &lt;name&gt;se&lt;/name&gt; "
 msgstr ""
 
 #. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:59
+#: en/live-environment.xml:27
 #, no-wrap
 msgid "lh_config --bootappend-live \"locale=sv_SE.utf8 keyb=se\""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:51
+#: en/live-environment.xml:27
 msgid ""
 "Both the console and X keyboard configuration depends on the <command>keyb</"
 "command> parameter of the <command>--bootappend-live</command> option. Valid "
@@ -170,19 +168,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:64
+#: en/live-environment.xml:28
 #, no-wrap
 msgid "for i in `find /usr/share/keymaps/ -iname \"*kmap.gz\"`; do basename $i | head -c -9; echo; done | sort | less "
 msgstr ""
 
 #. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:68
+#: en/live-environment.xml:28
 #, no-wrap
 msgid "lh_config --bootappend-live \"locale=sv_SE.utf8 keyb=se-latin1\""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:63
+#: en/live-environment.xml:28
 msgid ""
 "A list of the valid values of the keyboards for the console can be figured "
 "with the following command: <placeholder type=\"screen\" id=\"0\"/> To make "
@@ -191,15 +189,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para><screen>
-#: en/live-environment.xml:73
+#: en/live-environment.xml:29
 #, no-wrap
-msgid ""
-"lh_config --bootappend-live \\\n"
-"  \"locale=fr_FR.UTF-8 klayout=fr kvariant=bepo kmodel=tm2030usb\""
+msgid "lh_config --bootappend-live \\ \"locale=fr_FR.UTF-8 klayout=fr kvariant=bepo kmodel=tm2030usb\""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:72
+#: en/live-environment.xml:29
 msgid ""
 "Alternatively, you can use the <literal>console-setup</literal> package, a "
 "tool to let you configure console layout using X (XKB) definitions; you can "
@@ -215,12 +211,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: en/live-environment.xml:81
+#: en/live-environment.xml:32
 msgid "Persistence"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:82
+#: en/live-environment.xml:33
 msgid ""
 "A live cd paradigm is a preinstalled system which runs from read-only media, "
 "like a cdrom, where writes and modifications do not survive reboots of the "
@@ -228,7 +224,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:83
+#: en/live-environment.xml:34
 msgid ""
 "A Debian Live system is a generalization of this paradigm and thus supports "
 "other media in addition to CDs; but still, in its default behaviour, it "
@@ -237,7 +233,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:85
+#: en/live-environment.xml:35
 msgid ""
 "Persistence is a common name for different kinds of solutions for saving "
 "across reboots some, or all, of this runtime evolution of the system. To "
@@ -248,7 +244,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/live-environment.xml:86
+#: en/live-environment.xml:36
 msgid ""
 "The data stored on this ramdisk should be saved on a writable persistent "
 "medium like a Hard Disk, a USB key, a network share or even a session of a "
@@ -258,12 +254,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/live-environment.xml:88
+#: en/live-environment.xml:38
 msgid "Full persistence"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:89
+#: en/live-environment.xml:39
 msgid ""
 "By 'full persistence' it is meant that instead of using a tmpfs for storing "
 "modifications to the read-only media (with the copy-on-write, COW, system) a "
@@ -275,28 +271,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
-#: en/live-environment.xml:92
+#: en/live-environment.xml:40
 #, no-wrap
-msgid "# mkfs.ext2 -L live-rw /dev/sdb1\n"
+msgid " # mkfs.ext2 -L live-rw /dev/sdb1 "
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:95
+#: en/live-environment.xml:41
 msgid ""
 "If you already have a partition on your device, you could just change the "
 "label with one of the following:"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
-#: en/live-environment.xml:98
+#: en/live-environment.xml:42
 #, no-wrap
-msgid ""
-"# tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
-"# dosfslabel /dev/sdb1 live-rw # for a fat filesystem\n"
+msgid " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems # dosfslabel /dev/sdb1 live-rw # for a fat filesystem "
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:102
+#: en/live-environment.xml:43
 msgid ""
 "But since live system users cannot always use a hard drive partition, and "
 "considering that most USB keys have poor write speeds, 'full' persistence "
@@ -306,27 +300,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><screen>
-#: en/live-environment.xml:105
+#: en/live-environment.xml:44
 #, no-wrap
-msgid ""
-"$ dd if=/dev/null of=live-rw bs=1G seek=1\t# for a 1GB sized image file\n"
-"$ /sbin/mkfs.ext2 -F live-rw\n"
+msgid " $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file $ /sbin/mkfs.ext2 -F live-rw "
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:109
+#: en/live-environment.xml:45
 msgid ""
 "Then copy the <command>live-rw</command> file to a writable partition and "
 "reboot with the boot parameter 'persistent'."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/live-environment.xml:112
+#: en/live-environment.xml:48
 msgid "Home automounting"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:113
+#: en/live-environment.xml:49
 msgid ""
 "If during the boot a partition (filesystem) image file or a partition "
 "labeled <command>home-rw</command> is discovered, this filesystem will be "
@@ -336,12 +328,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/live-environment.xml:116
+#: en/live-environment.xml:52
 msgid "Snapshots"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:117
+#: en/live-environment.xml:53
 msgid ""
 "Snapshots are collections of files and directories which are not mounted "
 "while running but which are copied from a persistent device to the system "
@@ -359,7 +351,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:118
+#: en/live-environment.xml:54
 msgid ""
 "A /home version of snapshot exists too and its label is <command>home-sn.*</"
 "command>; it works the same as the main snapshot but it is only applied to /"
@@ -367,19 +359,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:119
+#: en/live-environment.xml:55
 msgid ""
 "Snapshots cannot currently handle file deletion but full persistence and "
 "home automounting can."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/live-environment.xml:122
+#: en/live-environment.xml:58
 msgid "Persistent SubText"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:123
+#: en/live-environment.xml:59
 msgid ""
 "If a user would need multiple persistent storage of the same type for "
 "different locations or testing, such as <command>live-rw-nonwork</command> "
@@ -393,12 +385,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/live-environment.xml:126
+#: en/live-environment.xml:62
 msgid "Partial remastering"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/live-environment.xml:127
+#: en/live-environment.xml:63
 msgid ""
 "The runtime modification of the tmpfs could be collected using live-snapshot "
 "in a squashfs and added to the cd by remastering the iso in the case of cd-r "
diff --git a/manual/pot/overview.xml.pot b/manual/pot/overview.xml.pot
index 80e9b55..795a722 100644
--- a/manual/pot/overview.xml.pot
+++ b/manual/pot/overview.xml.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:16+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,54 +16,53 @@ msgstr ""
 "Content-Transfer-Encoding: ENCODING"
 
 #. type: Content of: <chapter><section><title>
-#: en/about_manual.xml:80 en/overview.xml:17
+#: en/about_manual.xml:37 en/overview.xml:9
 msgid "&live-helper;"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/about_manual.xml:298 en/about_manual.xml:308 en/about_manual.xml:318
-#: en/about_manual.xml:338 en/about_manual.xml:351 en/about_manual.xml:366
-#: en/about_manual.xml:379 en/about_manual.xml:389 en/basics.xml:113
-#: en/basics.xml:128 en/basics.xml:144 en/basics.xml:158 en/basics.xml:194
-#: en/basics.xml:220 en/basics.xml:230 en/basics.xml:239 en/basics.xml:253
-#: en/basics.xml:275 en/basics.xml:302 en/basics.xml:312 en/basics.xml:320
-#: en/basics.xml:354 en/basics.xml:364 en/basics.xml:382 en/basics.xml:429
-#: en/basics.xml:498 en/basics.xml:530 en/basics.xml:539 en/basics.xml:590
-#: en/basics.xml:646 en/customization_packages.xml:50
-#: en/customization_packages.xml:58 en/customization_packages.xml:71
-#: en/customization_packages.xml:80 en/customization_packages.xml:104
-#: en/customization_packages.xml:222 en/customization_packages.xml:230
-#: en/customization_packages.xml:265 en/customization_packages.xml:310
-#: en/customization_packages.xml:330 en/customization_packages.xml:341
-#: en/customization_packages.xml:352 en/customization_packages.xml:362
-#: en/faq.xml:64 en/faq.xml:241 en/faq.xml:244 en/faq.xml:252 en/faq.xml:256
-#: en/faq.xml:264 en/faq.xml:279 en/faq.xml:287 en/faq.xml:334 en/faq.xml:424
-#: en/faq.xml:430 en/faq.xml:481 en/faq.xml:483 en/faq.xml:487 en/faq.xml:491
-#: en/overview.xml:181 en/overview.xml:230 en/overview.xml:240
+#: en/about_manual.xml:143 en/about_manual.xml:147 en/about_manual.xml:151
+#: en/about_manual.xml:160 en/about_manual.xml:166 en/about_manual.xml:172
+#: en/about_manual.xml:178 en/about_manual.xml:184 en/basics.xml:45
+#: en/basics.xml:50 en/basics.xml:57 en/basics.xml:60 en/basics.xml:72
+#: en/basics.xml:81 en/basics.xml:85 en/basics.xml:89 en/basics.xml:95
+#: en/basics.xml:105 en/basics.xml:118 en/basics.xml:122 en/basics.xml:126
+#: en/basics.xml:139 en/basics.xml:143 en/basics.xml:148 en/basics.xml:160
+#: en/basics.xml:170 en/basics.xml:182 en/basics.xml:186 en/basics.xml:205
+#: en/basics.xml:220 en/customization_packages.xml:25
+#: en/customization_packages.xml:29 en/customization_packages.xml:34
+#: en/customization_packages.xml:38 en/customization_packages.xml:48
+#: en/customization_packages.xml:102 en/customization_packages.xml:106
+#: en/customization_packages.xml:116 en/customization_packages.xml:132
+#: en/customization_packages.xml:140 en/customization_packages.xml:144
+#: en/customization_packages.xml:148 en/customization_packages.xml:152
+#: en/faq.xml:36 en/faq.xml:128 en/faq.xml:131 en/faq.xml:138 en/faq.xml:141
+#: en/faq.xml:163 en/faq.xml:188 en/faq.xml:210 en/overview.xml:61
+#: en/overview.xml:66 en/overview.xml:70
 msgid "<placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><title>
-#: en/overview.xml:9
+#: en/overview.xml:6
 msgid "Overview of tools"
 msgstr ""
 
 #. type: Content of: <chapter><para>
-#: en/overview.xml:12
+#: en/overview.xml:7
 msgid ""
 "This chapter contains an overview of the two main tools used in building "
 "Debian Live systems."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:20
+#: en/overview.xml:10
 msgid ""
-"&live-helper; is a collection of scripts to build Debian Live systems.  "
-"These scripts are also referred to as \"helpers\"."
+"&live-helper; is a collection of scripts to build Debian Live systems. These "
+"scripts are also referred to as \"helpers\"."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:25
+#: en/overview.xml:11
 msgid ""
 "The idea behind &live-helper; is to be a framework that uses a configuration "
 "directory to completely automate and customize all aspects of building a "
@@ -71,22 +70,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:31
+#: en/overview.xml:12
 msgid ""
 "Many concepts are similar to those in the <command>debhelper</command> "
 "Debian package tools written by Joey Hess:"
 msgstr ""
 
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/overview.xml:39
+#: en/overview.xml:15
 msgid "The scripts have a central location for configuring their operation."
 msgstr ""
 
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/overview.xml:43
+#: en/overview.xml:16
 msgid ""
-"In <command>debhelper</command>, this is the <filename class=\"directory\" "
-">debian</filename> subdirectory of a package tree. For example, "
+"In <command>debhelper</command>, this is the <filename class=\"directory"
+"\">debian</filename> subdirectory of a package tree. For example, "
 "<command>dh_install</command> will look for a file called <filename>debian/"
 "&lt;packagename&gt;.install</filename> to determine which files should exist "
 "in a particular binary package. In much the same way, &live-helper; stores "
@@ -95,24 +94,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><orderedlist><listitem><para>
-#: en/overview.xml:55
+#: en/overview.xml:19
 msgid ""
 "The scripts are independent - that is to say, it is always safe to run each "
 "command."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:63
+#: en/overview.xml:22
 msgid ""
 "Unlike <command>debhelper</command>, &live-helper; contains a tool to "
 "generate a skeleton configuration directory, <filename>lh config</filename>. "
 "This could be considered to be similar to tools such as <command>dh-make</"
 "command>. For more information about <filename>lh config</filename>, please "
-"see <xref linkend=\"lh-config\" />."
+"see <xref linkend=\"lh-config\"/>."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:71
+#: en/overview.xml:23
 msgid ""
 "Besides the common <filename>config/common</filename>, which is used by all "
 "&live-helper; helper commands, some additional files can be used to "
@@ -123,7 +122,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:81
+#: en/overview.xml:24
 msgid ""
 "For example, the <command>lh bootstrap debootstrap</command> helper command "
 "uses files named <filename>config/bootstrap</filename> and <filename>config/"
@@ -134,7 +133,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:90
+#: en/overview.xml:25
 msgid ""
 "&live-helper; respects environment variables which are present in the "
 "context of the shell it is running. If variables can be read from config "
@@ -145,7 +144,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:99
+#: en/overview.xml:26
 msgid ""
 "All config files are shell scripts which are sourced by a &live-helper; "
 "program. That means they have to follow the normal shell syntax. You can "
@@ -153,7 +152,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:105
+#: en/overview.xml:27
 msgid ""
 "In some rare cases you may want to have different versions of these files "
 "for different architectures or distributions. If files named <command>config/"
@@ -166,63 +165,63 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:117
+#: en/overview.xml:28
 msgid ""
-"Please see <xref linkend=\"installation\" /> for information on how to "
+"Please see <xref linkend=\"installation\"/> for information on how to "
 "install &live-helper;."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:122
+#: en/overview.xml:29
 msgid ""
 "The remainder of this section discusses the three most important helpers:"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/overview.xml:129
+#: en/overview.xml:33
 msgid "<filename>lh config</filename>"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/overview.xml:133
+#: en/overview.xml:36
 msgid ""
 "Responsible for initialising a Live system configuration directory. See "
-"<xref linkend=\"lh-config\" /> for more information."
+"<xref linkend=\"lh-config\"/> for more information."
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/overview.xml:140
+#: en/overview.xml:41
 msgid "<filename>lh build</filename>"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/overview.xml:144
+#: en/overview.xml:44
 msgid ""
-"Responsible for starting a Live system build. See <xref linkend=\"lh-build"
-"\" /> for more information."
+"Responsible for starting a Live system build. See <xref linkend=\"lh-build\"/"
+"> for more information."
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><term>
-#: en/overview.xml:151
+#: en/overview.xml:49
 msgid "<filename>lh clean</filename>"
 msgstr ""
 
 #. type: Content of: <chapter><section><variablelist><varlistentry><listitem><para>
-#: en/overview.xml:155
+#: en/overview.xml:52
 msgid ""
 "Responsible for removing parts of a Live system build. See <xref linkend="
-"\"lh-clean\" /> for more information."
+"\"lh-clean\"/> for more information."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/overview.xml:164
+#: en/overview.xml:57
 msgid "The <filename>lh config</filename> helper"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:167
+#: en/overview.xml:58
 msgid ""
-"As discussed in <xref linkend=\"live-helper\" />, the scripts that make up "
+"As discussed in <xref linkend=\"live-helper\"/>, the scripts that make up "
 "&live-helper; source their configuration from a single directory named "
 "<command>config/</command>. As constructing this directory by hand would be "
 "time-consuming and error-prone, the <filename>lh config</filename> helper "
@@ -230,7 +229,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:175
+#: en/overview.xml:59
 msgid ""
 "Issuing <filename>lh config</filename> without any arguments creates a "
 "<command>config</command> subdirectory which it populates with some default "
@@ -238,44 +237,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para><screen>
-#: en/overview.xml:181
+#: en/overview.xml:61
 #, no-wrap
-msgid ""
-"$ lh config\n"
-"$ ls -l\n"
-"total 4.1k\n"
-"drwxr-xr-x 19 user group 4.1k 2008-05-09 21:37 config\n"
-"$ ls -l config/\n"
-"total 104\n"
-"-rw-r--r-- 1 user group 4175 2010-04-11 12:16 binary\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_debian-installer\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_debian-installer-includes\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_grub\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-debs\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-hooks\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-includes\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-packageslists\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-udebs\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_rootfs\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_syslinux\n"
-"-rw-r--r-- 1 user group 2205 2010-04-11 12:16 bootstrap\n"
-"-rw-r--r-- 1 user group 1599 2010-04-11 12:16 chroot\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_apt\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-hooks\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-includes\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-packages\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-packageslists\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-patches\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-preseed\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_sources\n"
-"-rw-r--r-- 1 user group 2938 2010-04-11 12:16 common\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 includes\n"
-"-rw-r--r-- 1 user group  206 2010-04-11 12:16 source\n"
-"drwxr-xr-x 2 user group 4096 2010-04-11 12:16 templates\n"
+msgid "$ lh config $ ls -l total 4.1k drwxr-xr-x 19 user group 4.1k 2008-05-09 21:37 config $ ls -l config/ total 104 -rw-r--r-- 1 user group 4175 2010-04-11 12:16 binary drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_debian-installer drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_debian-installer-includes drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_grub drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-debs drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-hooks drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-includes drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-packageslists drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_local-udebs drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_rootfs drwxr-xr-x 2 user group 4096 2010-04-11 12:16 binary_syslinux -rw-r--r-- 1 user group 2205 2010-04-11 12:16 bootstrap -rw-r--r-- 1 user group 1599 2010-04-11 12:16 chroot drwxr-xr-x 2 user group 4096 2010-04-11 12:16
  chroot_apt drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-hooks drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-includes drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-packages drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-packageslists drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-patches drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_local-preseed drwxr-xr-x 2 user group 4096 2010-04-11 12:16 chroot_sources -rw-r--r-- 1 user group 2938 2010-04-11 12:16 common drwxr-xr-x 2 user group 4096 2010-04-11 12:16 includes -rw-r--r-- 1 user group 206 2010-04-11 12:16 source drwxr-xr-x 2 user group 4096 2010-04-11 12:16 templates "
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:216
+#: en/overview.xml:63
 msgid ""
 "Using <filename>lh config</filename> without any arguments would be suitable "
 "for users who are either happy editing the generated files, or are simply "
@@ -283,7 +251,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:222
+#: en/overview.xml:64
 msgid ""
 "You can ask <filename>lh config</filename> to generate a <filename class="
 "\"directory\">config/</filename> directory \"preseeded\" with various "
@@ -292,13 +260,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para><screen>
-#: en/overview.xml:230
+#: en/overview.xml:66
 #, no-wrap
 msgid "$ lh config -p gnome"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:234
+#: en/overview.xml:68
 msgid ""
 "will build a <filename class=\"directory\">config/</filename> directory "
 "configured to include the '<command>gnome</command>' package list. It is "
@@ -306,13 +274,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para><screen>
-#: en/overview.xml:240
+#: en/overview.xml:70
 #, no-wrap
 msgid "$ lh config --apt aptitude --binary-images net --hostname live-machine --username live-user ..."
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:244
+#: en/overview.xml:72
 msgid ""
 "A full list of options is available in the <command>lh_config</command> man "
 "page. Most options have a parallel with an \"<command>LH_</command>\" "
@@ -320,12 +288,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/overview.xml:252
+#: en/overview.xml:75
 msgid "The <filename>lh build</filename> helper"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:255
+#: en/overview.xml:76
 msgid ""
 "The <filename>lh build</filename> helper reads in your configuration from "
 "the <filename class=\"directory\">config/</filename> directory. It then runs "
@@ -333,12 +301,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><section><title>
-#: en/overview.xml:264
+#: en/overview.xml:79
 msgid "The <filename>lh clean</filename> helper"
 msgstr ""
 
 #. type: Content of: <chapter><section><section><para>
-#: en/overview.xml:267
+#: en/overview.xml:80
 msgid ""
 "It is the job of the <filename>lh clean</filename> helper to remove various "
 "parts of a Live helper build so subsequent builds can start from a clean "
@@ -346,12 +314,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: en/overview.xml:277
+#: en/overview.xml:84
 msgid "The &live-initramfs; package"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:280
+#: en/overview.xml:85
 msgid ""
 "&live-initramfs; is a collection of scripts providing hooks for the "
 "<command>initramfs-tools</command>, used to generate an initramfs capable of "
@@ -361,7 +329,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:288
+#: en/overview.xml:86
 msgid ""
 "At boot time it will look for read-only media containing a \"/live\" "
 "directory where a root filesystem (often a compressed filesystem image like "
@@ -370,14 +338,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:296
+#: en/overview.xml:87
 msgid ""
 "&live-initramfs; is a fork of <ulink url=\"http://packages.ubuntu.com/casper"
 "\">casper</ulink>."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/overview.xml:301
+#: en/overview.xml:88
 msgid ""
 "More information on initial ramfs in Debian can be found in the <ulink url="
 "\"http://kernel-handbook.alioth.debian.org/\"> Debian Linux Kernel Handbook</"
diff --git a/manual/pot/procedures.xml.pot b/manual/pot/procedures.xml.pot
index f073761..911a5b1 100644
--- a/manual/pot/procedures.xml.pot
+++ b/manual/pot/procedures.xml.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,40 +16,42 @@ msgstr ""
 "Content-Transfer-Encoding: ENCODING"
 
 #. type: Content of: <chapter><title>
-#: en/chapters/procedures.xml:7
+#: en/procedures.xml:6
 msgid "Procedures"
 msgstr ""
 
 #. type: Content of: <chapter><para>
-#: en/chapters/procedures.xml:9
+#: en/procedures.xml:7
 msgid ""
 "This chapter documents the procedures within the Debian Live project for "
 "various tasks that need cooperation with other teams in Debian."
 msgstr ""
 
 #. type: Content of: <chapter><sect1><title>
-#: en/chapters/procedures.xml:12
+#: en/procedures.xml:9
 msgid "Udeb Uploads"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><para>
-#: en/chapters/procedures.xml:14
+#: en/procedures.xml:10
 msgid "Before commiting releases of a udeb in d-i svn, one has to call:"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><screen>
-#: en/chapters/procedures.xml:15
+#: en/procedures.xml:12
 #, no-wrap
-msgid "<command>../../scripts/l10n/output-l10n-changes . -d</command>"
+msgid ""
+"      <command>../../scripts/l10n/output-l10n-changes . -d</command>\n"
+"    "
 msgstr ""
 
 #. type: Content of: <chapter><sect1><title>
-#: en/chapters/procedures.xml:19
+#: en/procedures.xml:16
 msgid "Major Releases"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><para>
-#: en/chapters/procedures.xml:21
+#: en/procedures.xml:17
 msgid ""
 "Releasing a new stable major version of Debian includes a lot of different "
 "teams working together to make it happen. At some point, the Live team comes "
@@ -57,113 +59,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><sect1><title>
-#: en/chapters/procedures.xml:34
+#: en/procedures.xml:27
 msgid "Point Releases"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><sect2><title>
-#: en/chapters/procedures.xml:44
+#: en/procedures.xml:35
 msgid "Point release announcement template"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><sect2><para>
-#: en/chapters/procedures.xml:46
+#: en/procedures.xml:36
 msgid ""
 "An annoucement mail for point releases can be generated using the template "
 "below and the following command:"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><sect2><screen>
-#: en/chapters/procedures.xml:49
+#: en/procedures.xml:37
 #, no-wrap
-msgid ""
-"$ sed \\\n"
-"  -e 's|%major%|5.0|g' \\\n"
-"  -e 's|%minor%|5.0.2|g' \\\n"
-"  -e 's|%codename%|lenny|g' \\\n"
-"  -e 's|%release_mail%|2009/msg00007.html|g'\n"
+msgid " $ sed \\ -e 's|%major%|5.0|g' \\ -e 's|%minor%|5.0.2|g' \\ -e 's|%codename%|lenny|g' \\ -e 's|%release_mail%|2009/msg00007.html|g' "
 msgstr ""
 
 #. type: Content of: <chapter><sect1><sect2><para>
-#: en/chapters/procedures.xml:56
+#: en/procedures.xml:38
 msgid ""
 "Please check the mail carefully before sending and pass it to others for "
 "proof-reading."
 msgstr ""
 
 #. type: Content of: <chapter><sect1><sect2><screen>
-#: en/chapters/procedures.xml:59
+#: en/procedures.xml:39
 #, no-wrap
-msgid ""
-"Debian Live images for Debian GNU/Linux %major% updated\n"
-"\n"
-"The Debian Live project is pleased to announce the availability of\n"
-"updated Live images for its stable distribution Debian GNU/Linux %major%\n"
-"(codename \"%codename%\").\n"
-"\n"
-"The images are available for download at:\n"
-"\n"
-"    &lt;http://cdimage.debian.org/cdimage/release/current-live/&gt;\n"
-"\n"
-"This update incorporates the changes made in the %minor% point release,\n"
-"which adds corrections for security problems to the stable release\n"
-"along with a few adjustments for serious problems. A full list of the\n"
-"changes may be viewed at:\n"
-"\n"
-"    &lt;http://lists.debian.org/debian-announce/%release_mail%&gt;\n"
-"\n"
-"It also includes the following Live-specific changes:\n"
-"\n"
-" * [INSERT LIVE-SPECIFIC CHANGE HERE]\n"
-" * [INSERT LIVE-SPECIFIC CHANGE HERE]\n"
-" * [LARGER ISSUES MAY DESERVE THEIR OWN SECTION]\n"
-"\n"
-"\n"
-"URLs\n"
-"----\n"
-"\n"
-"Download location of updated images:\n"
-"\n"
-"  &lt;http://cdimage.debian.org/cdimage/release/current-live/&gt;\n"
-"\n"
-"Debian Live project homepage:\n"
-"\n"
-"  &lt;http://live.debian.net/&gt;\n"
-"\n"
-"The current stable distribution:\n"
-"\n"
-"  &lt;http://ftp.debian.org/debian/dists/stable&gt;\n"
-"\n"
-"stable distribution information (release notes, errata etc.):\n"
-"\n"
-"  &lt;http://www.debian.org/releases/stable/&gt;\n"
-"\n"
-"Security announcements and information:\n"
-"\n"
-"  &lt;http://www.debian.org/security/&gt;\n"
-"\n"
-"\n"
-"About Debian\n"
-"-------------\n"
-"\n"
-"The Debian Project is an association of Free Software developers who\n"
-"volunteer their time and effort in order to produce the completely free\n"
-"operating system Debian GNU/Linux.\n"
-"\n"
-"\n"
-"About Debian Live\n"
-"-----------------\n"
-"\n"
-"Debian Live is an official sub-project of Debian which produces Debian\n"
-"systems that do not require a classical installer. Images are available\n"
-"for CD/DVD discs, USB sticks and PXE netbooting as well as a bare\n"
-"filesystem images for booting directly from the internet.\n"
-"\n"
-"\n"
-"Contact Information\n"
-"-------------------\n"
-"\n"
-"For further information, please visit the Debian Live web pages at\n"
-"&lt;http://live.debian.net/&gt; or alternatively send mail to\n"
-"&lt;debian-live at lists.debian.org&gt;.\n"
+msgid " Debian Live images for Debian GNU/Linux %major% updated The Debian Live project is pleased to announce the availability of updated Live images for its stable distribution Debian GNU/Linux %major% (codename \"%codename%\"). The images are available for download at: &lt;http://cdimage.debian.org/cdimage/release/current-live/&gt; This update incorporates the changes made in the %minor% point release, which adds corrections for security problems to the stable release along with a few adjustments for serious problems. A full list of the changes may be viewed at: &lt;http://lists.debian.org/debian-announce/%release_mail%&gt; It also includes the following Live-specific changes: COPYING debian html Makefile manual VERSION xml xsl [INSERT LIVE-SPECIFIC CHANGE HERE] COPYING debian html Makefile manual VERSION xml xsl [INSERT LIVE-SPECIFIC CHANGE HERE] COPYING debian html Makefile manual VERSION xml xsl [LARGER ISSUES MAY DESERVE THEIR OWN SECTION] URLs ---- Download location 
 of updated images: &lt;http://cdimage.debian.org/cdimage/release/current-live/&gt; Debian Live project homepage: &lt;http://live.debian.net/&gt; The current stable distribution: &lt;http://ftp.debian.org/debian/dists/stable&gt; stable distribution information (release notes, errata etc.): &lt;http://www.debian.org/releases/stable/&gt; Security announcements and information: &lt;http://www.debian.org/security/&gt; About Debian ------------- The Debian Project is an association of Free Software developers who volunteer their time and effort in order to produce the completely free operating system Debian GNU/Linux. About Debian Live ----------------- Debian Live is an official sub-project of Debian which produces Debian systems that do not require a classical installer. Images are available for CD/DVD discs, USB sticks and PXE netbooting as well as a bare filesystem images for booting directly from the internet. Contact Information ------------------- For further information, p
 lease visit the Debian Live web pages at &lt;http://live.debian.net/&gt; or alternatively send mail to &lt;debian-live at lists.debian.org&gt;. "
 msgstr ""
diff --git a/manual/pot/reporting-bugs.xml.pot b/manual/pot/reporting-bugs.xml.pot
index 2695d03..24b28ed 100644
--- a/manual/pot/reporting-bugs.xml.pot
+++ b/manual/pot/reporting-bugs.xml.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Transfer-Encoding: ENCODING"
 
 #. type: Content of: <chapter><title>
-#: en/chapters/reporting-bugs.xml:7
+#: en/reporting-bugs.xml:6
 msgid "Reporting bugs"
 msgstr ""
 
 #. type: Content of: <chapter><para>
-#: en/chapters/reporting-bugs.xml:9
+#: en/reporting-bugs.xml:7
 msgid ""
 "Debian Live is far from being perfect, but we want to make it as close as "
 "possible to perfect - with your help. Do not hesitate to report a bug: it is "
@@ -30,26 +30,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><para>
-#: en/chapters/reporting-bugs.xml:11
+#: en/reporting-bugs.xml:8
 msgid "For the impatient:"
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:16
+#: en/reporting-bugs.xml:11
 msgid ""
 "Always check first the image status updates on <ulink url=\"http://live."
 "debian.net/\">our homepage</ulink> for known issues."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:21
+#: en/reporting-bugs.xml:14
 msgid ""
 "Always try to reproduce the bug with the <emphasis>most recent version of "
 "&live-helper; and &live-initramfs;</emphasis> before submitting a bug report."
 msgstr ""
 
 #. type: Content of: <chapter><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:26
+#: en/reporting-bugs.xml:17
 msgid ""
 "Try to give <emphasis>as specific information as possible</emphasis> about "
 "the bug. This includes (at least) the version of &live-helper; and &live-"
@@ -57,19 +57,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: en/chapters/reporting-bugs.xml:32
+#: en/reporting-bugs.xml:21
 msgid "Known issues"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:33
+#: en/reporting-bugs.xml:22
 msgid ""
 "Due to the nature of Debian testing and Debian unstable branches being a "
 "moving target, building a live system may not always be possible."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:34
+#: en/reporting-bugs.xml:23
 msgid ""
 "If this is a problem, do not build a system based on testing or unstable, "
 "but go with stable. live-helper does always default to the current stable "
@@ -77,14 +77,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:35
+#: en/reporting-bugs.xml:24
 msgid ""
 "Currently known issues are listed under the section 'status' on <ulink url="
 "\"http://live.debian.net/\">our homepage</ulink>."
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:36
+#: en/reporting-bugs.xml:25
 msgid ""
 "It is out of the scope of this manual to train you in correctly identifying "
 "and fixing problems in packages of the development branches, however, there "
@@ -94,12 +94,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: en/chapters/reporting-bugs.xml:40
+#: en/reporting-bugs.xml:28
 msgid "Rebuild from scratch"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:41
+#: en/reporting-bugs.xml:29
 msgid ""
 "To ensure that a particular bug is not caused by an unclean built system, "
 "please always rebuild the whole live system from scratch to see if the bug "
@@ -107,17 +107,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: en/chapters/reporting-bugs.xml:45
+#: en/reporting-bugs.xml:32
 msgid "Use up-to-date packages"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:46
+#: en/reporting-bugs.xml:33
 msgid "This means"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:48
+#: en/reporting-bugs.xml:34
 msgid ""
 "Using outdated packages can cause significant problems when trying to "
 "reproduce (and ultimately fix) your problem. If a relevant package is not "
@@ -127,12 +127,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: en/chapters/reporting-bugs.xml:53
+#: en/reporting-bugs.xml:37
 msgid "Collect information"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:55
+#: en/reporting-bugs.xml:38
 msgid ""
 "Please provide enough information with your report. At a minimum, it should "
 "contain the exact version of &live-helper; version where the bug is "
@@ -142,64 +142,64 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:57
+#: en/reporting-bugs.xml:39
 msgid ""
 "To make the most out of your bug report, we require at least the following "
 "information:"
 msgstr ""
 
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:61
+#: en/reporting-bugs.xml:42
 msgid "Architecture of the host system"
 msgstr ""
 
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:62
+#: en/reporting-bugs.xml:45
 msgid "Version of &live-helper; on the host system"
 msgstr ""
 
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:63
+#: en/reporting-bugs.xml:48
 msgid "Version of &live-initramfs; on the live system"
 msgstr ""
 
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:64
+#: en/reporting-bugs.xml:51
 msgid ""
 "Version of <filename>debootstrap</filename> and/or <filename>cdebootstrap</"
 "filename> on the host system"
 msgstr ""
 
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:65
+#: en/reporting-bugs.xml:54
 msgid "Architecture of the live system"
 msgstr ""
 
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:66
+#: en/reporting-bugs.xml:57
 msgid "Distribution of the live system"
 msgstr ""
 
 #. type: Content of: <chapter><section><itemizedlist><listitem><para>
-#: en/chapters/reporting-bugs.xml:67
+#: en/reporting-bugs.xml:60
 msgid "Version of the kernel on the live system"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:71
+#: en/reporting-bugs.xml:63
 msgid ""
 "You can generate a log of the build process by using the <filename>tee</"
 "filename> command:"
 msgstr ""
 
 #. type: Content of: <chapter><section><screen>
-#: en/chapters/reporting-bugs.xml:75
+#: en/reporting-bugs.xml:64
 #, no-wrap
-msgid " # lh_build 2>&amp;1 | tee buildlog.txt\n"
+msgid " # lh_build 2&gt;&amp;1 | tee buildlog.txt "
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:78
+#: en/reporting-bugs.xml:65
 msgid ""
 "Additionally, to rule out other errors, it is always a good idea to tar up "
 "your config directory and upload it somewhere (do *not* send it as an "
@@ -208,7 +208,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:83
+#: en/reporting-bugs.xml:66
 msgid ""
 "Remember to send in any logs that were produced with English locale "
 "settings, e.g. run your live-helper commands with a leading <code>LC_ALL=C</"
@@ -216,22 +216,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: en/chapters/reporting-bugs.xml:91
+#: en/reporting-bugs.xml:69
 msgid "Use the correct package to report the bug against"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:93
+#: en/reporting-bugs.xml:70
 msgid "Where does the bug appear?"
 msgstr ""
 
 #. type: Content of: <chapter><section><para><variablelist><varlistentry><term>
-#: en/chapters/reporting-bugs.xml:98
+#: en/reporting-bugs.xml:74
 msgid "At build time whilst bootstrapping"
 msgstr ""
 
 #. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para><para>
-#: en/chapters/reporting-bugs.xml:101
+#: en/reporting-bugs.xml:77
 msgid ""
 "&live-helper; first bootstraps a basic Debian system with "
 "<command>debootstrap</command> or <command>cdebootstrap</command>. Depending "
@@ -242,7 +242,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para><para>
-#: en/chapters/reporting-bugs.xml:103
+#: en/reporting-bugs.xml:78
 msgid ""
 "In both cases, this is not a bug in Debian Live, but rather in Debian itself "
 "which we can not fix this directly. Please report such a bug against "
@@ -251,12 +251,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para><variablelist><varlistentry><term>
-#: en/chapters/reporting-bugs.xml:107
+#: en/reporting-bugs.xml:83
 msgid "At build time whilst installing packages"
 msgstr ""
 
 #. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#: en/chapters/reporting-bugs.xml:109
+#: en/reporting-bugs.xml:85
 msgid ""
 "&live-helper; installs additional packages from the Debian archive and "
 "depending on the Debian distribution used and the daily archive state, it "
@@ -265,7 +265,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#: en/chapters/reporting-bugs.xml:111
+#: en/reporting-bugs.xml:86
 msgid ""
 "If this is the case, this is not a bug in Debian Live, but rather in Debian "
 "- please report it against the failing package. Running "
@@ -275,7 +275,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#: en/chapters/reporting-bugs.xml:113
+#: en/reporting-bugs.xml:87
 msgid ""
 "Also, if you are using a local mirror and/or any of sort of proxy and you "
 "are experiencing a problem, please always reproduce it first by "
@@ -283,12 +283,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para><variablelist><varlistentry><term>
-#: en/chapters/reporting-bugs.xml:120
+#: en/reporting-bugs.xml:91
 msgid "At boot-time"
 msgstr ""
 
 #. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#: en/chapters/reporting-bugs.xml:123
+#: en/reporting-bugs.xml:93
 msgid ""
 "If your image does not boot, please report it to the mailing list together "
 "with the information requested in <xref linkend=\"collect-information\"/>. "
@@ -299,29 +299,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para><variablelist><varlistentry><term>
-#: en/chapters/reporting-bugs.xml:128
+#: en/reporting-bugs.xml:97
 msgid "At run-time"
 msgstr ""
 
 #. type: Content of: <chapter><section><para><variablelist><varlistentry><listitem><para>
-#: en/chapters/reporting-bugs.xml:130
+#: en/reporting-bugs.xml:99
 msgid ""
 "If a package was successfully installed, but fails while actually running "
 "the Live system, this is probably a bug in Debian Live. However,"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:96
+#: en/reporting-bugs.xml:72
 msgid "<placeholder type=\"variablelist\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: en/chapters/reporting-bugs.xml:139
+#: en/reporting-bugs.xml:106
 msgid "Do the research"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:140
+#: en/reporting-bugs.xml:107
 msgid ""
 "Before filing the bug, please search the web for the particular error "
 "message or symptom you are getting. As it is highly unlikely that you are "
@@ -331,7 +331,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:142
+#: en/reporting-bugs.xml:108
 msgid ""
 "You should pay particular attention to the Debian Live mailing list, as well "
 "as the homepage, as these are likely to contain the most up-to-date "
@@ -340,7 +340,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:144
+#: en/reporting-bugs.xml:109
 msgid ""
 "In addition, you should check the <ulink url=\"http://bugs.debian.org/cgi-"
 "bin/pkgreport.cgi?src=live-helper\">current bug list for &live-helper;</"
@@ -350,12 +350,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><title>
-#: en/chapters/reporting-bugs.xml:148
+#: en/reporting-bugs.xml:112
 msgid "Where to report bugs"
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:150
+#: en/reporting-bugs.xml:113
 msgid ""
 "The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
 "System (BTS). For information on how to use the system, please see <ulink "
@@ -365,7 +365,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:152
+#: en/reporting-bugs.xml:114
 msgid ""
 "In general, you should report build time errors against the <ulink url="
 "\"http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=live-helper\">live-"
@@ -377,7 +377,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <chapter><section><para>
-#: en/chapters/reporting-bugs.xml:154
+#: en/reporting-bugs.xml:115
 msgid ""
 "Please note that bugs found in distributions derived from Debian (such as "
 "Ubuntu, Knoppix, Xandros, etc.) should <emphasis>not</emphasis> be reported "
diff --git a/manual/pot/use-cases.xml.pot b/manual/pot/use-cases.xml.pot
index c260f7b..0756ef4 100644
--- a/manual/pot/use-cases.xml.pot
+++ b/manual/pot/use-cases.xml.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-06-06 12:07+0300\n"
+"POT-Creation-Date: 2010-06-06 17:46+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,112 +16,106 @@ msgstr ""
 "Content-Transfer-Encoding: ENCODING"
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/basics.xml:128 en/chapters/basics.xml:239
-#: en/chapters/basics.xml:382 en/chapters/use-cases.xml:59
+#: en/basics.xml:50 en/basics.xml:89 en/basics.xml:148 en/use-cases.xml:31
 #, no-wrap
 msgid "# lh build"
 msgstr ""
 
 #. type: Content of: <chapter><title>
-#: en/chapters/use-cases.xml:7
+#: en/use-cases.xml:6
 msgid "Use Cases"
 msgstr ""
 
 #. type: Content of: <chapter><para>
-#: en/chapters/use-cases.xml:9
+#: en/use-cases.xml:7
 msgid "This chapter is for users to document their use cases with Debian Live."
 msgstr ""
 
 #. type: Content of: <chapter><sect1><title>
-#: en/chapters/use-cases.xml:12
+#: en/use-cases.xml:9
 msgid "VNC Kiosk Client"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><para>
-#: en/chapters/use-cases.xml:13
+#: en/use-cases.xml:10
 msgid "Create an image with &live-helper; to boot directly to a VNC server."
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/use-cases.xml:18
+#: en/use-cases.xml:13
 #, no-wrap
 msgid "$ mkdir vncBuild"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/chapters/use-cases.xml:17
+#: en/use-cases.xml:13
 msgid "Make a build directory: <placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/use-cases.xml:24
+#: en/use-cases.xml:16
 #, no-wrap
 msgid "$ cd vncBuild"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/chapters/use-cases.xml:23
+#: en/use-cases.xml:16
 msgid "Move to the build directory: <placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/use-cases.xml:30
+#: en/use-cases.xml:19
 #, no-wrap
 msgid "$ lh config --packages \"gdm metacity xtightvncviewer\""
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/chapters/use-cases.xml:29
+#: en/use-cases.xml:19
 msgid ""
 "Example to config the build directory to include gdm metacity "
 "xtightvncviewer: <placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/use-cases.xml:36
+#: en/use-cases.xml:22
 #, no-wrap
 msgid "$ mkdir -p config/chroot_local-includes/etc/skel"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/chapters/use-cases.xml:35
+#: en/use-cases.xml:22
 msgid ""
 "Create a folder /etc/skel folder for a custom .xsession for the default "
 "user: <placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/use-cases.xml:42
+#: en/use-cases.xml:25
 #, no-wrap
 msgid "$ touch config/chroot_local-includes/etc/skel/.xsession"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/chapters/use-cases.xml:41
+#: en/use-cases.xml:25
 msgid ""
 "Create the .xsession for the default user: <placeholder type=\"screen\" id="
 "\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para><screen>
-#: en/chapters/use-cases.xml:49
+#: en/use-cases.xml:28
 #, no-wrap
-msgid ""
-"\t#!/bin/sh\n"
-"\t/usr/bin/metacity &amp;\n"
-"\t/usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT\n"
-"\texit\n"
-"\t"
+msgid " #!/bin/sh /usr/bin/metacity &amp; /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT exit "
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/chapters/use-cases.xml:47
+#: en/use-cases.xml:28
 msgid ""
 "Edit the .xsession file to launch metacity and start xvncviewer with "
 "something similar to the below: <placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <chapter><sect1><itemizedlist><listitem><para>
-#: en/chapters/use-cases.xml:58
+#: en/use-cases.xml:31
 msgid "Build the image: <placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
diff --git a/xsl/html-single.xsl b/xsl/html-single.xsl
index 0f4c70e..e50a053 100644
--- a/xsl/html-single.xsl
+++ b/xsl/html-single.xsl
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-	<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/onechunk.xsl" />
-
-	<xsl:param name="chunk.first.sections">1</xsl:param>
-	<xsl:param name="chunk.section.depth">1</xsl:param>
-	<xsl:param name="chunker.output.indent">yes</xsl:param>
-	<xsl:param name="section.autolabel">1</xsl:param>
-	<xsl:param name="section.label.includes.component.label">1</xsl:param>
-	<xsl:param name="use.id.as.filename">1</xsl:param>
+  <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/onechunk.xsl"/>
+  <xsl:param name="chunk.first.sections">1</xsl:param>
+  <xsl:param name="chunk.section.depth">1</xsl:param>
+  <xsl:param name="chunker.output.indent">yes</xsl:param>
+  <xsl:param name="section.autolabel">1</xsl:param>
+  <xsl:param name="section.label.includes.component.label">1</xsl:param>
+  <xsl:param name="use.id.as.filename">1</xsl:param>
 </xsl:stylesheet>
diff --git a/xsl/html.xsl b/xsl/html.xsl
index 025c576..30cac19 100644
--- a/xsl/html.xsl
+++ b/xsl/html.xsl
@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-	<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl" />
-
-	<xsl:param name="chunk.first.sections">1</xsl:param>
-	<xsl:param name="chunk.section.depth">1</xsl:param>
-	<xsl:param name="chunker.output.indent">yes</xsl:param>
-	<xsl:param name="section.autolabel">1</xsl:param>
-	<xsl:param name="section.label.includes.component.label">1</xsl:param>
-	<xsl:param name="use.id.as.filename">1</xsl:param>
+  <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl"/>
+  <xsl:param name="chunk.first.sections">1</xsl:param>
+  <xsl:param name="chunk.section.depth">1</xsl:param>
+  <xsl:param name="chunker.output.indent">yes</xsl:param>
+  <xsl:param name="section.autolabel">1</xsl:param>
+  <xsl:param name="section.label.includes.component.label">1</xsl:param>
+  <xsl:param name="use.id.as.filename">1</xsl:param>
 </xsl:stylesheet>
diff --git a/xsl/txt.xsl b/xsl/txt.xsl
index 5d83ad0..c37af39 100644
--- a/xsl/txt.xsl
+++ b/xsl/txt.xsl
@@ -1,28 +1,7 @@
 <?xml version="1.0"?>
-
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-	<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl" />
-
-	<xsl:param name="section.autolabel">1</xsl:param>
-	<xsl:param name="section.label.includes.component.label">1</xsl:param>
-
-	<xsl:param name="generate.toc">
-		appendix		title
-		article/appendix	nop
-		article			toc,title
-		book			toc,title,figure,table,example,equation
-		chapter			title
-		part			toc,title
-		preface			toc,title
-		qandadiv		toc
-		qandaset		toc
-		reference		toc,title
-		sect1			toc
-		sect2			toc
-		sect3			toc
-		sect4			toc
-		sect5			toc
-		section			toc
-		set			toc,title
-	</xsl:param>
+  <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"/>
+  <xsl:param name="section.autolabel">1</xsl:param>
+  <xsl:param name="section.label.includes.component.label">1</xsl:param>
+  <xsl:param name="generate.toc"> appendix title article/appendix nop article toc,title book toc,title,figure,table,example,equation chapter title part toc,title preface toc,title qandadiv toc qandaset toc reference toc,title sect1 toc sect2 toc sect3 toc sect4 toc sect5 toc section toc set toc,title </xsl:param>
 </xsl:stylesheet>

-- 
live-manual



More information about the debian-live-changes mailing list