[SCM] live-manual branch, debian-next, updated. debian/3.0_a8-1-49-gc39fd8e

Ben Armstrong synrg at debian.org
Tue Nov 8 01:05:15 UTC 2011


The following commit has been merged in the debian-next branch:
commit c39fd8e398fc4d0397c349e85dc0a9b1295bc7c7
Author: Ben Armstrong <synrg at debian.org>
Date:   Mon Nov 7 21:05:06 2011 -0400

    Catching up language strings for last couple of commits.

diff --git a/manual/de/user_customization-contents.ssi b/manual/de/user_customization-contents.ssi
index e7d92bd..5759093 100644
--- a/manual/de/user_customization-contents.ssi
+++ b/manual/de/user_customization-contents.ssi
@@ -112,12 +112,12 @@ build in order to customize the image.
 
 3~live-chroot-local-hooks Live/chroot local hooks
 
-To run commands in the chroot stage, create a hook script containing the
-commands in the #{config/chroot_local-hooks}# directory. The hook will run
-in the chroot after the rest of your chroot configuration has been applied,
-so remember to ensure your configuration includes all packages and files
-your hook needs in order to run. See the example chroot hook scripts for
-various common chroot customization tasks provided in
+To run commands in the chroot stage, create a hook script with a #{.chroot}#
+suffix containing the commands in the #{config/hooks/}# directory. The hook
+will run in the chroot after the rest of your chroot configuration has been
+applied, so remember to ensure your configuration includes all packages and
+files your hook needs in order to run. See the example chroot hook scripts
+for various common chroot customization tasks provided in
 #{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
 use them in your own configuration.
 
@@ -134,21 +134,22 @@ packages}#installing-modified-or-third-party-packages.
 
 3~ Binary local hooks
 
-To run commands in the binary stage, create a hook script containing the
-commands in the #{config/binary_local-hooks}#. The hook will run after all
-other binary commands are run, but before binary_checksums, the very last
-binary commands The commands in your hook do not run in the chroot, so take
-care to not modify any files outside of the build tree, or you may damage
-your build system! See the example binary hook scripts for various common
-binary customization tasks provided in
+To run commands in the binary stage, create a hook script with a #{.binary}#
+suffix containing the commands in the #{config/hooks/}# directory. The hook
+will run after all other binary commands are run, but before
+binary_checksums, the very last binary command. The commands in your hook do
+not run in the chroot, so take care to not modify any files outside of the
+build tree, or you may damage your build system! See the example binary hook
+scripts for various common binary customization tasks provided in
 #{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
 use them in your own configuration.
 
 2~ Preseeding Debconf questions
 
-Files in the #{config/chroot_local-preseed}# directory are considered to be
+Files in the #{config/preseed/}# directory suffixed with #{.preseed}#
+followed by the stage (#{.chroot}# or #{.binary}#) are considered to be
 debconf preseed files and are installed by live-build using
-#{debconf-set-selections}#.
+#{debconf-set-selections}# during the corresponding stage.
 
 For more information about debconf, please see debconf(7) in the #{debconf}#
 package.
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index ac1e1d4..75d3198 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -364,40 +364,40 @@ and elsewhere.
 
 There are two ways of installing modified custom packages:
 
-_* #{chroot_local-packages}#
+_* #{packages.chroot}#
 
 _* Using a custom APT repository
 
-Using #{chroot_local-packages}# is simpler to achieve and useful for
-"one-off" customizations but has a number of drawbacks, whilst using a
-custom APT repository is more time-consuming to set up.
+Using #{packages.chroot}# is simpler to achieve and useful for "one-off"
+customizations but has a number of drawbacks, whilst using a custom APT
+repository is more time-consuming to set up.
 
-3~ Using #{chroot_local-packages}# to install custom packages
+3~ Using #{packages.chroot}# to install custom packages
 
 To install a custom package, simply copy it to the
-#{config/chroot_local-packages/}# directory. Packages that are inside this
+#{config/packages.chroot/}# directory. Packages that are inside this
 directory will be automatically installed into the live system during build
 - you do not need to specify them elsewhere.
 
 Packages *{must}* be named in the prescribed way. One simple way to do this
 is to use #{dpkg-name}#.
 
-Using #{chroot_local-packages}# for installation of custom packages has
+Using #{packages.chroot}# for installation of custom packages has
 disadvantages:
 
 _* It is not possible to use secure APT.
 
 _* You must install all appropriate packages in the
-#{config/chroot_local-packages/}# directory.
+#{config/packages.chroot/}# directory.
 
 _* It does not lend itself to storing Debian Live configurations in revision
 control.
 
 3~ Using an APT repository to install custom packages
 
-Unlike using #{chroot_local-packages}#, when using a custom APT repository
-you must ensure that you specify the packages elsewhere. See {Choosing
-packages to install}#choosing-packages-to-install for details.
+Unlike using #{packages.chroot}#, when using a custom APT repository you
+must ensure that you specify the packages elsewhere. See {Choosing packages
+to install}#choosing-packages-to-install for details.
 
 Whilst it may seem unnecessary effort to create an APT repository to install
 custom packages, the infrastructure can be easily re-used at a later date to
@@ -422,7 +422,7 @@ pinning}#apt-pinning for more information.
 You can configure APT through a number of options applied only at build
 time. (APT configuration used in the running live system may be configured
 in the normal way for live system contents, that is, by including the
-appropriate configurations through #{config/chroot_local_includes/}#.) For a
+appropriate configurations through #{config/includes.chroot/}#.) For a
 complete list, look for options starting with #{apt}# in the #{lb_config}#
 man page.
 
diff --git a/manual/de/user_customization-runtime.ssi b/manual/de/user_customization-runtime.ssi
index 97dccb6..610fdb1 100644
--- a/manual/de/user_customization-runtime.ssi
+++ b/manual/de/user_customization-runtime.ssi
@@ -17,12 +17,15 @@ also any groups and permissions associated with the live user.
 
 You can specify additional groups that the live user will belong to by
 preseeding the #{passwd/user-default-groups}# debconf value. For example, to
-add the live user to the #{fuse}# group, add the following to a file in the
-#{config/chroot_local-preseed}# directory:
+add the live user to the #{fuse}# group, add the following preseed under
+#{config/preseed/}# for the chroot stage:
 
 code{
 
- user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse
+ $ lb config
+ $ echo user-setup passwd/user-default-groups string audio cdrom \
+   dip floppy video plugdev netdev powerdev scanner bluetooth fuse \
+   >> config/preseed/my.preseed.chroot
 
 }code
 
diff --git a/manual/es/user_customization-contents.ssi b/manual/es/user_customization-contents.ssi
index 5ee2908..da62080 100644
--- a/manual/es/user_customization-contents.ssi
+++ b/manual/es/user_customization-contents.ssi
@@ -131,17 +131,14 @@ las etapas chroot y binary.
 
 3~live-chroot-local-hooks Scripts gancho locales en Live/chroot
 
-Para ejecutar órdenes en la etapa chroot se deben crear scripts gancho que
-contengan dichas ordenes a ejecutar y depositarlos en el directorio
-#{config/chroot_local-hooks}#. Estos scripts serán ejecutados en el entorno
-del chroot después de que el resto de las tareas de preparación del chroot
-han sido realizadas. Se debe asegurar que previamente se han instalado en el
-entorno chroot cualquier paquete, fichero u órden que necesiten los scripts
-gancho. El paquete live-build instala en el directorio
-#{/usr/share/live/build/examples/hooks}#  del sistema huésped unos cuantos
-scripts gancho para realizar tareas habituales de personalización del
-entorno chroot que pueden ser copiados o referenciados mediante enlace
-simbólico en el directorio de configuración #{config/chroot_local-hooks}#.
+To run commands in the chroot stage, create a hook script with a #{.chroot}#
+suffix containing the commands in the #{config/hooks/}# directory. The hook
+will run in the chroot after the rest of your chroot configuration has been
+applied, so remember to ensure your configuration includes all packages and
+files your hook needs in order to run. See the example chroot hook scripts
+for various common chroot customization tasks provided in
+#{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
+use them in your own configuration.
 
 3~boot-time-hooks Scripts gancho en tiempo de arranque
 
@@ -159,24 +156,22 @@ modificados}#installing-modified-or-third-party-packages.
 
 3~ Scripts gancho locales en Binary
 
-Para ejecutar comandos en la etapa Binary se deben crear scripts gancho que
-contengan las ordenes y depositarlos en el directorio
-#{config/binary_local-hooks}#. Los scripts gancho se ejecutarán después de
-finalizar el resto de procesos de la etapa pero antes de crear los checksum
-con binary_checksum que es el último proceso que se ejecuta en esta
-etapa. Los scripts gancho no se ejecutan en el entorno del chroot, así que
-hay que tener cuidado de no modificar cualquier fichero fuera del árbol de
-creación, o se dañará el sistema de creación. En
-#{/usr/share/live/build/examples/hooks}# se pueden ver varios ejemplos de
-scripts gancho genéricos que permiten tareas de personalización para la
-etapa Binary. Estos scripts pueden ser utilizados copiandolos o creando
-enlaces simbólicos en #{config/binary_local-hooks}#.
+To run commands in the binary stage, create a hook script with a #{.binary}#
+suffix containing the commands in the #{config/hooks/}# directory. The hook
+will run after all other binary commands are run, but before
+binary_checksums, the very last binary command. The commands in your hook do
+not run in the chroot, so take care to not modify any files outside of the
+build tree, or you may damage your build system! See the example binary hook
+scripts for various common binary customization tasks provided in
+#{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
+use them in your own configuration.
 
 2~ Preconfiguración de las preguntas de Debconf
 
-Los ficheros del directorio #{config/chroot_local-preseed}# son ficheros de
-preconfiguración para debconf. live-build instalará estos ficheros mediante
-#{debconf-set-selections}#.
+Files in the #{config/preseed/}# directory suffixed with #{.preseed}#
+followed by the stage (#{.chroot}# or #{.binary}#) are considered to be
+debconf preseed files and are installed by live-build using
+#{debconf-set-selections}# during the corresponding stage.
 
 Ver debconf(7) en el paquete #{debconf}# para obtener más información acerca
 de debconf.
diff --git a/manual/es/user_customization-packages.ssi b/manual/es/user_customization-packages.ssi
index d28c01b..60253a1 100644
--- a/manual/es/user_customization-packages.ssi
+++ b/manual/es/user_customization-packages.ssi
@@ -403,43 +403,40 @@ medida.
 
 Existen dos formas de instalar paquetes personalizados:
 
-_* #{chroot_local-packages}#
+_* #{packages.chroot}#
 
 _* Utilizando un repositorio APT personalizado
 
-El método #{chroot_local-packages}# es el más simple para añadir paquetes
-personalizados. Es muy útil para personalizaciones «rápidas» (one-off) pero
-tiene unos cuantos inconvenientes mientras que la utilización de un
-repositorio APT personalizado es más lento de poner en marcha.
+Using #{packages.chroot}# is simpler to achieve and useful for "one-off"
+customizations but has a number of drawbacks, whilst using a custom APT
+repository is more time-consuming to set up.
 
-3~ Método #{chroot_local-packages}# para instalar paquetes personalizados
+3~ Using #{packages.chroot}# to install custom packages
 
-Para instalar paquetes personalizados solamente hay que copiar el paquete en
-el directorio #{config/chroot_local-packages/}#. Los paquetes contenidos en
-este directorio serán automáticamente instalados en el sistema en vivo
-durante el proceso de creación. No es necesario especificar de dónde se
-deben obtener los paquetes.
+To install a custom package, simply copy it to the
+#{config/packages.chroot/}# directory. Packages that are inside this
+directory will be automatically installed into the live system during build
+- you do not need to specify them elsewhere.
 
 Los paquetes *{deben}* nombrarse de la forma prescrita. La forma más simple
 es usar #{dpkg-name}#.
 
-El método #{chroot_local-packages}# para la instalación de paquetes
-personalizados tiene desventajas:
+Using #{packages.chroot}# for installation of custom packages has
+disadvantages:
 
 _* No es posible utilizar APT seguro.
 
-_* Se deben depositar todos los paquetes necesarios para cumplir
-dependencias en el directorio #{config/chroot_local-packages/}#.
+_* You must install all appropriate packages in the
+#{config/packages.chroot/}# directory.
 
 _* No es adecuado para almacenar configuraciones de Debian Live en un
 control de versiones.
 
 3~ Método de repositorio APT para instalar paquetes personalizados
 
-Al contrario del método #{chroot_local-packages}#, cuando se utiliza el
-método de repositorio APT personalizado se debe asegurar que se especifica
-dónde se deben buscar los paquetes a instalar. Para más información ver
-{Selección de los paquetes a instalar}#choosing-packages-to-install.
+Unlike using #{packages.chroot}#, when using a custom APT repository you
+must ensure that you specify the packages elsewhere. See {Choosing packages
+to install}#choosing-packages-to-install for details.
 
 Aunque crear un repositorio APT para instalar paquetes personalizados puede
 parecer un esfuerzo innecesaro, la infraestructurar puede ser fácilmente
@@ -462,14 +459,12 @@ preferencias de pinning de APT del sistema en vivo. Para más información ver
 
 2~ Configurar APT en la creación
 
-Se puede configurar APT mediante varias opciones que se aplicarán en el
-momento de crear la imagen. (La configuración que APT utilizará cuando se
-ejecute el sistema en vivo puede ser configurada de la manera que
-habitualmente se utiliza para introducir contenidos del sistema en vivo,
-esto es, incluyendo las configuraciones apropiadas en el directorio
-#{config/chroot_local_includes/}#.) Se puede encontrar una lista completa de
-las opciones para configurar APT en la página de manual de
-#{lb_config}#. Son aquellas opciones que comienzan con #{apt}#.
+You can configure APT through a number of options applied only at build
+time. (APT configuration used in the running live system may be configured
+in the normal way for live system contents, that is, by including the
+appropriate configurations through #{config/includes.chroot/}#.) For a
+complete list, look for options starting with #{apt}# in the #{lb_config}#
+man page.
 
 3~choosing-apt-or-aptitude Utilizar apt o aptitude
 
diff --git a/manual/es/user_customization-runtime.ssi b/manual/es/user_customization-runtime.ssi
index 75bd5d1..3681c43 100644
--- a/manual/es/user_customization-runtime.ssi
+++ b/manual/es/user_customization-runtime.ssi
@@ -18,15 +18,17 @@ tal y como se explica en {Includes locales en
 Live/chroot}#live-chroot-local-includes sino también a cualquier grupo y a
 los permisos asociados con el usuario por defecto del sistema en vivo.
 
-Se puede especificar grupos adicionales a los que pertenecerá el usuario por
-defecto del sistema en vivo preconfigurando el valor debconf
-#{passwd/user-default-groups}#. Por ejemplo, para agregar el usuario al
-grupo #{fuse}# añadir el siguiente código en un fichero en el directorio
-#{config/chroot_local-preseed}#.
+You can specify additional groups that the live user will belong to by
+preseeding the #{passwd/user-default-groups}# debconf value. For example, to
+add the live user to the #{fuse}# group, add the following preseed under
+#{config/preseed/}# for the chroot stage:
 
 code{
 
- user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse
+ $ lb config
+ $ echo user-setup passwd/user-default-groups string audio cdrom \
+   dip floppy video plugdev netdev powerdev scanner bluetooth fuse \
+   >> config/preseed/my.preseed.chroot
 
 }code
 
diff --git a/manual/fr/user_customization-contents.ssi b/manual/fr/user_customization-contents.ssi
index 3839f68..cfbef33 100644
--- a/manual/fr/user_customization-contents.ssi
+++ b/manual/fr/user_customization-contents.ssi
@@ -120,15 +120,14 @@ et binaire de la construction afin de personnaliser l'image.
 
 3~live-chroot-local-hooks Live/chroot local hooks
 
-Pour exécuter des commandes à l'étape chroot, créer un script hook contenant
-les commandes dans le répertoire #{config/chroot_local-hooks}#. Le hook
-s'exécutera dans le chroot après le reste de votre configuration chroot a
-été appliquée, donc n'oubliez pas de vous assurer que votre configuration
-inclut tous les paquets et les fichiers que votre hook a besoin pour
-fonctionner. Voir les exemples de scripts chroot hook pour diverses tâches
-courantes de personnalisation chroot fournis dans
-#{/usr/share/live/build/examples/hooks}# que vous pouvez copier ou symlink
-pour les utiliser dans votre propre configuration.
+To run commands in the chroot stage, create a hook script with a #{.chroot}#
+suffix containing the commands in the #{config/hooks/}# directory. The hook
+will run in the chroot after the rest of your chroot configuration has been
+applied, so remember to ensure your configuration includes all packages and
+files your hook needs in order to run. See the example chroot hook scripts
+for various common chroot customization tasks provided in
+#{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
+use them in your own configuration.
 
 3~boot-time-hooks Hooks au moment du démarrage
 
@@ -143,22 +142,22 @@ modifiés ou de tiers}#installing-modified-or-third-party-packages.
 
 3~ Binary local hooks
 
-Pour exécuter des commandes à l'étape binaire, créer un script hook
-contenant les commandes dans #{config/binary_local-hooks}#. Le hook sera
-exécuté après toutes les autres commandes binaires sont exécutées, mais
-avant binary_checksums, les dernièrs commandes binaires.  Les commandes de
-votre hook ne s'exécutent pas dans le chroot, afin de prendre soin de ne pas
-modifier les fichiers en dehors de l'arbre de construction, ou vous pourriez
-endommager votre système de construction! Voir les exemples de scripts hook
-binaires pour diverses tâches courantes de personnalisation binaires fournis
-dans #{/usr/share/live/build/examples/hooks}# que vous pouvez copier ou
-symlink pour les utiliser dans votre propre configuration.
+To run commands in the binary stage, create a hook script with a #{.binary}#
+suffix containing the commands in the #{config/hooks/}# directory. The hook
+will run after all other binary commands are run, but before
+binary_checksums, the very last binary command. The commands in your hook do
+not run in the chroot, so take care to not modify any files outside of the
+build tree, or you may damage your build system! See the example binary hook
+scripts for various common binary customization tasks provided in
+#{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
+use them in your own configuration.
 
 2~ Préconfigurer questions de debconf
 
-Les fichiers dans le répertoire #{config/chroot_local-preseed}# sont
-considérés comme des fichiers de préconfiguration debconf et sont installés
-par live-build en utilisant #{debconf-set-selections}#.
+Files in the #{config/preseed/}# directory suffixed with #{.preseed}#
+followed by the stage (#{.chroot}# or #{.binary}#) are considered to be
+debconf preseed files and are installed by live-build using
+#{debconf-set-selections}# during the corresponding stage.
 
 Pour plus d'informations sur debconf, s'il vous plaît voir debconf(7) dans
 le paquet #{debconf}#.
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index 3b1205b..2075e09 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -395,42 +395,40 @@ http://www.debian.org/doc/maint-guide/ et ailleurs
 
 Il y a deux façons d'installer des paquets personnalisés modifiés:
 
-_* #{chroot_local-packages}#
+_* #{packages.chroot}#
 
 _* En utilisant un référentiel APT personnalisé
 
-Utilisant #{chroot_local-packages}# est plus simple à réaliser et utile pour
-les personnalisations ponctuels mais a un certain nombre d'inconvénients,
-tout en utilisant un réferéntiel personnalisé APT est plus fastidieux à
-mettre en place.
+Using #{packages.chroot}# is simpler to achieve and useful for "one-off"
+customizations but has a number of drawbacks, whilst using a custom APT
+repository is more time-consuming to set up.
 
-3~ Utilisant #{chroot_local-packages}# pour installer paquets personnalisés
+3~ Using #{packages.chroot}# to install custom packages
 
-Pour installer un paquet personnalisé, il suffit de le copier dans le
-répertoire #{config/chroot_local-packages/}#. Les paquets qui sont dans ce
-répertoire seront automatiquement installés dans le système live pendant la
-construction du systéme - vous n'avez pas besoin de les spécifier ailleurs.
+To install a custom package, simply copy it to the
+#{config/packages.chroot/}# directory. Packages that are inside this
+directory will be automatically installed into the live system during build
+- you do not need to specify them elsewhere.
 
 Les paquets *{doivent}* être nommés de la manière prescrite. Une façon
 simple de le faire consiste à utiliser #{dpkg-name}#.
 
-L'utilisation de #{chroot_local-packages}# pour l'installation de paquets
-personnalisés a des inconvénients:
+Using #{packages.chroot}# for installation of custom packages has
+disadvantages:
 
 _* Il n'est pas possible d'utiliser secure APT.
 
-_* Vous devez installer tous les paquets appropriés dans le répertoire
-#{config/chroot_local-packages/}#.
+_* You must install all appropriate packages in the
+#{config/packages.chroot/}# directory.
 
 _* Il ne se prête pas au stockage de configurations Debian Live dans le
 contrôle de révision.
 
 3~ Utilisant un référentiel APT pour installer des paquets personnalisés.
 
-Contrairement à l'utilisation de #{chroot_local-packages}#, lorsque vous
-utilisez un réferéntiel personnalisé APT vous devez vous assurer que vous
-spécifiez les paquets ailleurs. Voir {Choisir les paquets à
-installer}#choosing-packages-to-install pour plus de détails.
+Unlike using #{packages.chroot}#, when using a custom APT repository you
+must ensure that you specify the packages elsewhere. See {Choosing packages
+to install}#choosing-packages-to-install for details.
 
 Si créer un référentiel APT pour installer des packages personnalisés peut
 sembler un effort inutile, l'infrastructure peut être facilement ré-utilisée
@@ -454,12 +452,12 @@ plus d'informations.
 
 2~ Configuration d'APT au moment de la construction
 
-Vous pouvez configurer APT par un certain nombre d'options appliquées
-uniquement au moment de la construction. (La configuration d'APT utilisé
-dans le système live en fonctionnement peut être configurée de façon normale
-pour un système live, qui est, en incluant les configurations appropriées à
-#{config/chroot_local_includes/}#.) Pour une liste complète, regardez les
-options commençant par #{apt}# dans la page de manuel de #{lb_config}#.
+You can configure APT through a number of options applied only at build
+time. (APT configuration used in the running live system may be configured
+in the normal way for live system contents, that is, by including the
+appropriate configurations through #{config/includes.chroot/}#.) For a
+complete list, look for options starting with #{apt}# in the #{lb_config}#
+man page.
 
 3~choosing-apt-or-aptitude Choisir apt ou aptitude
 
diff --git a/manual/fr/user_customization-runtime.ssi b/manual/fr/user_customization-runtime.ssi
index bf83c26..316e573 100644
--- a/manual/fr/user_customization-runtime.ssi
+++ b/manual/fr/user_customization-runtime.ssi
@@ -17,14 +17,17 @@ l'utilisateur live sont introduits dans votre construction, tel que discuté
 dans {Live/chroot local includes}#live-chroot-local-includes, mais aussi
 tous les groupes et les autorisations associées à l'utilisateur live.
 
-Vous pouvez spécifier d'autres groupes pour l'utilisateur live en
-préconfigurant la valeur debconf #{passwd/user-default-groups}#. Par
-exemple, pour ajouter l'utilisateur live au groupe #{fuse}# ajoutez la ligne
-suivante à un fichier dans le répertoire #{config/chroot_local-preseed}#:
+You can specify additional groups that the live user will belong to by
+preseeding the #{passwd/user-default-groups}# debconf value. For example, to
+add the live user to the #{fuse}# group, add the following preseed under
+#{config/preseed/}# for the chroot stage:
 
 code{
 
- user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse
+ $ lb config
+ $ echo user-setup passwd/user-default-groups string audio cdrom \
+   dip floppy video plugdev netdev powerdev scanner bluetooth fuse \
+   >> config/preseed/my.preseed.chroot
 
 }code
 
diff --git a/manual/it/user_customization-contents.ssi b/manual/it/user_customization-contents.ssi
index 1cc9bfa..c1e77d2 100644
--- a/manual/it/user_customization-contents.ssi
+++ b/manual/it/user_customization-contents.ssi
@@ -114,15 +114,14 @@ della creazione al fine di personalizzare l'immagine.
 
 3~live-chroot-local-hooks Live/chroot hook locali
 
-Per eseguire comandi nella fase chroot, creare uno script hook contenente i
-comandi nella directory #{config/chroot_local-hooks}#. L'hook verrà eseguito
-nel chroot dopo che verrà applicata il resto della configurazione del
-chroot, ricordare quindi di garantire che la propria configurazione includa
-tutti i pacchetti e i file che l'hook necessita per funzionare. Vedere gli
-script d'esempio degli hook di chroot per i vari compiti di
-personalizzazione del chroot contenuti in
-#{/usr/share/live/build/examples/hooks}# da copiare o collegare nella
-propria configurazione.
+To run commands in the chroot stage, create a hook script with a #{.chroot}#
+suffix containing the commands in the #{config/hooks/}# directory. The hook
+will run in the chroot after the rest of your chroot configuration has been
+applied, so remember to ensure your configuration includes all packages and
+files your hook needs in order to run. See the example chroot hook scripts
+for various common chroot customization tasks provided in
+#{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
+use them in your own configuration.
 
 3~boot-time-hooks Hook in fase di avvio
 
@@ -137,21 +136,22 @@ packages}#installing-modified-or-third-party-packages.
 
 3~ Hook binari locali
 
-Per eseguire comandi nella fase binaria, creare uno script hook che contenga
-i comandi in #{config/binary_local-hooks}#. L'hook verrà eseguito dopo tutti
-gli altri comandi binari, ma prima del binary_checksums, l'ultimo definitivo
-comando. I comandi nel proprio hook non vengono eseguiti nel chroot, perciò
-si faccia attenzione a non modificare nessun file al di fuori dell'albero di
-costruzione o si danneggerà il sistema! Vedere gli script d'esempio per gli
-hook binari per i vari compiti di personalizzazione dei binari in
-#{/usr/share/live/build/examples/hooks}# da copiare o collegare nella
-propria configurazione.
+To run commands in the binary stage, create a hook script with a #{.binary}#
+suffix containing the commands in the #{config/hooks/}# directory. The hook
+will run after all other binary commands are run, but before
+binary_checksums, the very last binary command. The commands in your hook do
+not run in the chroot, so take care to not modify any files outside of the
+build tree, or you may damage your build system! See the example binary hook
+scripts for various common binary customization tasks provided in
+#{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
+use them in your own configuration.
 
 2~ Preconfigurare le domande di Debconf
 
-I file nella directory #{config/chroot_local-preseed}# sono considerati file
-di preconfigurazione di debconf e sono installati da live-build usando
-#{debconf-set-selections}#.
+Files in the #{config/preseed/}# directory suffixed with #{.preseed}#
+followed by the stage (#{.chroot}# or #{.binary}#) are considered to be
+debconf preseed files and are installed by live-build using
+#{debconf-set-selections}# during the corresponding stage.
 
 Per ulteriori informazioni su debconf, vedere debconf(7) nel pacchetto
 #{debconf}#.
diff --git a/manual/it/user_customization-packages.ssi b/manual/it/user_customization-packages.ssi
index 689ec97..dc567a5 100644
--- a/manual/it/user_customization-packages.ssi
+++ b/manual/it/user_customization-packages.ssi
@@ -371,42 +371,40 @@ Maintainer" all'indirizzo http://www.debian.org/doc/maint-guide/ e altrove.
 
 Ci sono due modi per installare pacchetti personalizzati:
 
-_* #{chroot_local-packages}#
+_* #{packages.chroot}#
 
 _* Utilizzare repository APT personalizzati
 
-Usando #{chroot_local-packages}# è più semplice da ottenere e utile per una
-personalizzazione "una tantum" ma ha una serie di svantaggi, mentre un
-repository APT personalizzato è più laborioso da configurare.
+Using #{packages.chroot}# is simpler to achieve and useful for "one-off"
+customizations but has a number of drawbacks, whilst using a custom APT
+repository is more time-consuming to set up.
 
-3~ Utilizzare #{chroot_local-packages}# per installare pacchetti
-personalizzati
+3~ Using #{packages.chroot}# to install custom packages
 
-Per installare un pacchetto personalizzato copiarlo nella directory
-#{config/chroot_local-packages/}#; i pacchetti al suo interno verranno
-installati automaticamente durante la creazione del sistema live, non è
-necessario specificarli altrove.
+To install a custom package, simply copy it to the
+#{config/packages.chroot/}# directory. Packages that are inside this
+directory will be automatically installed into the live system during build
+- you do not need to specify them elsewhere.
 
 I pacchetti *{devono}* essere nominati nel modo prescritto, un metodo
 semplice per farlo è usare #{dpkg-name}#.
 
-L'utilizzo di #{chroot_local-packages}# per l'installazione di pacchetti
-personalizzati presenta degli svantaggi:
+Using #{packages.chroot}# for installation of custom packages has
+disadvantages:
 
 _* non è possibile usare secure APT
 
-_* è necessario installare i pacchetti adeguati nella directory
-#{config/chroot_local-packages/}#.
+_* You must install all appropriate packages in the
+#{config/packages.chroot/}# directory.
 
 _* non si presta a salvare le configurazioni di Debian Live nel controllo di
 versione.
 
 3~ Utilizzare un repository APT per installare pacchetti personalizzati
 
-A differenza di #{chroot_local-packages}#, quando si usa un repository APT
-personalizzato è necessario assicurarsi di specificare altrove i
-pacchetti. Per i dettagli si veda {Scegliere i pacchetti da
-installare}#choosing-packages-to-install.
+Unlike using #{packages.chroot}#, when using a custom APT repository you
+must ensure that you specify the packages elsewhere. See {Choosing packages
+to install}#choosing-packages-to-install for details.
 
 Sebbene creare un repository APT possa sembrare uno sforzo inutile,
 l'infrastruttura può facilmente essere riutilizzata in un secondo momento
@@ -428,12 +426,12 @@ veda {APT pinning}#apt-pinning per maggiori informazioni.
 
 2~ Configurare APT in fase di costruzione
 
-APT è configurabile tramite una serie di opzioni applicate solo in fase di
-costruzione (la configurazione di APT utilizzata nel sistema live in
-esecuzione può essere configurata nel solito modo, ovvero includendo le
-impostazioni appropriate attraverso #{config/chroot_local_includes/}#). Per
-un elenco completo, cercare nel manuale di #{lb_config}# le opzioni che
-iniziano con #{apt}#.
+You can configure APT through a number of options applied only at build
+time. (APT configuration used in the running live system may be configured
+in the normal way for live system contents, that is, by including the
+appropriate configurations through #{config/includes.chroot/}#.) For a
+complete list, look for options starting with #{apt}# in the #{lb_config}#
+man page.
 
 3~choosing-apt-or-aptitude Scegliere apt o aptitude
 
diff --git a/manual/it/user_customization-runtime.ssi b/manual/it/user_customization-runtime.ssi
index 6e8e620..8ba36b2 100644
--- a/manual/it/user_customization-runtime.ssi
+++ b/manual/it/user_customization-runtime.ssi
@@ -17,14 +17,17 @@ creazione, come discusso in {Live/chroot include
 locali}#live-chroot-local-includes, ma anche ogni gruppo e permesso
 associato all'utente live.
 
-È possibile specificare gruppi aggiuntivi ai quali l'utente live apparterrà
-preconfigurando il valore #{passwd/user-default-groups}# di debconf. Ad
-esempio, per aggiungere l'utente al gruppo #{fuse}#, inserire quanto segue
-ad un file nella directory #{config/chroot_local-preseed}#:
+You can specify additional groups that the live user will belong to by
+preseeding the #{passwd/user-default-groups}# debconf value. For example, to
+add the live user to the #{fuse}# group, add the following preseed under
+#{config/preseed/}# for the chroot stage:
 
 code{
 
- user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse
+ $ lb config
+ $ echo user-setup passwd/user-default-groups string audio cdrom \
+   dip floppy video plugdev netdev powerdev scanner bluetooth fuse \
+   >> config/preseed/my.preseed.chroot
 
 }code
 
diff --git a/manual/po/de/user_customization-contents.ssi.po b/manual/po/de/user_customization-contents.ssi.po
index 42e6222..205e71a 100644
--- a/manual/po/de/user_customization-contents.ssi.po
+++ b/manual/po/de/user_customization-contents.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-07 08:16-0400\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -56,11 +56,11 @@ msgstr ""
 #: 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: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-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
@@ -120,12 +120,12 @@ msgstr ""
 #: 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: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: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
@@ -347,12 +347,12 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-contents.ssi:80
 msgid ""
-"To run commands in the chroot stage, create a hook script containing the "
-"commands in the #{config/chroot_local-hooks}# directory. The hook will run "
-"in the chroot after the rest of your chroot configuration has been applied, "
-"so remember to ensure your configuration includes all packages and files "
-"your hook needs in order to run. See the example chroot hook scripts for "
-"various common chroot customization tasks provided in #{/usr/share/live/"
+"To run commands in the chroot stage, create a hook script with a #{.chroot}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run in the chroot after the rest of your chroot configuration has been "
+"applied, so remember to ensure your configuration includes all packages and "
+"files your hook needs in order to run. See the example chroot hook scripts "
+"for various common chroot customization tasks provided in #{/usr/share/live/"
 "build/examples/hooks}# which you can copy or symlink to use them in your own "
 "configuration."
 msgstr ""
@@ -382,14 +382,15 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-contents.ssi:88
 msgid ""
-"To run commands in the binary stage, create a hook script containing the "
-"commands in the #{config/binary_local-hooks}#. The hook will run after all "
-"other binary commands are run, but before binary_checksums, the very last "
-"binary commands The commands in your hook do not run in the chroot, so take "
-"care to not modify any files outside of the build tree, or you may damage "
-"your build system! See the example binary hook scripts for various common "
-"binary customization tasks provided in #{/usr/share/live/build/examples/"
-"hooks}# which you can copy or symlink to use them in your own configuration."
+"To run commands in the binary stage, create a hook script with a #{.binary}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run after all other binary commands are run, but before "
+"binary_checksums, the very last binary command. The commands in your hook do "
+"not run in the chroot, so take care to not modify any files outside of the "
+"build tree, or you may damage your build system! See the example binary hook "
+"scripts for various common binary customization tasks provided in #{/usr/"
+"share/live/build/examples/hooks}# which you can copy or symlink to use them "
+"in your own configuration."
 msgstr ""
 
 #. type: Plain text
@@ -400,9 +401,10 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-contents.ssi:92
 msgid ""
-"Files in the #{config/chroot_local-preseed}# directory are considered to be "
+"Files in the #{config/preseed/}# directory suffixed with #{.preseed}# "
+"followed by the stage (#{.chroot}# or #{.binary}#) are considered to be "
 "debconf preseed files and are installed by live-build using #{debconf-set-"
-"selections}#."
+"selections}# during the corresponding stage."
 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 604b7e7..7a7669d 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: 2011-11-07 17:40-0400\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -56,11 +56,11 @@ msgstr ""
 #: 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: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-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
@@ -120,12 +120,12 @@ msgstr ""
 #: 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: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: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
@@ -743,7 +743,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:228
-msgid "_* #{chroot_local-packages}#"
+msgid "_* #{packages.chroot}#"
 msgstr ""
 
 #. type: Plain text
@@ -754,23 +754,23 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:232
 msgid ""
-"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
-"off\" customizations but has a number of drawbacks, whilst using a custom "
-"APT repository is more time-consuming to set up."
+"Using #{packages.chroot}# is simpler to achieve and useful for \"one-off\" "
+"customizations but has a number of drawbacks, whilst using a custom APT "
+"repository is more time-consuming to set up."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:234
-msgid "3~ Using #{chroot_local-packages}# to install custom packages"
+msgid "3~ Using #{packages.chroot}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:236
 msgid ""
-"To install a custom package, simply copy it to the #{config/chroot_local-"
-"packages/}# directory. Packages that are inside this directory will be "
-"automatically installed into the live system during build - you do not need "
-"to specify them elsewhere."
+"To install a custom package, simply copy it to the #{config/packages.chroot/}"
+"# directory. Packages that are inside this directory will be automatically "
+"installed into the live system during build - you do not need to specify "
+"them elsewhere."
 msgstr ""
 
 #. type: Plain text
@@ -783,7 +783,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:240
 msgid ""
-"Using #{chroot_local-packages}# for installation of custom packages has "
+"Using #{packages.chroot}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
@@ -795,8 +795,8 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:244
 msgid ""
-"_* You must install all appropriate packages in the #{config/chroot_local-"
-"packages/}# directory."
+"_* You must install all appropriate packages in the #{config/packages."
+"chroot/}# directory."
 msgstr ""
 
 #. type: Plain text
@@ -814,9 +814,9 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:250
 msgid ""
-"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
-"you must ensure that you specify the packages elsewhere. See {Choosing "
-"packages to install}#choosing-packages-to-install for details."
+"Unlike using #{packages.chroot}#, when using a custom APT repository you "
+"must ensure that you specify the packages elsewhere. See {Choosing packages "
+"to install}#choosing-packages-to-install for details."
 msgstr ""
 
 #. type: Plain text
@@ -863,7 +863,7 @@ msgid ""
 "You can configure APT through a number of options applied only at build "
 "time. (APT configuration used in the running live system may be configured "
 "in the normal way for live system contents, that is, by including the "
-"appropriate configurations through #{config/chroot_local_includes/}#.) For a "
+"appropriate configurations through #{config/includes.chroot/}#.) For a "
 "complete list, look for options starting with #{apt}# in the #{lb_config}# "
 "man page."
 msgstr ""
diff --git a/manual/po/de/user_customization-runtime.ssi.po b/manual/po/de/user_customization-runtime.ssi.po
index 3616bbb..22995c9 100644
--- a/manual/po/de/user_customization-runtime.ssi.po
+++ b/manual/po/de/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-07 08:16-0400\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -56,11 +56,11 @@ msgstr ""
 #: 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: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-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
@@ -120,12 +120,12 @@ msgstr ""
 #: 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: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: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
@@ -185,18 +185,22 @@ msgstr ""
 msgid ""
 "You can specify additional groups that the live user will belong to by "
 "preseeding the #{passwd/user-default-groups}# debconf value. For example, to "
-"add the live user to the #{fuse}# group, add the following to a file in the #"
-"{config/chroot_local-preseed}# directory:"
+"add the live user to the #{fuse}# group, add the following preseed under #"
+"{config/preseed/}# for the chroot stage:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:16
+#: en/user_customization-runtime.ssi:19
 #, no-wrap
-msgid " user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse\n"
+msgid ""
+" $ lb config\n"
+" $ echo user-setup passwd/user-default-groups string audio cdrom \\\n"
+"   dip floppy video plugdev netdev powerdev scanner bluetooth fuse \\\n"
+"   >> config/preseed/my.preseed.chroot\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:20
+#: en/user_customization-runtime.ssi:23
 msgid ""
 "It is also possible to change the default username \"user\" and the default "
 "password \"live\". If you want to do that for any reason, you can easily "
@@ -204,18 +208,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:22
+#: en/user_customization-runtime.ssi:25
 msgid ""
 "To change the default username you can simply specify it in your config:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:26
+#: en/user_customization-runtime.ssi:29
 msgid "$ lb config --bootappend-live \"username=live-user\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:30
+#: en/user_customization-runtime.ssi:33
 msgid ""
 "One possible way of changing the default password is by means of a hook as "
 "described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
@@ -225,32 +229,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:32
+#: en/user_customization-runtime.ssi:35
 msgid "2~customizing-locale-and-language Customizing locale and language"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:34
+#: en/user_customization-runtime.ssi:37
 msgid "When the live system boots, language is involved in three steps:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:36
+#: en/user_customization-runtime.ssi:39
 msgid "_* the locale generation"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:38
+#: en/user_customization-runtime.ssi:41
 msgid "_* setting the keyboard layout for the console"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:40
+#: en/user_customization-runtime.ssi:43
 msgid "_* setting the keyboard layout for X"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:45
 msgid ""
 "The default locale when building a Live system is \"locales=en_US.UTF-8\". "
 "To define the locale that should be generated, use the #{locales}# parameter "
@@ -258,20 +262,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:46
+#: en/user_customization-runtime.ssi:49
 #, no-wrap
 msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:50
+#: en/user_customization-runtime.ssi:53
 msgid ""
 "This parameter can also be used at the kernel command line. You can specify "
 "a locale by a full #{language_country.encoding}# word."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:52
+#: en/user_customization-runtime.ssi:55
 msgid ""
 "Both the console and X keyboard configuration depend on the #{keyboard-"
 "layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
@@ -282,7 +286,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:57
+#: en/user_customization-runtime.ssi:60
 #, no-wrap
 msgid ""
 " $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
@@ -290,26 +294,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:61
+#: en/user_customization-runtime.ssi:64
 msgid ""
 "To get the locale files for German and Swiss German keyboard layout in X use:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:65
+#: en/user_customization-runtime.ssi:68
 #, no-wrap
 msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:69
+#: en/user_customization-runtime.ssi:72
 msgid ""
 "A list of the valid values of the keyboards for the console can be figured "
 "with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:74
+#: en/user_customization-runtime.ssi:77
 #, no-wrap
 msgid ""
 " $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
@@ -317,7 +321,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:78
+#: en/user_customization-runtime.ssi:81
 msgid ""
 "Alternatively, you can use the #{console-setup}# package, a tool to let you "
 "configure console layout using X (XKB) definitions; you can then set your "
@@ -329,7 +333,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:86
 #, no-wrap
 msgid ""
 " $ lb config --bootappend-live \\\n"
@@ -337,12 +341,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:87
+#: en/user_customization-runtime.ssi:90
 msgid "2~persistence Persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:92
 msgid ""
 "A live cd paradigm is a pre-installed system which runs from read-only "
 "media, like a cdrom, where writes and modifications do not survive reboots "
@@ -350,7 +354,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:91
+#: en/user_customization-runtime.ssi:94
 msgid ""
 "A Debian Live system is a generalization of this paradigm and thus supports "
 "other media in addition to CDs; but still, in its default behaviour, it "
@@ -359,7 +363,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:96
 msgid ""
 "Persistence is a common name for different kinds of solutions for saving "
 "across reboots some, or all, of this run-time evolution of the system. To "
@@ -370,7 +374,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:95
+#: en/user_customization-runtime.ssi:98
 msgid ""
 "The data stored on this ramdisk should be saved on a writable persistent "
 "medium like a Hard Disk, a USB key, a network share or even a session of a "
@@ -380,12 +384,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:97
+#: en/user_customization-runtime.ssi:100
 msgid "3~ Full persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:99
+#: en/user_customization-runtime.ssi:102
 msgid ""
 "By 'full persistence' it is meant that instead of using a tmpfs for storing "
 "modifications to the read-only media (with the copy-on-write, COW, system) a "
@@ -397,31 +401,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:103
+#: en/user_customization-runtime.ssi:106
 #, no-wrap
 msgid " # mkfs.ext2 -L live-rw /dev/sdb1\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:107
+#: en/user_customization-runtime.ssi:110
 msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:109
+#: en/user_customization-runtime.ssi:112
 msgid ""
 "If you already have a partition on your device, you could just change the "
 "label with one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:113
+#: en/user_customization-runtime.ssi:116
 #, no-wrap
 msgid " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:117
+#: en/user_customization-runtime.ssi:120
 msgid ""
 "But since live system users cannot always use a hard drive partition, and "
 "considering that most USB keys have poor write speeds, 'full' persistence "
@@ -431,7 +435,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:125
 #, no-wrap
 msgid ""
 " $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
@@ -439,19 +443,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:129
 msgid ""
 "Then copy the #{live-rw}# file to a writable partition and reboot with the "
 "boot parameter 'persistent'."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:131
 msgid "3~ Home automounting"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:133
 msgid ""
 "If during the boot a partition (filesystem) image file or a partition "
 "labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
@@ -460,12 +464,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:135
 msgid "3~ Snapshots"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:134
+#: en/user_customization-runtime.ssi:137
 msgid ""
 "Snapshots are collections of files and directories which are not mounted "
 "while running but which are copied from a persistent device to the system "
@@ -482,26 +486,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:139
 msgid ""
 "A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
 "works the same as the main snapshot but it is only applied to /home."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:141
 msgid ""
 "Snapshots cannot currently handle file deletion but full persistence and "
 "home automounting can."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:140
+#: en/user_customization-runtime.ssi:143
 msgid "3~ Persistent SubText"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:142
+#: en/user_customization-runtime.ssi:145
 msgid ""
 "If a user would need multiple persistent storage of the same type for "
 "different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-"
@@ -513,12 +517,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:144
+#: en/user_customization-runtime.ssi:147
 msgid "3~ Partial remastering"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:145
+#: en/user_customization-runtime.ssi:148
 msgid ""
 "The run-time modification of the tmpfs could be collected using live-"
 "snapshot in a squashfs and added to the cd by remastering the iso in the "
diff --git a/manual/po/es/user_customization-contents.ssi.po b/manual/po/es/user_customization-contents.ssi.po
index 06242a4..41a07b2 100644
--- a/manual/po/es/user_customization-contents.ssi.po
+++ b/manual/po/es/user_customization-contents.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-07 08:16-0400\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
 "PO-Revision-Date: 2011-11-07 14:38+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -57,11 +57,11 @@ msgstr ""
 #: 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: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-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
@@ -121,12 +121,12 @@ msgstr "code{"
 #: 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: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: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
@@ -426,13 +426,23 @@ msgstr "3~live-chroot-local-hooks Scripts gancho locales en Live/chroot"
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:80
+#, fuzzy
+#| msgid ""
+#| "To run commands in the chroot stage, create a hook script containing the "
+#| "commands in the #{config/chroot_local-hooks}# directory. The hook will "
+#| "run in the chroot after the rest of your chroot configuration has been "
+#| "applied, so remember to ensure your configuration includes all packages "
+#| "and files your hook needs in order to run. See the example chroot hook "
+#| "scripts for various common chroot customization tasks provided in #{/usr/"
+#| "share/live/build/examples/hooks}# which you can copy or symlink to use "
+#| "them in your own configuration."
 msgid ""
-"To run commands in the chroot stage, create a hook script containing the "
-"commands in the #{config/chroot_local-hooks}# directory. The hook will run "
-"in the chroot after the rest of your chroot configuration has been applied, "
-"so remember to ensure your configuration includes all packages and files "
-"your hook needs in order to run. See the example chroot hook scripts for "
-"various common chroot customization tasks provided in #{/usr/share/live/"
+"To run commands in the chroot stage, create a hook script with a #{.chroot}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run in the chroot after the rest of your chroot configuration has been "
+"applied, so remember to ensure your configuration includes all packages and "
+"files your hook needs in order to run. See the example chroot hook scripts "
+"for various common chroot customization tasks provided in #{/usr/share/live/"
 "build/examples/hooks}# which you can copy or symlink to use them in your own "
 "configuration."
 msgstr ""
@@ -482,15 +492,27 @@ msgstr "3~ Scripts gancho locales en Binary"
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:88
+#, fuzzy
+#| msgid ""
+#| "To run commands in the binary stage, create a hook script containing the "
+#| "commands in the #{config/binary_local-hooks}#. The hook will run after "
+#| "all other binary commands are run, but before binary_checksums, the very "
+#| "last binary commands The commands in your hook do not run in the chroot, "
+#| "so take care to not modify any files outside of the build tree, or you "
+#| "may damage your build system! See the example binary hook scripts for "
+#| "various common binary customization tasks provided in #{/usr/share/live/"
+#| "build/examples/hooks}# which you can copy or symlink to use them in your "
+#| "own configuration."
 msgid ""
-"To run commands in the binary stage, create a hook script containing the "
-"commands in the #{config/binary_local-hooks}#. The hook will run after all "
-"other binary commands are run, but before binary_checksums, the very last "
-"binary commands The commands in your hook do not run in the chroot, so take "
-"care to not modify any files outside of the build tree, or you may damage "
-"your build system! See the example binary hook scripts for various common "
-"binary customization tasks provided in #{/usr/share/live/build/examples/"
-"hooks}# which you can copy or symlink to use them in your own configuration."
+"To run commands in the binary stage, create a hook script with a #{.binary}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run after all other binary commands are run, but before "
+"binary_checksums, the very last binary command. The commands in your hook do "
+"not run in the chroot, so take care to not modify any files outside of the "
+"build tree, or you may damage your build system! See the example binary hook "
+"scripts for various common binary customization tasks provided in #{/usr/"
+"share/live/build/examples/hooks}# which you can copy or symlink to use them "
+"in your own configuration."
 msgstr ""
 "Para ejecutar comandos en la etapa Binary se deben crear scripts gancho que "
 "contengan las ordenes y depositarlos en el directorio #{config/binary_local-"
@@ -511,10 +533,16 @@ msgstr "2~ Preconfiguración de las preguntas de Debconf"
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:92
+#, fuzzy
+#| msgid ""
+#| "Files in the #{config/chroot_local-preseed}# directory are considered to "
+#| "be debconf preseed files and are installed by live-build using #{debconf-"
+#| "set-selections}#."
 msgid ""
-"Files in the #{config/chroot_local-preseed}# directory are considered to be "
+"Files in the #{config/preseed/}# directory suffixed with #{.preseed}# "
+"followed by the stage (#{.chroot}# or #{.binary}#) are considered to be "
 "debconf preseed files and are installed by live-build using #{debconf-set-"
-"selections}#."
+"selections}# during the corresponding stage."
 msgstr ""
 "Los ficheros del directorio #{config/chroot_local-preseed}# son ficheros de "
 "preconfiguración para debconf. live-build instalará estos ficheros mediante #"
diff --git a/manual/po/es/user_customization-packages.ssi.po b/manual/po/es/user_customization-packages.ssi.po
index 7f47e56..419a81c 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: 2011-11-07 17:40-0400\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
 "PO-Revision-Date: 2011-11-07 23:21+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -63,11 +63,11 @@ msgstr ""
 #: 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: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-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
@@ -127,12 +127,12 @@ msgstr "code{"
 #: 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: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: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
@@ -990,7 +990,9 @@ msgstr "Existen dos formas de instalar paquetes personalizados:"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:228
-msgid "_* #{chroot_local-packages}#"
+#, fuzzy
+#| msgid "_* #{chroot_local-packages}#"
+msgid "_* #{packages.chroot}#"
 msgstr "_* #{chroot_local-packages}#"
 
 #. type: Plain text
@@ -1000,10 +1002,15 @@ msgstr "_* Utilizando un repositorio APT personalizado"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:232
+#, fuzzy
+#| msgid ""
+#| "Using #{chroot_local-packages}# is simpler to achieve and useful for "
+#| "\"one-off\" customizations but has a number of drawbacks, whilst using a "
+#| "custom APT repository is more time-consuming to set up."
 msgid ""
-"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
-"off\" customizations but has a number of drawbacks, whilst using a custom "
-"APT repository is more time-consuming to set up."
+"Using #{packages.chroot}# is simpler to achieve and useful for \"one-off\" "
+"customizations but has a number of drawbacks, whilst using a custom APT "
+"repository is more time-consuming to set up."
 msgstr ""
 "El método #{chroot_local-packages}# es el más simple para añadir paquetes "
 "personalizados. Es muy útil para personalizaciones «rápidas» (one-off) pero "
@@ -1012,17 +1019,25 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:234
-msgid "3~ Using #{chroot_local-packages}# to install custom packages"
+#, fuzzy
+#| msgid "3~ Using #{chroot_local-packages}# to install custom packages"
+msgid "3~ Using #{packages.chroot}# to install custom packages"
 msgstr ""
 "3~ Método #{chroot_local-packages}# para instalar paquetes personalizados"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:236
-msgid ""
-"To install a custom package, simply copy it to the #{config/chroot_local-"
-"packages/}# directory. Packages that are inside this directory will be "
-"automatically installed into the live system during build - you do not need "
-"to specify them elsewhere."
+#, fuzzy
+#| msgid ""
+#| "To install a custom package, simply copy it to the #{config/chroot_local-"
+#| "packages/}# directory. Packages that are inside this directory will be "
+#| "automatically installed into the live system during build - you do not "
+#| "need to specify them elsewhere."
+msgid ""
+"To install a custom package, simply copy it to the #{config/packages.chroot/}"
+"# directory. Packages that are inside this directory will be automatically "
+"installed into the live system during build - you do not need to specify "
+"them elsewhere."
 msgstr ""
 "Para instalar paquetes personalizados solamente hay que copiar el paquete en "
 "el directorio #{config/chroot_local-packages/}#. Los paquetes contenidos en "
@@ -1041,8 +1056,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:240
+#, fuzzy
+#| msgid ""
+#| "Using #{chroot_local-packages}# for installation of custom packages has "
+#| "disadvantages:"
 msgid ""
-"Using #{chroot_local-packages}# for installation of custom packages has "
+"Using #{packages.chroot}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 "El método #{chroot_local-packages}# para la instalación de paquetes "
@@ -1055,9 +1074,13 @@ msgstr "_* No es posible utilizar APT seguro."
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:244
+#, fuzzy
+#| msgid ""
+#| "_* You must install all appropriate packages in the #{config/chroot_local-"
+#| "packages/}# directory."
 msgid ""
-"_* You must install all appropriate packages in the #{config/chroot_local-"
-"packages/}# directory."
+"_* You must install all appropriate packages in the #{config/packages."
+"chroot/}# directory."
 msgstr ""
 "_* Se deben depositar todos los paquetes necesarios para cumplir "
 "dependencias en el directorio #{config/chroot_local-packages/}#."
@@ -1078,10 +1101,15 @@ msgstr "3~ Método de repositorio APT para instalar paquetes personalizados"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:250
+#, fuzzy
+#| msgid ""
+#| "Unlike using #{chroot_local-packages}#, when using a custom APT "
+#| "repository you must ensure that you specify the packages elsewhere. See "
+#| "{Choosing packages to install}#choosing-packages-to-install for details."
 msgid ""
-"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
-"you must ensure that you specify the packages elsewhere. See {Choosing "
-"packages to install}#choosing-packages-to-install for details."
+"Unlike using #{packages.chroot}#, when using a custom APT repository you "
+"must ensure that you specify the packages elsewhere. See {Choosing packages "
+"to install}#choosing-packages-to-install for details."
 msgstr ""
 "Al contrario del método #{chroot_local-packages}#, cuando se utiliza el "
 "método de repositorio APT personalizado se debe asegurar que se especifica "
@@ -1142,11 +1170,19 @@ msgstr "2~ Configurar APT en la creación"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:262
+#, fuzzy
+#| msgid ""
+#| "You can configure APT through a number of options applied only at build "
+#| "time. (APT configuration used in the running live system may be "
+#| "configured in the normal way for live system contents, that is, by "
+#| "including the appropriate configurations through #{config/"
+#| "chroot_local_includes/}#.) For a complete list, look for options starting "
+#| "with #{apt}# in the #{lb_config}# man page."
 msgid ""
 "You can configure APT through a number of options applied only at build "
 "time. (APT configuration used in the running live system may be configured "
 "in the normal way for live system contents, that is, by including the "
-"appropriate configurations through #{config/chroot_local_includes/}#.) For a "
+"appropriate configurations through #{config/includes.chroot/}#.) For a "
 "complete list, look for options starting with #{apt}# in the #{lb_config}# "
 "man page."
 msgstr ""
diff --git a/manual/po/es/user_customization-runtime.ssi.po b/manual/po/es/user_customization-runtime.ssi.po
index c914239..0c60b3a 100644
--- a/manual/po/es/user_customization-runtime.ssi.po
+++ b/manual/po/es/user_customization-runtime.ssi.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-07 08:16-0400\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
 "PO-Revision-Date: 2011-11-07 14:39+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -61,11 +61,11 @@ msgstr ""
 #: 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: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-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
@@ -125,12 +125,12 @@ msgstr "code{"
 #: 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: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: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
@@ -200,11 +200,17 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:12
+#, fuzzy
+#| msgid ""
+#| "You can specify additional groups that the live user will belong to by "
+#| "preseeding the #{passwd/user-default-groups}# debconf value. For example, "
+#| "to add the live user to the #{fuse}# group, add the following to a file "
+#| "in the #{config/chroot_local-preseed}# directory:"
 msgid ""
 "You can specify additional groups that the live user will belong to by "
 "preseeding the #{passwd/user-default-groups}# debconf value. For example, to "
-"add the live user to the #{fuse}# group, add the following to a file in the #"
-"{config/chroot_local-preseed}# directory:"
+"add the live user to the #{fuse}# group, add the following preseed under #"
+"{config/preseed/}# for the chroot stage:"
 msgstr ""
 "Se puede especificar grupos adicionales a los que pertenecerá el usuario por "
 "defecto del sistema en vivo preconfigurando el valor debconf #{passwd/user-"
@@ -213,13 +219,18 @@ msgstr ""
 "chroot_local-preseed}#."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:16
-#, no-wrap
-msgid " user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse\n"
+#: en/user_customization-runtime.ssi:19
+#, fuzzy, no-wrap
+#| msgid " user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse\n"
+msgid ""
+" $ lb config\n"
+" $ echo user-setup passwd/user-default-groups string audio cdrom \\\n"
+"   dip floppy video plugdev netdev powerdev scanner bluetooth fuse \\\n"
+"   >> config/preseed/my.preseed.chroot\n"
 msgstr " user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse\n"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:20
+#: en/user_customization-runtime.ssi:23
 msgid ""
 "It is also possible to change the default username \"user\" and the default "
 "password \"live\". If you want to do that for any reason, you can easily "
@@ -230,7 +241,7 @@ msgstr ""
 "conseguir de forma sencilla tal y como se explica a continuación:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:22
+#: en/user_customization-runtime.ssi:25
 msgid ""
 "To change the default username you can simply specify it in your config:"
 msgstr ""
@@ -238,12 +249,12 @@ msgstr ""
 "en la configuración:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:26
+#: en/user_customization-runtime.ssi:29
 msgid "$ lb config --bootappend-live \"username=live-user\""
 msgstr "$ lb config --bootappend-live \"username=live-user\""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:30
+#: en/user_customization-runtime.ssi:33
 msgid ""
 "One possible way of changing the default password is by means of a hook as "
 "described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
@@ -259,35 +270,35 @@ msgstr ""
 "lib/live/config/}#"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:32
+#: en/user_customization-runtime.ssi:35
 msgid "2~customizing-locale-and-language Customizing locale and language"
 msgstr ""
 "2~customizing-locale-and-language Personalización de las variantes locales e "
 "idioma"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:34
+#: en/user_customization-runtime.ssi:37
 msgid "When the live system boots, language is involved in three steps:"
 msgstr ""
 "Cuando el sistema en vivo arranca, el idioma está implicado en tres pasos:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:36
+#: en/user_customization-runtime.ssi:39
 msgid "_* the locale generation"
 msgstr "_* Generar las variantes locales"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:38
+#: en/user_customization-runtime.ssi:41
 msgid "_* setting the keyboard layout for the console"
 msgstr "_* Establecer la distribución del teclado para el consola"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:40
+#: en/user_customization-runtime.ssi:43
 msgid "_* setting the keyboard layout for X"
 msgstr "_* Establecer la distribución del teclado para el entorno gráfico X"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:45
 msgid ""
 "The default locale when building a Live system is \"locales=en_US.UTF-8\". "
 "To define the locale that should be generated, use the #{locales}# parameter "
@@ -299,13 +310,13 @@ msgstr ""
 "# de #{lb config}#, p.ej."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:46
+#: en/user_customization-runtime.ssi:49
 #, no-wrap
 msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
 msgstr " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:50
+#: en/user_customization-runtime.ssi:53
 msgid ""
 "This parameter can also be used at the kernel command line. You can specify "
 "a locale by a full #{language_country.encoding}# word."
@@ -315,7 +326,7 @@ msgstr ""
 "{language_country.encoding}#."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:52
+#: en/user_customization-runtime.ssi:55
 msgid ""
 "Both the console and X keyboard configuration depend on the #{keyboard-"
 "layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
@@ -333,7 +344,7 @@ msgstr ""
 "idioma, por ejemplo:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:57
+#: en/user_customization-runtime.ssi:60
 #, no-wrap
 msgid ""
 " $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
@@ -343,7 +354,7 @@ msgstr ""
 " <name>se</name>\n"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:61
+#: en/user_customization-runtime.ssi:64
 msgid ""
 "To get the locale files for German and Swiss German keyboard layout in X use:"
 msgstr ""
@@ -351,13 +362,13 @@ msgstr ""
 "disposición del teclado alemán y suizo-alemán en X usar:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:65
+#: en/user_customization-runtime.ssi:68
 #, no-wrap
 msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
 msgstr " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:69
+#: en/user_customization-runtime.ssi:72
 msgid ""
 "A list of the valid values of the keyboards for the console can be figured "
 "with the following command:"
@@ -366,7 +377,7 @@ msgstr ""
 "con el siguiente comando:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:74
+#: en/user_customization-runtime.ssi:77
 #, no-wrap
 msgid ""
 " $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
@@ -376,7 +387,7 @@ msgstr ""
 "     do basename $i | head -c -9; echo; done | sort | less\n"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:78
+#: en/user_customization-runtime.ssi:81
 msgid ""
 "Alternatively, you can use the #{console-setup}# package, a tool to let you "
 "configure console layout using X (XKB) definitions; you can then set your "
@@ -396,7 +407,7 @@ msgstr ""
 "TypeMatrix, tanto en consola X como X11, se puede utilizar:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:86
 #, no-wrap
 msgid ""
 " $ lb config --bootappend-live \\\n"
@@ -406,12 +417,12 @@ msgstr ""
 "     \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:87
+#: en/user_customization-runtime.ssi:90
 msgid "2~persistence Persistence"
 msgstr "2~persistence  Persistencia (Modo guardar cambios)"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:92
 msgid ""
 "A live cd paradigm is a pre-installed system which runs from read-only "
 "media, like a cdrom, where writes and modifications do not survive reboots "
@@ -423,7 +434,7 @@ msgstr ""
 "reiniciar el sistema en que se ejecuta."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:91
+#: en/user_customization-runtime.ssi:94
 msgid ""
 "A Debian Live system is a generalization of this paradigm and thus supports "
 "other media in addition to CDs; but still, in its default behaviour, it "
@@ -437,7 +448,7 @@ msgstr ""
 "apagar el equipo."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:96
 msgid ""
 "Persistence is a common name for different kinds of solutions for saving "
 "across reboots some, or all, of this run-time evolution of the system. To "
@@ -456,7 +467,7 @@ msgstr ""
 "guardan tras reiniciar."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:95
+#: en/user_customization-runtime.ssi:98
 msgid ""
 "The data stored on this ramdisk should be saved on a writable persistent "
 "medium like a Hard Disk, a USB key, a network share or even a session of a "
@@ -472,12 +483,12 @@ msgstr ""
 "el momento del arranque: #{persistent}#."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:97
+#: en/user_customization-runtime.ssi:100
 msgid "3~ Full persistence"
 msgstr "3~ Persistencia total"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:99
+#: en/user_customization-runtime.ssi:102
 msgid ""
 "By 'full persistence' it is meant that instead of using a tmpfs for storing "
 "modifications to the read-only media (with the copy-on-write, COW, system) a "
@@ -499,19 +510,19 @@ msgstr ""
 "ejemplo:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:103
+#: en/user_customization-runtime.ssi:106
 #, no-wrap
 msgid " # mkfs.ext2 -L live-rw /dev/sdb1\n"
 msgstr " # mkfs.ext2 -L live-rw /dev/sdb1\n"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:107
+#: en/user_customization-runtime.ssi:110
 msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
 msgstr ""
 "Ver {Usar el espacio libre en el dispositivo USB}#using-usb-extra-space."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:109
+#: en/user_customization-runtime.ssi:112
 msgid ""
 "If you already have a partition on your device, you could just change the "
 "label with one of the following:"
@@ -520,13 +531,13 @@ msgstr ""
 "etiqueta con uno de los siguientes:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:113
+#: en/user_customization-runtime.ssi:116
 #, no-wrap
 msgid " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
 msgstr " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:117
+#: en/user_customization-runtime.ssi:120
 msgid ""
 "But since live system users cannot always use a hard drive partition, and "
 "considering that most USB keys have poor write speeds, 'full' persistence "
@@ -543,7 +554,7 @@ msgstr ""
 "esto:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:125
 #, no-wrap
 msgid ""
 " $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
@@ -553,7 +564,7 @@ msgstr ""
 " $ /sbin/mkfs.ext2 -F live-rw\n"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:129
 msgid ""
 "Then copy the #{live-rw}# file to a writable partition and reboot with the "
 "boot parameter 'persistent'."
@@ -562,12 +573,12 @@ msgstr ""
 "reiniciar el sistema con el parámetro de arranque «persistent»."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:131
 msgid "3~ Home automounting"
 msgstr "3~ Montar Home de forma automática"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:133
 msgid ""
 "If during the boot a partition (filesystem) image file or a partition "
 "labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
@@ -581,12 +592,12 @@ msgstr ""
 "defecto. Se puede combinar con persistencia total."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:135
 msgid "3~ Snapshots"
 msgstr "3~ Instantáneas"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:134
+#: en/user_customization-runtime.ssi:137
 msgid ""
 "Snapshots are collections of files and directories which are not mounted "
 "while running but which are copied from a persistent device to the system "
@@ -618,7 +629,7 @@ msgstr ""
 "almacenamiento."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:139
 msgid ""
 "A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
 "works the same as the main snapshot but it is only applied to /home."
@@ -628,7 +639,7 @@ msgstr ""
 "a /home."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:141
 msgid ""
 "Snapshots cannot currently handle file deletion but full persistence and "
 "home automounting can."
@@ -637,12 +648,12 @@ msgstr ""
 "la persistencia total y el montaje automático sí pueden."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:140
+#: en/user_customization-runtime.ssi:143
 msgid "3~ Persistent SubText"
 msgstr "3~ SubText persistente"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:142
+#: en/user_customization-runtime.ssi:145
 msgid ""
 "If a user would need multiple persistent storage of the same type for "
 "different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-"
@@ -661,12 +672,12 @@ msgstr ""
 "parámetros de arranque de: #{persistent}# #{persistent-subtext=subText}#."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:144
+#: en/user_customization-runtime.ssi:147
 msgid "3~ Partial remastering"
 msgstr "3~ Remasterización parcial"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:145
+#: en/user_customization-runtime.ssi:148
 msgid ""
 "The run-time modification of the tmpfs could be collected using live-"
 "snapshot in a squashfs and added to the cd by remastering the iso in the "
diff --git a/manual/po/fr/user_customization-contents.ssi.po b/manual/po/fr/user_customization-contents.ssi.po
index 96155bd..7b55466 100644
--- a/manual/po/fr/user_customization-contents.ssi.po
+++ b/manual/po/fr/user_customization-contents.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-07 08:16-0400\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
 "PO-Revision-Date: 2011-11-07 23:01+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -57,11 +57,11 @@ msgstr ""
 #: 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: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-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
@@ -121,12 +121,12 @@ msgstr "code{"
 #: 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: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: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
@@ -404,13 +404,23 @@ msgstr "3~live-chroot-local-hooks Live/chroot local hooks"
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:80
+#, fuzzy
+#| msgid ""
+#| "To run commands in the chroot stage, create a hook script containing the "
+#| "commands in the #{config/chroot_local-hooks}# directory. The hook will "
+#| "run in the chroot after the rest of your chroot configuration has been "
+#| "applied, so remember to ensure your configuration includes all packages "
+#| "and files your hook needs in order to run. See the example chroot hook "
+#| "scripts for various common chroot customization tasks provided in #{/usr/"
+#| "share/live/build/examples/hooks}# which you can copy or symlink to use "
+#| "them in your own configuration."
 msgid ""
-"To run commands in the chroot stage, create a hook script containing the "
-"commands in the #{config/chroot_local-hooks}# directory. The hook will run "
-"in the chroot after the rest of your chroot configuration has been applied, "
-"so remember to ensure your configuration includes all packages and files "
-"your hook needs in order to run. See the example chroot hook scripts for "
-"various common chroot customization tasks provided in #{/usr/share/live/"
+"To run commands in the chroot stage, create a hook script with a #{.chroot}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run in the chroot after the rest of your chroot configuration has been "
+"applied, so remember to ensure your configuration includes all packages and "
+"files your hook needs in order to run. See the example chroot hook scripts "
+"for various common chroot customization tasks provided in #{/usr/share/live/"
 "build/examples/hooks}# which you can copy or symlink to use them in your own "
 "configuration."
 msgstr ""
@@ -456,15 +466,27 @@ msgstr "3~ Binary local hooks"
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:88
+#, fuzzy
+#| msgid ""
+#| "To run commands in the binary stage, create a hook script containing the "
+#| "commands in the #{config/binary_local-hooks}#. The hook will run after "
+#| "all other binary commands are run, but before binary_checksums, the very "
+#| "last binary commands The commands in your hook do not run in the chroot, "
+#| "so take care to not modify any files outside of the build tree, or you "
+#| "may damage your build system! See the example binary hook scripts for "
+#| "various common binary customization tasks provided in #{/usr/share/live/"
+#| "build/examples/hooks}# which you can copy or symlink to use them in your "
+#| "own configuration."
 msgid ""
-"To run commands in the binary stage, create a hook script containing the "
-"commands in the #{config/binary_local-hooks}#. The hook will run after all "
-"other binary commands are run, but before binary_checksums, the very last "
-"binary commands The commands in your hook do not run in the chroot, so take "
-"care to not modify any files outside of the build tree, or you may damage "
-"your build system! See the example binary hook scripts for various common "
-"binary customization tasks provided in #{/usr/share/live/build/examples/"
-"hooks}# which you can copy or symlink to use them in your own configuration."
+"To run commands in the binary stage, create a hook script with a #{.binary}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run after all other binary commands are run, but before "
+"binary_checksums, the very last binary command. The commands in your hook do "
+"not run in the chroot, so take care to not modify any files outside of the "
+"build tree, or you may damage your build system! See the example binary hook "
+"scripts for various common binary customization tasks provided in #{/usr/"
+"share/live/build/examples/hooks}# which you can copy or symlink to use them "
+"in your own configuration."
 msgstr ""
 "Pour exécuter des commandes à l'étape binaire, créer un script hook "
 "contenant les commandes dans #{config/binary_local-hooks}#. Le hook sera "
@@ -484,10 +506,16 @@ msgstr "2~ Préconfigurer questions de debconf"
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:92
+#, fuzzy
+#| msgid ""
+#| "Files in the #{config/chroot_local-preseed}# directory are considered to "
+#| "be debconf preseed files and are installed by live-build using #{debconf-"
+#| "set-selections}#."
 msgid ""
-"Files in the #{config/chroot_local-preseed}# directory are considered to be "
+"Files in the #{config/preseed/}# directory suffixed with #{.preseed}# "
+"followed by the stage (#{.chroot}# or #{.binary}#) are considered to be "
 "debconf preseed files and are installed by live-build using #{debconf-set-"
-"selections}#."
+"selections}# during the corresponding stage."
 msgstr ""
 "Les fichiers dans le répertoire #{config/chroot_local-preseed}# sont "
 "considérés comme des fichiers de préconfiguration debconf et sont installés "
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index f753705..e645d67 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: 2011-11-07 17:40-0400\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
 "PO-Revision-Date: 2011-11-07 23:07+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -57,11 +57,11 @@ msgstr ""
 #: 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: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-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
@@ -121,12 +121,12 @@ msgstr "code{"
 #: 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: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: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
@@ -948,7 +948,9 @@ msgstr "Il y a deux façons d'installer des paquets personnalisés modifiés:"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:228
-msgid "_* #{chroot_local-packages}#"
+#, fuzzy
+#| msgid "_* #{chroot_local-packages}#"
+msgid "_* #{packages.chroot}#"
 msgstr "_* #{chroot_local-packages}#"
 
 #. type: Plain text
@@ -958,10 +960,15 @@ msgstr "_* En utilisant un référentiel APT personnalisé"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:232
+#, fuzzy
+#| msgid ""
+#| "Using #{chroot_local-packages}# is simpler to achieve and useful for "
+#| "\"one-off\" customizations but has a number of drawbacks, whilst using a "
+#| "custom APT repository is more time-consuming to set up."
 msgid ""
-"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
-"off\" customizations but has a number of drawbacks, whilst using a custom "
-"APT repository is more time-consuming to set up."
+"Using #{packages.chroot}# is simpler to achieve and useful for \"one-off\" "
+"customizations but has a number of drawbacks, whilst using a custom APT "
+"repository is more time-consuming to set up."
 msgstr ""
 "Utilisant #{chroot_local-packages}# est plus simple à réaliser et utile pour "
 "les personnalisations ponctuels mais a un certain nombre d'inconvénients, "
@@ -970,17 +977,25 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:234
-msgid "3~ Using #{chroot_local-packages}# to install custom packages"
+#, fuzzy
+#| msgid "3~ Using #{chroot_local-packages}# to install custom packages"
+msgid "3~ Using #{packages.chroot}# to install custom packages"
 msgstr ""
 "3~ Utilisant #{chroot_local-packages}# pour installer paquets personnalisés"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:236
-msgid ""
-"To install a custom package, simply copy it to the #{config/chroot_local-"
-"packages/}# directory. Packages that are inside this directory will be "
-"automatically installed into the live system during build - you do not need "
-"to specify them elsewhere."
+#, fuzzy
+#| msgid ""
+#| "To install a custom package, simply copy it to the #{config/chroot_local-"
+#| "packages/}# directory. Packages that are inside this directory will be "
+#| "automatically installed into the live system during build - you do not "
+#| "need to specify them elsewhere."
+msgid ""
+"To install a custom package, simply copy it to the #{config/packages.chroot/}"
+"# directory. Packages that are inside this directory will be automatically "
+"installed into the live system during build - you do not need to specify "
+"them elsewhere."
 msgstr ""
 "Pour installer un paquet personnalisé, il suffit de le copier dans le "
 "répertoire #{config/chroot_local-packages/}#. Les paquets qui sont dans ce "
@@ -998,8 +1013,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:240
+#, fuzzy
+#| msgid ""
+#| "Using #{chroot_local-packages}# for installation of custom packages has "
+#| "disadvantages:"
 msgid ""
-"Using #{chroot_local-packages}# for installation of custom packages has "
+"Using #{packages.chroot}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 "L'utilisation de #{chroot_local-packages}# pour l'installation de paquets "
@@ -1012,9 +1031,13 @@ msgstr "_* Il n'est pas possible d'utiliser secure APT."
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:244
+#, fuzzy
+#| msgid ""
+#| "_* You must install all appropriate packages in the #{config/chroot_local-"
+#| "packages/}# directory."
 msgid ""
-"_* You must install all appropriate packages in the #{config/chroot_local-"
-"packages/}# directory."
+"_* You must install all appropriate packages in the #{config/packages."
+"chroot/}# directory."
 msgstr ""
 "_* Vous devez installer tous les paquets appropriés dans le répertoire #"
 "{config/chroot_local-packages/}#."
@@ -1036,10 +1059,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:250
+#, fuzzy
+#| msgid ""
+#| "Unlike using #{chroot_local-packages}#, when using a custom APT "
+#| "repository you must ensure that you specify the packages elsewhere. See "
+#| "{Choosing packages to install}#choosing-packages-to-install for details."
 msgid ""
-"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
-"you must ensure that you specify the packages elsewhere. See {Choosing "
-"packages to install}#choosing-packages-to-install for details."
+"Unlike using #{packages.chroot}#, when using a custom APT repository you "
+"must ensure that you specify the packages elsewhere. See {Choosing packages "
+"to install}#choosing-packages-to-install for details."
 msgstr ""
 "Contrairement à l'utilisation de #{chroot_local-packages}#, lorsque vous "
 "utilisez un réferéntiel personnalisé APT vous devez vous assurer que vous "
@@ -1101,11 +1129,19 @@ msgstr "2~ Configuration d'APT au moment de la construction"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:262
+#, fuzzy
+#| msgid ""
+#| "You can configure APT through a number of options applied only at build "
+#| "time. (APT configuration used in the running live system may be "
+#| "configured in the normal way for live system contents, that is, by "
+#| "including the appropriate configurations through #{config/"
+#| "chroot_local_includes/}#.) For a complete list, look for options starting "
+#| "with #{apt}# in the #{lb_config}# man page."
 msgid ""
 "You can configure APT through a number of options applied only at build "
 "time. (APT configuration used in the running live system may be configured "
 "in the normal way for live system contents, that is, by including the "
-"appropriate configurations through #{config/chroot_local_includes/}#.) For a "
+"appropriate configurations through #{config/includes.chroot/}#.) For a "
 "complete list, look for options starting with #{apt}# in the #{lb_config}# "
 "man page."
 msgstr ""
diff --git a/manual/po/fr/user_customization-runtime.ssi.po b/manual/po/fr/user_customization-runtime.ssi.po
index 5af42bd..79612fe 100644
--- a/manual/po/fr/user_customization-runtime.ssi.po
+++ b/manual/po/fr/user_customization-runtime.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-07 08:16-0400\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
 "PO-Revision-Date: 2011-11-07 23:08+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -57,11 +57,11 @@ msgstr ""
 #: 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: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-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
@@ -121,12 +121,12 @@ msgstr "code{"
 #: 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: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: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
@@ -195,11 +195,17 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:12
+#, fuzzy
+#| msgid ""
+#| "You can specify additional groups that the live user will belong to by "
+#| "preseeding the #{passwd/user-default-groups}# debconf value. For example, "
+#| "to add the live user to the #{fuse}# group, add the following to a file "
+#| "in the #{config/chroot_local-preseed}# directory:"
 msgid ""
 "You can specify additional groups that the live user will belong to by "
 "preseeding the #{passwd/user-default-groups}# debconf value. For example, to "
-"add the live user to the #{fuse}# group, add the following to a file in the #"
-"{config/chroot_local-preseed}# directory:"
+"add the live user to the #{fuse}# group, add the following preseed under #"
+"{config/preseed/}# for the chroot stage:"
 msgstr ""
 "Vous pouvez spécifier d'autres groupes pour l'utilisateur live en "
 "préconfigurant la valeur debconf #{passwd/user-default-groups}#. Par "
@@ -207,13 +213,17 @@ msgstr ""
 "suivante à un fichier dans le répertoire #{config/chroot_local-preseed}#:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:16
+#: en/user_customization-runtime.ssi:19
 #, no-wrap
-msgid " user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse\n"
+msgid ""
+" $ lb config\n"
+" $ echo user-setup passwd/user-default-groups string audio cdrom \\\n"
+"   dip floppy video plugdev netdev powerdev scanner bluetooth fuse \\\n"
+"   >> config/preseed/my.preseed.chroot\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:20
+#: en/user_customization-runtime.ssi:23
 msgid ""
 "It is also possible to change the default username \"user\" and the default "
 "password \"live\". If you want to do that for any reason, you can easily "
@@ -224,7 +234,7 @@ msgstr ""
 "vous pouvez facilement faire ça comme suit:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:22
+#: en/user_customization-runtime.ssi:25
 msgid ""
 "To change the default username you can simply specify it in your config:"
 msgstr ""
@@ -232,12 +242,12 @@ msgstr ""
 "spécifier dans votre config:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:26
+#: en/user_customization-runtime.ssi:29
 msgid "$ lb config --bootappend-live \"username=live-user\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:30
+#: en/user_customization-runtime.ssi:33
 msgid ""
 "One possible way of changing the default password is by means of a hook as "
 "described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
@@ -252,35 +262,35 @@ msgstr ""
 "et l'ajouter à #{config/includes.chroot/lib/live/config/}#"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:32
+#: en/user_customization-runtime.ssi:35
 msgid "2~customizing-locale-and-language Customizing locale and language"
 msgstr ""
 "2~customizing-locale-and-language Personnalisation des paramètres régionaux "
 "et la langue"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:34
+#: en/user_customization-runtime.ssi:37
 msgid "When the live system boots, language is involved in three steps:"
 msgstr ""
 "Au démarrage du système live, la langue est impliqué dans trois étapes:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:36
+#: en/user_customization-runtime.ssi:39
 msgid "_* the locale generation"
 msgstr "_* la génération des paramètres régionaux"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:38
+#: en/user_customization-runtime.ssi:41
 msgid "_* setting the keyboard layout for the console"
 msgstr "_* réglage de la disposition du clavier pour la console"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:40
+#: en/user_customization-runtime.ssi:43
 msgid "_* setting the keyboard layout for X"
 msgstr "_* réglage de la disposition du clavier pour X"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:45
 msgid ""
 "The default locale when building a Live system is \"locales=en_US.UTF-8\". "
 "To define the locale that should be generated, use the #{locales}# parameter "
@@ -292,13 +302,13 @@ msgstr ""
 "bootappend-live}# de #{lb config}#, par exemple"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:46
+#: en/user_customization-runtime.ssi:49
 #, no-wrap
 msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:50
+#: en/user_customization-runtime.ssi:53
 msgid ""
 "This parameter can also be used at the kernel command line. You can specify "
 "a locale by a full #{language_country.encoding}# word."
@@ -308,7 +318,7 @@ msgstr ""
 "encoding}#."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:52
+#: en/user_customization-runtime.ssi:55
 msgid ""
 "Both the console and X keyboard configuration depend on the #{keyboard-"
 "layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
@@ -326,7 +336,7 @@ msgstr ""
 "par exemple:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:57
+#: en/user_customization-runtime.ssi:60
 #, no-wrap
 msgid ""
 " $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
@@ -334,7 +344,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:61
+#: en/user_customization-runtime.ssi:64
 msgid ""
 "To get the locale files for German and Swiss German keyboard layout in X use:"
 msgstr ""
@@ -342,13 +352,13 @@ msgstr ""
 "allemand et suisse allemand dans X utiliser:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:65
+#: en/user_customization-runtime.ssi:68
 #, no-wrap
 msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:69
+#: en/user_customization-runtime.ssi:72
 msgid ""
 "A list of the valid values of the keyboards for the console can be figured "
 "with the following command:"
@@ -357,7 +367,7 @@ msgstr ""
 "avec la commande suivante:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:74
+#: en/user_customization-runtime.ssi:77
 #, no-wrap
 msgid ""
 " $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
@@ -365,7 +375,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:78
+#: en/user_customization-runtime.ssi:81
 msgid ""
 "Alternatively, you can use the #{console-setup}# package, a tool to let you "
 "configure console layout using X (XKB) definitions; you can then set your "
@@ -385,7 +395,7 @@ msgstr ""
 "Bepo) sur un clavier TypeMatrix, à la fois dans la console et X11, utilisez:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:86
 #, no-wrap
 msgid ""
 " $ lb config --bootappend-live \\\n"
@@ -393,12 +403,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:87
+#: en/user_customization-runtime.ssi:90
 msgid "2~persistence Persistence"
 msgstr "2~persistence Persistance"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:92
 msgid ""
 "A live cd paradigm is a pre-installed system which runs from read-only "
 "media, like a cdrom, where writes and modifications do not survive reboots "
@@ -410,7 +420,7 @@ msgstr ""
 "l'exécute."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:91
+#: en/user_customization-runtime.ssi:94
 msgid ""
 "A Debian Live system is a generalization of this paradigm and thus supports "
 "other media in addition to CDs; but still, in its default behaviour, it "
@@ -423,7 +433,7 @@ msgstr ""
 "d'exécution du système sont perdus à l'arrêt."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:96
 msgid ""
 "Persistence is a common name for different kinds of solutions for saving "
 "across reboots some, or all, of this run-time evolution of the system. To "
@@ -442,7 +452,7 @@ msgstr ""
 "données ne survivent pas à un redémarrage."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:95
+#: en/user_customization-runtime.ssi:98
 msgid ""
 "The data stored on this ramdisk should be saved on a writable persistent "
 "medium like a Hard Disk, a USB key, a network share or even a session of a "
@@ -458,12 +468,12 @@ msgstr ""
 "préciser au moment du démarrage: #{persistent}#."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:97
+#: en/user_customization-runtime.ssi:100
 msgid "3~ Full persistence"
 msgstr "3~ Persistance pleine"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:99
+#: en/user_customization-runtime.ssi:102
 msgid ""
 "By 'full persistence' it is meant that instead of using a tmpfs for storing "
 "modifications to the read-only media (with the copy-on-write, COW, system) a "
@@ -483,20 +493,20 @@ msgstr ""
 "disque dur ou sur une clé USB créé avec, par exemple:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:103
+#: en/user_customization-runtime.ssi:106
 #, no-wrap
 msgid " # mkfs.ext2 -L live-rw /dev/sdb1\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:107
+#: en/user_customization-runtime.ssi:110
 msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
 msgstr ""
 "Voir aussi {Utilisation de l'espace disponible sur une clé USB}#using-usb-"
 "extra-space."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:109
+#: en/user_customization-runtime.ssi:112
 msgid ""
 "If you already have a partition on your device, you could just change the "
 "label with one of the following:"
@@ -505,13 +515,13 @@ msgstr ""
 "modifier l'étiquette avec l'un des suivants:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:113
+#: en/user_customization-runtime.ssi:116
 #, no-wrap
 msgid " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:117
+#: en/user_customization-runtime.ssi:120
 msgid ""
 "But since live system users cannot always use a hard drive partition, and "
 "considering that most USB keys have poor write speeds, 'full' persistence "
@@ -528,7 +538,7 @@ msgstr ""
 "comme:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:125
 #, no-wrap
 msgid ""
 " $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
@@ -536,7 +546,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:129
 msgid ""
 "Then copy the #{live-rw}# file to a writable partition and reboot with the "
 "boot parameter 'persistent'."
@@ -545,12 +555,12 @@ msgstr ""
 "écriture et redémarrer avec le paramètre de démarrage \"persistent\"."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:131
 msgid "3~ Home automounting"
 msgstr "3~ Montage automatique de Home"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:133
 msgid ""
 "If during the boot a partition (filesystem) image file or a partition "
 "labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
@@ -564,12 +574,12 @@ msgstr ""
 "peut être combinée avec la persistance complète."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:135
 msgid "3~ Snapshots"
 msgstr "3~ Instantanés"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:134
+#: en/user_customization-runtime.ssi:137
 msgid ""
 "Snapshots are collections of files and directories which are not mounted "
 "while running but which are copied from a persistent device to the system "
@@ -601,7 +611,7 @@ msgstr ""
 "systèmes de persistance."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:139
 msgid ""
 "A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
 "works the same as the main snapshot but it is only applied to /home."
@@ -611,7 +621,7 @@ msgstr ""
 "seulement appliquée à /home."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:141
 msgid ""
 "Snapshots cannot currently handle file deletion but full persistence and "
 "home automounting can."
@@ -621,12 +631,12 @@ msgstr ""
 "peuvent le faire."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:140
+#: en/user_customization-runtime.ssi:143
 msgid "3~ Persistent SubText"
 msgstr "3~ SubText persistant"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:142
+#: en/user_customization-runtime.ssi:145
 msgid ""
 "If a user would need multiple persistent storage of the same type for "
 "different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-"
@@ -646,12 +656,12 @@ msgstr ""
 "{persistent-subtext=subText}#."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:144
+#: en/user_customization-runtime.ssi:147
 msgid "3~ Partial remastering"
 msgstr "3~ Remasterisation partielle"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:145
+#: en/user_customization-runtime.ssi:148
 msgid ""
 "The run-time modification of the tmpfs could be collected using live-"
 "snapshot in a squashfs and added to the cd by remastering the iso in the "
diff --git a/manual/po/it/user_customization-contents.ssi.po b/manual/po/it/user_customization-contents.ssi.po
index 2ee1c0e..3684803 100644
--- a/manual/po/it/user_customization-contents.ssi.po
+++ b/manual/po/it/user_customization-contents.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-07 08:16-0400\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
 "PO-Revision-Date: 2011-09-10 23:07+0200\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -57,11 +57,11 @@ msgstr ""
 #: 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: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-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
@@ -121,12 +121,12 @@ msgstr "code{"
 #: 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: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: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
@@ -413,13 +413,23 @@ msgstr "3~live-chroot-local-hooks Live/chroot hook locali"
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:80
+#, fuzzy
+#| msgid ""
+#| "To run commands in the chroot stage, create a hook script containing the "
+#| "commands in the #{config/chroot_local-hooks}# directory. The hook will "
+#| "run in the chroot after the rest of your chroot configuration has been "
+#| "applied, so remember to ensure your configuration includes all packages "
+#| "and files your hook needs in order to run. See the example chroot hook "
+#| "scripts for various common chroot customization tasks provided in #{/usr/"
+#| "share/live/build/examples/hooks}# which you can copy or symlink to use "
+#| "them in your own configuration."
 msgid ""
-"To run commands in the chroot stage, create a hook script containing the "
-"commands in the #{config/chroot_local-hooks}# directory. The hook will run "
-"in the chroot after the rest of your chroot configuration has been applied, "
-"so remember to ensure your configuration includes all packages and files "
-"your hook needs in order to run. See the example chroot hook scripts for "
-"various common chroot customization tasks provided in #{/usr/share/live/"
+"To run commands in the chroot stage, create a hook script with a #{.chroot}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run in the chroot after the rest of your chroot configuration has been "
+"applied, so remember to ensure your configuration includes all packages and "
+"files your hook needs in order to run. See the example chroot hook scripts "
+"for various common chroot customization tasks provided in #{/usr/share/live/"
 "build/examples/hooks}# which you can copy or symlink to use them in your own "
 "configuration."
 msgstr ""
@@ -474,15 +484,27 @@ msgstr "3~ Hook binari locali"
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:88
+#, fuzzy
+#| msgid ""
+#| "To run commands in the binary stage, create a hook script containing the "
+#| "commands in the #{config/binary_local-hooks}#. The hook will run after "
+#| "all other binary commands are run, but before binary_checksums, the very "
+#| "last binary commands The commands in your hook do not run in the chroot, "
+#| "so take care to not modify any files outside of the build tree, or you "
+#| "may damage your build system! See the example binary hook scripts for "
+#| "various common binary customization tasks provided in #{/usr/share/live/"
+#| "build/examples/hooks}# which you can copy or symlink to use them in your "
+#| "own configuration."
 msgid ""
-"To run commands in the binary stage, create a hook script containing the "
-"commands in the #{config/binary_local-hooks}#. The hook will run after all "
-"other binary commands are run, but before binary_checksums, the very last "
-"binary commands The commands in your hook do not run in the chroot, so take "
-"care to not modify any files outside of the build tree, or you may damage "
-"your build system! See the example binary hook scripts for various common "
-"binary customization tasks provided in #{/usr/share/live/build/examples/"
-"hooks}# which you can copy or symlink to use them in your own configuration."
+"To run commands in the binary stage, create a hook script with a #{.binary}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run after all other binary commands are run, but before "
+"binary_checksums, the very last binary command. The commands in your hook do "
+"not run in the chroot, so take care to not modify any files outside of the "
+"build tree, or you may damage your build system! See the example binary hook "
+"scripts for various common binary customization tasks provided in #{/usr/"
+"share/live/build/examples/hooks}# which you can copy or symlink to use them "
+"in your own configuration."
 msgstr ""
 "Per eseguire comandi nella fase binaria, creare uno script hook che contenga "
 "i comandi in #{config/binary_local-hooks}#. L'hook verrà eseguito dopo tutti "
@@ -501,10 +523,16 @@ msgstr "2~ Preconfigurare le domande di Debconf"
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:92
+#, fuzzy
+#| msgid ""
+#| "Files in the #{config/chroot_local-preseed}# directory are considered to "
+#| "be debconf preseed files and are installed by live-build using #{debconf-"
+#| "set-selections}#."
 msgid ""
-"Files in the #{config/chroot_local-preseed}# directory are considered to be "
+"Files in the #{config/preseed/}# directory suffixed with #{.preseed}# "
+"followed by the stage (#{.chroot}# or #{.binary}#) are considered to be "
 "debconf preseed files and are installed by live-build using #{debconf-set-"
-"selections}#."
+"selections}# during the corresponding stage."
 msgstr ""
 "I file nella directory #{config/chroot_local-preseed}# sono considerati file "
 "di preconfigurazione di debconf e sono installati da live-build usando #"
diff --git a/manual/po/it/user_customization-packages.ssi.po b/manual/po/it/user_customization-packages.ssi.po
index ffdfaab..c7a42a7 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: 2011-11-07 17:40-0400\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
 "PO-Revision-Date: 2011-08-02 00:53+0200\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -58,11 +58,11 @@ msgstr ""
 #: 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: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-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
@@ -122,12 +122,12 @@ msgstr "code{"
 #: 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: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: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
@@ -1036,7 +1036,7 @@ msgstr "Ci sono due modi per installare pacchetti personalizzati:"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:228
-msgid "_* #{chroot_local-packages}#"
+msgid "_* #{packages.chroot}#"
 msgstr ""
 
 #. type: Plain text
@@ -1046,10 +1046,15 @@ msgstr "_* Utilizzare repository APT personalizzati"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:232
+#, fuzzy
+#| msgid ""
+#| "Using #{chroot_local-packages}# is simpler to achieve and useful for "
+#| "\"one-off\" customizations but has a number of drawbacks, whilst using a "
+#| "custom APT repository is more time-consuming to set up."
 msgid ""
-"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
-"off\" customizations but has a number of drawbacks, whilst using a custom "
-"APT repository is more time-consuming to set up."
+"Using #{packages.chroot}# is simpler to achieve and useful for \"one-off\" "
+"customizations but has a number of drawbacks, whilst using a custom APT "
+"repository is more time-consuming to set up."
 msgstr ""
 "Usando #{chroot_local-packages}# è più semplice da ottenere e utile per una "
 "personalizzazione \"una tantum\" ma ha una serie di svantaggi, mentre un "
@@ -1057,18 +1062,26 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:234
-msgid "3~ Using #{chroot_local-packages}# to install custom packages"
+#, fuzzy
+#| msgid "3~ Using #{chroot_local-packages}# to install custom packages"
+msgid "3~ Using #{packages.chroot}# to install custom packages"
 msgstr ""
 "3~ Utilizzare #{chroot_local-packages}# per installare pacchetti "
 "personalizzati"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:236
+#, fuzzy
+#| msgid ""
+#| "To install a custom package, simply copy it to the #{config/chroot_local-"
+#| "packages/}# directory. Packages that are inside this directory will be "
+#| "automatically installed into the live system during build - you do not "
+#| "need to specify them elsewhere."
 msgid ""
-"To install a custom package, simply copy it to the #{config/chroot_local-"
-"packages/}# directory. Packages that are inside this directory will be "
-"automatically installed into the live system during build - you do not need "
-"to specify them elsewhere."
+"To install a custom package, simply copy it to the #{config/packages.chroot/}"
+"# directory. Packages that are inside this directory will be automatically "
+"installed into the live system during build - you do not need to specify "
+"them elsewhere."
 msgstr ""
 "Per installare un pacchetto personalizzato copiarlo nella directory #{config/"
 "chroot_local-packages/}#; i pacchetti al suo interno verranno installati "
@@ -1086,8 +1099,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:240
+#, fuzzy
+#| msgid ""
+#| "Using #{chroot_local-packages}# for installation of custom packages has "
+#| "disadvantages:"
 msgid ""
-"Using #{chroot_local-packages}# for installation of custom packages has "
+"Using #{packages.chroot}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 "L'utilizzo di #{chroot_local-packages}# per l'installazione di pacchetti "
@@ -1100,9 +1117,13 @@ msgstr "_* non è possibile usare secure APT"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:244
+#, fuzzy
+#| msgid ""
+#| "_* You must install all appropriate packages in the #{config/chroot_local-"
+#| "packages/}# directory."
 msgid ""
-"_* You must install all appropriate packages in the #{config/chroot_local-"
-"packages/}# directory."
+"_* You must install all appropriate packages in the #{config/packages."
+"chroot/}# directory."
 msgstr ""
 "_* è necessario installare i pacchetti adeguati nella directory #{config/"
 "chroot_local-packages/}#."
@@ -1124,10 +1145,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:250
+#, fuzzy
+#| msgid ""
+#| "Unlike using #{chroot_local-packages}#, when using a custom APT "
+#| "repository you must ensure that you specify the packages elsewhere. See "
+#| "{Choosing packages to install}#choosing-packages-to-install for details."
 msgid ""
-"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
-"you must ensure that you specify the packages elsewhere. See {Choosing "
-"packages to install}#choosing-packages-to-install for details."
+"Unlike using #{packages.chroot}#, when using a custom APT repository you "
+"must ensure that you specify the packages elsewhere. See {Choosing packages "
+"to install}#choosing-packages-to-install for details."
 msgstr ""
 "A differenza di #{chroot_local-packages}#, quando si usa un repository APT "
 "personalizzato è necessario assicurarsi di specificare altrove i pacchetti. "
@@ -1187,11 +1213,19 @@ msgstr "2~ Configurare APT in fase di costruzione"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:262
+#, fuzzy
+#| msgid ""
+#| "You can configure APT through a number of options applied only at build "
+#| "time. (APT configuration used in the running live system may be "
+#| "configured in the normal way for live system contents, that is, by "
+#| "including the appropriate configurations through #{config/"
+#| "chroot_local_includes/}#.) For a complete list, look for options starting "
+#| "with #{apt}# in the #{lb_config}# man page."
 msgid ""
 "You can configure APT through a number of options applied only at build "
 "time. (APT configuration used in the running live system may be configured "
 "in the normal way for live system contents, that is, by including the "
-"appropriate configurations through #{config/chroot_local_includes/}#.) For a "
+"appropriate configurations through #{config/includes.chroot/}#.) For a "
 "complete list, look for options starting with #{apt}# in the #{lb_config}# "
 "man page."
 msgstr ""
diff --git a/manual/po/it/user_customization-runtime.ssi.po b/manual/po/it/user_customization-runtime.ssi.po
index 9ae6eae..487c6e1 100644
--- a/manual/po/it/user_customization-runtime.ssi.po
+++ b/manual/po/it/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-07 08:16-0400\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
 "PO-Revision-Date: 2011-09-10 23:11+0200\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -56,11 +56,11 @@ msgstr ""
 #: 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: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-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
@@ -120,12 +120,12 @@ msgstr "code{"
 #: 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: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: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
@@ -193,11 +193,17 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:12
+#, fuzzy
+#| msgid ""
+#| "You can specify additional groups that the live user will belong to by "
+#| "preseeding the #{passwd/user-default-groups}# debconf value. For example, "
+#| "to add the live user to the #{fuse}# group, add the following to a file "
+#| "in the #{config/chroot_local-preseed}# directory:"
 msgid ""
 "You can specify additional groups that the live user will belong to by "
 "preseeding the #{passwd/user-default-groups}# debconf value. For example, to "
-"add the live user to the #{fuse}# group, add the following to a file in the #"
-"{config/chroot_local-preseed}# directory:"
+"add the live user to the #{fuse}# group, add the following preseed under #"
+"{config/preseed/}# for the chroot stage:"
 msgstr ""
 "È possibile specificare gruppi aggiuntivi ai quali l'utente live apparterrà "
 "preconfigurando il valore #{passwd/user-default-groups}# di debconf. Ad "
@@ -205,13 +211,17 @@ msgstr ""
 "ad un file nella directory #{config/chroot_local-preseed}#:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:16
+#: en/user_customization-runtime.ssi:19
 #, no-wrap
-msgid " user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse\n"
+msgid ""
+" $ lb config\n"
+" $ echo user-setup passwd/user-default-groups string audio cdrom \\\n"
+"   dip floppy video plugdev netdev powerdev scanner bluetooth fuse \\\n"
+"   >> config/preseed/my.preseed.chroot\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:20
+#: en/user_customization-runtime.ssi:23
 msgid ""
 "It is also possible to change the default username \"user\" and the default "
 "password \"live\". If you want to do that for any reason, you can easily "
@@ -219,18 +229,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:22
+#: en/user_customization-runtime.ssi:25
 msgid ""
 "To change the default username you can simply specify it in your config:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:26
+#: en/user_customization-runtime.ssi:29
 msgid "$ lb config --bootappend-live \"username=live-user\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:30
+#: en/user_customization-runtime.ssi:33
 msgid ""
 "One possible way of changing the default password is by means of a hook as "
 "described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
@@ -240,34 +250,34 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:32
+#: en/user_customization-runtime.ssi:35
 msgid "2~customizing-locale-and-language Customizing locale and language"
 msgstr ""
 "2~customizing-locale-and-language Personalizzare la localizzazione e la "
 "lingua"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:34
+#: en/user_customization-runtime.ssi:37
 msgid "When the live system boots, language is involved in three steps:"
 msgstr "Quando il sistema live si avvia, la lingua è inserita in tre fasi:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:36
+#: en/user_customization-runtime.ssi:39
 msgid "_* the locale generation"
 msgstr "_* generazione della localizzazione"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:38
+#: en/user_customization-runtime.ssi:41
 msgid "_* setting the keyboard layout for the console"
 msgstr "_* impostazione del layout di tastiera per la console"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:40
+#: en/user_customization-runtime.ssi:43
 msgid "_* setting the keyboard layout for X"
 msgstr "impostazione del layout di tastiera per X"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:45
 msgid ""
 "The default locale when building a Live system is \"locales=en_US.UTF-8\". "
 "To define the locale that should be generated, use the #{locales}# parameter "
@@ -278,13 +288,13 @@ msgstr ""
 "{locales}# nell'opzione #{--bootappend-live}# di #{lb config}#:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:46
+#: en/user_customization-runtime.ssi:49
 #, no-wrap
 msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:50
+#: en/user_customization-runtime.ssi:53
 msgid ""
 "This parameter can also be used at the kernel command line. You can specify "
 "a locale by a full #{language_country.encoding}# word."
@@ -293,7 +303,7 @@ msgstr ""
 "specificando una localizzazione nella forma #{lingua_nazione.codifica}#."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:52
+#: en/user_customization-runtime.ssi:55
 msgid ""
 "Both the console and X keyboard configuration depend on the #{keyboard-"
 "layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
@@ -311,7 +321,7 @@ msgstr ""
 "lingua:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:57
+#: en/user_customization-runtime.ssi:60
 #, no-wrap
 msgid ""
 " $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
@@ -319,7 +329,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:61
+#: en/user_customization-runtime.ssi:64
 msgid ""
 "To get the locale files for German and Swiss German keyboard layout in X use:"
 msgstr ""
@@ -327,13 +337,13 @@ msgstr ""
 "svizzero-tedesco in X:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:65
+#: en/user_customization-runtime.ssi:68
 #, no-wrap
 msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:69
+#: en/user_customization-runtime.ssi:72
 msgid ""
 "A list of the valid values of the keyboards for the console can be figured "
 "with the following command:"
@@ -342,7 +352,7 @@ msgstr ""
 "il seguente comando:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:74
+#: en/user_customization-runtime.ssi:77
 #, no-wrap
 msgid ""
 " $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
@@ -350,7 +360,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:78
+#: en/user_customization-runtime.ssi:81
 msgid ""
 "Alternatively, you can use the #{console-setup}# package, a tool to let you "
 "configure console layout using X (XKB) definitions; you can then set your "
@@ -369,7 +379,7 @@ msgstr ""
 "francese con una tastiera TypeMatrix, sia in console sia in X11:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:86
 #, no-wrap
 msgid ""
 " $ lb config --bootappend-live \\\n"
@@ -377,12 +387,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:87
+#: en/user_customization-runtime.ssi:90
 msgid "2~persistence Persistence"
 msgstr "2~persistence Persistenza"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:92
 msgid ""
 "A live cd paradigm is a pre-installed system which runs from read-only "
 "media, like a cdrom, where writes and modifications do not survive reboots "
@@ -393,7 +403,7 @@ msgstr ""
 "ai riavvii dell'hardware della macchina ospitante."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:91
+#: en/user_customization-runtime.ssi:94
 msgid ""
 "A Debian Live system is a generalization of this paradigm and thus supports "
 "other media in addition to CDs; but still, in its default behaviour, it "
@@ -407,7 +417,7 @@ msgstr ""
 "spegnimento."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:96
 msgid ""
 "Persistence is a common name for different kinds of solutions for saving "
 "across reboots some, or all, of this run-time evolution of the system. To "
@@ -424,7 +434,7 @@ msgstr ""
 "sui ram disk non sopravvivono ai riavvii."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:95
+#: en/user_customization-runtime.ssi:98
 msgid ""
 "The data stored on this ramdisk should be saved on a writable persistent "
 "medium like a Hard Disk, a USB key, a network share or even a session of a "
@@ -440,12 +450,12 @@ msgstr ""
 "all'avvio: #{persistent}#."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:97
+#: en/user_customization-runtime.ssi:100
 msgid "3~ Full persistence"
 msgstr "3~ Persistenza completa"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:99
+#: en/user_customization-runtime.ssi:102
 msgid ""
 "By 'full persistence' it is meant that instead of using a tmpfs for storing "
 "modifications to the read-only media (with the copy-on-write, COW, system) a "
@@ -465,20 +475,20 @@ msgstr ""
 "penna usb creata ad esempio con:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:103
+#: en/user_customization-runtime.ssi:106
 #, no-wrap
 msgid " # mkfs.ext2 -L live-rw /dev/sdb1\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:107
+#: en/user_customization-runtime.ssi:110
 msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
 msgstr ""
 "Si veda anche {Usare lo spazio rimanente su una penna USB}#using-usb-extra-"
 "space."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:109
+#: en/user_customization-runtime.ssi:112
 msgid ""
 "If you already have a partition on your device, you could just change the "
 "label with one of the following:"
@@ -487,13 +497,13 @@ msgstr ""
 "l'etichetta con una delle seguenti:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:113
+#: en/user_customization-runtime.ssi:116
 #, no-wrap
 msgid " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:117
+#: en/user_customization-runtime.ssi:120
 msgid ""
 "But since live system users cannot always use a hard drive partition, and "
 "considering that most USB keys have poor write speeds, 'full' persistence "
@@ -510,7 +520,7 @@ msgstr ""
 "qualcosa come:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:125
 #, no-wrap
 msgid ""
 " $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
@@ -518,7 +528,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:129
 msgid ""
 "Then copy the #{live-rw}# file to a writable partition and reboot with the "
 "boot parameter 'persistent'."
@@ -527,12 +537,12 @@ msgstr ""
 "con il parametro d'avvio \"persistent\"."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:131
 msgid "3~ Home automounting"
 msgstr "3~ Mount automatico della home"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:133
 msgid ""
 "If during the boot a partition (filesystem) image file or a partition "
 "labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
@@ -546,12 +556,12 @@ msgstr ""
 "persistenza completa."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:135
 msgid "3~ Snapshots"
 msgstr "3~ Istantanee"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:134
+#: en/user_customization-runtime.ssi:137
 msgid ""
 "Snapshots are collections of files and directories which are not mounted "
 "while running but which are copied from a persistent device to the system "
@@ -581,7 +591,7 @@ msgstr ""
 "basati su memoria flash."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:139
 msgid ""
 "A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
 "works the same as the main snapshot but it is only applied to /home."
@@ -590,7 +600,7 @@ msgstr ""
 "come la principale ma viene applicata solo ad /home."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:141
 msgid ""
 "Snapshots cannot currently handle file deletion but full persistence and "
 "home automounting can."
@@ -599,12 +609,12 @@ msgstr ""
 "contrario della persistenza completa e il mount automatico della home. "
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:140
+#: en/user_customization-runtime.ssi:143
 msgid "3~ Persistent SubText"
 msgstr "3~ Sottotesto persistente"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:142
+#: en/user_customization-runtime.ssi:145
 msgid ""
 "If a user would need multiple persistent storage of the same type for "
 "different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-"
@@ -623,12 +633,12 @@ msgstr ""
 "subtext=sottotesto}#."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:144
+#: en/user_customization-runtime.ssi:147
 msgid "3~ Partial remastering"
 msgstr "3~ Rimasterizzazione parziale"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:145
+#: en/user_customization-runtime.ssi:148
 msgid ""
 "The run-time modification of the tmpfs could be collected using live-"
 "snapshot in a squashfs and added to the cd by remastering the iso in the "
diff --git a/manual/po/pt_BR/user_customization-contents.ssi.po b/manual/po/pt_BR/user_customization-contents.ssi.po
index 304c61d..442cb93 100644
--- a/manual/po/pt_BR/user_customization-contents.ssi.po
+++ b/manual/po/pt_BR/user_customization-contents.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-07 08:16-0400\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
 "PO-Revision-Date: 2010-10-22 07:52-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -56,11 +56,11 @@ msgstr ""
 #: 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: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-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
@@ -120,12 +120,12 @@ msgstr "code{"
 #: 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: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: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
@@ -347,12 +347,12 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-contents.ssi:80
 msgid ""
-"To run commands in the chroot stage, create a hook script containing the "
-"commands in the #{config/chroot_local-hooks}# directory. The hook will run "
-"in the chroot after the rest of your chroot configuration has been applied, "
-"so remember to ensure your configuration includes all packages and files "
-"your hook needs in order to run. See the example chroot hook scripts for "
-"various common chroot customization tasks provided in #{/usr/share/live/"
+"To run commands in the chroot stage, create a hook script with a #{.chroot}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run in the chroot after the rest of your chroot configuration has been "
+"applied, so remember to ensure your configuration includes all packages and "
+"files your hook needs in order to run. See the example chroot hook scripts "
+"for various common chroot customization tasks provided in #{/usr/share/live/"
 "build/examples/hooks}# which you can copy or symlink to use them in your own "
 "configuration."
 msgstr ""
@@ -382,14 +382,15 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-contents.ssi:88
 msgid ""
-"To run commands in the binary stage, create a hook script containing the "
-"commands in the #{config/binary_local-hooks}#. The hook will run after all "
-"other binary commands are run, but before binary_checksums, the very last "
-"binary commands The commands in your hook do not run in the chroot, so take "
-"care to not modify any files outside of the build tree, or you may damage "
-"your build system! See the example binary hook scripts for various common "
-"binary customization tasks provided in #{/usr/share/live/build/examples/"
-"hooks}# which you can copy or symlink to use them in your own configuration."
+"To run commands in the binary stage, create a hook script with a #{.binary}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run after all other binary commands are run, but before "
+"binary_checksums, the very last binary command. The commands in your hook do "
+"not run in the chroot, so take care to not modify any files outside of the "
+"build tree, or you may damage your build system! See the example binary hook "
+"scripts for various common binary customization tasks provided in #{/usr/"
+"share/live/build/examples/hooks}# which you can copy or symlink to use them "
+"in your own configuration."
 msgstr ""
 
 #. type: Plain text
@@ -400,9 +401,10 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-contents.ssi:92
 msgid ""
-"Files in the #{config/chroot_local-preseed}# directory are considered to be "
+"Files in the #{config/preseed/}# directory suffixed with #{.preseed}# "
+"followed by the stage (#{.chroot}# or #{.binary}#) are considered to be "
 "debconf preseed files and are installed by live-build using #{debconf-set-"
-"selections}#."
+"selections}# during the corresponding stage."
 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 ff1e9a6..e02e603 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: 2011-11-07 17:40-0400\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
 "PO-Revision-Date: 2010-10-22 08:58-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -56,11 +56,11 @@ msgstr ""
 #: 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: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-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
@@ -120,12 +120,12 @@ msgstr "code{"
 #: 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: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: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
@@ -743,7 +743,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:228
-msgid "_* #{chroot_local-packages}#"
+msgid "_* #{packages.chroot}#"
 msgstr ""
 
 #. type: Plain text
@@ -754,23 +754,23 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:232
 msgid ""
-"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
-"off\" customizations but has a number of drawbacks, whilst using a custom "
-"APT repository is more time-consuming to set up."
+"Using #{packages.chroot}# is simpler to achieve and useful for \"one-off\" "
+"customizations but has a number of drawbacks, whilst using a custom APT "
+"repository is more time-consuming to set up."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:234
-msgid "3~ Using #{chroot_local-packages}# to install custom packages"
+msgid "3~ Using #{packages.chroot}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:236
 msgid ""
-"To install a custom package, simply copy it to the #{config/chroot_local-"
-"packages/}# directory. Packages that are inside this directory will be "
-"automatically installed into the live system during build - you do not need "
-"to specify them elsewhere."
+"To install a custom package, simply copy it to the #{config/packages.chroot/}"
+"# directory. Packages that are inside this directory will be automatically "
+"installed into the live system during build - you do not need to specify "
+"them elsewhere."
 msgstr ""
 
 #. type: Plain text
@@ -783,7 +783,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:240
 msgid ""
-"Using #{chroot_local-packages}# for installation of custom packages has "
+"Using #{packages.chroot}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
@@ -795,8 +795,8 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:244
 msgid ""
-"_* You must install all appropriate packages in the #{config/chroot_local-"
-"packages/}# directory."
+"_* You must install all appropriate packages in the #{config/packages."
+"chroot/}# directory."
 msgstr ""
 
 #. type: Plain text
@@ -814,9 +814,9 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:250
 msgid ""
-"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
-"you must ensure that you specify the packages elsewhere. See {Choosing "
-"packages to install}#choosing-packages-to-install for details."
+"Unlike using #{packages.chroot}#, when using a custom APT repository you "
+"must ensure that you specify the packages elsewhere. See {Choosing packages "
+"to install}#choosing-packages-to-install for details."
 msgstr ""
 
 #. type: Plain text
@@ -863,7 +863,7 @@ msgid ""
 "You can configure APT through a number of options applied only at build "
 "time. (APT configuration used in the running live system may be configured "
 "in the normal way for live system contents, that is, by including the "
-"appropriate configurations through #{config/chroot_local_includes/}#.) For a "
+"appropriate configurations through #{config/includes.chroot/}#.) For a "
 "complete list, look for options starting with #{apt}# in the #{lb_config}# "
 "man page."
 msgstr ""
diff --git a/manual/po/pt_BR/user_customization-runtime.ssi.po b/manual/po/pt_BR/user_customization-runtime.ssi.po
index eaeef36..9e46904 100644
--- a/manual/po/pt_BR/user_customization-runtime.ssi.po
+++ b/manual/po/pt_BR/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-07 08:16-0400\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
 "PO-Revision-Date: 2010-11-30 11:40+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -56,11 +56,11 @@ msgstr ""
 #: 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: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-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
@@ -120,12 +120,12 @@ msgstr "code{"
 #: 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: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: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
@@ -185,18 +185,22 @@ msgstr ""
 msgid ""
 "You can specify additional groups that the live user will belong to by "
 "preseeding the #{passwd/user-default-groups}# debconf value. For example, to "
-"add the live user to the #{fuse}# group, add the following to a file in the #"
-"{config/chroot_local-preseed}# directory:"
+"add the live user to the #{fuse}# group, add the following preseed under #"
+"{config/preseed/}# for the chroot stage:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:16
+#: en/user_customization-runtime.ssi:19
 #, no-wrap
-msgid " user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse\n"
+msgid ""
+" $ lb config\n"
+" $ echo user-setup passwd/user-default-groups string audio cdrom \\\n"
+"   dip floppy video plugdev netdev powerdev scanner bluetooth fuse \\\n"
+"   >> config/preseed/my.preseed.chroot\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:20
+#: en/user_customization-runtime.ssi:23
 msgid ""
 "It is also possible to change the default username \"user\" and the default "
 "password \"live\". If you want to do that for any reason, you can easily "
@@ -204,18 +208,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:22
+#: en/user_customization-runtime.ssi:25
 msgid ""
 "To change the default username you can simply specify it in your config:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:26
+#: en/user_customization-runtime.ssi:29
 msgid "$ lb config --bootappend-live \"username=live-user\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:30
+#: en/user_customization-runtime.ssi:33
 msgid ""
 "One possible way of changing the default password is by means of a hook as "
 "described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
@@ -225,32 +229,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:32
+#: en/user_customization-runtime.ssi:35
 msgid "2~customizing-locale-and-language Customizing locale and language"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:34
+#: en/user_customization-runtime.ssi:37
 msgid "When the live system boots, language is involved in three steps:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:36
+#: en/user_customization-runtime.ssi:39
 msgid "_* the locale generation"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:38
+#: en/user_customization-runtime.ssi:41
 msgid "_* setting the keyboard layout for the console"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:40
+#: en/user_customization-runtime.ssi:43
 msgid "_* setting the keyboard layout for X"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:45
 msgid ""
 "The default locale when building a Live system is \"locales=en_US.UTF-8\". "
 "To define the locale that should be generated, use the #{locales}# parameter "
@@ -258,20 +262,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:46
+#: en/user_customization-runtime.ssi:49
 #, no-wrap
 msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:50
+#: en/user_customization-runtime.ssi:53
 msgid ""
 "This parameter can also be used at the kernel command line. You can specify "
 "a locale by a full #{language_country.encoding}# word."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:52
+#: en/user_customization-runtime.ssi:55
 msgid ""
 "Both the console and X keyboard configuration depend on the #{keyboard-"
 "layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
@@ -282,7 +286,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:57
+#: en/user_customization-runtime.ssi:60
 #, no-wrap
 msgid ""
 " $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
@@ -290,26 +294,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:61
+#: en/user_customization-runtime.ssi:64
 msgid ""
 "To get the locale files for German and Swiss German keyboard layout in X use:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:65
+#: en/user_customization-runtime.ssi:68
 #, no-wrap
 msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:69
+#: en/user_customization-runtime.ssi:72
 msgid ""
 "A list of the valid values of the keyboards for the console can be figured "
 "with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:74
+#: en/user_customization-runtime.ssi:77
 #, no-wrap
 msgid ""
 " $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
@@ -317,7 +321,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:78
+#: en/user_customization-runtime.ssi:81
 msgid ""
 "Alternatively, you can use the #{console-setup}# package, a tool to let you "
 "configure console layout using X (XKB) definitions; you can then set your "
@@ -329,7 +333,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:86
 #, no-wrap
 msgid ""
 " $ lb config --bootappend-live \\\n"
@@ -337,12 +341,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:87
+#: en/user_customization-runtime.ssi:90
 msgid "2~persistence Persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:92
 msgid ""
 "A live cd paradigm is a pre-installed system which runs from read-only "
 "media, like a cdrom, where writes and modifications do not survive reboots "
@@ -350,7 +354,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:91
+#: en/user_customization-runtime.ssi:94
 msgid ""
 "A Debian Live system is a generalization of this paradigm and thus supports "
 "other media in addition to CDs; but still, in its default behaviour, it "
@@ -359,7 +363,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:96
 msgid ""
 "Persistence is a common name for different kinds of solutions for saving "
 "across reboots some, or all, of this run-time evolution of the system. To "
@@ -370,7 +374,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:95
+#: en/user_customization-runtime.ssi:98
 msgid ""
 "The data stored on this ramdisk should be saved on a writable persistent "
 "medium like a Hard Disk, a USB key, a network share or even a session of a "
@@ -380,12 +384,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:97
+#: en/user_customization-runtime.ssi:100
 msgid "3~ Full persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:99
+#: en/user_customization-runtime.ssi:102
 msgid ""
 "By 'full persistence' it is meant that instead of using a tmpfs for storing "
 "modifications to the read-only media (with the copy-on-write, COW, system) a "
@@ -397,31 +401,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:103
+#: en/user_customization-runtime.ssi:106
 #, no-wrap
 msgid " # mkfs.ext2 -L live-rw /dev/sdb1\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:107
+#: en/user_customization-runtime.ssi:110
 msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:109
+#: en/user_customization-runtime.ssi:112
 msgid ""
 "If you already have a partition on your device, you could just change the "
 "label with one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:113
+#: en/user_customization-runtime.ssi:116
 #, no-wrap
 msgid " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:117
+#: en/user_customization-runtime.ssi:120
 msgid ""
 "But since live system users cannot always use a hard drive partition, and "
 "considering that most USB keys have poor write speeds, 'full' persistence "
@@ -431,7 +435,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:125
 #, no-wrap
 msgid ""
 " $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
@@ -439,19 +443,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:129
 msgid ""
 "Then copy the #{live-rw}# file to a writable partition and reboot with the "
 "boot parameter 'persistent'."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:131
 msgid "3~ Home automounting"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:133
 msgid ""
 "If during the boot a partition (filesystem) image file or a partition "
 "labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
@@ -460,12 +464,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:135
 msgid "3~ Snapshots"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:134
+#: en/user_customization-runtime.ssi:137
 msgid ""
 "Snapshots are collections of files and directories which are not mounted "
 "while running but which are copied from a persistent device to the system "
@@ -482,26 +486,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:139
 msgid ""
 "A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
 "works the same as the main snapshot but it is only applied to /home."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:141
 msgid ""
 "Snapshots cannot currently handle file deletion but full persistence and "
 "home automounting can."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:140
+#: en/user_customization-runtime.ssi:143
 msgid "3~ Persistent SubText"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:142
+#: en/user_customization-runtime.ssi:145
 msgid ""
 "If a user would need multiple persistent storage of the same type for "
 "different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-"
@@ -513,12 +517,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:144
+#: en/user_customization-runtime.ssi:147
 msgid "3~ Partial remastering"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:145
+#: en/user_customization-runtime.ssi:148
 msgid ""
 "The run-time modification of the tmpfs could be collected using live-"
 "snapshot in a squashfs and added to the cd by remastering the iso in the "
diff --git a/manual/po/ro/user_customization-contents.ssi.po b/manual/po/ro/user_customization-contents.ssi.po
index 0fbba43..6d3543b 100644
--- a/manual/po/ro/user_customization-contents.ssi.po
+++ b/manual/po/ro/user_customization-contents.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-07 08:16-0400\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
 "PO-Revision-Date: 2010-10-23 16:43+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -57,11 +57,11 @@ msgstr ""
 #: 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: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-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
@@ -121,12 +121,12 @@ msgstr "code{"
 #: 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: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: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
@@ -348,12 +348,12 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-contents.ssi:80
 msgid ""
-"To run commands in the chroot stage, create a hook script containing the "
-"commands in the #{config/chroot_local-hooks}# directory. The hook will run "
-"in the chroot after the rest of your chroot configuration has been applied, "
-"so remember to ensure your configuration includes all packages and files "
-"your hook needs in order to run. See the example chroot hook scripts for "
-"various common chroot customization tasks provided in #{/usr/share/live/"
+"To run commands in the chroot stage, create a hook script with a #{.chroot}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run in the chroot after the rest of your chroot configuration has been "
+"applied, so remember to ensure your configuration includes all packages and "
+"files your hook needs in order to run. See the example chroot hook scripts "
+"for various common chroot customization tasks provided in #{/usr/share/live/"
 "build/examples/hooks}# which you can copy or symlink to use them in your own "
 "configuration."
 msgstr ""
@@ -383,14 +383,15 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-contents.ssi:88
 msgid ""
-"To run commands in the binary stage, create a hook script containing the "
-"commands in the #{config/binary_local-hooks}#. The hook will run after all "
-"other binary commands are run, but before binary_checksums, the very last "
-"binary commands The commands in your hook do not run in the chroot, so take "
-"care to not modify any files outside of the build tree, or you may damage "
-"your build system! See the example binary hook scripts for various common "
-"binary customization tasks provided in #{/usr/share/live/build/examples/"
-"hooks}# which you can copy or symlink to use them in your own configuration."
+"To run commands in the binary stage, create a hook script with a #{.binary}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run after all other binary commands are run, but before "
+"binary_checksums, the very last binary command. The commands in your hook do "
+"not run in the chroot, so take care to not modify any files outside of the "
+"build tree, or you may damage your build system! See the example binary hook "
+"scripts for various common binary customization tasks provided in #{/usr/"
+"share/live/build/examples/hooks}# which you can copy or symlink to use them "
+"in your own configuration."
 msgstr ""
 
 #. type: Plain text
@@ -401,9 +402,10 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-contents.ssi:92
 msgid ""
-"Files in the #{config/chroot_local-preseed}# directory are considered to be "
+"Files in the #{config/preseed/}# directory suffixed with #{.preseed}# "
+"followed by the stage (#{.chroot}# or #{.binary}#) are considered to be "
 "debconf preseed files and are installed by live-build using #{debconf-set-"
-"selections}#."
+"selections}# during the corresponding stage."
 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 da46412..7ab64d6 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: 2011-11-07 17:40-0400\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
 "PO-Revision-Date: 2010-10-22 08:58-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -57,11 +57,11 @@ msgstr ""
 #: 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: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-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
@@ -121,12 +121,12 @@ msgstr "code{"
 #: 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: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: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
@@ -744,7 +744,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:228
-msgid "_* #{chroot_local-packages}#"
+msgid "_* #{packages.chroot}#"
 msgstr ""
 
 #. type: Plain text
@@ -755,23 +755,23 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:232
 msgid ""
-"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
-"off\" customizations but has a number of drawbacks, whilst using a custom "
-"APT repository is more time-consuming to set up."
+"Using #{packages.chroot}# is simpler to achieve and useful for \"one-off\" "
+"customizations but has a number of drawbacks, whilst using a custom APT "
+"repository is more time-consuming to set up."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:234
-msgid "3~ Using #{chroot_local-packages}# to install custom packages"
+msgid "3~ Using #{packages.chroot}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:236
 msgid ""
-"To install a custom package, simply copy it to the #{config/chroot_local-"
-"packages/}# directory. Packages that are inside this directory will be "
-"automatically installed into the live system during build - you do not need "
-"to specify them elsewhere."
+"To install a custom package, simply copy it to the #{config/packages.chroot/}"
+"# directory. Packages that are inside this directory will be automatically "
+"installed into the live system during build - you do not need to specify "
+"them elsewhere."
 msgstr ""
 
 #. type: Plain text
@@ -784,7 +784,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:240
 msgid ""
-"Using #{chroot_local-packages}# for installation of custom packages has "
+"Using #{packages.chroot}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
@@ -796,8 +796,8 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:244
 msgid ""
-"_* You must install all appropriate packages in the #{config/chroot_local-"
-"packages/}# directory."
+"_* You must install all appropriate packages in the #{config/packages."
+"chroot/}# directory."
 msgstr ""
 
 #. type: Plain text
@@ -815,9 +815,9 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:250
 msgid ""
-"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
-"you must ensure that you specify the packages elsewhere. See {Choosing "
-"packages to install}#choosing-packages-to-install for details."
+"Unlike using #{packages.chroot}#, when using a custom APT repository you "
+"must ensure that you specify the packages elsewhere. See {Choosing packages "
+"to install}#choosing-packages-to-install for details."
 msgstr ""
 
 #. type: Plain text
@@ -864,7 +864,7 @@ msgid ""
 "You can configure APT through a number of options applied only at build "
 "time. (APT configuration used in the running live system may be configured "
 "in the normal way for live system contents, that is, by including the "
-"appropriate configurations through #{config/chroot_local_includes/}#.) For a "
+"appropriate configurations through #{config/includes.chroot/}#.) For a "
 "complete list, look for options starting with #{apt}# in the #{lb_config}# "
 "man page."
 msgstr ""
diff --git a/manual/po/ro/user_customization-runtime.ssi.po b/manual/po/ro/user_customization-runtime.ssi.po
index 50a7773..81415fc 100644
--- a/manual/po/ro/user_customization-runtime.ssi.po
+++ b/manual/po/ro/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-07 08:16-0400\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
 "PO-Revision-Date: 2010-11-30 11:40+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -57,11 +57,11 @@ msgstr ""
 #: 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: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-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
@@ -121,12 +121,12 @@ msgstr "code{"
 #: 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: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: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
@@ -186,18 +186,22 @@ msgstr ""
 msgid ""
 "You can specify additional groups that the live user will belong to by "
 "preseeding the #{passwd/user-default-groups}# debconf value. For example, to "
-"add the live user to the #{fuse}# group, add the following to a file in the #"
-"{config/chroot_local-preseed}# directory:"
+"add the live user to the #{fuse}# group, add the following preseed under #"
+"{config/preseed/}# for the chroot stage:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:16
+#: en/user_customization-runtime.ssi:19
 #, no-wrap
-msgid " user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse\n"
+msgid ""
+" $ lb config\n"
+" $ echo user-setup passwd/user-default-groups string audio cdrom \\\n"
+"   dip floppy video plugdev netdev powerdev scanner bluetooth fuse \\\n"
+"   >> config/preseed/my.preseed.chroot\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:20
+#: en/user_customization-runtime.ssi:23
 msgid ""
 "It is also possible to change the default username \"user\" and the default "
 "password \"live\". If you want to do that for any reason, you can easily "
@@ -205,18 +209,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:22
+#: en/user_customization-runtime.ssi:25
 msgid ""
 "To change the default username you can simply specify it in your config:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:26
+#: en/user_customization-runtime.ssi:29
 msgid "$ lb config --bootappend-live \"username=live-user\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:30
+#: en/user_customization-runtime.ssi:33
 msgid ""
 "One possible way of changing the default password is by means of a hook as "
 "described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
@@ -226,32 +230,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:32
+#: en/user_customization-runtime.ssi:35
 msgid "2~customizing-locale-and-language Customizing locale and language"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:34
+#: en/user_customization-runtime.ssi:37
 msgid "When the live system boots, language is involved in three steps:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:36
+#: en/user_customization-runtime.ssi:39
 msgid "_* the locale generation"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:38
+#: en/user_customization-runtime.ssi:41
 msgid "_* setting the keyboard layout for the console"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:40
+#: en/user_customization-runtime.ssi:43
 msgid "_* setting the keyboard layout for X"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:45
 msgid ""
 "The default locale when building a Live system is \"locales=en_US.UTF-8\". "
 "To define the locale that should be generated, use the #{locales}# parameter "
@@ -259,20 +263,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:46
+#: en/user_customization-runtime.ssi:49
 #, no-wrap
 msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:50
+#: en/user_customization-runtime.ssi:53
 msgid ""
 "This parameter can also be used at the kernel command line. You can specify "
 "a locale by a full #{language_country.encoding}# word."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:52
+#: en/user_customization-runtime.ssi:55
 msgid ""
 "Both the console and X keyboard configuration depend on the #{keyboard-"
 "layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
@@ -283,7 +287,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:57
+#: en/user_customization-runtime.ssi:60
 #, no-wrap
 msgid ""
 " $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
@@ -291,26 +295,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:61
+#: en/user_customization-runtime.ssi:64
 msgid ""
 "To get the locale files for German and Swiss German keyboard layout in X use:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:65
+#: en/user_customization-runtime.ssi:68
 #, no-wrap
 msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:69
+#: en/user_customization-runtime.ssi:72
 msgid ""
 "A list of the valid values of the keyboards for the console can be figured "
 "with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:74
+#: en/user_customization-runtime.ssi:77
 #, no-wrap
 msgid ""
 " $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
@@ -318,7 +322,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:78
+#: en/user_customization-runtime.ssi:81
 msgid ""
 "Alternatively, you can use the #{console-setup}# package, a tool to let you "
 "configure console layout using X (XKB) definitions; you can then set your "
@@ -330,7 +334,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:86
 #, no-wrap
 msgid ""
 " $ lb config --bootappend-live \\\n"
@@ -338,12 +342,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:87
+#: en/user_customization-runtime.ssi:90
 msgid "2~persistence Persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:92
 msgid ""
 "A live cd paradigm is a pre-installed system which runs from read-only "
 "media, like a cdrom, where writes and modifications do not survive reboots "
@@ -351,7 +355,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:91
+#: en/user_customization-runtime.ssi:94
 msgid ""
 "A Debian Live system is a generalization of this paradigm and thus supports "
 "other media in addition to CDs; but still, in its default behaviour, it "
@@ -360,7 +364,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:96
 msgid ""
 "Persistence is a common name for different kinds of solutions for saving "
 "across reboots some, or all, of this run-time evolution of the system. To "
@@ -371,7 +375,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:95
+#: en/user_customization-runtime.ssi:98
 msgid ""
 "The data stored on this ramdisk should be saved on a writable persistent "
 "medium like a Hard Disk, a USB key, a network share or even a session of a "
@@ -381,12 +385,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:97
+#: en/user_customization-runtime.ssi:100
 msgid "3~ Full persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:99
+#: en/user_customization-runtime.ssi:102
 msgid ""
 "By 'full persistence' it is meant that instead of using a tmpfs for storing "
 "modifications to the read-only media (with the copy-on-write, COW, system) a "
@@ -398,31 +402,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:103
+#: en/user_customization-runtime.ssi:106
 #, no-wrap
 msgid " # mkfs.ext2 -L live-rw /dev/sdb1\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:107
+#: en/user_customization-runtime.ssi:110
 msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:109
+#: en/user_customization-runtime.ssi:112
 msgid ""
 "If you already have a partition on your device, you could just change the "
 "label with one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:113
+#: en/user_customization-runtime.ssi:116
 #, no-wrap
 msgid " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:117
+#: en/user_customization-runtime.ssi:120
 msgid ""
 "But since live system users cannot always use a hard drive partition, and "
 "considering that most USB keys have poor write speeds, 'full' persistence "
@@ -432,7 +436,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:125
 #, no-wrap
 msgid ""
 " $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
@@ -440,19 +444,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:129
 msgid ""
 "Then copy the #{live-rw}# file to a writable partition and reboot with the "
 "boot parameter 'persistent'."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:131
 msgid "3~ Home automounting"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:133
 msgid ""
 "If during the boot a partition (filesystem) image file or a partition "
 "labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
@@ -461,12 +465,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:135
 msgid "3~ Snapshots"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:134
+#: en/user_customization-runtime.ssi:137
 msgid ""
 "Snapshots are collections of files and directories which are not mounted "
 "while running but which are copied from a persistent device to the system "
@@ -483,26 +487,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:139
 msgid ""
 "A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
 "works the same as the main snapshot but it is only applied to /home."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:141
 msgid ""
 "Snapshots cannot currently handle file deletion but full persistence and "
 "home automounting can."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:140
+#: en/user_customization-runtime.ssi:143
 msgid "3~ Persistent SubText"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:142
+#: en/user_customization-runtime.ssi:145
 msgid ""
 "If a user would need multiple persistent storage of the same type for "
 "different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-"
@@ -514,12 +518,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:144
+#: en/user_customization-runtime.ssi:147
 msgid "3~ Partial remastering"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:145
+#: en/user_customization-runtime.ssi:148
 msgid ""
 "The run-time modification of the tmpfs could be collected using live-"
 "snapshot in a squashfs and added to the cd by remastering the iso in the "
diff --git a/manual/pot/user_customization-contents.ssi.pot b/manual/pot/user_customization-contents.ssi.pot
index 50cedbc..d8950f0 100644
--- a/manual/pot/user_customization-contents.ssi.pot
+++ b/manual/pot/user_customization-contents.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-07 08:16-0400\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -56,11 +56,11 @@ msgstr ""
 #: 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: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-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
@@ -120,12 +120,12 @@ msgstr ""
 #: 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: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: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
@@ -347,12 +347,12 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-contents.ssi:80
 msgid ""
-"To run commands in the chroot stage, create a hook script containing the "
-"commands in the #{config/chroot_local-hooks}# directory. The hook will run "
-"in the chroot after the rest of your chroot configuration has been applied, "
-"so remember to ensure your configuration includes all packages and files "
-"your hook needs in order to run. See the example chroot hook scripts for "
-"various common chroot customization tasks provided in #{/usr/share/live/"
+"To run commands in the chroot stage, create a hook script with a #{.chroot}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run in the chroot after the rest of your chroot configuration has been "
+"applied, so remember to ensure your configuration includes all packages and "
+"files your hook needs in order to run. See the example chroot hook scripts "
+"for various common chroot customization tasks provided in #{/usr/share/live/"
 "build/examples/hooks}# which you can copy or symlink to use them in your own "
 "configuration."
 msgstr ""
@@ -382,14 +382,15 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-contents.ssi:88
 msgid ""
-"To run commands in the binary stage, create a hook script containing the "
-"commands in the #{config/binary_local-hooks}#. The hook will run after all "
-"other binary commands are run, but before binary_checksums, the very last "
-"binary commands The commands in your hook do not run in the chroot, so take "
-"care to not modify any files outside of the build tree, or you may damage "
-"your build system! See the example binary hook scripts for various common "
-"binary customization tasks provided in #{/usr/share/live/build/examples/"
-"hooks}# which you can copy or symlink to use them in your own configuration."
+"To run commands in the binary stage, create a hook script with a #{.binary}# "
+"suffix containing the commands in the #{config/hooks/}# directory. The hook "
+"will run after all other binary commands are run, but before "
+"binary_checksums, the very last binary command. The commands in your hook do "
+"not run in the chroot, so take care to not modify any files outside of the "
+"build tree, or you may damage your build system! See the example binary hook "
+"scripts for various common binary customization tasks provided in #{/usr/"
+"share/live/build/examples/hooks}# which you can copy or symlink to use them "
+"in your own configuration."
 msgstr ""
 
 #. type: Plain text
@@ -400,9 +401,10 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-contents.ssi:92
 msgid ""
-"Files in the #{config/chroot_local-preseed}# directory are considered to be "
+"Files in the #{config/preseed/}# directory suffixed with #{.preseed}# "
+"followed by the stage (#{.chroot}# or #{.binary}#) are considered to be "
 "debconf preseed files and are installed by live-build using #{debconf-set-"
-"selections}#."
+"selections}# during the corresponding stage."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index ce6c58f..eb25145 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: 2011-11-07 17:40-0400\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -56,11 +56,11 @@ msgstr ""
 #: 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: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-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
@@ -120,12 +120,12 @@ msgstr ""
 #: 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: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: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
@@ -743,7 +743,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:228
-msgid "_* #{chroot_local-packages}#"
+msgid "_* #{packages.chroot}#"
 msgstr ""
 
 #. type: Plain text
@@ -754,23 +754,23 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:232
 msgid ""
-"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
-"off\" customizations but has a number of drawbacks, whilst using a custom "
-"APT repository is more time-consuming to set up."
+"Using #{packages.chroot}# is simpler to achieve and useful for \"one-off\" "
+"customizations but has a number of drawbacks, whilst using a custom APT "
+"repository is more time-consuming to set up."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:234
-msgid "3~ Using #{chroot_local-packages}# to install custom packages"
+msgid "3~ Using #{packages.chroot}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:236
 msgid ""
-"To install a custom package, simply copy it to the #{config/chroot_local-"
-"packages/}# directory. Packages that are inside this directory will be "
-"automatically installed into the live system during build - you do not need "
-"to specify them elsewhere."
+"To install a custom package, simply copy it to the #{config/packages.chroot/}"
+"# directory. Packages that are inside this directory will be automatically "
+"installed into the live system during build - you do not need to specify "
+"them elsewhere."
 msgstr ""
 
 #. type: Plain text
@@ -783,7 +783,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:240
 msgid ""
-"Using #{chroot_local-packages}# for installation of custom packages has "
+"Using #{packages.chroot}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
@@ -795,8 +795,8 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:244
 msgid ""
-"_* You must install all appropriate packages in the #{config/chroot_local-"
-"packages/}# directory."
+"_* You must install all appropriate packages in the #{config/packages."
+"chroot/}# directory."
 msgstr ""
 
 #. type: Plain text
@@ -814,9 +814,9 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:250
 msgid ""
-"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
-"you must ensure that you specify the packages elsewhere. See {Choosing "
-"packages to install}#choosing-packages-to-install for details."
+"Unlike using #{packages.chroot}#, when using a custom APT repository you "
+"must ensure that you specify the packages elsewhere. See {Choosing packages "
+"to install}#choosing-packages-to-install for details."
 msgstr ""
 
 #. type: Plain text
@@ -863,7 +863,7 @@ msgid ""
 "You can configure APT through a number of options applied only at build "
 "time. (APT configuration used in the running live system may be configured "
 "in the normal way for live system contents, that is, by including the "
-"appropriate configurations through #{config/chroot_local_includes/}#.) For a "
+"appropriate configurations through #{config/includes.chroot/}#.) For a "
 "complete list, look for options starting with #{apt}# in the #{lb_config}# "
 "man page."
 msgstr ""
diff --git a/manual/pot/user_customization-runtime.ssi.pot b/manual/pot/user_customization-runtime.ssi.pot
index 26e0b76..a7c3c3e 100644
--- a/manual/pot/user_customization-runtime.ssi.pot
+++ b/manual/pot/user_customization-runtime.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-07 08:16-0400\n"
+"POT-Creation-Date: 2011-11-07 21:01-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -56,11 +56,11 @@ msgstr ""
 #: 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: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-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
@@ -120,12 +120,12 @@ msgstr ""
 #: 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: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: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
@@ -185,18 +185,22 @@ msgstr ""
 msgid ""
 "You can specify additional groups that the live user will belong to by "
 "preseeding the #{passwd/user-default-groups}# debconf value. For example, to "
-"add the live user to the #{fuse}# group, add the following to a file in the #"
-"{config/chroot_local-preseed}# directory:"
+"add the live user to the #{fuse}# group, add the following preseed under #"
+"{config/preseed/}# for the chroot stage:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:16
+#: en/user_customization-runtime.ssi:19
 #, no-wrap
-msgid " user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse\n"
+msgid ""
+" $ lb config\n"
+" $ echo user-setup passwd/user-default-groups string audio cdrom \\\n"
+"   dip floppy video plugdev netdev powerdev scanner bluetooth fuse \\\n"
+"   >> config/preseed/my.preseed.chroot\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:20
+#: en/user_customization-runtime.ssi:23
 msgid ""
 "It is also possible to change the default username \"user\" and the default "
 "password \"live\". If you want to do that for any reason, you can easily "
@@ -204,18 +208,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:22
+#: en/user_customization-runtime.ssi:25
 msgid ""
 "To change the default username you can simply specify it in your config:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:26
+#: en/user_customization-runtime.ssi:29
 msgid "$ lb config --bootappend-live \"username=live-user\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:30
+#: en/user_customization-runtime.ssi:33
 msgid ""
 "One possible way of changing the default password is by means of a hook as "
 "described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
@@ -225,32 +229,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:32
+#: en/user_customization-runtime.ssi:35
 msgid "2~customizing-locale-and-language Customizing locale and language"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:34
+#: en/user_customization-runtime.ssi:37
 msgid "When the live system boots, language is involved in three steps:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:36
+#: en/user_customization-runtime.ssi:39
 msgid "_* the locale generation"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:38
+#: en/user_customization-runtime.ssi:41
 msgid "_* setting the keyboard layout for the console"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:40
+#: en/user_customization-runtime.ssi:43
 msgid "_* setting the keyboard layout for X"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:45
 msgid ""
 "The default locale when building a Live system is \"locales=en_US.UTF-8\". "
 "To define the locale that should be generated, use the #{locales}# parameter "
@@ -258,20 +262,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:46
+#: en/user_customization-runtime.ssi:49
 #, no-wrap
 msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:50
+#: en/user_customization-runtime.ssi:53
 msgid ""
 "This parameter can also be used at the kernel command line. You can specify "
 "a locale by a full #{language_country.encoding}# word."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:52
+#: en/user_customization-runtime.ssi:55
 msgid ""
 "Both the console and X keyboard configuration depend on the #{keyboard-"
 "layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
@@ -282,7 +286,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:57
+#: en/user_customization-runtime.ssi:60
 #, no-wrap
 msgid ""
 " $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
@@ -290,26 +294,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:61
+#: en/user_customization-runtime.ssi:64
 msgid ""
 "To get the locale files for German and Swiss German keyboard layout in X use:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:65
+#: en/user_customization-runtime.ssi:68
 #, no-wrap
 msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:69
+#: en/user_customization-runtime.ssi:72
 msgid ""
 "A list of the valid values of the keyboards for the console can be figured "
 "with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:74
+#: en/user_customization-runtime.ssi:77
 #, no-wrap
 msgid ""
 " $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
@@ -317,7 +321,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:78
+#: en/user_customization-runtime.ssi:81
 msgid ""
 "Alternatively, you can use the #{console-setup}# package, a tool to let you "
 "configure console layout using X (XKB) definitions; you can then set your "
@@ -329,7 +333,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:86
 #, no-wrap
 msgid ""
 " $ lb config --bootappend-live \\\n"
@@ -337,12 +341,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:87
+#: en/user_customization-runtime.ssi:90
 msgid "2~persistence Persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:92
 msgid ""
 "A live cd paradigm is a pre-installed system which runs from read-only "
 "media, like a cdrom, where writes and modifications do not survive reboots "
@@ -350,7 +354,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:91
+#: en/user_customization-runtime.ssi:94
 msgid ""
 "A Debian Live system is a generalization of this paradigm and thus supports "
 "other media in addition to CDs; but still, in its default behaviour, it "
@@ -359,7 +363,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:96
 msgid ""
 "Persistence is a common name for different kinds of solutions for saving "
 "across reboots some, or all, of this run-time evolution of the system. To "
@@ -370,7 +374,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:95
+#: en/user_customization-runtime.ssi:98
 msgid ""
 "The data stored on this ramdisk should be saved on a writable persistent "
 "medium like a Hard Disk, a USB key, a network share or even a session of a "
@@ -380,12 +384,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:97
+#: en/user_customization-runtime.ssi:100
 msgid "3~ Full persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:99
+#: en/user_customization-runtime.ssi:102
 msgid ""
 "By 'full persistence' it is meant that instead of using a tmpfs for storing "
 "modifications to the read-only media (with the copy-on-write, COW, system) a "
@@ -397,31 +401,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:103
+#: en/user_customization-runtime.ssi:106
 #, no-wrap
 msgid " # mkfs.ext2 -L live-rw /dev/sdb1\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:107
+#: en/user_customization-runtime.ssi:110
 msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:109
+#: en/user_customization-runtime.ssi:112
 msgid ""
 "If you already have a partition on your device, you could just change the "
 "label with one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:113
+#: en/user_customization-runtime.ssi:116
 #, no-wrap
 msgid " # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:117
+#: en/user_customization-runtime.ssi:120
 msgid ""
 "But since live system users cannot always use a hard drive partition, and "
 "considering that most USB keys have poor write speeds, 'full' persistence "
@@ -431,7 +435,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:125
 #, no-wrap
 msgid ""
 " $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
@@ -439,19 +443,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:129
 msgid ""
 "Then copy the #{live-rw}# file to a writable partition and reboot with the "
 "boot parameter 'persistent'."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:131
 msgid "3~ Home automounting"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:133
 msgid ""
 "If during the boot a partition (filesystem) image file or a partition "
 "labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
@@ -460,12 +464,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:135
 msgid "3~ Snapshots"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:134
+#: en/user_customization-runtime.ssi:137
 msgid ""
 "Snapshots are collections of files and directories which are not mounted "
 "while running but which are copied from a persistent device to the system "
@@ -482,26 +486,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:139
 msgid ""
 "A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
 "works the same as the main snapshot but it is only applied to /home."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:138
+#: en/user_customization-runtime.ssi:141
 msgid ""
 "Snapshots cannot currently handle file deletion but full persistence and "
 "home automounting can."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:140
+#: en/user_customization-runtime.ssi:143
 msgid "3~ Persistent SubText"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:142
+#: en/user_customization-runtime.ssi:145
 msgid ""
 "If a user would need multiple persistent storage of the same type for "
 "different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-"
@@ -513,12 +517,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:144
+#: en/user_customization-runtime.ssi:147
 msgid "3~ Partial remastering"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:145
+#: en/user_customization-runtime.ssi:148
 msgid ""
 "The run-time modification of the tmpfs could be collected using live-"
 "snapshot in a squashfs and added to the cd by remastering the iso in the "
diff --git a/manual/pt_BR/user_customization-contents.ssi b/manual/pt_BR/user_customization-contents.ssi
index e7d92bd..5759093 100644
--- a/manual/pt_BR/user_customization-contents.ssi
+++ b/manual/pt_BR/user_customization-contents.ssi
@@ -112,12 +112,12 @@ build in order to customize the image.
 
 3~live-chroot-local-hooks Live/chroot local hooks
 
-To run commands in the chroot stage, create a hook script containing the
-commands in the #{config/chroot_local-hooks}# directory. The hook will run
-in the chroot after the rest of your chroot configuration has been applied,
-so remember to ensure your configuration includes all packages and files
-your hook needs in order to run. See the example chroot hook scripts for
-various common chroot customization tasks provided in
+To run commands in the chroot stage, create a hook script with a #{.chroot}#
+suffix containing the commands in the #{config/hooks/}# directory. The hook
+will run in the chroot after the rest of your chroot configuration has been
+applied, so remember to ensure your configuration includes all packages and
+files your hook needs in order to run. See the example chroot hook scripts
+for various common chroot customization tasks provided in
 #{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
 use them in your own configuration.
 
@@ -134,21 +134,22 @@ packages}#installing-modified-or-third-party-packages.
 
 3~ Binary local hooks
 
-To run commands in the binary stage, create a hook script containing the
-commands in the #{config/binary_local-hooks}#. The hook will run after all
-other binary commands are run, but before binary_checksums, the very last
-binary commands The commands in your hook do not run in the chroot, so take
-care to not modify any files outside of the build tree, or you may damage
-your build system! See the example binary hook scripts for various common
-binary customization tasks provided in
+To run commands in the binary stage, create a hook script with a #{.binary}#
+suffix containing the commands in the #{config/hooks/}# directory. The hook
+will run after all other binary commands are run, but before
+binary_checksums, the very last binary command. The commands in your hook do
+not run in the chroot, so take care to not modify any files outside of the
+build tree, or you may damage your build system! See the example binary hook
+scripts for various common binary customization tasks provided in
 #{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
 use them in your own configuration.
 
 2~ Preseeding Debconf questions
 
-Files in the #{config/chroot_local-preseed}# directory are considered to be
+Files in the #{config/preseed/}# directory suffixed with #{.preseed}#
+followed by the stage (#{.chroot}# or #{.binary}#) are considered to be
 debconf preseed files and are installed by live-build using
-#{debconf-set-selections}#.
+#{debconf-set-selections}# during the corresponding stage.
 
 For more information about debconf, please see debconf(7) in the #{debconf}#
 package.
diff --git a/manual/pt_BR/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
index ac1e1d4..75d3198 100644
--- a/manual/pt_BR/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -364,40 +364,40 @@ and elsewhere.
 
 There are two ways of installing modified custom packages:
 
-_* #{chroot_local-packages}#
+_* #{packages.chroot}#
 
 _* Using a custom APT repository
 
-Using #{chroot_local-packages}# is simpler to achieve and useful for
-"one-off" customizations but has a number of drawbacks, whilst using a
-custom APT repository is more time-consuming to set up.
+Using #{packages.chroot}# is simpler to achieve and useful for "one-off"
+customizations but has a number of drawbacks, whilst using a custom APT
+repository is more time-consuming to set up.
 
-3~ Using #{chroot_local-packages}# to install custom packages
+3~ Using #{packages.chroot}# to install custom packages
 
 To install a custom package, simply copy it to the
-#{config/chroot_local-packages/}# directory. Packages that are inside this
+#{config/packages.chroot/}# directory. Packages that are inside this
 directory will be automatically installed into the live system during build
 - you do not need to specify them elsewhere.
 
 Packages *{must}* be named in the prescribed way. One simple way to do this
 is to use #{dpkg-name}#.
 
-Using #{chroot_local-packages}# for installation of custom packages has
+Using #{packages.chroot}# for installation of custom packages has
 disadvantages:
 
 _* It is not possible to use secure APT.
 
 _* You must install all appropriate packages in the
-#{config/chroot_local-packages/}# directory.
+#{config/packages.chroot/}# directory.
 
 _* It does not lend itself to storing Debian Live configurations in revision
 control.
 
 3~ Using an APT repository to install custom packages
 
-Unlike using #{chroot_local-packages}#, when using a custom APT repository
-you must ensure that you specify the packages elsewhere. See {Choosing
-packages to install}#choosing-packages-to-install for details.
+Unlike using #{packages.chroot}#, when using a custom APT repository you
+must ensure that you specify the packages elsewhere. See {Choosing packages
+to install}#choosing-packages-to-install for details.
 
 Whilst it may seem unnecessary effort to create an APT repository to install
 custom packages, the infrastructure can be easily re-used at a later date to
@@ -422,7 +422,7 @@ pinning}#apt-pinning for more information.
 You can configure APT through a number of options applied only at build
 time. (APT configuration used in the running live system may be configured
 in the normal way for live system contents, that is, by including the
-appropriate configurations through #{config/chroot_local_includes/}#.) For a
+appropriate configurations through #{config/includes.chroot/}#.) For a
 complete list, look for options starting with #{apt}# in the #{lb_config}#
 man page.
 
diff --git a/manual/pt_BR/user_customization-runtime.ssi b/manual/pt_BR/user_customization-runtime.ssi
index 97dccb6..610fdb1 100644
--- a/manual/pt_BR/user_customization-runtime.ssi
+++ b/manual/pt_BR/user_customization-runtime.ssi
@@ -17,12 +17,15 @@ also any groups and permissions associated with the live user.
 
 You can specify additional groups that the live user will belong to by
 preseeding the #{passwd/user-default-groups}# debconf value. For example, to
-add the live user to the #{fuse}# group, add the following to a file in the
-#{config/chroot_local-preseed}# directory:
+add the live user to the #{fuse}# group, add the following preseed under
+#{config/preseed/}# for the chroot stage:
 
 code{
 
- user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse
+ $ lb config
+ $ echo user-setup passwd/user-default-groups string audio cdrom \
+   dip floppy video plugdev netdev powerdev scanner bluetooth fuse \
+   >> config/preseed/my.preseed.chroot
 
 }code
 
diff --git a/manual/ro/user_customization-contents.ssi b/manual/ro/user_customization-contents.ssi
index e7d92bd..5759093 100644
--- a/manual/ro/user_customization-contents.ssi
+++ b/manual/ro/user_customization-contents.ssi
@@ -112,12 +112,12 @@ build in order to customize the image.
 
 3~live-chroot-local-hooks Live/chroot local hooks
 
-To run commands in the chroot stage, create a hook script containing the
-commands in the #{config/chroot_local-hooks}# directory. The hook will run
-in the chroot after the rest of your chroot configuration has been applied,
-so remember to ensure your configuration includes all packages and files
-your hook needs in order to run. See the example chroot hook scripts for
-various common chroot customization tasks provided in
+To run commands in the chroot stage, create a hook script with a #{.chroot}#
+suffix containing the commands in the #{config/hooks/}# directory. The hook
+will run in the chroot after the rest of your chroot configuration has been
+applied, so remember to ensure your configuration includes all packages and
+files your hook needs in order to run. See the example chroot hook scripts
+for various common chroot customization tasks provided in
 #{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
 use them in your own configuration.
 
@@ -134,21 +134,22 @@ packages}#installing-modified-or-third-party-packages.
 
 3~ Binary local hooks
 
-To run commands in the binary stage, create a hook script containing the
-commands in the #{config/binary_local-hooks}#. The hook will run after all
-other binary commands are run, but before binary_checksums, the very last
-binary commands The commands in your hook do not run in the chroot, so take
-care to not modify any files outside of the build tree, or you may damage
-your build system! See the example binary hook scripts for various common
-binary customization tasks provided in
+To run commands in the binary stage, create a hook script with a #{.binary}#
+suffix containing the commands in the #{config/hooks/}# directory. The hook
+will run after all other binary commands are run, but before
+binary_checksums, the very last binary command. The commands in your hook do
+not run in the chroot, so take care to not modify any files outside of the
+build tree, or you may damage your build system! See the example binary hook
+scripts for various common binary customization tasks provided in
 #{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
 use them in your own configuration.
 
 2~ Preseeding Debconf questions
 
-Files in the #{config/chroot_local-preseed}# directory are considered to be
+Files in the #{config/preseed/}# directory suffixed with #{.preseed}#
+followed by the stage (#{.chroot}# or #{.binary}#) are considered to be
 debconf preseed files and are installed by live-build using
-#{debconf-set-selections}#.
+#{debconf-set-selections}# during the corresponding stage.
 
 For more information about debconf, please see debconf(7) in the #{debconf}#
 package.
diff --git a/manual/ro/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
index ac1e1d4..75d3198 100644
--- a/manual/ro/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -364,40 +364,40 @@ and elsewhere.
 
 There are two ways of installing modified custom packages:
 
-_* #{chroot_local-packages}#
+_* #{packages.chroot}#
 
 _* Using a custom APT repository
 
-Using #{chroot_local-packages}# is simpler to achieve and useful for
-"one-off" customizations but has a number of drawbacks, whilst using a
-custom APT repository is more time-consuming to set up.
+Using #{packages.chroot}# is simpler to achieve and useful for "one-off"
+customizations but has a number of drawbacks, whilst using a custom APT
+repository is more time-consuming to set up.
 
-3~ Using #{chroot_local-packages}# to install custom packages
+3~ Using #{packages.chroot}# to install custom packages
 
 To install a custom package, simply copy it to the
-#{config/chroot_local-packages/}# directory. Packages that are inside this
+#{config/packages.chroot/}# directory. Packages that are inside this
 directory will be automatically installed into the live system during build
 - you do not need to specify them elsewhere.
 
 Packages *{must}* be named in the prescribed way. One simple way to do this
 is to use #{dpkg-name}#.
 
-Using #{chroot_local-packages}# for installation of custom packages has
+Using #{packages.chroot}# for installation of custom packages has
 disadvantages:
 
 _* It is not possible to use secure APT.
 
 _* You must install all appropriate packages in the
-#{config/chroot_local-packages/}# directory.
+#{config/packages.chroot/}# directory.
 
 _* It does not lend itself to storing Debian Live configurations in revision
 control.
 
 3~ Using an APT repository to install custom packages
 
-Unlike using #{chroot_local-packages}#, when using a custom APT repository
-you must ensure that you specify the packages elsewhere. See {Choosing
-packages to install}#choosing-packages-to-install for details.
+Unlike using #{packages.chroot}#, when using a custom APT repository you
+must ensure that you specify the packages elsewhere. See {Choosing packages
+to install}#choosing-packages-to-install for details.
 
 Whilst it may seem unnecessary effort to create an APT repository to install
 custom packages, the infrastructure can be easily re-used at a later date to
@@ -422,7 +422,7 @@ pinning}#apt-pinning for more information.
 You can configure APT through a number of options applied only at build
 time. (APT configuration used in the running live system may be configured
 in the normal way for live system contents, that is, by including the
-appropriate configurations through #{config/chroot_local_includes/}#.) For a
+appropriate configurations through #{config/includes.chroot/}#.) For a
 complete list, look for options starting with #{apt}# in the #{lb_config}#
 man page.
 
diff --git a/manual/ro/user_customization-runtime.ssi b/manual/ro/user_customization-runtime.ssi
index 97dccb6..610fdb1 100644
--- a/manual/ro/user_customization-runtime.ssi
+++ b/manual/ro/user_customization-runtime.ssi
@@ -17,12 +17,15 @@ also any groups and permissions associated with the live user.
 
 You can specify additional groups that the live user will belong to by
 preseeding the #{passwd/user-default-groups}# debconf value. For example, to
-add the live user to the #{fuse}# group, add the following to a file in the
-#{config/chroot_local-preseed}# directory:
+add the live user to the #{fuse}# group, add the following preseed under
+#{config/preseed/}# for the chroot stage:
 
 code{
 
- user-setup passwd/user-default-groups string audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth fuse
+ $ lb config
+ $ echo user-setup passwd/user-default-groups string audio cdrom \
+   dip floppy video plugdev netdev powerdev scanner bluetooth fuse \
+   >> config/preseed/my.preseed.chroot
 
 }code
 

-- 
live-manual



More information about the debian-live-changes mailing list