[SCM] live-manual branch, upstream, updated. upstream/20100301-1-ga75b76c

[Daniel Baumann]

The following commit has been merged in the upstream branch:
commit a75b76cac39bed2d03ef1d0d5f63bc52de18368b
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat May 1 04:56:40 2010 +0200

    Adding upstream version 20100501.

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 04fc444..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*.html
-*.pdf
-*.txt
-build/
-de/
-fr/
-xml/entities/version.ent
diff --git a/po4a/pot/binary.xml.pot b/po4a/fr/binary.xml.po
similarity index 51%
copy from po4a/pot/binary.xml.pot
copy to po4a/fr/binary.xml.po
index 19661e9..68b22ac 100644
--- a/po4a/pot/binary.xml.pot
+++ b/po4a/fr/binary.xml.po
@@ -1,34 +1,34 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
+# French translations for PACKAGE package
+# Copyright (C) 2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# Automatically generated, 2009.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-11-12 22:29+0100\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"
+"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"
+"Language-Team: none\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: ENCODING"
+"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/customization/binary.xml:7
 msgid "Customising the binary image"
-msgstr ""
+msgstr "Personnaliser l'image binaire"
 
 # type: Content of: <sect1><para>
 #: xml/chapters/customization/binary.xml:9
 msgid "This chapter discusses FIXME"
-msgstr ""
+msgstr "Ce chapitre aborde A FAIRE"
 
 # type: Content of: <sect1><sect2><title>
 #: xml/chapters/customization/binary.xml:12
 msgid "ISO metadata"
-msgstr ""
+msgstr "ISO metadata"
 
 # type: Content of: <sect1><sect2><para>
 #: xml/chapters/customization/binary.xml:14
@@ -37,13 +37,19 @@ msgid ""
 "add various textual metadata for your image. This can help you easily "
 "identify the version or configuration of an image without booting it."
 msgstr ""
+"Lors de la création d'un image binaire ISO9660, on peut utiliser les options "
+"suivantes pour lui ajouter diverses méta-données textes. Ceci peut aider à "
+"identifier facilement la version ou la configuration d'une image sans qu'il "
+"soit nécessaire de la démarrer."
 
 # type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: xml/chapters/customization/binary.xml:19
 msgid ""
-"<computeroutput>LH_ISO_APPLICATION</computeroutput> / <computeroutput>--iso-"
-"application <replaceable>NAME</replaceable></computeroutput>"
+"<command>LH_ISO_APPLICATION</command> / <command>--iso-application "
+"<replaceable>NAME</replaceable></command>"
 msgstr ""
+"<command>LH_ISO_APPLICATION</command> / <command>--iso-application "
+"<replaceable>NOM</replaceable></command>"
 
 # type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: xml/chapters/customization/binary.xml:22
@@ -51,13 +57,17 @@ msgid ""
 "This should describe the application that will be on the image. The maximum "
 "length for this field is 128 characters."
 msgstr ""
+"Ceci devrait décrire l'application qui sera sur l'image. La longueur maximum "
+"est de 128 caractères."
 
 # type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: xml/chapters/customization/binary.xml:27
 msgid ""
-"<computeroutput>LH_ISO_PREPARER</computeroutput> / <computeroutput>--iso-"
-"preparer <replaceable>NAME</replaceable></computeroutput>"
+"<command>LH_ISO_PREPARER</command> / <command>--iso-preparer "
+"<replaceable>NAME</replaceable></command>"
 msgstr ""
+"<command>LH_ISO_PREPARER</command> / <command>--iso-preparer "
+"<replaceable>NOM</replaceable></command>"
 
 # type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: xml/chapters/customization/binary.xml:30
@@ -67,13 +77,19 @@ msgid ""
 "using, which may help with debugging later. The maximum length for this "
 "field is 128 characters."
 msgstr ""
+"Ceci devrait décrire le préparateur de l'image, habituellement avec quelques "
+"détails de contact.La valeur par défaut pour cette option est la version de "
+"&live-helper; utilisée, qui peut aider plus tard pour le débogage. La "
+"longueur maximum est de 128 caractères."
 
 # type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: xml/chapters/customization/binary.xml:35
 msgid ""
-"<computeroutput>LH_ISO_PUBLISHER</computeroutput> / <computeroutput>--iso-"
-"publisher <replaceable>NAME</replaceable></computeroutput>"
+"<command>LH_ISO_PUBLISHER</command> / <command>--iso-publisher "
+"<replaceable>NAME</replaceable></command>"
 msgstr ""
+"<command>LH_ISO_PUBLISHER</command> / <command>--iso-publisher "
+"<replaceable>NOM</replaceable></command>"
 
 # type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: xml/chapters/customization/binary.xml:38
@@ -81,13 +97,17 @@ msgid ""
 "This should describe the publisher of the image, usually with some contact "
 "details. The maximum length for this field is 128 characters."
 msgstr ""
+"Ceci devrait décrire le distibuteur de l'image, habituellement avec quelques "
+"details de contacts. La longueur maximum est de 128 caractères."
 
 # type: Content of: <sect1><sect2><variablelist><varlistentry><term>
 #: xml/chapters/customization/binary.xml:43
 msgid ""
-"<computeroutput>LH_ISO_VOLUME</computeroutput> / <computeroutput>--iso-"
-"volume <replaceable>NAME</replaceable></computeroutput>"
+"<command>LH_ISO_VOLUME</command> / <command>--iso-volume <replaceable>NAME</"
+"replaceable></command>"
 msgstr ""
+"<command>LH_ISO_VOLUME</command> / <command>--iso-volume <replaceable>NOM</"
+"replaceable></command>"
 
 # type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: xml/chapters/customization/binary.xml:46
@@ -96,3 +116,6 @@ msgid ""
 "visible label on some platforms such as Windows and Apple Mac OS. The "
 "maximum length for this field is 32 characters."
 msgstr ""
+"Ceci devrait spécifier le volume-ID de l'image. Ceci est utilisé sur "
+"certaines plateformes comme Windows ou Apple Mac OS comme le nom visible par "
+"l'utilisateur. La longueur maximum est de 128 caractères."
diff --git a/po4a/fr/bootup.xml.po b/po4a/fr/bootup.xml.po
new file mode 100644
index 0000000..907285c
--- /dev/null
+++ b/po4a/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/po4a/fr/coding-style.xml.po b/po4a/fr/coding-style.xml.po
new file mode 100644
index 0000000..53bc808
--- /dev/null
+++ b/po4a/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/po4a/fr/about.xml.po b/po4a/fr/customization.xml.po
similarity index 52%
copy from po4a/fr/about.xml.po
copy to po4a/fr/customization.xml.po
index 78bc57b..a68b944 100644
--- a/po4a/fr/about.xml.po
+++ b/po4a/fr/customization.xml.po
@@ -1,13 +1,13 @@
-# 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.
+# 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: Debconf 8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2008-11-12 22:29+0100\n"
-"PO-Revision-Date: 2009-02-25 19:06+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"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -16,6 +16,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 # type: Content of: <chapter><title>
-#: xml/chapters/about.xml:7
-msgid "About"
-msgstr "A propos"
+#: xml/chapters/customization.xml:7
+msgid "Customization"
+msgstr "Personnalisation"
diff --git a/po4a/fr/manual.xml.po b/po4a/fr/manual.xml.po
new file mode 100644
index 0000000..0fbaee6
--- /dev/null
+++ b/po4a/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/po4a/pot/packages.xml.pot b/po4a/fr/packages.xml.po
similarity index 55%
copy from po4a/pot/packages.xml.pot
copy to po4a/fr/packages.xml.po
index 3ac0112..49ec1aa 100644
--- a/po4a/pot/packages.xml.pot
+++ b/po4a/fr/packages.xml.po
@@ -1,33 +1,30 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
+# French translations for PACKAGE package
+# Copyright (C) 2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# Automatically generated, 2009.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-11-12 22:29+0100\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"
+"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: ENCODING"
+"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: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/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:46
-#: xml/chapters/customization/bootup.xml:53
-#: xml/chapters/customization/bootup.xml:60
-#: xml/chapters/customization/bootup.xml:67
+#: 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
@@ -36,7 +33,7 @@ msgstr ""
 #: 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 ""
+msgstr "FIXME"
 
 # type: Content of: <sect1><sect2><sect3><sect4><para>
 #: xml/chapters/customization/contents.xml:91
@@ -45,13 +42,18 @@ msgstr ""
 #: 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 ""
+msgstr "Installation personnalisée des paquets"
 
 # type: Content of: <sect1><para>
 #: xml/chapters/customization/packages.xml:10
@@ -59,41 +61,46 @@ 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 ""
+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 ""
+msgstr "L'installation de paquets modifiés"
 
 # type: Content of: <sect1><sect2><title>
 #: xml/chapters/customization/packages.xml:19
 msgid "Package sources"
-msgstr ""
+msgstr "Les sources des paquets"
 
 # type: Content of: <sect1><sect2><title>
 #: xml/chapters/customization/packages.xml:26
 msgid "Package installation"
-msgstr ""
+msgstr "L'installation des paquets"
 
 # type: Content of: <sect1><sect2><para>
 #: xml/chapters/customization/packages.xml:28
 msgid ""
-"You can elect to use either <computeroutput>apt</computeroutput> or "
-"<computeroutput>aptitude</computeroutput> when installing packages. Which "
-"utility is used is governed by the <computeroutput>LH_APT</computeroutput> "
-"variable in <filename>config/chroot</filename> or by the <computeroutput>--"
-"apt</computeroutput> argument to <filename>lh_config</filename>:"
+"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 "<computeroutput>apt</computeroutput>"
-msgstr ""
+msgid "<command>apt</command>"
+msgstr "<command>apt</command>"
 
 # type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: xml/chapters/customization/packages.xml:36
@@ -101,16 +108,20 @@ 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 "<computeroutput>aptitude</computeroutput>"
-msgstr ""
+msgid "<command>aptitude</command>"
+msgstr "<command>aptitude</command>"
 
 # type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
 #: xml/chapters/customization/packages.xml:47
@@ -118,16 +129,18 @@ 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 ""
+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 ""
+msgstr "Installer des paquets supplémentaires"
 
 # type: Content of: <sect1><sect2><para>
 #: xml/chapters/customization/packages.xml:62
@@ -135,37 +148,41 @@ 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 <computeroutput>LH_PACKAGES</computeroutput> variable"
-msgstr ""
+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 ""
+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 ""
+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 ""
+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 "
-"<computeroutput>LH_PACKAGES</computeroutput> variable in <filename>config/"
-"chroot</filename>. For example:"
+"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
@@ -174,11 +191,15 @@ 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
@@ -187,6 +208,8 @@ 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
@@ -195,6 +218,9 @@ msgid ""
 "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
@@ -204,6 +230,10 @@ msgid ""
 "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
@@ -213,14 +243,22 @@ msgid ""
 "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 "
-"<computeroutput>LH_PACKAGES_LISTS</computeroutput> variable in "
-"<filename>config/chroot</filename>. For example:"
+"<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
@@ -229,25 +267,31 @@ 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 "
-"<computeroutput>/usr/share/live-helper/lists</computeroutput> directory."
+"<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 ""
+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 "
-"<computeroutput>config/chroot_local-packageslists</computeroutput>."
+"<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
@@ -255,11 +299,14 @@ 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 ""
+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
@@ -269,19 +316,25 @@ msgid ""
 "#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 <computeroutput>/usr/share/live-"
-"helper/lists</computeroutput> directory."
+"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 ""
+msgstr "Utilisation de tests dans les listes de paquets"
 
 # type: Content of: <sect1><sect2><sect3><sect4><screen>
 #: xml/chapters/customization/packages.xml:140
@@ -292,14 +345,19 @@ msgid ""
 "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 <computeroutput>LH_ARCHITECTURE</computeroutput> is set to "
-"<computeroutput>i386</computeroutput> or <computeroutput>amd64</"
-"computeroutput>:"
+"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
@@ -310,14 +368,19 @@ msgid ""
 "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 <computeroutput>LH_SECTIONS</computeroutput> contains either "
-"<computeroutput>contrib</computeroutput> or <computeroutput>non-free</"
-"computeroutput>:"
+"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
@@ -328,13 +391,15 @@ msgid ""
 "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 <computeroutput>#include</computeroutput> "
-"directive:"
-msgstr ""
+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
@@ -345,23 +410,29 @@ msgid ""
 "#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 "
-"<computeroutput>LH_</computeroutput> can be tested in this way."
+"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 ""
+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 ""
+msgstr "Installation de paquets modifiés ou de tierce partie"
 
 # type: Content of: <sect1><sect2><para>
 #: xml/chapters/customization/packages.xml:191
@@ -373,6 +444,13 @@ msgid ""
 "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
@@ -384,21 +462,28 @@ msgid ""
 "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 ""
+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 ""
+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 ""
+msgstr "Utilisation d'un dépôt APT \"custom\""
 
 # type: Content of: <sect1><sect2><para>
 #: xml/chapters/customization/packages.xml:201
@@ -407,28 +492,40 @@ msgid ""
 "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 <computeroutput>config/"
-"chroot_local-packages</computeroutput> 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."
+"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 <computeroutput>dpkg-name</computeroutput>. FIXME"
+"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
@@ -436,18 +533,22 @@ 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 ""
+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 <computeroutput>config/"
-"chroot_local-packages</computeroutput> directory"
+"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
@@ -455,17 +556,20 @@ 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 ""
+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
@@ -475,11 +579,14 @@ msgid ""
 "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 ""
+msgstr "APT et paquets modifiés"
 
 # type: Content of: <sect1><sect2><sect3><para>
 #: xml/chapters/customization/packages.xml:233
@@ -490,19 +597,29 @@ msgid ""
 "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' <computeroutput>debian/changelog</computeroutput> 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 ""
+"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 ""
+msgstr "Modification des préférences APT lors d'une session Live"
diff --git a/po4a/fr/procedures.xml.po b/po4a/fr/procedures.xml.po
new file mode 100644
index 0000000..bab6e39
--- /dev/null
+++ b/po4a/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/po4a/fr/project.xml.po b/po4a/fr/project.xml.po
new file mode 100644
index 0000000..a8340f2
--- /dev/null
+++ b/po4a/fr/project.xml.po
@@ -0,0 +1,366 @@
+# 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-26 17:43+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/project.xml:7
+msgid "About the Debian Live Project"
+msgstr "À propos du projet Debian Live"
+
+# type: Content of: <sect1><sect2><title>
+#: xml/chapters/about/project.xml:10
+msgid "Motivation"
+msgstr "Motivation"
+
+# type: Content of: <sect1><sect2><sect3><title>
+#: 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>
+#: 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 "
+"the following disadvantages:"
+msgstr ""
+"Il existe actuellement plusieurs systèmes live basés sur Debian, et qui font "
+"du très bon travail. Mais du point de vue Debian, la plupart d'entre eux "
+"présente au moins l'un des inconvénients suivants :"
+
+# type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
+#: 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>
+#: 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>
+#: 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>
+#: xml/chapters/about/project.xml:21
+msgid ""
+"They modify the behaviour and/or appearance of packages by stripping them "
+"down to save space."
+msgstr ""
+"Ils modifient le comportement et/ou l'apparence des paquets en les réduisant "
+"pour récupérer de l'espace."
+
+# type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
+#: 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>
+#: xml/chapters/about/project.xml:23
+msgid ""
+"They ship custom kernels with additional patches that are not part of Debian."
+msgstr ""
+"Ils fournissent des noyaux customisés et des patches non-supportés par "
+"Debian."
+
+# type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
+#: xml/chapters/about/project.xml:24
+msgid ""
+"They are large and slow due to their sheer size and thus not suitable for "
+"rescue issues."
+msgstr ""
+"Ils sont gros et lents du simple fait de leur taille, et donc inadaptés aux "
+"problèmes de récupération du système."
+
+# type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
+#: xml/chapters/about/project.xml:25
+msgid ""
+"They are not available in different flavours, e.g. CDs, DVDs, USB-stick and "
+"netboot images"
+msgstr ""
+"Il n'y a pas de choix de support d'installation (CD, DVD, clé USB, boot "
+"réseau...)"
+
+# type: Content of: <sect1><sect2><sect3><title>
+#: 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>
+#: 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 "
+"only Debian system with the following main advantages:"
+msgstr ""
+"Debian est l'OS universel : Debian se doit de posséder un système live "
+"officiel, afin de représenter le seul, le vrai et l'unique système Debian, "
+"avec ces avantages :"
+
+# type: Content of: <sect1><sect2><sect3><orderedlist><listitem><para>
+#: 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>
+#: 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>
+#: 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>
+#: 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>
+#: 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>
+#: 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>
+#: xml/chapters/about/project.xml:48
+msgid "Philosophy"
+msgstr "Philosophie"
+
+# type: Content of: <sect1><sect2><sect3><title>
+#: 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>
+#: 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 "
+"section is not part of Debian and therefore cannot be used at all for live "
+"systems."
+msgstr ""
+"Nous n'utiliserons que des paquets officiels de la section \"main\" des "
+"dépôts Debian ( et peut-être de \"contrib\", cela reste à décider). La "
+"section \"non-free\" ne fait pas partie de Debian, et est par conséquent "
+"inutilisable pour les systèmes live."
+
+# type: Content of: <sect1><sect2><sect3><para>
+#: 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."
+msgstr ""
+"Aucun paquet ne sera modifié. Si des modifications s'imposent, elles seront "
+"faites en collaboration avec les mainteneurs de paquets Debian."
+
+# type: Content of: <sect1><sect2><sect3><para>
+#: 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."
+"g. to create development snapshots). They will be uploaded to Debian on a "
+"regular basis."
+msgstr ""
+"Exceptionnellement, nous utiliserons temporairement certains paquets (tels "
+"que &live-helper;·et·&live-initramfs;)·de nos propres dépôts à des fins de "
+"développement. Ceux-ci seront régulièrement transférés à Debian."
+
+# type: Content of: <sect1><sect2><sect3><title>
+#: 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>
+#: 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 "
+"are after a regular installation of Debian."
+msgstr ""
+"Lors de cette phase, nous ne fournirons ni n'installerons pas de "
+"configuration alternative. Tous les paquets sont utilisés dans leur "
+"configuration d'origine, tels qu'ils le sont après une installation Debian "
+"classique."
+
+# type: Content of: <sect1><sect2><sect3><para>
+#: 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."
+msgstr ""
+"Si une modification de la configuration par défaut s'avère nécessaire, elle "
+"sera faite en coordination avec le mainteneur de paquets Debian."
+
+# type: Content of: <sect1><sect2><sect3><para>
+#: xml/chapters/about/project.xml:65
+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\"/>."
+msgstr ""
+"Un système de configuration des paquets basé sur debconf est fourni dans "
+"lh_config (usage : --preseed FICHIER). Il permet une configuration "
+"spécifique des paquets pour être installés par des images live Debian "
+"\"custom\", mais seules les configurations par défaut seront utilisées dans "
+"les images live officielles. Pour plus d'informations, reportez-vous à <xref "
+"linkend=\"customization\"/>."
+
+# type: Content of: <sect1><sect2><sect3><para>
+#: xml/chapters/about/project.xml:67
+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."
+msgstr ""
+"Une exception: quelques modifications essentielles sont nécessaires pour "
+"rendre un système live utilisable (par exemple, configurer pam afin qu'il "
+"autorise les mots de passe vides). Ces changements doivent rester aussi "
+"minimes que possible, et devrait être si possible intégrés au dépôt Debian."
+
+# type: Content of: <sect1><sect2><sect3><title>
+#: 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>
+#: 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 "
+"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 ""
+"Pour l'instant,nous ne fournirons pas d'installeur pour copier le système "
+"live sur une partition de disque dur. Bien que nous nous efforcions de "
+"modifier le moins possible le système live, comparé à une installation "
+"Debian classique, ceux-ci diffèrent en quelques points essentiels (voir "
+"exceptions, guideline 2)."
+
+# type: Content of: <sect1><sect2><sect3><para>
+#: 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 "
+"Debian installation (and, of course, cdebootstrap and debootstrap are on the "
+"system too)."
+msgstr ""
+"Par conséquent, nous fournirons à la place une copie de l'installeur Debian "
+"(resp.·Debian·Installer,·Graphical·Installer), afin de permettre aux "
+"utilisateurs d'effectuer une installation classique. Et bien sûr, "
+"cdebootstrap et·debootstrap sont présents sur le système."
+
+# type: Content of: <sect1><sect2><title>
+#: xml/chapters/about/project.xml:84
+msgid "Contact"
+msgstr "Contact"
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
+#: xml/chapters/about/project.xml:87
+msgid "Mailing list"
+msgstr "Liste de diffusion"
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
+#: 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 "
+"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 ""
+"Rejoignez la <ulink url=\"http://lists.debian.org/debian-live/\">liste de "
+"diffusion</ulink> du projet, ou écrivez directement à <email>debian-"
+"live at lists.debian.org</email>. Vous pouvez également consulter les <ulink "
+"url=\"http://lists.debian.org/debian-live/\">archives</ulink> "
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
+#: xml/chapters/about/project.xml:91
+msgid "IRC"
+msgstr "IRC"
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
+#: 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="
+"\"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 ""
+"Des utilisateurs et développeurs sont présents sur le canal <ulink url="
+"\"irc://irc.debian.org/#debian-live\">#debian-live</ulink>·sur·<ulink url="
+"\"http://oftc.net\">OFTC</ulink>. Merci d'être patient lorsque vous posez "
+"des questions sur l'IRC. Si aucune réponse ne vous parvient, postez votre "
+"message sur la liste de diffusion."
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
+#: xml/chapters/about/project.xml:95
+msgid "BTS"
+msgstr "BTS"
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
+#: 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 "
+"it is marked as having been dealt with. For more information, please see "
+"<xref linkend=\"bugs\"/>."
+msgstr ""
+"Le Système de Suivi de Bugs Debian (Debian·Bug·Tracking·System·- BTS) "
+"détaille les bugs rapportés par les utilisateurs et les développeurs. Chaque "
+"bug reçoit un numéro et est répertorié jusqu'à ce qu'il soit marqué comme "
+"résolu. Pour plus d'informations, voir <xref linkend=\"bugs\"/>."
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><term>
+#: xml/chapters/about/project.xml:99
+msgid "Wiki"
+msgstr "Wiki"
+
+# type: Content of: <sect1><sect2><variablelist><varlistentry><listitem><para>
+#: 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 "
+"document frameworks of Debian Live systems that go beyond the scope of this "
+"document."
+msgstr ""
+"Au-delà de cette documentation, vous pouvez trouver plus d'informations, "
+"discuter des nouvelles technologies et vous documenter sur les systèmes live "
+"Debian sur <ulink url=\"http://wiki.debian.org/DebianLive\">wiki Debian "
+"Live</ulink>"
diff --git a/xml/chapters/about.xml b/xml/chapters/about.xml
index 15b255f..4fefbb4 100644
--- a/xml/chapters/about.xml
+++ b/xml/chapters/about.xml
@@ -1,8 +1,10 @@
 <?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 "../entities/common.ent" > %commondata;
+	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+	<!ENTITY % commondata SYSTEM "../entities/common.ent" > %commondata;
 ]>
+
 <chapter>
 <title>About</title>
 
diff --git a/xml/chapters/about/manual.xml b/xml/chapters/about/manual.xml
index ecb724b..bbba21a 100644
--- a/xml/chapters/about/manual.xml
+++ b/xml/chapters/about/manual.xml
@@ -1,70 +1,185 @@
 <?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 "../../entities/common.ent" > %commondata;
+	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+	<!ENTITY % commondata SYSTEM "../../entities/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>
+<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>
+<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>
+<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>
+<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>
+<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>
+<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>
+<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>
+<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>FIXME</para></listitem>
+<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>
+<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>
+<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>
+<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>FIXME</para></listitem>
+<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 - 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.</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>
+<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>
 
@@ -74,71 +189,206 @@
 
 <sect2 id="authors">
 <title>Authors</title>
-<para>A list of authors (in alphabetical order):</para>
+
+<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>
+<listitem>
+<para>
+	Ben Armstrong
+</para>
+</listitem>
 
-<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>
+<listitem>
+<para>
+	Brendan Sleight
+</para>
+</listitem>
 
-<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>
+<listitem>
+<para>
+	Chris Lamb
+</para>
+</listitem>
 
-<para>The sources for this manual are maintained using the Git version control system. You can checkout the latest copy by executing:</para>
+<listitem>
+<para>
+	Daniel Baumann
+</para>
+</listitem>
 
-<screen>$ git clone git://live.debian.net/git/live-manual.git</screen>
+<listitem>
+<para>
+	Franklin Piat
+</para>
+</listitem>
 
-<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>
+<listitem>
+<para>
+	Jonas Stein
+</para>
+</listitem>
 
-<screen># apt-get install dblatex docbook-xml docbook-xsl make po4a w3m</screen>
+<listitem>
+<para>
+	Kai Hendry
+</para>
+</listitem>
 
-<para>You may build the live-manual from the top level directory of your git checkout by executing:</para>
+<listitem>
+<para>
+	Marco Amadori
+</para>
+</listitem>
 
-<screen>$ make build</screen>
+<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>
+
+<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>
-<screen>$ mkdir -p ~/.ssh/identity.d
+
+<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></listitem>
+$ 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>
 
-<listitem><para>Add the following section your openssh-client config:</para>
-<screen> $ cat &gt;&gt; ~/.ssh/config &lt;&lt; EOF
+<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></listitem>
+EOF</screen>
+</para>
+</listitem>
+
+<listitem>
+<para>
+	Checkout a clone of the manual through ssh:
+</para>
 
-<listitem><para>Checkout a clone of the manual through ssh:</para>
-<screen>$ git clone gitosis at live.debian.net:/live-manual.git</screen></listitem>
+<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>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>
-<screen>$ git commit -a</screen></listitem>
+<listitem>
+<para>
+	Push the commit to the server:
+</para>
 
-<listitem><para>Push the commit to the server:</para>
-<screen>$ git push</screen></listitem>
+<para>
+	<screen>$ git push</screen>
+</para>
+</listitem>
 
 </itemizedlist>
 
diff --git a/xml/chapters/about/project.xml b/xml/chapters/about/project.xml
index 35471e8..d2da448 100644
--- a/xml/chapters/about/project.xml
+++ b/xml/chapters/about/project.xml
@@ -12,7 +12,7 @@
 <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>
+<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>
@@ -62,9 +62,9 @@
 
 <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 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"/>.</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 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.</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>
diff --git a/xml/chapters/basics.xml b/xml/chapters/basics.xml
index 4fa6063..4f3f3db 100644
--- a/xml/chapters/basics.xml
+++ b/xml/chapters/basics.xml
@@ -1,167 +1,386 @@
 <?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 "../entities/common.ent" > %commondata;
+	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+	<!ENTITY % commondata SYSTEM "../entities/common.ent" > %commondata;
 ]>
+
 <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>
+<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 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"/>).</para>
+<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>
+<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>
+
+<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>
+
+<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 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"/>).</para></listitem>
+
+<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 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 format 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...</para></listitem>
+
+<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, ...).</para>
+<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>
-<screen>$ lh_config</screen>
-<para>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"/>).</para>
-<para>Now that we have a <filename>"config/"</filename> hierarchy, we may build the image with <filename>lh_build</filename> helper command:</para>
-<screen># lh_build</screen>
-<para>This process can take a while, depending on the speed of your network connection (see <xref linkend="lh_build"/>).</para>
+<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>
-<screen>
-# apt-get install qemu
-$ qemu -cdrom binary.iso
-</screen>
+<para>
+	Testing an ISO is simple:
+</para>
+
+<para>
+	<screen># apt-get install qemu
+$ qemu -cdrom binary.iso</screen>
+</para>
+
 </section>
 
 <section>
 <title>Burning an ISO image to a physical medium</title>
 
-<para>Burning an ISO image is easy:</para>
-<screen>
-# apt-get install wodim
-$ wodim binary.iso
-</screen>
+<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>
-<screen>$ lh_clean --binary</screen>
-<para>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:</para>
-<screen>$ lh_config -b usb-hdd</screen>
-<para>Now build the image with <filename>lh_build</filename> helper command:</para>
-<screen># lh_build</screen>
+<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>
 <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 <filename>binary.img</filename>'s one, and type:
-<screen>$ dd if=binary.img of=${USBSTICK}</screen>
-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).</para>
-<important>This will definitely overwrite any previous contents on youro stick!</important>
+<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>
-<screen>
-# apt-get install qemu
-$ qemu -hda binary.img
-</screen>
+
+<para>
+	<screen># apt-get install qemu
+$ qemu -hda binary.img</screen>
+</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.
+	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>
 
-<screen>
-# gparted ${USBSTICK}
-</screen>
+<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 much writes to the stick).
+	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>
 
-<screen>
-# mkfs.ext2 ${USBSTICK}
-</screen>
+<para>
+	<screen># mkfs.ext2 ${USBSTICK}</screen>
+</para>
 
 <para>
-If you want to use this data partition with Windows, use FAT32
+	If you want to use this data partition with Windows, use FAT32.
 </para>
 
-<screen>
-# mkfs.vfat -F 32
-</screen>
+<para>
+	<screen># mkfs.vfat -F 32</screen>
+</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>
+	<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.
+	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>
-<screen>$ lh_clean --binary</screen>
-<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>
-<screen>$ lh_config -b net --net-root-path "/srv/debian-live" --net-root-server "192.168.0.1"</screen>
-<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 respectfully of the NFS server where the filesytem image will be located at boot-time.</para>
-<para>Now build the image with <filename>lh_build</filename> helper command:</para>
-<screen># lh_build</screen>
-<para>In a network boot, the client runs a small piece of software, usually on the <acronym>EEPROM</acronym> of the Ethernet card, which sends a <abbrev>DHCP</abbrev> request  to get an <abbrev>IP</abbrev> address and also information about what to do next; such as getting (through <abbrev>TFTP</abbrev> protocol) a higher level boot software like <application>Grub</application> or <application>PXLINUX</application>, or directly to an operating system like <application>Linux</application>.</para>
-<para>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>.</para>
-<para>We must now configure three services on the server:</para>
+<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 a <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>
-<screen>
-# Options DHCP spécifiques à Pxelinux:
+<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;
@@ -207,55 +426,122 @@ subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
     # automatically reboot after 10 minutes of no activity
     option pxelinux.reboottime 600;
   }
-}
-</screen>
+}</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 serves files inside <filename>/srv/debian-live/tftpboot</filename>, modify its start definition in <filename>/etc/inetd.conf</filename> with:
-<screen>tftp           dgram   udp     wait    root  /usr/sbin/in.tftpd /usr/sbin/in.tftpd -s /srv/debian-live/tftpboot -r blksize -v -v</screen>
-and reload the super server with <command>/etc/init.d/openbsd-inetd reload</command>.
+<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>
+<varlistentry>
+<term>NFS server</term>
+
 <listitem>
-<para>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.</para>
-<para>You should install the <command>nfs-kernel-server</command> server package -- <command>nfs-user-server</command> does not function correctly with netboot.</para>
-<para>Then, declare that the directory of the filesystem image is available through NFS, by writing in <filename>/etc/exports</filename> :</para>
-<screen>/srv/debian-live *(ro,async,subtree_check,no_root_squash)</screen>
-<para>and let the NFS server knowing it typing following command :</para>
-<screen># exportfs -rv</screen>
+<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 all these services is quite error prone, you'll need some patience to let all of them working together.</para>
+<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 images creation is made easy with live-helper magic, but testing the images on physical machines can be really time consuming.
-To make our life easier, we can use virtualization. There are two solutions:
+<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>
+
+<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>
-<screen>
-#!/usr/bin/vmware
+<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"
@@ -276,36 +562,63 @@ 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>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>
+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>
 
 <variablelist>
-<varlistentry><term>Qemu</term>
+
+<varlistentry>
+<term>Qemu</term>
+
 <listitem>
-<para>Install qemu, bridge-utils, sudo.</para>
-<para>Edit <filename>/etc/qemu-ifup</filename>:</para>
-<screen>
-#!/bin/sh
+<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>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>
+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/xml/chapters/customization/packages.xml b/xml/chapters/customization/packages.xml
index ff94ece..57facb6 100644
--- a/xml/chapters/customization/packages.xml
+++ b/xml/chapters/customization/packages.xml
@@ -1,135 +1,174 @@
 <?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 "../../entities/common.ent" > %commondata;
+	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+	<!ENTITY % commondata SYSTEM "../../entities/common.ent" > %commondata;
 ]>
+
 <sect1 id="packages">
 <title>Customising package installation</title>
 
 <para>
- This chapter discusses the customisation of package installation. This involves:
+	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>
+
+<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
+	FIXME
 </para>
-<para>
+
 <variablelist>
 
-<varlistentry><term>Debian repositories</term>
-<listitem>
+<varlistentry>
+<term>Debian repositories</term>
 
+<listitem>
 <para>
-To set a local mirror (used to ''build'' the live-cd)
+	To set a local mirror (used to ''build'' the live-cd)
 </para>
 
-<screen>
-$ lh_config --mirror-bootstrap "http://local.intra.net/debian/" --mirror-chroot "http://local.intra.net/debian/"
-</screen>
+<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.
+	The generic mirror is added to the live-system's /etc/apt/sources.list.
 </para>
 
-<screen>
-$ lh_config --mirror-binary "http://ftp.debian.org/debian/"
-</screen>
+<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.
+	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
+	It can be disabled by setting binary indices parameter to disabled
 </para>
 
-<screen>
-$ lh_config --binary-indices disabled
-</screen>
+<para>
+	<screen>$ lh config --binary-indices disabled</screen>
+</para>
 
 <para>
-Note: the same applies for mirror chroot security and mirror binary security
+	Note: the same applies for mirror chroot security and mirror binary
+	security
 </para>
 
-<screen>
-$ lh_config --mirror-chroot-security {URL}
-$ lh_config --mirror-binary-security {URL}
-</screen>
+<para>
+	<screen>$ lh config --mirror-chroot-security {URL}
+$ lh config --mirror-binary-security {URL}</screen>
+</para>
 </listitem>
 </varlistentry>
 
-<varlistentry><term>Own repository</term>
-<listitem>
+<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.
+	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):
+	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>
 
-<screen>
-deb http://live.debian.net/ sid-snapshots main contrib non-free
-</screen>
+<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>.
+	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.
+	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
+	You can also put the gpg-key used to sign the repository into
+	config/chroot_sources/foo.{binary,chroot}.gpg
 </para>
 </listitem>
 </varlistentry>
 
 </variablelist>
-</para>
-
 
 </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>:
+	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>
+<varlistentry>
+<term><command>apt</command></term>
+
 <listitem>
 <para>
- Specifying a missing package causes package installation to fail, which may not be the desired behaviour.
+	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.
+	This is the default setting for building images for Lenny or later.
 </para>
 </listitem>
 </varlistentry>
 
-<varlistentry><term><command>aptitude</command></term>
+<varlistentry>
+<term><command>aptitude</command></term>
+
 <listitem>
 <para>
- Specifying a missing package causes package installation to succeed, which may not be the desired behaviour.
+	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.
+	This is the default setting for building images for Etch.
 </para>
 </listitem>
 </varlistentry>
+
 </variablelist>
 
 </sect2>
@@ -138,126 +177,200 @@ You can also put the gpg-key used to sign the repository into config/chroot_sour
 <title>Installing additional packages</title>
 
 <para>
- &live-helper; has a number of mechanisms for indicating that additional packages should be installed, including:
+	&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>
+
+<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:
+	To install additional packages, simply add them to the
+	<command>LH_PACKAGES</command> variable in
+	<filename>config/chroot</filename>. For example:
 </para>
 
-<screen>
-LH_PACKAGES="package1 package2 package3 ... "
-</screen>
+<para>
+	<screen>LH_PACKAGES="package1 package2 package3 ... "</screen>
+</para>
 
 <para>
- You can also specify initial values on the command line:
+	You can also specify initial values on the command line:
 </para>
 
-<screen>
-$ lh_config --packages "package1 package2 package3"
-</screen>
+<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>
+	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.
+	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.
+	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>
+	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>
 
-<screen>
-LH_PACKAGES_LISTS="gnome"
-</screen>
+<para>
+	<screen>LH_PACKAGES_LISTS="gnome"</screen>
+</para>
 
-<para>Packages lists that are distributed with &live-helper; reside in view in the <command>/usr/share/live-helper/lists</command> directory.</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>.
+	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..
+	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_PACKAES_LISTS should only be used referencing packages lists included in live-helper (at <command>/usr/share/live-helper/lists/</command>.
- </para>
+<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>
 
-<screen>
-#include &lt;gnome&gt;
-iceweasel
-</screen>
+<para>
+	FIXME
+</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.
+	<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>
 
-<screen>
-#if ARCHITECTURE amd64
+<para>
+	FIXME
+</para>
+
+<para>
+	<screen>#if ARCHITECTURE amd64
 ia32-libs
-#endif
-</screen>
+#endif</screen>
+</para>
 
-<para>or if <command>LH_ARCHITECTURE</command> is set to <command>i386</command> or <command>amd64</command>:</para>
+<para>
+	or if <command>LH_ARCHITECTURE</command> is set to
+	<command>i386</command> or <command>amd64</command>:
+</para>
 
-<screen>
-#if ARCHITECTURE i386 amd64
+<para>
+	<screen>#if ARCHITECTURE i386 amd64
 memtest86+
-#endif
-</screen>
+#endif</screen>
+</para>
 
-<para>or if <command>LH_SECTIONS</command> contains either <command>contrib</command> or <command>non-free</command>:</para>
+<para>
+	or if <command>LH_SECTIONS</command> contains either
+	<command>contrib</command> or <command>non-free</command>:
+</para>
 
-<screen>
-#if SECTIONS contrib non-free
+<para>
+	<screen>#if SECTIONS contrib non-free
 vrms
-#endif
-</screen>
+#endif</screen>
+</para>
 
-<para>A conditional may surround an <command>#include</command> directive:</para>
+<para>
+	A conditional may surround an <command>#include</command> directive:
+</para>
 
-<screen>
-#if ARCHITECTURE amd64
+<para>
+	<screen>#if ARCHITECTURE amd64
 #include &lt;gnome-full&gt;
-#endif
-</screen>
+#endif</screen>
+</para>
 
 <para>
- Any &live-helper; configuration variable that begins with <command>LH_</command> can be tested in this way.
+	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.
+	The nesting of conditionals is not supported.
 </para>
 
 </sect4>
@@ -266,7 +379,11 @@ vrms
 
 <sect3 id="tasks">
 <title>Tasks</title>
-<para>FIXME</para>
+
+<para>
+	FIXME
+</para>
+
 </sect3>
 
 </sect2>
@@ -274,65 +391,156 @@ vrms
 <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>
+	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>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>
 
-<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>
+
+<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>
+<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>
+<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 is to use <command>dpkg-name</command>. FIXME</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>
 
-<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>
+
+<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
+	FIXME
 </para>
+
 <para>
- Unlike You must ensure that you specify the package elsewhere, see (FIXME)
+	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 package.
+	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 is available in two different repositories, APT will elect to install the package with a higher version number over one with the lower.
+	&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.
+	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
+	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.
+	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>
diff --git a/xml/chapters/installation.xml b/xml/chapters/installation.xml
index 3925576..da52952 100644
--- a/xml/chapters/installation.xml
+++ b/xml/chapters/installation.xml
@@ -109,7 +109,7 @@ $ dpkg-buildpackage -rfakeroot -b -uc -us
 <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. Assumed you have already created a configuration tree with <command>lh_config</command></para>
+<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>
@@ -117,7 +117,7 @@ $ dpkg-buildpackage -rfakeroot -b -uc -us
 <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 fro the binary stage:</para>
+<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>
diff --git a/xml/chapters/overview.xml b/xml/chapters/overview.xml
index 3464a79..1e157c2 100644
--- a/xml/chapters/overview.xml
+++ b/xml/chapters/overview.xml
@@ -1,130 +1,310 @@
 <?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 "../entities/common.ent" > %commondata;
+	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+	<!ENTITY % commondata SYSTEM "../entities/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>
+<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>
+	&live-helper; is a collection of scripts to build Debian Live systems.
+	These scripts are also referred to as "helpers".
+</para>
 
-<para>Many concepts are similar with the <command>debhelper</command> Debian package tools written by Joey Hess:</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 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>
+<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>
+<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>
+	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/foo</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>
+	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>
+	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>
+	&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>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>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>Please see <xref linkend="installation"/> for information on how to install &live-helper;.
+<para>
+	The remainder of this section discusses the three most important
+	helpers:
+</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>
+<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>
+<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. <xref linkend="lh_clean"/> for more information.</para></listitem>
+<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>
 
-<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>Issuing <filename>lh_config</filename> without any arguments creates a <command>config</command> subdirectory which it populates with some default settings:</para>
-<screen>
-$ lh_config
+<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 91k
--rw-r--r-- 1 user group 4.0k 2008-05-09 21:37 binary
-drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 binary_debian-installer
-drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 binary_grub
-drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 binary_local-debs
-drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 binary_local-hooks
-drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 binary_local-includes
-drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 binary_local-packageslists
-drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 binary_local-udebs
-drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 binary_rootfs
-drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 binary_syslinux
--rw-r--r-- 1 user group 1.7k 2008-05-09 21:37 bootstrap
--rw-r--r-- 1 user group 1.5k 2008-05-09 21:37 chroot
-drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 chroot_apt
-drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 chroot_local-hooks
-drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 chroot_local-includes
-drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 chroot_local-packages
-drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 chroot_local-packageslists
-drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 chroot_sources
--rw-r--r-- 1 user group 2.9k 2008-05-09 21:37 common
-drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 includes
--rw-r--r-- 1 user group  212 2008-05-09 21:37 source
-drwxr-xr-x 2 user group 4.1k 2008-05-09 21:37 templates
+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>
+	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 <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>
+	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>
 
-<screen>
-$ lh_config -p gnome
-</screen>
+<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>
+	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>
 
-<screen>
-$ lh_config --apt aptitude --binary-images net --hostname live-machine --username live-user ...
-</screen>
+<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 FIXME. Most options have a parallel with an "<command>LH_</command>" prefixed variable.</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>FIXME</para>
+<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.</para>
+<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.</para>
-<para>FIXME link to Kernel Handbook</para>
+
+<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>

-- 
live-manual