[SCM] live-manual branch, debian, updated. debian/3.0_a10-1-39-g216427c

chals chals at altorricon.com
Tue Apr 3 07:21:43 UTC 2012


The following commit has been merged in the debian branch:
commit ceba445636aa8c2f80b65beb2c830448c9eb78f9
Author: chals <chals at altorricon.com>
Date:   Mon Mar 19 21:11:41 2012 +0100

    Fixing typos and some minor formatting errors, updating 'es' and 'fr' at the same time.

diff --git a/manual/de/user_customization-installer.ssi b/manual/de/user_customization-installer.ssi
index a8b01b5..a41a62d 100644
--- a/manual/de/user_customization-installer.ssi
+++ b/manual/de/user_customization-installer.ssi
@@ -15,7 +15,7 @@ seen abbreviated to "d-i".
 
 The three main types of installer are:
 
-*{"Regular" Debian Installer}*: This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as "combined images".
+*{"Regular" Debian Installer}*: This is a normal Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as "combined images".
 
 On such images, Debian is installed by fetching and installing .deb packages
 using #{debootstrap}# or #{cdebootstrap}#, from the local media or some
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index 9035a7f..4542f38 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -29,7 +29,7 @@ distribution carried in the Debian archive may be specified by its codename
 here. (See {Terms}#terms for more details.) The #{--distribution}# option
 not only influences the source of packages within the archive, but also
 instructs #{live-build}# to behave as needed to build each supported
-distribution. For example, to build against the *unstable* release, Sid,
+distribution. For example, to build against the *{unstable}* release, Sid,
 specify:
 
 code{
@@ -64,13 +64,13 @@ The Debian archive is replicated across a large network of mirrors around
 the world so that people in each region can choose a nearby mirror for best
 download speed. Each of the #{--mirror-*}# options governs which
 distribution mirror is used at various stages of the build. Recall from
-{Stages of the build}#stages-of-the-build that the *bootstrap* stage is when
-the chroot is initially populated by debootstrap with a minimal system, and
-the *chroot* stage is when the chroot used to construct the live system's
-filesystem is built. Thus, the corresponding mirror switches are used for
-those stages, and later, in the *binary* stage, the #{--mirror-binary}# and
-#{--mirror-binary-security}# values are used, superceding any mirrors used
-in an earlier stage.
+{Stages of the build}#stages-of-the-build that the *{bootstrap}* stage is
+when the chroot is initially populated by debootstrap with a minimal system,
+and the *{chroot}* stage is when the chroot used to construct the live
+system's filesystem is built. Thus, the corresponding mirror switches are
+used for those stages, and later, in the *{binary}* stage, the
+#{--mirror-binary}# and #{--mirror-binary-security}# values are used,
+superceding any mirrors used in an earlier stage.
 
 3~distribution-mirrors-build-time Distribution mirrors used at build time
 
@@ -114,9 +114,9 @@ is available in your target distribution. These may be, for example, for
 backports, experimental or custom packages. To configure additional
 repositories, create #{config/archives/your-repository.list.chroot}#, and/or
 #{config/archives/your-repository.list.binary}# files. As with the
-#{--mirror-*}# options, these govern the repositories used in the *chroot*
-stage when building the image, and in the *binary* stage, i.e. for use when
-running the live system.
+#{--mirror-*}# options, these govern the repositories used in the *{chroot}*
+stage when building the image, and in the *{binary}* stage, i.e. for use
+when running the live system.
 
 For example, #{config/archives/live.list.chroot}# allows you to install
 packages from the debian live snapshot repository at live system build time.
@@ -495,7 +495,7 @@ as explained in {APT pinning}#apt-pinning.
 
 3~ Passing options to apt or aptitude
 
-If there is not an #{lb config}# option to alter APT's behaviour in the way
+If there is not a #{lb config}# option to alter APT's behaviour in the way
 you need, use #{--apt-options}# or #{--aptitude-options}# to pass any
 options through to your configured APT tool. See the man pages for #{apt}#
 and #{aptitude}# for details.
diff --git a/manual/de/user_managing_a_configuration.ssi b/manual/de/user_managing_a_configuration.ssi
index d0706a8..7df1d34 100644
--- a/manual/de/user_managing_a_configuration.ssi
+++ b/manual/de/user_managing_a_configuration.ssi
@@ -31,7 +31,7 @@ simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands
 that are designed to help you manage your configuration. Simply create an
 auto/config script containing #{lb config}# command with all desired
 options, and an auto/clean that removes the files containing configuration
-variable values, and each time you #{lb config}# and #{lb clean}#, these
+variable values, and each time you run #{lb config}# and #{lb clean}#, these
 files will be executed. This will ensure that your configuration is kept
 internally consistent from one revision to the next and from one live-build
 release to the next (though you will still have to take care and read the
diff --git a/manual/en/user_customization-installer.ssi b/manual/en/user_customization-installer.ssi
index 62a9ed9..f524781 100644
--- a/manual/en/user_customization-installer.ssi
+++ b/manual/en/user_customization-installer.ssi
@@ -10,7 +10,7 @@ Please note the careful use of capital letters when referring to the "Debian Ins
 
 The three main types of installer are:
 
-*{"Regular" Debian Installer}*: This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as "combined images".
+*{"Regular" Debian Installer}*: This is a normal Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as "combined images".
 
 On such images, Debian is installed by fetching and installing .deb packages using #{debootstrap}# or #{cdebootstrap}#, from the local media or some network-based network, resulting in a standard Debian system being installed to the hard disk.
 
diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index c3b10ac..a93062b 100644
--- a/manual/en/user_customization-packages.ssi
+++ b/manual/en/user_customization-packages.ssi
@@ -8,7 +8,7 @@ Perhaps the most basic customization of a Debian live system is the selection of
 
 3~ Distribution, archive areas and mode
 
-The distribution you choose has the broadest impact on which packages are available to include in your live image. Specify the codename, which defaults to #{wheezy}# for the Wheezy version of live-build. Any current distribution carried in the Debian archive may be specified by its codename here. (See {Terms}#terms for more details.) The #{--distribution}# option not only influences the source of packages within the archive, but also instructs #{live-build}# to behave as needed to build each supported distribution. For example, to build against the *unstable* release, Sid, specify:
+The distribution you choose has the broadest impact on which packages are available to include in your live image. Specify the codename, which defaults to #{wheezy}# for the Wheezy version of live-build. Any current distribution carried in the Debian archive may be specified by its codename here. (See {Terms}#terms for more details.) The #{--distribution}# option not only influences the source of packages within the archive, but also instructs #{live-build}# to behave as needed to build each supported distribution. For example, to build against the *{unstable}* release, Sid, specify:
 
 code{
 
@@ -30,7 +30,7 @@ Experimental support is available for some Debian derivatives through a #{--mode
 
 3~ Distribution mirrors
 
-The Debian archive is replicated across a large network of mirrors around the world so that people in each region can choose a nearby mirror for best download speed. Each of the #{--mirror-*}# options governs which distribution mirror is used at various stages of the build. Recall from {Stages of the build}#stages-of-the-build that the *bootstrap* stage is when the chroot is initially populated by debootstrap with a minimal system, and the *chroot* stage is when the chroot used to construct the live system's filesystem is built. Thus, the corresponding mirror switches are used for those stages, and later, in the *binary* stage, the #{--mirror-binary}# and #{--mirror-binary-security}# values are used, superceding any mirrors used in an earlier stage.
+The Debian archive is replicated across a large network of mirrors around the world so that people in each region can choose a nearby mirror for best download speed. Each of the #{--mirror-*}# options governs which distribution mirror is used at various stages of the build. Recall from {Stages of the build}#stages-of-the-build that the *{bootstrap}* stage is when the chroot is initially populated by debootstrap with a minimal system, and the *{chroot}* stage is when the chroot used to construct the live system's filesystem is built. Thus, the corresponding mirror switches are used for those stages, and later, in the *{binary}* stage, the #{--mirror-binary}# and #{--mirror-binary-security}# values are used, superceding any mirrors used in an earlier stage.
 
 3~distribution-mirrors-build-time Distribution mirrors used at build time
 
@@ -59,7 +59,7 @@ code{
 
 3~additional-repositories Additional repositories
 
-You may add more repositories, broadening your package choices beyond what is available in your target distribution. These may be, for example, for backports, experimental or custom packages. To configure additional repositories, create #{config/archives/your-repository.list.chroot}#, and/or #{config/archives/your-repository.list.binary}# files. As with the #{--mirror-*}# options, these govern the repositories used in the *chroot* stage when building the image, and in the *binary* stage, i.e. for use when running the live system.
+You may add more repositories, broadening your package choices beyond what is available in your target distribution. These may be, for example, for backports, experimental or custom packages. To configure additional repositories, create #{config/archives/your-repository.list.chroot}#, and/or #{config/archives/your-repository.list.binary}# files. As with the #{--mirror-*}# options, these govern the repositories used in the *{chroot}* stage when building the image, and in the *{binary}* stage, i.e. for use when running the live system.
 
 For example, #{config/archives/live.list.chroot}# allows you to install packages from the debian live snapshot repository at live system build time.
 
@@ -304,7 +304,7 @@ The tradeoff here is that if you don't install recommended packages for a given
 
 3~ Passing options to apt or aptitude
 
-If there is not an #{lb config}# option to alter APT's behaviour in the way you need, use #{--apt-options}# or #{--aptitude-options}# to pass any options through to your configured APT tool. See the man pages for #{apt}# and #{aptitude}# for details.
+If there is not a #{lb config}# option to alter APT's behaviour in the way you need, use #{--apt-options}# or #{--aptitude-options}# to pass any options through to your configured APT tool. See the man pages for #{apt}# and #{aptitude}# for details.
 
 3~apt-pinning APT pinning
 
diff --git a/manual/en/user_managing_a_configuration.ssi b/manual/en/user_managing_a_configuration.ssi
index 5047b97..aad6304 100644
--- a/manual/en/user_managing_a_configuration.ssi
+++ b/manual/en/user_managing_a_configuration.ssi
@@ -12,7 +12,7 @@ For example, when the distribution is first set, many 'dependent' variables are
 
 A second, related problem is that if you run #{lb config}# and then upgrade to a new version of live-build that has changed one of the variable names, you will discover this only by manual review of the variables in your #{config/*}# files, which you will then need to use to set the appropriate option again.
 
-All of this would be a terrible nuisance if it weren't for auto/* scripts, simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands that are designed to help you manage your configuration. Simply create an auto/config script containing #{lb config}# command with all desired options, and an auto/clean that removes the files containing configuration variable values, and each time you #{lb config}# and #{lb clean}#, these files will be executed. This will ensure that your configuration is kept internally consistent from one revision to the next and from one live-build release to the next (though you will still have to take care and read the documentation when you upgrade live-build and make adjustments as needed).
+All of this would be a terrible nuisance if it weren't for auto/* scripts, simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands that are designed to help you manage your configuration. Simply create an auto/config script containing #{lb config}# command with all desired options, and an auto/clean that removes the files containing configuration variable values, and each time you run #{lb config}# and #{lb clean}#, these files will be executed. This will ensure that your configuration is kept internally consistent from one revision to the next and from one live-build release to the next (though you will still have to take care and read the documentation when you upgrade live-build and make adjustments as needed).
 
 2~ Example auto scripts
 
diff --git a/manual/es/user_customization-packages.ssi b/manual/es/user_customization-packages.ssi
index c3a7a2f..54a7a7c 100644
--- a/manual/es/user_customization-packages.ssi
+++ b/manual/es/user_customization-packages.ssi
@@ -36,7 +36,7 @@ ver {Términos}#terms). La opción #{--distribution}# no solamente influencia
 la fuente de los paquetes dentro del archivo Debian, sino que instruye a
 #{live-build}# a comportarse tal y como se necesita para construir cada una
 de las distribuciones. Por ejemplo, para construir contra la versión
-*inestable*, Sid, se debe indicar: 
+*{inestable}*, Sid, se debe indicar: 
 
 code{
 
@@ -74,13 +74,13 @@ mundo, de manera que se puede seleccionar la réplica más cercana con el fin
 de obtener la mejor velocidad de descarga. Cada una de las opciones
 #{--mirror-*}# gobierna qué réplica de repositorio Debian se utiliza en las
 diferentes etapas de creación. Si se recuerda de {Etapas de la
-creación}#stages-of-the-build, en la etapa de *preinstalación (bootstrap)*
-es cuando se crea el directorio chroot y se rellena con un sistema mínimo
-mediante  la herramienta debootstrap, y en la etapa *chroot* es cuando el
+creación}#stages-of-the-build, en la etapa de preinstalación (bootstrap) es
+cuando se crea el directorio chroot y se rellena con un sistema mínimo
+mediante  la herramienta debootstrap, y en la etapa *{chroot}* es cuando el
 directorio chroot es completado con los paquetes necesarios para crear el
 sistema de ficheros que será utilizado en el sistema en vivo. A cada una de
 estas etapas le corresponde su propia opción #{--mirror-*}#. Posteriormente,
-en la etapa *binary* se utilizarán las réplicas Debian indicadas en los
+en la etapa *{binary}* se utilizarán las réplicas Debian indicadas en los
 valores de las opciones #{--mirror-binary}# y #{--mirror-binary-security}#
 en lugar de utilizar los indicados para las etapas anteriores.
 
@@ -132,8 +132,8 @@ personalizados. Para configurar repositorios adicionales se debe crear los
 ficheros #{config/archives/your-repository.list.chroot}# y/o
 #{config/archives/your-repository.list.binary}#. Al igual que en las
 opciones #{--mirror-*}#, estos ficheros gobiernan los repositorios
-utilizados en las etapas *chroot* y *binary* respectivamente, esto es, los
-repositorios que serán utilizados cuando se ejecute el sistema en vivo.
+utilizados en las etapas *{chroot}* y *{binary}* respectivamente, esto es,
+los repositorios que serán utilizados cuando se ejecute el sistema en vivo.
 
 Por ejemplo, #{config/archives/live.list.chroot}# permite instalar paquetes
 de las instantáneas del repositorio Debian Live en el momento de crear la
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index ed60fda..b2d619d 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -34,7 +34,7 @@ par son nom de code ici. (Voir {Termes}#terms pour plus de détails.)
 L'option #{--distribution}# non seulement influence la source des paquets
 dans l'archive, mais aussi dit #{live-build}# comme it doit construire
 chaque distribution soutenue. Par exemple, pour construire contre
-*unstable*, Sid, précisez: 
+*{unstable}*, Sid, précisez: 
 
 code{
 
@@ -71,13 +71,14 @@ monde pour que les gens dans chaque région peuvent choisir un miroir proche
 avec la meilleur vitesse de téléchargement. Chacune des options
 #{--mirror-*}# qui régissent quel miroir de distribution est utilisée à
 différentes étapes de la construction. Rappelez-vous de {Étapes de la
-construction}#stages-of-the-build que l'étape *bootstrap* c'est quand le
+construction}#stages-of-the-build que l'étape *{bootstrap}* c'est quand le
 chroot est initialement peuplée par debootstrap avec un système minimal, et
-l'étape *chroot* c'est quand le chroot utilisé pour construire le système de
-fichiers du système live est construit. Ainsi, les commutateurs des miroirs
-correspondants sont utilisées pour ces étapes, et plus tard, dans l'étape
-*binary* les valeurs #{--mirror-binary}# et #{--mirror-binary-security}#
-sont utilisées, remplaçant tout miroir utilisé dans une étape antérieure. 
+l'étape *{chroot}* c'est quand le chroot utilisé pour construire le système
+de fichiers du système live est construit. Ainsi, les commutateurs des
+miroirs correspondants sont utilisées pour ces étapes, et plus tard, dans
+l'étape *{binary}* les valeurs #{--mirror-binary}# et
+#{--mirror-binary-security}# sont utilisées, remplaçant tout miroir utilisé
+dans une étape antérieure. 
 
 3~distribution-mirrors-build-time Miroirs de distribution utilisés au temps
 de construction
@@ -125,8 +126,8 @@ exemple, pour backports, expérimentaux ou des paquets personnalisés. Pour
 configurer des dépôts supplémentaires, créer les fichiers
 #{config/archives/your-repository.list.chroot}#, et/ou
 #{config/archives/your-repository.list.binary}#. Comme avec les options
-#{--mirror-*}#, elles gouvernent les dépôts utilisés dans l'étape *chroot*
-lors de la construction de l'image, et dans l'étape *binary*, c'est à dire
+#{--mirror-*}#, elles gouvernent les dépôts utilisés dans l'étape *{chroot}*
+lors de la construction de l'image, et dans l'étape *{binary}*, c'est à dire
 pour une utilisation au moment de l'exécution du système live.
 
 Par exemple, #{config/archives/live.list.chroot}# vous permet d'installer
diff --git a/manual/it/user_customization-packages.ssi b/manual/it/user_customization-packages.ssi
index f88d736..d1a43ca 100644
--- a/manual/it/user_customization-packages.ssi
+++ b/manual/it/user_customization-packages.ssi
@@ -25,16 +25,15 @@ installate con il pinning, giusto per citare alcune possibilità.
 
 3~ Distribuzione, le aree di archivio e le modalità
 
-La distribuzione che viene scelta ha un ampio impatto su quali pacchetti
-siano disponibili per essere inclusi nell'immagine live. Specificare il nome
-in codice, il predefinito per la versione Wheezy di live-build è #{wheezy}#;
-qualsiasi attuale distribuzione mantenuta negli archivi Debian può essere
-qui specificata con il suo nome in codice. (Per ulteriori dettagli
-consultare il {Glossario}#terms). L'opzione #{--distribution}# non solo
-influenza la sorgente dei pacchetti nell'archivio, ma indica a
-#{live-build}# di comportarsi secondo la necessità per compilare ciascuna
-distribuzione supportata. Ad esempio se si vuole costruire un rilascio
-*unstable*, Sid, specificare:
+The distribution you choose has the broadest impact on which packages are
+available to include in your live image. Specify the codename, which
+defaults to #{wheezy}# for the Wheezy version of live-build. Any current
+distribution carried in the Debian archive may be specified by its codename
+here. (See {Terms}#terms for more details.) The #{--distribution}# option
+not only influences the source of packages within the archive, but also
+instructs #{live-build}# to behave as needed to build each supported
+distribution. For example, to build against the *{unstable}* release, Sid,
+specify:
 
 code{
 
@@ -65,18 +64,17 @@ comportamento di live-build per adattarlo alle derivate.
 
 3~ Mirror delle distribuzioni
 
-L'archivio Debian è replicato attraverso una vasta rete di mirror in tutto
-il mondo cosicché chiunque in ogni nazione può selezionare il mirror più
-vicino per la migliore velocità di scaricamento. Ciascuna delle opzioni
-#{--mirror-*}# determina quale mirror della distribuzione è usato nei vari
-stadi della compilazione. Ricordando dalle {Fasi della
-creazione}#stages-of-the-build che la fase di *avvio* è quando il chroot è
-inizialmente popolato da debootstrap con un sistema minimale e quella di
-*chroot* è quando viene creato il chroot usato per costruire il file system
-del sistema live. Perciò per queste fasi vengono usati i corrispondenti
-cambi di mirror, e in seguito, nella fase *binaria* vengono usati i valori
-di #{--mirror-binary}# e #{--mirror-binary-security}# sostituendo qualsiasi
-altro mirror usato nelle fasi iniziali.
+The Debian archive is replicated across a large network of mirrors around
+the world so that people in each region can choose a nearby mirror for best
+download speed. Each of the #{--mirror-*}# options governs which
+distribution mirror is used at various stages of the build. Recall from
+{Stages of the build}#stages-of-the-build that the *{bootstrap}* stage is
+when the chroot is initially populated by debootstrap with a minimal system,
+and the *{chroot}* stage is when the chroot used to construct the live
+system's filesystem is built. Thus, the corresponding mirror switches are
+used for those stages, and later, in the *{binary}* stage, the
+#{--mirror-binary}# and #{--mirror-binary-security}# values are used,
+superceding any mirrors used in an earlier stage.
 
 3~distribution-mirrors-build-time Mirror delle distribuzioni usati in fase
 di compilazione
@@ -118,15 +116,14 @@ code{
 
 3~additional-repositories Repository addizionali
 
-Si possono aggiungere altri repository, ampliando così la scelta dei
-pacchetti al di là di quelli disponibili nella distribuzione di
-destinazione. Questi possono essere, per esempio, pacchetti di backport,
-sperimentali o personalizzati. Per configurare repository aggiuntivi, creare
-i file #{config/archives/vostro-repository.list.chroot}#, o
-#{config/archives/vostro-repository.list.binary}#. Come per le opzioni
-#{--mirror-*}#, queste controlleranno i repository usati nella fase *chroot*
-quando si compila l'immagine, e nella fase *binary*, ad esempio per usarli
-quando il sistema live è avviato.
+You may add more repositories, broadening your package choices beyond what
+is available in your target distribution. These may be, for example, for
+backports, experimental or custom packages. To configure additional
+repositories, create #{config/archives/your-repository.list.chroot}#, and/or
+#{config/archives/your-repository.list.binary}# files. As with the
+#{--mirror-*}# options, these govern the repositories used in the *{chroot}*
+stage when building the image, and in the *{binary}* stage, i.e. for use
+when running the live system.
 
 Per esempio, #{config/archives/live.list.chroot}# permette di installare
 pacchetti dal repository snapshot di debian live al momento della creazione
@@ -507,10 +504,10 @@ spiegato in {APT pinning}#apt-pinning.
 
 3~ Passare opzioni ad apt o aptitude
 
-Se non c'è un'opzione di #{lb config}# per modificare il comportamento di
-APT nel modo desiderato, si usi #{--apt-options}# o #{--aptitude-options}#
-per passare opzioni tramite il proprio strumento APT. Consultare il manuale
-di #{apt}# e #{aptitude}# per i dettagli.
+If there is not a #{lb config}# option to alter APT's behaviour in the way
+you need, use #{--apt-options}# or #{--aptitude-options}# to pass any
+options through to your configured APT tool. See the man pages for #{apt}#
+and #{aptitude}# for details.
 
 3~apt-pinning APT pinning
 
diff --git a/manual/it/user_managing_a_configuration.ssi b/manual/it/user_managing_a_configuration.ssi
index bb14c0c..9cbd33c 100644
--- a/manual/it/user_managing_a_configuration.ssi
+++ b/manual/it/user_managing_a_configuration.ssi
@@ -26,17 +26,16 @@ variabili, lo si può scoprire solamente con una revisione manuale delle
 variabili nei file #{config/*}#, che sarà necessario utilizzare per
 impostare nuovamente le opzioni appropriate.
 
-Tutto ciò potrebbe essere un fastidio terribile se non fosse per gli script
-auto/*, semplici wrapper ai comandi #{lb config}#, #{lb build}# e #{lb
-clean}#, designati per aiutare nella gestione della propria
-configurazione. Basta creare uno script auto/config che contenga il comando
-#{lb config}# con le opzioni desiderate e un auto/clean che rimuove i file
-contenenti valori delle variabili di configurazione, così ogni volta che si
-usano #{lb config}# e #{lb clean}# questi file saranno eseguiti. Ciò fà sì
-che la configurazione sia coerente da una revisione all'altra e tra i
-rilasci delle varie versioni di live-build (sebbene si dovrà comunque fare
-attenzione aggiornando live-build, leggendo la documentazione e facendo le
-modifiche necessarie).
+All of this would be a terrible nuisance if it weren't for auto/* scripts,
+simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands
+that are designed to help you manage your configuration. Simply create an
+auto/config script containing #{lb config}# command with all desired
+options, and an auto/clean that removes the files containing configuration
+variable values, and each time you run #{lb config}# and #{lb clean}#, these
+files will be executed. This will ensure that your configuration is kept
+internally consistent from one revision to the next and from one live-build
+release to the next (though you will still have to take care and read the
+documentation when you upgrade live-build and make adjustments as needed).
 
 2~ Esempi di script automatici
 
diff --git a/manual/po/de/user_customization-installer.ssi.po b/manual/po/de/user_customization-installer.ssi.po
index 2ca62fe..b0250d5 100644
--- a/manual/po/de/user_customization-installer.ssi.po
+++ b/manual/po/de/user_customization-installer.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-13 14:44+0100\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -35,10 +35,10 @@ msgstr ""
 #: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
 #: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
 #: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 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_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
+#: 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-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -80,7 +80,7 @@ msgstr ""
 #: 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
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr ""
 
@@ -103,10 +103,10 @@ msgstr ""
 #: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
 #: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
 #: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 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_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
+#: 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-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -147,8 +147,8 @@ msgstr ""
 #: en/user_installation.ssi:149 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:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr ""
 
@@ -192,7 +192,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-installer.ssi:14
 #, no-wrap
-msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as \"combined images\".\n"
+msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as \"combined images\".\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index 224c811..6276c19 100644
--- a/manual/po/de/user_customization-packages.ssi.po
+++ b/manual/po/de/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-13 14:44+0100\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -35,10 +35,10 @@ msgstr ""
 #: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
 #: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
 #: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 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_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
+#: 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-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -80,7 +80,7 @@ msgstr ""
 #: 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
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr ""
 
@@ -103,10 +103,10 @@ msgstr ""
 #: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
 #: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
 #: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 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_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
+#: 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-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -147,8 +147,8 @@ msgstr ""
 #: en/user_installation.ssi:149 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:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr ""
 
@@ -202,7 +202,7 @@ msgid ""
 "here. (See {Terms}#terms for more details.) The #{--distribution}# option "
 "not only influences the source of packages within the archive, but also "
 "instructs #{live-build}# to behave as needed to build each supported "
-"distribution. For example, to build against the *unstable* release, Sid, "
+"distribution. For example, to build against the *{unstable}* release, Sid, "
 "specify:"
 msgstr ""
 
@@ -256,13 +256,13 @@ msgid ""
 "the world so that people in each region can choose a nearby mirror for best "
 "download speed. Each of the #{--mirror-*}# options governs which "
 "distribution mirror is used at various stages of the build. Recall from "
-"{Stages of the build}#stages-of-the-build that the *bootstrap* stage is when "
-"the chroot is initially populated by debootstrap with a minimal system, and "
-"the *chroot* stage is when the chroot used to construct the live system's "
-"filesystem is built. Thus, the corresponding mirror switches are used for "
-"those stages, and later, in the *binary* stage, the #{--mirror-binary}# and #"
-"{--mirror-binary-security}# values are used, superceding any mirrors used in "
-"an earlier stage."
+"{Stages of the build}#stages-of-the-build that the *{bootstrap}* stage is "
+"when the chroot is initially populated by debootstrap with a minimal system, "
+"and the *{chroot}* stage is when the chroot used to construct the live "
+"system's filesystem is built. Thus, the corresponding mirror switches are "
+"used for those stages, and later, in the *{binary}* stage, the #{--mirror-"
+"binary}# and #{--mirror-binary-security}# values are used, superceding any "
+"mirrors used in an earlier stage."
 msgstr ""
 
 #. type: Plain text
@@ -334,9 +334,9 @@ msgid ""
 "backports, experimental or custom packages. To configure additional "
 "repositories, create #{config/archives/your-repository.list.chroot}#, and/or "
 "#{config/archives/your-repository.list.binary}# files. As with the #{--"
-"mirror-*}# options, these govern the repositories used in the *chroot* stage "
-"when building the image, and in the *binary* stage, i.e. for use when "
-"running the live system."
+"mirror-*}# options, these govern the repositories used in the *{chroot}* "
+"stage when building the image, and in the *{binary}* stage, i.e. for use "
+"when running the live system."
 msgstr ""
 
 #. type: Plain text
@@ -996,7 +996,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:308
 msgid ""
-"If there is not an #{lb config}# option to alter APT's behaviour in the way "
+"If there is not a #{lb config}# option to alter APT's behaviour in the way "
 "you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
 "options through to your configured APT tool. See the man pages for #{apt}# "
 "and #{aptitude}# for details."
diff --git a/manual/po/de/user_managing_a_configuration.ssi.po b/manual/po/de/user_managing_a_configuration.ssi.po
index d00b67a..2477772 100644
--- a/manual/po/de/user_managing_a_configuration.ssi.po
+++ b/manual/po/de/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-02 12:23-0200\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,22 +18,25 @@ msgstr ""
 
 #. type: Plain text
 #: 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: 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:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
 #: 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-installer.ssi:32
@@ -42,33 +45,33 @@ msgstr ""
 #: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
 #: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
 #: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:204
-#: en/user_customization-packages.ssi:216
-#: en/user_customization-packages.ssi:280
-#: en/user_customization-packages.ssi:292
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
 #: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
 #: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
 #: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
 #: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
 #: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
 #: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 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
@@ -77,28 +80,31 @@ msgstr ""
 #: 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
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 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:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: 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:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
 #: 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-installer.ssi:38
@@ -107,33 +113,33 @@ msgstr ""
 #: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
 #: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:208
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
 #: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
 #: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
 #: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
 #: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
 #: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
 #: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 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
@@ -141,8 +147,8 @@ msgstr ""
 #: en/user_installation.ssi:149 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
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr ""
 
@@ -207,7 +213,7 @@ msgid ""
 "that are designed to help you manage your configuration. Simply create an "
 "auto/config script containing #{lb config}# command with all desired "
 "options, and an auto/clean that removes the files containing configuration "
-"variable values, and each time you #{lb config}# and #{lb clean}#, these "
+"variable values, and each time you run #{lb config}# and #{lb clean}#, these "
 "files will be executed. This will ensure that your configuration is kept "
 "internally consistent from one revision to the next and from one live-build "
 "release to the next (though you will still have to take care and read the "
diff --git a/manual/po/es/user_customization-installer.ssi.po b/manual/po/es/user_customization-installer.ssi.po
index dc95aaf..a33ad84 100644
--- a/manual/po/es/user_customization-installer.ssi.po
+++ b/manual/po/es/user_customization-installer.ssi.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-13 14:44+0100\n"
-"PO-Revision-Date: 2012-02-19 21:47+0100\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"PO-Revision-Date: 2012-03-19 20:54+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
 "Language-Team: none\n"
@@ -42,10 +42,10 @@ msgstr ""
 #: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
 #: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
 #: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 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_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
+#: 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-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -87,7 +87,7 @@ msgstr ""
 #: 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
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr "code{"
 
@@ -110,10 +110,10 @@ msgstr "code{"
 #: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
 #: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
 #: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 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_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
+#: 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-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -154,8 +154,8 @@ msgstr "code{"
 #: en/user_installation.ssi:149 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:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr "}code"
 
@@ -206,7 +206,7 @@ msgstr "Principalmente existen tres tipos de imágenes según el instalador:"
 #. type: Plain text
 #: en/user_customization-installer.ssi:14
 #, no-wrap
-msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as \"combined images\".\n"
+msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as \"combined images\".\n"
 msgstr "*{Imágenes con Instalador Debian «official»}*: Esta imagen de Debian Live se puede considerar como la imagen habitual. Dispone de un kernel y un initrd diferenciados que, al ser seleccionados desde el gestor de arranque, ejecuta un Instalador de Debian estándar, de la misma manera que lo haría si se arrancase desde una imagen de CD descargada desde el sitio oficial de Debian. Las imágenes que contienen un sistema en vivo con otro instalador independiente se suelen llamar «imágenes combinadas».\n"
 
 #. type: Plain text
diff --git a/manual/po/es/user_customization-packages.ssi.po b/manual/po/es/user_customization-packages.ssi.po
index 75513ac..1f4e7b9 100644
--- a/manual/po/es/user_customization-packages.ssi.po
+++ b/manual/po/es/user_customization-packages.ssi.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-13 14:44+0100\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
 "PO-Revision-Date: 2012-02-19 17:53+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -42,10 +42,10 @@ msgstr ""
 #: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
 #: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
 #: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 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_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
+#: 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-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -87,7 +87,7 @@ msgstr ""
 #: 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
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr "code{"
 
@@ -110,10 +110,10 @@ msgstr "code{"
 #: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
 #: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
 #: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 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_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
+#: 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-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -154,8 +154,8 @@ msgstr "code{"
 #: en/user_installation.ssi:149 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:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr "}code"
 
@@ -230,7 +230,7 @@ msgid ""
 "here. (See {Terms}#terms for more details.) The #{--distribution}# option "
 "not only influences the source of packages within the archive, but also "
 "instructs #{live-build}# to behave as needed to build each supported "
-"distribution. For example, to build against the *unstable* release, Sid, "
+"distribution. For example, to build against the *{unstable}* release, Sid, "
 "specify:"
 msgstr ""
 "La distribución seleccionada tiene gran impacto en qué paquetes están "
@@ -241,8 +241,8 @@ msgstr ""
 "ver {Términos}#terms). La opción #{--distribution}# no solamente influencia "
 "la fuente de los paquetes dentro del archivo Debian, sino que instruye a #"
 "{live-build}# a comportarse tal y como se necesita para construir cada una "
-"de las distribuciones. Por ejemplo, para construir contra la versión "
-"*inestable*, Sid, se debe indicar: "
+"de las distribuciones. Por ejemplo, para construir contra la versión *"
+"{inestable}*, Sid, se debe indicar: "
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:16
@@ -307,28 +307,28 @@ msgid ""
 "the world so that people in each region can choose a nearby mirror for best "
 "download speed. Each of the #{--mirror-*}# options governs which "
 "distribution mirror is used at various stages of the build. Recall from "
-"{Stages of the build}#stages-of-the-build that the *bootstrap* stage is when "
-"the chroot is initially populated by debootstrap with a minimal system, and "
-"the *chroot* stage is when the chroot used to construct the live system's "
-"filesystem is built. Thus, the corresponding mirror switches are used for "
-"those stages, and later, in the *binary* stage, the #{--mirror-binary}# and #"
-"{--mirror-binary-security}# values are used, superceding any mirrors used in "
-"an earlier stage."
+"{Stages of the build}#stages-of-the-build that the *{bootstrap}* stage is "
+"when the chroot is initially populated by debootstrap with a minimal system, "
+"and the *{chroot}* stage is when the chroot used to construct the live "
+"system's filesystem is built. Thus, the corresponding mirror switches are "
+"used for those stages, and later, in the *{binary}* stage, the #{--mirror-"
+"binary}# and #{--mirror-binary-security}# values are used, superceding any "
+"mirrors used in an earlier stage."
 msgstr ""
 "Los repositorios de Debian están replicados en una gran red alrededor del "
 "mundo, de manera que se puede seleccionar la réplica más cercana con el fin "
 "de obtener la mejor velocidad de descarga. Cada una de las opciones #{--"
 "mirror-*}# gobierna qué réplica de repositorio Debian se utiliza en las "
 "diferentes etapas de creación. Si se recuerda de {Etapas de la creación}"
-"#stages-of-the-build, en la etapa de *preinstalación (bootstrap)* es cuando "
-"se crea el directorio chroot y se rellena con un sistema mínimo  mediante  "
-"la herramienta debootstrap, y en la etapa *chroot* es cuando el directorio "
+"#stages-of-the-build, en la etapa de preinstalación (bootstrap) es cuando se "
+"crea el directorio chroot y se rellena con un sistema mínimo  mediante  la "
+"herramienta debootstrap, y en la etapa *{chroot}* es cuando el directorio "
 "chroot es completado con los paquetes necesarios para crear el sistema de "
 "ficheros que será utilizado en el sistema en vivo. A cada una de estas "
 "etapas le corresponde su propia opción #{--mirror-*}#. Posteriormente, en la "
-"etapa *binary* se utilizarán las réplicas Debian indicadas en los valores de "
-"las opciones #{--mirror-binary}# y #{--mirror-binary-security}# en lugar de "
-"utilizar los indicados para las etapas anteriores."
+"etapa *{binary}* se utilizarán las réplicas Debian indicadas en los valores "
+"de las opciones #{--mirror-binary}# y #{--mirror-binary-security}# en lugar "
+"de utilizar los indicados para las etapas anteriores."
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:36
@@ -416,9 +416,9 @@ msgid ""
 "backports, experimental or custom packages. To configure additional "
 "repositories, create #{config/archives/your-repository.list.chroot}#, and/or "
 "#{config/archives/your-repository.list.binary}# files. As with the #{--"
-"mirror-*}# options, these govern the repositories used in the *chroot* stage "
-"when building the image, and in the *binary* stage, i.e. for use when "
-"running the live system."
+"mirror-*}# options, these govern the repositories used in the *{chroot}* "
+"stage when building the image, and in the *{binary}* stage, i.e. for use "
+"when running the live system."
 msgstr ""
 "Se pueden añadir más repositorios, ampliando la lista de paquetes "
 "seleccionables más alla de aquellos disponibles para la distribución "
@@ -427,8 +427,8 @@ msgstr ""
 "ficheros #{config/archives/your-repository.list.chroot}# y/o #{config/"
 "archives/your-repository.list.binary}#. Al igual que en las opciones #{--"
 "mirror-*}#, estos ficheros gobiernan los repositorios utilizados en las "
-"etapas *chroot* y *binary* respectivamente, esto es, los repositorios que "
-"serán utilizados cuando se ejecute el sistema en vivo."
+"etapas *{chroot}* y *{binary}* respectivamente, esto es, los repositorios "
+"que serán utilizados cuando se ejecute el sistema en vivo."
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:65
@@ -1297,7 +1297,7 @@ msgstr "3~ Pasar opciones a apt o a aptitude"
 #. type: Plain text
 #: en/user_customization-packages.ssi:308
 msgid ""
-"If there is not an #{lb config}# option to alter APT's behaviour in the way "
+"If there is not a #{lb config}# option to alter APT's behaviour in the way "
 "you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
 "options through to your configured APT tool. See the man pages for #{apt}# "
 "and #{aptitude}# for details."
diff --git a/manual/po/es/user_managing_a_configuration.ssi.po b/manual/po/es/user_managing_a_configuration.ssi.po
index 1181fa2..b6fa722 100644
--- a/manual/po/es/user_managing_a_configuration.ssi.po
+++ b/manual/po/es/user_managing_a_configuration.ssi.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-02 12:23-0200\n"
-"PO-Revision-Date: 2012-02-19 17:34+0100\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"PO-Revision-Date: 2012-03-19 20:54+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
 "Language-Team: Debian live Spanish translation team <debian-live at lists."
@@ -23,22 +23,25 @@ msgstr ""
 
 #. type: Plain text
 #: 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: 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:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
 #: 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-installer.ssi:32
@@ -47,33 +50,33 @@ msgstr ""
 #: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
 #: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
 #: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:204
-#: en/user_customization-packages.ssi:216
-#: en/user_customization-packages.ssi:280
-#: en/user_customization-packages.ssi:292
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
 #: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
 #: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
 #: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
 #: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
 #: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
 #: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 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
@@ -82,28 +85,31 @@ msgstr ""
 #: 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
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 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:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: 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:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
 #: 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-installer.ssi:38
@@ -112,33 +118,33 @@ msgstr "code{"
 #: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
 #: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:208
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
 #: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
 #: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
 #: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
 #: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
 #: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
 #: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 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
@@ -146,8 +152,8 @@ msgstr "code{"
 #: en/user_installation.ssi:149 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
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr "}code"
 
@@ -239,7 +245,7 @@ msgid ""
 "that are designed to help you manage your configuration. Simply create an "
 "auto/config script containing #{lb config}# command with all desired "
 "options, and an auto/clean that removes the files containing configuration "
-"variable values, and each time you #{lb config}# and #{lb clean}#, these "
+"variable values, and each time you run #{lb config}# and #{lb clean}#, these "
 "files will be executed. This will ensure that your configuration is kept "
 "internally consistent from one revision to the next and from one live-build "
 "release to the next (though you will still have to take care and read the "
diff --git a/manual/po/fr/user_customization-installer.ssi.po b/manual/po/fr/user_customization-installer.ssi.po
index 5e52714..57db8fd 100644
--- a/manual/po/fr/user_customization-installer.ssi.po
+++ b/manual/po/fr/user_customization-installer.ssi.po
@@ -7,15 +7,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-13 14:44+0100\n"
-"PO-Revision-Date: 2012-03-17 17:33+0100\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"PO-Revision-Date: 2012-03-19 21:01+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
@@ -36,10 +36,10 @@ msgstr ""
 #: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
 #: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
 #: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 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_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
+#: 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-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -81,7 +81,7 @@ msgstr ""
 #: 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
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr "code{"
 
@@ -104,10 +104,10 @@ msgstr "code{"
 #: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
 #: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
 #: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 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_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
+#: 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-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -148,8 +148,8 @@ msgstr "code{"
 #: en/user_installation.ssi:149 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:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr "}code"
 
@@ -200,7 +200,7 @@ msgstr "Les trois principaux types de programme d'installation sont:"
 #. type: Plain text
 #: en/user_customization-installer.ssi:14
 #, no-wrap
-msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as \"combined images\".\n"
+msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as \"combined images\".\n"
 msgstr "*{Installateur Debian «Régulière»}*: C'est une image de Debian Live normale avec un noyau et initrd séparés qui (lorsqu'ils sont sélectionnés à partir du chargeur d'amorçage approprié) se lancen dans une instance d'installateur Debian standard, exactement comme si vous aviez téléchargé une image CD de Debian et la auriez démarrée. Les images contenant un système live et un installateur indépendant sont souvent appelés «images combinées\".\n"
 
 #. type: Plain text
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index 823aac3..3a07cbc 100644
--- a/manual/po/fr/user_customization-packages.ssi.po
+++ b/manual/po/fr/user_customization-packages.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-13 14:44+0100\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
 "PO-Revision-Date: 2012-03-17 19:13+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -36,10 +36,10 @@ msgstr ""
 #: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
 #: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
 #: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 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_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
+#: 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-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -81,7 +81,7 @@ msgstr ""
 #: 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
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr "code{"
 
@@ -104,10 +104,10 @@ msgstr "code{"
 #: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
 #: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
 #: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 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_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
+#: 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-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -148,8 +148,8 @@ msgstr "code{"
 #: en/user_installation.ssi:149 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:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr "}code"
 
@@ -223,7 +223,7 @@ msgid ""
 "here. (See {Terms}#terms for more details.) The #{--distribution}# option "
 "not only influences the source of packages within the archive, but also "
 "instructs #{live-build}# to behave as needed to build each supported "
-"distribution. For example, to build against the *unstable* release, Sid, "
+"distribution. For example, to build against the *{unstable}* release, Sid, "
 "specify:"
 msgstr ""
 "La distribution que vous choisissez a le plus large impact sur les paquets "
@@ -233,8 +233,8 @@ msgstr ""
 "par son nom de code ici. (Voir {Termes}#terms pour plus de détails.) "
 "L'option #{--distribution}# non seulement influence la source des paquets "
 "dans l'archive, mais aussi dit #{live-build}# comme it doit construire "
-"chaque distribution soutenue. Par exemple, pour construire contre "
-"*unstable*, Sid, précisez: "
+"chaque distribution soutenue. Par exemple, pour construire contre *{unstable}"
+"*, Sid, précisez: "
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:16
@@ -298,25 +298,25 @@ msgid ""
 "the world so that people in each region can choose a nearby mirror for best "
 "download speed. Each of the #{--mirror-*}# options governs which "
 "distribution mirror is used at various stages of the build. Recall from "
-"{Stages of the build}#stages-of-the-build that the *bootstrap* stage is when "
-"the chroot is initially populated by debootstrap with a minimal system, and "
-"the *chroot* stage is when the chroot used to construct the live system's "
-"filesystem is built. Thus, the corresponding mirror switches are used for "
-"those stages, and later, in the *binary* stage, the #{--mirror-binary}# and #"
-"{--mirror-binary-security}# values are used, superceding any mirrors used in "
-"an earlier stage."
+"{Stages of the build}#stages-of-the-build that the *{bootstrap}* stage is "
+"when the chroot is initially populated by debootstrap with a minimal system, "
+"and the *{chroot}* stage is when the chroot used to construct the live "
+"system's filesystem is built. Thus, the corresponding mirror switches are "
+"used for those stages, and later, in the *{binary}* stage, the #{--mirror-"
+"binary}# and #{--mirror-binary-security}# values are used, superceding any "
+"mirrors used in an earlier stage."
 msgstr ""
 "L'archive Debian est répliqué à travers un large réseau de miroirs autour du "
 "monde pour que les gens dans chaque région peuvent choisir un miroir proche "
 "avec la meilleur vitesse de téléchargement. Chacune des options #{--mirror-*}"
 "# qui régissent quel miroir de distribution est utilisée à différentes "
 "étapes de la construction. Rappelez-vous de {Étapes de la construction}"
-"#stages-of-the-build que l'étape *bootstrap* c'est quand le chroot est "
-"initialement peuplée par debootstrap avec un système minimal, et l'étape "
-"*chroot* c'est quand le chroot utilisé pour construire le système de "
+"#stages-of-the-build que l'étape *{bootstrap}* c'est quand le chroot est "
+"initialement peuplée par debootstrap avec un système minimal, et l'étape *"
+"{chroot}* c'est quand le chroot utilisé pour construire le système de "
 "fichiers du système live est construit. Ainsi, les commutateurs des miroirs "
-"correspondants sont utilisées pour ces étapes, et plus tard, dans l'étape "
-"*binary* les valeurs #{--mirror-binary}# et #{--mirror-binary-security}# "
+"correspondants sont utilisées pour ces étapes, et plus tard, dans l'étape *"
+"{binary}* les valeurs #{--mirror-binary}# et #{--mirror-binary-security}# "
 "sont utilisées, remplaçant tout miroir utilisé dans une étape antérieure. "
 
 #. type: Plain text
@@ -405,9 +405,9 @@ msgid ""
 "backports, experimental or custom packages. To configure additional "
 "repositories, create #{config/archives/your-repository.list.chroot}#, and/or "
 "#{config/archives/your-repository.list.binary}# files. As with the #{--"
-"mirror-*}# options, these govern the repositories used in the *chroot* stage "
-"when building the image, and in the *binary* stage, i.e. for use when "
-"running the live system."
+"mirror-*}# options, these govern the repositories used in the *{chroot}* "
+"stage when building the image, and in the *{binary}* stage, i.e. for use "
+"when running the live system."
 msgstr ""
 "Vous pouvez ajouter d'autres dépôts, élargissant votre choix de paquets au-"
 "delà ceux disponibles dans votre distribution objectif. Il peut être, par "
@@ -415,9 +415,9 @@ msgstr ""
 "configurer des dépôts supplémentaires, créer les fichiers #{config/archives/"
 "your-repository.list.chroot}#, et/ou #{config/archives/your-repository.list."
 "binary}#. Comme avec les options #{--mirror-*}#, elles gouvernent les dépôts "
-"utilisés dans l'étape *chroot* lors de la construction de l'image, et dans "
-"l'étape *binary*, c'est à dire pour une utilisation au moment de l'exécution "
-"du système live."
+"utilisés dans l'étape *{chroot}* lors de la construction de l'image, et dans "
+"l'étape *{binary}*, c'est à dire pour une utilisation au moment de "
+"l'exécution du système live."
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:65
@@ -1276,7 +1276,7 @@ msgstr "3~ Passer des options à apt ou aptitude"
 #. type: Plain text
 #: en/user_customization-packages.ssi:308
 msgid ""
-"If there is not an #{lb config}# option to alter APT's behaviour in the way "
+"If there is not a #{lb config}# option to alter APT's behaviour in the way "
 "you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
 "options through to your configured APT tool. See the man pages for #{apt}# "
 "and #{aptitude}# for details."
diff --git a/manual/po/fr/user_managing_a_configuration.ssi.po b/manual/po/fr/user_managing_a_configuration.ssi.po
index b766752..0a7335f 100644
--- a/manual/po/fr/user_managing_a_configuration.ssi.po
+++ b/manual/po/fr/user_managing_a_configuration.ssi.po
@@ -7,34 +7,37 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-02 12:23-0200\n"
-"PO-Revision-Date: 2012-03-17 20:26+0100\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"PO-Revision-Date: 2012-03-19 21:02+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
 #: 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: 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:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
 #: 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-installer.ssi:32
@@ -43,33 +46,33 @@ msgstr ""
 #: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
 #: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
 #: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:204
-#: en/user_customization-packages.ssi:216
-#: en/user_customization-packages.ssi:280
-#: en/user_customization-packages.ssi:292
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
 #: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
 #: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
 #: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
 #: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
 #: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
 #: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 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
@@ -78,28 +81,31 @@ msgstr ""
 #: 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
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 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:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: 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:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
 #: 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-installer.ssi:38
@@ -108,33 +114,33 @@ msgstr "code{"
 #: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
 #: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:208
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
 #: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
 #: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
 #: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
 #: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
 #: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
 #: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 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
@@ -142,8 +148,8 @@ msgstr "code{"
 #: en/user_installation.ssi:149 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
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr "}code"
 
@@ -228,7 +234,7 @@ msgid ""
 "that are designed to help you manage your configuration. Simply create an "
 "auto/config script containing #{lb config}# command with all desired "
 "options, and an auto/clean that removes the files containing configuration "
-"variable values, and each time you #{lb config}# and #{lb clean}#, these "
+"variable values, and each time you run #{lb config}# and #{lb clean}#, these "
 "files will be executed. This will ensure that your configuration is kept "
 "internally consistent from one revision to the next and from one live-build "
 "release to the next (though you will still have to take care and read the "
diff --git a/manual/po/it/user_customization-installer.ssi.po b/manual/po/it/user_customization-installer.ssi.po
index b99e0af..c3b3a6a 100644
--- a/manual/po/it/user_customization-installer.ssi.po
+++ b/manual/po/it/user_customization-installer.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-13 14:44+0100\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
 "PO-Revision-Date: 2011-12-06 00:05+0100\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -36,10 +36,10 @@ msgstr ""
 #: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
 #: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
 #: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 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_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
+#: 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-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -81,7 +81,7 @@ msgstr ""
 #: 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
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr "code{"
 
@@ -104,10 +104,10 @@ msgstr "code{"
 #: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
 #: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
 #: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 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_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
+#: 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-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -148,8 +148,8 @@ msgstr "code{"
 #: en/user_installation.ssi:149 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:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr "}code"
 
@@ -200,7 +200,7 @@ msgstr "I tre principali tipi dell'installer sono:"
 #. type: Plain text
 #: en/user_customization-installer.ssi:14
 #, no-wrap
-msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as \"combined images\".\n"
+msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as \"combined images\".\n"
 msgstr "*{Installatore Debian \"normale\"}*: un'immagine Debian Live con un kernel e un initrd separati i quali (quando viene selezionato dal bootloader appropriato) lancia un'istanza standard dell'Installatore Debian, come quando si scarica un'immagine di Debian per CD e la si avvia. Le immagini che contengono un sistema live e un'installatore indipendenti sono spesso definite \"immagini combinate\".\n"
 
 #. type: Plain text
diff --git a/manual/po/it/user_customization-packages.ssi.po b/manual/po/it/user_customization-packages.ssi.po
index 36436af..ede0375 100644
--- a/manual/po/it/user_customization-packages.ssi.po
+++ b/manual/po/it/user_customization-packages.ssi.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2012-02-13 14:44+0100\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
 "PO-Revision-Date: 2012-02-06 18:35+0100\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -37,10 +37,10 @@ msgstr ""
 #: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
 #: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
 #: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 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_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
+#: 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-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -82,7 +82,7 @@ msgstr ""
 #: 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
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr "code{"
 
@@ -105,10 +105,10 @@ msgstr "code{"
 #: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
 #: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
 #: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 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_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
+#: 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-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -149,8 +149,8 @@ msgstr "code{"
 #: en/user_installation.ssi:149 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:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr "}code"
 
@@ -215,6 +215,17 @@ msgstr "3~ Distribuzione, le aree di archivio e le modalità"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:12
+#, fuzzy
+#| msgid ""
+#| "The distribution you choose has the broadest impact on which packages are "
+#| "available to include in your live image. Specify the codename, which "
+#| "defaults to #{wheezy}# for the Wheezy version of live-build. Any current "
+#| "distribution carried in the Debian archive may be specified by its "
+#| "codename here. (See {Terms}#terms for more details.) The #{--distribution}"
+#| "# option not only influences the source of packages within the archive, "
+#| "but also instructs #{live-build}# to behave as needed to build each "
+#| "supported distribution. For example, to build against the *unstable* "
+#| "release, Sid, specify:"
 msgid ""
 "The distribution you choose has the broadest impact on which packages are "
 "available to include in your live image. Specify the codename, which "
@@ -223,7 +234,7 @@ msgid ""
 "here. (See {Terms}#terms for more details.) The #{--distribution}# option "
 "not only influences the source of packages within the archive, but also "
 "instructs #{live-build}# to behave as needed to build each supported "
-"distribution. For example, to build against the *unstable* release, Sid, "
+"distribution. For example, to build against the *{unstable}* release, Sid, "
 "specify:"
 msgstr ""
 "La distribuzione che viene scelta ha un ampio impatto su quali pacchetti "
@@ -293,18 +304,31 @@ msgstr "3~ Mirror delle distribuzioni"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:34
+#, fuzzy
+#| msgid ""
+#| "The Debian archive is replicated across a large network of mirrors around "
+#| "the world so that people in each region can choose a nearby mirror for "
+#| "best download speed. Each of the #{--mirror-*}# options governs which "
+#| "distribution mirror is used at various stages of the build. Recall from "
+#| "{Stages of the build}#stages-of-the-build that the *bootstrap* stage is "
+#| "when the chroot is initially populated by debootstrap with a minimal "
+#| "system, and the *chroot* stage is when the chroot used to construct the "
+#| "live system's filesystem is built. Thus, the corresponding mirror "
+#| "switches are used for those stages, and later, in the *binary* stage, the "
+#| "#{--mirror-binary}# and #{--mirror-binary-security}# values are used, "
+#| "superceding any mirrors used in an earlier stage."
 msgid ""
 "The Debian archive is replicated across a large network of mirrors around "
 "the world so that people in each region can choose a nearby mirror for best "
 "download speed. Each of the #{--mirror-*}# options governs which "
 "distribution mirror is used at various stages of the build. Recall from "
-"{Stages of the build}#stages-of-the-build that the *bootstrap* stage is when "
-"the chroot is initially populated by debootstrap with a minimal system, and "
-"the *chroot* stage is when the chroot used to construct the live system's "
-"filesystem is built. Thus, the corresponding mirror switches are used for "
-"those stages, and later, in the *binary* stage, the #{--mirror-binary}# and #"
-"{--mirror-binary-security}# values are used, superceding any mirrors used in "
-"an earlier stage."
+"{Stages of the build}#stages-of-the-build that the *{bootstrap}* stage is "
+"when the chroot is initially populated by debootstrap with a minimal system, "
+"and the *{chroot}* stage is when the chroot used to construct the live "
+"system's filesystem is built. Thus, the corresponding mirror switches are "
+"used for those stages, and later, in the *{binary}* stage, the #{--mirror-"
+"binary}# and #{--mirror-binary-security}# values are used, superceding any "
+"mirrors used in an earlier stage."
 msgstr ""
 "L'archivio Debian è replicato attraverso una vasta rete di mirror in tutto "
 "il mondo cosicché chiunque in ogni nazione può selezionare il mirror più "
@@ -399,15 +423,25 @@ msgstr "3~additional-repositories Repository addizionali"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:63
+#, fuzzy
+#| msgid ""
+#| "You may add more repositories, broadening your package choices beyond "
+#| "what is available in your target distribution. These may be, for example, "
+#| "for backports, experimental or custom packages. To configure additional "
+#| "repositories, create #{config/archives/your-repository.list.chroot}#, and/"
+#| "or #{config/archives/your-repository.list.binary}# files. As with the #{--"
+#| "mirror-*}# options, these govern the repositories used in the *chroot* "
+#| "stage when building the image, and in the *binary* stage, i.e. for use "
+#| "when running the live system."
 msgid ""
 "You may add more repositories, broadening your package choices beyond what "
 "is available in your target distribution. These may be, for example, for "
 "backports, experimental or custom packages. To configure additional "
 "repositories, create #{config/archives/your-repository.list.chroot}#, and/or "
 "#{config/archives/your-repository.list.binary}# files. As with the #{--"
-"mirror-*}# options, these govern the repositories used in the *chroot* stage "
-"when building the image, and in the *binary* stage, i.e. for use when "
-"running the live system."
+"mirror-*}# options, these govern the repositories used in the *{chroot}* "
+"stage when building the image, and in the *{binary}* stage, i.e. for use "
+"when running the live system."
 msgstr ""
 "Si possono aggiungere altri repository, ampliando così la scelta dei "
 "pacchetti al di là di quelli disponibili nella distribuzione di "
@@ -1258,8 +1292,14 @@ msgstr "3~ Passare opzioni ad apt o aptitude"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:308
+#, fuzzy
+#| msgid ""
+#| "If there is not an #{lb config}# option to alter APT's behaviour in the "
+#| "way you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
+#| "options through to your configured APT tool. See the man pages for #{apt}"
+#| "# and #{aptitude}# for details."
 msgid ""
-"If there is not an #{lb config}# option to alter APT's behaviour in the way "
+"If there is not a #{lb config}# option to alter APT's behaviour in the way "
 "you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
 "options through to your configured APT tool. See the man pages for #{apt}# "
 "and #{aptitude}# for details."
diff --git a/manual/po/it/user_managing_a_configuration.ssi.po b/manual/po/it/user_managing_a_configuration.ssi.po
index 2e24735..8d597df 100644
--- a/manual/po/it/user_managing_a_configuration.ssi.po
+++ b/manual/po/it/user_managing_a_configuration.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-02 12:23-0200\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
 "PO-Revision-Date: 2011-12-05 23:01+0100\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -19,22 +19,25 @@ msgstr ""
 
 #. type: Plain text
 #: 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: 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:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
 #: 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-installer.ssi:32
@@ -43,33 +46,33 @@ msgstr ""
 #: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
 #: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
 #: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:204
-#: en/user_customization-packages.ssi:216
-#: en/user_customization-packages.ssi:280
-#: en/user_customization-packages.ssi:292
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
 #: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
 #: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
 #: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
 #: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
 #: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
 #: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 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
@@ -78,28 +81,31 @@ msgstr ""
 #: 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
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 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:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: 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:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
 #: 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-installer.ssi:38
@@ -108,33 +114,33 @@ msgstr "code{"
 #: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
 #: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:208
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
 #: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
 #: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
 #: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
 #: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
 #: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
 #: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 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
@@ -142,8 +148,8 @@ msgstr "code{"
 #: en/user_installation.ssi:149 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
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr "}code"
 
@@ -220,13 +226,26 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_managing_a_configuration.ssi:16
+#, fuzzy
+#| msgid ""
+#| "All of this would be a terrible nuisance if it weren't for auto/* "
+#| "scripts, simple wrappers to the #{lb config}#, #{lb build}# and #{lb "
+#| "clean}# commands that are designed to help you manage your configuration. "
+#| "Simply create an auto/config script containing #{lb config}# command with "
+#| "all desired options, and an auto/clean that removes the files containing "
+#| "configuration variable values, and each time you #{lb config}# and #{lb "
+#| "clean}#, these files will be executed. This will ensure that your "
+#| "configuration is kept internally consistent from one revision to the next "
+#| "and from one live-build release to the next (though you will still have "
+#| "to take care and read the documentation when you upgrade live-build and "
+#| "make adjustments as needed)."
 msgid ""
 "All of this would be a terrible nuisance if it weren't for auto/* scripts, "
 "simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands "
 "that are designed to help you manage your configuration. Simply create an "
 "auto/config script containing #{lb config}# command with all desired "
 "options, and an auto/clean that removes the files containing configuration "
-"variable values, and each time you #{lb config}# and #{lb clean}#, these "
+"variable values, and each time you run #{lb config}# and #{lb clean}#, these "
 "files will be executed. This will ensure that your configuration is kept "
 "internally consistent from one revision to the next and from one live-build "
 "release to the next (though you will still have to take care and read the "
diff --git a/manual/po/pt_BR/user_customization-installer.ssi.po b/manual/po/pt_BR/user_customization-installer.ssi.po
index db46a0e..ef1b05f 100644
--- a/manual/po/pt_BR/user_customization-installer.ssi.po
+++ b/manual/po/pt_BR/user_customization-installer.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-13 14:44+0100\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
 "PO-Revision-Date: 2010-11-30 10:53+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -35,10 +35,10 @@ msgstr ""
 #: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
 #: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
 #: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 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_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
+#: 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-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -80,7 +80,7 @@ msgstr ""
 #: 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
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr "code{"
 
@@ -103,10 +103,10 @@ msgstr "code{"
 #: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
 #: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
 #: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 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_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
+#: 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-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -147,8 +147,8 @@ msgstr "code{"
 #: en/user_installation.ssi:149 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:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr "}code"
 
@@ -192,7 +192,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-installer.ssi:14
 #, no-wrap
-msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as \"combined images\".\n"
+msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as \"combined images\".\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-packages.ssi.po b/manual/po/pt_BR/user_customization-packages.ssi.po
index 8f9e0dc..5f05987 100644
--- a/manual/po/pt_BR/user_customization-packages.ssi.po
+++ b/manual/po/pt_BR/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-13 14:44+0100\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
 "PO-Revision-Date: 2010-10-22 08:58-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -35,10 +35,10 @@ msgstr ""
 #: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
 #: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
 #: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 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_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
+#: 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-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -80,7 +80,7 @@ msgstr ""
 #: 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
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr "code{"
 
@@ -103,10 +103,10 @@ msgstr "code{"
 #: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
 #: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
 #: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 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_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
+#: 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-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -147,8 +147,8 @@ msgstr "code{"
 #: en/user_installation.ssi:149 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:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr "}code"
 
@@ -202,7 +202,7 @@ msgid ""
 "here. (See {Terms}#terms for more details.) The #{--distribution}# option "
 "not only influences the source of packages within the archive, but also "
 "instructs #{live-build}# to behave as needed to build each supported "
-"distribution. For example, to build against the *unstable* release, Sid, "
+"distribution. For example, to build against the *{unstable}* release, Sid, "
 "specify:"
 msgstr ""
 
@@ -256,13 +256,13 @@ msgid ""
 "the world so that people in each region can choose a nearby mirror for best "
 "download speed. Each of the #{--mirror-*}# options governs which "
 "distribution mirror is used at various stages of the build. Recall from "
-"{Stages of the build}#stages-of-the-build that the *bootstrap* stage is when "
-"the chroot is initially populated by debootstrap with a minimal system, and "
-"the *chroot* stage is when the chroot used to construct the live system's "
-"filesystem is built. Thus, the corresponding mirror switches are used for "
-"those stages, and later, in the *binary* stage, the #{--mirror-binary}# and #"
-"{--mirror-binary-security}# values are used, superceding any mirrors used in "
-"an earlier stage."
+"{Stages of the build}#stages-of-the-build that the *{bootstrap}* stage is "
+"when the chroot is initially populated by debootstrap with a minimal system, "
+"and the *{chroot}* stage is when the chroot used to construct the live "
+"system's filesystem is built. Thus, the corresponding mirror switches are "
+"used for those stages, and later, in the *{binary}* stage, the #{--mirror-"
+"binary}# and #{--mirror-binary-security}# values are used, superceding any "
+"mirrors used in an earlier stage."
 msgstr ""
 
 #. type: Plain text
@@ -334,9 +334,9 @@ msgid ""
 "backports, experimental or custom packages. To configure additional "
 "repositories, create #{config/archives/your-repository.list.chroot}#, and/or "
 "#{config/archives/your-repository.list.binary}# files. As with the #{--"
-"mirror-*}# options, these govern the repositories used in the *chroot* stage "
-"when building the image, and in the *binary* stage, i.e. for use when "
-"running the live system."
+"mirror-*}# options, these govern the repositories used in the *{chroot}* "
+"stage when building the image, and in the *{binary}* stage, i.e. for use "
+"when running the live system."
 msgstr ""
 
 #. type: Plain text
@@ -996,7 +996,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:308
 msgid ""
-"If there is not an #{lb config}# option to alter APT's behaviour in the way "
+"If there is not a #{lb config}# option to alter APT's behaviour in the way "
 "you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
 "options through to your configured APT tool. See the man pages for #{apt}# "
 "and #{aptitude}# for details."
diff --git a/manual/po/pt_BR/user_managing_a_configuration.ssi.po b/manual/po/pt_BR/user_managing_a_configuration.ssi.po
index 9b761b5..3f3b09c 100644
--- a/manual/po/pt_BR/user_managing_a_configuration.ssi.po
+++ b/manual/po/pt_BR/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-02 12:23-0200\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
 "PO-Revision-Date: 2010-10-13 17:00+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,22 +18,25 @@ msgstr ""
 
 #. type: Plain text
 #: 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: 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:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
 #: 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-installer.ssi:32
@@ -42,33 +45,33 @@ msgstr ""
 #: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
 #: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
 #: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:204
-#: en/user_customization-packages.ssi:216
-#: en/user_customization-packages.ssi:280
-#: en/user_customization-packages.ssi:292
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
 #: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
 #: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
 #: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
 #: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
 #: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
 #: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 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
@@ -77,28 +80,31 @@ msgstr ""
 #: 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
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 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:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: 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:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
 #: 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-installer.ssi:38
@@ -107,33 +113,33 @@ msgstr "code{"
 #: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
 #: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:208
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
 #: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
 #: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
 #: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
 #: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
 #: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
 #: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 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
@@ -141,8 +147,8 @@ msgstr "code{"
 #: en/user_installation.ssi:149 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
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr "}code"
 
@@ -207,7 +213,7 @@ msgid ""
 "that are designed to help you manage your configuration. Simply create an "
 "auto/config script containing #{lb config}# command with all desired "
 "options, and an auto/clean that removes the files containing configuration "
-"variable values, and each time you #{lb config}# and #{lb clean}#, these "
+"variable values, and each time you run #{lb config}# and #{lb clean}#, these "
 "files will be executed. This will ensure that your configuration is kept "
 "internally consistent from one revision to the next and from one live-build "
 "release to the next (though you will still have to take care and read the "
diff --git a/manual/po/ro/user_customization-installer.ssi.po b/manual/po/ro/user_customization-installer.ssi.po
index 4ed1083..e60444c 100644
--- a/manual/po/ro/user_customization-installer.ssi.po
+++ b/manual/po/ro/user_customization-installer.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-13 14:44+0100\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
 "PO-Revision-Date: 2010-11-30 10:53+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -36,10 +36,10 @@ msgstr ""
 #: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
 #: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
 #: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 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_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
+#: 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-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -81,7 +81,7 @@ msgstr ""
 #: 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
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr "code{"
 
@@ -104,10 +104,10 @@ msgstr "code{"
 #: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
 #: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
 #: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 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_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
+#: 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-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -148,8 +148,8 @@ msgstr "code{"
 #: en/user_installation.ssi:149 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:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr "}code"
 
@@ -193,7 +193,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-installer.ssi:14
 #, no-wrap
-msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as \"combined images\".\n"
+msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as \"combined images\".\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/user_customization-packages.ssi.po b/manual/po/ro/user_customization-packages.ssi.po
index d8b2096..c39b866 100644
--- a/manual/po/ro/user_customization-packages.ssi.po
+++ b/manual/po/ro/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-13 14:44+0100\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
 "PO-Revision-Date: 2010-10-22 08:58-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -36,10 +36,10 @@ msgstr ""
 #: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
 #: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
 #: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 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_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
+#: 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-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -81,7 +81,7 @@ msgstr ""
 #: 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
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr "code{"
 
@@ -104,10 +104,10 @@ msgstr "code{"
 #: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
 #: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
 #: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 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_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
+#: 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-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -148,8 +148,8 @@ msgstr "code{"
 #: en/user_installation.ssi:149 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:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr "}code"
 
@@ -203,7 +203,7 @@ msgid ""
 "here. (See {Terms}#terms for more details.) The #{--distribution}# option "
 "not only influences the source of packages within the archive, but also "
 "instructs #{live-build}# to behave as needed to build each supported "
-"distribution. For example, to build against the *unstable* release, Sid, "
+"distribution. For example, to build against the *{unstable}* release, Sid, "
 "specify:"
 msgstr ""
 
@@ -257,13 +257,13 @@ msgid ""
 "the world so that people in each region can choose a nearby mirror for best "
 "download speed. Each of the #{--mirror-*}# options governs which "
 "distribution mirror is used at various stages of the build. Recall from "
-"{Stages of the build}#stages-of-the-build that the *bootstrap* stage is when "
-"the chroot is initially populated by debootstrap with a minimal system, and "
-"the *chroot* stage is when the chroot used to construct the live system's "
-"filesystem is built. Thus, the corresponding mirror switches are used for "
-"those stages, and later, in the *binary* stage, the #{--mirror-binary}# and #"
-"{--mirror-binary-security}# values are used, superceding any mirrors used in "
-"an earlier stage."
+"{Stages of the build}#stages-of-the-build that the *{bootstrap}* stage is "
+"when the chroot is initially populated by debootstrap with a minimal system, "
+"and the *{chroot}* stage is when the chroot used to construct the live "
+"system's filesystem is built. Thus, the corresponding mirror switches are "
+"used for those stages, and later, in the *{binary}* stage, the #{--mirror-"
+"binary}# and #{--mirror-binary-security}# values are used, superceding any "
+"mirrors used in an earlier stage."
 msgstr ""
 
 #. type: Plain text
@@ -335,9 +335,9 @@ msgid ""
 "backports, experimental or custom packages. To configure additional "
 "repositories, create #{config/archives/your-repository.list.chroot}#, and/or "
 "#{config/archives/your-repository.list.binary}# files. As with the #{--"
-"mirror-*}# options, these govern the repositories used in the *chroot* stage "
-"when building the image, and in the *binary* stage, i.e. for use when "
-"running the live system."
+"mirror-*}# options, these govern the repositories used in the *{chroot}* "
+"stage when building the image, and in the *{binary}* stage, i.e. for use "
+"when running the live system."
 msgstr ""
 
 #. type: Plain text
@@ -997,7 +997,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:308
 msgid ""
-"If there is not an #{lb config}# option to alter APT's behaviour in the way "
+"If there is not a #{lb config}# option to alter APT's behaviour in the way "
 "you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
 "options through to your configured APT tool. See the man pages for #{apt}# "
 "and #{aptitude}# for details."
diff --git a/manual/po/ro/user_managing_a_configuration.ssi.po b/manual/po/ro/user_managing_a_configuration.ssi.po
index f16d24f..d04a50b 100644
--- a/manual/po/ro/user_managing_a_configuration.ssi.po
+++ b/manual/po/ro/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-02 12:23-0200\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
 "PO-Revision-Date: 2010-10-13 17:00+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -19,22 +19,25 @@ msgstr ""
 
 #. type: Plain text
 #: 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: 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:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
 #: 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-installer.ssi:32
@@ -43,33 +46,33 @@ msgstr ""
 #: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
 #: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
 #: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:204
-#: en/user_customization-packages.ssi:216
-#: en/user_customization-packages.ssi:280
-#: en/user_customization-packages.ssi:292
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
 #: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
 #: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
 #: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
 #: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
 #: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
 #: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 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
@@ -78,28 +81,31 @@ msgstr ""
 #: 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
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 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:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: 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:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
 #: 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-installer.ssi:38
@@ -108,33 +114,33 @@ msgstr "code{"
 #: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
 #: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:208
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
 #: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
 #: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
 #: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
 #: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
 #: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
 #: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 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
@@ -142,8 +148,8 @@ msgstr "code{"
 #: en/user_installation.ssi:149 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
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr "}code"
 
@@ -208,7 +214,7 @@ msgid ""
 "that are designed to help you manage your configuration. Simply create an "
 "auto/config script containing #{lb config}# command with all desired "
 "options, and an auto/clean that removes the files containing configuration "
-"variable values, and each time you #{lb config}# and #{lb clean}#, these "
+"variable values, and each time you run #{lb config}# and #{lb clean}#, these "
 "files will be executed. This will ensure that your configuration is kept "
 "internally consistent from one revision to the next and from one live-build "
 "release to the next (though you will still have to take care and read the "
diff --git a/manual/pot/user_customization-installer.ssi.pot b/manual/pot/user_customization-installer.ssi.pot
index 95d8ab7..07c2a1e 100644
--- a/manual/pot/user_customization-installer.ssi.pot
+++ b/manual/pot/user_customization-installer.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-13 14:44+0100\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -35,10 +35,10 @@ msgstr ""
 #: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
 #: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
 #: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 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_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
+#: 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-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -80,7 +80,7 @@ msgstr ""
 #: 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
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr ""
 
@@ -103,10 +103,10 @@ msgstr ""
 #: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
 #: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
 #: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 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_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
+#: 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-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -147,8 +147,8 @@ msgstr ""
 #: en/user_installation.ssi:149 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:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr ""
 
@@ -192,7 +192,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-installer.ssi:14
 #, no-wrap
-msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as \"combined images\".\n"
+msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as \"combined images\".\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index abfa7a4..036e06b 100644
--- a/manual/pot/user_customization-packages.ssi.pot
+++ b/manual/pot/user_customization-packages.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-13 14:44+0100\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -35,10 +35,10 @@ msgstr ""
 #: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
 #: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
 #: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
-#: en/user_customization-binary.ssi:27 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_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
+#: 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-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -80,7 +80,7 @@ msgstr ""
 #: 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
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr ""
 
@@ -103,10 +103,10 @@ msgstr ""
 #: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
 #: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
 #: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
-#: en/user_customization-binary.ssi:33 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_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
+#: 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-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -147,8 +147,8 @@ msgstr ""
 #: en/user_installation.ssi:149 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:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr ""
 
@@ -202,7 +202,7 @@ msgid ""
 "here. (See {Terms}#terms for more details.) The #{--distribution}# option "
 "not only influences the source of packages within the archive, but also "
 "instructs #{live-build}# to behave as needed to build each supported "
-"distribution. For example, to build against the *unstable* release, Sid, "
+"distribution. For example, to build against the *{unstable}* release, Sid, "
 "specify:"
 msgstr ""
 
@@ -256,13 +256,13 @@ msgid ""
 "the world so that people in each region can choose a nearby mirror for best "
 "download speed. Each of the #{--mirror-*}# options governs which "
 "distribution mirror is used at various stages of the build. Recall from "
-"{Stages of the build}#stages-of-the-build that the *bootstrap* stage is when "
-"the chroot is initially populated by debootstrap with a minimal system, and "
-"the *chroot* stage is when the chroot used to construct the live system's "
-"filesystem is built. Thus, the corresponding mirror switches are used for "
-"those stages, and later, in the *binary* stage, the #{--mirror-binary}# and #"
-"{--mirror-binary-security}# values are used, superceding any mirrors used in "
-"an earlier stage."
+"{Stages of the build}#stages-of-the-build that the *{bootstrap}* stage is "
+"when the chroot is initially populated by debootstrap with a minimal system, "
+"and the *{chroot}* stage is when the chroot used to construct the live "
+"system's filesystem is built. Thus, the corresponding mirror switches are "
+"used for those stages, and later, in the *{binary}* stage, the #{--mirror-"
+"binary}# and #{--mirror-binary-security}# values are used, superceding any "
+"mirrors used in an earlier stage."
 msgstr ""
 
 #. type: Plain text
@@ -334,9 +334,9 @@ msgid ""
 "backports, experimental or custom packages. To configure additional "
 "repositories, create #{config/archives/your-repository.list.chroot}#, and/or "
 "#{config/archives/your-repository.list.binary}# files. As with the #{--"
-"mirror-*}# options, these govern the repositories used in the *chroot* stage "
-"when building the image, and in the *binary* stage, i.e. for use when "
-"running the live system."
+"mirror-*}# options, these govern the repositories used in the *{chroot}* "
+"stage when building the image, and in the *{binary}* stage, i.e. for use "
+"when running the live system."
 msgstr ""
 
 #. type: Plain text
@@ -996,7 +996,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:308
 msgid ""
-"If there is not an #{lb config}# option to alter APT's behaviour in the way "
+"If there is not a #{lb config}# option to alter APT's behaviour in the way "
 "you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
 "options through to your configured APT tool. See the man pages for #{apt}# "
 "and #{aptitude}# for details."
diff --git a/manual/pot/user_managing_a_configuration.ssi.pot b/manual/pot/user_managing_a_configuration.ssi.pot
index 8436b29..7041a6b 100644
--- a/manual/pot/user_managing_a_configuration.ssi.pot
+++ b/manual/pot/user_managing_a_configuration.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-02 12:23-0200\n"
+"POT-Creation-Date: 2012-03-19 20:50+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,22 +18,25 @@ msgstr ""
 
 #. type: Plain text
 #: 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:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: 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:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
+#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
 #: 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-installer.ssi:32
@@ -42,33 +45,33 @@ msgstr ""
 #: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
 #: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
 #: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:204
-#: en/user_customization-packages.ssi:216
-#: en/user_customization-packages.ssi:280
-#: en/user_customization-packages.ssi:292
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
-#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
 #: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
 #: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
 #: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
 #: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
 #: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
 #: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 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
@@ -77,28 +80,31 @@ msgstr ""
 #: 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
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 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:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: 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:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
+#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
 #: 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-installer.ssi:38
@@ -107,33 +113,33 @@ msgstr ""
 #: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
 #: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
 #: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:208
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
-#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
-#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
 #: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
 #: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
 #: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
 #: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
 #: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
 #: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 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
@@ -141,8 +147,8 @@ msgstr ""
 #: en/user_installation.ssi:149 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
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr ""
 
@@ -207,7 +213,7 @@ msgid ""
 "that are designed to help you manage your configuration. Simply create an "
 "auto/config script containing #{lb config}# command with all desired "
 "options, and an auto/clean that removes the files containing configuration "
-"variable values, and each time you #{lb config}# and #{lb clean}#, these "
+"variable values, and each time you run #{lb config}# and #{lb clean}#, these "
 "files will be executed. This will ensure that your configuration is kept "
 "internally consistent from one revision to the next and from one live-build "
 "release to the next (though you will still have to take care and read the "
diff --git a/manual/pt_BR/user_customization-installer.ssi b/manual/pt_BR/user_customization-installer.ssi
index a8b01b5..a41a62d 100644
--- a/manual/pt_BR/user_customization-installer.ssi
+++ b/manual/pt_BR/user_customization-installer.ssi
@@ -15,7 +15,7 @@ seen abbreviated to "d-i".
 
 The three main types of installer are:
 
-*{"Regular" Debian Installer}*: This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as "combined images".
+*{"Regular" Debian Installer}*: This is a normal Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as "combined images".
 
 On such images, Debian is installed by fetching and installing .deb packages
 using #{debootstrap}# or #{cdebootstrap}#, from the local media or some
diff --git a/manual/pt_BR/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
index 9035a7f..4542f38 100644
--- a/manual/pt_BR/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -29,7 +29,7 @@ distribution carried in the Debian archive may be specified by its codename
 here. (See {Terms}#terms for more details.) The #{--distribution}# option
 not only influences the source of packages within the archive, but also
 instructs #{live-build}# to behave as needed to build each supported
-distribution. For example, to build against the *unstable* release, Sid,
+distribution. For example, to build against the *{unstable}* release, Sid,
 specify:
 
 code{
@@ -64,13 +64,13 @@ The Debian archive is replicated across a large network of mirrors around
 the world so that people in each region can choose a nearby mirror for best
 download speed. Each of the #{--mirror-*}# options governs which
 distribution mirror is used at various stages of the build. Recall from
-{Stages of the build}#stages-of-the-build that the *bootstrap* stage is when
-the chroot is initially populated by debootstrap with a minimal system, and
-the *chroot* stage is when the chroot used to construct the live system's
-filesystem is built. Thus, the corresponding mirror switches are used for
-those stages, and later, in the *binary* stage, the #{--mirror-binary}# and
-#{--mirror-binary-security}# values are used, superceding any mirrors used
-in an earlier stage.
+{Stages of the build}#stages-of-the-build that the *{bootstrap}* stage is
+when the chroot is initially populated by debootstrap with a minimal system,
+and the *{chroot}* stage is when the chroot used to construct the live
+system's filesystem is built. Thus, the corresponding mirror switches are
+used for those stages, and later, in the *{binary}* stage, the
+#{--mirror-binary}# and #{--mirror-binary-security}# values are used,
+superceding any mirrors used in an earlier stage.
 
 3~distribution-mirrors-build-time Distribution mirrors used at build time
 
@@ -114,9 +114,9 @@ is available in your target distribution. These may be, for example, for
 backports, experimental or custom packages. To configure additional
 repositories, create #{config/archives/your-repository.list.chroot}#, and/or
 #{config/archives/your-repository.list.binary}# files. As with the
-#{--mirror-*}# options, these govern the repositories used in the *chroot*
-stage when building the image, and in the *binary* stage, i.e. for use when
-running the live system.
+#{--mirror-*}# options, these govern the repositories used in the *{chroot}*
+stage when building the image, and in the *{binary}* stage, i.e. for use
+when running the live system.
 
 For example, #{config/archives/live.list.chroot}# allows you to install
 packages from the debian live snapshot repository at live system build time.
@@ -495,7 +495,7 @@ as explained in {APT pinning}#apt-pinning.
 
 3~ Passing options to apt or aptitude
 
-If there is not an #{lb config}# option to alter APT's behaviour in the way
+If there is not a #{lb config}# option to alter APT's behaviour in the way
 you need, use #{--apt-options}# or #{--aptitude-options}# to pass any
 options through to your configured APT tool. See the man pages for #{apt}#
 and #{aptitude}# for details.
diff --git a/manual/pt_BR/user_managing_a_configuration.ssi b/manual/pt_BR/user_managing_a_configuration.ssi
index d0706a8..7df1d34 100644
--- a/manual/pt_BR/user_managing_a_configuration.ssi
+++ b/manual/pt_BR/user_managing_a_configuration.ssi
@@ -31,7 +31,7 @@ simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands
 that are designed to help you manage your configuration. Simply create an
 auto/config script containing #{lb config}# command with all desired
 options, and an auto/clean that removes the files containing configuration
-variable values, and each time you #{lb config}# and #{lb clean}#, these
+variable values, and each time you run #{lb config}# and #{lb clean}#, these
 files will be executed. This will ensure that your configuration is kept
 internally consistent from one revision to the next and from one live-build
 release to the next (though you will still have to take care and read the
diff --git a/manual/ro/user_customization-installer.ssi b/manual/ro/user_customization-installer.ssi
index a8b01b5..a41a62d 100644
--- a/manual/ro/user_customization-installer.ssi
+++ b/manual/ro/user_customization-installer.ssi
@@ -15,7 +15,7 @@ seen abbreviated to "d-i".
 
 The three main types of installer are:
 
-*{"Regular" Debian Installer}*: This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as "combined images".
+*{"Regular" Debian Installer}*: This is a normal Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as "combined images".
 
 On such images, Debian is installed by fetching and installing .deb packages
 using #{debootstrap}# or #{cdebootstrap}#, from the local media or some
diff --git a/manual/ro/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
index 9035a7f..4542f38 100644
--- a/manual/ro/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -29,7 +29,7 @@ distribution carried in the Debian archive may be specified by its codename
 here. (See {Terms}#terms for more details.) The #{--distribution}# option
 not only influences the source of packages within the archive, but also
 instructs #{live-build}# to behave as needed to build each supported
-distribution. For example, to build against the *unstable* release, Sid,
+distribution. For example, to build against the *{unstable}* release, Sid,
 specify:
 
 code{
@@ -64,13 +64,13 @@ The Debian archive is replicated across a large network of mirrors around
 the world so that people in each region can choose a nearby mirror for best
 download speed. Each of the #{--mirror-*}# options governs which
 distribution mirror is used at various stages of the build. Recall from
-{Stages of the build}#stages-of-the-build that the *bootstrap* stage is when
-the chroot is initially populated by debootstrap with a minimal system, and
-the *chroot* stage is when the chroot used to construct the live system's
-filesystem is built. Thus, the corresponding mirror switches are used for
-those stages, and later, in the *binary* stage, the #{--mirror-binary}# and
-#{--mirror-binary-security}# values are used, superceding any mirrors used
-in an earlier stage.
+{Stages of the build}#stages-of-the-build that the *{bootstrap}* stage is
+when the chroot is initially populated by debootstrap with a minimal system,
+and the *{chroot}* stage is when the chroot used to construct the live
+system's filesystem is built. Thus, the corresponding mirror switches are
+used for those stages, and later, in the *{binary}* stage, the
+#{--mirror-binary}# and #{--mirror-binary-security}# values are used,
+superceding any mirrors used in an earlier stage.
 
 3~distribution-mirrors-build-time Distribution mirrors used at build time
 
@@ -114,9 +114,9 @@ is available in your target distribution. These may be, for example, for
 backports, experimental or custom packages. To configure additional
 repositories, create #{config/archives/your-repository.list.chroot}#, and/or
 #{config/archives/your-repository.list.binary}# files. As with the
-#{--mirror-*}# options, these govern the repositories used in the *chroot*
-stage when building the image, and in the *binary* stage, i.e. for use when
-running the live system.
+#{--mirror-*}# options, these govern the repositories used in the *{chroot}*
+stage when building the image, and in the *{binary}* stage, i.e. for use
+when running the live system.
 
 For example, #{config/archives/live.list.chroot}# allows you to install
 packages from the debian live snapshot repository at live system build time.
@@ -495,7 +495,7 @@ as explained in {APT pinning}#apt-pinning.
 
 3~ Passing options to apt or aptitude
 
-If there is not an #{lb config}# option to alter APT's behaviour in the way
+If there is not a #{lb config}# option to alter APT's behaviour in the way
 you need, use #{--apt-options}# or #{--aptitude-options}# to pass any
 options through to your configured APT tool. See the man pages for #{apt}#
 and #{aptitude}# for details.
diff --git a/manual/ro/user_managing_a_configuration.ssi b/manual/ro/user_managing_a_configuration.ssi
index d0706a8..7df1d34 100644
--- a/manual/ro/user_managing_a_configuration.ssi
+++ b/manual/ro/user_managing_a_configuration.ssi
@@ -31,7 +31,7 @@ simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands
 that are designed to help you manage your configuration. Simply create an
 auto/config script containing #{lb config}# command with all desired
 options, and an auto/clean that removes the files containing configuration
-variable values, and each time you #{lb config}# and #{lb clean}#, these
+variable values, and each time you run #{lb config}# and #{lb clean}#, these
 files will be executed. This will ensure that your configuration is kept
 internally consistent from one revision to the next and from one live-build
 release to the next (though you will still have to take care and read the

-- 
live-manual



More information about the debian-live-changes mailing list