[SCM] live-manual branch, debian, updated. debian/2.0_a12-1-68-gf33a654

Sun Dec 12 18:07:36 UTC 2010

The following commit has been merged in the debian branch:
commit f33a654dd36da3d2fa5e7b633e21c7a2fa2636c2
Author: Ben Armstrong <synrg at debian.org>
Date:   Sun Dec 12 14:07:26 2010 -0400

    Fixing missing instructions to build live-config from source; unify with live-boot section.

diff --git a/manual/de/user_basics.ssi b/manual/de/user_basics.ssi
index b4e6373..e8e2cc6 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/de/user_basics.ssi
@@ -36,9 +36,7 @@ SquashFS compressed filesystem is used to minimize the Debian Live image
 size. Note that it is 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 is used (see persistence).
-
-% FIXME: <xref linkend="persistence"/>
+optional persistence is used (see {Persistence}#persistence).
 
 _* *{Bootloader}*: A small piece of code crafted to boot from the chosen
 media, possibly presenting a prompt or menu to allow selection of
@@ -299,7 +297,8 @@ bootloader.
 Here is an example for inspiration, written for the ISC DHCP server
 #{isc-dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;
 
-% FIXME
+% FIXME: bring up to date: base example on default isc-dhcp-server config
+file in Squeeze
 
 code{
 
diff --git a/manual/de/user_customization-runtime.ssi b/manual/de/user_customization-runtime.ssi
index afa9812..906b704 100644
--- a/manual/de/user_customization-runtime.ssi
+++ b/manual/de/user_customization-runtime.ssi
@@ -96,7 +96,7 @@ keyboard-variant=bepo keyboard-model=tm2030usb"
 
 }code
 
-2~ Persistence
+2~persistence Persistence
 
 A live cd paradigm is a pre-installed system which runs from read-only
 media, like a cdrom, where writes and modifications do not survive reboots
diff --git a/manual/de/user_installation.ssi b/manual/de/user_installation.ssi
index 19f04a4..f79c756 100644
--- a/manual/de/user_installation.ssi
+++ b/manual/de/user_installation.ssi
@@ -101,39 +101,33 @@ If you do not wish to build or install live-build from source, you can use
 snapshots. These are built automatically from the latest version in Git and
 are available on http://live.debian.net/debian/.
 
-2~ live-boot
+2~ live-boot and live-config
 
-*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.
+*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.
 
-% FIXME: we also need to mention live-config
+3~ From the Debian repository
 
-3~ Using a customized live-boot
+Both live-boot and live-config are available from the Debian repository as
+per {Installing live-build}#installing-live-build.
 
-% FIXME: should follow the structure for live-build above (i.e. "from
-source", not "customized" -- we should not get into customization now, but
-should reserve that discussion for later.
+3~ From source
 
-To modify the code you can follow the process below. Please ensure you are
-familiar with the terms mentioned in {Terms}#terms.
+To use the latest source from git, you can follow the process below. Please
+ensure you are familiar with the terms mentioned in {Terms}#terms.
 
-_* Checkout the live-boot source
+_* Checkout the live-boot and live-config source
 
 code{
 
-$ git clone git://live.debian.net/git/live-boot.git
+$ git clone git://live.debian.net/git/live-boot.git $ git clone
+git://live.debian.net/git/live-config.git
 
 }code
 
-_* Make changes to your local copy
-
-% FIXME: as indicated above, it's too early for this topic. Move to later in
-the manual.
-
-And beware that if you want to add your pre-init script in live-bottom, you
-should name it without dashes '-', e.g: call it "99new_feature" and not
-"99new-feature".
+Consult the live-boot and live-config man pages for details on customizing
+if that is your reason for building these packages from source.
 
-_* Build a live-boot .deb
+_* Build live-boot and live-config .deb files
 
 You must build either on your target distribution or in a chroot containing
 your target platform: this means if your target is Squeeze then you should
@@ -148,28 +142,31 @@ system distribution, you may build directly on the build system using
 
 code{
 
-$ cd live-boot $ dpkg-buildpackage -b -uc -us
+$ cd live-boot $ dpkg-buildpackage -b -uc -us $ cd ../live-config $
+dpkg-buildpackage -b -uc -us
 
 }code
 
-_* Use the generated live-boot .deb
+_* Use all generated .deb files
 
-As live-boot is installed by live-build system, installing the package in
-the host system is not sufficient: you should treat the generated .deb like
-another custom package. Please see {Customizing package
-installation}#customizing-package-installation for more information. You
-should pay particular attention to {Additional
+As live-boot and live-config are installed by live-build system, installing
+the packages in the host system is not sufficient: you should treat the
+generated .deb files like any other custom packages. Please see {Customizing
+package installation}#customizing-package-installation for more
+information. You should pay particular attention to {Additional
 repositories}#additional-repositories.
 
-3~ Using live-boot snapshots
+3~ From 'snapshots'
 
-You can let live-build automatically use the latest snapshot of live-boot by
-configuring a third-party repository in your live-build configuration
-directory. Assuming you have already created a configuration tree with #{lb
-config}#:
+You can let live-build automatically use the latest snapshots of live-boot
+and live-config by configuring a third-party repository in your live-build
+configuration directory. Assuming you have already created a configuration
+tree with #{lb config}#:
 
 code{
 
 lb config --repository live.debian.net
 
 }code
+
+
diff --git a/manual/en/user_installation.ssi b/manual/en/user_installation.ssi
index 818451e..548ec6e 100644
--- a/manual/en/user_installation.ssi
+++ b/manual/en/user_installation.ssi
@@ -96,33 +96,30 @@ code{
 
 If you do not wish to build or install live-build from source, you can use snapshots. These are built automatically from the latest version in Git and are available on http://live.debian.net/debian/.
 
-2~ live-boot
+2~ live-boot and live-config
 
-*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.
+*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.
 
-% FIXME: we also need to mention live-config
+3~ From the Debian repository
 
-3~ Using a customized live-boot
+Both live-boot and live-config are available from the Debian repository as per {Installing live-build}#installing-live-build.
 
-% FIXME: should follow the structure for live-build above (i.e. "from source", not "customized" -- we should not get into customization now, but should reserve that discussion for later.
+3~ From source
 
-To modify the code you can follow the process below. Please ensure you are familiar with the terms mentioned in {Terms}#terms.
+To use the latest source from git, you can follow the process below. Please ensure you are familiar with the terms mentioned in {Terms}#terms.
 
-_* Checkout the live-boot source
+_* Checkout the live-boot and live-config source
 
 code{
 
 $ git clone git://live.debian.net/git/live-boot.git
+$ git clone git://live.debian.net/git/live-config.git
 
 }code
 
-_* Make changes to your local copy
-
-% FIXME: as indicated above, it's too early for this topic. Move to later in the manual.
-
-And beware that if you want to add your pre-init script in live-bottom, you should name it without dashes '-', e.g: call it "99new_feature" and not "99new-feature".
+Consult the live-boot and live-config man pages for details on customizing if that is your reason for building these packages from source.
 
-_* Build a live-boot .deb
+_* Build live-boot and live-config .deb files
 
 You must build either on your target distribution or in a chroot containing your target platform: this means if your target is Squeeze then you should build against Squeeze.
 
@@ -132,19 +129,23 @@ code{
 
 $ cd live-boot
 $ dpkg-buildpackage -b -uc -us
+$ cd ../live-config
+$ dpkg-buildpackage -b -uc -us
 
 }code
 
-_* Use the generated live-boot .deb
+_* Use all generated .deb files
 
-As live-boot is installed by live-build system, installing the package in the host system is not sufficient: you should treat the generated .deb like another custom package. Please see {Customizing package installation}#customizing-package-installation for more information. You should pay particular attention to {Additional repositories}#additional-repositories.
+As live-boot and live-config are installed by live-build system, installing the packages in the host system is not sufficient: you should treat the generated .deb files like any other custom packages. Please see {Customizing package installation}#customizing-package-installation for more information. You should pay particular attention to {Additional repositories}#additional-repositories.
 
-3~ Using live-boot snapshots
+3~ From 'snapshots'
 
-You can let live-build automatically use the latest snapshot of live-boot by configuring a third-party repository in your live-build configuration directory. Assuming you have already created a configuration tree with #{lb config}#:
+You can let live-build automatically use the latest snapshots of live-boot and live-config by configuring a third-party repository in your live-build configuration directory. Assuming you have already created a configuration tree with #{lb config}#:
 
 code{
 
 lb config --repository live.debian.net
 
 }code
+
+
diff --git a/manual/fr/user_basics.ssi b/manual/fr/user_basics.ssi
index b4e6373..e8e2cc6 100644
--- a/manual/fr/user_basics.ssi
+++ b/manual/fr/user_basics.ssi
@@ -36,9 +36,7 @@ SquashFS compressed filesystem is used to minimize the Debian Live image
 size. Note that it is 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 is used (see persistence).
-
-% FIXME: <xref linkend="persistence"/>
+optional persistence is used (see {Persistence}#persistence).
 
 _* *{Bootloader}*: A small piece of code crafted to boot from the chosen
 media, possibly presenting a prompt or menu to allow selection of
@@ -299,7 +297,8 @@ bootloader.
 Here is an example for inspiration, written for the ISC DHCP server
 #{isc-dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;
 
-% FIXME
+% FIXME: bring up to date: base example on default isc-dhcp-server config
+file in Squeeze
 
 code{
 
diff --git a/manual/fr/user_customization-runtime.ssi b/manual/fr/user_customization-runtime.ssi
index afa9812..906b704 100644
--- a/manual/fr/user_customization-runtime.ssi
+++ b/manual/fr/user_customization-runtime.ssi
@@ -96,7 +96,7 @@ keyboard-variant=bepo keyboard-model=tm2030usb"
 
 }code
 
-2~ Persistence
+2~persistence Persistence
 
 A live cd paradigm is a pre-installed system which runs from read-only
 media, like a cdrom, where writes and modifications do not survive reboots
diff --git a/manual/fr/user_installation.ssi b/manual/fr/user_installation.ssi
index 19f04a4..f79c756 100644
--- a/manual/fr/user_installation.ssi
+++ b/manual/fr/user_installation.ssi
@@ -101,39 +101,33 @@ If you do not wish to build or install live-build from source, you can use
 snapshots. These are built automatically from the latest version in Git and
 are available on http://live.debian.net/debian/.
 
-2~ live-boot
+2~ live-boot and live-config
 
-*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.
+*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.
 
-% FIXME: we also need to mention live-config
+3~ From the Debian repository
 
-3~ Using a customized live-boot
+Both live-boot and live-config are available from the Debian repository as
+per {Installing live-build}#installing-live-build.
 
-% FIXME: should follow the structure for live-build above (i.e. "from
-source", not "customized" -- we should not get into customization now, but
-should reserve that discussion for later.
+3~ From source
 
-To modify the code you can follow the process below. Please ensure you are
-familiar with the terms mentioned in {Terms}#terms.
+To use the latest source from git, you can follow the process below. Please
+ensure you are familiar with the terms mentioned in {Terms}#terms.
 
-_* Checkout the live-boot source
+_* Checkout the live-boot and live-config source
 
 code{
 
-$ git clone git://live.debian.net/git/live-boot.git
+$ git clone git://live.debian.net/git/live-boot.git $ git clone
+git://live.debian.net/git/live-config.git
 
 }code
 
-_* Make changes to your local copy
-
-% FIXME: as indicated above, it's too early for this topic. Move to later in
-the manual.
-
-And beware that if you want to add your pre-init script in live-bottom, you
-should name it without dashes '-', e.g: call it "99new_feature" and not
-"99new-feature".
+Consult the live-boot and live-config man pages for details on customizing
+if that is your reason for building these packages from source.
 
-_* Build a live-boot .deb
+_* Build live-boot and live-config .deb files
 
 You must build either on your target distribution or in a chroot containing
 your target platform: this means if your target is Squeeze then you should
@@ -148,28 +142,31 @@ system distribution, you may build directly on the build system using
 
 code{
 
-$ cd live-boot $ dpkg-buildpackage -b -uc -us
+$ cd live-boot $ dpkg-buildpackage -b -uc -us $ cd ../live-config $
+dpkg-buildpackage -b -uc -us
 
 }code
 
-_* Use the generated live-boot .deb
+_* Use all generated .deb files
 
-As live-boot is installed by live-build system, installing the package in
-the host system is not sufficient: you should treat the generated .deb like
-another custom package. Please see {Customizing package
-installation}#customizing-package-installation for more information. You
-should pay particular attention to {Additional
+As live-boot and live-config are installed by live-build system, installing
+the packages in the host system is not sufficient: you should treat the
+generated .deb files like any other custom packages. Please see {Customizing
+package installation}#customizing-package-installation for more
+information. You should pay particular attention to {Additional
 repositories}#additional-repositories.
 
-3~ Using live-boot snapshots
+3~ From 'snapshots'
 
-You can let live-build automatically use the latest snapshot of live-boot by
-configuring a third-party repository in your live-build configuration
-directory. Assuming you have already created a configuration tree with #{lb
-config}#:
+You can let live-build automatically use the latest snapshots of live-boot
+and live-config by configuring a third-party repository in your live-build
+configuration directory. Assuming you have already created a configuration
+tree with #{lb config}#:
 
 code{
 
 lb config --repository live.debian.net
 
 }code
+
+
diff --git a/manual/it/user_basics.ssi b/manual/it/user_basics.ssi
index c0ade58..602ca2a 100644
--- a/manual/it/user_basics.ssi
+++ b/manual/it/user_basics.ssi
@@ -34,16 +34,12 @@ _* *{Initial RAM disk image (initrd)}*: un disco RAM creato per il boot di
 Linux, contenente i moduli potenzialmente necessari per montare l'immagine
 di sistema e alcuni script per farlo.
 
-_* *{Immagine di sistema}*: L'immagine del filesystem del sistema
-operativo. Normalmente è usato un file system compresso SquashFS, per
-minimizzare le dimensioni dell'immagine Debian Live. Si noti che è in sola
-lettura. Dunque, durante il boot il sistema Debian Live userà un disco RAM e
-il meccanismo 'unione' per attivare i file in scrittura all'interno del
-sistema in esecuzione. Ad ogni modo, tutte le modifiche verranno perse con
-lo spegnimento a meno che non si usi l'opzione persistenza (si veda la
-persistenza).
-
-% FIXME: <xref linkend="persistence"/>
+_* *{System image}*: The operating system's filesystem image. Usually, a
+SquashFS compressed filesystem is used to minimize the Debian Live image
+size. Note that it is 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 is used (see {Persistence}#persistence).
 
 _* *{Bootloader}*: una piccola porzione di codice predisposto per l'avvio
 dal supporto scelto, che presenta un prompt o un menu per la selezione di
@@ -312,7 +308,8 @@ del bootloader PXE.
 Ecco un esempio scritto per un server ISC DHCP #{isc-dhcp-server}# nel file
 di configurazione /etc/dhcp/dhcpd.conf;
 
-% FIXME
+% FIXME: bring up to date: base example on default isc-dhcp-server config
+file in Squeeze
 
 code{
 
diff --git a/manual/it/user_customization-runtime.ssi b/manual/it/user_customization-runtime.ssi
index afa9812..906b704 100644
--- a/manual/it/user_customization-runtime.ssi
+++ b/manual/it/user_customization-runtime.ssi
@@ -96,7 +96,7 @@ keyboard-variant=bepo keyboard-model=tm2030usb"
 
 }code
 
-2~ Persistence
+2~persistence Persistence
 
 A live cd paradigm is a pre-installed system which runs from read-only
 media, like a cdrom, where writes and modifications do not survive reboots
diff --git a/manual/it/user_installation.ssi b/manual/it/user_installation.ssi
index f2a2a6a..1431072 100644
--- a/manual/it/user_installation.ssi
+++ b/manual/it/user_installation.ssi
@@ -104,40 +104,33 @@ Se non si desidera generare o installare live-build da sorgenti, si può
 usare le istantanee. Sono costruite automaticamente dall'ultima versione
 presente su Git e disponibili su http://live.debian.net/debian/.
 
-2~ live-boot
+2~ live-boot and live-config
 
-*{Nota:}* non è necessario installare live-boot sul proprio sistema per creare sistemi Debian Live personalizzati. Tuttavia, farlo non nuoce.
+*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.
 
-% FIXME: we also need to mention live-config
+3~ Dal repository Debian
 
-3~ Usare un live-boot personalizzato
+Both live-boot and live-config are available from the Debian repository as
+per {Installing live-build}#installing-live-build.
 
-% FIXME: should follow the structure for live-build above (i.e. "from
-source", not "customized" -- we should not get into customization now, but
-should reserve that discussion for later.
+3~ Da sorgenti
 
-Per modificare il codice si può seguire il procedimento
-seguente. Assicurarsi di conoscere i termini menzionati in
-{Glossario}#terms.
+To use the latest source from git, you can follow the process below. Please
+ensure you are familiar with the terms mentioned in {Terms}#terms.
 
-_* Scaricare i sorgenti di live-boot
+_* Checkout the live-boot and live-config source
 
 code{
 
-$ git clone git://live.debian.net/git/live-boot.git
+$ git clone git://live.debian.net/git/live-boot.git $ git clone
+git://live.debian.net/git/live-config.git
 
 }code
 
-_* Eseguire le modifiche sulla copia locale
-
-% FIXME: as indicated above, it's too early for this topic. Move to later in
-the manual.
-
-E fare attenzione che se si vuole aggiungere il proprio script di pre-init
-in live-bottom, si dovrebbe dargli un nome senza trattini '-', ad esempio:
-chiamarlo "99new_feature" e non "99new-feature".
+Consult the live-boot and live-config man pages for details on customizing
+if that is your reason for building these packages from source.
 
-_* Costruire un .deb di live-boot
+_* Build live-boot and live-config .deb files
 
 You must build either on your target distribution or in a chroot containing
 your target platform: this means if your target is Squeeze then you should
@@ -153,28 +146,31 @@ pacchetto /{dpkg-dev}/):
 
 code{
 
-$ cd live-boot $ dpkg-buildpackage -b -uc -us
+$ cd live-boot $ dpkg-buildpackage -b -uc -us $ cd ../live-config $
+dpkg-buildpackage -b -uc -us
 
 }code
 
-_* Usare il .deb di live-boot generato
+_* Use all generated .deb files
 
-Siccome live-boot è installato dal sistema live-build, installare il
-pacchetto nel sistema host non è sufficiente: occorre trattare il .deb
-generato come un altro pacchetto su misura. Si veda {Customizing package
-installation}#customizing-package-installation per maggiori
-informazioni. Fare particolare attenzione a {Additional
+As live-boot and live-config are installed by live-build system, installing
+the packages in the host system is not sufficient: you should treat the
+generated .deb files like any other custom packages. Please see {Customizing
+package installation}#customizing-package-installation for more
+information. You should pay particular attention to {Additional
 repositories}#additional-repositories.
 
-3~ Usare le istantanee di live-boot
+3~ Da 'istantanee'
 
-Si può lasciare che live-build usi automaticamente l'ultima istantanea di
-live-boot configurando un repository esterno nella directory di
-configurazione di live-build. Assumendo che si sia già creato un albero di
-configurazione con #{lb config}#:
+You can let live-build automatically use the latest snapshots of live-boot
+and live-config by configuring a third-party repository in your live-build
+configuration directory. Assuming you have already created a configuration
+tree with #{lb config}#:
 
 code{
 
 lb config --repository live.debian.net
 
 }code
+
+
diff --git a/manual/po/de/user_basics.ssi.po b/manual/po/de/user_basics.ssi.po
index db4f8ce..6b3c5e6 100644
--- a/manual/po/de/user_basics.ssi.po
+++ b/manual/po/de/user_basics.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-28 07:16-0400\n"
+"POT-Creation-Date: 2010-12-12 14:05-0400\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,132 +18,121 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
-#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
-#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
-#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
-#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
-#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
-#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
-#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
-#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
-#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
-#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
-#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
-#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
-#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
-#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
-#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
-#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
-#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
-#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/about_manual.ssi:170 en/project_bugs.ssi:58
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
+#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
+#: en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:142
+#: en/user_customization-packages.ssi:155
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:290
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:312
+#: en/user_customization-packages.ssi:330 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:50 en/user_customization-runtime.ssi:58
+#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
+#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
+#: en/user_examples.ssi:256 en/user_examples.ssi:271
 #: en/user_installation.ssi:38 en/user_installation.ssi:46
 #: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
-#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
-#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
-#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
-#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
-#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
-#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
-#: en/user_customization-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
+#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
+#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
+#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
+#: en/user_customization-packages.ssi:98
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:161
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
-#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
-#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
-#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
-#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
-#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:294
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:343 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
+#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
+#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
+#: en/user_examples.ssi:267 en/user_examples.ssi:285
 #: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:150
+#: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr ""
@@ -217,16 +206,11 @@ msgid ""
 "size. Note that it is 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 is used (see persistence)."
+"optional persistence is used (see {Persistence}#persistence)."
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:20
-msgid "% FIXME: <xref linkend=\"persistence\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:22
 msgid ""
 "_* *{Bootloader}*: A small piece of code crafted to boot from the chosen "
 "media, possibly presenting a prompt or menu to allow selection of options/"
@@ -240,7 +224,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
 msgid ""
 "You can use live-build to build the system image from your specifications, "
 "set up a Linux kernel, its initrd, and a bootloader to run them, all in one "
@@ -248,12 +232,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
 msgid "2~ First steps: building an ISO image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
 msgid ""
 "The following sequence of live-build commands will create a basic ISO hybrid "
 "image containing just the Debian standard system without X.org. It is "
@@ -263,93 +247,93 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
 msgid ""
 "First, we run the #{lb config}# command which will create a \"config/\" "
 "hierarchy in the current directory for use by other commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:32
 msgid "$ lb config"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:38
+#: en/user_basics.ssi:36
 msgid ""
 "By passing no parameters to #{lb config}#, we indicated that we wish to use "
 "the defaults (see {The lb config command}#lb-config)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:40
+#: en/user_basics.ssi:38
 msgid ""
 "Now that we have a \"config/\" hierarchy, we may build the image with the lb "
 "build command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
-#: en/user_examples.ssi:106 en/user_examples.ssi:153
+#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_examples.ssi:109 en/user_examples.ssi:156
 msgid "# lb build"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:48
+#: en/user_basics.ssi:46
 msgid ""
 "This process can take a while, depending on the speed of your network "
 "connection (see {The lb build command}#lb-build)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:50
+#: en/user_basics.ssi:48
 msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:52
+#: en/user_basics.ssi:50
 msgid "Testing an ISO is simple:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:56 en/user_basics.ssi:144
+#: en/user_basics.ssi:54 en/user_basics.ssi:142
 msgid "# apt-get install qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:58
+#: en/user_basics.ssi:56
 msgid "$ qemu -cdrom binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:62
+#: en/user_basics.ssi:60
 msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:64
+#: en/user_basics.ssi:62
 msgid "In order to test the ISO with virtualbox-ose:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:68
+#: en/user_basics.ssi:66
 msgid "# apt-get install virtualbox-ose virtualbox-ose-dkms"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:70
+#: en/user_basics.ssi:68
 msgid "$ virtualbox"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:74
+#: en/user_basics.ssi:72
 msgid ""
 "Create a new virtual machine, change the storage settings to use binary.iso "
 "as the CD/DVD device, and start the machine."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:76
+#: en/user_basics.ssi:74
 msgid ""
 "Note: For live systems containing X.org that you want to test with "
 "virtualbox-ose, you may wish to include the VirtualBox X.org driver package, "
@@ -358,37 +342,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:80
+#: en/user_basics.ssi:78
 msgid "# lb config --packages virtualbox-ose-guest-x11"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:84
+#: en/user_basics.ssi:82
 msgid "3~burning-iso-image Burning an ISO image to a physical medium"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:86
+#: en/user_basics.ssi:84
 msgid "Burning an ISO image is easy:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:88
 msgid "# apt-get install wodim"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:92
+#: en/user_basics.ssi:90
 msgid "$ wodim binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:94
 msgid "2~ Building a USB/HDD image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:98
+#: en/user_basics.ssi:96
 msgid ""
 "The following sequence of commands will create a basic USB/HDD image "
 "containing just the Debian standard system without X.org. It is suitable for "
@@ -400,7 +384,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:100
+#: en/user_basics.ssi:98
 msgid ""
 "Note: if you created an ISO image with the previous example, you will need "
 "to clean up your working directory with the #{lb clean}# command (see {The "
@@ -408,34 +392,34 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:104 en/user_basics.ssi:186
+#: en/user_basics.ssi:102 en/user_basics.ssi:184
 msgid "$ lb clean --binary"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:108
+#: en/user_basics.ssi:106
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the #{config/}"
 "# hierarchy to create a USB/HDD image type:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:112
+#: en/user_basics.ssi:110
 msgid "$ lb config -b usb-hdd"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:116
+#: en/user_basics.ssi:114
 msgid "Now build the image with the #{lb build} command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:124
+#: en/user_basics.ssi:122
 msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:126
+#: en/user_basics.ssi:124
 msgid ""
 "The generated binary image contains a VFAT partition and the syslinux "
 "bootloader, ready to be directly written on a USB stick. Plug in a USB stick "
@@ -443,12 +427,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:130
+#: en/user_basics.ssi:128
 msgid "$ dd if=binary.img of=${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:134
+#: en/user_basics.ssi:132
 msgid ""
 "where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
 "a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -457,35 +441,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:136
+#: en/user_basics.ssi:134
 #, no-wrap
 msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:136
 msgid ""
 "Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
 "type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:140
+#: en/user_basics.ssi:138
 msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:146
+#: en/user_basics.ssi:144
 msgid "$ qemu -hda binary.img"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:148
 msgid "3~ Using the space left on a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:152
+#: en/user_basics.ssi:150
 msgid ""
 "If you want to use the remaining free space after you have installed the "
 "binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -494,45 +478,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:156
+#: en/user_basics.ssi:154
 msgid "# gparted ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:160
+#: en/user_basics.ssi:158
 msgid ""
 "After the creation of the partition, you have to create a filesystem on it. "
 "One possible choice would be ext4."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:164
+#: en/user_basics.ssi:162
 msgid "# mkfs.ext4 ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:168
+#: en/user_basics.ssi:166
 msgid "If you want to use this data partition with Windows, use FAT32."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:172
+#: en/user_basics.ssi:170
 msgid "# mkfs.vfat -F 32"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:176
+#: en/user_basics.ssi:174
 #, no-wrap
 msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:176
 msgid "2~building-netboot-image Building a netboot image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:178
 msgid ""
 "The following sequence of commands will create a basic netboot image "
 "containing the Debian standard system without X.org. It is suitable for "
@@ -540,28 +524,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:182
+#: en/user_basics.ssi:180
 msgid ""
 "Note: if you performed any previous examples, you will need to clean up your "
 "working directory with the #{lb clean}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:190
+#: en/user_basics.ssi:188
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the \"config/"
 "\" hierarchy to create our netboot image:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:194
+#: en/user_basics.ssi:192
 msgid ""
 "$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
 "\"192.168.0.1\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:198
+#: en/user_basics.ssi:196
 msgid ""
 "In contrast with the ISO and USB/HDD images, netbooting does not support "
 "serving a filesystem image with the client, so the files must be served via "
@@ -571,12 +555,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:200
+#: en/user_basics.ssi:198
 msgid "Now build the image with the #{lb build}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:206
 msgid ""
 "In a network boot, the client runs a small piece of software which usually "
 "resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -587,7 +571,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:208
 msgid ""
 "For example, if you unpack the generated binary-net.tar.gz archive in the /"
 "srv/debian-live directory, you'll find the filesystem image in live/"
@@ -596,17 +580,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:210
 msgid "We must now configure three services on the server to enable netboot."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:212
 msgid "3~ DHCP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:214
 msgid ""
 "We must configure our network's DHCP server to be sure to give an IP address "
 "to the netbooting client system, and to advertise the location of the PXE "
@@ -614,25 +598,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:216
 msgid ""
 "Here is an example for inspiration, written for the ISC DHCP server #{isc-"
 "dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:220
-msgid "% FIXME"
+#: en/user_basics.ssi:218
+msgid ""
+"% FIXME: bring up to date: base example on default isc-dhcp-server config "
+"file in Squeeze"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:224
+#: en/user_basics.ssi:222
 #, no-wrap
 msgid "subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:227
+#: en/user_basics.ssi:225
 #, no-wrap
 msgid ""
 "  # IP addresses available for guests\n"
@@ -640,7 +626,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:230
+#: en/user_basics.ssi:228
 #, no-wrap
 msgid ""
 "  # allow booting from the net\n"
@@ -648,7 +634,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:235
+#: en/user_basics.ssi:233
 #, no-wrap
 msgid ""
 "  # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -658,7 +644,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:239
+#: en/user_basics.ssi:237
 #, no-wrap
 msgid ""
 "  # net boot configuration for guests with a PXE client:\n"
@@ -667,7 +653,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:242
+#: en/user_basics.ssi:240
 #, no-wrap
 msgid ""
 "    # PXE bootloader (first program to be loaded, by TFTP)\n"
@@ -675,7 +661,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:243
 #, no-wrap
 msgid ""
 "  }\n"
@@ -683,17 +669,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:247
 msgid "3~ TFTP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:249
 msgid "This serves the kernel and initial ramdisk to the system at run time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:253
+#: en/user_basics.ssi:251
 msgid ""
 "You should install the tftpd-hpa package. It can serve all files contained "
 "inside a root directory, usually /srv/tftp. To let it serve files inside /"
@@ -701,22 +687,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:257
+#: en/user_basics.ssi:255
 msgid "dpkg-reconfigure -plow tftpd-hpa"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:259
 msgid "and fill in the new tftp server directory when being asked about it."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:261
 msgid "3~ NFS server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:263
 msgid ""
 "Once the guest computer has downloaded and booted a Linux kernel and loaded "
 "its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -724,35 +710,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:265
 msgid "You need to install the nfs-kernel-server package."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:267
 msgid ""
 "Then, make the filesystem image available through NFS by adding a line like "
 "the following to /etc/exports:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:273
+#: en/user_basics.ssi:271
 msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:277
+#: en/user_basics.ssi:275
 msgid ""
 "and tell the NFS server about this new export with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:281
+#: en/user_basics.ssi:279
 msgid "# exportfs -rv"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:283
 msgid ""
 "Setting up these three services can be a little tricky. You might need some "
 "patience to get all of them working together. The Debian Installer Manual's "
@@ -761,40 +747,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:285
 msgid "3~ Netboot testing HowTo"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:287
 msgid ""
 "Netboot image creation is made easy with live-build magic, but testing the "
 "images on physical machines can be really time consuming."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:289
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:291
 msgid "3~ Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:293
 msgid "_* Install qemu, bridge-utils, sudo."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:295
 msgid "Edit /etc/qemu-ifup:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:308
+#: en/user_basics.ssi:306
 msgid ""
 "#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
 "\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -803,62 +789,62 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:310
 msgid "Get, or build a grub-floppy-netboot (in the svn)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:312
 msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:314
 msgid "3~ VMWare Player"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:316
 msgid "_* Install VMWare Player (\"free as in beer\" edition)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:318
 msgid ""
 "_* Create a PXETester directory, and create a text file called pxe.vwx inside"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:320
 msgid "_* Paste this text inside:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:330
+#: en/user_basics.ssi:328
 msgid ""
 "#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
 "\"512\" MemAllowAutoScaleDown = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:336
+#: en/user_basics.ssi:334
 msgid ""
 "ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
 "\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:339
+#: en/user_basics.ssi:337
 msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:342
+#: en/user_basics.ssi:340
 msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:347
+#: en/user_basics.ssi:345
 msgid ""
 "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 "
@@ -866,19 +852,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:349
 msgid ""
 "_* You can play with this configuration file (i.e. change memory limit to "
 "256)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:353
+#: en/user_basics.ssi:351
 msgid ""
 "_* Double click on this file (or run VMWare player and select this file)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:354
+#: en/user_basics.ssi:352
 msgid "_* When running just press space if that strange question comes up..."
 msgstr ""
diff --git a/manual/po/de/user_customization-runtime.ssi.po b/manual/po/de/user_customization-runtime.ssi.po
index ff460ef..e1b6037 100644
--- a/manual/po/de/user_customization-runtime.ssi.po
+++ b/manual/po/de/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-06 17:29-0400\n"
+"POT-Creation-Date: 2010-12-12 14:05-0400\n"
 "PO-Revision-Date: 2010-11-30 11:40+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -20,32 +20,22 @@ msgstr ""
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
-#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
-#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
-#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
-#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
-#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
-#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/about_manual.ssi:170 en/project_bugs.ssi:58
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
-#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
-#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
 #: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
 #: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
@@ -72,12 +62,14 @@ msgstr ""
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
 #: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:132
-#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
+#: en/user_examples.ssi:256 en/user_examples.ssi:271
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -89,32 +81,22 @@ msgstr ""
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
 #: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/other_faq.ssi:37 en/other_faq.ssi:46
-#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
-#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
-#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
-#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
-#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
-#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/about_manual.ssi:174 en/project_bugs.ssi:62
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
-#: en/user_customization-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
+#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
+#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
 #: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
@@ -140,12 +122,14 @@ msgstr ""
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
 #: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:118 en/user_installation.ssi:137
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
+#: en/user_examples.ssi:267 en/user_examples.ssi:285
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:150
+#: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -309,7 +293,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:72
-msgid "2~ Persistence"
+msgid "2~persistence Persistence"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/user_installation.ssi.po b/manual/po/de/user_installation.ssi.po
index 6c53095..d90cf41 100644
--- a/manual/po/de/user_installation.ssi.po
+++ b/manual/po/de/user_installation.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-11 22:46+0100\n"
+"POT-Creation-Date: 2010-12-12 14:05-0400\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -26,14 +26,14 @@ msgstr ""
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
-#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
-#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
 #: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
 #: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -68,7 +68,7 @@ msgstr ""
 #: en/user_installation.ssi:56 en/user_installation.ssi:64
 #: en/user_installation.ssi:74 en/user_installation.ssi:82
 #: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:132 en/user_installation.ssi:147
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
 #: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
@@ -87,14 +87,14 @@ msgstr ""
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
+#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
 #: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
 #: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -127,8 +127,8 @@ msgstr ""
 #: en/user_installation.ssi:42 en/user_installation.ssi:50
 #: en/user_installation.ssi:60 en/user_installation.ssi:70
 #: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:118
-#: en/user_installation.ssi:137 en/user_installation.ssi:150
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:150
 #: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
@@ -222,7 +222,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:34
+#: en/user_installation.ssi:34 en/user_installation.ssi:104
 msgid "3~ From the Debian repository"
 msgstr ""
 
@@ -247,7 +247,7 @@ msgid "# aptitude install live-build"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:52
+#: en/user_installation.ssi:52 en/user_installation.ssi:108
 msgid "3~ From source"
 msgstr ""
 
@@ -307,7 +307,7 @@ msgid "# make uninstall"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:96
+#: en/user_installation.ssi:96 en/user_installation.ssi:142
 msgid "3~ From 'snapshots'"
 msgstr ""
 
@@ -321,77 +321,61 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:100
-msgid "2~ live-boot"
+msgid "2~ live-boot and live-config"
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:102
 #, no-wrap
-msgid "*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:104
-msgid "% FIXME: we also need to mention live-config"
+msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:106
-msgid "3~ Using a customized live-boot"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:108
 msgid ""
-"% FIXME: should follow the structure for live-build above (i.e. \"from source"
-"\", not \"customized\" -- we should not get into customization now, but "
-"should reserve that discussion for later."
+"Both live-boot and live-config are available from the Debian repository as "
+"per {Installing live-build}#installing-live-build."
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:110
 msgid ""
-"To modify the code you can follow the process below. Please ensure you are "
-"familiar with the terms mentioned in {Terms}#terms."
+"To use the latest source from git, you can follow the process below. Please "
+"ensure you are familiar with the terms mentioned in {Terms}#terms."
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:112
-msgid "_* Checkout the live-boot source"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:116
-msgid "$ git clone git://live.debian.net/git/live-boot.git"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:120
-msgid "_* Make changes to your local copy"
+msgid "_* Checkout the live-boot and live-config source"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:122
+#: en/user_installation.ssi:117
+#, fuzzy
+#| msgid ""
+#| "Git: <a href=\"git://live.debian.net/git/live-manual.git"
+#| "\"><small><tt>git://live.debian.net/git/live-manual.git</tt></small></a>"
 msgid ""
-"% FIXME: as indicated above, it's too early for this topic. Move to later in "
-"the manual."
+"$ git clone git://live.debian.net/git/live-boot.git $ git clone git://live."
+"debian.net/git/live-config.git"
 msgstr ""
+"Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
+"live.debian.net/git/live-manual.git</tt></small></a>"
 
 #. type: Plain text
-#: en/user_installation.ssi:124
+#: en/user_installation.ssi:121
 msgid ""
-"And beware that if you want to add your pre-init script in live-bottom, you "
-"should name it without dashes '-', e.g: call it \"99new_feature\" and not "
-"\"99new-feature\"."
+"Consult the live-boot and live-config man pages for details on customizing "
+"if that is your reason for building these packages from source."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:126
-msgid "_* Build a live-boot .deb"
+#: en/user_installation.ssi:123
+msgid "_* Build live-boot and live-config .deb files"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:128
+#: en/user_installation.ssi:125
 msgid ""
 "You must build either on your target distribution or in a chroot containing "
 "your target platform: this means if your target is Squeeze then you should "
@@ -399,7 +383,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:130
+#: en/user_installation.ssi:127
 msgid ""
 "Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
 "build #{live-boot}# for a target distribution that differs from your build "
@@ -410,40 +394,38 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:135
-msgid "$ cd live-boot $ dpkg-buildpackage -b -uc -us"
+#: en/user_installation.ssi:134
+msgid ""
+"$ cd live-boot $ dpkg-buildpackage -b -uc -us $ cd ../live-config $ dpkg-"
+"buildpackage -b -uc -us"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:139
-msgid "_* Use the generated live-boot .deb"
+#: en/user_installation.ssi:138
+msgid "_* Use all generated .deb files"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:141
+#: en/user_installation.ssi:140
 msgid ""
-"As live-boot is installed by live-build system, installing the package in "
-"the host system is not sufficient: you should treat the generated .deb like "
-"another custom package. Please see {Customizing package installation}"
-"#customizing-package-installation for more information. You should pay "
-"particular attention to {Additional repositories}#additional-repositories."
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:143
-msgid "3~ Using live-boot snapshots"
+"As live-boot and live-config are installed by live-build system, installing "
+"the packages in the host system is not sufficient: you should treat the "
+"generated .deb files like any other custom packages. Please see {Customizing "
+"package installation}#customizing-package-installation for more information. "
+"You should pay particular attention to {Additional repositories}#additional-"
+"repositories."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:145
+#: en/user_installation.ssi:144
 msgid ""
-"You can let live-build automatically use the latest snapshot of live-boot by "
-"configuring a third-party repository in your live-build configuration "
-"directory. Assuming you have already created a configuration tree with #{lb "
-"config}#:"
+"You can let live-build automatically use the latest snapshots of live-boot "
+"and live-config by configuring a third-party repository in your live-build "
+"configuration directory. Assuming you have already created a configuration "
+"tree with #{lb config}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:149
+#: en/user_installation.ssi:148
 msgid "lb config --repository live.debian.net"
 msgstr ""
diff --git a/manual/po/fr/user_basics.ssi.po b/manual/po/fr/user_basics.ssi.po
index 0aba383..f76b975 100644
--- a/manual/po/fr/user_basics.ssi.po
+++ b/manual/po/fr/user_basics.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-28 07:16-0400\n"
+"POT-Creation-Date: 2010-12-12 14:05-0400\n"
 "PO-Revision-Date: 2010-10-20 06:53-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,132 +18,121 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
-#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
-#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
-#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
-#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
-#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
-#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
-#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
-#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
-#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
-#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
-#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
-#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
-#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
-#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
-#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
-#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
-#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
-#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/about_manual.ssi:170 en/project_bugs.ssi:58
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
+#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
+#: en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:142
+#: en/user_customization-packages.ssi:155
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:290
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:312
+#: en/user_customization-packages.ssi:330 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:50 en/user_customization-runtime.ssi:58
+#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
+#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
+#: en/user_examples.ssi:256 en/user_examples.ssi:271
 #: en/user_installation.ssi:38 en/user_installation.ssi:46
 #: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
-#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
-#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
-#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
-#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
-#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
-#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
-#: en/user_customization-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
+#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
+#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
+#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
+#: en/user_customization-packages.ssi:98
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:161
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
-#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
-#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
-#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
-#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
-#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:294
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:343 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
+#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
+#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
+#: en/user_examples.ssi:267 en/user_examples.ssi:285
 #: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:150
+#: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr "}code"
@@ -217,16 +206,11 @@ msgid ""
 "size. Note that it is 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 is used (see persistence)."
+"optional persistence is used (see {Persistence}#persistence)."
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:20
-msgid "% FIXME: <xref linkend=\"persistence\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:22
 msgid ""
 "_* *{Bootloader}*: A small piece of code crafted to boot from the chosen "
 "media, possibly presenting a prompt or menu to allow selection of options/"
@@ -240,7 +224,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
 msgid ""
 "You can use live-build to build the system image from your specifications, "
 "set up a Linux kernel, its initrd, and a bootloader to run them, all in one "
@@ -248,12 +232,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
 msgid "2~ First steps: building an ISO image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
 msgid ""
 "The following sequence of live-build commands will create a basic ISO hybrid "
 "image containing just the Debian standard system without X.org. It is "
@@ -263,93 +247,93 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
 msgid ""
 "First, we run the #{lb config}# command which will create a \"config/\" "
 "hierarchy in the current directory for use by other commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:32
 msgid "$ lb config"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:38
+#: en/user_basics.ssi:36
 msgid ""
 "By passing no parameters to #{lb config}#, we indicated that we wish to use "
 "the defaults (see {The lb config command}#lb-config)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:40
+#: en/user_basics.ssi:38
 msgid ""
 "Now that we have a \"config/\" hierarchy, we may build the image with the lb "
 "build command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
-#: en/user_examples.ssi:106 en/user_examples.ssi:153
+#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_examples.ssi:109 en/user_examples.ssi:156
 msgid "# lb build"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:48
+#: en/user_basics.ssi:46
 msgid ""
 "This process can take a while, depending on the speed of your network "
 "connection (see {The lb build command}#lb-build)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:50
+#: en/user_basics.ssi:48
 msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:52
+#: en/user_basics.ssi:50
 msgid "Testing an ISO is simple:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:56 en/user_basics.ssi:144
+#: en/user_basics.ssi:54 en/user_basics.ssi:142
 msgid "# apt-get install qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:58
+#: en/user_basics.ssi:56
 msgid "$ qemu -cdrom binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:62
+#: en/user_basics.ssi:60
 msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:64
+#: en/user_basics.ssi:62
 msgid "In order to test the ISO with virtualbox-ose:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:68
+#: en/user_basics.ssi:66
 msgid "# apt-get install virtualbox-ose virtualbox-ose-dkms"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:70
+#: en/user_basics.ssi:68
 msgid "$ virtualbox"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:74
+#: en/user_basics.ssi:72
 msgid ""
 "Create a new virtual machine, change the storage settings to use binary.iso "
 "as the CD/DVD device, and start the machine."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:76
+#: en/user_basics.ssi:74
 msgid ""
 "Note: For live systems containing X.org that you want to test with "
 "virtualbox-ose, you may wish to include the VirtualBox X.org driver package, "
@@ -358,37 +342,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:80
+#: en/user_basics.ssi:78
 msgid "# lb config --packages virtualbox-ose-guest-x11"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:84
+#: en/user_basics.ssi:82
 msgid "3~burning-iso-image Burning an ISO image to a physical medium"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:86
+#: en/user_basics.ssi:84
 msgid "Burning an ISO image is easy:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:88
 msgid "# apt-get install wodim"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:92
+#: en/user_basics.ssi:90
 msgid "$ wodim binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:94
 msgid "2~ Building a USB/HDD image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:98
+#: en/user_basics.ssi:96
 msgid ""
 "The following sequence of commands will create a basic USB/HDD image "
 "containing just the Debian standard system without X.org. It is suitable for "
@@ -400,7 +384,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:100
+#: en/user_basics.ssi:98
 msgid ""
 "Note: if you created an ISO image with the previous example, you will need "
 "to clean up your working directory with the #{lb clean}# command (see {The "
@@ -408,34 +392,34 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:104 en/user_basics.ssi:186
+#: en/user_basics.ssi:102 en/user_basics.ssi:184
 msgid "$ lb clean --binary"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:108
+#: en/user_basics.ssi:106
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the #{config/}"
 "# hierarchy to create a USB/HDD image type:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:112
+#: en/user_basics.ssi:110
 msgid "$ lb config -b usb-hdd"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:116
+#: en/user_basics.ssi:114
 msgid "Now build the image with the #{lb build} command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:124
+#: en/user_basics.ssi:122
 msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:126
+#: en/user_basics.ssi:124
 msgid ""
 "The generated binary image contains a VFAT partition and the syslinux "
 "bootloader, ready to be directly written on a USB stick. Plug in a USB stick "
@@ -443,12 +427,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:130
+#: en/user_basics.ssi:128
 msgid "$ dd if=binary.img of=${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:134
+#: en/user_basics.ssi:132
 msgid ""
 "where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
 "a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -457,35 +441,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:136
+#: en/user_basics.ssi:134
 #, no-wrap
 msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:136
 msgid ""
 "Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
 "type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:140
+#: en/user_basics.ssi:138
 msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:146
+#: en/user_basics.ssi:144
 msgid "$ qemu -hda binary.img"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:148
 msgid "3~ Using the space left on a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:152
+#: en/user_basics.ssi:150
 msgid ""
 "If you want to use the remaining free space after you have installed the "
 "binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -494,45 +478,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:156
+#: en/user_basics.ssi:154
 msgid "# gparted ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:160
+#: en/user_basics.ssi:158
 msgid ""
 "After the creation of the partition, you have to create a filesystem on it. "
 "One possible choice would be ext4."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:164
+#: en/user_basics.ssi:162
 msgid "# mkfs.ext4 ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:168
+#: en/user_basics.ssi:166
 msgid "If you want to use this data partition with Windows, use FAT32."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:172
+#: en/user_basics.ssi:170
 msgid "# mkfs.vfat -F 32"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:176
+#: en/user_basics.ssi:174
 #, no-wrap
 msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:176
 msgid "2~building-netboot-image Building a netboot image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:178
 msgid ""
 "The following sequence of commands will create a basic netboot image "
 "containing the Debian standard system without X.org. It is suitable for "
@@ -540,28 +524,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:182
+#: en/user_basics.ssi:180
 msgid ""
 "Note: if you performed any previous examples, you will need to clean up your "
 "working directory with the #{lb clean}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:190
+#: en/user_basics.ssi:188
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the \"config/"
 "\" hierarchy to create our netboot image:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:194
+#: en/user_basics.ssi:192
 msgid ""
 "$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
 "\"192.168.0.1\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:198
+#: en/user_basics.ssi:196
 msgid ""
 "In contrast with the ISO and USB/HDD images, netbooting does not support "
 "serving a filesystem image with the client, so the files must be served via "
@@ -571,12 +555,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:200
+#: en/user_basics.ssi:198
 msgid "Now build the image with the #{lb build}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:206
 msgid ""
 "In a network boot, the client runs a small piece of software which usually "
 "resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -587,7 +571,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:208
 msgid ""
 "For example, if you unpack the generated binary-net.tar.gz archive in the /"
 "srv/debian-live directory, you'll find the filesystem image in live/"
@@ -596,17 +580,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:210
 msgid "We must now configure three services on the server to enable netboot."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:212
 msgid "3~ DHCP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:214
 msgid ""
 "We must configure our network's DHCP server to be sure to give an IP address "
 "to the netbooting client system, and to advertise the location of the PXE "
@@ -614,25 +598,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:216
 msgid ""
 "Here is an example for inspiration, written for the ISC DHCP server #{isc-"
 "dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:220
-msgid "% FIXME"
+#: en/user_basics.ssi:218
+msgid ""
+"% FIXME: bring up to date: base example on default isc-dhcp-server config "
+"file in Squeeze"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:224
+#: en/user_basics.ssi:222
 #, no-wrap
 msgid "subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:227
+#: en/user_basics.ssi:225
 #, no-wrap
 msgid ""
 "  # IP addresses available for guests\n"
@@ -640,7 +626,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:230
+#: en/user_basics.ssi:228
 #, no-wrap
 msgid ""
 "  # allow booting from the net\n"
@@ -648,7 +634,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:235
+#: en/user_basics.ssi:233
 #, no-wrap
 msgid ""
 "  # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -658,7 +644,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:239
+#: en/user_basics.ssi:237
 #, no-wrap
 msgid ""
 "  # net boot configuration for guests with a PXE client:\n"
@@ -667,7 +653,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:242
+#: en/user_basics.ssi:240
 #, no-wrap
 msgid ""
 "    # PXE bootloader (first program to be loaded, by TFTP)\n"
@@ -675,7 +661,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:243
 #, no-wrap
 msgid ""
 "  }\n"
@@ -683,17 +669,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:247
 msgid "3~ TFTP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:249
 msgid "This serves the kernel and initial ramdisk to the system at run time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:253
+#: en/user_basics.ssi:251
 msgid ""
 "You should install the tftpd-hpa package. It can serve all files contained "
 "inside a root directory, usually /srv/tftp. To let it serve files inside /"
@@ -701,22 +687,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:257
+#: en/user_basics.ssi:255
 msgid "dpkg-reconfigure -plow tftpd-hpa"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:259
 msgid "and fill in the new tftp server directory when being asked about it."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:261
 msgid "3~ NFS server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:263
 msgid ""
 "Once the guest computer has downloaded and booted a Linux kernel and loaded "
 "its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -724,35 +710,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:265
 msgid "You need to install the nfs-kernel-server package."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:267
 msgid ""
 "Then, make the filesystem image available through NFS by adding a line like "
 "the following to /etc/exports:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:273
+#: en/user_basics.ssi:271
 msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:277
+#: en/user_basics.ssi:275
 msgid ""
 "and tell the NFS server about this new export with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:281
+#: en/user_basics.ssi:279
 msgid "# exportfs -rv"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:283
 msgid ""
 "Setting up these three services can be a little tricky. You might need some "
 "patience to get all of them working together. The Debian Installer Manual's "
@@ -761,40 +747,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:285
 msgid "3~ Netboot testing HowTo"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:287
 msgid ""
 "Netboot image creation is made easy with live-build magic, but testing the "
 "images on physical machines can be really time consuming."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:289
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:291
 msgid "3~ Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:293
 msgid "_* Install qemu, bridge-utils, sudo."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:295
 msgid "Edit /etc/qemu-ifup:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:308
+#: en/user_basics.ssi:306
 msgid ""
 "#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
 "\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -803,62 +789,62 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:310
 msgid "Get, or build a grub-floppy-netboot (in the svn)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:312
 msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:314
 msgid "3~ VMWare Player"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:316
 msgid "_* Install VMWare Player (\"free as in beer\" edition)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:318
 msgid ""
 "_* Create a PXETester directory, and create a text file called pxe.vwx inside"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:320
 msgid "_* Paste this text inside:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:330
+#: en/user_basics.ssi:328
 msgid ""
 "#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
 "\"512\" MemAllowAutoScaleDown = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:336
+#: en/user_basics.ssi:334
 msgid ""
 "ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
 "\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:339
+#: en/user_basics.ssi:337
 msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:342
+#: en/user_basics.ssi:340
 msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:347
+#: en/user_basics.ssi:345
 msgid ""
 "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 "
@@ -866,19 +852,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:349
 msgid ""
 "_* You can play with this configuration file (i.e. change memory limit to "
 "256)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:353
+#: en/user_basics.ssi:351
 msgid ""
 "_* Double click on this file (or run VMWare player and select this file)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:354
+#: en/user_basics.ssi:352
 msgid "_* When running just press space if that strange question comes up..."
 msgstr ""
diff --git a/manual/po/fr/user_customization-runtime.ssi.po b/manual/po/fr/user_customization-runtime.ssi.po
index d6f4fc9..13b1566 100644
--- a/manual/po/fr/user_customization-runtime.ssi.po
+++ b/manual/po/fr/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-06 17:29-0400\n"
+"POT-Creation-Date: 2010-12-12 14:05-0400\n"
 "PO-Revision-Date: 2010-11-30 11:40+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -20,32 +20,22 @@ msgstr ""
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
-#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
-#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
-#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
-#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
-#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
-#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/about_manual.ssi:170 en/project_bugs.ssi:58
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
-#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
-#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
 #: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
 #: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
@@ -72,12 +62,14 @@ msgstr ""
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
 #: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:132
-#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
+#: en/user_examples.ssi:256 en/user_examples.ssi:271
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -89,32 +81,22 @@ msgstr "code{"
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
 #: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/other_faq.ssi:37 en/other_faq.ssi:46
-#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
-#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
-#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
-#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
-#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
-#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/about_manual.ssi:174 en/project_bugs.ssi:62
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
-#: en/user_customization-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
+#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
+#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
 #: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
@@ -140,12 +122,14 @@ msgstr "code{"
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
 #: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:118 en/user_installation.ssi:137
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
+#: en/user_examples.ssi:267 en/user_examples.ssi:285
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:150
+#: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -309,7 +293,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:72
-msgid "2~ Persistence"
+msgid "2~persistence Persistence"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/fr/user_installation.ssi.po b/manual/po/fr/user_installation.ssi.po
index 80ddbac..d484b2f 100644
--- a/manual/po/fr/user_installation.ssi.po
+++ b/manual/po/fr/user_installation.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-11 22:46+0100\n"
+"POT-Creation-Date: 2010-12-12 14:05-0400\n"
 "PO-Revision-Date: 2010-10-16 20:36-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -26,14 +26,14 @@ msgstr ""
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
-#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
-#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
 #: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
 #: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -68,7 +68,7 @@ msgstr ""
 #: en/user_installation.ssi:56 en/user_installation.ssi:64
 #: en/user_installation.ssi:74 en/user_installation.ssi:82
 #: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:132 en/user_installation.ssi:147
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
 #: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
@@ -87,14 +87,14 @@ msgstr "code{"
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
+#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
 #: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
 #: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -127,8 +127,8 @@ msgstr "code{"
 #: en/user_installation.ssi:42 en/user_installation.ssi:50
 #: en/user_installation.ssi:60 en/user_installation.ssi:70
 #: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:118
-#: en/user_installation.ssi:137 en/user_installation.ssi:150
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:150
 #: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
@@ -222,7 +222,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:34
+#: en/user_installation.ssi:34 en/user_installation.ssi:104
 msgid "3~ From the Debian repository"
 msgstr ""
 
@@ -247,7 +247,7 @@ msgid "# aptitude install live-build"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:52
+#: en/user_installation.ssi:52 en/user_installation.ssi:108
 msgid "3~ From source"
 msgstr ""
 
@@ -307,7 +307,7 @@ msgid "# make uninstall"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:96
+#: en/user_installation.ssi:96 en/user_installation.ssi:142
 msgid "3~ From 'snapshots'"
 msgstr ""
 
@@ -321,77 +321,61 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:100
-msgid "2~ live-boot"
+msgid "2~ live-boot and live-config"
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:102
 #, no-wrap
-msgid "*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:104
-msgid "% FIXME: we also need to mention live-config"
+msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:106
-msgid "3~ Using a customized live-boot"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:108
 msgid ""
-"% FIXME: should follow the structure for live-build above (i.e. \"from source"
-"\", not \"customized\" -- we should not get into customization now, but "
-"should reserve that discussion for later."
+"Both live-boot and live-config are available from the Debian repository as "
+"per {Installing live-build}#installing-live-build."
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:110
 msgid ""
-"To modify the code you can follow the process below. Please ensure you are "
-"familiar with the terms mentioned in {Terms}#terms."
+"To use the latest source from git, you can follow the process below. Please "
+"ensure you are familiar with the terms mentioned in {Terms}#terms."
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:112
-msgid "_* Checkout the live-boot source"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:116
-msgid "$ git clone git://live.debian.net/git/live-boot.git"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:120
-msgid "_* Make changes to your local copy"
+msgid "_* Checkout the live-boot and live-config source"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:122
+#: en/user_installation.ssi:117
+#, fuzzy
+#| msgid ""
+#| "Git: <a href=\"git://live.debian.net/git/live-manual.git"
+#| "\"><small><tt>git://live.debian.net/git/live-manual.git</tt></small></a>"
 msgid ""
-"% FIXME: as indicated above, it's too early for this topic. Move to later in "
-"the manual."
+"$ git clone git://live.debian.net/git/live-boot.git $ git clone git://live."
+"debian.net/git/live-config.git"
 msgstr ""
+"Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
+"live.debian.net/git/live-manual.git</tt></small></a>"
 
 #. type: Plain text
-#: en/user_installation.ssi:124
+#: en/user_installation.ssi:121
 msgid ""
-"And beware that if you want to add your pre-init script in live-bottom, you "
-"should name it without dashes '-', e.g: call it \"99new_feature\" and not "
-"\"99new-feature\"."
+"Consult the live-boot and live-config man pages for details on customizing "
+"if that is your reason for building these packages from source."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:126
-msgid "_* Build a live-boot .deb"
+#: en/user_installation.ssi:123
+msgid "_* Build live-boot and live-config .deb files"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:128
+#: en/user_installation.ssi:125
 msgid ""
 "You must build either on your target distribution or in a chroot containing "
 "your target platform: this means if your target is Squeeze then you should "
@@ -399,7 +383,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:130
+#: en/user_installation.ssi:127
 msgid ""
 "Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
 "build #{live-boot}# for a target distribution that differs from your build "
@@ -410,40 +394,38 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:135
-msgid "$ cd live-boot $ dpkg-buildpackage -b -uc -us"
+#: en/user_installation.ssi:134
+msgid ""
+"$ cd live-boot $ dpkg-buildpackage -b -uc -us $ cd ../live-config $ dpkg-"
+"buildpackage -b -uc -us"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:139
-msgid "_* Use the generated live-boot .deb"
+#: en/user_installation.ssi:138
+msgid "_* Use all generated .deb files"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:141
+#: en/user_installation.ssi:140
 msgid ""
-"As live-boot is installed by live-build system, installing the package in "
-"the host system is not sufficient: you should treat the generated .deb like "
-"another custom package. Please see {Customizing package installation}"
-"#customizing-package-installation for more information. You should pay "
-"particular attention to {Additional repositories}#additional-repositories."
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:143
-msgid "3~ Using live-boot snapshots"
+"As live-boot and live-config are installed by live-build system, installing "
+"the packages in the host system is not sufficient: you should treat the "
+"generated .deb files like any other custom packages. Please see {Customizing "
+"package installation}#customizing-package-installation for more information. "
+"You should pay particular attention to {Additional repositories}#additional-"
+"repositories."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:145
+#: en/user_installation.ssi:144
 msgid ""
-"You can let live-build automatically use the latest snapshot of live-boot by "
-"configuring a third-party repository in your live-build configuration "
-"directory. Assuming you have already created a configuration tree with #{lb "
-"config}#:"
+"You can let live-build automatically use the latest snapshots of live-boot "
+"and live-config by configuring a third-party repository in your live-build "
+"configuration directory. Assuming you have already created a configuration "
+"tree with #{lb config}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:149
+#: en/user_installation.ssi:148
 msgid "lb config --repository live.debian.net"
 msgstr ""
diff --git a/manual/po/it/user_basics.ssi.po b/manual/po/it/user_basics.ssi.po
index 46ed496..3562488 100644
--- a/manual/po/it/user_basics.ssi.po
+++ b/manual/po/it/user_basics.ssi.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-28 07:16-0400\n"
+"POT-Creation-Date: 2010-12-12 14:05-0400\n"
 "PO-Revision-Date: 2010-12-12 01:36+0100\n"
 "Last-Translator: Carlo Stemberger <carlo.stemberger at gmail.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -20,132 +20,121 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
-#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
-#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
-#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
-#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
-#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
-#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
-#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
-#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
-#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
-#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
-#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
-#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
-#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
-#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
-#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
-#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
-#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
-#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/about_manual.ssi:170 en/project_bugs.ssi:58
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
+#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
+#: en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:142
+#: en/user_customization-packages.ssi:155
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:290
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:312
+#: en/user_customization-packages.ssi:330 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:50 en/user_customization-runtime.ssi:58
+#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
+#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
+#: en/user_examples.ssi:256 en/user_examples.ssi:271
 #: en/user_installation.ssi:38 en/user_installation.ssi:46
 #: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
-#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
-#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
-#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
-#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
-#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
-#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
-#: en/user_customization-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
+#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
+#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
+#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
+#: en/user_customization-packages.ssi:98
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:161
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
-#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
-#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
-#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
-#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
-#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:294
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:343 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
+#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
+#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
+#: en/user_examples.ssi:267 en/user_examples.ssi:285
 #: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:150
+#: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr "}code"
@@ -237,13 +226,21 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:18
+#, fuzzy
+#| msgid ""
+#| "_* *{System image}*: The operating system's filesystem image. Usually, a "
+#| "SquashFS compressed filesystem is used to minimize the Debian Live image "
+#| "size. Note that it is 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 is used (see persistence)."
 msgid ""
 "_* *{System image}*: The operating system's filesystem image. Usually, a "
 "SquashFS compressed filesystem is used to minimize the Debian Live image "
 "size. Note that it is 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 is used (see persistence)."
+"optional persistence is used (see {Persistence}#persistence)."
 msgstr ""
 "_* *{Immagine di sistema}*: L'immagine del filesystem del sistema operativo. "
 "Normalmente è usato un file system compresso SquashFS, per minimizzare le "
@@ -256,11 +253,6 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:20
-msgid "% FIXME: <xref linkend=\"persistence\"/>"
-msgstr "% FIXME: <xref linkend=\"persistence\"/>"
-
-#. type: Plain text
-#: en/user_basics.ssi:22
 msgid ""
 "_* *{Bootloader}*: A small piece of code crafted to boot from the chosen "
 "media, possibly presenting a prompt or menu to allow selection of options/"
@@ -283,7 +275,7 @@ msgstr ""
 "il netboot PXE, GRUB per partizioni ext2/3/4, ecc."
 
 #. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
 msgid ""
 "You can use live-build to build the system image from your specifications, "
 "set up a Linux kernel, its initrd, and a bootloader to run them, all in one "
@@ -295,12 +287,12 @@ msgstr ""
 "ISO9660, immagine disco, ecc.)"
 
 #. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
 msgid "2~ First steps: building an ISO image"
 msgstr "2~ Primi passi: creare una immagine ISO"
 
 #. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
 msgid ""
 "The following sequence of live-build commands will create a basic ISO hybrid "
 "image containing just the Debian standard system without X.org. It is "
@@ -315,7 +307,7 @@ msgstr ""
 "hdd-image, specificando l'estensione \".iso\" dove è indicato \".img\")."
 
 #. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
 msgid ""
 "First, we run the #{lb config}# command which will create a \"config/\" "
 "hierarchy in the current directory for use by other commands:"
@@ -325,12 +317,12 @@ msgstr ""
 "altri comandi:"
 
 #. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:32
 msgid "$ lb config"
 msgstr "$ lb config"
 
 #. type: Plain text
-#: en/user_basics.ssi:38
+#: en/user_basics.ssi:36
 msgid ""
 "By passing no parameters to #{lb config}#, we indicated that we wish to use "
 "the defaults (see {The lb config command}#lb-config)."
@@ -340,7 +332,7 @@ msgstr ""
 "config)."
 
 #. type: Plain text
-#: en/user_basics.ssi:40
+#: en/user_basics.ssi:38
 msgid ""
 "Now that we have a \"config/\" hierarchy, we may build the image with the lb "
 "build command:"
@@ -349,13 +341,13 @@ msgstr ""
 "comando lb build:"
 
 #. type: Plain text
-#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
-#: en/user_examples.ssi:106 en/user_examples.ssi:153
+#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_examples.ssi:109 en/user_examples.ssi:156
 msgid "# lb build"
 msgstr "# lb build"
 
 #. type: Plain text
-#: en/user_basics.ssi:48
+#: en/user_basics.ssi:46
 msgid ""
 "This process can take a while, depending on the speed of your network "
 "connection (see {The lb build command}#lb-build)."
@@ -364,48 +356,48 @@ msgstr ""
 "connessione di rete (vedere {Il comando lb build}#lb-build)."
 
 #. type: Plain text
-#: en/user_basics.ssi:50
+#: en/user_basics.ssi:48
 msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
 msgstr "3~testing-iso-with-qemu Provare un'immagine ISO con Qemu"
 
 #. type: Plain text
-#: en/user_basics.ssi:52
+#: en/user_basics.ssi:50
 msgid "Testing an ISO is simple:"
 msgstr "Collaudare una ISO è semplice:"
 
 #. type: Plain text
-#: en/user_basics.ssi:56 en/user_basics.ssi:144
+#: en/user_basics.ssi:54 en/user_basics.ssi:142
 msgid "# apt-get install qemu"
 msgstr "# apt-get install qemu"
 
 #. type: Plain text
-#: en/user_basics.ssi:58
+#: en/user_basics.ssi:56
 msgid "$ qemu -cdrom binary.iso"
 msgstr "$ qemu -cdrom binary.iso"
 
 #. type: Plain text
-#: en/user_basics.ssi:62
+#: en/user_basics.ssi:60
 msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
 msgstr ""
 "3~testing-iso-with-virtualbox Provare un'immagine ISO con virtualbox-ose"
 
 #. type: Plain text
-#: en/user_basics.ssi:64
+#: en/user_basics.ssi:62
 msgid "In order to test the ISO with virtualbox-ose:"
 msgstr "Per provare la ISO con virtualbox-ose:"
 
 #. type: Plain text
-#: en/user_basics.ssi:68
+#: en/user_basics.ssi:66
 msgid "# apt-get install virtualbox-ose virtualbox-ose-dkms"
 msgstr "# apt-get install virtualbox-ose virtualbox-ose-dkms"
 
 #. type: Plain text
-#: en/user_basics.ssi:70
+#: en/user_basics.ssi:68
 msgid "$ virtualbox"
 msgstr "$ virtualbox"
 
 #. type: Plain text
-#: en/user_basics.ssi:74
+#: en/user_basics.ssi:72
 msgid ""
 "Create a new virtual machine, change the storage settings to use binary.iso "
 "as the CD/DVD device, and start the machine."
@@ -415,7 +407,7 @@ msgstr ""
 "avviare la macchina."
 
 #. type: Plain text
-#: en/user_basics.ssi:76
+#: en/user_basics.ssi:74
 msgid ""
 "Note: For live systems containing X.org that you want to test with "
 "virtualbox-ose, you may wish to include the VirtualBox X.org driver package, "
@@ -428,37 +420,37 @@ msgstr ""
 "Altrimenti, la risoluzione è limitata a 800x600."
 
 #. type: Plain text
-#: en/user_basics.ssi:80
+#: en/user_basics.ssi:78
 msgid "# lb config --packages virtualbox-ose-guest-x11"
 msgstr "# lb config --packages virtualbox-ose-guest-x11"
 
 #. type: Plain text
-#: en/user_basics.ssi:84
+#: en/user_basics.ssi:82
 msgid "3~burning-iso-image Burning an ISO image to a physical medium"
 msgstr "3~burning-iso-image Masterizzare un'immagine ISO su un supporto fisico"
 
 #. type: Plain text
-#: en/user_basics.ssi:86
+#: en/user_basics.ssi:84
 msgid "Burning an ISO image is easy:"
 msgstr "Masterizzare un'immagine ISO è semplice:"
 
 #. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:88
 msgid "# apt-get install wodim"
 msgstr "# apt-get install wodim"
 
 #. type: Plain text
-#: en/user_basics.ssi:92
+#: en/user_basics.ssi:90
 msgid "$ wodim binary.iso"
 msgstr "$ wodim binary.iso"
 
 #. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:94
 msgid "2~ Building a USB/HDD image"
 msgstr "2~ Creare un'immagine USB/HDD"
 
 #. type: Plain text
-#: en/user_basics.ssi:98
+#: en/user_basics.ssi:96
 msgid ""
 "The following sequence of commands will create a basic USB/HDD image "
 "containing just the Debian standard system without X.org. It is suitable for "
@@ -477,7 +469,7 @@ msgstr ""
 "persistente, allora occorre un'immagine USB/HDD."
 
 #. type: Plain text
-#: en/user_basics.ssi:100
+#: en/user_basics.ssi:98
 msgid ""
 "Note: if you created an ISO image with the previous example, you will need "
 "to clean up your working directory with the #{lb clean}# command (see {The "
@@ -488,12 +480,12 @@ msgstr ""
 "comando lb clean}#lb-clean):"
 
 #. type: Plain text
-#: en/user_basics.ssi:104 en/user_basics.ssi:186
+#: en/user_basics.ssi:102 en/user_basics.ssi:184
 msgid "$ lb clean --binary"
 msgstr "$ lb clean --binary"
 
 #. type: Plain text
-#: en/user_basics.ssi:108
+#: en/user_basics.ssi:106
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the #{config/}"
 "# hierarchy to create a USB/HDD image type:"
@@ -502,22 +494,22 @@ msgstr ""
 "struttura #{config/}# per creare un'immagine USB/HDD:"
 
 #. type: Plain text
-#: en/user_basics.ssi:112
+#: en/user_basics.ssi:110
 msgid "$ lb config -b usb-hdd"
 msgstr "$ lb config -b usb-hdd"
 
 #. type: Plain text
-#: en/user_basics.ssi:116
+#: en/user_basics.ssi:114
 msgid "Now build the image with the #{lb build} command:"
 msgstr "Creare quindi l'immagine con il comando #{lb build}:"
 
 #. type: Plain text
-#: en/user_basics.ssi:124
+#: en/user_basics.ssi:122
 msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
 msgstr "3~copying-usb-hdd-image Copiare un'immagine USB/HDD su una penna USB"
 
 #. type: Plain text
-#: en/user_basics.ssi:126
+#: en/user_basics.ssi:124
 msgid ""
 "The generated binary image contains a VFAT partition and the syslinux "
 "bootloader, ready to be directly written on a USB stick. Plug in a USB stick "
@@ -529,12 +521,12 @@ msgstr ""
 "digitare:"
 
 #. type: Plain text
-#: en/user_basics.ssi:130
+#: en/user_basics.ssi:128
 msgid "$ dd if=binary.img of=${USBSTICK}"
 msgstr "$ dd if=binary.img of=${USBSTICK}"
 
 #. type: Plain text
-#: en/user_basics.ssi:134
+#: en/user_basics.ssi:132
 msgid ""
 "where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
 "a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -547,13 +539,13 @@ msgstr ""
 "meglio ancora #{ls -l /dev/disk/by-id}#."
 
 #. type: Plain text
-#: en/user_basics.ssi:136
+#: en/user_basics.ssi:134
 #, no-wrap
 msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
 msgstr "*{Questo sovrascriverà qualsiasi altro dato sulla chiavetta!}*\n"
 
 #. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:136
 msgid ""
 "Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
 "type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images."
@@ -563,22 +555,22 @@ msgstr ""
 "per le immagini #{iso}#."
 
 #. type: Plain text
-#: en/user_basics.ssi:140
+#: en/user_basics.ssi:138
 msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
 msgstr "3~testing-usb-hdd-with-qemu Provare un'immagine USB/HDD con Qemu"
 
 #. type: Plain text
-#: en/user_basics.ssi:146
+#: en/user_basics.ssi:144
 msgid "$ qemu -hda binary.img"
 msgstr "$ qemu -hda binary.img"
 
 #. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:148
 msgid "3~ Using the space left on a USB stick"
 msgstr "3~ Usare lo spazio rimanente sulla penna USB"
 
 #. type: Plain text
-#: en/user_basics.ssi:152
+#: en/user_basics.ssi:150
 msgid ""
 "If you want to use the remaining free space after you have installed the "
 "binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -591,12 +583,12 @@ msgstr ""
 "verrà utilizzata dal sistema Debian Live."
 
 #. type: Plain text
-#: en/user_basics.ssi:156
+#: en/user_basics.ssi:154
 msgid "# gparted ${USBSTICK}"
 msgstr "# gparted ${USBSTICK}"
 
 #. type: Plain text
-#: en/user_basics.ssi:160
+#: en/user_basics.ssi:158
 msgid ""
 "After the creation of the partition, you have to create a filesystem on it. "
 "One possible choice would be ext4."
@@ -605,33 +597,33 @@ msgstr ""
 "essere una scelta possibile."
 
 #. type: Plain text
-#: en/user_basics.ssi:164
+#: en/user_basics.ssi:162
 msgid "# mkfs.ext4 ${USBSTICK}"
 msgstr "# mkfs.ext4 ${USBSTICK}"
 
 #. type: Plain text
-#: en/user_basics.ssi:168
+#: en/user_basics.ssi:166
 msgid "If you want to use this data partition with Windows, use FAT32."
 msgstr "Usare FAT32 se si vuole usare questa partizione dati con Windows."
 
 #. type: Plain text
-#: en/user_basics.ssi:172
+#: en/user_basics.ssi:170
 msgid "# mkfs.vfat -F 32"
 msgstr "# mkfs.vfat -F 32"
 
 #. type: Plain text
-#: en/user_basics.ssi:176
+#: en/user_basics.ssi:174
 #, no-wrap
 msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
 msgstr "*{Ricorda: ogni volta che si installa un nuovo file binary.img sulla penna verranno persi tutti i dati perché la partizione verrà sovrascritta con i contenuti della nuova immagine.}*\n"
 
 #. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:176
 msgid "2~building-netboot-image Building a netboot image"
 msgstr "2~building-netboot-image Creare un'immagine netboot"
 
 #. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:178
 msgid ""
 "The following sequence of commands will create a basic netboot image "
 "containing the Debian standard system without X.org. It is suitable for "
@@ -642,7 +634,7 @@ msgstr ""
 "tramite rete."
 
 #. type: Plain text
-#: en/user_basics.ssi:182
+#: en/user_basics.ssi:180
 msgid ""
 "Note: if you performed any previous examples, you will need to clean up your "
 "working directory with the #{lb clean}# command:"
@@ -651,7 +643,7 @@ msgstr ""
 "directory di lavoro con il comando #{lb clean}#:"
 
 #. type: Plain text
-#: en/user_basics.ssi:190
+#: en/user_basics.ssi:188
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the \"config/"
 "\" hierarchy to create our netboot image:"
@@ -660,7 +652,7 @@ msgstr ""
 "struttura \"config/\" per creare un'immagine netboot:"
 
 #. type: Plain text
-#: en/user_basics.ssi:194
+#: en/user_basics.ssi:192
 msgid ""
 "$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
 "\"192.168.0.1\""
@@ -669,7 +661,7 @@ msgstr ""
 "\"192.168.0.1\""
 
 #. type: Plain text
-#: en/user_basics.ssi:198
+#: en/user_basics.ssi:196
 msgid ""
 "In contrast with the ISO and USB/HDD images, netbooting does not support "
 "serving a filesystem image with the client, so the files must be served via "
@@ -684,12 +676,12 @@ msgstr ""
 "immagini filesystem saranno situate all'avvio."
 
 #. type: Plain text
-#: en/user_basics.ssi:200
+#: en/user_basics.ssi:198
 msgid "Now build the image with the #{lb build}# command:"
 msgstr "Si crei ora l'immagine con il comando #{lb build}#:"
 
 #. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:206
 msgid ""
 "In a network boot, the client runs a small piece of software which usually "
 "resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -706,7 +698,7 @@ msgstr ""
 "pxelinux, GRUB, o anche avviare direttamente un sistema operativo come Linux."
 
 #. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:208
 msgid ""
 "For example, if you unpack the generated binary-net.tar.gz archive in the /"
 "srv/debian-live directory, you'll find the filesystem image in live/"
@@ -719,17 +711,17 @@ msgstr ""
 "i386."
 
 #. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:210
 msgid "We must now configure three services on the server to enable netboot."
 msgstr "Per abilitare l'avvio tramite rete vanno ora configurati tre servizi."
 
 #. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:212
 msgid "3~ DHCP server"
 msgstr "3~ DHCP server"
 
 #. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:214
 msgid ""
 "We must configure our network's DHCP server to be sure to give an IP address "
 "to the netbooting client system, and to advertise the location of the PXE "
@@ -740,7 +732,7 @@ msgstr ""
 "del bootloader PXE."
 
 #. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:216
 msgid ""
 "Here is an example for inspiration, written for the ISC DHCP server #{isc-"
 "dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
@@ -749,18 +741,20 @@ msgstr ""
 "di configurazione /etc/dhcp/dhcpd.conf;"
 
 #. type: Plain text
-#: en/user_basics.ssi:220
-msgid "% FIXME"
-msgstr "% FIXME"
+#: en/user_basics.ssi:218
+msgid ""
+"% FIXME: bring up to date: base example on default isc-dhcp-server config "
+"file in Squeeze"
+msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:224
+#: en/user_basics.ssi:222
 #, no-wrap
 msgid "subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
 msgstr "subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
 
 #. type: Plain text
-#: en/user_basics.ssi:227
+#: en/user_basics.ssi:225
 #, no-wrap
 msgid ""
 "  # IP addresses available for guests\n"
@@ -770,7 +764,7 @@ msgstr ""
 "  range 192.168.1.100 192.168.1.149;\n"
 
 #. type: Plain text
-#: en/user_basics.ssi:230
+#: en/user_basics.ssi:228
 #, no-wrap
 msgid ""
 "  # allow booting from the net\n"
@@ -780,7 +774,7 @@ msgstr ""
 "  allow bootp;\n"
 
 #. type: Plain text
-#: en/user_basics.ssi:235
+#: en/user_basics.ssi:233
 #, fuzzy, no-wrap
 #| msgid ""
 #| "  # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -799,7 +793,7 @@ msgstr ""
 "  next-server myserver;\n"
 
 #. type: Plain text
-#: en/user_basics.ssi:239
+#: en/user_basics.ssi:237
 #, fuzzy, no-wrap
 #| msgid ""
 #| "  # net boot configuration for guests with a PXE client:\n"
@@ -815,7 +809,7 @@ msgstr ""
 "    # Note: all files for PXE are relatives to the TFTP server's root\n"
 
 #. type: Plain text
-#: en/user_basics.ssi:242
+#: en/user_basics.ssi:240
 #, no-wrap
 msgid ""
 "    # PXE bootloader (first program to be loaded, by TFTP)\n"
@@ -825,7 +819,7 @@ msgstr ""
 "    filename \"pxelinux.0\";\n"
 
 #. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:243
 #, no-wrap
 msgid ""
 "  }\n"
@@ -835,18 +829,18 @@ msgstr ""
 "}\n"
 
 #. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:247
 msgid "3~ TFTP server"
 msgstr "3~ Server TFTP"
 
 #. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:249
 msgid "This serves the kernel and initial ramdisk to the system at run time."
 msgstr ""
 "Fornisce al sistema il kernel e il ramdisk iniziale in fase di esecuzione."
 
 #. type: Plain text
-#: en/user_basics.ssi:253
+#: en/user_basics.ssi:251
 msgid ""
 "You should install the tftpd-hpa package. It can serve all files contained "
 "inside a root directory, usually /srv/tftp. To let it serve files inside /"
@@ -858,22 +852,22 @@ msgstr ""
 "seguente comando come utente root:"
 
 #. type: Plain text
-#: en/user_basics.ssi:257
+#: en/user_basics.ssi:255
 msgid "dpkg-reconfigure -plow tftpd-hpa"
 msgstr "dpkg-reconfigure -plow tftpd-hpa"
 
 #. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:259
 msgid "and fill in the new tftp server directory when being asked about it."
 msgstr "e inserire la nuova directory del server tftp quando viene richiesto."
 
 #. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:261
 msgid "3~ NFS server"
 msgstr "3~ Server NFS"
 
 #. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:263
 msgid ""
 "Once the guest computer has downloaded and booted a Linux kernel and loaded "
 "its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -884,12 +878,12 @@ msgstr ""
 "tramite il server NFS."
 
 #. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:265
 msgid "You need to install the nfs-kernel-server package."
 msgstr "Bisogna installare il pacchetto nfs-kernel-server."
 
 #. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:267
 msgid ""
 "Then, make the filesystem image available through NFS by adding a line like "
 "the following to /etc/exports:"
@@ -898,23 +892,23 @@ msgstr ""
 "seguente riga in /etc/exports:"
 
 #. type: Plain text
-#: en/user_basics.ssi:273
+#: en/user_basics.ssi:271
 msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
 msgstr "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
 
 #. type: Plain text
-#: en/user_basics.ssi:277
+#: en/user_basics.ssi:275
 msgid ""
 "and tell the NFS server about this new export with the following command:"
 msgstr "e comunicare il nuovo export al server NFS con il seguente comando:"
 
 #. type: Plain text
-#: en/user_basics.ssi:281
+#: en/user_basics.ssi:279
 msgid "# exportfs -rv"
 msgstr "# exportfs -rv"
 
 #. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:283
 msgid ""
 "Setting up these three services can be a little tricky. You might need some "
 "patience to get all of them working together. The Debian Installer Manual's "
@@ -927,12 +921,12 @@ msgstr ""
 "http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html può essere d'aiuto."
 
 #. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:285
 msgid "3~ Netboot testing HowTo"
 msgstr "3~ Come provare una netboot"
 
 #. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:287
 msgid ""
 "Netboot image creation is made easy with live-build magic, but testing the "
 "images on physical machines can be really time consuming."
@@ -942,7 +936,7 @@ msgstr ""
 "termini di tempo."
 
 #. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:289
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions."
 msgstr ""
@@ -950,22 +944,22 @@ msgstr ""
 "soluzioni."
 
 #. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:291
 msgid "3~ Qemu"
 msgstr "3~ Qemu"
 
 #. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:293
 msgid "_* Install qemu, bridge-utils, sudo."
 msgstr "_* Installare qemu, bridge-utils, sudo."
 
 #. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:295
 msgid "Edit /etc/qemu-ifup:"
 msgstr "Modificare /etc/qemu-ifup:"
 
 #. type: Plain text
-#: en/user_basics.ssi:308
+#: en/user_basics.ssi:306
 msgid ""
 "#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
 "\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -978,27 +972,27 @@ msgstr ""
 "usr/sbin/brctl addif br0 $1 sleep 2"
 
 #. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:310
 msgid "Get, or build a grub-floppy-netboot (in the svn)."
 msgstr "Procurarsi o compilare grub-floppy-netboot (su svn)."
 
 #. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:312
 msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
 msgstr "Lanciare qemu con \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
 
 #. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:314
 msgid "3~ VMWare Player"
 msgstr "3~ VMWare Player"
 
 #. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:316
 msgid "_* Install VMWare Player (\"free as in beer\" edition)"
 msgstr "_* Installare VMWare Player (edizione \"free as a beer\")"
 
 #. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:318
 msgid ""
 "_* Create a PXETester directory, and create a text file called pxe.vwx inside"
 msgstr ""
@@ -1006,12 +1000,12 @@ msgstr ""
 "vmx"
 
 #. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:320
 msgid "_* Paste this text inside:"
 msgstr "_* Copiarci questo testo:"
 
 #. type: Plain text
-#: en/user_basics.ssi:330
+#: en/user_basics.ssi:328
 msgid ""
 "#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
 "\"512\" MemAllowAutoScaleDown = \"FALSE\""
@@ -1020,7 +1014,7 @@ msgstr ""
 "\"512\" MemAllowAutoScaleDown = \"FALSE\""
 
 #. type: Plain text
-#: en/user_basics.ssi:336
+#: en/user_basics.ssi:334
 msgid ""
 "ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
 "\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
@@ -1029,17 +1023,17 @@ msgstr ""
 "\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
 
 #. type: Plain text
-#: en/user_basics.ssi:339
+#: en/user_basics.ssi:337
 msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
 msgstr "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
 
 #. type: Plain text
-#: en/user_basics.ssi:342
+#: en/user_basics.ssi:340
 msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
 msgstr "displayName = \"Test Boot PXE\" guestOS = \"other\""
 
 #. type: Plain text
-#: en/user_basics.ssi:347
+#: en/user_basics.ssi:345
 msgid ""
 "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 "
@@ -1050,7 +1044,7 @@ msgstr ""
 "de 3f-ae 9e 07 91 1d 8d 71 3b\" ethernet0.generatedAddressOffset = \"0\""
 
 #. type: Plain text
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:349
 msgid ""
 "_* You can play with this configuration file (i.e. change memory limit to "
 "256)"
@@ -1059,7 +1053,7 @@ msgstr ""
 "256 il limite della memoria)"
 
 #. type: Plain text
-#: en/user_basics.ssi:353
+#: en/user_basics.ssi:351
 msgid ""
 "_* Double click on this file (or run VMWare player and select this file)."
 msgstr ""
@@ -1067,7 +1061,7 @@ msgstr ""
 "questo file)."
 
 #. type: Plain text
-#: en/user_basics.ssi:354
+#: en/user_basics.ssi:352
 msgid "_* When running just press space if that strange question comes up..."
 msgstr ""
 "_* Se viene posta qualche strana durante l'esecuzione premere il tasto "
diff --git a/manual/po/it/user_customization-runtime.ssi.po b/manual/po/it/user_customization-runtime.ssi.po
index d22997c..c744c34 100644
--- a/manual/po/it/user_customization-runtime.ssi.po
+++ b/manual/po/it/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-12-06 17:29-0400\n"
+"POT-Creation-Date: 2010-12-12 14:05-0400\n"
 "PO-Revision-Date: 2010-12-06 17:29-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -20,32 +20,22 @@ msgstr ""
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
-#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
-#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
-#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
-#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
-#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
-#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/about_manual.ssi:170 en/project_bugs.ssi:58
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
-#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
-#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
 #: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
 #: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
@@ -72,12 +62,14 @@ msgstr ""
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
 #: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:132
-#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
+#: en/user_examples.ssi:256 en/user_examples.ssi:271
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -89,32 +81,22 @@ msgstr "code{"
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
 #: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/other_faq.ssi:37 en/other_faq.ssi:46
-#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
-#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
-#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
-#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
-#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
-#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/about_manual.ssi:174 en/project_bugs.ssi:62
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
-#: en/user_customization-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
+#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
+#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
 #: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
@@ -140,12 +122,14 @@ msgstr "code{"
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
 #: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:118 en/user_installation.ssi:137
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
+#: en/user_examples.ssi:267 en/user_examples.ssi:285
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:150
+#: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -309,7 +293,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:72
-msgid "2~ Persistence"
+msgid "2~persistence Persistence"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/it/user_installation.ssi.po b/manual/po/it/user_installation.ssi.po
index cfe7c2d..0023978 100644
--- a/manual/po/it/user_installation.ssi.po
+++ b/manual/po/it/user_installation.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-12-11 22:46+0100\n"
+"POT-Creation-Date: 2010-12-12 14:05-0400\n"
 "PO-Revision-Date: 2010-12-11 22:45+0100\n"
 "Last-Translator: Carlo Stemberger <carlo.stemberger at gmail.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -27,14 +27,14 @@ msgstr ""
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
-#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
-#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
 #: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
 #: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -69,7 +69,7 @@ msgstr ""
 #: en/user_installation.ssi:56 en/user_installation.ssi:64
 #: en/user_installation.ssi:74 en/user_installation.ssi:82
 #: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:132 en/user_installation.ssi:147
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
 #: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
@@ -88,14 +88,14 @@ msgstr "code{"
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
+#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
 #: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
 #: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -128,8 +128,8 @@ msgstr "code{"
 #: en/user_installation.ssi:42 en/user_installation.ssi:50
 #: en/user_installation.ssi:60 en/user_installation.ssi:70
 #: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:118
-#: en/user_installation.ssi:137 en/user_installation.ssi:150
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:150
 #: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
@@ -229,7 +229,7 @@ msgstr ""
 "attraverso il repository Debian."
 
 #. type: Plain text
-#: en/user_installation.ssi:34
+#: en/user_installation.ssi:34 en/user_installation.ssi:104
 msgid "3~ From the Debian repository"
 msgstr "3~ Dal repository Debian"
 
@@ -254,7 +254,7 @@ msgid "# aptitude install live-build"
 msgstr "# aptitude install live-build"
 
 #. type: Plain text
-#: en/user_installation.ssi:52
+#: en/user_installation.ssi:52 en/user_installation.ssi:108
 msgid "3~ From source"
 msgstr "3~ Da sorgenti"
 
@@ -322,7 +322,7 @@ msgid "# make uninstall"
 msgstr "# make uninstall"
 
 #. type: Plain text
-#: en/user_installation.ssi:96
+#: en/user_installation.ssi:96 en/user_installation.ssi:142
 msgid "3~ From 'snapshots'"
 msgstr "3~ Da 'istantanee'"
 
@@ -339,87 +339,74 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:100
-msgid "2~ live-boot"
+#, fuzzy
+#| msgid "2~ live-boot"
+msgid "2~ live-boot and live-config"
 msgstr "2~ live-boot"
 
 #. type: Plain text
 #: en/user_installation.ssi:102
-#, no-wrap
-msgid "*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.\n"
+#, fuzzy, no-wrap
+#| msgid "*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.\n"
+msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.\n"
 msgstr "*{Nota:}* non è necessario installare live-boot sul proprio sistema per creare sistemi Debian Live personalizzati. Tuttavia, farlo non nuoce.\n"
 
 #. type: Plain text
-#: en/user_installation.ssi:104
-msgid "% FIXME: we also need to mention live-config"
-msgstr "% FIXME: we also need to mention live-config"
-
-#. type: Plain text
 #: en/user_installation.ssi:106
-msgid "3~ Using a customized live-boot"
-msgstr "3~ Usare un live-boot personalizzato"
-
-#. type: Plain text
-#: en/user_installation.ssi:108
 msgid ""
-"% FIXME: should follow the structure for live-build above (i.e. \"from source"
-"\", not \"customized\" -- we should not get into customization now, but "
-"should reserve that discussion for later."
+"Both live-boot and live-config are available from the Debian repository as "
+"per {Installing live-build}#installing-live-build."
 msgstr ""
-"% FIXME: should follow the structure for live-build above (i.e. \"from source"
-"\", not \"customized\" -- we should not get into customization now, but "
-"should reserve that discussion for later."
 
 #. type: Plain text
 #: en/user_installation.ssi:110
+#, fuzzy
+#| msgid ""
+#| "To modify the code you can follow the process below. Please ensure you "
+#| "are familiar with the terms mentioned in {Terms}#terms."
 msgid ""
-"To modify the code you can follow the process below. Please ensure you are "
-"familiar with the terms mentioned in {Terms}#terms."
+"To use the latest source from git, you can follow the process below. Please "
+"ensure you are familiar with the terms mentioned in {Terms}#terms."
 msgstr ""
 "Per modificare il codice si può seguire il procedimento seguente. "
 "Assicurarsi di conoscere i termini menzionati in {Glossario}#terms."
 
 #. type: Plain text
 #: en/user_installation.ssi:112
-msgid "_* Checkout the live-boot source"
+#, fuzzy
+#| msgid "_* Checkout the live-boot source"
+msgid "_* Checkout the live-boot and live-config source"
 msgstr "_* Scaricare i sorgenti di live-boot"
 
 #. type: Plain text
-#: en/user_installation.ssi:116
-msgid "$ git clone git://live.debian.net/git/live-boot.git"
-msgstr "$ git clone git://live.debian.net/git/live-boot.git"
-
-#. type: Plain text
-#: en/user_installation.ssi:120
-msgid "_* Make changes to your local copy"
-msgstr "_* Eseguire le modifiche sulla copia locale"
-
-#. type: Plain text
-#: en/user_installation.ssi:122
+#: en/user_installation.ssi:117
+#, fuzzy
+#| msgid ""
+#| "Git: <a href=\"git://live.debian.net/git/live-manual.git"
+#| "\"><small><tt>git://live.debian.net/git/live-manual.git</tt></small></a>"
 msgid ""
-"% FIXME: as indicated above, it's too early for this topic. Move to later in "
-"the manual."
+"$ git clone git://live.debian.net/git/live-boot.git $ git clone git://live."
+"debian.net/git/live-config.git"
 msgstr ""
-"% FIXME: as indicated above, it's too early for this topic. Move to later in "
-"the manual."
+"Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
+"live.debian.net/git/live-manual.git</tt></small></a>"
 
 #. type: Plain text
-#: en/user_installation.ssi:124
+#: en/user_installation.ssi:121
 msgid ""
-"And beware that if you want to add your pre-init script in live-bottom, you "
-"should name it without dashes '-', e.g: call it \"99new_feature\" and not "
-"\"99new-feature\"."
+"Consult the live-boot and live-config man pages for details on customizing "
+"if that is your reason for building these packages from source."
 msgstr ""
-"E fare attenzione che se si vuole aggiungere il proprio script di pre-init "
-"in live-bottom, si dovrebbe dargli un nome senza trattini '-', ad esempio: "
-"chiamarlo \"99new_feature\" e non \"99new-feature\"."
 
 #. type: Plain text
-#: en/user_installation.ssi:126
-msgid "_* Build a live-boot .deb"
+#: en/user_installation.ssi:123
+#, fuzzy
+#| msgid "_* Build a live-boot .deb"
+msgid "_* Build live-boot and live-config .deb files"
 msgstr "_* Costruire un .deb di live-boot"
 
 #. type: Plain text
-#: en/user_installation.ssi:128
+#: en/user_installation.ssi:125
 #, fuzzy
 #| msgid ""
 #| "You must build either on your target distribution or in a chroot "
@@ -435,7 +422,7 @@ msgstr ""
 "bisogna costruire su Squeeze."
 
 #. type: Plain text
-#: en/user_installation.ssi:130
+#: en/user_installation.ssi:127
 msgid ""
 "Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
 "build #{live-boot}# for a target distribution that differs from your build "
@@ -453,23 +440,37 @@ msgstr ""
 "{dpkg-dev}/):"
 
 #. type: Plain text
-#: en/user_installation.ssi:135
-msgid "$ cd live-boot $ dpkg-buildpackage -b -uc -us"
+#: en/user_installation.ssi:134
+#, fuzzy
+#| msgid "$ cd live-boot $ dpkg-buildpackage -b -uc -us"
+msgid ""
+"$ cd live-boot $ dpkg-buildpackage -b -uc -us $ cd ../live-config $ dpkg-"
+"buildpackage -b -uc -us"
 msgstr "$ cd live-boot $ dpkg-buildpackage -b -uc -us"
 
 #. type: Plain text
-#: en/user_installation.ssi:139
-msgid "_* Use the generated live-boot .deb"
+#: en/user_installation.ssi:138
+#, fuzzy
+#| msgid "_* Use the generated live-boot .deb"
+msgid "_* Use all generated .deb files"
 msgstr "_* Usare il .deb di live-boot generato"
 
 #. type: Plain text
-#: en/user_installation.ssi:141
+#: en/user_installation.ssi:140
+#, fuzzy
+#| msgid ""
+#| "As live-boot is installed by live-build system, installing the package in "
+#| "the host system is not sufficient: you should treat the generated .deb "
+#| "like another custom package. Please see {Customizing package installation}"
+#| "#customizing-package-installation for more information. You should pay "
+#| "particular attention to {Additional repositories}#additional-repositories."
 msgid ""
-"As live-boot is installed by live-build system, installing the package in "
-"the host system is not sufficient: you should treat the generated .deb like "
-"another custom package. Please see {Customizing package installation}"
-"#customizing-package-installation for more information. You should pay "
-"particular attention to {Additional repositories}#additional-repositories."
+"As live-boot and live-config are installed by live-build system, installing "
+"the packages in the host system is not sufficient: you should treat the "
+"generated .deb files like any other custom packages. Please see {Customizing "
+"package installation}#customizing-package-installation for more information. "
+"You should pay particular attention to {Additional repositories}#additional-"
+"repositories."
 msgstr ""
 "Siccome live-boot è installato dal sistema live-build, installare il "
 "pacchetto nel sistema host non è sufficiente: occorre trattare il .deb "
@@ -479,17 +480,18 @@ msgstr ""
 "repositories."
 
 #. type: Plain text
-#: en/user_installation.ssi:143
-msgid "3~ Using live-boot snapshots"
-msgstr "3~ Usare le istantanee di live-boot"
-
-#. type: Plain text
-#: en/user_installation.ssi:145
+#: en/user_installation.ssi:144
+#, fuzzy
+#| msgid ""
+#| "You can let live-build automatically use the latest snapshot of live-boot "
+#| "by configuring a third-party repository in your live-build configuration "
+#| "directory. Assuming you have already created a configuration tree with #"
+#| "{lb config}#:"
 msgid ""
-"You can let live-build automatically use the latest snapshot of live-boot by "
-"configuring a third-party repository in your live-build configuration "
-"directory. Assuming you have already created a configuration tree with #{lb "
-"config}#:"
+"You can let live-build automatically use the latest snapshots of live-boot "
+"and live-config by configuring a third-party repository in your live-build "
+"configuration directory. Assuming you have already created a configuration "
+"tree with #{lb config}#:"
 msgstr ""
 "Si può lasciare che live-build usi automaticamente l'ultima istantanea di "
 "live-boot configurando un repository esterno nella directory di "
@@ -497,6 +499,6 @@ msgstr ""
 "configurazione con #{lb config}#:"
 
 #. type: Plain text
-#: en/user_installation.ssi:149
+#: en/user_installation.ssi:148
 msgid "lb config --repository live.debian.net"
 msgstr "lb config --repository live.debian.net"
diff --git a/manual/po/pt_BR/user_basics.ssi.po b/manual/po/pt_BR/user_basics.ssi.po
index 18d90aa..a8ba5f2 100644
--- a/manual/po/pt_BR/user_basics.ssi.po
+++ b/manual/po/pt_BR/user_basics.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-28 07:16-0400\n"
+"POT-Creation-Date: 2010-12-12 14:05-0400\n"
 "PO-Revision-Date: 2010-10-20 06:53-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,132 +18,121 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
-#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
-#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
-#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
-#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
-#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
-#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
-#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
-#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
-#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
-#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
-#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
-#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
-#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
-#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
-#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
-#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
-#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
-#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/about_manual.ssi:170 en/project_bugs.ssi:58
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
+#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
+#: en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:142
+#: en/user_customization-packages.ssi:155
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:290
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:312
+#: en/user_customization-packages.ssi:330 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:50 en/user_customization-runtime.ssi:58
+#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
+#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
+#: en/user_examples.ssi:256 en/user_examples.ssi:271
 #: en/user_installation.ssi:38 en/user_installation.ssi:46
 #: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
-#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
-#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
-#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
-#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
-#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
-#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
-#: en/user_customization-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
+#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
+#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
+#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
+#: en/user_customization-packages.ssi:98
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:161
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
-#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
-#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
-#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
-#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
-#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:294
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:343 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
+#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
+#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
+#: en/user_examples.ssi:267 en/user_examples.ssi:285
 #: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:150
+#: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr "}code"
@@ -217,16 +206,11 @@ msgid ""
 "size. Note that it is 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 is used (see persistence)."
+"optional persistence is used (see {Persistence}#persistence)."
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:20
-msgid "% FIXME: <xref linkend=\"persistence\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:22
 msgid ""
 "_* *{Bootloader}*: A small piece of code crafted to boot from the chosen "
 "media, possibly presenting a prompt or menu to allow selection of options/"
@@ -240,7 +224,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
 msgid ""
 "You can use live-build to build the system image from your specifications, "
 "set up a Linux kernel, its initrd, and a bootloader to run them, all in one "
@@ -248,12 +232,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
 msgid "2~ First steps: building an ISO image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
 msgid ""
 "The following sequence of live-build commands will create a basic ISO hybrid "
 "image containing just the Debian standard system without X.org. It is "
@@ -263,93 +247,93 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
 msgid ""
 "First, we run the #{lb config}# command which will create a \"config/\" "
 "hierarchy in the current directory for use by other commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:32
 msgid "$ lb config"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:38
+#: en/user_basics.ssi:36
 msgid ""
 "By passing no parameters to #{lb config}#, we indicated that we wish to use "
 "the defaults (see {The lb config command}#lb-config)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:40
+#: en/user_basics.ssi:38
 msgid ""
 "Now that we have a \"config/\" hierarchy, we may build the image with the lb "
 "build command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
-#: en/user_examples.ssi:106 en/user_examples.ssi:153
+#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_examples.ssi:109 en/user_examples.ssi:156
 msgid "# lb build"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:48
+#: en/user_basics.ssi:46
 msgid ""
 "This process can take a while, depending on the speed of your network "
 "connection (see {The lb build command}#lb-build)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:50
+#: en/user_basics.ssi:48
 msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:52
+#: en/user_basics.ssi:50
 msgid "Testing an ISO is simple:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:56 en/user_basics.ssi:144
+#: en/user_basics.ssi:54 en/user_basics.ssi:142
 msgid "# apt-get install qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:58
+#: en/user_basics.ssi:56
 msgid "$ qemu -cdrom binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:62
+#: en/user_basics.ssi:60
 msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:64
+#: en/user_basics.ssi:62
 msgid "In order to test the ISO with virtualbox-ose:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:68
+#: en/user_basics.ssi:66
 msgid "# apt-get install virtualbox-ose virtualbox-ose-dkms"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:70
+#: en/user_basics.ssi:68
 msgid "$ virtualbox"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:74
+#: en/user_basics.ssi:72
 msgid ""
 "Create a new virtual machine, change the storage settings to use binary.iso "
 "as the CD/DVD device, and start the machine."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:76
+#: en/user_basics.ssi:74
 msgid ""
 "Note: For live systems containing X.org that you want to test with "
 "virtualbox-ose, you may wish to include the VirtualBox X.org driver package, "
@@ -358,37 +342,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:80
+#: en/user_basics.ssi:78
 msgid "# lb config --packages virtualbox-ose-guest-x11"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:84
+#: en/user_basics.ssi:82
 msgid "3~burning-iso-image Burning an ISO image to a physical medium"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:86
+#: en/user_basics.ssi:84
 msgid "Burning an ISO image is easy:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:88
 msgid "# apt-get install wodim"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:92
+#: en/user_basics.ssi:90
 msgid "$ wodim binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:94
 msgid "2~ Building a USB/HDD image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:98
+#: en/user_basics.ssi:96
 msgid ""
 "The following sequence of commands will create a basic USB/HDD image "
 "containing just the Debian standard system without X.org. It is suitable for "
@@ -400,7 +384,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:100
+#: en/user_basics.ssi:98
 msgid ""
 "Note: if you created an ISO image with the previous example, you will need "
 "to clean up your working directory with the #{lb clean}# command (see {The "
@@ -408,34 +392,34 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:104 en/user_basics.ssi:186
+#: en/user_basics.ssi:102 en/user_basics.ssi:184
 msgid "$ lb clean --binary"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:108
+#: en/user_basics.ssi:106
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the #{config/}"
 "# hierarchy to create a USB/HDD image type:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:112
+#: en/user_basics.ssi:110
 msgid "$ lb config -b usb-hdd"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:116
+#: en/user_basics.ssi:114
 msgid "Now build the image with the #{lb build} command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:124
+#: en/user_basics.ssi:122
 msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:126
+#: en/user_basics.ssi:124
 msgid ""
 "The generated binary image contains a VFAT partition and the syslinux "
 "bootloader, ready to be directly written on a USB stick. Plug in a USB stick "
@@ -443,12 +427,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:130
+#: en/user_basics.ssi:128
 msgid "$ dd if=binary.img of=${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:134
+#: en/user_basics.ssi:132
 msgid ""
 "where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
 "a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -457,35 +441,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:136
+#: en/user_basics.ssi:134
 #, no-wrap
 msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:136
 msgid ""
 "Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
 "type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:140
+#: en/user_basics.ssi:138
 msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:146
+#: en/user_basics.ssi:144
 msgid "$ qemu -hda binary.img"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:148
 msgid "3~ Using the space left on a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:152
+#: en/user_basics.ssi:150
 msgid ""
 "If you want to use the remaining free space after you have installed the "
 "binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -494,45 +478,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:156
+#: en/user_basics.ssi:154
 msgid "# gparted ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:160
+#: en/user_basics.ssi:158
 msgid ""
 "After the creation of the partition, you have to create a filesystem on it. "
 "One possible choice would be ext4."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:164
+#: en/user_basics.ssi:162
 msgid "# mkfs.ext4 ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:168
+#: en/user_basics.ssi:166
 msgid "If you want to use this data partition with Windows, use FAT32."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:172
+#: en/user_basics.ssi:170
 msgid "# mkfs.vfat -F 32"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:176
+#: en/user_basics.ssi:174
 #, no-wrap
 msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:176
 msgid "2~building-netboot-image Building a netboot image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:178
 msgid ""
 "The following sequence of commands will create a basic netboot image "
 "containing the Debian standard system without X.org. It is suitable for "
@@ -540,28 +524,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:182
+#: en/user_basics.ssi:180
 msgid ""
 "Note: if you performed any previous examples, you will need to clean up your "
 "working directory with the #{lb clean}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:190
+#: en/user_basics.ssi:188
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the \"config/"
 "\" hierarchy to create our netboot image:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:194
+#: en/user_basics.ssi:192
 msgid ""
 "$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
 "\"192.168.0.1\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:198
+#: en/user_basics.ssi:196
 msgid ""
 "In contrast with the ISO and USB/HDD images, netbooting does not support "
 "serving a filesystem image with the client, so the files must be served via "
@@ -571,12 +555,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:200
+#: en/user_basics.ssi:198
 msgid "Now build the image with the #{lb build}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:206
 msgid ""
 "In a network boot, the client runs a small piece of software which usually "
 "resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -587,7 +571,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:208
 msgid ""
 "For example, if you unpack the generated binary-net.tar.gz archive in the /"
 "srv/debian-live directory, you'll find the filesystem image in live/"
@@ -596,17 +580,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:210
 msgid "We must now configure three services on the server to enable netboot."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:212
 msgid "3~ DHCP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:214
 msgid ""
 "We must configure our network's DHCP server to be sure to give an IP address "
 "to the netbooting client system, and to advertise the location of the PXE "
@@ -614,25 +598,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:216
 msgid ""
 "Here is an example for inspiration, written for the ISC DHCP server #{isc-"
 "dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:220
-msgid "% FIXME"
+#: en/user_basics.ssi:218
+msgid ""
+"% FIXME: bring up to date: base example on default isc-dhcp-server config "
+"file in Squeeze"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:224
+#: en/user_basics.ssi:222
 #, no-wrap
 msgid "subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:227
+#: en/user_basics.ssi:225
 #, no-wrap
 msgid ""
 "  # IP addresses available for guests\n"
@@ -640,7 +626,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:230
+#: en/user_basics.ssi:228
 #, no-wrap
 msgid ""
 "  # allow booting from the net\n"
@@ -648,7 +634,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:235
+#: en/user_basics.ssi:233
 #, no-wrap
 msgid ""
 "  # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -658,7 +644,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:239
+#: en/user_basics.ssi:237
 #, no-wrap
 msgid ""
 "  # net boot configuration for guests with a PXE client:\n"
@@ -667,7 +653,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:242
+#: en/user_basics.ssi:240
 #, no-wrap
 msgid ""
 "    # PXE bootloader (first program to be loaded, by TFTP)\n"
@@ -675,7 +661,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:243
 #, no-wrap
 msgid ""
 "  }\n"
@@ -683,17 +669,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:247
 msgid "3~ TFTP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:249
 msgid "This serves the kernel and initial ramdisk to the system at run time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:253
+#: en/user_basics.ssi:251
 msgid ""
 "You should install the tftpd-hpa package. It can serve all files contained "
 "inside a root directory, usually /srv/tftp. To let it serve files inside /"
@@ -701,22 +687,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:257
+#: en/user_basics.ssi:255
 msgid "dpkg-reconfigure -plow tftpd-hpa"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:259
 msgid "and fill in the new tftp server directory when being asked about it."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:261
 msgid "3~ NFS server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:263
 msgid ""
 "Once the guest computer has downloaded and booted a Linux kernel and loaded "
 "its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -724,35 +710,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:265
 msgid "You need to install the nfs-kernel-server package."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:267
 msgid ""
 "Then, make the filesystem image available through NFS by adding a line like "
 "the following to /etc/exports:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:273
+#: en/user_basics.ssi:271
 msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:277
+#: en/user_basics.ssi:275
 msgid ""
 "and tell the NFS server about this new export with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:281
+#: en/user_basics.ssi:279
 msgid "# exportfs -rv"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:283
 msgid ""
 "Setting up these three services can be a little tricky. You might need some "
 "patience to get all of them working together. The Debian Installer Manual's "
@@ -761,40 +747,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:285
 msgid "3~ Netboot testing HowTo"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:287
 msgid ""
 "Netboot image creation is made easy with live-build magic, but testing the "
 "images on physical machines can be really time consuming."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:289
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:291
 msgid "3~ Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:293
 msgid "_* Install qemu, bridge-utils, sudo."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:295
 msgid "Edit /etc/qemu-ifup:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:308
+#: en/user_basics.ssi:306
 msgid ""
 "#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
 "\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -803,62 +789,62 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:310
 msgid "Get, or build a grub-floppy-netboot (in the svn)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:312
 msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:314
 msgid "3~ VMWare Player"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:316
 msgid "_* Install VMWare Player (\"free as in beer\" edition)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:318
 msgid ""
 "_* Create a PXETester directory, and create a text file called pxe.vwx inside"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:320
 msgid "_* Paste this text inside:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:330
+#: en/user_basics.ssi:328
 msgid ""
 "#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
 "\"512\" MemAllowAutoScaleDown = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:336
+#: en/user_basics.ssi:334
 msgid ""
 "ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
 "\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:339
+#: en/user_basics.ssi:337
 msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:342
+#: en/user_basics.ssi:340
 msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:347
+#: en/user_basics.ssi:345
 msgid ""
 "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 "
@@ -866,19 +852,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:349
 msgid ""
 "_* You can play with this configuration file (i.e. change memory limit to "
 "256)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:353
+#: en/user_basics.ssi:351
 msgid ""
 "_* Double click on this file (or run VMWare player and select this file)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:354
+#: en/user_basics.ssi:352
 msgid "_* When running just press space if that strange question comes up..."
 msgstr ""
diff --git a/manual/po/pt_BR/user_customization-runtime.ssi.po b/manual/po/pt_BR/user_customization-runtime.ssi.po
index c78edb4..0447b8c 100644
--- a/manual/po/pt_BR/user_customization-runtime.ssi.po
+++ b/manual/po/pt_BR/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-06 17:29-0400\n"
+"POT-Creation-Date: 2010-12-12 14:05-0400\n"
 "PO-Revision-Date: 2010-11-30 11:40+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -20,32 +20,22 @@ msgstr ""
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
-#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
-#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
-#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
-#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
-#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
-#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/about_manual.ssi:170 en/project_bugs.ssi:58
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
-#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
-#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
 #: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
 #: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
@@ -72,12 +62,14 @@ msgstr ""
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
 #: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:132
-#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
+#: en/user_examples.ssi:256 en/user_examples.ssi:271
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -89,32 +81,22 @@ msgstr "code{"
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
 #: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/other_faq.ssi:37 en/other_faq.ssi:46
-#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
-#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
-#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
-#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
-#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
-#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/about_manual.ssi:174 en/project_bugs.ssi:62
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
-#: en/user_customization-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
+#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
+#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
 #: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
@@ -140,12 +122,14 @@ msgstr "code{"
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
 #: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:118 en/user_installation.ssi:137
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
+#: en/user_examples.ssi:267 en/user_examples.ssi:285
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:150
+#: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -309,7 +293,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:72
-msgid "2~ Persistence"
+msgid "2~persistence Persistence"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/pt_BR/user_installation.ssi.po b/manual/po/pt_BR/user_installation.ssi.po
index c744226..8279ddc 100644
--- a/manual/po/pt_BR/user_installation.ssi.po
+++ b/manual/po/pt_BR/user_installation.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-11 22:46+0100\n"
+"POT-Creation-Date: 2010-12-12 14:05-0400\n"
 "PO-Revision-Date: 2010-10-16 20:36-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -26,14 +26,14 @@ msgstr ""
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
-#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
-#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
 #: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
 #: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -68,7 +68,7 @@ msgstr ""
 #: en/user_installation.ssi:56 en/user_installation.ssi:64
 #: en/user_installation.ssi:74 en/user_installation.ssi:82
 #: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:132 en/user_installation.ssi:147
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
 #: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
@@ -87,14 +87,14 @@ msgstr "code{"
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
+#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
 #: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
 #: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -127,8 +127,8 @@ msgstr "code{"
 #: en/user_installation.ssi:42 en/user_installation.ssi:50
 #: en/user_installation.ssi:60 en/user_installation.ssi:70
 #: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:118
-#: en/user_installation.ssi:137 en/user_installation.ssi:150
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:150
 #: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
@@ -222,7 +222,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:34
+#: en/user_installation.ssi:34 en/user_installation.ssi:104
 msgid "3~ From the Debian repository"
 msgstr ""
 
@@ -247,7 +247,7 @@ msgid "# aptitude install live-build"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:52
+#: en/user_installation.ssi:52 en/user_installation.ssi:108
 msgid "3~ From source"
 msgstr ""
 
@@ -307,7 +307,7 @@ msgid "# make uninstall"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:96
+#: en/user_installation.ssi:96 en/user_installation.ssi:142
 msgid "3~ From 'snapshots'"
 msgstr ""
 
@@ -321,77 +321,61 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:100
-msgid "2~ live-boot"
+msgid "2~ live-boot and live-config"
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:102
 #, no-wrap
-msgid "*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:104
-msgid "% FIXME: we also need to mention live-config"
+msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:106
-msgid "3~ Using a customized live-boot"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:108
 msgid ""
-"% FIXME: should follow the structure for live-build above (i.e. \"from source"
-"\", not \"customized\" -- we should not get into customization now, but "
-"should reserve that discussion for later."
+"Both live-boot and live-config are available from the Debian repository as "
+"per {Installing live-build}#installing-live-build."
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:110
 msgid ""
-"To modify the code you can follow the process below. Please ensure you are "
-"familiar with the terms mentioned in {Terms}#terms."
+"To use the latest source from git, you can follow the process below. Please "
+"ensure you are familiar with the terms mentioned in {Terms}#terms."
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:112
-msgid "_* Checkout the live-boot source"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:116
-msgid "$ git clone git://live.debian.net/git/live-boot.git"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:120
-msgid "_* Make changes to your local copy"
+msgid "_* Checkout the live-boot and live-config source"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:122
+#: en/user_installation.ssi:117
+#, fuzzy
+#| msgid ""
+#| "Git: <a href=\"git://live.debian.net/git/live-manual.git"
+#| "\"><small><tt>git://live.debian.net/git/live-manual.git</tt></small></a>"
 msgid ""
-"% FIXME: as indicated above, it's too early for this topic. Move to later in "
-"the manual."
+"$ git clone git://live.debian.net/git/live-boot.git $ git clone git://live."
+"debian.net/git/live-config.git"
 msgstr ""
+"Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
+"live.debian.net/git/live-manual.git</tt></small></a>"
 
 #. type: Plain text
-#: en/user_installation.ssi:124
+#: en/user_installation.ssi:121
 msgid ""
-"And beware that if you want to add your pre-init script in live-bottom, you "
-"should name it without dashes '-', e.g: call it \"99new_feature\" and not "
-"\"99new-feature\"."
+"Consult the live-boot and live-config man pages for details on customizing "
+"if that is your reason for building these packages from source."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:126
-msgid "_* Build a live-boot .deb"
+#: en/user_installation.ssi:123
+msgid "_* Build live-boot and live-config .deb files"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:128
+#: en/user_installation.ssi:125
 msgid ""
 "You must build either on your target distribution or in a chroot containing "
 "your target platform: this means if your target is Squeeze then you should "
@@ -399,7 +383,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:130
+#: en/user_installation.ssi:127
 msgid ""
 "Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
 "build #{live-boot}# for a target distribution that differs from your build "
@@ -410,40 +394,38 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:135
-msgid "$ cd live-boot $ dpkg-buildpackage -b -uc -us"
+#: en/user_installation.ssi:134
+msgid ""
+"$ cd live-boot $ dpkg-buildpackage -b -uc -us $ cd ../live-config $ dpkg-"
+"buildpackage -b -uc -us"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:139
-msgid "_* Use the generated live-boot .deb"
+#: en/user_installation.ssi:138
+msgid "_* Use all generated .deb files"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:141
+#: en/user_installation.ssi:140
 msgid ""
-"As live-boot is installed by live-build system, installing the package in "
-"the host system is not sufficient: you should treat the generated .deb like "
-"another custom package. Please see {Customizing package installation}"
-"#customizing-package-installation for more information. You should pay "
-"particular attention to {Additional repositories}#additional-repositories."
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:143
-msgid "3~ Using live-boot snapshots"
+"As live-boot and live-config are installed by live-build system, installing "
+"the packages in the host system is not sufficient: you should treat the "
+"generated .deb files like any other custom packages. Please see {Customizing "
+"package installation}#customizing-package-installation for more information. "
+"You should pay particular attention to {Additional repositories}#additional-"
+"repositories."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:145
+#: en/user_installation.ssi:144
 msgid ""
-"You can let live-build automatically use the latest snapshot of live-boot by "
-"configuring a third-party repository in your live-build configuration "
-"directory. Assuming you have already created a configuration tree with #{lb "
-"config}#:"
+"You can let live-build automatically use the latest snapshots of live-boot "
+"and live-config by configuring a third-party repository in your live-build "
+"configuration directory. Assuming you have already created a configuration "
+"tree with #{lb config}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:149
+#: en/user_installation.ssi:148
 msgid "lb config --repository live.debian.net"
 msgstr ""
diff --git a/manual/po/ro/user_basics.ssi.po b/manual/po/ro/user_basics.ssi.po
index 6577a75..5b4060d 100644
--- a/manual/po/ro/user_basics.ssi.po
+++ b/manual/po/ro/user_basics.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-28 07:16-0400\n"
+"POT-Creation-Date: 2010-12-12 14:05-0400\n"
 "PO-Revision-Date: 2010-10-23 16:43+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -19,132 +19,121 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
-#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
-#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
-#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
-#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
-#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
-#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
-#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
-#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
-#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
-#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
-#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
-#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
-#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
-#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
-#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
-#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
-#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
-#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/about_manual.ssi:170 en/project_bugs.ssi:58
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
+#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
+#: en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:142
+#: en/user_customization-packages.ssi:155
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:290
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:312
+#: en/user_customization-packages.ssi:330 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:50 en/user_customization-runtime.ssi:58
+#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
+#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
+#: en/user_examples.ssi:256 en/user_examples.ssi:271
 #: en/user_installation.ssi:38 en/user_installation.ssi:46
 #: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
-#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
-#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
-#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
-#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
-#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
-#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
-#: en/user_customization-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
+#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
+#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
+#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
+#: en/user_customization-packages.ssi:98
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:161
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
-#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
-#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
-#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
-#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
-#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:294
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:343 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
+#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
+#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
+#: en/user_examples.ssi:267 en/user_examples.ssi:285
 #: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:150
+#: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr "}code"
@@ -218,16 +207,11 @@ msgid ""
 "size. Note that it is 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 is used (see persistence)."
+"optional persistence is used (see {Persistence}#persistence)."
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:20
-msgid "% FIXME: <xref linkend=\"persistence\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:22
 msgid ""
 "_* *{Bootloader}*: A small piece of code crafted to boot from the chosen "
 "media, possibly presenting a prompt or menu to allow selection of options/"
@@ -241,7 +225,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
 msgid ""
 "You can use live-build to build the system image from your specifications, "
 "set up a Linux kernel, its initrd, and a bootloader to run them, all in one "
@@ -249,12 +233,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
 msgid "2~ First steps: building an ISO image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
 msgid ""
 "The following sequence of live-build commands will create a basic ISO hybrid "
 "image containing just the Debian standard system without X.org. It is "
@@ -264,93 +248,93 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
 msgid ""
 "First, we run the #{lb config}# command which will create a \"config/\" "
 "hierarchy in the current directory for use by other commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:32
 msgid "$ lb config"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:38
+#: en/user_basics.ssi:36
 msgid ""
 "By passing no parameters to #{lb config}#, we indicated that we wish to use "
 "the defaults (see {The lb config command}#lb-config)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:40
+#: en/user_basics.ssi:38
 msgid ""
 "Now that we have a \"config/\" hierarchy, we may build the image with the lb "
 "build command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
-#: en/user_examples.ssi:106 en/user_examples.ssi:153
+#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_examples.ssi:109 en/user_examples.ssi:156
 msgid "# lb build"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:48
+#: en/user_basics.ssi:46
 msgid ""
 "This process can take a while, depending on the speed of your network "
 "connection (see {The lb build command}#lb-build)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:50
+#: en/user_basics.ssi:48
 msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:52
+#: en/user_basics.ssi:50
 msgid "Testing an ISO is simple:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:56 en/user_basics.ssi:144
+#: en/user_basics.ssi:54 en/user_basics.ssi:142
 msgid "# apt-get install qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:58
+#: en/user_basics.ssi:56
 msgid "$ qemu -cdrom binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:62
+#: en/user_basics.ssi:60
 msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:64
+#: en/user_basics.ssi:62
 msgid "In order to test the ISO with virtualbox-ose:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:68
+#: en/user_basics.ssi:66
 msgid "# apt-get install virtualbox-ose virtualbox-ose-dkms"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:70
+#: en/user_basics.ssi:68
 msgid "$ virtualbox"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:74
+#: en/user_basics.ssi:72
 msgid ""
 "Create a new virtual machine, change the storage settings to use binary.iso "
 "as the CD/DVD device, and start the machine."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:76
+#: en/user_basics.ssi:74
 msgid ""
 "Note: For live systems containing X.org that you want to test with "
 "virtualbox-ose, you may wish to include the VirtualBox X.org driver package, "
@@ -359,37 +343,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:80
+#: en/user_basics.ssi:78
 msgid "# lb config --packages virtualbox-ose-guest-x11"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:84
+#: en/user_basics.ssi:82
 msgid "3~burning-iso-image Burning an ISO image to a physical medium"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:86
+#: en/user_basics.ssi:84
 msgid "Burning an ISO image is easy:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:88
 msgid "# apt-get install wodim"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:92
+#: en/user_basics.ssi:90
 msgid "$ wodim binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:94
 msgid "2~ Building a USB/HDD image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:98
+#: en/user_basics.ssi:96
 msgid ""
 "The following sequence of commands will create a basic USB/HDD image "
 "containing just the Debian standard system without X.org. It is suitable for "
@@ -401,7 +385,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:100
+#: en/user_basics.ssi:98
 msgid ""
 "Note: if you created an ISO image with the previous example, you will need "
 "to clean up your working directory with the #{lb clean}# command (see {The "
@@ -409,34 +393,34 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:104 en/user_basics.ssi:186
+#: en/user_basics.ssi:102 en/user_basics.ssi:184
 msgid "$ lb clean --binary"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:108
+#: en/user_basics.ssi:106
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the #{config/}"
 "# hierarchy to create a USB/HDD image type:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:112
+#: en/user_basics.ssi:110
 msgid "$ lb config -b usb-hdd"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:116
+#: en/user_basics.ssi:114
 msgid "Now build the image with the #{lb build} command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:124
+#: en/user_basics.ssi:122
 msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:126
+#: en/user_basics.ssi:124
 msgid ""
 "The generated binary image contains a VFAT partition and the syslinux "
 "bootloader, ready to be directly written on a USB stick. Plug in a USB stick "
@@ -444,12 +428,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:130
+#: en/user_basics.ssi:128
 msgid "$ dd if=binary.img of=${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:134
+#: en/user_basics.ssi:132
 msgid ""
 "where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
 "a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -458,35 +442,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:136
+#: en/user_basics.ssi:134
 #, no-wrap
 msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:136
 msgid ""
 "Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
 "type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:140
+#: en/user_basics.ssi:138
 msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:146
+#: en/user_basics.ssi:144
 msgid "$ qemu -hda binary.img"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:148
 msgid "3~ Using the space left on a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:152
+#: en/user_basics.ssi:150
 msgid ""
 "If you want to use the remaining free space after you have installed the "
 "binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -495,45 +479,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:156
+#: en/user_basics.ssi:154
 msgid "# gparted ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:160
+#: en/user_basics.ssi:158
 msgid ""
 "After the creation of the partition, you have to create a filesystem on it. "
 "One possible choice would be ext4."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:164
+#: en/user_basics.ssi:162
 msgid "# mkfs.ext4 ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:168
+#: en/user_basics.ssi:166
 msgid "If you want to use this data partition with Windows, use FAT32."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:172
+#: en/user_basics.ssi:170
 msgid "# mkfs.vfat -F 32"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:176
+#: en/user_basics.ssi:174
 #, no-wrap
 msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:176
 msgid "2~building-netboot-image Building a netboot image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:178
 msgid ""
 "The following sequence of commands will create a basic netboot image "
 "containing the Debian standard system without X.org. It is suitable for "
@@ -541,28 +525,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:182
+#: en/user_basics.ssi:180
 msgid ""
 "Note: if you performed any previous examples, you will need to clean up your "
 "working directory with the #{lb clean}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:190
+#: en/user_basics.ssi:188
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the \"config/"
 "\" hierarchy to create our netboot image:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:194
+#: en/user_basics.ssi:192
 msgid ""
 "$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
 "\"192.168.0.1\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:198
+#: en/user_basics.ssi:196
 msgid ""
 "In contrast with the ISO and USB/HDD images, netbooting does not support "
 "serving a filesystem image with the client, so the files must be served via "
@@ -572,12 +556,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:200
+#: en/user_basics.ssi:198
 msgid "Now build the image with the #{lb build}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:206
 msgid ""
 "In a network boot, the client runs a small piece of software which usually "
 "resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -588,7 +572,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:208
 msgid ""
 "For example, if you unpack the generated binary-net.tar.gz archive in the /"
 "srv/debian-live directory, you'll find the filesystem image in live/"
@@ -597,17 +581,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:210
 msgid "We must now configure three services on the server to enable netboot."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:212
 msgid "3~ DHCP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:214
 msgid ""
 "We must configure our network's DHCP server to be sure to give an IP address "
 "to the netbooting client system, and to advertise the location of the PXE "
@@ -615,25 +599,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:216
 msgid ""
 "Here is an example for inspiration, written for the ISC DHCP server #{isc-"
 "dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:220
-msgid "% FIXME"
+#: en/user_basics.ssi:218
+msgid ""
+"% FIXME: bring up to date: base example on default isc-dhcp-server config "
+"file in Squeeze"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:224
+#: en/user_basics.ssi:222
 #, no-wrap
 msgid "subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:227
+#: en/user_basics.ssi:225
 #, no-wrap
 msgid ""
 "  # IP addresses available for guests\n"
@@ -641,7 +627,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:230
+#: en/user_basics.ssi:228
 #, no-wrap
 msgid ""
 "  # allow booting from the net\n"
@@ -649,7 +635,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:235
+#: en/user_basics.ssi:233
 #, no-wrap
 msgid ""
 "  # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -659,7 +645,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:239
+#: en/user_basics.ssi:237
 #, no-wrap
 msgid ""
 "  # net boot configuration for guests with a PXE client:\n"
@@ -668,7 +654,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:242
+#: en/user_basics.ssi:240
 #, no-wrap
 msgid ""
 "    # PXE bootloader (first program to be loaded, by TFTP)\n"
@@ -676,7 +662,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:243
 #, no-wrap
 msgid ""
 "  }\n"
@@ -684,17 +670,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:247
 msgid "3~ TFTP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:249
 msgid "This serves the kernel and initial ramdisk to the system at run time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:253
+#: en/user_basics.ssi:251
 msgid ""
 "You should install the tftpd-hpa package. It can serve all files contained "
 "inside a root directory, usually /srv/tftp. To let it serve files inside /"
@@ -702,22 +688,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:257
+#: en/user_basics.ssi:255
 msgid "dpkg-reconfigure -plow tftpd-hpa"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:259
 msgid "and fill in the new tftp server directory when being asked about it."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:261
 msgid "3~ NFS server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:263
 msgid ""
 "Once the guest computer has downloaded and booted a Linux kernel and loaded "
 "its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -725,35 +711,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:265
 msgid "You need to install the nfs-kernel-server package."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:267
 msgid ""
 "Then, make the filesystem image available through NFS by adding a line like "
 "the following to /etc/exports:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:273
+#: en/user_basics.ssi:271
 msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:277
+#: en/user_basics.ssi:275
 msgid ""
 "and tell the NFS server about this new export with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:281
+#: en/user_basics.ssi:279
 msgid "# exportfs -rv"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:283
 msgid ""
 "Setting up these three services can be a little tricky. You might need some "
 "patience to get all of them working together. The Debian Installer Manual's "
@@ -762,40 +748,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:285
 msgid "3~ Netboot testing HowTo"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:287
 msgid ""
 "Netboot image creation is made easy with live-build magic, but testing the "
 "images on physical machines can be really time consuming."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:289
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:291
 msgid "3~ Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:293
 msgid "_* Install qemu, bridge-utils, sudo."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:295
 msgid "Edit /etc/qemu-ifup:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:308
+#: en/user_basics.ssi:306
 msgid ""
 "#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
 "\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -804,62 +790,62 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:310
 msgid "Get, or build a grub-floppy-netboot (in the svn)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:312
 msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:314
 msgid "3~ VMWare Player"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:316
 msgid "_* Install VMWare Player (\"free as in beer\" edition)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:318
 msgid ""
 "_* Create a PXETester directory, and create a text file called pxe.vwx inside"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:320
 msgid "_* Paste this text inside:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:330
+#: en/user_basics.ssi:328
 msgid ""
 "#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
 "\"512\" MemAllowAutoScaleDown = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:336
+#: en/user_basics.ssi:334
 msgid ""
 "ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
 "\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:339
+#: en/user_basics.ssi:337
 msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:342
+#: en/user_basics.ssi:340
 msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:347
+#: en/user_basics.ssi:345
 msgid ""
 "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 "
@@ -867,19 +853,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:349
 msgid ""
 "_* You can play with this configuration file (i.e. change memory limit to "
 "256)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:353
+#: en/user_basics.ssi:351
 msgid ""
 "_* Double click on this file (or run VMWare player and select this file)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:354
+#: en/user_basics.ssi:352
 msgid "_* When running just press space if that strange question comes up..."
 msgstr ""
diff --git a/manual/po/ro/user_customization-runtime.ssi.po b/manual/po/ro/user_customization-runtime.ssi.po
index dd0bf9c..911dd4a 100644
--- a/manual/po/ro/user_customization-runtime.ssi.po
+++ b/manual/po/ro/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-06 17:29-0400\n"
+"POT-Creation-Date: 2010-12-12 14:05-0400\n"
 "PO-Revision-Date: 2010-11-30 11:40+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -21,32 +21,22 @@ msgstr ""
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
-#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
-#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
-#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
-#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
-#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
-#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/about_manual.ssi:170 en/project_bugs.ssi:58
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
-#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
-#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
 #: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
 #: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
@@ -73,12 +63,14 @@ msgstr ""
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
 #: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:132
-#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
+#: en/user_examples.ssi:256 en/user_examples.ssi:271
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -90,32 +82,22 @@ msgstr "code{"
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
 #: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/other_faq.ssi:37 en/other_faq.ssi:46
-#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
-#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
-#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
-#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
-#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
-#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/about_manual.ssi:174 en/project_bugs.ssi:62
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
-#: en/user_customization-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
+#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
+#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
 #: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
@@ -141,12 +123,14 @@ msgstr "code{"
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
 #: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:118 en/user_installation.ssi:137
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
+#: en/user_examples.ssi:267 en/user_examples.ssi:285
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:150
+#: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -310,7 +294,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:72
-msgid "2~ Persistence"
+msgid "2~persistence Persistence"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/user_installation.ssi.po b/manual/po/ro/user_installation.ssi.po
index 1b869e6..26be5c0 100644
--- a/manual/po/ro/user_installation.ssi.po
+++ b/manual/po/ro/user_installation.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-11 22:46+0100\n"
+"POT-Creation-Date: 2010-12-12 14:05-0400\n"
 "PO-Revision-Date: 2010-10-23 16:43+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -27,14 +27,14 @@ msgstr ""
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
-#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
-#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
 #: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
 #: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -69,7 +69,7 @@ msgstr ""
 #: en/user_installation.ssi:56 en/user_installation.ssi:64
 #: en/user_installation.ssi:74 en/user_installation.ssi:82
 #: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:132 en/user_installation.ssi:147
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
 #: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
@@ -88,14 +88,14 @@ msgstr "code{"
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
+#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
 #: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
 #: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -128,8 +128,8 @@ msgstr "code{"
 #: en/user_installation.ssi:42 en/user_installation.ssi:50
 #: en/user_installation.ssi:60 en/user_installation.ssi:70
 #: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:118
-#: en/user_installation.ssi:137 en/user_installation.ssi:150
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:150
 #: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
@@ -223,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:34
+#: en/user_installation.ssi:34 en/user_installation.ssi:104
 msgid "3~ From the Debian repository"
 msgstr ""
 
@@ -248,7 +248,7 @@ msgid "# aptitude install live-build"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:52
+#: en/user_installation.ssi:52 en/user_installation.ssi:108
 msgid "3~ From source"
 msgstr ""
 
@@ -308,7 +308,7 @@ msgid "# make uninstall"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:96
+#: en/user_installation.ssi:96 en/user_installation.ssi:142
 msgid "3~ From 'snapshots'"
 msgstr ""
 
@@ -322,77 +322,57 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:100
-msgid "2~ live-boot"
+msgid "2~ live-boot and live-config"
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:102
 #, no-wrap
-msgid "*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:104
-msgid "% FIXME: we also need to mention live-config"
+msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:106
-msgid "3~ Using a customized live-boot"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:108
 msgid ""
-"% FIXME: should follow the structure for live-build above (i.e. \"from source"
-"\", not \"customized\" -- we should not get into customization now, but "
-"should reserve that discussion for later."
+"Both live-boot and live-config are available from the Debian repository as "
+"per {Installing live-build}#installing-live-build."
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:110
 msgid ""
-"To modify the code you can follow the process below. Please ensure you are "
-"familiar with the terms mentioned in {Terms}#terms."
+"To use the latest source from git, you can follow the process below. Please "
+"ensure you are familiar with the terms mentioned in {Terms}#terms."
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:112
-msgid "_* Checkout the live-boot source"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:116
-msgid "$ git clone git://live.debian.net/git/live-boot.git"
+msgid "_* Checkout the live-boot and live-config source"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:120
-msgid "_* Make changes to your local copy"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:122
+#: en/user_installation.ssi:117
+#, fuzzy
+#| msgid "$ git clone git://live.debian.net/git/live-manual.git"
 msgid ""
-"% FIXME: as indicated above, it's too early for this topic. Move to later in "
-"the manual."
-msgstr ""
+"$ git clone git://live.debian.net/git/live-boot.git $ git clone git://live."
+"debian.net/git/live-config.git"
+msgstr "$ git clone git://live.debian.net/git/live-manual.git"
 
 #. type: Plain text
-#: en/user_installation.ssi:124
+#: en/user_installation.ssi:121
 msgid ""
-"And beware that if you want to add your pre-init script in live-bottom, you "
-"should name it without dashes '-', e.g: call it \"99new_feature\" and not "
-"\"99new-feature\"."
+"Consult the live-boot and live-config man pages for details on customizing "
+"if that is your reason for building these packages from source."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:126
-msgid "_* Build a live-boot .deb"
+#: en/user_installation.ssi:123
+msgid "_* Build live-boot and live-config .deb files"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:128
+#: en/user_installation.ssi:125
 msgid ""
 "You must build either on your target distribution or in a chroot containing "
 "your target platform: this means if your target is Squeeze then you should "
@@ -400,7 +380,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:130
+#: en/user_installation.ssi:127
 msgid ""
 "Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
 "build #{live-boot}# for a target distribution that differs from your build "
@@ -411,40 +391,38 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:135
-msgid "$ cd live-boot $ dpkg-buildpackage -b -uc -us"
+#: en/user_installation.ssi:134
+msgid ""
+"$ cd live-boot $ dpkg-buildpackage -b -uc -us $ cd ../live-config $ dpkg-"
+"buildpackage -b -uc -us"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:139
-msgid "_* Use the generated live-boot .deb"
+#: en/user_installation.ssi:138
+msgid "_* Use all generated .deb files"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:141
+#: en/user_installation.ssi:140
 msgid ""
-"As live-boot is installed by live-build system, installing the package in "
-"the host system is not sufficient: you should treat the generated .deb like "
-"another custom package. Please see {Customizing package installation}"
-"#customizing-package-installation for more information. You should pay "
-"particular attention to {Additional repositories}#additional-repositories."
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:143
-msgid "3~ Using live-boot snapshots"
+"As live-boot and live-config are installed by live-build system, installing "
+"the packages in the host system is not sufficient: you should treat the "
+"generated .deb files like any other custom packages. Please see {Customizing "
+"package installation}#customizing-package-installation for more information. "
+"You should pay particular attention to {Additional repositories}#additional-"
+"repositories."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:145
+#: en/user_installation.ssi:144
 msgid ""
-"You can let live-build automatically use the latest snapshot of live-boot by "
-"configuring a third-party repository in your live-build configuration "
-"directory. Assuming you have already created a configuration tree with #{lb "
-"config}#:"
+"You can let live-build automatically use the latest snapshots of live-boot "
+"and live-config by configuring a third-party repository in your live-build "
+"configuration directory. Assuming you have already created a configuration "
+"tree with #{lb config}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:149
+#: en/user_installation.ssi:148
 msgid "lb config --repository live.debian.net"
 msgstr ""
diff --git a/manual/pot/user_basics.ssi.pot b/manual/pot/user_basics.ssi.pot
index 3ac6529..e201fef 100644
--- a/manual/pot/user_basics.ssi.pot
+++ b/manual/pot/user_basics.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-28 07:16-0400\n"
+"POT-Creation-Date: 2010-12-12 14:05-0400\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"
@@ -18,132 +18,121 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
-#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
-#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
-#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
-#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
-#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
-#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
-#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
-#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
-#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
-#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
-#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
-#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
-#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
-#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
-#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
-#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
-#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
-#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/about_manual.ssi:170 en/project_bugs.ssi:58
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
+#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
+#: en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:142
+#: en/user_customization-packages.ssi:155
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:290
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:312
+#: en/user_customization-packages.ssi:330 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:50 en/user_customization-runtime.ssi:58
+#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
+#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
+#: en/user_examples.ssi:256 en/user_examples.ssi:271
 #: en/user_installation.ssi:38 en/user_installation.ssi:46
 #: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
-#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
-#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
-#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
-#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
-#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
-#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
-#: en/user_customization-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi:62
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
+#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
+#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
+#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
+#: en/user_customization-packages.ssi:98
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:161
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
-#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
-#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
-#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
-#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
-#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:294
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:343 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
+#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
+#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
+#: en/user_examples.ssi:267 en/user_examples.ssi:285
 #: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:150
+#: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr ""
@@ -217,16 +206,11 @@ msgid ""
 "size. Note that it is 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 is used (see persistence)."
+"optional persistence is used (see {Persistence}#persistence)."
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:20
-msgid "% FIXME: <xref linkend=\"persistence\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:22
 msgid ""
 "_* *{Bootloader}*: A small piece of code crafted to boot from the chosen "
 "media, possibly presenting a prompt or menu to allow selection of options/"
@@ -240,7 +224,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
 msgid ""
 "You can use live-build to build the system image from your specifications, "
 "set up a Linux kernel, its initrd, and a bootloader to run them, all in one "
@@ -248,12 +232,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
 msgid "2~ First steps: building an ISO image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
 msgid ""
 "The following sequence of live-build commands will create a basic ISO hybrid "
 "image containing just the Debian standard system without X.org. It is "
@@ -263,93 +247,93 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
 msgid ""
 "First, we run the #{lb config}# command which will create a \"config/\" "
 "hierarchy in the current directory for use by other commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:32
 msgid "$ lb config"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:38
+#: en/user_basics.ssi:36
 msgid ""
 "By passing no parameters to #{lb config}#, we indicated that we wish to use "
 "the defaults (see {The lb config command}#lb-config)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:40
+#: en/user_basics.ssi:38
 msgid ""
 "Now that we have a \"config/\" hierarchy, we may build the image with the lb "
 "build command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
-#: en/user_examples.ssi:106 en/user_examples.ssi:153
+#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_examples.ssi:109 en/user_examples.ssi:156
 msgid "# lb build"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:48
+#: en/user_basics.ssi:46
 msgid ""
 "This process can take a while, depending on the speed of your network "
 "connection (see {The lb build command}#lb-build)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:50
+#: en/user_basics.ssi:48
 msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:52
+#: en/user_basics.ssi:50
 msgid "Testing an ISO is simple:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:56 en/user_basics.ssi:144
+#: en/user_basics.ssi:54 en/user_basics.ssi:142
 msgid "# apt-get install qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:58
+#: en/user_basics.ssi:56
 msgid "$ qemu -cdrom binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:62
+#: en/user_basics.ssi:60
 msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:64
+#: en/user_basics.ssi:62
 msgid "In order to test the ISO with virtualbox-ose:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:68
+#: en/user_basics.ssi:66
 msgid "# apt-get install virtualbox-ose virtualbox-ose-dkms"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:70
+#: en/user_basics.ssi:68
 msgid "$ virtualbox"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:74
+#: en/user_basics.ssi:72
 msgid ""
 "Create a new virtual machine, change the storage settings to use binary.iso "
 "as the CD/DVD device, and start the machine."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:76
+#: en/user_basics.ssi:74
 msgid ""
 "Note: For live systems containing X.org that you want to test with "
 "virtualbox-ose, you may wish to include the VirtualBox X.org driver package, "
@@ -358,37 +342,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:80
+#: en/user_basics.ssi:78
 msgid "# lb config --packages virtualbox-ose-guest-x11"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:84
+#: en/user_basics.ssi:82
 msgid "3~burning-iso-image Burning an ISO image to a physical medium"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:86
+#: en/user_basics.ssi:84
 msgid "Burning an ISO image is easy:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:88
 msgid "# apt-get install wodim"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:92
+#: en/user_basics.ssi:90
 msgid "$ wodim binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:94
 msgid "2~ Building a USB/HDD image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:98
+#: en/user_basics.ssi:96
 msgid ""
 "The following sequence of commands will create a basic USB/HDD image "
 "containing just the Debian standard system without X.org. It is suitable for "
@@ -400,7 +384,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:100
+#: en/user_basics.ssi:98
 msgid ""
 "Note: if you created an ISO image with the previous example, you will need "
 "to clean up your working directory with the #{lb clean}# command (see {The "
@@ -408,34 +392,34 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:104 en/user_basics.ssi:186
+#: en/user_basics.ssi:102 en/user_basics.ssi:184
 msgid "$ lb clean --binary"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:108
+#: en/user_basics.ssi:106
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the #{config/}"
 "# hierarchy to create a USB/HDD image type:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:112
+#: en/user_basics.ssi:110
 msgid "$ lb config -b usb-hdd"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:116
+#: en/user_basics.ssi:114
 msgid "Now build the image with the #{lb build} command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:124
+#: en/user_basics.ssi:122
 msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:126
+#: en/user_basics.ssi:124
 msgid ""
 "The generated binary image contains a VFAT partition and the syslinux "
 "bootloader, ready to be directly written on a USB stick. Plug in a USB stick "
@@ -443,12 +427,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:130
+#: en/user_basics.ssi:128
 msgid "$ dd if=binary.img of=${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:134
+#: en/user_basics.ssi:132
 msgid ""
 "where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
 "a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -457,35 +441,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:136
+#: en/user_basics.ssi:134
 #, no-wrap
 msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:136
 msgid ""
 "Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
 "type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:140
+#: en/user_basics.ssi:138
 msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:146
+#: en/user_basics.ssi:144
 msgid "$ qemu -hda binary.img"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:148
 msgid "3~ Using the space left on a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:152
+#: en/user_basics.ssi:150
 msgid ""
 "If you want to use the remaining free space after you have installed the "
 "binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -494,45 +478,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:156
+#: en/user_basics.ssi:154
 msgid "# gparted ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:160
+#: en/user_basics.ssi:158
 msgid ""
 "After the creation of the partition, you have to create a filesystem on it. "
 "One possible choice would be ext4."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:164
+#: en/user_basics.ssi:162
 msgid "# mkfs.ext4 ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:168
+#: en/user_basics.ssi:166
 msgid "If you want to use this data partition with Windows, use FAT32."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:172
+#: en/user_basics.ssi:170
 msgid "# mkfs.vfat -F 32"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:176
+#: en/user_basics.ssi:174
 #, no-wrap
 msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:176
 msgid "2~building-netboot-image Building a netboot image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:178
 msgid ""
 "The following sequence of commands will create a basic netboot image "
 "containing the Debian standard system without X.org. It is suitable for "
@@ -540,28 +524,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:182
+#: en/user_basics.ssi:180
 msgid ""
 "Note: if you performed any previous examples, you will need to clean up your "
 "working directory with the #{lb clean}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:190
+#: en/user_basics.ssi:188
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the \"config/"
 "\" hierarchy to create our netboot image:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:194
+#: en/user_basics.ssi:192
 msgid ""
 "$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
 "\"192.168.0.1\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:198
+#: en/user_basics.ssi:196
 msgid ""
 "In contrast with the ISO and USB/HDD images, netbooting does not support "
 "serving a filesystem image with the client, so the files must be served via "
@@ -571,12 +555,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:200
+#: en/user_basics.ssi:198
 msgid "Now build the image with the #{lb build}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:206
 msgid ""
 "In a network boot, the client runs a small piece of software which usually "
 "resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -587,7 +571,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:208
 msgid ""
 "For example, if you unpack the generated binary-net.tar.gz archive in the /"
 "srv/debian-live directory, you'll find the filesystem image in live/"
@@ -596,17 +580,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:210
 msgid "We must now configure three services on the server to enable netboot."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:212
 msgid "3~ DHCP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:214
 msgid ""
 "We must configure our network's DHCP server to be sure to give an IP address "
 "to the netbooting client system, and to advertise the location of the PXE "
@@ -614,25 +598,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:216
 msgid ""
 "Here is an example for inspiration, written for the ISC DHCP server #{isc-"
 "dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:220
-msgid "% FIXME"
+#: en/user_basics.ssi:218
+msgid ""
+"% FIXME: bring up to date: base example on default isc-dhcp-server config "
+"file in Squeeze"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:224
+#: en/user_basics.ssi:222
 #, no-wrap
 msgid "subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:227
+#: en/user_basics.ssi:225
 #, no-wrap
 msgid ""
 "  # IP addresses available for guests\n"
@@ -640,7 +626,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:230
+#: en/user_basics.ssi:228
 #, no-wrap
 msgid ""
 "  # allow booting from the net\n"
@@ -648,7 +634,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:235
+#: en/user_basics.ssi:233
 #, no-wrap
 msgid ""
 "  # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -658,7 +644,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:239
+#: en/user_basics.ssi:237
 #, no-wrap
 msgid ""
 "  # net boot configuration for guests with a PXE client:\n"
@@ -667,7 +653,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:242
+#: en/user_basics.ssi:240
 #, no-wrap
 msgid ""
 "    # PXE bootloader (first program to be loaded, by TFTP)\n"
@@ -675,7 +661,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:243
 #, no-wrap
 msgid ""
 "  }\n"
@@ -683,17 +669,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:247
 msgid "3~ TFTP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:249
 msgid "This serves the kernel and initial ramdisk to the system at run time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:253
+#: en/user_basics.ssi:251
 msgid ""
 "You should install the tftpd-hpa package. It can serve all files contained "
 "inside a root directory, usually /srv/tftp. To let it serve files inside /"
@@ -701,22 +687,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:257
+#: en/user_basics.ssi:255
 msgid "dpkg-reconfigure -plow tftpd-hpa"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:259
 msgid "and fill in the new tftp server directory when being asked about it."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:261
 msgid "3~ NFS server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:263
 msgid ""
 "Once the guest computer has downloaded and booted a Linux kernel and loaded "
 "its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -724,35 +710,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:265
 msgid "You need to install the nfs-kernel-server package."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:267
 msgid ""
 "Then, make the filesystem image available through NFS by adding a line like "
 "the following to /etc/exports:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:273
+#: en/user_basics.ssi:271
 msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:277
+#: en/user_basics.ssi:275
 msgid ""
 "and tell the NFS server about this new export with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:281
+#: en/user_basics.ssi:279
 msgid "# exportfs -rv"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:283
 msgid ""
 "Setting up these three services can be a little tricky. You might need some "
 "patience to get all of them working together. The Debian Installer Manual's "
@@ -761,40 +747,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:285
 msgid "3~ Netboot testing HowTo"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:287
 msgid ""
 "Netboot image creation is made easy with live-build magic, but testing the "
 "images on physical machines can be really time consuming."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:289
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:291
 msgid "3~ Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:293
 msgid "_* Install qemu, bridge-utils, sudo."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:295
 msgid "Edit /etc/qemu-ifup:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:308
+#: en/user_basics.ssi:306
 msgid ""
 "#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
 "\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -803,62 +789,62 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:310
 msgid "Get, or build a grub-floppy-netboot (in the svn)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:312
 msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:314
 msgid "3~ VMWare Player"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:316
 msgid "_* Install VMWare Player (\"free as in beer\" edition)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:318
 msgid ""
 "_* Create a PXETester directory, and create a text file called pxe.vwx inside"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:320
 msgid "_* Paste this text inside:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:330
+#: en/user_basics.ssi:328
 msgid ""
 "#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
 "\"512\" MemAllowAutoScaleDown = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:336
+#: en/user_basics.ssi:334
 msgid ""
 "ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
 "\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:339
+#: en/user_basics.ssi:337
 msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:342
+#: en/user_basics.ssi:340
 msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:347
+#: en/user_basics.ssi:345
 msgid ""
 "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 "
@@ -866,19 +852,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:349
 msgid ""
 "_* You can play with this configuration file (i.e. change memory limit to "
 "256)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:353
+#: en/user_basics.ssi:351
 msgid ""
 "_* Double click on this file (or run VMWare player and select this file)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:354
+#: en/user_basics.ssi:352
 msgid "_* When running just press space if that strange question comes up..."
 msgstr ""
diff --git a/manual/pot/user_customization-runtime.ssi.pot b/manual/pot/user_customization-runtime.ssi.pot
index 95aec81..148ced5 100644
--- a/manual/pot/user_customization-runtime.ssi.pot
+++ b/manual/pot/user_customization-runtime.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-12-06 17:29-0400\n"
+"POT-Creation-Date: 2010-12-12 14:05-0400\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"
@@ -20,32 +20,22 @@ msgstr ""
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
-#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
-#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
-#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
-#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
-#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
-#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/about_manual.ssi:170 en/project_bugs.ssi:58
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
-#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
-#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
 #: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
 #: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
@@ -72,12 +62,14 @@ msgstr ""
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
 #: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:132
-#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
+#: en/user_examples.ssi:256 en/user_examples.ssi:271
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -89,32 +81,22 @@ msgstr ""
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
 #: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/other_faq.ssi:37 en/other_faq.ssi:46
-#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
-#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
-#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
-#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
-#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
-#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/about_manual.ssi:174 en/project_bugs.ssi:62
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
-#: en/user_customization-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
+#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
+#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
 #: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
 #: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
@@ -140,12 +122,14 @@ msgstr ""
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
 #: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:118 en/user_installation.ssi:137
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
+#: en/user_examples.ssi:267 en/user_examples.ssi:285
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:150
+#: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -309,7 +293,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:72
-msgid "2~ Persistence"
+msgid "2~persistence Persistence"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/user_installation.ssi.pot b/manual/pot/user_installation.ssi.pot
index b65a7b9..39eebee 100644
--- a/manual/pot/user_installation.ssi.pot
+++ b/manual/pot/user_installation.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-12-11 22:46+0100\n"
+"POT-Creation-Date: 2010-12-12 14:05-0400\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"
@@ -26,14 +26,14 @@ msgstr ""
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
-#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
-#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
 #: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
 #: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -68,7 +68,7 @@ msgstr ""
 #: en/user_installation.ssi:56 en/user_installation.ssi:64
 #: en/user_installation.ssi:74 en/user_installation.ssi:82
 #: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:132 en/user_installation.ssi:147
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
 #: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
@@ -87,14 +87,14 @@ msgstr ""
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
+#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
 #: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
 #: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -127,8 +127,8 @@ msgstr ""
 #: en/user_installation.ssi:42 en/user_installation.ssi:50
 #: en/user_installation.ssi:60 en/user_installation.ssi:70
 #: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:118
-#: en/user_installation.ssi:137 en/user_installation.ssi:150
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:150
 #: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
@@ -222,7 +222,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:34
+#: en/user_installation.ssi:34 en/user_installation.ssi:104
 msgid "3~ From the Debian repository"
 msgstr ""
 
@@ -247,7 +247,7 @@ msgid "# aptitude install live-build"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:52
+#: en/user_installation.ssi:52 en/user_installation.ssi:108
 msgid "3~ From source"
 msgstr ""
 
@@ -307,7 +307,7 @@ msgid "# make uninstall"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:96
+#: en/user_installation.ssi:96 en/user_installation.ssi:142
 msgid "3~ From 'snapshots'"
 msgstr ""
 
@@ -321,77 +321,55 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:100
-msgid "2~ live-boot"
+msgid "2~ live-boot and live-config"
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:102
 #, no-wrap
-msgid "*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:104
-msgid "% FIXME: we also need to mention live-config"
+msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:106
-msgid "3~ Using a customized live-boot"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:108
 msgid ""
-"% FIXME: should follow the structure for live-build above (i.e. \"from source"
-"\", not \"customized\" -- we should not get into customization now, but "
-"should reserve that discussion for later."
+"Both live-boot and live-config are available from the Debian repository as "
+"per {Installing live-build}#installing-live-build."
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:110
 msgid ""
-"To modify the code you can follow the process below. Please ensure you are "
-"familiar with the terms mentioned in {Terms}#terms."
+"To use the latest source from git, you can follow the process below. Please "
+"ensure you are familiar with the terms mentioned in {Terms}#terms."
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:112
-msgid "_* Checkout the live-boot source"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:116
-msgid "$ git clone git://live.debian.net/git/live-boot.git"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:120
-msgid "_* Make changes to your local copy"
+msgid "_* Checkout the live-boot and live-config source"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:122
+#: en/user_installation.ssi:117
 msgid ""
-"% FIXME: as indicated above, it's too early for this topic. Move to later in "
-"the manual."
+"$ git clone git://live.debian.net/git/live-boot.git $ git clone git://live."
+"debian.net/git/live-config.git"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:124
+#: en/user_installation.ssi:121
 msgid ""
-"And beware that if you want to add your pre-init script in live-bottom, you "
-"should name it without dashes '-', e.g: call it \"99new_feature\" and not "
-"\"99new-feature\"."
+"Consult the live-boot and live-config man pages for details on customizing "
+"if that is your reason for building these packages from source."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:126
-msgid "_* Build a live-boot .deb"
+#: en/user_installation.ssi:123
+msgid "_* Build live-boot and live-config .deb files"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:128
+#: en/user_installation.ssi:125
 msgid ""
 "You must build either on your target distribution or in a chroot containing "
 "your target platform: this means if your target is Squeeze then you should "
@@ -399,7 +377,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:130
+#: en/user_installation.ssi:127
 msgid ""
 "Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
 "build #{live-boot}# for a target distribution that differs from your build "
@@ -410,40 +388,38 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:135
-msgid "$ cd live-boot $ dpkg-buildpackage -b -uc -us"
+#: en/user_installation.ssi:134
+msgid ""
+"$ cd live-boot $ dpkg-buildpackage -b -uc -us $ cd ../live-config $ dpkg-"
+"buildpackage -b -uc -us"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:139
-msgid "_* Use the generated live-boot .deb"
+#: en/user_installation.ssi:138
+msgid "_* Use all generated .deb files"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:141
+#: en/user_installation.ssi:140
 msgid ""
-"As live-boot is installed by live-build system, installing the package in "
-"the host system is not sufficient: you should treat the generated .deb like "
-"another custom package. Please see {Customizing package installation}"
-"#customizing-package-installation for more information. You should pay "
-"particular attention to {Additional repositories}#additional-repositories."
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:143
-msgid "3~ Using live-boot snapshots"
+"As live-boot and live-config are installed by live-build system, installing "
+"the packages in the host system is not sufficient: you should treat the "
+"generated .deb files like any other custom packages. Please see {Customizing "
+"package installation}#customizing-package-installation for more information. "
+"You should pay particular attention to {Additional repositories}#additional-"
+"repositories."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:145
+#: en/user_installation.ssi:144
 msgid ""
-"You can let live-build automatically use the latest snapshot of live-boot by "
-"configuring a third-party repository in your live-build configuration "
-"directory. Assuming you have already created a configuration tree with #{lb "
-"config}#:"
+"You can let live-build automatically use the latest snapshots of live-boot "
+"and live-config by configuring a third-party repository in your live-build "
+"configuration directory. Assuming you have already created a configuration "
+"tree with #{lb config}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:149
+#: en/user_installation.ssi:148
 msgid "lb config --repository live.debian.net"
 msgstr ""
diff --git a/manual/pt_BR/user_basics.ssi b/manual/pt_BR/user_basics.ssi
index b4e6373..e8e2cc6 100644
--- a/manual/pt_BR/user_basics.ssi
+++ b/manual/pt_BR/user_basics.ssi
@@ -36,9 +36,7 @@ SquashFS compressed filesystem is used to minimize the Debian Live image
 size. Note that it is 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 is used (see persistence).
-
-% FIXME: <xref linkend="persistence"/>
+optional persistence is used (see {Persistence}#persistence).
 
 _* *{Bootloader}*: A small piece of code crafted to boot from the chosen
 media, possibly presenting a prompt or menu to allow selection of
@@ -299,7 +297,8 @@ bootloader.
 Here is an example for inspiration, written for the ISC DHCP server
 #{isc-dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;
 
-% FIXME
+% FIXME: bring up to date: base example on default isc-dhcp-server config
+file in Squeeze
 
 code{
 
diff --git a/manual/pt_BR/user_customization-runtime.ssi b/manual/pt_BR/user_customization-runtime.ssi
index afa9812..906b704 100644
--- a/manual/pt_BR/user_customization-runtime.ssi
+++ b/manual/pt_BR/user_customization-runtime.ssi
@@ -96,7 +96,7 @@ keyboard-variant=bepo keyboard-model=tm2030usb"
 
 }code
 
-2~ Persistence
+2~persistence Persistence
 
 A live cd paradigm is a pre-installed system which runs from read-only
 media, like a cdrom, where writes and modifications do not survive reboots
diff --git a/manual/pt_BR/user_installation.ssi b/manual/pt_BR/user_installation.ssi
index 19f04a4..f79c756 100644
--- a/manual/pt_BR/user_installation.ssi
+++ b/manual/pt_BR/user_installation.ssi
@@ -101,39 +101,33 @@ If you do not wish to build or install live-build from source, you can use
 snapshots. These are built automatically from the latest version in Git and
 are available on http://live.debian.net/debian/.
 
-2~ live-boot
+2~ live-boot and live-config
 
-*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.
+*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.
 
-% FIXME: we also need to mention live-config
+3~ From the Debian repository
 
-3~ Using a customized live-boot
+Both live-boot and live-config are available from the Debian repository as
+per {Installing live-build}#installing-live-build.
 
-% FIXME: should follow the structure for live-build above (i.e. "from
-source", not "customized" -- we should not get into customization now, but
-should reserve that discussion for later.
+3~ From source
 
-To modify the code you can follow the process below. Please ensure you are
-familiar with the terms mentioned in {Terms}#terms.
+To use the latest source from git, you can follow the process below. Please
+ensure you are familiar with the terms mentioned in {Terms}#terms.
 
-_* Checkout the live-boot source
+_* Checkout the live-boot and live-config source
 
 code{
 
-$ git clone git://live.debian.net/git/live-boot.git
+$ git clone git://live.debian.net/git/live-boot.git $ git clone
+git://live.debian.net/git/live-config.git
 
 }code
 
-_* Make changes to your local copy
-
-% FIXME: as indicated above, it's too early for this topic. Move to later in
-the manual.
-
-And beware that if you want to add your pre-init script in live-bottom, you
-should name it without dashes '-', e.g: call it "99new_feature" and not
-"99new-feature".
+Consult the live-boot and live-config man pages for details on customizing
+if that is your reason for building these packages from source.
 
-_* Build a live-boot .deb
+_* Build live-boot and live-config .deb files
 
 You must build either on your target distribution or in a chroot containing
 your target platform: this means if your target is Squeeze then you should
@@ -148,28 +142,31 @@ system distribution, you may build directly on the build system using
 
 code{
 
-$ cd live-boot $ dpkg-buildpackage -b -uc -us
+$ cd live-boot $ dpkg-buildpackage -b -uc -us $ cd ../live-config $
+dpkg-buildpackage -b -uc -us
 
 }code
 
-_* Use the generated live-boot .deb
+_* Use all generated .deb files
 
-As live-boot is installed by live-build system, installing the package in
-the host system is not sufficient: you should treat the generated .deb like
-another custom package. Please see {Customizing package
-installation}#customizing-package-installation for more information. You
-should pay particular attention to {Additional
+As live-boot and live-config are installed by live-build system, installing
+the packages in the host system is not sufficient: you should treat the
+generated .deb files like any other custom packages. Please see {Customizing
+package installation}#customizing-package-installation for more
+information. You should pay particular attention to {Additional
 repositories}#additional-repositories.
 
-3~ Using live-boot snapshots
+3~ From 'snapshots'
 
-You can let live-build automatically use the latest snapshot of live-boot by
-configuring a third-party repository in your live-build configuration
-directory. Assuming you have already created a configuration tree with #{lb
-config}#:
+You can let live-build automatically use the latest snapshots of live-boot
+and live-config by configuring a third-party repository in your live-build
+configuration directory. Assuming you have already created a configuration
+tree with #{lb config}#:
 
 code{
 
 lb config --repository live.debian.net
 
 }code
+
+
diff --git a/manual/ro/user_basics.ssi b/manual/ro/user_basics.ssi
index b4e6373..e8e2cc6 100644
--- a/manual/ro/user_basics.ssi
+++ b/manual/ro/user_basics.ssi
@@ -36,9 +36,7 @@ SquashFS compressed filesystem is used to minimize the Debian Live image
 size. Note that it is 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 is used (see persistence).
-
-% FIXME: <xref linkend="persistence"/>
+optional persistence is used (see {Persistence}#persistence).
 
 _* *{Bootloader}*: A small piece of code crafted to boot from the chosen
 media, possibly presenting a prompt or menu to allow selection of
@@ -299,7 +297,8 @@ bootloader.
 Here is an example for inspiration, written for the ISC DHCP server
 #{isc-dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;
 
-% FIXME
+% FIXME: bring up to date: base example on default isc-dhcp-server config
+file in Squeeze
 
 code{
 
diff --git a/manual/ro/user_customization-runtime.ssi b/manual/ro/user_customization-runtime.ssi
index afa9812..906b704 100644
--- a/manual/ro/user_customization-runtime.ssi
+++ b/manual/ro/user_customization-runtime.ssi
@@ -96,7 +96,7 @@ keyboard-variant=bepo keyboard-model=tm2030usb"
 
 }code
 
-2~ Persistence
+2~persistence Persistence
 
 A live cd paradigm is a pre-installed system which runs from read-only
 media, like a cdrom, where writes and modifications do not survive reboots
diff --git a/manual/ro/user_installation.ssi b/manual/ro/user_installation.ssi
index 19f04a4..f79c756 100644
--- a/manual/ro/user_installation.ssi
+++ b/manual/ro/user_installation.ssi
@@ -101,39 +101,33 @@ If you do not wish to build or install live-build from source, you can use
 snapshots. These are built automatically from the latest version in Git and
 are available on http://live.debian.net/debian/.
 
-2~ live-boot
+2~ live-boot and live-config
 
-*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.
+*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.
 
-% FIXME: we also need to mention live-config
+3~ From the Debian repository
 
-3~ Using a customized live-boot
+Both live-boot and live-config are available from the Debian repository as
+per {Installing live-build}#installing-live-build.
 
-% FIXME: should follow the structure for live-build above (i.e. "from
-source", not "customized" -- we should not get into customization now, but
-should reserve that discussion for later.
+3~ From source
 
-To modify the code you can follow the process below. Please ensure you are
-familiar with the terms mentioned in {Terms}#terms.
+To use the latest source from git, you can follow the process below. Please
+ensure you are familiar with the terms mentioned in {Terms}#terms.
 
-_* Checkout the live-boot source
+_* Checkout the live-boot and live-config source
 
 code{
 
-$ git clone git://live.debian.net/git/live-boot.git
+$ git clone git://live.debian.net/git/live-boot.git $ git clone
+git://live.debian.net/git/live-config.git
 
 }code
 
-_* Make changes to your local copy
-
-% FIXME: as indicated above, it's too early for this topic. Move to later in
-the manual.
-
-And beware that if you want to add your pre-init script in live-bottom, you
-should name it without dashes '-', e.g: call it "99new_feature" and not
-"99new-feature".
+Consult the live-boot and live-config man pages for details on customizing
+if that is your reason for building these packages from source.
 
-_* Build a live-boot .deb
+_* Build live-boot and live-config .deb files
 
 You must build either on your target distribution or in a chroot containing
 your target platform: this means if your target is Squeeze then you should
@@ -148,28 +142,31 @@ system distribution, you may build directly on the build system using
 
 code{
 
-$ cd live-boot $ dpkg-buildpackage -b -uc -us
+$ cd live-boot $ dpkg-buildpackage -b -uc -us $ cd ../live-config $
+dpkg-buildpackage -b -uc -us
 
 }code
 
-_* Use the generated live-boot .deb
+_* Use all generated .deb files
 
-As live-boot is installed by live-build system, installing the package in
-the host system is not sufficient: you should treat the generated .deb like
-another custom package. Please see {Customizing package
-installation}#customizing-package-installation for more information. You
-should pay particular attention to {Additional
+As live-boot and live-config are installed by live-build system, installing
+the packages in the host system is not sufficient: you should treat the
+generated .deb files like any other custom packages. Please see {Customizing
+package installation}#customizing-package-installation for more
+information. You should pay particular attention to {Additional
 repositories}#additional-repositories.
 
-3~ Using live-boot snapshots
+3~ From 'snapshots'
 
-You can let live-build automatically use the latest snapshot of live-boot by
-configuring a third-party repository in your live-build configuration
-directory. Assuming you have already created a configuration tree with #{lb
-config}#:
+You can let live-build automatically use the latest snapshots of live-boot
+and live-config by configuring a third-party repository in your live-build
+configuration directory. Assuming you have already created a configuration
+tree with #{lb config}#:
 
 code{
 
 lb config --repository live.debian.net
 
 }code
+
+

-- 
live-manual

