[SCM] live-manual branch, debian-next, updated. debian/3.0_a11-1-35-g4423e47

chals chals at altorricon.com
Sat Apr 14 15:29:33 UTC 2012


The following commit has been merged in the debian-next branch:
commit 4423e476274a7b28dd675abf35fa1b8986bd5754
Author: chals <chals at altorricon.com>
Date:   Sat Apr 14 17:29:18 2012 +0200

    Updating markup of packages in the translations.

diff --git a/manual/de/about_manual.ssi b/manual/de/about_manual.ssi
index c893f53..c3776e1 100644
--- a/manual/de/about_manual.ssi
+++ b/manual/de/about_manual.ssi
@@ -69,7 +69,7 @@ _* *{Host system}*: The environment used to create the live system.
 _* *{Target system}*: The environment used to run the live system.
 
 _* *{live-boot}*: A collection of scripts used to boot live
-systems. live-boot was formerly a part of live-initramfs.
+systems. live-boot was formerly a part of /{live-initramfs}/.
 
 _* *{live-build}*: A collection of scripts used to build customized Debian
 Live systems. live-build was formerly known as /{live-helper}/, and even
@@ -289,9 +289,9 @@ To submit a translation for a new language, follow these three steps:
 
 _* Translate the about_manual.ssi.pot, about_project.ssi.pot and
 index.html.in.pot files to your language with your favourite editor (such as
-poedit). Send translated files to the mailing list. Once we have reviewed
-your submission, we will add the new language to the manual (providing the
-po files) and will enable it in the autobuild.
+/{poedit}/). Send translated files to the mailing list. Once we have
+reviewed your submission, we will add the new language to the manual
+(providing the po files) and will enable it in the autobuild.
 
 _* Once the new language is added, you can randomly start translating all po
 files in #{manual/po/}#.
diff --git a/manual/de/user_basics.ssi b/manual/de/user_basics.ssi
index c88fb2c..0726c1b 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/de/user_basics.ssi
@@ -146,8 +146,8 @@ normal boot device.
 Once you've booted the media, you are presented with a boot menu. If you
 just press enter here, the system will boot using the default entry,
 #{Live}# and default options. For more information about boot options, see
-the "help" entry in the menu and also the #{live-boot}# and #{live-config}#
-man pages found within the live system.
+the "help" entry in the menu and also the live-boot and live-config man
+pages found within the live system.
 
 Assuming you've selected #{Live}# and booted a default desktop live image,
 after the boot messages scroll by, you should be automatically logged into
@@ -179,12 +179,12 @@ software and choose one that is suitable for your needs.
 3~testing-iso-with-qemu Testing an ISO image with QEMU
 
 The most versatile VM in Debian is QEMU. If your processor has hardware
-support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}#
+support for virtualization, use the /{qemu-kvm}/ package; the /{qemu-kvm}/
 package description briefly lists the requirements.
 
-First, install #{qemu-kvm}# if your processor supports it. If not, install
-#{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in
-the following examples. The #{qemu-utils}# package is also valuable for
+First, install /{qemu-kvm}/ if your processor supports it. If not, install
+/{qemu}/, in which case the program name is #{qemu}# instead of #{kvm}# in
+the following examples. The /{qemu-utils}/ package is also valuable for
 creating virtual disk images with #{qemu-img}#.
 
 code{
@@ -275,7 +275,7 @@ filename #{binary.img}# instead of #{binary-hybrid.iso}#.
 
 3~testing-hdd-with-qemu Testing an HDD image with Qemu
 
-First, install QEMU as described above in {Testing an ISO image with
+First, install /{qemu}/ as described above in {Testing an ISO image with
 QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on
 which version your host system needs, specifying #{binary.img}# as the first
 hard drive.
@@ -289,7 +289,7 @@ code{
 3~using-usb-extra-space Using the space left on a USB stick
 
 To use the remaining free space after copying #{binary.img}# to a USB stick,
-use a partitioning tool such as #{gparted}# or #{parted}# to create a new
+use a partitioning tool such as /{gparted}/ or /{parted}/ to create a new
 partition on the stick. The first partition will be used by the Debian Live
 system.
 
@@ -419,7 +419,7 @@ Once the guest computer has downloaded and booted a Linux kernel and loaded
 its initrd, it will try to mount the Live filesystem image through a NFS
 server.
 
-You need to install the #{nfs-kernel-server}# package.
+You need to install the /{nfs-kernel-server}/ package.
 
 Then, make the filesystem image available through NFS by adding a line like
 the following to #{/etc/exports}#:
@@ -454,7 +454,7 @@ To make our life easier, we can use virtualization. There are two solutions.
 
 3~ Qemu
 
-_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#.
+_* Install /{qemu}/, /{bridge-utils}/, /{sudo}/.
 
 Edit #{/etc/qemu-ifup}#:
 
diff --git a/manual/de/user_customization-contents.ssi b/manual/de/user_customization-contents.ssi
index 4d67a3c..e6237cf 100644
--- a/manual/de/user_customization-contents.ssi
+++ b/manual/de/user_customization-contents.ssi
@@ -43,7 +43,7 @@ see {Live/chroot local hooks}#live-chroot-local-hooks if processing is
 needed.
 
 To include files, simply add them to your #{config/includes.chroot}#
-directory. This directory corresponds to the root directory (#{/}#) of the
+directory. This directory corresponds to the root directory #{/}# of the
 live system. For example, to add a file #{/var/www/index.html}# in the live
 system, use:
 
@@ -151,5 +151,5 @@ 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.
 
-For more information about debconf, please see debconf(7) in the #{debconf}#
-package.
+For more information about debconf, please see #{debconf(7)}# in the
+/{debconf}/ package.
diff --git a/manual/de/user_customization-overview.ssi b/manual/de/user_customization-overview.ssi
index 137e322..0e2fec2 100644
--- a/manual/de/user_customization-overview.ssi
+++ b/manual/de/user_customization-overview.ssi
@@ -55,7 +55,7 @@ in place.
 
 2~ Supplement lb config with files
 
-Although #{lb config}# does create a skeletal configuration in the config/
+Although #{lb config}# creates a skeletal configuration in the config/
 directory, to accomplish your goals, you may need to provide additional
 files in subdirectories of config/. Depending on where the files are stored
 in the configuration, they may be copied into the live system's filesystem
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index 89ab2f6..1145a94 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -11,12 +11,12 @@ areas. To ensure decent download speeds, you should choose a nearby
 distribution mirror. You can also add your own repositories for backports,
 experimental or custom packages, or include packages directly as files. You
 can define your own lists of packages to include, use live-build's
-predefined lists, use #{tasksel}# tasks, or a combination of all
-three. Finally, a number of options give some control over apt, or if you
-prefer, aptitude, at build time when packages are installed. You may find
-these handy if you use a proxy, want to disable installation of recommended
-packages to save space, or need to control which versions of packages are
-installed via APT pinning, to name a few possibilities.
+predefined lists, use /{tasksel}/ tasks, or a combination of all
+three. Finally, a number of options give some control over /{apt}/, or if
+you prefer, /{aptitude}/, at build time when packages are installed. You may
+find these handy if you use a proxy, want to disable installation of
+recommended packages to save space, or need to control which versions of
+packages are installed via APT pinning, to name a few possibilities.
 
 2~ Package sources
 
@@ -24,7 +24,7 @@ installed via APT pinning, to name a few possibilities.
 
 The distribution you choose has the broadest impact on which packages are
 available to include in your live image. Specify the codename, which
-defaults to #{wheezy}# for the wheezy version of live-build. Any current
+defaults to wheezy for the wheezy version of live-build. Any current
 distribution carried in the Debian archive may be specified by its codename
 here. (See {Terms}#terms for more details.) The #{--distribution}# option
 not only influences the source of packages within the archive, but also
@@ -209,8 +209,8 @@ includes. Refer to these in the #{/usr/share/live/build/package-lists/}#
 directory, as they serve as good examples of how to write your own lists.
 
 For example, to make a list that includes the predefined #{gnome}# list plus
-iceweasel, create #{config/package-lists/my.list.chroot}# with the following
-contents:
+/{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the
+following contents:
 
 code{
 
@@ -240,7 +240,7 @@ code{
 }code
 
 You may test for any one of a number of values, e.g. to install
-#{memtest86+}# if either #{--architectures i386}# or #{--architectures
+/{memtest86+}/ if either #{--architectures i386}# or #{--architectures
 amd64}# is specified:
 
 code{
@@ -427,7 +427,7 @@ man page.
 
 3~choosing-apt-or-aptitude Choosing apt or aptitude
 
-You can elect to use either #{apt}# or #{aptitude}# when installing packages
+You can elect to use either /{apt}/ or /{aptitude}/ when installing packages
 at build time. Which utility is used is governed by the #{--apt}# argument
 to #{lb config}#. Choose the method implementing the preferred behaviour for
 package installation, the notable difference being how missing packages are
@@ -541,9 +541,9 @@ Negative pin priorities will prevent a package from being installed, as in
 the case where you do not want a package that is recommended by another
 package. Suppose you are building an LXDE image using #{--package-lists
 lxde}# option, but don't want the user prompted to store wifi passwords in
-the keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in
-turn recommends #{gnome-keyring}#. So you want to omit the recommended
-#{gnome-keyring}# package. This can be done by adding the following stanza
+the keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in
+turn recommends /{gnome-keyring}/. So you want to omit the recommended
+/{gnome-keyring}/ package. This can be done by adding the following stanza
 to #{config/chroot_apt/preferences}#:
 
 code{
diff --git a/manual/de/user_examples.ssi b/manual/de/user_examples.ssi
index b155f23..51b0f83 100644
--- a/manual/de/user_examples.ssi
+++ b/manual/de/user_examples.ssi
@@ -149,9 +149,9 @@ code{
 First, #{--architectures i386}# ensures that on our #{amd64}# build system,
 we build a 32-bit version suitable for use on most machines. Second, we use
 #{--linux-flavours 686-pae}# because we don't anticipate using this image on
-much older systems. Third, we've chosen the #{lxde}# package list to give us
+much older systems. Third, we've chosen the /{lxde}/ package list to give us
 a minimal desktop. And finally, we have added two initial favourite
-packages: #{iceweasel}# and #{xchat}#.
+packages: /{iceweasel}/ and /{xchat}/.
 
 Now, build the image:
 
diff --git a/manual/de/user_managing_a_configuration.ssi b/manual/de/user_managing_a_configuration.ssi
index 7df1d34..8f6089a 100644
--- a/manual/de/user_managing_a_configuration.ssi
+++ b/manual/de/user_managing_a_configuration.ssi
@@ -34,7 +34,7 @@ options, and an auto/clean that removes the files containing configuration
 variable values, and each time you run #{lb config}# and #{lb clean}#, these
 files will be executed. This will ensure that your configuration is kept
 internally consistent from one revision to the next and from one live-build
-release to the next (though you will still have to take care and read the
+release to the next (Although you will still have to take care and read the
 documentation when you upgrade live-build and make adjustments as needed).
 
 2~ Example auto scripts
diff --git a/manual/de/user_overview.ssi b/manual/de/user_overview.ssi
index 100ca04..c0e59b5 100644
--- a/manual/de/user_overview.ssi
+++ b/manual/de/user_overview.ssi
@@ -29,7 +29,7 @@ each command.
 
 Unlike /{debhelper}/, live-build contains a tool to generate a skeleton
 configuration directory, #{lb config}#. This could be considered to be
-similar to tools such as #{dh-make}#. For more information about #{lb
+similar to tools such as /{dh-make}/. For more information about #{lb
 config}#, please see {The lb config command}#lb-config.
 
 The remainder of this section discusses the three most important commands:
diff --git a/manual/en/user_basics.ssi b/manual/en/user_basics.ssi
index f3d39c5..0fa0944 100644
--- a/manual/en/user_basics.ssi
+++ b/manual/en/user_basics.ssi
@@ -102,7 +102,7 @@ Provided you can work within these constraints, survey the available VM software
 
 The most versatile VM in Debian is QEMU. If your processor has hardware support for virtualization, use the /{qemu-kvm}/ package; the /{qemu-kvm}/ package description briefly lists the requirements.
 
-First, install /{qemu-kvm}/ if your processor supports it. If not, install /{qemu}/, in which case the program name is /{qemu}/ instead of #{kvm}# in the following examples. The /{qemu-utils}/ package is also valuable for creating virtual disk images with #{qemu-img}#.
+First, install /{qemu-kvm}/ if your processor supports it. If not, install /{qemu}/, in which case the program name is #{qemu}# instead of #{kvm}# in the following examples. The /{qemu-utils}/ package is also valuable for creating virtual disk images with #{qemu-img}#.
 
 code{
 
@@ -178,7 +178,7 @@ The generated binary image contains a VFAT partition and the syslinux bootloader
 
 3~testing-hdd-with-qemu Testing an HDD image with Qemu
 
-First, install QEMU as described above in {Testing an ISO image with QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on which version your host system needs, specifying #{binary.img}# as the first hard drive.
+First, install /{qemu}/ as described above in {Testing an ISO image with QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on which version your host system needs, specifying #{binary.img}# as the first hard drive.
 
 code{
 
diff --git a/manual/es/about_manual.ssi b/manual/es/about_manual.ssi
index 02fe568..5d6a851 100644
--- a/manual/es/about_manual.ssi
+++ b/manual/es/about_manual.ssi
@@ -79,7 +79,7 @@ ejecutará el sistema en vivo.
 
 _* *{live-boot}*: Es una colección de scripts que serán responsables de
 arrancar el sistema en vivo. live-boot fue anteriormente una parte del
-paquete live-initramfs.
+paquete /{live-initramfs}/.
 
 _* *{live-build}*: Es una colección de scripts utilizados para construir
 sistemas Debian Live personalizados. live-build fue conocido anteriormente
@@ -319,9 +319,9 @@ siguientes pasos:
 
 _* Traducir los ficheros about_manual.ssi.pot, about_project.ssi.pot e
 index.html.in.pot al idioma deseado con cualquier editor (como puede ser
-poedit) y enviarlos a la lista de correos. Una vez hayan sido revisados, el
-idioma será añadido al manual, (añadiendo los ficheros .po) y se activará en
-el autobuild.
+/{poedit}/) y enviarlos a la lista de correos. Una vez hayan sido revisados,
+el idioma será añadido al manual, (añadiendo los ficheros .po) y se activará
+en el autobuild.
 
 _* Una vez que el nuevo idioma haya sido añadido, se puede comenzar la
 traducción de todos los ficheros .po exisitentes en #{manual/po/}# de manera
diff --git a/manual/es/user_basics.ssi b/manual/es/user_basics.ssi
index 8825e04..c584819 100644
--- a/manual/es/user_basics.ssi
+++ b/manual/es/user_basics.ssi
@@ -161,7 +161,7 @@ se accede a un menú de arranque. Si se pulsa la tecla «enter»,  el sistema
 arrancará usando el modo por defecto #{Live}# y las opciones
 predeterminadas. Para obtener más información acerca de las opciones de
 arranque, ver la opción  «help» del menú y también las páginas del manual de
-#{live-boot}# y #{live-config}# que se encuentran en el sistema en vivo.
+live-boot y live-config que se encuentran en el sistema en vivo.
 
 Suponiendo que se ha seleccionado #{Live}# y arrancado una imagen en vivo
 por defecto con escritorio gráfico, después de que los mensajes de arranque
@@ -199,13 +199,13 @@ necesidades.
 3~testing-iso-with-qemu Probar una imagen ISO con QEMU
 
 La máquina virtual más versátil en Debian es QEMU. Si el procesador tiene
-soporte de hardware para virtualización, utilizar el paquete #{qemu-kvm}# en
-la descripción del paquete #{qemu-kvm}# se enumera brevemente la lista de
+soporte de hardware para virtualización, utilizar el paquete /{qemu-kvm}/ en
+la descripción del paquete /{qemu-kvm}/ se enumera brevemente la lista de
 requisitos.
 
 En primer lugar, instalar #{qemu-kvm}# si el procesador lo soporta. Si no es
 así, instalar #{qemu}#, en cuyo caso el nombre del programa será #{qemu}# en
-vez de #{kvm}# en los siguientes ejemplos. El paquete #{qemu-utils}# también
+vez de #{kvm}# en los siguientes ejemplos. El paquete /{qemu-utils}/ también
 es útil para la creación de imágenes virtuales de disco con #{qemu-img}#.
 
 code{
@@ -297,10 +297,10 @@ en lugar de #{binary-hybrid.iso}#.
 
 3~testing-hdd-with-qemu Probar una imágen HDD con Qemu
 
-En primer lugar, instalar QEMU como se describe más arriba en {Probar una
-imágen ISO con QEMU}#testing-iso-with-qemu A continuación, ejecutar #{kvm}#
-o #{qemu}#, según qué versión necesita el sistema anfitrión y especificando
-#{binary.img}# como primer disco duro.
+En primer lugar, instalar /{qemu}/ como se describe más arriba en {Probar
+una imágen ISO con QEMU}#testing-iso-with-qemu A continuación, ejecutar
+#{kvm}# o #{qemu}#, según qué versión necesita el sistema anfitrión y
+especificando #{binary.img}# como primer disco duro.
 
 code{
 
@@ -312,7 +312,7 @@ code{
 
 Si se desea usar el espacio libre después de haber instalado la imagen
 #{binary.img}# en una llave USB, se puede usar un programa de particionado
-como #{gparted}# o #{parted}# para crear una partición nueva en el
+como /{gparted}/ o /{parted}/ para crear una partición nueva en el
 dispositivo. La primera partición será usada por el sistema Debian en vivo.
 
 code{
@@ -444,7 +444,7 @@ Una vez el equipo cliente ha descargado y arrancado el kernel de Linux junto
 a su initrd, intentará montar el sistema de archivos de la imagen en vivo a
 través de un servidor NFS.
 
-Se debe instalar el paquete #{nfs-kernel-server}#.
+Se debe instalar el paquete /{nfs-kernel-server}/.
 
 Entonces, se debe hacer que la imagen del sistema de archivos esté
 disponible a través de NFS añadiendo una línea como la siguiente para
@@ -484,7 +484,7 @@ dos soluciones.
 
 3~ Qemu
 
-_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#.
+_* Instalar /{qemu}/, /{bridge-utils}/, /{sudo}/.
 
 Se debe editar el fichero #{/etc/qemu-ifup}#:
 
diff --git a/manual/es/user_customization-contents.ssi b/manual/es/user_customization-contents.ssi
index 2fb96fa..85f5320 100644
--- a/manual/es/user_customization-contents.ssi
+++ b/manual/es/user_customization-contents.ssi
@@ -51,8 +51,8 @@ gancho locales en Live/chroot}#live-chroot-local-hooks
 
 Para incluir ficheros solamente hace falta añadirlos al directorio de
 configuración #{config/includes.chroot}#. Habrá una relación directa entre
-este directorio y el directorio raiz (#{/}#) del sistema en vivo. Por
-ejemplo, si se desea añadir un fichero para que sea el fichero
+este directorio y el directorio raiz #{/}# del sistema en vivo. Por ejemplo,
+si se desea añadir un fichero para que sea el fichero
 #{/var/www/index.html}# del sistema en vivo se puede hacer lo siguiente:
 
 code{
@@ -176,5 +176,5 @@ seguido por la etapa (#{.chroot}# o #{.binary}#) son ficheros de
 preconfiguración para debconf. live-build instalará estos ficheros mediante
 #{debconf-set-selections}# durante la etapa correspondiente.
 
-Ver debconf(7) en el paquete #{debconf}# para obtener más información acerca
-de debconf.
+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 1948384..5169fbb 100644
--- a/manual/es/user_customization-packages.ssi
+++ b/manual/es/user_customization-packages.ssi
@@ -14,14 +14,14 @@ velocidad de descarga de paquetes, se debería elegir el repositorio Debian
 más cercano. Se pueden añadir repositorios para backports, experimentales,
 paquetes personalizados o incluir ficheros de paquetes directamente. Se
 pueden definir listas de paquetes personalizadas, utilizar listas
-predefinidas en live-build, seleccionar tareas de #{tasksel}# o una
+predefinidas en live-build, seleccionar tareas de /{tasksel}/ o una
 combinación de los tres métodos. Por último existen varias opciones que dan
 algún control sobre cuando son instalados los paquetes por la herramienta
-apt o la herramienta aptitude, según sea la elegida. Estas opciones pueden
-ser útiles si se utiliza un proxy, se quiere desactivar la instalación de
-paquetes recomendados para ahorrar espacio o se necesita controlar las
-versiones de los paquetes a instalar mediante APT pinning, por nombrar
-algunas posibilidades.
+/{apt}/ o la herramienta /{aptitude}/, según sea la elegida. Estas opciones
+pueden ser útiles si se utiliza un proxy, se quiere desactivar la
+instalación de paquetes recomendados para ahorrar espacio o se necesita
+controlar las versiones de los paquetes a instalar mediante APT pinning, por
+nombrar algunas posibilidades.
 
 2~ Origen de los paquetes
 
@@ -29,13 +29,13 @@ algunas posibilidades.
 
 La distribución seleccionada tiene gran impacto en qué paquetes están
 disponibles para incluir en la imagen. Se debe indicar el nombre en clave de
-la distribución, que por defecto es #{wheezy}# para la versión wheezy de
+la distribución, que por defecto es wheezy para la versión wheezy de
 live-build. Se puede especificar cualquier nombre de distribución disponible
 en los repositorios Debian indicando su nombre en clave. (Para más detalles
 ver {Términos}#terms). La opción #{--distribution}# no solamente influencia
 la fuente de los paquetes dentro del archivo Debian, sino que instruye a
-/{live-build}/ a comportarse tal y como se necesita para construir cada una
-de las distribuciones. Por ejemplo, para construir contra la versión
+live-build a comportarse tal y como se necesita para construir cada una de
+las distribuciones. Por ejemplo, para construir contra la versión
 *{inestable}*, sid, se debe indicar: 
 
 code{
@@ -235,9 +235,9 @@ las directivas «includes». Los ficheros existentes en el directorio
 como escribir listas de paquetes.
 
 Por ejemplo, para hacer una lista de paquetes que incluya la lista de
-paquetes predefinida #{gnome}# y añadir el paquete iceweasel se puede crear
-un fichero llamado #{config/package-lists/my.list.chroot}# con el siguiente
-contenido:
+paquetes predefinida #{gnome}# y añadir el paquete /{iceweasel}/ se puede
+crear un fichero llamado #{config/package-lists/my.list.chroot}# con el
+siguiente contenido:
 
 code{
 
@@ -269,7 +269,7 @@ code{
 }code
 
 En la expresión condicional pueden utilizarse varios valores. Por ejemplo
-para instalar el paquete #{memtest86+}# si la arquitectura es i386
+para instalar el paquete /{memtest86+}/ si la arquitectura es i386
 (#{--architectures i386}#) o es amd64 (#{--architectures amd64}#) se puede
 especificar:
 
@@ -470,7 +470,7 @@ aquellas opciones que comienzan con #{apt}#.
 3~choosing-apt-or-aptitude Utilizar apt o aptitude
 
 Se puede seleccionar qué herramienta se utilizará para instalar paquetes,
-#{apt}# o #{aptitude}#, en el momento de crear la imagen mediante la opción
+/{apt}/ o /{aptitude}/, en el momento de crear la imagen mediante la opción
 #{--apt}# de #{lb config}#. Esta selección definirá el comportamiento
 preferido en la instalación de paquetes, siendo la mayor diferencia la
 manera de tratar los paquetes no disponibles.
@@ -591,9 +591,9 @@ ser el caso de que no se desee que un paquete recomendado por otro sea
 instalado al instalar el primero. Supongamos que se está creando una imagen
 LXDE mediante la opción #{--package-lists lxde}#, pero no se desea preguntar
 al usuario si desea almacenar las claves wifi en el almacen de claves. La
-lista lxde incluye #{gdm}#, la cual depende de #{gksu}# que a su vez
-recomienda #{gnome-keyring}#. Así que el objetivo es omitir la instalación
-del paquete #{gnome-keyring}#, que puede conseguirse añadiendo un fichero
+lista lxde incluye /{gdm}/, la cual depende de /{gksu}/ que a su vez
+recomienda /{gnome-keyring}/. Así que el objetivo es omitir la instalación
+del paquete /{gnome-keyring}/, que puede conseguirse añadiendo un fichero
 con el siguiente contenido a #{config/chroot_apt/preferences}#:
 
 code{
diff --git a/manual/es/user_examples.ssi b/manual/es/user_examples.ssi
index e7c6d63..a46b4e8 100644
--- a/manual/es/user_examples.ssi
+++ b/manual/es/user_examples.ssi
@@ -161,8 +161,8 @@ sistema de creación #{amd64}# se crea una versión de 32-bits adecuada para
 ser usada en la mayoría de máquinas. En segundo lugar, se usa
 #{--linux-flavours 686-pae}# porque no se espera usar esta imagen en
 sistemas mucho más viejos. En tercer lugar se elige la lista de paquetes
-#{lxde}# para proporcionar un escritorio mínimo. Y, por último, se añaden
-dos paquetes iniciales favoritos: #{iceweasel}# y #{xchat}#.
+/{lxde}/ para proporcionar un escritorio mínimo. Y, por último, se añaden
+dos paquetes iniciales favoritos: /{iceweasel}/ y /{xchat}/.
 
 Ahora, crear la imagen:
 
diff --git a/manual/es/user_overview.ssi b/manual/es/user_overview.ssi
index f9620fd..b61b0d1 100644
--- a/manual/es/user_overview.ssi
+++ b/manual/es/user_overview.ssi
@@ -31,7 +31,7 @@ cada comando.
 A diferencia de /{debhelper}/, live-build contiene una herramienta para
 crear un directorio de configuración en esqueleto, #{lb config}#. Ésto
 podría ser considerado como similar a herramientas tales como
-#{dh-make}#. Para obtener más información sobre #{lb config}#, consultar {El
+/{dh-make}/. Para obtener más información sobre #{lb config}#, consultar {El
 comando lb config }#lb-config
 
 El resto de esta sección describe los tres comandos más importantes:
diff --git a/manual/fr/about_manual.ssi b/manual/fr/about_manual.ssi
index 673be05..80119bd 100644
--- a/manual/fr/about_manual.ssi
+++ b/manual/fr/about_manual.ssi
@@ -75,7 +75,7 @@ _* *{Système de destination}*: L'environnement utilisé pour faire tourner le
 système live.
 
 _* *{live-boot}*: Une collection de scripts utilisés pour lancer des
-systèmes live. live-boot faisait initialement partie de live-initramfs.
+systèmes live. live-boot faisait initialement partie de /{live-initramfs}/.
 
 _* *{live-build}*: Une collection de scripts utilisés pour personnaliser les
 systèmes Debian Live. live-build était initialement nommé /{live-package}/,
@@ -300,9 +300,9 @@ Pour soumettre une traduction pour une nouvelle langue, suivez ces trois
 
 _* Traduire les fichiers about_manual.ssi.pot, about_project.ssi.pot et
 index.html.in.pot à votre langue avec votre éditeur préféré (comme
-poedit). Envoyer les fichiers traduits à la liste de diffusion. Une fois que
-nous avons examiné votre livraison, nous allons ajouter une nouvelle langue
-au manuel (avec les fichiers po) et l'activer dans l'autobuild.
+/{poedit}/). Envoyer les fichiers traduits à la liste de diffusion. Une fois
+que nous avons examiné votre livraison, nous allons ajouter une nouvelle
+langue au manuel (avec les fichiers po) et l'activer dans l'autobuild.
 
 _* Une fois la nouvelle langue est ajoutée, vous pouvez commencer à traduire
 de façon aléatoire tous les fichiers po dans #{manual/po/}#.
diff --git a/manual/fr/user_basics.ssi b/manual/fr/user_basics.ssi
index c598af9..78a100f 100644
--- a/manual/fr/user_basics.ssi
+++ b/manual/fr/user_basics.ssi
@@ -161,8 +161,7 @@ Une fois que vous avez démarré le support, vous êtes présenté avec un menu
 de démarrage. Si vous appuyez simplement sur enter ici, le système va
 démarrer en utilisant l'entrée par défaut, #{Live}# Pour plus d'informations
 sur les options de démarrage, consultez l'entrée «Help» dans le menu et
-aussi les pages de manuel de #{live-boot}# et #{live-config}# dans le
-système live.
+aussi les pages de manuel de live-boot et live-config dans le système live.
 
 En supposant que vous avez sélectionné #{Live}# et démarré une image de
 bureau live par défaut, après les messages de démarrage défilent, vous
@@ -198,12 +197,12 @@ logiciels VM disponibles et choisissez celui qui convient à vos besoins.
 
 La VM la plus polyvalente de Debian est QEMU. Si votre processeur possède un
 support matériel pour la virtualisation, vouz pouvez utiliser le paquet
-#{qemu-kvm}#; La description du paquet #{qemu-kvm}# énumère brièvement les
+/{qemu-kvm}/; La description du paquet /{qemu-kvm}/ énumère brièvement les
 exigences.
 
-Tout d'abord, installez #{qemu-kvm}# si votre processeur le soutient. Sinon,
-installez #{qemu}#, dans ce cas, le nom du programme est #{qemu}# au lieu de
-#{kvm}# dans les exemples suivants. Le paquet #{qemu-utils}# est également
+Tout d'abord, installez /{qemu-kvm}/ si votre processeur le soutient. Sinon,
+installez /{qemu}/, dans ce cas, le nom du programme est #{qemu}# au lieu de
+#{kvm}# dans les exemples suivants. Le paquet /{qemu-utils}/ est également
 valuable pour créer des images disque virtuels avec #{qemu-img}#.
 
 code{
@@ -295,8 +294,8 @@ lieu de #{binary-hybrid.iso}#.
 
 3~testing-hdd-with-qemu Test d'une image HDD avec Qemu
 
-D'abord, installer QEMU comme décrit ci-dessus dans {Test d'une image ISO
-avec QEMU}#testing-iso-with-qemu. Ensuite, exécutez #{kvm}# ou #{qemu}#,
+D'abord, installer /{qemu}/ comme décrit ci-dessus dans {Test d'une image
+ISO avec QEMU}#testing-iso-with-qemu. Ensuite, exécutez #{kvm}# ou #{qemu}#,
 selon la version de vos besoins du système hôte, précisant #{binary.img}#
 comme le premier disque dur.
 
@@ -309,8 +308,8 @@ code{
 3~using-usb-extra-space Utilisation de l'espace disponible sur une clé USB
 
 Pour utiliser l'espace libre restant après avoir copié #{binary.img}# sur
-une clé USB, utilisez un outil de partitionnement tels que #{gparted}# ou
-#{parted}# afin de créer une nouvelle partition sur la clé. La première
+une clé USB, utilisez un outil de partitionnement tels que /{gparted}/ ou
+/{parted}/ afin de créer une nouvelle partition sur la clé. La première
 partition sera utilisée par le système Debian Live.
 
 code{
@@ -442,7 +441,7 @@ Une fois l'ordinateur hôte a téléchargé et démarré un noyau Linux et charg
 son initrd, il va essayer de monter l'image du système de fichiers live via
 un serveur NFS.
 
-Vous devez installer le paquet #{nfs-kernel-server}#.
+Vous devez installer le paquet /{nfs-kernel-server}/.
 
 Ensuite, rendre l'image du système de fichiers disponible via NFS en
 ajoutant une ligne comme la suivante #{/etc/exports}#:
@@ -480,7 +479,7 @@ virtualisation. Il y a deux solutions.
 
 3~ Qemu
 
-_* Installer #{qemu}#, #{bridge-utils}#, #{sudo}#.
+_* Installer /{qemu}/, /{bridge-utils}/, /{sudo}/.
 
 Èditer #{/etc/qemu-ifup}#:
 
diff --git a/manual/fr/user_customization-contents.ssi b/manual/fr/user_customization-contents.ssi
index fdd3e85..33ceb67 100644
--- a/manual/fr/user_customization-contents.ssi
+++ b/manual/fr/user_customization-contents.ssi
@@ -49,7 +49,7 @@ hooks}#live-chroot-local-hooks si le traitement est nécessaire.
 
 Pour inclure des fichiers, il suffit de les ajouter à votre répertoire
 #{config/includes.chroot}#. Ce répertoire correspond au répertoire racine
-(#{/}#) du système live. Par exemple, pour ajouter un fichier
+#{/}# du système live. Par exemple, pour ajouter un fichier
 #{/var/www/index.html}# dans le système live, utilisez:
 
 code{
@@ -162,5 +162,5 @@ Les fichiers dans le répertoire #{config/preseed/}# avec le suffixe
 comme des fichiers de préconfiguration debconf et sont installés par
 live-build en utilisant #{debconf-set-selections}#.
 
-Pour plus d'informations sur debconf, s'il vous plaît voir debconf(7) dans
-le paquet #{debconf}#.
+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 3d2f498..5d7a076 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -14,11 +14,11 @@ miroir de distribution proche. Vous pouvez également ajouter vos propres
 dépôts pour les backports, paquets expérimentaux ou personnalisés, ou
 inclure des paquets directement en tant que fichiers. Vous pouvez définir
 vos propres listes de paquets à inclure, utiliser des listes prédéfinies de
-live-build, utiliser tâches #{tasksel}#, ou une combinaison des
+live-build, utiliser tâches /{tasksel}/, ou une combinaison des
 trois. Enfin, un certain nombre d'options donnent un certain contrôle sur
-apt, ou si vous préférez, aptitude, au moment de la construction quand les
-paquets sont installés. Vous pouvez trouver ces très pratique si vous
-utilisez un proxy, vous voulez désactiver l'installation des paquets
+/{apt}/, ou si vous préférez, /{aptitude}/, au moment de la construction
+quand les paquets sont installés. Vous pouvez trouver ces très pratique si
+vous utilisez un proxy, vous voulez désactiver l'installation des paquets
 recommandés pour économiser l'espace, ou avez besoin de contrôler quels
 versions des paquets sont installés via APT pinning, pour n'en nommer
 quelques possibilités.
@@ -29,7 +29,7 @@ quelques possibilités.
 
 La distribution que vous choisissez a le plus large impact sur les paquets
 qui sont disponibles à inclure dans votre image live. Indiquez le nom de
-code, qui est par défaut #{wheezy}# pour la version de live-build dans
+code, qui est par défaut wheezy pour la version de live-build dans
 wheezy. Toute distribution actuelle dans l'archive Debian peut être spécifié
 par son nom de code ici. (Voir {Termes}#terms pour plus de détails.)
 L'option #{--distribution}# non seulement influence la source des paquets
@@ -230,7 +230,7 @@ des «includes». Reportez-vous à ceux-ci dans le répertoire
 savoir comment écrire vos propres listes.
 
 Par exemple, pour faire une liste qui comprend la liste prédéfinie
-#{gnome}#, plus iceweasel, créer #{config/package-lists/my.list.chroot}#
+#{gnome}#, plus /{iceweasel}/, créer #{config/package-lists/my.list.chroot}#
 avec le contenu suivant:
 
 code{
@@ -262,7 +262,7 @@ code{
 }code
 
 Vous pouvez tester pour un certain nombre de valeurs, par exemple pour
-installer #{memtest86+}# si #{--architectures i386}# ou #{--architectures
+installer /{memtest86+}/ si #{--architectures i386}# ou #{--architectures
 amd64}# est spécifié:
 
 code{
@@ -460,7 +460,7 @@ options commençant par #{apt}# dans la page de manuel de #{lb_config}#.
 
 3~choosing-apt-or-aptitude Choisir apt ou aptitude
 
-Vous pouvez choisir d'utiliser soit #{apt}# ou #{aptitude}#  Quel logiciel
+Vous pouvez choisir d'utiliser soit /{apt}/ ou /{aptitude}/  Quel logiciel
 est utilisé est régi par l'argument #{--apt}# de #{lb config}#. Choisissez
 la méthode du comportement préférée pour l'installation de paquets, la
 différence notable étant la manière dont les paquets manquants sont
@@ -580,9 +580,9 @@ vous ne voulez pas un paquet qui est recommandé par un autre
 paquet. Supposons que vous construisez une image LXDE en utilisant l'option
 #{--package-lists lxde}# mais ne veulez pas que l'utilisateur soit invité à
 stocker les mots de passe wifi dans le trousseau de clés. Cette liste
-comprend #{gdm}#, que dépend de #{gksu}#, que à son tour recommends
-#{gnome-keyring}#. Donc, vous voulez omettre le paquet recommandé
-#{gnome-keyring}#. Cela peut être fait en ajoutant la strophe suivante à
+comprend /{gdm}/, que dépend de /{gksu}/, que à son tour recommande
+/{gnome-keyring}/. Donc, vous voulez omettre le paquet recommandé
+/{gnome-keyring}/. Cela peut être fait en ajoutant la strophe suivante à
 #{config/chroot_apt/preferences}#:
 
 code{
diff --git a/manual/fr/user_examples.ssi b/manual/fr/user_examples.ssi
index 6322572..a31fc57 100644
--- a/manual/fr/user_examples.ssi
+++ b/manual/fr/user_examples.ssi
@@ -161,9 +161,9 @@ construction #{amd64}#, nous construisons une version 32 bits qui peut être
 utilisé sur la plupart des machines. Deuxièmement, nous utilisons
 #{--linux-flavours 686-pae}# parce que nous ne prévoyons pas utiliser cette
 image sur des systèmes beaucoup plus anciens. Troisièmement, nous avons
-choisi la liste des paquets #{lxde}# pour nous donner un bureau minimal. Et
-enfin, nous avons ajouté deux premiers paquets préférés: #{iceweasel}# et
-#{xchat}#.
+choisi la liste de paquets /{lxde}/ pour nous donner un bureau minimal. Et
+enfin, nous avons ajouté deux premiers paquets préférés: /{iceweasel}/ et
+/{xchat}/.
 
 Maintenant, construire l'image:
 
diff --git a/manual/fr/user_overview.ssi b/manual/fr/user_overview.ssi
index 799e851..572a8ac 100644
--- a/manual/fr/user_overview.ssi
+++ b/manual/fr/user_overview.ssi
@@ -30,7 +30,7 @@ d'exécuter chaque commande.
 
 Contrairement à /{debhelper}/, live-build contient un outil pour générer une
 arborescence de configuration, #{lb config}#. Cela pourrait être considéré
-comme similaire à des outils tels que #{dh-make}#.  Pour plus d'informations
+comme similaire à des outils tels que /{dh-make}/.  Pour plus d'informations
 à propos de #{lb config}#, s'il vous plaît voir {La commande lb
 config}#lb-config.
 
diff --git a/manual/it/about_manual.ssi b/manual/it/about_manual.ssi
index ad8b1ef..8fe2a5b 100644
--- a/manual/it/about_manual.ssi
+++ b/manual/it/about_manual.ssi
@@ -68,7 +68,7 @@ _* *{Host system}*: L'ambiente utilizzato per creare il sistema live.
 _* *{Target system}*: L'ambiente usato per eseguire il sistema live.
 
 _* *{live-boot}*: Una raccolta di script usati per avviare sistemi
-live. live-boot era una parte di live-initramfs.
+live. live-boot era una parte di /{live-initramfs}/.
 
 _* *{live-build}*: Una raccolta di script usati per creare sistemi Debian
 Live personalizzati. live-build era conosciuto come /{live-helper}/, ed
@@ -291,9 +291,10 @@ Per inviare una traduzione per una nuova lingua, seguire questi tre passi:
 
 _* Tradurre i file about_manual.ssi.pot, about_project.ssi.pot e
 index.html.in.pot nella propria lingua con il proprio editor preferito (tipo
-poedit). Inviare i file tradotti alla mailing list. Una volta che abbiamo
-ricevuto il contributo, aggiungeremo la nuova lingua al manuale (fornendo i
-file po) e la attiveremo per la procedura di compilazione automatica.
+/{poedit}/). Inviare i file tradotti alla mailing list. Una volta che
+abbiamo ricevuto il contributo, aggiungeremo la nuova lingua al manuale
+(fornendo i file po) e la attiveremo per la procedura di compilazione
+automatica.
 
 _* Una volta che la nuova lingua è stata aggiunta, si può iniziare a
 tradurre tutti i file po situati in #{manual/po/}#, nell'ordine che si
diff --git a/manual/it/user_basics.ssi b/manual/it/user_basics.ssi
index a02c397..547c772 100644
--- a/manual/it/user_basics.ssi
+++ b/manual/it/user_basics.ssi
@@ -155,8 +155,7 @@ sistema live prima di quella usuale.
 Avviando il supporto si otterrà un menu, premendo il tasto enter il sistema
 partirà utilizzando la voce #{Live}# e le opzioni predefinite. Per ulteriori
 informazioni sulle opzioni di boot, si veda la voce "help" nel menu e le
-pagine di manuale di #{live-boot}# e #{live-config}# all'interno del
-sistema.
+pagine di manuale di live-boot e live-config all'interno del sistema.
 
 Supponendo di aver selezionato #{Live}# e avviato l'immagine desktop
 predefinita, dopo i messaggi di avvio si dovrebbe automaticamente accedere
@@ -191,12 +190,12 @@ necessità.
 3~testing-iso-with-qemu Provare un'immagine ISO con QEMU
 
 Il programma più versatile in Debian è QEMU. Se il processore gestisce la
-virtualizzazione hardware utilizzare il pacchetto #{qemu-kvm}#; la
+virtualizzazione hardware utilizzare il pacchetto /{qemu-kvm}/; la
 descrizione elenca brevemente i requisiti.
 
-Per prima cosa installare #{qemu-kvm}# o altrimenti #{qemu}#, nel qual caso
+Per prima cosa installare /{qemu-kvm}/ o altrimenti /{qemu}/, nel qual caso
 il nome del programma nei successivi sarà #{qemu}# invece di #{kvm}#. Il
-pacchetto #{qemu-utils}# è inoltre utile per creare immagini di dischi
+pacchetto /{qemu-utils}/ è inoltre utile per creare immagini di dischi
 virtuali con #{qemu-img}#.
 
 code{
@@ -288,7 +287,7 @@ sarà #{binary.img}# invece di #{binary-hybrid.iso}#.
 
 3~testing-hdd-with-qemu Provare un'immagine HDD con Qemu
 
-Installare QEMU come descritto in {Provare un'immagine ISO con
+Installare /{qemu}/ come descritto in {Provare un'immagine ISO con
 QEMU}#testing-iso-with-qemu; quindi eseguire #{kvm}# o #{qemu}#, a seconda
 di quale versione è necessaria al sistema ospitante, specificando
 #{binary.img}# come disco rigido principale.
@@ -303,7 +302,7 @@ code{
 
 Per utilizzare lo spazio libero che rimane dopo aver copiato il file
 #{binary.img}# su una penna USB, usare uno strumento di partizionamento come
-#{gparted}# o #{parted}# per creare una nuova partizione. La prima
+/{gparted}/ o /{parted}/ per creare una nuova partizione. La prima
 partizione verrà utilizzata dal sistema Debian Live.
 
 code{
@@ -432,7 +431,7 @@ Una volta che il computer ospite ha scaricato e avviato un kernel Linux e
 caricato il suo initrd, cercherà di montare l'immagine del filesystem Live
 tramite un server NFS.
 
-Bisogna installare il pacchetto #{nfs-kernel-server}#.
+Bisogna installare il pacchetto /{nfs-kernel-server}/.
 
 Quindi, rendere disponibile l'immagine del filesystem via NFS aggiungendo
 una riga come la seguente in #{/etc/exports}#:
@@ -469,7 +468,7 @@ soluzioni.
 
 3~ Qemu
 
-_* Installare #{qemu}#, #{bridge-utils}#, #{sudo}#.
+_* Installare /{qemu}/, /{bridge-utils}/, /{sudo}/.
 
 Modificare #{/etc/qemu-ifup}#:
 
diff --git a/manual/it/user_customization-contents.ssi b/manual/it/user_customization-contents.ssi
index 9e29dd7..daa333d 100644
--- a/manual/it/user_customization-contents.ssi
+++ b/manual/it/user_customization-contents.ssi
@@ -44,9 +44,9 @@ elaborazione; si veda {Live/chroot hook locali}#live-chroot-local-hooks se è
 necessaria l'elaborazione.
 
 Per includere i file si aggiungano semplicemente alla directory
-#{config/includes.chroot}#. Questa corrisponde alla directory root (#{/}#)
-del sistema live. Per esempio, per aggiungere un file
-#{/var/www/index.html}# nel sistema live, si usi:
+#{config/includes.chroot}#. Questa corrisponde alla directory root #{/}# del
+sistema live. Per esempio, per aggiungere un file #{/var/www/index.html}#
+nel sistema live, si usi:
 
 code{
 
@@ -153,5 +153,5 @@ dalla fase (#{.chroot}# o #{.binary}#) sono considerati file di
 preconfigurazione di debconf e sono installati da live-build usando
 #{debconf-set-selections}# durante la fase corrispondente.
 
-Per ulteriori informazioni su debconf, vedere debconf(7) nel pacchetto
-#{debconf}#.
+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 64b076d..1dda06f 100644
--- a/manual/it/user_customization-packages.ssi
+++ b/manual/it/user_customization-packages.ssi
@@ -13,13 +13,14 @@ velocità di scaricamento, dovreste usare un mirror a voi vicino. Si possono
 inoltre aggiungere i propri repository per pacchetti di backport,
 sperimentali o personalizzati, o aggiungere i pacchetti direttamente come
 file. È possibile definire una propria lista di pacchetti da includere,
-usarne una predefinita di live-build, usare task di #{tasksel}#, o una
+usarne una predefinita di live-build, usare task di /{tasksel}/, o una
 combinazione di tutti e tre. Infine una serie di opzioni fornisce un certo
-controllo su apt, o aptitude se si preferisce, in fase di compilazione
-quando i pacchetti sono installati. Ciò può tornare utile se si usa un
-proxy, se si vuole disabilitare l'installazione dei pacchetti raccomandati
-per risparmiare spazio o controllare quali versioni dei pacchetti vengono
-installate con il pinning, giusto per citare alcune possibilità.
+controllo su /{apt}/, o /{aptitude}/ se si preferisce, in fase di
+compilazione quando i pacchetti sono installati. Ciò può tornare utile se si
+usa un proxy, se si vuole disabilitare l'installazione dei pacchetti
+raccomandati per risparmiare spazio o controllare quali versioni dei
+pacchetti vengono installate con il pinning, giusto per citare alcune
+possibilità.
 
 2~ Sorgenti dei pacchetti
 
@@ -27,7 +28,7 @@ installate con il pinning, giusto per citare alcune possibilità.
 
 La distribuzione che viene scelta ha un ampio impatto su quali pacchetti
 siano disponibili per essere inclusi nell'immagine live. Specificare il nome
-in codice, il predefinito per la versione wheezy di live-build è #{wheezy}#;
+in codice, il predefinito per la versione wheezy di live-build è wheezy;
 qualsiasi attuale distribuzione mantenuta negli archivi Debian può essere
 qui specificata con il suo nome in codice. (Per ulteriori dettagli
 consultare il {Glossario}#terms). L'opzione #{--distribution}# non solo
@@ -220,8 +221,8 @@ include. Far riferimento a questi nella directory
 come scriverne di propri.
 
 Per esempio, per creare un elenco che includa quello predefinito di
-#{gnome}#più iceweasel, creare #{config/package-lists/mio.elenco.chroot}#
-con i seguenti contenuti:
+#{gnome}#più /{iceweasel}/, creare
+#{config/package-lists/mio.elenco.chroot}# con i seguenti contenuti:
 
 code{
 
@@ -252,7 +253,7 @@ code{
 }code
 
 Si può verificare per ognuna di una serie di valori, ad esempio per
-installare #{memtest86+}# specificando sia #{--architectures i386}# sia
+installare /{memtest86+}/ specificando sia #{--architectures i386}# sia
 #{--architectures amd64}#:
 
 code{
@@ -444,7 +445,7 @@ iniziano con #{apt}#.
 3~choosing-apt-or-aptitude Scegliere apt o aptitude
 
 Per installare pacchetti in fase di compilazione si può optare sia per
-#{apt}# sia per #{aptitude}#, l'argomento #{--apt}# di #{lb config}#
+/{apt}/ sia per /{aptitude}/, l'argomento #{--apt}# di #{lb config}#
 determina quale usare. Sceglie il metodo implementando il comportamento
 preferito per l'installazione dei pacchetti, la notevole differenza è come
 vengono gestiti quelli mancanti.
@@ -556,9 +557,9 @@ Un valore negativo della priorità evita che un pacchetto venga installato,
 come nel caso in cui non se ne voglia uno raccomandato da un altro. Si
 suppone di costruire un'immagine di LXDE utilizzando l'opzione
 #{--package-lists lxde}# ma non si desidera che all'utente venga richiesto
-di salvare la password del wifi nel portachiavi. L'elenco include #{gdm}#
-che dipende da #{gksu}# che a sua volta raccomanda #{gnome-keyring}#, in
-questo caso si vorrà omettere il pacchetto #{gnome-keyring}# aggiungendo a
+di salvare la password del wifi nel portachiavi. L'elenco include /{gdm}/
+che dipende da /{gksu}/ che a sua volta raccomanda /{gnome-keyring}/, in
+questo caso si vorrà omettere il pacchetto /{gnome-keyring}/ aggiungendo a
 #{config/chroot_apt/preferences}# la seguente definizione:
 
 code{
diff --git a/manual/it/user_examples.ssi b/manual/it/user_examples.ssi
index 7d0f5cb..83f0b3e 100644
--- a/manual/it/user_examples.ssi
+++ b/manual/it/user_examples.ssi
@@ -156,9 +156,9 @@ Per prima cosa, #{--architectures i386}# assicura che sul nostro sistema
 #{amd64}# costruiamo una versione a 32-bit utilizzabile sulla maggior parte
 delle macchine. In secondo luogo, usiamo #{--linux-flavours 686-pae}# dato
 che non prevediamo di usare questa immagine su sistemi troppo vecchi. Terzo,
-abbiamo scelto la lista di pacchetti #{lxde}# per avere un desktop
+abbiamo scelto la lista di pacchetti /{lxde}/ per avere un desktop
 minimale. Infine, abbiamo aggiunto due pacchetti preferiti per cominciare:
-#{iceweasel}# e #{xchat}#.
+/{iceweasel}/ e /{xchat}/.
 
 Costruire quindi l'immagine:
 
diff --git a/manual/it/user_overview.ssi b/manual/it/user_overview.ssi
index ec98776..4406b57 100644
--- a/manual/it/user_overview.ssi
+++ b/manual/it/user_overview.ssi
@@ -30,7 +30,7 @@ ogni comando.
 
 Al contrario di /{debhelper}/, live-build contiene uno strumento per
 generare una directory scheletro di configurazione, #{lb config}#, che può
-essere considerato simile a utilità come #{dh-make}#. Per maggiori
+essere considerato simile a utilità come /{dh-make}/. Per maggiori
 informazioni su #{lb config}# si veda {Il comando lb config}#lb-config.
 
 Il resto di questa sezione tratta i tre comandi più importanti:
diff --git a/manual/po/de/about_manual.ssi.po b/manual/po/de/about_manual.ssi.po
index 97b3fda..cdf3f3f 100644
--- a/manual/po/de/about_manual.ssi.po
+++ b/manual/po/de/about_manual.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-14 12:48+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -163,7 +163,7 @@ msgstr ""
 #: en/about_manual.ssi:32
 msgid ""
 "_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
-"boot was formerly a part of live-initramfs."
+"boot was formerly a part of /{live-initramfs}/."
 msgstr ""
 
 #. type: Plain text
@@ -681,10 +681,10 @@ msgstr ""
 #: en/about_manual.ssi:211
 msgid ""
 "_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
-"in.pot files to your language with your favourite editor (such as poedit). "
-"Send translated files to the mailing list. Once we have reviewed your "
-"submission, we will add the new language to the manual (providing the po "
-"files) and will enable it in the autobuild."
+"in.pot files to your language with your favourite editor (such as /"
+"{poedit}/). Send translated files to the mailing list. Once we have reviewed "
+"your submission, we will add the new language to the manual (providing the "
+"po files) and will enable it in the autobuild."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/user_basics.ssi.po b/manual/po/de/user_basics.ssi.po
index f4125d1..638d3fb 100644
--- a/manual/po/de/user_basics.ssi.po
+++ b/manual/po/de/user_basics.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 16:54+0300\n"
+"POT-Creation-Date: 2012-04-14 16:31+0300\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -88,11 +88,11 @@ msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -412,8 +412,8 @@ msgid ""
 "Once you've booted the media, you are presented with a boot menu. If you "
 "just press enter here, the system will boot using the default entry, #{Live}"
 "# and default options. For more information about boot options, see the "
-"\"help\" entry in the menu and also the #{live-boot}# and #{live-config}# "
-"man pages found within the live system."
+"\"help\" entry in the menu and also the live-boot and live-config man pages "
+"found within the live system."
 msgstr ""
 
 #. type: Plain text
@@ -483,16 +483,16 @@ msgstr ""
 #: en/user_basics.ssi:104
 msgid ""
 "The most versatile VM in Debian is QEMU. If your processor has hardware "
-"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
+"support for virtualization, use the /{qemu-kvm}/ package; the /{qemu-kvm}/ "
 "package description briefly lists the requirements."
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:106
 msgid ""
-"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
-"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
-"the following examples. The #{qemu-utils}# package is also valuable for "
+"First, install /{qemu-kvm}/ if your processor supports it. If not, install /"
+"{qemu}/, in which case the program name is #{qemu}# instead of #{kvm}# in "
+"the following examples. The /{qemu-utils}/ package is also valuable for "
 "creating virtual disk images with #{qemu-img}#."
 msgstr ""
 
@@ -637,10 +637,10 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:182
 msgid ""
-"First, install QEMU as described above in {Testing an ISO image with QEMU}"
-"#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on which "
-"version your host system needs, specifying #{binary.img}# as the first hard "
-"drive."
+"First, install /{qemu}/ as described above in {Testing an ISO image with "
+"QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on "
+"which version your host system needs, specifying #{binary.img}# as the first "
+"hard drive."
 msgstr ""
 
 #. type: Plain text
@@ -658,7 +658,7 @@ msgstr ""
 #: en/user_basics.ssi:192
 msgid ""
 "To use the remaining free space after copying #{binary.img}# to a USB stick, "
-"use a partitioning tool such as #{gparted}# or #{parted}# to create a new "
+"use a partitioning tool such as /{gparted}/ or /{parted}/ to create a new "
 "partition on the stick. The first partition will be used by the Debian Live "
 "system."
 msgstr ""
@@ -874,7 +874,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:294
-msgid "You need to install the #{nfs-kernel-server}# package."
+msgid "You need to install the /{nfs-kernel-server}/ package."
 msgstr ""
 
 #. type: Plain text
@@ -938,7 +938,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:322
-msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
+msgid "_* Install /{qemu}/, /{bridge-utils}/, /{sudo}/."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/user_customization-contents.ssi.po b/manual/po/de/user_customization-contents.ssi.po
index 8c405f5..94c6368 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: 2012-01-15 16:28+0100\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,16 +17,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
-#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
-#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
-#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
 #: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
 #: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
 #: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -34,9 +37,10 @@ msgstr ""
 #: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
 #: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
 #: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
 #: en/user_customization-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -60,39 +64,43 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
-#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
-#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
-#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
 #: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
 #: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
 #: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -100,9 +108,10 @@ msgstr ""
 #: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
 #: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
 #: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
 #: en/user_customization-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -126,25 +135,26 @@ msgstr ""
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr ""
 
@@ -236,7 +246,7 @@ msgstr ""
 #: en/user_customization-contents.ssi:24
 msgid ""
 "To include files, simply add them to your #{config/includes.chroot}# "
-"directory. This directory corresponds to the root directory (#{/}#) of the "
+"directory. This directory corresponds to the root directory #{/}# of the "
 "live system. For example, to add a file #{/var/www/index.html}# in the live "
 "system, use:"
 msgstr ""
@@ -412,6 +422,6 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-contents.ssi:93
 msgid ""
-"For more information about debconf, please see debconf(7) in the #{debconf}# "
-"package."
+"For more information about debconf, please see #{debconf(7)}# in the /"
+"{debconf}/ package."
 msgstr ""
diff --git a/manual/po/de/user_customization-overview.ssi.po b/manual/po/de/user_customization-overview.ssi.po
index efad689..773f8a2 100644
--- a/manual/po/de/user_customization-overview.ssi.po
+++ b/manual/po/de/user_customization-overview.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -110,7 +110,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-overview.ssi:22
 msgid ""
-"Although #{lb config}# does create a skeletal configuration in the config/ "
+"Although #{lb config}# creates a skeletal configuration in the config/ "
 "directory, to accomplish your goals, you may need to provide additional "
 "files in subdirectories of config/. Depending on where the files are stored "
 "in the configuration, they may be copied into the live system's filesystem "
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index 1c2acd9..08ae1f1 100644
--- a/manual/po/de/user_customization-packages.ssi.po
+++ b/manual/po/de/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 14:10+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -88,11 +88,11 @@ msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -180,12 +180,12 @@ msgid ""
 "distribution mirror. You can also add your own repositories for backports, "
 "experimental or custom packages, or include packages directly as files. You "
 "can define your own lists of packages to include, use live-build's "
-"predefined lists, use #{tasksel}# tasks, or a combination of all three. "
-"Finally, a number of options give some control over apt, or if you prefer, "
-"aptitude, at build time when packages are installed. You may find these "
-"handy if you use a proxy, want to disable installation of recommended "
-"packages to save space, or need to control which versions of packages are "
-"installed via APT pinning, to name a few possibilities."
+"predefined lists, use /{tasksel}/ tasks, or a combination of all three. "
+"Finally, a number of options give some control over /{apt}/, or if you "
+"prefer, /{aptitude}/, at build time when packages are installed. You may "
+"find these handy if you use a proxy, want to disable installation of "
+"recommended packages to save space, or need to control which versions of "
+"packages are installed via APT pinning, to name a few possibilities."
 msgstr ""
 
 #. type: Plain text
@@ -203,7 +203,7 @@ msgstr ""
 msgid ""
 "The distribution you choose has the broadest impact on which packages are "
 "available to include in your live image. Specify the codename, which "
-"defaults to #{wheezy}# for the wheezy version of live-build. Any current "
+"defaults to wheezy for the wheezy version of live-build. Any current "
 "distribution carried in the Debian archive may be specified by its codename "
 "here. (See {Terms}#terms for more details.) The #{--distribution}# option "
 "not only influences the source of packages within the archive, but also "
@@ -515,9 +515,9 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:125
 msgid ""
-"For example, to make a list that includes the predefined #{gnome}# list plus "
-"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
-"contents:"
+"For example, to make a list that includes the predefined #{gnome}# list "
+"plus /{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the "
+"following contents:"
 msgstr ""
 
 #. type: Plain text
@@ -563,9 +563,9 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:148
 msgid ""
-"You may test for any one of a number of values, e.g. to install #{memtest86+}"
-"# if either #{--architectures i386}# or #{--architectures amd64}# is "
-"specified:"
+"You may test for any one of a number of values, e.g. to install /"
+"{memtest86+}/ if either #{--architectures i386}# or #{--architectures amd64}"
+"# is specified:"
 msgstr ""
 
 #. type: Plain text
@@ -889,7 +889,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:266
 msgid ""
-"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
+"You can elect to use either /{apt}/ or /{aptitude}/ when installing packages "
 "at build time. Which utility is used is governed by the #{--apt}# argument "
 "to #{lb config}#. Choose the method implementing the preferred behaviour for "
 "package installation, the notable difference being how missing packages are "
@@ -1072,9 +1072,9 @@ msgid ""
 "the case where you do not want a package that is recommended by another "
 "package. Suppose you are building an LXDE image using #{--package-lists lxde}"
 "# option, but don't want the user prompted to store wifi passwords in the "
-"keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
-"turn recommends #{gnome-keyring}#. So you want to omit the recommended #"
-"{gnome-keyring}# package. This can be done by adding the following stanza to "
+"keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in "
+"turn recommends /{gnome-keyring}/. So you want to omit the recommended /"
+"{gnome-keyring}/ package. This can be done by adding the following stanza to "
 "#{config/chroot_apt/preferences}#:"
 msgstr ""
 
diff --git a/manual/po/de/user_examples.ssi.po b/manual/po/de/user_examples.ssi.po
index 0c0132b..497b397 100644
--- a/manual/po/de/user_examples.ssi.po
+++ b/manual/po/de/user_examples.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 14:58+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -22,11 +22,11 @@ msgid ":B~ Examples"
 msgstr ":B~ Beispiele"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -93,11 +93,11 @@ msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -409,9 +409,9 @@ msgid ""
 "First, #{--architectures i386}# ensures that on our #{amd64}# build system, "
 "we build a 32-bit version suitable for use on most machines. Second, we use #"
 "{--linux-flavours 686-pae}# because we don't anticipate using this image on "
-"much older systems. Third, we've chosen the #{lxde}# package list to give us "
+"much older systems. Third, we've chosen the /{lxde}/ package list to give us "
 "a minimal desktop. And finally, we have added two initial favourite "
-"packages: #{iceweasel}# and #{xchat}#."
+"packages: /{iceweasel}/ and /{xchat}/."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/user_managing_a_configuration.ssi.po b/manual/po/de/user_managing_a_configuration.ssi.po
index 2477772..f070484 100644
--- a/manual/po/de/user_managing_a_configuration.ssi.po
+++ b/manual/po/de/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,28 +17,30 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 en/project_bugs.ssi:60
-#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
-#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
-#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
 #: en/user_customization-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -62,21 +64,22 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -85,28 +88,30 @@ msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:64
-#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
-#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
-#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
 #: en/user_customization-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -130,21 +135,22 @@ msgstr ""
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -216,7 +222,7 @@ msgid ""
 "variable values, and each time you run #{lb config}# and #{lb clean}#, these "
 "files will be executed. This will ensure that your configuration is kept "
 "internally consistent from one revision to the next and from one live-build "
-"release to the next (though you will still have to take care and read the "
+"release to the next (Although you will still have to take care and read the "
 "documentation when you upgrade live-build and make adjustments as needed)."
 msgstr ""
 
diff --git a/manual/po/de/user_overview.ssi.po b/manual/po/de/user_overview.ssi.po
index de69ec1..d29eb38 100644
--- a/manual/po/de/user_overview.ssi.po
+++ b/manual/po/de/user_overview.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -88,11 +88,11 @@ msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -225,7 +225,7 @@ msgstr ""
 msgid ""
 "Unlike /{debhelper}/, live-build contains a tool to generate a skeleton "
 "configuration directory, #{lb config}#. This could be considered to be "
-"similar to tools such as #{dh-make}#. For more information about #{lb config}"
+"similar to tools such as /{dh-make}/. For more information about #{lb config}"
 "#, please see {The lb config command}#lb-config."
 msgstr ""
 
diff --git a/manual/po/es/about_manual.ssi.po b/manual/po/es/about_manual.ssi.po
index 08c7519..0fba76e 100644
--- a/manual/po/es/about_manual.ssi.po
+++ b/manual/po/es/about_manual.ssi.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-14 12:48+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2012-04-14 12:49+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -212,11 +212,11 @@ msgstr ""
 #: en/about_manual.ssi:32
 msgid ""
 "_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
-"boot was formerly a part of live-initramfs."
+"boot was formerly a part of /{live-initramfs}/."
 msgstr ""
 "_* *{live-boot}*: Es una colección de scripts que serán responsables de "
 "arrancar el sistema en vivo. live-boot fue anteriormente una parte del "
-"paquete live-initramfs."
+"paquete /{live-initramfs}/."
 
 #. type: Plain text
 #: en/about_manual.ssi:34
@@ -808,16 +808,16 @@ msgstr ""
 #: en/about_manual.ssi:211
 msgid ""
 "_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
-"in.pot files to your language with your favourite editor (such as poedit). "
-"Send translated files to the mailing list. Once we have reviewed your "
-"submission, we will add the new language to the manual (providing the po "
-"files) and will enable it in the autobuild."
+"in.pot files to your language with your favourite editor (such as /"
+"{poedit}/). Send translated files to the mailing list. Once we have reviewed "
+"your submission, we will add the new language to the manual (providing the "
+"po files) and will enable it in the autobuild."
 msgstr ""
 "_* Traducir los ficheros about_manual.ssi.pot, about_project.ssi.pot e index."
-"html.in.pot al idioma deseado con cualquier editor (como puede ser poedit) y "
-"enviarlos a la lista de correos. Una vez hayan sido revisados, el idioma "
-"será añadido al manual, (añadiendo los ficheros .po) y se activará en el "
-"autobuild."
+"html.in.pot al idioma deseado con cualquier editor (como puede ser /"
+"{poedit}/) y enviarlos a la lista de correos. Una vez hayan sido revisados, "
+"el idioma será añadido al manual, (añadiendo los ficheros .po) y se activará "
+"en el autobuild."
 
 #. type: Plain text
 #: en/about_manual.ssi:213
diff --git a/manual/po/es/user_basics.ssi.po b/manual/po/es/user_basics.ssi.po
index 1b01f97..723fe24 100644
--- a/manual/po/es/user_basics.ssi.po
+++ b/manual/po/es/user_basics.ssi.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 16:54+0300\n"
+"POT-Creation-Date: 2012-04-14 16:31+0300\n"
 "PO-Revision-Date: 2012-02-19 21:41+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -22,11 +22,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -93,11 +93,11 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -514,15 +514,15 @@ msgid ""
 "Once you've booted the media, you are presented with a boot menu. If you "
 "just press enter here, the system will boot using the default entry, #{Live}"
 "# and default options. For more information about boot options, see the "
-"\"help\" entry in the menu and also the #{live-boot}# and #{live-config}# "
-"man pages found within the live system."
+"\"help\" entry in the menu and also the live-boot and live-config man pages "
+"found within the live system."
 msgstr ""
 "Una vez que se haya arrancado desde los medios de almacenamiento externos, "
 "se accede a un menú de arranque. Si se pulsa la tecla «enter»,  el sistema "
 "arrancará usando el modo por defecto #{Live}# y las opciones "
 "predeterminadas. Para obtener más información acerca de las opciones de "
 "arranque, ver la opción  «help» del menú y también las páginas del manual de "
-"#{live-boot}# y #{live-config}# que se encuentran en el sistema en vivo."
+"live-boot y live-config que se encuentran en el sistema en vivo."
 
 #. type: Plain text
 #: en/user_basics.ssi:86
@@ -615,25 +615,25 @@ msgstr "3~testing-iso-with-qemu Probar una imagen ISO con QEMU"
 #: en/user_basics.ssi:104
 msgid ""
 "The most versatile VM in Debian is QEMU. If your processor has hardware "
-"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
+"support for virtualization, use the /{qemu-kvm}/ package; the /{qemu-kvm}/ "
 "package description briefly lists the requirements."
 msgstr ""
 "La máquina virtual más versátil en Debian es QEMU. Si el procesador tiene "
-"soporte de hardware para virtualización, utilizar el paquete #{qemu-kvm}# en "
-"la descripción del paquete #{qemu-kvm}# se enumera brevemente la lista de "
+"soporte de hardware para virtualización, utilizar el paquete /{qemu-kvm}/ en "
+"la descripción del paquete /{qemu-kvm}/ se enumera brevemente la lista de "
 "requisitos."
 
 #. type: Plain text
 #: en/user_basics.ssi:106
 msgid ""
-"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
-"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
-"the following examples. The #{qemu-utils}# package is also valuable for "
+"First, install /{qemu-kvm}/ if your processor supports it. If not, install /"
+"{qemu}/, in which case the program name is #{qemu}# instead of #{kvm}# in "
+"the following examples. The /{qemu-utils}/ package is also valuable for "
 "creating virtual disk images with #{qemu-img}#."
 msgstr ""
 "En primer lugar, instalar #{qemu-kvm}# si el procesador lo soporta. Si no es "
 "así, instalar #{qemu}#, en cuyo caso el nombre del programa será #{qemu}# en "
-"vez de #{kvm}# en los siguientes ejemplos. El paquete #{qemu-utils}# también "
+"vez de #{kvm}# en los siguientes ejemplos. El paquete /{qemu-utils}/ también "
 "es útil para la creación de imágenes virtuales de disco con #{qemu-img}#."
 
 #. type: Plain text
@@ -800,15 +800,15 @@ msgstr "3~testing-hdd-with-qemu Probar una imágen HDD con Qemu"
 #. type: Plain text
 #: en/user_basics.ssi:182
 msgid ""
-"First, install QEMU as described above in {Testing an ISO image with QEMU}"
-"#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on which "
-"version your host system needs, specifying #{binary.img}# as the first hard "
-"drive."
+"First, install /{qemu}/ as described above in {Testing an ISO image with "
+"QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on "
+"which version your host system needs, specifying #{binary.img}# as the first "
+"hard drive."
 msgstr ""
-"En primer lugar, instalar QEMU como se describe más arriba en {Probar una "
-"imágen ISO con QEMU}#testing-iso-with-qemu A continuación, ejecutar #{kvm}# "
-"o #{qemu}#, según qué versión necesita el sistema anfitrión y especificando #"
-"{binary.img}# como primer disco duro."
+"En primer lugar, instalar /{qemu}/ como se describe más arriba en {Probar "
+"una imágen ISO con QEMU}#testing-iso-with-qemu A continuación, ejecutar #"
+"{kvm}# o #{qemu}#, según qué versión necesita el sistema anfitrión y "
+"especificando #{binary.img}# como primer disco duro."
 
 #. type: Plain text
 #: en/user_basics.ssi:186
@@ -825,13 +825,13 @@ msgstr "3~using-usb-extra-space Usar el espacio libre en el dispositivo USB"
 #: en/user_basics.ssi:192
 msgid ""
 "To use the remaining free space after copying #{binary.img}# to a USB stick, "
-"use a partitioning tool such as #{gparted}# or #{parted}# to create a new "
+"use a partitioning tool such as /{gparted}/ or /{parted}/ to create a new "
 "partition on the stick. The first partition will be used by the Debian Live "
 "system."
 msgstr ""
 "Si se desea usar el espacio libre después de haber instalado la imagen #"
 "{binary.img}# en una llave USB, se puede usar un programa de particionado "
-"como #{gparted}# o #{parted}# para crear una partición nueva en el "
+"como /{gparted}/ o /{parted}/ para crear una partición nueva en el "
 "dispositivo. La primera partición será usada por el sistema Debian en vivo."
 
 #. type: Plain text
@@ -1087,8 +1087,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:294
-msgid "You need to install the #{nfs-kernel-server}# package."
-msgstr "Se debe instalar el paquete #{nfs-kernel-server}#."
+msgid "You need to install the /{nfs-kernel-server}/ package."
+msgstr "Se debe instalar el paquete /{nfs-kernel-server}/."
 
 #. type: Plain text
 #: en/user_basics.ssi:296
@@ -1168,8 +1168,8 @@ msgstr "3~ Qemu"
 
 #. type: Plain text
 #: en/user_basics.ssi:322
-msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
-msgstr "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
+msgid "_* Install /{qemu}/, /{bridge-utils}/, /{sudo}/."
+msgstr "_* Instalar /{qemu}/, /{bridge-utils}/, /{sudo}/."
 
 #. type: Plain text
 #: en/user_basics.ssi:324
diff --git a/manual/po/es/user_customization-contents.ssi.po b/manual/po/es/user_customization-contents.ssi.po
index 47bf4d8..d940653 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: 2012-01-15 16:28+0100\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2012-02-19 18:05+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -18,16 +18,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
-#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
-#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
-#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
 #: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
 #: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
 #: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -35,9 +38,10 @@ msgstr ""
 #: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
 #: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
 #: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
 #: en/user_customization-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -61,39 +65,43 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
-#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
-#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
-#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
 #: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
 #: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
 #: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -101,9 +109,10 @@ msgstr "code{"
 #: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
 #: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
 #: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
 #: en/user_customization-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -127,25 +136,26 @@ msgstr "code{"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr "}code"
 
@@ -273,15 +283,15 @@ msgstr ""
 #: en/user_customization-contents.ssi:24
 msgid ""
 "To include files, simply add them to your #{config/includes.chroot}# "
-"directory. This directory corresponds to the root directory (#{/}#) of the "
+"directory. This directory corresponds to the root directory #{/}# of the "
 "live system. For example, to add a file #{/var/www/index.html}# in the live "
 "system, use:"
 msgstr ""
 "Para incluir ficheros solamente hace falta añadirlos al directorio de "
 "configuración #{config/includes.chroot}#. Habrá una relación directa entre "
-"este directorio y el directorio raiz (#{/}#) del sistema en vivo. Por "
-"ejemplo, si se desea añadir un fichero para que sea el fichero #{/var/www/"
-"index.html}# del sistema en vivo se puede hacer lo siguiente:"
+"este directorio y el directorio raiz #{/}# del sistema en vivo. Por ejemplo, "
+"si se desea añadir un fichero para que sea el fichero #{/var/www/index.html}"
+"# del sistema en vivo se puede hacer lo siguiente:"
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:29
@@ -516,8 +526,8 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-contents.ssi:93
 msgid ""
-"For more information about debconf, please see debconf(7) in the #{debconf}# "
-"package."
+"For more information about debconf, please see #{debconf(7)}# in the /"
+"{debconf}/ package."
 msgstr ""
-"Ver debconf(7) en el paquete #{debconf}# para obtener más información acerca "
-"de debconf."
+"Ver #{debconf(7)}# en el paquete /{debconf}/ para obtener más información "
+"acerca de debconf."
diff --git a/manual/po/es/user_customization-overview.ssi.po b/manual/po/es/user_customization-overview.ssi.po
index ca7d22a..020e729 100644
--- a/manual/po/es/user_customization-overview.ssi.po
+++ b/manual/po/es/user_customization-overview.ssi.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2012-02-19 17:36+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -171,7 +171,7 @@ msgstr "2~ Opciones para lb config en ficheros"
 #. type: Plain text
 #: en/user_customization-overview.ssi:22
 msgid ""
-"Although #{lb config}# does create a skeletal configuration in the config/ "
+"Although #{lb config}# creates a skeletal configuration in the config/ "
 "directory, to accomplish your goals, you may need to provide additional "
 "files in subdirectories of config/. Depending on where the files are stored "
 "in the configuration, they may be copied into the live system's filesystem "
diff --git a/manual/po/es/user_customization-packages.ssi.po b/manual/po/es/user_customization-packages.ssi.po
index 3934eca..432e80d 100644
--- a/manual/po/es/user_customization-packages.ssi.po
+++ b/manual/po/es/user_customization-packages.ssi.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 14:10+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2012-02-19 17:53+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -24,11 +24,11 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -95,11 +95,11 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -189,12 +189,12 @@ msgid ""
 "distribution mirror. You can also add your own repositories for backports, "
 "experimental or custom packages, or include packages directly as files. You "
 "can define your own lists of packages to include, use live-build's "
-"predefined lists, use #{tasksel}# tasks, or a combination of all three. "
-"Finally, a number of options give some control over apt, or if you prefer, "
-"aptitude, at build time when packages are installed. You may find these "
-"handy if you use a proxy, want to disable installation of recommended "
-"packages to save space, or need to control which versions of packages are "
-"installed via APT pinning, to name a few possibilities."
+"predefined lists, use /{tasksel}/ tasks, or a combination of all three. "
+"Finally, a number of options give some control over /{apt}/, or if you "
+"prefer, /{aptitude}/, at build time when packages are installed. You may "
+"find these handy if you use a proxy, want to disable installation of "
+"recommended packages to save space, or need to control which versions of "
+"packages are installed via APT pinning, to name a few possibilities."
 msgstr ""
 "Quizás la tarea más básica de personalización en Debian Live es la selección "
 "de paquetes que serán incluidos en la imagen. Este capítulo orienta a través "
@@ -207,14 +207,14 @@ msgstr ""
 "más cercano. Se pueden añadir repositorios para backports, experimentales, "
 "paquetes personalizados o incluir ficheros de paquetes directamente. Se "
 "pueden definir listas de paquetes personalizadas, utilizar listas "
-"predefinidas en live-build, seleccionar tareas de #{tasksel}# o una "
+"predefinidas en live-build, seleccionar tareas de /{tasksel}/ o una "
 "combinación de los tres métodos. Por último existen varias opciones que dan "
-"algún control sobre cuando son instalados los paquetes por la herramienta "
-"apt o la herramienta aptitude, según sea la elegida. Estas opciones pueden "
-"ser útiles si se utiliza un proxy, se quiere desactivar la instalación de "
-"paquetes recomendados para ahorrar espacio o se necesita controlar las "
-"versiones de los paquetes a instalar mediante APT pinning, por nombrar "
-"algunas posibilidades."
+"algún control sobre cuando son instalados los paquetes por la herramienta /"
+"{apt}/ o la herramienta /{aptitude}/, según sea la elegida. Estas opciones "
+"pueden ser útiles si se utiliza un proxy, se quiere desactivar la "
+"instalación de paquetes recomendados para ahorrar espacio o se necesita "
+"controlar las versiones de los paquetes a instalar mediante APT pinning, por "
+"nombrar algunas posibilidades."
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:8
@@ -231,7 +231,7 @@ msgstr "3~ Distribución, áreas de archivo y modo"
 msgid ""
 "The distribution you choose has the broadest impact on which packages are "
 "available to include in your live image. Specify the codename, which "
-"defaults to #{wheezy}# for the wheezy version of live-build. Any current "
+"defaults to wheezy for the wheezy version of live-build. Any current "
 "distribution carried in the Debian archive may be specified by its codename "
 "here. (See {Terms}#terms for more details.) The #{--distribution}# option "
 "not only influences the source of packages within the archive, but also "
@@ -241,14 +241,14 @@ msgid ""
 msgstr ""
 "La distribución seleccionada tiene gran impacto en qué paquetes están "
 "disponibles para incluir en la imagen. Se debe indicar el nombre en clave de "
-"la distribución, que por defecto es #{wheezy}# para la versión wheezy de "
-"live-build. Se puede especificar cualquier nombre de distribución disponible "
-"en los repositorios Debian indicando su nombre en clave. (Para más detalles "
-"ver {Términos}#terms). La opción #{--distribution}# no solamente influencia "
-"la fuente de los paquetes dentro del archivo Debian, sino que instruye a /"
-"{live-build}/ a comportarse tal y como se necesita para construir cada una "
-"de las distribuciones. Por ejemplo, para construir contra la versión *"
-"{inestable}*, sid, se debe indicar: "
+"la distribución, que por defecto es wheezy para la versión wheezy de live-"
+"build. Se puede especificar cualquier nombre de distribución disponible en "
+"los repositorios Debian indicando su nombre en clave. (Para más detalles ver "
+"{Términos}#terms). La opción #{--distribution}# no solamente influencia la "
+"fuente de los paquetes dentro del archivo Debian, sino que instruye a live-"
+"build a comportarse tal y como se necesita para construir cada una de las "
+"distribuciones. Por ejemplo, para construir contra la versión *{inestable}*, "
+"sid, se debe indicar: "
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:16
@@ -656,14 +656,14 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:125
 msgid ""
-"For example, to make a list that includes the predefined #{gnome}# list plus "
-"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
-"contents:"
+"For example, to make a list that includes the predefined #{gnome}# list "
+"plus /{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the "
+"following contents:"
 msgstr ""
 "Por ejemplo, para hacer una lista de paquetes que incluya la lista de "
-"paquetes predefinida #{gnome}# y añadir el paquete iceweasel se puede crear "
-"un fichero llamado #{config/package-lists/my.list.chroot}# con el siguiente "
-"contenido:"
+"paquetes predefinida #{gnome}# y añadir el paquete /{iceweasel}/ se puede "
+"crear un fichero llamado #{config/package-lists/my.list.chroot}# con el "
+"siguiente contenido:"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:130
@@ -718,12 +718,12 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:148
 msgid ""
-"You may test for any one of a number of values, e.g. to install #{memtest86+}"
-"# if either #{--architectures i386}# or #{--architectures amd64}# is "
-"specified:"
+"You may test for any one of a number of values, e.g. to install /"
+"{memtest86+}/ if either #{--architectures i386}# or #{--architectures amd64}"
+"# is specified:"
 msgstr ""
 "En la expresión condicional pueden utilizarse varios valores. Por ejemplo "
-"para instalar el paquete #{memtest86+}# si la arquitectura es i386 (#{--"
+"para instalar el paquete /{memtest86+}/ si la arquitectura es i386 (#{--"
 "architectures i386}#) o es amd64 (#{--architectures amd64}#) se puede "
 "especificar:"
 
@@ -1152,14 +1152,14 @@ msgstr "3~choosing-apt-or-aptitude Utilizar apt o aptitude"
 #. type: Plain text
 #: en/user_customization-packages.ssi:266
 msgid ""
-"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
+"You can elect to use either /{apt}/ or /{aptitude}/ when installing packages "
 "at build time. Which utility is used is governed by the #{--apt}# argument "
 "to #{lb config}#. Choose the method implementing the preferred behaviour for "
 "package installation, the notable difference being how missing packages are "
 "handled."
 msgstr ""
-"Se puede seleccionar qué herramienta se utilizará para instalar paquetes, #"
-"{apt}# o #{aptitude}#, en el momento de crear la imagen mediante la opción #"
+"Se puede seleccionar qué herramienta se utilizará para instalar paquetes, /"
+"{apt}/ o /{aptitude}/, en el momento de crear la imagen mediante la opción #"
 "{--apt}# de #{lb config}#. Esta selección definirá el comportamiento "
 "preferido en la instalación de paquetes, siendo la mayor diferencia la "
 "manera de tratar los paquetes no disponibles."
@@ -1390,9 +1390,9 @@ msgid ""
 "the case where you do not want a package that is recommended by another "
 "package. Suppose you are building an LXDE image using #{--package-lists lxde}"
 "# option, but don't want the user prompted to store wifi passwords in the "
-"keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
-"turn recommends #{gnome-keyring}#. So you want to omit the recommended #"
-"{gnome-keyring}# package. This can be done by adding the following stanza to "
+"keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in "
+"turn recommends /{gnome-keyring}/. So you want to omit the recommended /"
+"{gnome-keyring}/ package. This can be done by adding the following stanza to "
 "#{config/chroot_apt/preferences}#:"
 msgstr ""
 "Una prioridad pin negativa previene la instalación de un paquete, como puede "
@@ -1400,9 +1400,9 @@ msgstr ""
 "instalado al instalar el primero. Supongamos que se está creando una imagen "
 "LXDE mediante la opción #{--package-lists lxde}#, pero no se desea preguntar "
 "al usuario si desea almacenar las claves wifi en el almacen de claves. La "
-"lista lxde incluye #{gdm}#, la cual depende de #{gksu}# que a su vez "
-"recomienda #{gnome-keyring}#. Así que el objetivo es omitir la instalación "
-"del paquete #{gnome-keyring}#, que puede conseguirse añadiendo un fichero "
+"lista lxde incluye /{gdm}/, la cual depende de /{gksu}/ que a su vez "
+"recomienda /{gnome-keyring}/. Así que el objetivo es omitir la instalación "
+"del paquete /{gnome-keyring}/, que puede conseguirse añadiendo un fichero "
 "con el siguiente contenido a #{config/chroot_apt/preferences}#:"
 
 #. type: Plain text
diff --git a/manual/po/es/user_examples.ssi.po b/manual/po/es/user_examples.ssi.po
index 454fb2f..c5f6ace 100644
--- a/manual/po/es/user_examples.ssi.po
+++ b/manual/po/es/user_examples.ssi.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 14:58+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2012-02-19 18:29+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -27,11 +27,11 @@ msgid ":B~ Examples"
 msgstr ":B~ Ejemplos"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -98,11 +98,11 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -472,17 +472,17 @@ msgid ""
 "First, #{--architectures i386}# ensures that on our #{amd64}# build system, "
 "we build a 32-bit version suitable for use on most machines. Second, we use #"
 "{--linux-flavours 686-pae}# because we don't anticipate using this image on "
-"much older systems. Third, we've chosen the #{lxde}# package list to give us "
+"much older systems. Third, we've chosen the /{lxde}/ package list to give us "
 "a minimal desktop. And finally, we have added two initial favourite "
-"packages: #{iceweasel}# and #{xchat}#."
+"packages: /{iceweasel}/ and /{xchat}/."
 msgstr ""
 "En primer lugar con #{--architectures i386}# se asegura de que en nuestro "
 "sistema de creación #{amd64}# se crea una versión de 32-bits adecuada para "
 "ser usada en la mayoría de máquinas. En segundo lugar, se usa #{--linux-"
 "flavours 686-pae}# porque no se espera usar esta imagen en sistemas mucho "
-"más viejos. En tercer lugar se elige la lista de paquetes #{lxde}# para "
+"más viejos. En tercer lugar se elige la lista de paquetes /{lxde}/ para "
 "proporcionar un escritorio mínimo. Y, por último, se añaden dos paquetes "
-"iniciales favoritos: #{iceweasel}# y #{xchat}#."
+"iniciales favoritos: /{iceweasel}/ y /{xchat}/."
 
 #. type: Plain text
 #: en/user_examples.ssi:115
diff --git a/manual/po/es/user_managing_a_configuration.ssi.po b/manual/po/es/user_managing_a_configuration.ssi.po
index b6fa722..dbdf6a7 100644
--- a/manual/po/es/user_managing_a_configuration.ssi.po
+++ b/manual/po/es/user_managing_a_configuration.ssi.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2012-03-19 20:54+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -22,28 +22,30 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 en/project_bugs.ssi:60
-#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
-#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
-#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
 #: en/user_customization-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -67,21 +69,22 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -90,28 +93,30 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:64
-#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
-#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
-#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
 #: en/user_customization-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -135,21 +140,22 @@ msgstr "code{"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -248,7 +254,7 @@ msgid ""
 "variable values, and each time you run #{lb config}# and #{lb clean}#, these "
 "files will be executed. This will ensure that your configuration is kept "
 "internally consistent from one revision to the next and from one live-build "
-"release to the next (though you will still have to take care and read the "
+"release to the next (Although you will still have to take care and read the "
 "documentation when you upgrade live-build and make adjustments as needed)."
 msgstr ""
 "Todo esto sería un terrible embrollo si no fuese por los scripts auto/* "
diff --git a/manual/po/es/user_overview.ssi.po b/manual/po/es/user_overview.ssi.po
index d0deb19..fcf8900 100644
--- a/manual/po/es/user_overview.ssi.po
+++ b/manual/po/es/user_overview.ssi.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2011-11-07 14:47+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -22,11 +22,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -93,11 +93,11 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -248,12 +248,12 @@ msgstr ""
 msgid ""
 "Unlike /{debhelper}/, live-build contains a tool to generate a skeleton "
 "configuration directory, #{lb config}#. This could be considered to be "
-"similar to tools such as #{dh-make}#. For more information about #{lb config}"
+"similar to tools such as /{dh-make}/. For more information about #{lb config}"
 "#, please see {The lb config command}#lb-config."
 msgstr ""
 "A diferencia de /{debhelper}/, live-build contiene una herramienta para "
 "crear un directorio de configuración en esqueleto, #{lb config}#. Ésto "
-"podría ser considerado como similar a herramientas tales como #{dh-make}#. "
+"podría ser considerado como similar a herramientas tales como /{dh-make}/. "
 "Para obtener más información sobre #{lb config}#, consultar {El comando lb "
 "config }#lb-config"
 
diff --git a/manual/po/fr/about_manual.ssi.po b/manual/po/fr/about_manual.ssi.po
index a170f88..65d4100 100644
--- a/manual/po/fr/about_manual.ssi.po
+++ b/manual/po/fr/about_manual.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-14 12:48+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2012-04-14 12:53+0200\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -197,10 +197,10 @@ msgstr ""
 #: en/about_manual.ssi:32
 msgid ""
 "_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
-"boot was formerly a part of live-initramfs."
+"boot was formerly a part of /{live-initramfs}/."
 msgstr ""
 "_* *{live-boot}*: Une collection de scripts utilisés pour lancer des "
-"systèmes live. live-boot faisait initialement partie de live-initramfs."
+"systèmes live. live-boot faisait initialement partie de /{live-initramfs}/."
 
 #. type: Plain text
 #: en/about_manual.ssi:34
@@ -782,16 +782,16 @@ msgstr ""
 #: en/about_manual.ssi:211
 msgid ""
 "_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
-"in.pot files to your language with your favourite editor (such as poedit). "
-"Send translated files to the mailing list. Once we have reviewed your "
-"submission, we will add the new language to the manual (providing the po "
-"files) and will enable it in the autobuild."
+"in.pot files to your language with your favourite editor (such as /"
+"{poedit}/). Send translated files to the mailing list. Once we have reviewed "
+"your submission, we will add the new language to the manual (providing the "
+"po files) and will enable it in the autobuild."
 msgstr ""
 "_* Traduire les fichiers about_manual.ssi.pot, about_project.ssi.pot et "
-"index.html.in.pot à votre langue avec votre éditeur préféré (comme poedit). "
-"Envoyer les fichiers traduits à la liste de diffusion. Une fois que nous "
-"avons examiné votre livraison, nous allons ajouter une nouvelle langue au "
-"manuel (avec les fichiers po) et l'activer dans l'autobuild."
+"index.html.in.pot à votre langue avec votre éditeur préféré (comme /"
+"{poedit}/). Envoyer les fichiers traduits à la liste de diffusion. Une fois "
+"que nous avons examiné votre livraison, nous allons ajouter une nouvelle "
+"langue au manuel (avec les fichiers po) et l'activer dans l'autobuild."
 
 #. type: Plain text
 #: en/about_manual.ssi:213
diff --git a/manual/po/fr/user_basics.ssi.po b/manual/po/fr/user_basics.ssi.po
index cee7089..5d0adee 100644
--- a/manual/po/fr/user_basics.ssi.po
+++ b/manual/po/fr/user_basics.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 16:54+0300\n"
+"POT-Creation-Date: 2012-04-14 16:31+0300\n"
 "PO-Revision-Date: 2012-03-17 20:08+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -89,11 +89,11 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -510,15 +510,14 @@ msgid ""
 "Once you've booted the media, you are presented with a boot menu. If you "
 "just press enter here, the system will boot using the default entry, #{Live}"
 "# and default options. For more information about boot options, see the "
-"\"help\" entry in the menu and also the #{live-boot}# and #{live-config}# "
-"man pages found within the live system."
+"\"help\" entry in the menu and also the live-boot and live-config man pages "
+"found within the live system."
 msgstr ""
 "Une fois que vous avez démarré le support, vous êtes présenté avec un menu "
 "de démarrage. Si vous appuyez simplement sur enter ici, le système va "
 "démarrer en utilisant l'entrée par défaut, #{Live}# Pour plus d'informations "
 "sur les options de démarrage, consultez l'entrée «Help» dans le menu et "
-"aussi les pages de manuel de #{live-boot}# et #{live-config}# dans le "
-"système live."
+"aussi les pages de manuel de live-boot et live-config dans le système live."
 
 #. type: Plain text
 #: en/user_basics.ssi:86
@@ -608,25 +607,25 @@ msgstr "3~testing-iso-with-qemu Test d'une image ISO avec QEMU"
 #: en/user_basics.ssi:104
 msgid ""
 "The most versatile VM in Debian is QEMU. If your processor has hardware "
-"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
+"support for virtualization, use the /{qemu-kvm}/ package; the /{qemu-kvm}/ "
 "package description briefly lists the requirements."
 msgstr ""
 "La VM la plus polyvalente de Debian est QEMU. Si votre processeur possède un "
-"support matériel pour la virtualisation, vouz pouvez utiliser le paquet #"
-"{qemu-kvm}#; La description du paquet #{qemu-kvm}# énumère brièvement les "
+"support matériel pour la virtualisation, vouz pouvez utiliser le paquet /"
+"{qemu-kvm}/; La description du paquet /{qemu-kvm}/ énumère brièvement les "
 "exigences."
 
 #. type: Plain text
 #: en/user_basics.ssi:106
 msgid ""
-"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
-"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
-"the following examples. The #{qemu-utils}# package is also valuable for "
+"First, install /{qemu-kvm}/ if your processor supports it. If not, install /"
+"{qemu}/, in which case the program name is #{qemu}# instead of #{kvm}# in "
+"the following examples. The /{qemu-utils}/ package is also valuable for "
 "creating virtual disk images with #{qemu-img}#."
 msgstr ""
-"Tout d'abord, installez #{qemu-kvm}# si votre processeur le soutient. Sinon, "
-"installez #{qemu}#, dans ce cas, le nom du programme est #{qemu}# au lieu de "
-"#{kvm}# dans les exemples suivants. Le paquet #{qemu-utils}# est également "
+"Tout d'abord, installez /{qemu-kvm}/ si votre processeur le soutient. Sinon, "
+"installez /{qemu}/, dans ce cas, le nom du programme est #{qemu}# au lieu de "
+"#{kvm}# dans les exemples suivants. Le paquet /{qemu-utils}/ est également "
 "valuable pour créer des images disque virtuels avec #{qemu-img}#."
 
 #. type: Plain text
@@ -793,13 +792,13 @@ msgstr "3~testing-hdd-with-qemu Test d'une image HDD avec Qemu"
 #. type: Plain text
 #: en/user_basics.ssi:182
 msgid ""
-"First, install QEMU as described above in {Testing an ISO image with QEMU}"
-"#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on which "
-"version your host system needs, specifying #{binary.img}# as the first hard "
-"drive."
+"First, install /{qemu}/ as described above in {Testing an ISO image with "
+"QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on "
+"which version your host system needs, specifying #{binary.img}# as the first "
+"hard drive."
 msgstr ""
-"D'abord, installer QEMU comme décrit ci-dessus dans {Test d'une image ISO "
-"avec QEMU}#testing-iso-with-qemu. Ensuite, exécutez #{kvm}# ou #{qemu}#, "
+"D'abord, installer /{qemu}/ comme décrit ci-dessus dans {Test d'une image "
+"ISO avec QEMU}#testing-iso-with-qemu. Ensuite, exécutez #{kvm}# ou #{qemu}#, "
 "selon la version de vos besoins du système hôte, précisant #{binary.img}# "
 "comme le premier disque dur."
 
@@ -819,13 +818,13 @@ msgstr ""
 #: en/user_basics.ssi:192
 msgid ""
 "To use the remaining free space after copying #{binary.img}# to a USB stick, "
-"use a partitioning tool such as #{gparted}# or #{parted}# to create a new "
+"use a partitioning tool such as /{gparted}/ or /{parted}/ to create a new "
 "partition on the stick. The first partition will be used by the Debian Live "
 "system."
 msgstr ""
 "Pour utiliser l'espace libre restant après avoir copié #{binary.img}# sur "
-"une clé USB, utilisez un outil de partitionnement tels que #{gparted}# ou #"
-"{parted}# afin de créer une nouvelle partition sur la clé. La première "
+"une clé USB, utilisez un outil de partitionnement tels que /{gparted}/ ou /"
+"{parted}/ afin de créer une nouvelle partition sur la clé. La première "
 "partition sera utilisée par le système Debian Live."
 
 #. type: Plain text
@@ -1081,8 +1080,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:294
-msgid "You need to install the #{nfs-kernel-server}# package."
-msgstr "Vous devez installer le paquet #{nfs-kernel-server}#."
+msgid "You need to install the /{nfs-kernel-server}/ package."
+msgstr "Vous devez installer le paquet /{nfs-kernel-server}/."
 
 #. type: Plain text
 #: en/user_basics.ssi:296
@@ -1160,8 +1159,8 @@ msgstr "3~ Qemu"
 
 #. type: Plain text
 #: en/user_basics.ssi:322
-msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
-msgstr "_* Installer #{qemu}#, #{bridge-utils}#, #{sudo}#."
+msgid "_* Install /{qemu}/, /{bridge-utils}/, /{sudo}/."
+msgstr "_* Installer /{qemu}/, /{bridge-utils}/, /{sudo}/."
 
 #. type: Plain text
 #: en/user_basics.ssi:324
diff --git a/manual/po/fr/user_customization-contents.ssi.po b/manual/po/fr/user_customization-contents.ssi.po
index 0494854..5c48977 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: 2012-01-15 16:28+0100\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2012-03-17 19:20+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -18,16 +18,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
-#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
-#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
-#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
 #: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
 #: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
 #: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -35,9 +38,10 @@ msgstr ""
 #: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
 #: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
 #: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
 #: en/user_customization-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -61,39 +65,43 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
-#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
-#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
-#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
 #: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
 #: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
 #: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -101,9 +109,10 @@ msgstr "code{"
 #: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
 #: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
 #: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
 #: en/user_customization-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -127,25 +136,26 @@ msgstr "code{"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr "}code"
 
@@ -270,13 +280,13 @@ msgstr ""
 #: en/user_customization-contents.ssi:24
 msgid ""
 "To include files, simply add them to your #{config/includes.chroot}# "
-"directory. This directory corresponds to the root directory (#{/}#) of the "
+"directory. This directory corresponds to the root directory #{/}# of the "
 "live system. For example, to add a file #{/var/www/index.html}# in the live "
 "system, use:"
 msgstr ""
 "Pour inclure des fichiers, il suffit de les ajouter à votre répertoire #"
-"{config/includes.chroot}#. Ce répertoire correspond au répertoire racine (#"
-"{/}#) du système live. Par exemple, pour ajouter un fichier #{/var/www/index."
+"{config/includes.chroot}#. Ce répertoire correspond au répertoire racine #{/}"
+"# du système live. Par exemple, pour ajouter un fichier #{/var/www/index."
 "html}# dans le système live, utilisez:"
 
 #. type: Plain text
@@ -502,8 +512,8 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-contents.ssi:93
 msgid ""
-"For more information about debconf, please see debconf(7) in the #{debconf}# "
-"package."
+"For more information about debconf, please see #{debconf(7)}# in the /"
+"{debconf}/ package."
 msgstr ""
-"Pour plus d'informations sur debconf, s'il vous plaît voir debconf(7) dans "
-"le paquet #{debconf}#."
+"Pour plus d'informations sur debconf, s'il vous plaît voir #{debconf(7)}# "
+"dans le paquet /{debconf}/."
diff --git a/manual/po/fr/user_customization-overview.ssi.po b/manual/po/fr/user_customization-overview.ssi.po
index 9d3e0dd..8961a3b 100644
--- a/manual/po/fr/user_customization-overview.ssi.po
+++ b/manual/po/fr/user_customization-overview.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2012-03-17 20:27+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -158,7 +158,7 @@ msgstr "2~ Supplément lb config avec des fichiers"
 #. type: Plain text
 #: en/user_customization-overview.ssi:22
 msgid ""
-"Although #{lb config}# does create a skeletal configuration in the config/ "
+"Although #{lb config}# creates a skeletal configuration in the config/ "
 "directory, to accomplish your goals, you may need to provide additional "
 "files in subdirectories of config/. Depending on where the files are stored "
 "in the configuration, they may be copied into the live system's filesystem "
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index f8c14ff..b0e1f65 100644
--- a/manual/po/fr/user_customization-packages.ssi.po
+++ b/manual/po/fr/user_customization-packages.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 14:10+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2012-03-17 19:13+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -89,11 +89,11 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -183,12 +183,12 @@ msgid ""
 "distribution mirror. You can also add your own repositories for backports, "
 "experimental or custom packages, or include packages directly as files. You "
 "can define your own lists of packages to include, use live-build's "
-"predefined lists, use #{tasksel}# tasks, or a combination of all three. "
-"Finally, a number of options give some control over apt, or if you prefer, "
-"aptitude, at build time when packages are installed. You may find these "
-"handy if you use a proxy, want to disable installation of recommended "
-"packages to save space, or need to control which versions of packages are "
-"installed via APT pinning, to name a few possibilities."
+"predefined lists, use /{tasksel}/ tasks, or a combination of all three. "
+"Finally, a number of options give some control over /{apt}/, or if you "
+"prefer, /{aptitude}/, at build time when packages are installed. You may "
+"find these handy if you use a proxy, want to disable installation of "
+"recommended packages to save space, or need to control which versions of "
+"packages are installed via APT pinning, to name a few possibilities."
 msgstr ""
 "La personnalisation la plus fondamentale d'un système Debian Live peut-être "
 "la sélection de paquets à inclure dans l'image. Ce chapitre vous guide tout "
@@ -201,13 +201,14 @@ msgstr ""
 "dépôts pour les backports, paquets expérimentaux ou personnalisés, ou "
 "inclure des paquets directement en tant que fichiers. Vous pouvez définir "
 "vos propres listes de paquets à inclure, utiliser des listes prédéfinies de "
-"live-build, utiliser tâches #{tasksel}#, ou une combinaison des trois. "
-"Enfin, un certain nombre d'options donnent un certain contrôle sur apt, ou "
-"si vous préférez, aptitude, au moment de la construction quand les paquets "
-"sont installés. Vous pouvez trouver ces très pratique si vous utilisez un "
-"proxy, vous voulez désactiver l'installation des paquets recommandés pour "
-"économiser l'espace, ou avez besoin de contrôler quels versions des paquets "
-"sont installés via APT pinning, pour n'en nommer quelques possibilités."
+"live-build, utiliser tâches /{tasksel}/, ou une combinaison des trois. "
+"Enfin, un certain nombre d'options donnent un certain contrôle sur /{apt}/, "
+"ou si vous préférez, /{aptitude}/, au moment de la construction quand les "
+"paquets sont installés. Vous pouvez trouver ces très pratique si vous "
+"utilisez un proxy, vous voulez désactiver l'installation des paquets "
+"recommandés pour économiser l'espace, ou avez besoin de contrôler quels "
+"versions des paquets sont installés via APT pinning, pour n'en nommer "
+"quelques possibilités."
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:8
@@ -224,7 +225,7 @@ msgstr "3~ Distribution, archive areas et mode"
 msgid ""
 "The distribution you choose has the broadest impact on which packages are "
 "available to include in your live image. Specify the codename, which "
-"defaults to #{wheezy}# for the wheezy version of live-build. Any current "
+"defaults to wheezy for the wheezy version of live-build. Any current "
 "distribution carried in the Debian archive may be specified by its codename "
 "here. (See {Terms}#terms for more details.) The #{--distribution}# option "
 "not only influences the source of packages within the archive, but also "
@@ -234,13 +235,12 @@ msgid ""
 msgstr ""
 "La distribution que vous choisissez a le plus large impact sur les paquets "
 "qui sont disponibles à inclure dans votre image live. Indiquez le nom de "
-"code, qui est par défaut #{wheezy}# pour la version de live-build dans "
-"wheezy. Toute distribution actuelle dans l'archive Debian peut être spécifié "
-"par son nom de code ici. (Voir {Termes}#terms pour plus de détails.) "
-"L'option #{--distribution}# non seulement influence la source des paquets "
-"dans l'archive, mais aussi dit live-build comme it doit construire chaque "
-"distribution soutenue. Par exemple, pour construire contre *{unstable}*, "
-"sid, précisez: "
+"code, qui est par défaut wheezy pour la version de live-build dans wheezy. "
+"Toute distribution actuelle dans l'archive Debian peut être spécifié par son "
+"nom de code ici. (Voir {Termes}#terms pour plus de détails.) L'option #{--"
+"distribution}# non seulement influence la source des paquets dans l'archive, "
+"mais aussi dit live-build comme it doit construire chaque distribution "
+"soutenue. Par exemple, pour construire contre *{unstable}*, sid, précisez: "
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:16
@@ -643,12 +643,12 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:125
 msgid ""
-"For example, to make a list that includes the predefined #{gnome}# list plus "
-"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
-"contents:"
+"For example, to make a list that includes the predefined #{gnome}# list "
+"plus /{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the "
+"following contents:"
 msgstr ""
 "Par exemple, pour faire une liste qui comprend la liste prédéfinie #{gnome}"
-"#, plus iceweasel, créer #{config/package-lists/my.list.chroot}# avec le "
+"#, plus /{iceweasel}/, créer #{config/package-lists/my.list.chroot}# avec le "
 "contenu suivant:"
 
 #. type: Plain text
@@ -703,12 +703,12 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:148
 msgid ""
-"You may test for any one of a number of values, e.g. to install #{memtest86+}"
-"# if either #{--architectures i386}# or #{--architectures amd64}# is "
-"specified:"
+"You may test for any one of a number of values, e.g. to install /"
+"{memtest86+}/ if either #{--architectures i386}# or #{--architectures amd64}"
+"# is specified:"
 msgstr ""
 "Vous pouvez tester pour un certain nombre de valeurs, par exemple pour "
-"installer #{memtest86+}# si #{--architectures i386}# ou #{--architectures "
+"installer /{memtest86+}/ si #{--architectures i386}# ou #{--architectures "
 "amd64}# est spécifié:"
 
 #. type: Plain text
@@ -1132,13 +1132,13 @@ msgstr "3~choosing-apt-or-aptitude Choisir apt ou aptitude"
 #. type: Plain text
 #: en/user_customization-packages.ssi:266
 msgid ""
-"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
+"You can elect to use either /{apt}/ or /{aptitude}/ when installing packages "
 "at build time. Which utility is used is governed by the #{--apt}# argument "
 "to #{lb config}#. Choose the method implementing the preferred behaviour for "
 "package installation, the notable difference being how missing packages are "
 "handled."
 msgstr ""
-"Vous pouvez choisir d'utiliser soit #{apt}# ou #{aptitude}#  Quel logiciel "
+"Vous pouvez choisir d'utiliser soit /{apt}/ ou /{aptitude}/  Quel logiciel "
 "est utilisé est régi par l'argument #{--apt}# de #{lb config}#. Choisissez "
 "la méthode du comportement préférée pour l'installation de paquets, la "
 "différence notable étant la manière dont les paquets manquants sont traitées."
@@ -1368,9 +1368,9 @@ msgid ""
 "the case where you do not want a package that is recommended by another "
 "package. Suppose you are building an LXDE image using #{--package-lists lxde}"
 "# option, but don't want the user prompted to store wifi passwords in the "
-"keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
-"turn recommends #{gnome-keyring}#. So you want to omit the recommended #"
-"{gnome-keyring}# package. This can be done by adding the following stanza to "
+"keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in "
+"turn recommends /{gnome-keyring}/. So you want to omit the recommended /"
+"{gnome-keyring}/ package. This can be done by adding the following stanza to "
 "#{config/chroot_apt/preferences}#:"
 msgstr ""
 "Une priorité pin négative évitera installér un paquet, comme dans le cas où "
@@ -1378,8 +1378,8 @@ msgstr ""
 "Supposons que vous construisez une image LXDE en utilisant l'option #{--"
 "package-lists lxde}# mais ne veulez pas que l'utilisateur soit invité à "
 "stocker les mots de passe wifi dans le trousseau de clés. Cette liste "
-"comprend #{gdm}#, que dépend de #{gksu}#, que à son tour recommends #{gnome-"
-"keyring}#. Donc, vous voulez omettre le paquet recommandé #{gnome-keyring}#. "
+"comprend /{gdm}/, que dépend de /{gksu}/, que à son tour recommande /{gnome-"
+"keyring}/. Donc, vous voulez omettre le paquet recommandé /{gnome-keyring}/. "
 "Cela peut être fait en ajoutant la strophe suivante à #{config/chroot_apt/"
 "preferences}#:"
 
diff --git a/manual/po/fr/user_examples.ssi.po b/manual/po/fr/user_examples.ssi.po
index a1b30d5..e6a11ee 100644
--- a/manual/po/fr/user_examples.ssi.po
+++ b/manual/po/fr/user_examples.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 14:58+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2012-03-17 18:13+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -23,11 +23,11 @@ msgid ":B~ Examples"
 msgstr ":B~ Exemples"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -94,11 +94,11 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -467,17 +467,17 @@ msgid ""
 "First, #{--architectures i386}# ensures that on our #{amd64}# build system, "
 "we build a 32-bit version suitable for use on most machines. Second, we use #"
 "{--linux-flavours 686-pae}# because we don't anticipate using this image on "
-"much older systems. Third, we've chosen the #{lxde}# package list to give us "
+"much older systems. Third, we've chosen the /{lxde}/ package list to give us "
 "a minimal desktop. And finally, we have added two initial favourite "
-"packages: #{iceweasel}# and #{xchat}#."
+"packages: /{iceweasel}/ and /{xchat}/."
 msgstr ""
 "Tout d'abord, #{--architectures i386}# assure que sur notre système de "
 "construction #{amd64}#, nous construisons une version 32 bits qui peut être "
 "utilisé sur la plupart des machines. Deuxièmement, nous utilisons #{--linux-"
 "flavours 686-pae}# parce que nous ne prévoyons pas utiliser cette image sur "
 "des systèmes beaucoup plus anciens. Troisièmement, nous avons choisi la "
-"liste des paquets #{lxde}# pour nous donner un bureau minimal. Et enfin, "
-"nous avons ajouté deux premiers paquets préférés: #{iceweasel}# et #{xchat}#."
+"liste de paquets /{lxde}/ pour nous donner un bureau minimal. Et enfin, nous "
+"avons ajouté deux premiers paquets préférés: /{iceweasel}/ et /{xchat}/."
 
 #. type: Plain text
 #: en/user_examples.ssi:115
diff --git a/manual/po/fr/user_managing_a_configuration.ssi.po b/manual/po/fr/user_managing_a_configuration.ssi.po
index 469ccae..789662b 100644
--- a/manual/po/fr/user_managing_a_configuration.ssi.po
+++ b/manual/po/fr/user_managing_a_configuration.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2012-03-19 21:02+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -18,28 +18,30 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 en/project_bugs.ssi:60
-#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
-#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
-#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
 #: en/user_customization-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -63,21 +65,22 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -86,28 +89,30 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:64
-#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
-#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
-#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
 #: en/user_customization-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -131,21 +136,22 @@ msgstr "code{"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -237,7 +243,7 @@ msgid ""
 "variable values, and each time you run #{lb config}# and #{lb clean}#, these "
 "files will be executed. This will ensure that your configuration is kept "
 "internally consistent from one revision to the next and from one live-build "
-"release to the next (though you will still have to take care and read the "
+"release to the next (Although you will still have to take care and read the "
 "documentation when you upgrade live-build and make adjustments as needed)."
 msgstr ""
 "Tout cela serait une nuisance terrible si ce n'était pas pour les scripts "
diff --git a/manual/po/fr/user_overview.ssi.po b/manual/po/fr/user_overview.ssi.po
index d89ae92..6666997 100644
--- a/manual/po/fr/user_overview.ssi.po
+++ b/manual/po/fr/user_overview.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2012-03-17 20:12+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -89,11 +89,11 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -243,12 +243,12 @@ msgstr ""
 msgid ""
 "Unlike /{debhelper}/, live-build contains a tool to generate a skeleton "
 "configuration directory, #{lb config}#. This could be considered to be "
-"similar to tools such as #{dh-make}#. For more information about #{lb config}"
+"similar to tools such as /{dh-make}/. For more information about #{lb config}"
 "#, please see {The lb config command}#lb-config."
 msgstr ""
 "Contrairement à /{debhelper}/, live-build contient un outil pour générer une "
 "arborescence de configuration, #{lb config}#. Cela pourrait être considéré "
-"comme similaire à des outils tels que #{dh-make}#.  Pour plus d'informations "
+"comme similaire à des outils tels que /{dh-make}/.  Pour plus d'informations "
 "à propos de #{lb config}#, s'il vous plaît voir {La commande lb config}#lb-"
 "config."
 
diff --git a/manual/po/it/about_manual.ssi.po b/manual/po/it/about_manual.ssi.po
index ef3aa90..efee33e 100644
--- a/manual/po/it/about_manual.ssi.po
+++ b/manual/po/it/about_manual.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-14 12:48+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2012-04-03 20:21+0200\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -171,10 +171,10 @@ msgstr "_* *{Target system}*: L'ambiente usato per eseguire il sistema live."
 #: en/about_manual.ssi:32
 msgid ""
 "_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
-"boot was formerly a part of live-initramfs."
+"boot was formerly a part of /{live-initramfs}/."
 msgstr ""
 "_* *{live-boot}*: Una raccolta di script usati per avviare sistemi live. "
-"live-boot era una parte di live-initramfs."
+"live-boot era una parte di /{live-initramfs}/."
 
 #. type: Plain text
 #: en/about_manual.ssi:34
@@ -762,16 +762,16 @@ msgstr ""
 #: en/about_manual.ssi:211
 msgid ""
 "_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
-"in.pot files to your language with your favourite editor (such as poedit). "
-"Send translated files to the mailing list. Once we have reviewed your "
-"submission, we will add the new language to the manual (providing the po "
-"files) and will enable it in the autobuild."
+"in.pot files to your language with your favourite editor (such as /"
+"{poedit}/). Send translated files to the mailing list. Once we have reviewed "
+"your submission, we will add the new language to the manual (providing the "
+"po files) and will enable it in the autobuild."
 msgstr ""
 "_* Tradurre i file about_manual.ssi.pot, about_project.ssi.pot e index.html."
-"in.pot nella propria lingua con il proprio editor preferito (tipo poedit). "
-"Inviare i file tradotti alla mailing list. Una volta che abbiamo ricevuto il "
-"contributo, aggiungeremo la nuova lingua al manuale (fornendo i file po) e "
-"la attiveremo per la procedura di compilazione automatica."
+"in.pot nella propria lingua con il proprio editor preferito (tipo /"
+"{poedit}/). Inviare i file tradotti alla mailing list. Una volta che abbiamo "
+"ricevuto il contributo, aggiungeremo la nuova lingua al manuale (fornendo i "
+"file po) e la attiveremo per la procedura di compilazione automatica."
 
 #. type: Plain text
 #: en/about_manual.ssi:213
diff --git a/manual/po/it/user_basics.ssi.po b/manual/po/it/user_basics.ssi.po
index 5a35cdb..e081b34 100644
--- a/manual/po/it/user_basics.ssi.po
+++ b/manual/po/it/user_basics.ssi.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 16:54+0300\n"
+"POT-Creation-Date: 2012-04-14 16:31+0300\n"
 "PO-Revision-Date: 2012-04-03 17:59+0200\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2: plural=(n !=1)\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -90,11 +90,11 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -503,13 +503,13 @@ msgid ""
 "Once you've booted the media, you are presented with a boot menu. If you "
 "just press enter here, the system will boot using the default entry, #{Live}"
 "# and default options. For more information about boot options, see the "
-"\"help\" entry in the menu and also the #{live-boot}# and #{live-config}# "
-"man pages found within the live system."
+"\"help\" entry in the menu and also the live-boot and live-config man pages "
+"found within the live system."
 msgstr ""
 "Avviando il supporto si otterrà un menu, premendo il tasto enter il sistema "
 "partirà utilizzando la voce #{Live}# e le opzioni predefinite. Per ulteriori "
 "informazioni sulle opzioni di boot, si veda la voce \"help\" nel menu e le "
-"pagine di manuale di #{live-boot}# e #{live-config}# all'interno del sistema."
+"pagine di manuale di live-boot e live-config all'interno del sistema."
 
 #. type: Plain text
 #: en/user_basics.ssi:86
@@ -599,24 +599,24 @@ msgstr "3~testing-iso-with-qemu Provare un'immagine ISO con QEMU"
 #: en/user_basics.ssi:104
 msgid ""
 "The most versatile VM in Debian is QEMU. If your processor has hardware "
-"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
+"support for virtualization, use the /{qemu-kvm}/ package; the /{qemu-kvm}/ "
 "package description briefly lists the requirements."
 msgstr ""
 "Il programma più versatile in Debian è QEMU. Se il processore gestisce la "
-"virtualizzazione hardware utilizzare il pacchetto #{qemu-kvm}#; la "
+"virtualizzazione hardware utilizzare il pacchetto /{qemu-kvm}/; la "
 "descrizione elenca brevemente i requisiti."
 
 #. type: Plain text
 #: en/user_basics.ssi:106
 msgid ""
-"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
-"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
-"the following examples. The #{qemu-utils}# package is also valuable for "
+"First, install /{qemu-kvm}/ if your processor supports it. If not, install /"
+"{qemu}/, in which case the program name is #{qemu}# instead of #{kvm}# in "
+"the following examples. The /{qemu-utils}/ package is also valuable for "
 "creating virtual disk images with #{qemu-img}#."
 msgstr ""
-"Per prima cosa installare #{qemu-kvm}# o altrimenti #{qemu}#, nel qual caso "
+"Per prima cosa installare /{qemu-kvm}/ o altrimenti /{qemu}/, nel qual caso "
 "il nome del programma nei successivi sarà #{qemu}# invece di #{kvm}#. Il "
-"pacchetto #{qemu-utils}# è inoltre utile per creare immagini di dischi "
+"pacchetto /{qemu-utils}/ è inoltre utile per creare immagini di dischi "
 "virtuali con #{qemu-img}#."
 
 #. type: Plain text
@@ -783,15 +783,15 @@ msgstr "3~testing-hdd-with-qemu Provare un'immagine HDD con Qemu"
 #. type: Plain text
 #: en/user_basics.ssi:182
 msgid ""
-"First, install QEMU as described above in {Testing an ISO image with QEMU}"
-"#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on which "
-"version your host system needs, specifying #{binary.img}# as the first hard "
-"drive."
+"First, install /{qemu}/ as described above in {Testing an ISO image with "
+"QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on "
+"which version your host system needs, specifying #{binary.img}# as the first "
+"hard drive."
 msgstr ""
-"Installare QEMU come descritto in {Provare un'immagine ISO con QEMU}#testing-"
-"iso-with-qemu; quindi eseguire #{kvm}# o #{qemu}#, a seconda di quale "
-"versione è necessaria al sistema ospitante, specificando #{binary.img}# come "
-"disco rigido principale."
+"Installare /{qemu}/ come descritto in {Provare un'immagine ISO con QEMU}"
+"#testing-iso-with-qemu; quindi eseguire #{kvm}# o #{qemu}#, a seconda di "
+"quale versione è necessaria al sistema ospitante, specificando #{binary.img}"
+"# come disco rigido principale."
 
 #. type: Plain text
 #: en/user_basics.ssi:186
@@ -808,13 +808,13 @@ msgstr "3~using-usb-extra-space Usare lo spazio rimanente su una penna USB"
 #: en/user_basics.ssi:192
 msgid ""
 "To use the remaining free space after copying #{binary.img}# to a USB stick, "
-"use a partitioning tool such as #{gparted}# or #{parted}# to create a new "
+"use a partitioning tool such as /{gparted}/ or /{parted}/ to create a new "
 "partition on the stick. The first partition will be used by the Debian Live "
 "system."
 msgstr ""
 "Per utilizzare lo spazio libero che rimane dopo aver copiato il file #"
-"{binary.img}# su una penna USB, usare uno strumento di partizionamento come #"
-"{gparted}# o #{parted}# per creare una nuova partizione. La prima partizione "
+"{binary.img}# su una penna USB, usare uno strumento di partizionamento come /"
+"{gparted}/ o /{parted}/ per creare una nuova partizione. La prima partizione "
 "verrà utilizzata dal sistema Debian Live."
 
 #. type: Plain text
@@ -1068,8 +1068,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:294
-msgid "You need to install the #{nfs-kernel-server}# package."
-msgstr "Bisogna installare il pacchetto #{nfs-kernel-server}#."
+msgid "You need to install the /{nfs-kernel-server}/ package."
+msgstr "Bisogna installare il pacchetto /{nfs-kernel-server}/."
 
 #. type: Plain text
 #: en/user_basics.ssi:296
@@ -1145,8 +1145,8 @@ msgstr "3~ Qemu"
 
 #. type: Plain text
 #: en/user_basics.ssi:322
-msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
-msgstr "_* Installare #{qemu}#, #{bridge-utils}#, #{sudo}#."
+msgid "_* Install /{qemu}/, /{bridge-utils}/, /{sudo}/."
+msgstr "_* Installare /{qemu}/, /{bridge-utils}/, /{sudo}/."
 
 #. type: Plain text
 #: en/user_basics.ssi:324
diff --git a/manual/po/it/user_customization-contents.ssi.po b/manual/po/it/user_customization-contents.ssi.po
index 825d971..09b3294 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: 2012-01-15 16:28+0100\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2012-04-03 18:21+0200\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -18,16 +18,19 @@ msgstr ""
 "Plural-Forms: nplurals=2: plural=(n !=1)\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
-#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
-#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
-#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
 #: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
 #: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
 #: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -35,9 +38,10 @@ msgstr ""
 #: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
 #: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
 #: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
 #: en/user_customization-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -61,39 +65,43 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
-#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
-#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
-#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
 #: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
 #: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
 #: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -101,9 +109,10 @@ msgstr "code{"
 #: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
 #: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
 #: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
 #: en/user_customization-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -127,25 +136,26 @@ msgstr "code{"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr "}code"
 
@@ -267,14 +277,14 @@ msgstr ""
 #: en/user_customization-contents.ssi:24
 msgid ""
 "To include files, simply add them to your #{config/includes.chroot}# "
-"directory. This directory corresponds to the root directory (#{/}#) of the "
+"directory. This directory corresponds to the root directory #{/}# of the "
 "live system. For example, to add a file #{/var/www/index.html}# in the live "
 "system, use:"
 msgstr ""
 "Per includere i file si aggiungano semplicemente alla directory #{config/"
-"includes.chroot}#. Questa corrisponde alla directory root (#{/}#) del "
-"sistema live. Per esempio, per aggiungere un file #{/var/www/index.html}# "
-"nel sistema live, si usi:"
+"includes.chroot}#. Questa corrisponde alla directory root #{/}# del sistema "
+"live. Per esempio, per aggiungere un file #{/var/www/index.html}# nel "
+"sistema live, si usi:"
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:29
@@ -493,8 +503,8 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-contents.ssi:93
 msgid ""
-"For more information about debconf, please see debconf(7) in the #{debconf}# "
-"package."
+"For more information about debconf, please see #{debconf(7)}# in the /"
+"{debconf}/ package."
 msgstr ""
-"Per ulteriori informazioni su debconf, vedere debconf(7) nel pacchetto #"
-"{debconf}#."
+"Per ulteriori informazioni su debconf, vedere #{debconf(7)}# nel pacchetto /"
+"{debconf}/."
diff --git a/manual/po/it/user_customization-overview.ssi.po b/manual/po/it/user_customization-overview.ssi.po
index 486f96d..88c7e62 100644
--- a/manual/po/it/user_customization-overview.ssi.po
+++ b/manual/po/it/user_customization-overview.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2010-12-11 23:35-0400\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -155,7 +155,7 @@ msgstr "2~ Integrare la configurazione di lb con dei file"
 #. type: Plain text
 #: en/user_customization-overview.ssi:22
 msgid ""
-"Although #{lb config}# does create a skeletal configuration in the config/ "
+"Although #{lb config}# creates a skeletal configuration in the config/ "
 "directory, to accomplish your goals, you may need to provide additional "
 "files in subdirectories of config/. Depending on where the files are stored "
 "in the configuration, they may be copied into the live system's filesystem "
@@ -184,7 +184,7 @@ msgid "2~ Customization tasks"
 msgstr "2~ Personalizzazione dei compiti"
 
 #. type: Plain text
-#: en/user_customization-overview.ssi:26
+#: en/user_customization-overview.ssi:25
 msgid ""
 "The following chapters are organized by the kinds of customization task "
 "users typically perform: {Customizing package installation}#customizing-"
diff --git a/manual/po/it/user_customization-packages.ssi.po b/manual/po/it/user_customization-packages.ssi.po
index 3a1a919..88b5c2e 100644
--- a/manual/po/it/user_customization-packages.ssi.po
+++ b/manual/po/it/user_customization-packages.ssi.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2012-04-08 14:10+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2012-04-03 18:01+0200\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -19,11 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -90,11 +90,11 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -184,12 +184,12 @@ msgid ""
 "distribution mirror. You can also add your own repositories for backports, "
 "experimental or custom packages, or include packages directly as files. You "
 "can define your own lists of packages to include, use live-build's "
-"predefined lists, use #{tasksel}# tasks, or a combination of all three. "
-"Finally, a number of options give some control over apt, or if you prefer, "
-"aptitude, at build time when packages are installed. You may find these "
-"handy if you use a proxy, want to disable installation of recommended "
-"packages to save space, or need to control which versions of packages are "
-"installed via APT pinning, to name a few possibilities."
+"predefined lists, use /{tasksel}/ tasks, or a combination of all three. "
+"Finally, a number of options give some control over /{apt}/, or if you "
+"prefer, /{aptitude}/, at build time when packages are installed. You may "
+"find these handy if you use a proxy, want to disable installation of "
+"recommended packages to save space, or need to control which versions of "
+"packages are installed via APT pinning, to name a few possibilities."
 msgstr ""
 "Probabilmente la personalizzazione basilare di un sistema Debian Live è la "
 "scelta dei pacchetti da includere nell'immagine. Questo capitolo vi guiderà "
@@ -201,13 +201,14 @@ msgstr ""
 "inoltre aggiungere i propri repository per pacchetti di backport, "
 "sperimentali o personalizzati, o aggiungere i pacchetti direttamente come "
 "file. È possibile definire una propria lista di pacchetti da includere, "
-"usarne una predefinita di live-build, usare task di #{tasksel}#, o una "
+"usarne una predefinita di live-build, usare task di /{tasksel}/, o una "
 "combinazione di tutti e tre. Infine una serie di opzioni fornisce un certo "
-"controllo su apt, o aptitude se si preferisce, in fase di compilazione "
-"quando i pacchetti sono installati. Ciò può tornare utile se si usa un "
-"proxy, se si vuole disabilitare l'installazione dei pacchetti raccomandati "
-"per risparmiare spazio o controllare quali versioni dei pacchetti vengono "
-"installate con il pinning, giusto per citare alcune possibilità."
+"controllo su /{apt}/, o /{aptitude}/ se si preferisce, in fase di "
+"compilazione quando i pacchetti sono installati. Ciò può tornare utile se si "
+"usa un proxy, se si vuole disabilitare l'installazione dei pacchetti "
+"raccomandati per risparmiare spazio o controllare quali versioni dei "
+"pacchetti vengono installate con il pinning, giusto per citare alcune "
+"possibilità."
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:8
@@ -224,7 +225,7 @@ msgstr "3~ Distribuzione, le aree di archivio e le modalità"
 msgid ""
 "The distribution you choose has the broadest impact on which packages are "
 "available to include in your live image. Specify the codename, which "
-"defaults to #{wheezy}# for the wheezy version of live-build. Any current "
+"defaults to wheezy for the wheezy version of live-build. Any current "
 "distribution carried in the Debian archive may be specified by its codename "
 "here. (See {Terms}#terms for more details.) The #{--distribution}# option "
 "not only influences the source of packages within the archive, but also "
@@ -234,7 +235,7 @@ msgid ""
 msgstr ""
 "La distribuzione che viene scelta ha un ampio impatto su quali pacchetti "
 "siano disponibili per essere inclusi nell'immagine live. Specificare il nome "
-"in codice, il predefinito per la versione wheezy di live-build è #{wheezy}#; "
+"in codice, il predefinito per la versione wheezy di live-build è wheezy; "
 "qualsiasi attuale distribuzione mantenuta negli archivi Debian può essere "
 "qui specificata con il suo nome in codice. (Per ulteriori dettagli "
 "consultare il {Glossario}#terms). L'opzione #{--distribution}# non solo "
@@ -638,12 +639,12 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:125
 msgid ""
-"For example, to make a list that includes the predefined #{gnome}# list plus "
-"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
-"contents:"
+"For example, to make a list that includes the predefined #{gnome}# list "
+"plus /{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the "
+"following contents:"
 msgstr ""
 "Per esempio, per creare un elenco che includa quello predefinito di #{gnome}"
-"#più iceweasel, creare #{config/package-lists/mio.elenco.chroot}# con i "
+"#più /{iceweasel}/, creare #{config/package-lists/mio.elenco.chroot}# con i "
 "seguenti contenuti:"
 
 #. type: Plain text
@@ -697,12 +698,12 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:148
 msgid ""
-"You may test for any one of a number of values, e.g. to install #{memtest86+}"
-"# if either #{--architectures i386}# or #{--architectures amd64}# is "
-"specified:"
+"You may test for any one of a number of values, e.g. to install /"
+"{memtest86+}/ if either #{--architectures i386}# or #{--architectures amd64}"
+"# is specified:"
 msgstr ""
 "Si può verificare per ognuna di una serie di valori, ad esempio per "
-"installare #{memtest86+}# specificando sia #{--architectures i386}# sia #{--"
+"installare /{memtest86+}/ specificando sia #{--architectures i386}# sia #{--"
 "architectures amd64}#:"
 
 #. type: Plain text
@@ -1122,17 +1123,17 @@ msgstr "3~choosing-apt-or-aptitude Scegliere apt o aptitude"
 #. type: Plain text
 #: en/user_customization-packages.ssi:266
 msgid ""
-"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
+"You can elect to use either /{apt}/ or /{aptitude}/ when installing packages "
 "at build time. Which utility is used is governed by the #{--apt}# argument "
 "to #{lb config}#. Choose the method implementing the preferred behaviour for "
 "package installation, the notable difference being how missing packages are "
 "handled."
 msgstr ""
-"Per installare pacchetti in fase di compilazione si può optare sia per #{apt}"
-"# sia per #{aptitude}#, l'argomento #{--apt}# di #{lb config}# determina "
-"quale usare. Sceglie il metodo implementando il comportamento preferito per "
-"l'installazione dei pacchetti, la notevole differenza è come vengono gestiti "
-"quelli mancanti."
+"Per installare pacchetti in fase di compilazione si può optare sia per /"
+"{apt}/ sia per /{aptitude}/, l'argomento #{--apt}# di #{lb config}# "
+"determina quale usare. Sceglie il metodo implementando il comportamento "
+"preferito per l'installazione dei pacchetti, la notevole differenza è come "
+"vengono gestiti quelli mancanti."
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:268
@@ -1351,18 +1352,18 @@ msgid ""
 "the case where you do not want a package that is recommended by another "
 "package. Suppose you are building an LXDE image using #{--package-lists lxde}"
 "# option, but don't want the user prompted to store wifi passwords in the "
-"keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
-"turn recommends #{gnome-keyring}#. So you want to omit the recommended #"
-"{gnome-keyring}# package. This can be done by adding the following stanza to "
+"keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in "
+"turn recommends /{gnome-keyring}/. So you want to omit the recommended /"
+"{gnome-keyring}/ package. This can be done by adding the following stanza to "
 "#{config/chroot_apt/preferences}#:"
 msgstr ""
 "Un valore negativo della priorità evita che un pacchetto venga installato, "
 "come nel caso in cui non se ne voglia uno raccomandato da un altro. Si "
 "suppone di costruire un'immagine di LXDE utilizzando l'opzione #{--package-"
 "lists lxde}# ma non si desidera che all'utente venga richiesto di salvare la "
-"password del wifi nel portachiavi. L'elenco include #{gdm}# che dipende da #"
-"{gksu}# che a sua volta raccomanda #{gnome-keyring}#, in questo caso si "
-"vorrà omettere il pacchetto #{gnome-keyring}# aggiungendo a #{config/"
+"password del wifi nel portachiavi. L'elenco include /{gdm}/ che dipende da /"
+"{gksu}/ che a sua volta raccomanda /{gnome-keyring}/, in questo caso si "
+"vorrà omettere il pacchetto /{gnome-keyring}/ aggiungendo a #{config/"
 "chroot_apt/preferences}# la seguente definizione:"
 
 #. type: Plain text
diff --git a/manual/po/it/user_examples.ssi.po b/manual/po/it/user_examples.ssi.po
index 0e33377..629e4a6 100644
--- a/manual/po/it/user_examples.ssi.po
+++ b/manual/po/it/user_examples.ssi.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 14:58+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2012-03-04 18:43+0200\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -24,11 +24,11 @@ msgid ":B~ Examples"
 msgstr ":B~ Esempi"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -95,11 +95,11 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -466,17 +466,17 @@ msgid ""
 "First, #{--architectures i386}# ensures that on our #{amd64}# build system, "
 "we build a 32-bit version suitable for use on most machines. Second, we use #"
 "{--linux-flavours 686-pae}# because we don't anticipate using this image on "
-"much older systems. Third, we've chosen the #{lxde}# package list to give us "
+"much older systems. Third, we've chosen the /{lxde}/ package list to give us "
 "a minimal desktop. And finally, we have added two initial favourite "
-"packages: #{iceweasel}# and #{xchat}#."
+"packages: /{iceweasel}/ and /{xchat}/."
 msgstr ""
 "Per prima cosa, #{--architectures i386}# assicura che sul nostro sistema #"
 "{amd64}# costruiamo una versione a 32-bit utilizzabile sulla maggior parte "
 "delle macchine. In secondo luogo, usiamo #{--linux-flavours 686-pae}# dato "
 "che non prevediamo di usare questa immagine su sistemi troppo vecchi. Terzo, "
-"abbiamo scelto la lista di pacchetti #{lxde}# per avere un desktop minimale. "
-"Infine, abbiamo aggiunto due pacchetti preferiti per cominciare: #{iceweasel}"
-"# e #{xchat}#."
+"abbiamo scelto la lista di pacchetti /{lxde}/ per avere un desktop minimale. "
+"Infine, abbiamo aggiunto due pacchetti preferiti per cominciare: /"
+"{iceweasel}/ e /{xchat}/."
 
 #. type: Plain text
 #: en/user_examples.ssi:115
diff --git a/manual/po/it/user_managing_a_configuration.ssi.po b/manual/po/it/user_managing_a_configuration.ssi.po
index 8ba8e91..19c4ba1 100644
--- a/manual/po/it/user_managing_a_configuration.ssi.po
+++ b/manual/po/it/user_managing_a_configuration.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2011-12-05 23:01+0100\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -18,28 +18,30 @@ msgstr ""
 "Plural-Forms: nplurals=2: plural=(n !=1)\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 en/project_bugs.ssi:60
-#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
-#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
-#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
 #: en/user_customization-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -63,21 +65,22 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -86,28 +89,30 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:64
-#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
-#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
-#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
 #: en/user_customization-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -131,21 +136,22 @@ msgstr "code{"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -235,7 +241,7 @@ msgid ""
 "variable values, and each time you run #{lb config}# and #{lb clean}#, these "
 "files will be executed. This will ensure that your configuration is kept "
 "internally consistent from one revision to the next and from one live-build "
-"release to the next (though you will still have to take care and read the "
+"release to the next (Although you will still have to take care and read the "
 "documentation when you upgrade live-build and make adjustments as needed)."
 msgstr ""
 "Tutto ciò potrebbe essere un fastidio terribile se non fosse per gli script "
diff --git a/manual/po/it/user_overview.ssi.po b/manual/po/it/user_overview.ssi.po
index 52934f1..b218ffc 100644
--- a/manual/po/it/user_overview.ssi.po
+++ b/manual/po/it/user_overview.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2011-12-05 23:53+0100\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -89,11 +89,11 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -244,12 +244,12 @@ msgstr ""
 msgid ""
 "Unlike /{debhelper}/, live-build contains a tool to generate a skeleton "
 "configuration directory, #{lb config}#. This could be considered to be "
-"similar to tools such as #{dh-make}#. For more information about #{lb config}"
+"similar to tools such as /{dh-make}/. For more information about #{lb config}"
 "#, please see {The lb config command}#lb-config."
 msgstr ""
 "Al contrario di /{debhelper}/, live-build contiene uno strumento per "
 "generare una directory scheletro di configurazione, #{lb config}#, che può "
-"essere considerato simile a utilità come #{dh-make}#. Per maggiori "
+"essere considerato simile a utilità come /{dh-make}/. Per maggiori "
 "informazioni su #{lb config}# si veda {Il comando lb config}#lb-config."
 
 #. type: Plain text
diff --git a/manual/po/pt_BR/about_manual.ssi.po b/manual/po/pt_BR/about_manual.ssi.po
index 87618b1..09fc8d0 100644
--- a/manual/po/pt_BR/about_manual.ssi.po
+++ b/manual/po/pt_BR/about_manual.ssi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-14 12:48+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2010-10-22 18:16-0300\n"
 "Last-Translator: Bruno Gurgel <bruno.gurgel at gmail.com>\n"
 "Language-Team: none\n"
@@ -158,10 +158,10 @@ msgstr "_* *{Target system}*: O ambiente usado para rodar o sistema live."
 #: en/about_manual.ssi:32
 msgid ""
 "_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
-"boot was formerly a part of live-initramfs."
+"boot was formerly a part of /{live-initramfs}/."
 msgstr ""
 "_* *{live-boot}*: Uma coleção de scripts usados para inicializar sistemas "
-"live. live-boot era formalmente parte do live-initramfs."
+"live. live-boot era formalmente parte do /{live-initramfs}/."
 
 #. type: Plain text
 #: en/about_manual.ssi:34
@@ -182,8 +182,8 @@ msgid ""
 "initramfs}/."
 msgstr ""
 "_* *{live-config}*: Uma coleção de scripts usados para configurar um sistema "
-"live durante o processo de boot. live-config era formalmente parte do live-/"
-"{initramfs}/."
+"live durante o processo de boot. live-config era formalmente parte do /{live-"
+"initramfs}/."
 
 #. type: Plain text
 #: en/about_manual.ssi:38
@@ -745,10 +745,10 @@ msgstr ""
 #: en/about_manual.ssi:211
 msgid ""
 "_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
-"in.pot files to your language with your favourite editor (such as poedit). "
-"Send translated files to the mailing list. Once we have reviewed your "
-"submission, we will add the new language to the manual (providing the po "
-"files) and will enable it in the autobuild."
+"in.pot files to your language with your favourite editor (such as /"
+"{poedit}/). Send translated files to the mailing list. Once we have reviewed "
+"your submission, we will add the new language to the manual (providing the "
+"po files) and will enable it in the autobuild."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/pt_BR/user_basics.ssi.po b/manual/po/pt_BR/user_basics.ssi.po
index 7ee7c93..c9246ad 100644
--- a/manual/po/pt_BR/user_basics.ssi.po
+++ b/manual/po/pt_BR/user_basics.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 16:54+0300\n"
+"POT-Creation-Date: 2012-04-14 16:31+0300\n"
 "PO-Revision-Date: 2010-10-20 06:53-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -88,11 +88,11 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -412,8 +412,8 @@ msgid ""
 "Once you've booted the media, you are presented with a boot menu. If you "
 "just press enter here, the system will boot using the default entry, #{Live}"
 "# and default options. For more information about boot options, see the "
-"\"help\" entry in the menu and also the #{live-boot}# and #{live-config}# "
-"man pages found within the live system."
+"\"help\" entry in the menu and also the live-boot and live-config man pages "
+"found within the live system."
 msgstr ""
 
 #. type: Plain text
@@ -483,16 +483,16 @@ msgstr ""
 #: en/user_basics.ssi:104
 msgid ""
 "The most versatile VM in Debian is QEMU. If your processor has hardware "
-"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
+"support for virtualization, use the /{qemu-kvm}/ package; the /{qemu-kvm}/ "
 "package description briefly lists the requirements."
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:106
 msgid ""
-"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
-"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
-"the following examples. The #{qemu-utils}# package is also valuable for "
+"First, install /{qemu-kvm}/ if your processor supports it. If not, install /"
+"{qemu}/, in which case the program name is #{qemu}# instead of #{kvm}# in "
+"the following examples. The /{qemu-utils}/ package is also valuable for "
 "creating virtual disk images with #{qemu-img}#."
 msgstr ""
 
@@ -637,10 +637,10 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:182
 msgid ""
-"First, install QEMU as described above in {Testing an ISO image with QEMU}"
-"#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on which "
-"version your host system needs, specifying #{binary.img}# as the first hard "
-"drive."
+"First, install /{qemu}/ as described above in {Testing an ISO image with "
+"QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on "
+"which version your host system needs, specifying #{binary.img}# as the first "
+"hard drive."
 msgstr ""
 
 #. type: Plain text
@@ -658,7 +658,7 @@ msgstr ""
 #: en/user_basics.ssi:192
 msgid ""
 "To use the remaining free space after copying #{binary.img}# to a USB stick, "
-"use a partitioning tool such as #{gparted}# or #{parted}# to create a new "
+"use a partitioning tool such as /{gparted}/ or /{parted}/ to create a new "
 "partition on the stick. The first partition will be used by the Debian Live "
 "system."
 msgstr ""
@@ -874,7 +874,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:294
-msgid "You need to install the #{nfs-kernel-server}# package."
+msgid "You need to install the /{nfs-kernel-server}/ package."
 msgstr ""
 
 #. type: Plain text
@@ -938,7 +938,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:322
-msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
+msgid "_* Install /{qemu}/, /{bridge-utils}/, /{sudo}/."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-contents.ssi.po b/manual/po/pt_BR/user_customization-contents.ssi.po
index a713a60..27ca095 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: 2012-01-15 16:28+0100\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2010-10-22 07:52-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,16 +17,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
-#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
-#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
-#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
 #: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
 #: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
 #: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -34,9 +37,10 @@ msgstr ""
 #: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
 #: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
 #: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
 #: en/user_customization-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -60,39 +64,43 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
-#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
-#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
-#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
 #: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
 #: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
 #: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -100,9 +108,10 @@ msgstr "code{"
 #: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
 #: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
 #: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
 #: en/user_customization-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -126,25 +135,26 @@ msgstr "code{"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr "}code"
 
@@ -236,7 +246,7 @@ msgstr ""
 #: en/user_customization-contents.ssi:24
 msgid ""
 "To include files, simply add them to your #{config/includes.chroot}# "
-"directory. This directory corresponds to the root directory (#{/}#) of the "
+"directory. This directory corresponds to the root directory #{/}# of the "
 "live system. For example, to add a file #{/var/www/index.html}# in the live "
 "system, use:"
 msgstr ""
@@ -412,6 +422,6 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-contents.ssi:93
 msgid ""
-"For more information about debconf, please see debconf(7) in the #{debconf}# "
-"package."
+"For more information about debconf, please see #{debconf(7)}# in the /"
+"{debconf}/ package."
 msgstr ""
diff --git a/manual/po/pt_BR/user_customization-overview.ssi.po b/manual/po/pt_BR/user_customization-overview.ssi.po
index d85fefc..9e8e5ff 100644
--- a/manual/po/pt_BR/user_customization-overview.ssi.po
+++ b/manual/po/pt_BR/user_customization-overview.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2010-10-22 08:57-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -110,7 +110,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-overview.ssi:22
 msgid ""
-"Although #{lb config}# does create a skeletal configuration in the config/ "
+"Although #{lb config}# creates a skeletal configuration in the config/ "
 "directory, to accomplish your goals, you may need to provide additional "
 "files in subdirectories of config/. Depending on where the files are stored "
 "in the configuration, they may be copied into the live system's filesystem "
@@ -128,7 +128,7 @@ msgid "2~ Customization tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-overview.ssi:26
+#: en/user_customization-overview.ssi:25
 msgid ""
 "The following chapters are organized by the kinds of customization task "
 "users typically perform: {Customizing package installation}#customizing-"
diff --git a/manual/po/pt_BR/user_customization-packages.ssi.po b/manual/po/pt_BR/user_customization-packages.ssi.po
index d95a96d..21b5ed0 100644
--- a/manual/po/pt_BR/user_customization-packages.ssi.po
+++ b/manual/po/pt_BR/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 14:10+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2010-10-22 08:58-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -88,11 +88,11 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -180,12 +180,12 @@ msgid ""
 "distribution mirror. You can also add your own repositories for backports, "
 "experimental or custom packages, or include packages directly as files. You "
 "can define your own lists of packages to include, use live-build's "
-"predefined lists, use #{tasksel}# tasks, or a combination of all three. "
-"Finally, a number of options give some control over apt, or if you prefer, "
-"aptitude, at build time when packages are installed. You may find these "
-"handy if you use a proxy, want to disable installation of recommended "
-"packages to save space, or need to control which versions of packages are "
-"installed via APT pinning, to name a few possibilities."
+"predefined lists, use /{tasksel}/ tasks, or a combination of all three. "
+"Finally, a number of options give some control over /{apt}/, or if you "
+"prefer, /{aptitude}/, at build time when packages are installed. You may "
+"find these handy if you use a proxy, want to disable installation of "
+"recommended packages to save space, or need to control which versions of "
+"packages are installed via APT pinning, to name a few possibilities."
 msgstr ""
 
 #. type: Plain text
@@ -203,7 +203,7 @@ msgstr ""
 msgid ""
 "The distribution you choose has the broadest impact on which packages are "
 "available to include in your live image. Specify the codename, which "
-"defaults to #{wheezy}# for the wheezy version of live-build. Any current "
+"defaults to wheezy for the wheezy version of live-build. Any current "
 "distribution carried in the Debian archive may be specified by its codename "
 "here. (See {Terms}#terms for more details.) The #{--distribution}# option "
 "not only influences the source of packages within the archive, but also "
@@ -515,9 +515,9 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:125
 msgid ""
-"For example, to make a list that includes the predefined #{gnome}# list plus "
-"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
-"contents:"
+"For example, to make a list that includes the predefined #{gnome}# list "
+"plus /{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the "
+"following contents:"
 msgstr ""
 
 #. type: Plain text
@@ -563,9 +563,9 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:148
 msgid ""
-"You may test for any one of a number of values, e.g. to install #{memtest86+}"
-"# if either #{--architectures i386}# or #{--architectures amd64}# is "
-"specified:"
+"You may test for any one of a number of values, e.g. to install /"
+"{memtest86+}/ if either #{--architectures i386}# or #{--architectures amd64}"
+"# is specified:"
 msgstr ""
 
 #. type: Plain text
@@ -889,7 +889,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:266
 msgid ""
-"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
+"You can elect to use either /{apt}/ or /{aptitude}/ when installing packages "
 "at build time. Which utility is used is governed by the #{--apt}# argument "
 "to #{lb config}#. Choose the method implementing the preferred behaviour for "
 "package installation, the notable difference being how missing packages are "
@@ -1072,9 +1072,9 @@ msgid ""
 "the case where you do not want a package that is recommended by another "
 "package. Suppose you are building an LXDE image using #{--package-lists lxde}"
 "# option, but don't want the user prompted to store wifi passwords in the "
-"keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
-"turn recommends #{gnome-keyring}#. So you want to omit the recommended #"
-"{gnome-keyring}# package. This can be done by adding the following stanza to "
+"keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in "
+"turn recommends /{gnome-keyring}/. So you want to omit the recommended /"
+"{gnome-keyring}/ package. This can be done by adding the following stanza to "
 "#{config/chroot_apt/preferences}#:"
 msgstr ""
 
diff --git a/manual/po/pt_BR/user_examples.ssi.po b/manual/po/pt_BR/user_examples.ssi.po
index 8607e89..b75b175 100644
--- a/manual/po/pt_BR/user_examples.ssi.po
+++ b/manual/po/pt_BR/user_examples.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 14:58+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2010-11-04 16:34-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -22,11 +22,11 @@ msgid ":B~ Examples"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -93,11 +93,11 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -409,9 +409,9 @@ msgid ""
 "First, #{--architectures i386}# ensures that on our #{amd64}# build system, "
 "we build a 32-bit version suitable for use on most machines. Second, we use #"
 "{--linux-flavours 686-pae}# because we don't anticipate using this image on "
-"much older systems. Third, we've chosen the #{lxde}# package list to give us "
+"much older systems. Third, we've chosen the /{lxde}/ package list to give us "
 "a minimal desktop. And finally, we have added two initial favourite "
-"packages: #{iceweasel}# and #{xchat}#."
+"packages: /{iceweasel}/ and /{xchat}/."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/pt_BR/user_managing_a_configuration.ssi.po b/manual/po/pt_BR/user_managing_a_configuration.ssi.po
index 3f3b09c..2fbaccb 100644
--- a/manual/po/pt_BR/user_managing_a_configuration.ssi.po
+++ b/manual/po/pt_BR/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2010-10-13 17:00+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,28 +17,30 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 en/project_bugs.ssi:60
-#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
-#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
-#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
 #: en/user_customization-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -62,21 +64,22 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -85,28 +88,30 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:64
-#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
-#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
-#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
 #: en/user_customization-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -130,21 +135,22 @@ msgstr "code{"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -216,7 +222,7 @@ msgid ""
 "variable values, and each time you run #{lb config}# and #{lb clean}#, these "
 "files will be executed. This will ensure that your configuration is kept "
 "internally consistent from one revision to the next and from one live-build "
-"release to the next (though you will still have to take care and read the "
+"release to the next (Although you will still have to take care and read the "
 "documentation when you upgrade live-build and make adjustments as needed)."
 msgstr ""
 
diff --git a/manual/po/pt_BR/user_overview.ssi.po b/manual/po/pt_BR/user_overview.ssi.po
index 2deae85..ac08c9c 100644
--- a/manual/po/pt_BR/user_overview.ssi.po
+++ b/manual/po/pt_BR/user_overview.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2010-10-22 07:52-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -88,11 +88,11 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -225,7 +225,7 @@ msgstr ""
 msgid ""
 "Unlike /{debhelper}/, live-build contains a tool to generate a skeleton "
 "configuration directory, #{lb config}#. This could be considered to be "
-"similar to tools such as #{dh-make}#. For more information about #{lb config}"
+"similar to tools such as /{dh-make}/. For more information about #{lb config}"
 "#, please see {The lb config command}#lb-config."
 msgstr ""
 
diff --git a/manual/po/ro/about_manual.ssi.po b/manual/po/ro/about_manual.ssi.po
index 2193bed..c893b7e 100644
--- a/manual/po/ro/about_manual.ssi.po
+++ b/manual/po/ro/about_manual.ssi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-14 12:48+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2010-10-23 10:34-0200\n"
 "Last-Translator: Eugen Paiuc <linux51 at bluewin.ch>\n"
 "Language-Team: none\n"
@@ -156,10 +156,10 @@ msgstr "_* *{Target system}*: Mediul folosit pentru rularea sistemului live."
 #: en/about_manual.ssi:32
 msgid ""
 "_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
-"boot was formerly a part of live-initramfs."
+"boot was formerly a part of /{live-initramfs}/."
 msgstr ""
 "_* *{live-boot}*: O coloctie se scripte folosite la pornirea sistemului "
-"live. live-boot a facul parte formal din live-initramfs."
+"live. live-boot a facul parte formal din /{live-initramfs}/."
 
 #. type: Plain text
 #: en/about_manual.ssi:34
@@ -741,10 +741,10 @@ msgstr ""
 #: en/about_manual.ssi:211
 msgid ""
 "_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
-"in.pot files to your language with your favourite editor (such as poedit). "
-"Send translated files to the mailing list. Once we have reviewed your "
-"submission, we will add the new language to the manual (providing the po "
-"files) and will enable it in the autobuild."
+"in.pot files to your language with your favourite editor (such as /"
+"{poedit}/). Send translated files to the mailing list. Once we have reviewed "
+"your submission, we will add the new language to the manual (providing the "
+"po files) and will enable it in the autobuild."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/user_basics.ssi.po b/manual/po/ro/user_basics.ssi.po
index e937746..a29a548 100644
--- a/manual/po/ro/user_basics.ssi.po
+++ b/manual/po/ro/user_basics.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 16:54+0300\n"
+"POT-Creation-Date: 2012-04-14 16:31+0300\n"
 "PO-Revision-Date: 2010-10-23 16:43+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,11 +18,11 @@ msgstr ""
 "20)) ? 1 : 2;\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -89,11 +89,11 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -413,8 +413,8 @@ msgid ""
 "Once you've booted the media, you are presented with a boot menu. If you "
 "just press enter here, the system will boot using the default entry, #{Live}"
 "# and default options. For more information about boot options, see the "
-"\"help\" entry in the menu and also the #{live-boot}# and #{live-config}# "
-"man pages found within the live system."
+"\"help\" entry in the menu and also the live-boot and live-config man pages "
+"found within the live system."
 msgstr ""
 
 #. type: Plain text
@@ -484,16 +484,16 @@ msgstr ""
 #: en/user_basics.ssi:104
 msgid ""
 "The most versatile VM in Debian is QEMU. If your processor has hardware "
-"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
+"support for virtualization, use the /{qemu-kvm}/ package; the /{qemu-kvm}/ "
 "package description briefly lists the requirements."
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:106
 msgid ""
-"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
-"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
-"the following examples. The #{qemu-utils}# package is also valuable for "
+"First, install /{qemu-kvm}/ if your processor supports it. If not, install /"
+"{qemu}/, in which case the program name is #{qemu}# instead of #{kvm}# in "
+"the following examples. The /{qemu-utils}/ package is also valuable for "
 "creating virtual disk images with #{qemu-img}#."
 msgstr ""
 
@@ -638,10 +638,10 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:182
 msgid ""
-"First, install QEMU as described above in {Testing an ISO image with QEMU}"
-"#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on which "
-"version your host system needs, specifying #{binary.img}# as the first hard "
-"drive."
+"First, install /{qemu}/ as described above in {Testing an ISO image with "
+"QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on "
+"which version your host system needs, specifying #{binary.img}# as the first "
+"hard drive."
 msgstr ""
 
 #. type: Plain text
@@ -659,7 +659,7 @@ msgstr ""
 #: en/user_basics.ssi:192
 msgid ""
 "To use the remaining free space after copying #{binary.img}# to a USB stick, "
-"use a partitioning tool such as #{gparted}# or #{parted}# to create a new "
+"use a partitioning tool such as /{gparted}/ or /{parted}/ to create a new "
 "partition on the stick. The first partition will be used by the Debian Live "
 "system."
 msgstr ""
@@ -875,7 +875,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:294
-msgid "You need to install the #{nfs-kernel-server}# package."
+msgid "You need to install the /{nfs-kernel-server}/ package."
 msgstr ""
 
 #. type: Plain text
@@ -939,7 +939,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:322
-msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
+msgid "_* Install /{qemu}/, /{bridge-utils}/, /{sudo}/."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/user_customization-contents.ssi.po b/manual/po/ro/user_customization-contents.ssi.po
index 30fe07b..a0ccf41 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: 2012-01-15 16:28+0100\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2010-10-23 16:43+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,16 +18,19 @@ msgstr ""
 "20)) ? 1 : 2;\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
-#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
-#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
-#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
 #: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
 #: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
 #: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -35,9 +38,10 @@ msgstr ""
 #: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
 #: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
 #: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
 #: en/user_customization-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -61,39 +65,43 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
-#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
-#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
-#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
 #: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
 #: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
 #: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -101,9 +109,10 @@ msgstr "code{"
 #: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
 #: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
 #: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
 #: en/user_customization-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -127,25 +136,26 @@ msgstr "code{"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr "}code"
 
@@ -237,7 +247,7 @@ msgstr ""
 #: en/user_customization-contents.ssi:24
 msgid ""
 "To include files, simply add them to your #{config/includes.chroot}# "
-"directory. This directory corresponds to the root directory (#{/}#) of the "
+"directory. This directory corresponds to the root directory #{/}# of the "
 "live system. For example, to add a file #{/var/www/index.html}# in the live "
 "system, use:"
 msgstr ""
@@ -413,6 +423,6 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-contents.ssi:93
 msgid ""
-"For more information about debconf, please see debconf(7) in the #{debconf}# "
-"package."
+"For more information about debconf, please see #{debconf(7)}# in the /"
+"{debconf}/ package."
 msgstr ""
diff --git a/manual/po/ro/user_customization-overview.ssi.po b/manual/po/ro/user_customization-overview.ssi.po
index ee436bc..086f56a 100644
--- a/manual/po/ro/user_customization-overview.ssi.po
+++ b/manual/po/ro/user_customization-overview.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2010-10-22 08:57-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -111,7 +111,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-overview.ssi:22
 msgid ""
-"Although #{lb config}# does create a skeletal configuration in the config/ "
+"Although #{lb config}# creates a skeletal configuration in the config/ "
 "directory, to accomplish your goals, you may need to provide additional "
 "files in subdirectories of config/. Depending on where the files are stored "
 "in the configuration, they may be copied into the live system's filesystem "
@@ -129,7 +129,7 @@ msgid "2~ Customization tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-overview.ssi:26
+#: en/user_customization-overview.ssi:25
 msgid ""
 "The following chapters are organized by the kinds of customization task "
 "users typically perform: {Customizing package installation}#customizing-"
diff --git a/manual/po/ro/user_customization-packages.ssi.po b/manual/po/ro/user_customization-packages.ssi.po
index b63a9f2..bb94a5d 100644
--- a/manual/po/ro/user_customization-packages.ssi.po
+++ b/manual/po/ro/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 14:10+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2010-10-22 08:58-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,11 +18,11 @@ msgstr ""
 "20)) ? 1 : 2;\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -89,11 +89,11 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -181,12 +181,12 @@ msgid ""
 "distribution mirror. You can also add your own repositories for backports, "
 "experimental or custom packages, or include packages directly as files. You "
 "can define your own lists of packages to include, use live-build's "
-"predefined lists, use #{tasksel}# tasks, or a combination of all three. "
-"Finally, a number of options give some control over apt, or if you prefer, "
-"aptitude, at build time when packages are installed. You may find these "
-"handy if you use a proxy, want to disable installation of recommended "
-"packages to save space, or need to control which versions of packages are "
-"installed via APT pinning, to name a few possibilities."
+"predefined lists, use /{tasksel}/ tasks, or a combination of all three. "
+"Finally, a number of options give some control over /{apt}/, or if you "
+"prefer, /{aptitude}/, at build time when packages are installed. You may "
+"find these handy if you use a proxy, want to disable installation of "
+"recommended packages to save space, or need to control which versions of "
+"packages are installed via APT pinning, to name a few possibilities."
 msgstr ""
 
 #. type: Plain text
@@ -204,7 +204,7 @@ msgstr ""
 msgid ""
 "The distribution you choose has the broadest impact on which packages are "
 "available to include in your live image. Specify the codename, which "
-"defaults to #{wheezy}# for the wheezy version of live-build. Any current "
+"defaults to wheezy for the wheezy version of live-build. Any current "
 "distribution carried in the Debian archive may be specified by its codename "
 "here. (See {Terms}#terms for more details.) The #{--distribution}# option "
 "not only influences the source of packages within the archive, but also "
@@ -516,9 +516,9 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:125
 msgid ""
-"For example, to make a list that includes the predefined #{gnome}# list plus "
-"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
-"contents:"
+"For example, to make a list that includes the predefined #{gnome}# list "
+"plus /{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the "
+"following contents:"
 msgstr ""
 
 #. type: Plain text
@@ -564,9 +564,9 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:148
 msgid ""
-"You may test for any one of a number of values, e.g. to install #{memtest86+}"
-"# if either #{--architectures i386}# or #{--architectures amd64}# is "
-"specified:"
+"You may test for any one of a number of values, e.g. to install /"
+"{memtest86+}/ if either #{--architectures i386}# or #{--architectures amd64}"
+"# is specified:"
 msgstr ""
 
 #. type: Plain text
@@ -890,7 +890,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:266
 msgid ""
-"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
+"You can elect to use either /{apt}/ or /{aptitude}/ when installing packages "
 "at build time. Which utility is used is governed by the #{--apt}# argument "
 "to #{lb config}#. Choose the method implementing the preferred behaviour for "
 "package installation, the notable difference being how missing packages are "
@@ -1073,9 +1073,9 @@ msgid ""
 "the case where you do not want a package that is recommended by another "
 "package. Suppose you are building an LXDE image using #{--package-lists lxde}"
 "# option, but don't want the user prompted to store wifi passwords in the "
-"keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
-"turn recommends #{gnome-keyring}#. So you want to omit the recommended #"
-"{gnome-keyring}# package. This can be done by adding the following stanza to "
+"keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in "
+"turn recommends /{gnome-keyring}/. So you want to omit the recommended /"
+"{gnome-keyring}/ package. This can be done by adding the following stanza to "
 "#{config/chroot_apt/preferences}#:"
 msgstr ""
 
diff --git a/manual/po/ro/user_examples.ssi.po b/manual/po/ro/user_examples.ssi.po
index 593d027..add3f5e 100644
--- a/manual/po/ro/user_examples.ssi.po
+++ b/manual/po/ro/user_examples.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 14:58+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2010-11-04 16:34-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -23,11 +23,11 @@ msgid ":B~ Examples"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -94,11 +94,11 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -410,9 +410,9 @@ msgid ""
 "First, #{--architectures i386}# ensures that on our #{amd64}# build system, "
 "we build a 32-bit version suitable for use on most machines. Second, we use #"
 "{--linux-flavours 686-pae}# because we don't anticipate using this image on "
-"much older systems. Third, we've chosen the #{lxde}# package list to give us "
+"much older systems. Third, we've chosen the /{lxde}/ package list to give us "
 "a minimal desktop. And finally, we have added two initial favourite "
-"packages: #{iceweasel}# and #{xchat}#."
+"packages: /{iceweasel}/ and /{xchat}/."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/user_managing_a_configuration.ssi.po b/manual/po/ro/user_managing_a_configuration.ssi.po
index d04a50b..c854390 100644
--- a/manual/po/ro/user_managing_a_configuration.ssi.po
+++ b/manual/po/ro/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2010-10-13 17:00+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,28 +18,30 @@ msgstr ""
 "20)) ? 1 : 2;\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 en/project_bugs.ssi:60
-#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
-#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
-#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
 #: en/user_customization-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -63,21 +65,22 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -86,28 +89,30 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:64
-#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
-#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
-#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
 #: en/user_customization-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -131,21 +136,22 @@ msgstr "code{"
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -217,7 +223,7 @@ msgid ""
 "variable values, and each time you run #{lb config}# and #{lb clean}#, these "
 "files will be executed. This will ensure that your configuration is kept "
 "internally consistent from one revision to the next and from one live-build "
-"release to the next (though you will still have to take care and read the "
+"release to the next (Although you will still have to take care and read the "
 "documentation when you upgrade live-build and make adjustments as needed)."
 msgstr ""
 
diff --git a/manual/po/ro/user_overview.ssi.po b/manual/po/ro/user_overview.ssi.po
index d77183d..439194a 100644
--- a/manual/po/ro/user_overview.ssi.po
+++ b/manual/po/ro/user_overview.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: 2010-10-22 07:52-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,11 +18,11 @@ msgstr ""
 "20)) ? 1 : 2;\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -89,11 +89,11 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -226,7 +226,7 @@ msgstr ""
 msgid ""
 "Unlike /{debhelper}/, live-build contains a tool to generate a skeleton "
 "configuration directory, #{lb config}#. This could be considered to be "
-"similar to tools such as #{dh-make}#. For more information about #{lb config}"
+"similar to tools such as /{dh-make}/. For more information about #{lb config}"
 "#, please see {The lb config command}#lb-config."
 msgstr ""
 
diff --git a/manual/pot/about_manual.ssi.pot b/manual/pot/about_manual.ssi.pot
index 9567e18..319e444 100644
--- a/manual/pot/about_manual.ssi.pot
+++ b/manual/pot/about_manual.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-14 12:48+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -141,7 +141,7 @@ msgstr ""
 #: en/about_manual.ssi:32
 msgid ""
 "_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
-"boot was formerly a part of live-initramfs."
+"boot was formerly a part of /{live-initramfs}/."
 msgstr ""
 
 #. type: Plain text
@@ -659,10 +659,10 @@ msgstr ""
 #: en/about_manual.ssi:211
 msgid ""
 "_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
-"in.pot files to your language with your favourite editor (such as poedit). "
-"Send translated files to the mailing list. Once we have reviewed your "
-"submission, we will add the new language to the manual (providing the po "
-"files) and will enable it in the autobuild."
+"in.pot files to your language with your favourite editor (such as /"
+"{poedit}/). Send translated files to the mailing list. Once we have reviewed "
+"your submission, we will add the new language to the manual (providing the "
+"po files) and will enable it in the autobuild."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/user_basics.ssi.pot b/manual/pot/user_basics.ssi.pot
index 18536f4..79bf84f 100644
--- a/manual/pot/user_basics.ssi.pot
+++ b/manual/pot/user_basics.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 16:54+0300\n"
+"POT-Creation-Date: 2012-04-14 16:31+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -88,11 +88,11 @@ msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -412,8 +412,8 @@ msgid ""
 "Once you've booted the media, you are presented with a boot menu. If you "
 "just press enter here, the system will boot using the default entry, #{Live}"
 "# and default options. For more information about boot options, see the "
-"\"help\" entry in the menu and also the #{live-boot}# and #{live-config}# "
-"man pages found within the live system."
+"\"help\" entry in the menu and also the live-boot and live-config man pages "
+"found within the live system."
 msgstr ""
 
 #. type: Plain text
@@ -483,16 +483,16 @@ msgstr ""
 #: en/user_basics.ssi:104
 msgid ""
 "The most versatile VM in Debian is QEMU. If your processor has hardware "
-"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
+"support for virtualization, use the /{qemu-kvm}/ package; the /{qemu-kvm}/ "
 "package description briefly lists the requirements."
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:106
 msgid ""
-"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
-"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
-"the following examples. The #{qemu-utils}# package is also valuable for "
+"First, install /{qemu-kvm}/ if your processor supports it. If not, install /"
+"{qemu}/, in which case the program name is #{qemu}# instead of #{kvm}# in "
+"the following examples. The /{qemu-utils}/ package is also valuable for "
 "creating virtual disk images with #{qemu-img}#."
 msgstr ""
 
@@ -637,10 +637,10 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:182
 msgid ""
-"First, install QEMU as described above in {Testing an ISO image with QEMU}"
-"#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on which "
-"version your host system needs, specifying #{binary.img}# as the first hard "
-"drive."
+"First, install /{qemu}/ as described above in {Testing an ISO image with "
+"QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on "
+"which version your host system needs, specifying #{binary.img}# as the first "
+"hard drive."
 msgstr ""
 
 #. type: Plain text
@@ -658,7 +658,7 @@ msgstr ""
 #: en/user_basics.ssi:192
 msgid ""
 "To use the remaining free space after copying #{binary.img}# to a USB stick, "
-"use a partitioning tool such as #{gparted}# or #{parted}# to create a new "
+"use a partitioning tool such as /{gparted}/ or /{parted}/ to create a new "
 "partition on the stick. The first partition will be used by the Debian Live "
 "system."
 msgstr ""
@@ -874,7 +874,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:294
-msgid "You need to install the #{nfs-kernel-server}# package."
+msgid "You need to install the /{nfs-kernel-server}/ package."
 msgstr ""
 
 #. type: Plain text
@@ -938,7 +938,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:322
-msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
+msgid "_* Install /{qemu}/, /{bridge-utils}/, /{sudo}/."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/user_customization-contents.ssi.pot b/manual/pot/user_customization-contents.ssi.pot
index 2f4f5d2..0218f95 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: 2012-01-15 16:28+0100\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,16 +17,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
-#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
-#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
-#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
 #: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
 #: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
 #: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
@@ -34,9 +37,10 @@ msgstr ""
 #: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
 #: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
 #: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
 #: en/user_customization-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -60,39 +64,43 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:48 en/user_overview.ssi:56
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
-#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
-#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
-#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
 #: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
 #: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
 #: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
@@ -100,9 +108,10 @@ msgstr ""
 #: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
 #: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
 #: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
 #: en/user_customization-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -126,25 +135,26 @@ msgstr ""
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
-#: en/user_overview.ssi:52 en/user_overview.ssi:60
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr ""
 
@@ -236,7 +246,7 @@ msgstr ""
 #: en/user_customization-contents.ssi:24
 msgid ""
 "To include files, simply add them to your #{config/includes.chroot}# "
-"directory. This directory corresponds to the root directory (#{/}#) of the "
+"directory. This directory corresponds to the root directory #{/}# of the "
 "live system. For example, to add a file #{/var/www/index.html}# in the live "
 "system, use:"
 msgstr ""
@@ -412,6 +422,6 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-contents.ssi:93
 msgid ""
-"For more information about debconf, please see debconf(7) in the #{debconf}# "
-"package."
+"For more information about debconf, please see #{debconf(7)}# in the /"
+"{debconf}/ package."
 msgstr ""
diff --git a/manual/pot/user_customization-overview.ssi.pot b/manual/pot/user_customization-overview.ssi.pot
index 93027aa..c7d58a1 100644
--- a/manual/pot/user_customization-overview.ssi.pot
+++ b/manual/pot/user_customization-overview.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -110,7 +110,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-overview.ssi:22
 msgid ""
-"Although #{lb config}# does create a skeletal configuration in the config/ "
+"Although #{lb config}# creates a skeletal configuration in the config/ "
 "directory, to accomplish your goals, you may need to provide additional "
 "files in subdirectories of config/. Depending on where the files are stored "
 "in the configuration, they may be copied into the live system's filesystem "
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index bb5d243..bea984d 100644
--- a/manual/pot/user_customization-packages.ssi.pot
+++ b/manual/pot/user_customization-packages.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 14:10+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -88,11 +88,11 @@ msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -180,12 +180,12 @@ msgid ""
 "distribution mirror. You can also add your own repositories for backports, "
 "experimental or custom packages, or include packages directly as files. You "
 "can define your own lists of packages to include, use live-build's "
-"predefined lists, use #{tasksel}# tasks, or a combination of all three. "
-"Finally, a number of options give some control over apt, or if you prefer, "
-"aptitude, at build time when packages are installed. You may find these "
-"handy if you use a proxy, want to disable installation of recommended "
-"packages to save space, or need to control which versions of packages are "
-"installed via APT pinning, to name a few possibilities."
+"predefined lists, use /{tasksel}/ tasks, or a combination of all three. "
+"Finally, a number of options give some control over /{apt}/, or if you "
+"prefer, /{aptitude}/, at build time when packages are installed. You may "
+"find these handy if you use a proxy, want to disable installation of "
+"recommended packages to save space, or need to control which versions of "
+"packages are installed via APT pinning, to name a few possibilities."
 msgstr ""
 
 #. type: Plain text
@@ -203,7 +203,7 @@ msgstr ""
 msgid ""
 "The distribution you choose has the broadest impact on which packages are "
 "available to include in your live image. Specify the codename, which "
-"defaults to #{wheezy}# for the wheezy version of live-build. Any current "
+"defaults to wheezy for the wheezy version of live-build. Any current "
 "distribution carried in the Debian archive may be specified by its codename "
 "here. (See {Terms}#terms for more details.) The #{--distribution}# option "
 "not only influences the source of packages within the archive, but also "
@@ -515,9 +515,9 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:125
 msgid ""
-"For example, to make a list that includes the predefined #{gnome}# list plus "
-"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
-"contents:"
+"For example, to make a list that includes the predefined #{gnome}# list "
+"plus /{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the "
+"following contents:"
 msgstr ""
 
 #. type: Plain text
@@ -563,9 +563,9 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:148
 msgid ""
-"You may test for any one of a number of values, e.g. to install #{memtest86+}"
-"# if either #{--architectures i386}# or #{--architectures amd64}# is "
-"specified:"
+"You may test for any one of a number of values, e.g. to install /"
+"{memtest86+}/ if either #{--architectures i386}# or #{--architectures amd64}"
+"# is specified:"
 msgstr ""
 
 #. type: Plain text
@@ -889,7 +889,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:266
 msgid ""
-"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
+"You can elect to use either /{apt}/ or /{aptitude}/ when installing packages "
 "at build time. Which utility is used is governed by the #{--apt}# argument "
 "to #{lb config}#. Choose the method implementing the preferred behaviour for "
 "package installation, the notable difference being how missing packages are "
@@ -1072,9 +1072,9 @@ msgid ""
 "the case where you do not want a package that is recommended by another "
 "package. Suppose you are building an LXDE image using #{--package-lists lxde}"
 "# option, but don't want the user prompted to store wifi passwords in the "
-"keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in "
-"turn recommends #{gnome-keyring}#. So you want to omit the recommended #"
-"{gnome-keyring}# package. This can be done by adding the following stanza to "
+"keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in "
+"turn recommends /{gnome-keyring}/. So you want to omit the recommended /"
+"{gnome-keyring}/ package. This can be done by adding the following stanza to "
 "#{config/chroot_apt/preferences}#:"
 msgstr ""
 
diff --git a/manual/pot/user_examples.ssi.pot b/manual/pot/user_examples.ssi.pot
index 0db896a..f2371cf 100644
--- a/manual/pot/user_examples.ssi.pot
+++ b/manual/pot/user_examples.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 14:58+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -22,11 +22,11 @@ msgid ":B~ Examples"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -93,11 +93,11 @@ msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -409,9 +409,9 @@ msgid ""
 "First, #{--architectures i386}# ensures that on our #{amd64}# build system, "
 "we build a 32-bit version suitable for use on most machines. Second, we use #"
 "{--linux-flavours 686-pae}# because we don't anticipate using this image on "
-"much older systems. Third, we've chosen the #{lxde}# package list to give us "
+"much older systems. Third, we've chosen the /{lxde}/ package list to give us "
 "a minimal desktop. And finally, we have added two initial favourite "
-"packages: #{iceweasel}# and #{xchat}#."
+"packages: /{iceweasel}/ and /{xchat}/."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/user_managing_a_configuration.ssi.pot b/manual/pot/user_managing_a_configuration.ssi.pot
index 7041a6b..6f93f4a 100644
--- a/manual/pot/user_managing_a_configuration.ssi.pot
+++ b/manual/pot/user_managing_a_configuration.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,28 +17,30 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
-#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
-#: en/about_manual.ssi:197 en/project_bugs.ssi:60
-#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
-#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
-#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
-#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
-#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
-#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
-#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
-#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
-#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
-#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
-#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
-#: en/user_basics.ssi:351 en/user_customization-binary.ssi:14
-#: en/user_customization-binary.ssi:28 en/user_customization-binary.ssi:39
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
+#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
+#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
+#: en/project_coding-style.ssi:112 en/project_coding-style.ssi:123
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:53
+#: en/project_procedures.ssi:65 en/style_guide.ssi:124 en/style_guide.ssi:134
+#: en/style_guide.ssi:144 en/style_guide.ssi:154 en/style_guide.ssi:164
+#: en/style_guide.ssi:177 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
+#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
+#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
+#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
+#: en/user_customization-binary.ssi:39 en/user_customization-contents.ssi:26
+#: en/user_customization-contents.ssi:35 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:66
 #: en/user_customization-installer.ssi:32
 #: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -62,21 +64,22 @@ msgstr ""
 #: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
 #: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
 #: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:104 en/user_customization-runtime.ssi:114
-#: en/user_customization-runtime.ssi:122 en/user_examples.ssi:14
-#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
-#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
-#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
-#: en/user_examples.ssi:277 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:74
-#: en/user_installation.ssi:82 en/user_installation.ssi:90
-#: en/user_installation.ssi:114 en/user_installation.ssi:129
-#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:67 en/user_examples.ssi:83
+#: en/user_examples.ssi:93 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:141 en/user_examples.ssi:149
+#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:181
+#: en/user_examples.ssi:193 en/user_examples.ssi:209 en/user_examples.ssi:223
+#: en/user_examples.ssi:232 en/user_examples.ssi:250 en/user_examples.ssi:258
+#: en/user_examples.ssi:267 en/user_examples.ssi:277
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:74 en/user_installation.ssi:82
+#: en/user_installation.ssi:90 en/user_installation.ssi:114
+#: en/user_installation.ssi:129 en/user_installation.ssi:146
+#: en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -85,28 +88,30 @@ msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
-#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:64
-#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
-#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
-#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
-#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
-#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
-#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
-#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
-#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
-#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
-#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
-#: en/user_basics.ssi:376 en/user_customization-binary.ssi:18
-#: en/user_customization-binary.ssi:35 en/user_customization-binary.ssi:45
-#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
-#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
+#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
+#: en/project_coding-style.ssi:119 en/project_coding-style.ssi:130
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:61
+#: en/project_procedures.ssi:138 en/style_guide.ssi:128 en/style_guide.ssi:138
+#: en/style_guide.ssi:148 en/style_guide.ssi:158 en/style_guide.ssi:173
+#: en/style_guide.ssi:182 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
+#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
+#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
+#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
+#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
+#: en/user_customization-binary.ssi:45 en/user_customization-contents.ssi:31
+#: en/user_customization-contents.ssi:46 en/user_customization-contents.ssi:58
+#: en/user_customization-contents.ssi:70
 #: en/user_customization-installer.ssi:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -130,21 +135,22 @@ msgstr ""
 #: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
 #: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
 #: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:108 en/user_customization-runtime.ssi:118
-#: en/user_customization-runtime.ssi:127 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
-#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
-#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
-#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
-#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
-#: en/user_examples.ssi:291 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:61 en/user_examples.ssi:71 en/user_examples.ssi:89
+#: en/user_examples.ssi:103 en/user_examples.ssi:111 en/user_examples.ssi:121
+#: en/user_examples.ssi:133 en/user_examples.ssi:145 en/user_examples.ssi:153
+#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:189
+#: en/user_examples.ssi:205 en/user_examples.ssi:213 en/user_examples.ssi:228
+#: en/user_examples.ssi:236 en/user_examples.ssi:254 en/user_examples.ssi:263
+#: en/user_examples.ssi:273 en/user_examples.ssi:291
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:70
+#: en/user_installation.ssi:78 en/user_installation.ssi:86
+#: en/user_installation.ssi:94 en/user_installation.ssi:119
+#: en/user_installation.ssi:136 en/user_installation.ssi:149
+#: en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
@@ -216,7 +222,7 @@ msgid ""
 "variable values, and each time you run #{lb config}# and #{lb clean}#, these "
 "files will be executed. This will ensure that your configuration is kept "
 "internally consistent from one revision to the next and from one live-build "
-"release to the next (though you will still have to take care and read the "
+"release to the next (Although you will still have to take care and read the "
 "documentation when you upgrade live-build and make adjustments as needed)."
 msgstr ""
 
diff --git a/manual/pot/user_overview.ssi.pot b/manual/pot/user_overview.ssi.pot
index adee664..29f62be 100644
--- a/manual/pot/user_overview.ssi.pot
+++ b/manual/pot/user_overview.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-14 16:13+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -88,11 +88,11 @@ msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
+#: en/about_manual.ssi:205 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -225,7 +225,7 @@ msgstr ""
 msgid ""
 "Unlike /{debhelper}/, live-build contains a tool to generate a skeleton "
 "configuration directory, #{lb config}#. This could be considered to be "
-"similar to tools such as #{dh-make}#. For more information about #{lb config}"
+"similar to tools such as /{dh-make}/. For more information about #{lb config}"
 "#, please see {The lb config command}#lb-config."
 msgstr ""
 
diff --git a/manual/pt_BR/about_manual.ssi b/manual/pt_BR/about_manual.ssi
index 83bb15b..1976fd7 100644
--- a/manual/pt_BR/about_manual.ssi
+++ b/manual/pt_BR/about_manual.ssi
@@ -67,7 +67,7 @@ _* *{Host system}*: O ambiente usado para criar o sistema live.
 _* *{Target system}*: O ambiente usado para rodar o sistema live.
 
 _* *{live-boot}*: Uma coleção de scripts usados para inicializar sistemas
-live. live-boot era formalmente parte do live-initramfs.
+live. live-boot era formalmente parte do /{live-initramfs}/.
 
 _* *{live-build}*: Uma coleção de scripts usados para construir sistemas
 Debian live customizados. live-build era formalmente conhecido como
@@ -75,7 +75,7 @@ Debian live customizados. live-build era formalmente conhecido como
 
 _* *{live-config}*: Uma coleção de scripts usados para configurar um sistema
 live durante o processo de boot. live-config era formalmente parte do
-live-/{initramfs}/.
+/{live-initramfs}/.
 
 _* *{live-manual}*: Esse documento é mantido em um pacote chamado
 live-manual.
@@ -289,9 +289,9 @@ To submit a translation for a new language, follow these three steps:
 
 _* Translate the about_manual.ssi.pot, about_project.ssi.pot and
 index.html.in.pot files to your language with your favourite editor (such as
-poedit). Send translated files to the mailing list. Once we have reviewed
-your submission, we will add the new language to the manual (providing the
-po files) and will enable it in the autobuild.
+/{poedit}/). Send translated files to the mailing list. Once we have
+reviewed your submission, we will add the new language to the manual
+(providing the po files) and will enable it in the autobuild.
 
 _* Once the new language is added, you can randomly start translating all po
 files in #{manual/po/}#.
diff --git a/manual/pt_BR/user_basics.ssi b/manual/pt_BR/user_basics.ssi
index c88fb2c..0726c1b 100644
--- a/manual/pt_BR/user_basics.ssi
+++ b/manual/pt_BR/user_basics.ssi
@@ -146,8 +146,8 @@ normal boot device.
 Once you've booted the media, you are presented with a boot menu. If you
 just press enter here, the system will boot using the default entry,
 #{Live}# and default options. For more information about boot options, see
-the "help" entry in the menu and also the #{live-boot}# and #{live-config}#
-man pages found within the live system.
+the "help" entry in the menu and also the live-boot and live-config man
+pages found within the live system.
 
 Assuming you've selected #{Live}# and booted a default desktop live image,
 after the boot messages scroll by, you should be automatically logged into
@@ -179,12 +179,12 @@ software and choose one that is suitable for your needs.
 3~testing-iso-with-qemu Testing an ISO image with QEMU
 
 The most versatile VM in Debian is QEMU. If your processor has hardware
-support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}#
+support for virtualization, use the /{qemu-kvm}/ package; the /{qemu-kvm}/
 package description briefly lists the requirements.
 
-First, install #{qemu-kvm}# if your processor supports it. If not, install
-#{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in
-the following examples. The #{qemu-utils}# package is also valuable for
+First, install /{qemu-kvm}/ if your processor supports it. If not, install
+/{qemu}/, in which case the program name is #{qemu}# instead of #{kvm}# in
+the following examples. The /{qemu-utils}/ package is also valuable for
 creating virtual disk images with #{qemu-img}#.
 
 code{
@@ -275,7 +275,7 @@ filename #{binary.img}# instead of #{binary-hybrid.iso}#.
 
 3~testing-hdd-with-qemu Testing an HDD image with Qemu
 
-First, install QEMU as described above in {Testing an ISO image with
+First, install /{qemu}/ as described above in {Testing an ISO image with
 QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on
 which version your host system needs, specifying #{binary.img}# as the first
 hard drive.
@@ -289,7 +289,7 @@ code{
 3~using-usb-extra-space Using the space left on a USB stick
 
 To use the remaining free space after copying #{binary.img}# to a USB stick,
-use a partitioning tool such as #{gparted}# or #{parted}# to create a new
+use a partitioning tool such as /{gparted}/ or /{parted}/ to create a new
 partition on the stick. The first partition will be used by the Debian Live
 system.
 
@@ -419,7 +419,7 @@ Once the guest computer has downloaded and booted a Linux kernel and loaded
 its initrd, it will try to mount the Live filesystem image through a NFS
 server.
 
-You need to install the #{nfs-kernel-server}# package.
+You need to install the /{nfs-kernel-server}/ package.
 
 Then, make the filesystem image available through NFS by adding a line like
 the following to #{/etc/exports}#:
@@ -454,7 +454,7 @@ To make our life easier, we can use virtualization. There are two solutions.
 
 3~ Qemu
 
-_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#.
+_* Install /{qemu}/, /{bridge-utils}/, /{sudo}/.
 
 Edit #{/etc/qemu-ifup}#:
 
diff --git a/manual/pt_BR/user_customization-contents.ssi b/manual/pt_BR/user_customization-contents.ssi
index 4d67a3c..e6237cf 100644
--- a/manual/pt_BR/user_customization-contents.ssi
+++ b/manual/pt_BR/user_customization-contents.ssi
@@ -43,7 +43,7 @@ see {Live/chroot local hooks}#live-chroot-local-hooks if processing is
 needed.
 
 To include files, simply add them to your #{config/includes.chroot}#
-directory. This directory corresponds to the root directory (#{/}#) of the
+directory. This directory corresponds to the root directory #{/}# of the
 live system. For example, to add a file #{/var/www/index.html}# in the live
 system, use:
 
@@ -151,5 +151,5 @@ 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.
 
-For more information about debconf, please see debconf(7) in the #{debconf}#
-package.
+For more information about debconf, please see #{debconf(7)}# in the
+/{debconf}/ package.
diff --git a/manual/pt_BR/user_customization-overview.ssi b/manual/pt_BR/user_customization-overview.ssi
index 137e322..0e2fec2 100644
--- a/manual/pt_BR/user_customization-overview.ssi
+++ b/manual/pt_BR/user_customization-overview.ssi
@@ -55,7 +55,7 @@ in place.
 
 2~ Supplement lb config with files
 
-Although #{lb config}# does create a skeletal configuration in the config/
+Although #{lb config}# creates a skeletal configuration in the config/
 directory, to accomplish your goals, you may need to provide additional
 files in subdirectories of config/. Depending on where the files are stored
 in the configuration, they may be copied into the live system's filesystem
diff --git a/manual/pt_BR/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
index 89ab2f6..1145a94 100644
--- a/manual/pt_BR/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -11,12 +11,12 @@ areas. To ensure decent download speeds, you should choose a nearby
 distribution mirror. You can also add your own repositories for backports,
 experimental or custom packages, or include packages directly as files. You
 can define your own lists of packages to include, use live-build's
-predefined lists, use #{tasksel}# tasks, or a combination of all
-three. Finally, a number of options give some control over apt, or if you
-prefer, aptitude, at build time when packages are installed. You may find
-these handy if you use a proxy, want to disable installation of recommended
-packages to save space, or need to control which versions of packages are
-installed via APT pinning, to name a few possibilities.
+predefined lists, use /{tasksel}/ tasks, or a combination of all
+three. Finally, a number of options give some control over /{apt}/, or if
+you prefer, /{aptitude}/, at build time when packages are installed. You may
+find these handy if you use a proxy, want to disable installation of
+recommended packages to save space, or need to control which versions of
+packages are installed via APT pinning, to name a few possibilities.
 
 2~ Package sources
 
@@ -24,7 +24,7 @@ installed via APT pinning, to name a few possibilities.
 
 The distribution you choose has the broadest impact on which packages are
 available to include in your live image. Specify the codename, which
-defaults to #{wheezy}# for the wheezy version of live-build. Any current
+defaults to wheezy for the wheezy version of live-build. Any current
 distribution carried in the Debian archive may be specified by its codename
 here. (See {Terms}#terms for more details.) The #{--distribution}# option
 not only influences the source of packages within the archive, but also
@@ -209,8 +209,8 @@ includes. Refer to these in the #{/usr/share/live/build/package-lists/}#
 directory, as they serve as good examples of how to write your own lists.
 
 For example, to make a list that includes the predefined #{gnome}# list plus
-iceweasel, create #{config/package-lists/my.list.chroot}# with the following
-contents:
+/{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the
+following contents:
 
 code{
 
@@ -240,7 +240,7 @@ code{
 }code
 
 You may test for any one of a number of values, e.g. to install
-#{memtest86+}# if either #{--architectures i386}# or #{--architectures
+/{memtest86+}/ if either #{--architectures i386}# or #{--architectures
 amd64}# is specified:
 
 code{
@@ -427,7 +427,7 @@ man page.
 
 3~choosing-apt-or-aptitude Choosing apt or aptitude
 
-You can elect to use either #{apt}# or #{aptitude}# when installing packages
+You can elect to use either /{apt}/ or /{aptitude}/ when installing packages
 at build time. Which utility is used is governed by the #{--apt}# argument
 to #{lb config}#. Choose the method implementing the preferred behaviour for
 package installation, the notable difference being how missing packages are
@@ -541,9 +541,9 @@ Negative pin priorities will prevent a package from being installed, as in
 the case where you do not want a package that is recommended by another
 package. Suppose you are building an LXDE image using #{--package-lists
 lxde}# option, but don't want the user prompted to store wifi passwords in
-the keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in
-turn recommends #{gnome-keyring}#. So you want to omit the recommended
-#{gnome-keyring}# package. This can be done by adding the following stanza
+the keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in
+turn recommends /{gnome-keyring}/. So you want to omit the recommended
+/{gnome-keyring}/ package. This can be done by adding the following stanza
 to #{config/chroot_apt/preferences}#:
 
 code{
diff --git a/manual/pt_BR/user_examples.ssi b/manual/pt_BR/user_examples.ssi
index 81d18f6..c5eb275 100644
--- a/manual/pt_BR/user_examples.ssi
+++ b/manual/pt_BR/user_examples.ssi
@@ -149,9 +149,9 @@ code{
 First, #{--architectures i386}# ensures that on our #{amd64}# build system,
 we build a 32-bit version suitable for use on most machines. Second, we use
 #{--linux-flavours 686-pae}# because we don't anticipate using this image on
-much older systems. Third, we've chosen the #{lxde}# package list to give us
+much older systems. Third, we've chosen the /{lxde}/ package list to give us
 a minimal desktop. And finally, we have added two initial favourite
-packages: #{iceweasel}# and #{xchat}#.
+packages: /{iceweasel}/ and /{xchat}/.
 
 Now, build the image:
 
diff --git a/manual/pt_BR/user_managing_a_configuration.ssi b/manual/pt_BR/user_managing_a_configuration.ssi
index 7df1d34..8f6089a 100644
--- a/manual/pt_BR/user_managing_a_configuration.ssi
+++ b/manual/pt_BR/user_managing_a_configuration.ssi
@@ -34,7 +34,7 @@ options, and an auto/clean that removes the files containing configuration
 variable values, and each time you run #{lb config}# and #{lb clean}#, these
 files will be executed. This will ensure that your configuration is kept
 internally consistent from one revision to the next and from one live-build
-release to the next (though you will still have to take care and read the
+release to the next (Although you will still have to take care and read the
 documentation when you upgrade live-build and make adjustments as needed).
 
 2~ Example auto scripts
diff --git a/manual/pt_BR/user_overview.ssi b/manual/pt_BR/user_overview.ssi
index 100ca04..c0e59b5 100644
--- a/manual/pt_BR/user_overview.ssi
+++ b/manual/pt_BR/user_overview.ssi
@@ -29,7 +29,7 @@ each command.
 
 Unlike /{debhelper}/, live-build contains a tool to generate a skeleton
 configuration directory, #{lb config}#. This could be considered to be
-similar to tools such as #{dh-make}#. For more information about #{lb
+similar to tools such as /{dh-make}/. For more information about #{lb
 config}#, please see {The lb config command}#lb-config.
 
 The remainder of this section discusses the three most important commands:
diff --git a/manual/ro/about_manual.ssi b/manual/ro/about_manual.ssi
index 4dc8193..ddb73f7 100644
--- a/manual/ro/about_manual.ssi
+++ b/manual/ro/about_manual.ssi
@@ -65,7 +65,7 @@ sistem dat.
 _* *{Target system}*: Mediul folosit pentru rularea sistemului live.
 
 _* *{live-boot}*: O coloctie se scripte folosite la pornirea sistemului
-live. live-boot a facul parte formal din live-initramfs.
+live. live-boot a facul parte formal din /{live-initramfs}/.
 
 _* *{live-build}*: O colectie de scripte folosite la particularizatrea
 sistemelor Debian Live. live-build a fost cunoscut ca /{live-helper}/, iar
@@ -285,9 +285,9 @@ To submit a translation for a new language, follow these three steps:
 
 _* Translate the about_manual.ssi.pot, about_project.ssi.pot and
 index.html.in.pot files to your language with your favourite editor (such as
-poedit). Send translated files to the mailing list. Once we have reviewed
-your submission, we will add the new language to the manual (providing the
-po files) and will enable it in the autobuild.
+/{poedit}/). Send translated files to the mailing list. Once we have
+reviewed your submission, we will add the new language to the manual
+(providing the po files) and will enable it in the autobuild.
 
 _* Once the new language is added, you can randomly start translating all po
 files in #{manual/po/}#.
diff --git a/manual/ro/user_basics.ssi b/manual/ro/user_basics.ssi
index c88fb2c..0726c1b 100644
--- a/manual/ro/user_basics.ssi
+++ b/manual/ro/user_basics.ssi
@@ -146,8 +146,8 @@ normal boot device.
 Once you've booted the media, you are presented with a boot menu. If you
 just press enter here, the system will boot using the default entry,
 #{Live}# and default options. For more information about boot options, see
-the "help" entry in the menu and also the #{live-boot}# and #{live-config}#
-man pages found within the live system.
+the "help" entry in the menu and also the live-boot and live-config man
+pages found within the live system.
 
 Assuming you've selected #{Live}# and booted a default desktop live image,
 after the boot messages scroll by, you should be automatically logged into
@@ -179,12 +179,12 @@ software and choose one that is suitable for your needs.
 3~testing-iso-with-qemu Testing an ISO image with QEMU
 
 The most versatile VM in Debian is QEMU. If your processor has hardware
-support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}#
+support for virtualization, use the /{qemu-kvm}/ package; the /{qemu-kvm}/
 package description briefly lists the requirements.
 
-First, install #{qemu-kvm}# if your processor supports it. If not, install
-#{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in
-the following examples. The #{qemu-utils}# package is also valuable for
+First, install /{qemu-kvm}/ if your processor supports it. If not, install
+/{qemu}/, in which case the program name is #{qemu}# instead of #{kvm}# in
+the following examples. The /{qemu-utils}/ package is also valuable for
 creating virtual disk images with #{qemu-img}#.
 
 code{
@@ -275,7 +275,7 @@ filename #{binary.img}# instead of #{binary-hybrid.iso}#.
 
 3~testing-hdd-with-qemu Testing an HDD image with Qemu
 
-First, install QEMU as described above in {Testing an ISO image with
+First, install /{qemu}/ as described above in {Testing an ISO image with
 QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on
 which version your host system needs, specifying #{binary.img}# as the first
 hard drive.
@@ -289,7 +289,7 @@ code{
 3~using-usb-extra-space Using the space left on a USB stick
 
 To use the remaining free space after copying #{binary.img}# to a USB stick,
-use a partitioning tool such as #{gparted}# or #{parted}# to create a new
+use a partitioning tool such as /{gparted}/ or /{parted}/ to create a new
 partition on the stick. The first partition will be used by the Debian Live
 system.
 
@@ -419,7 +419,7 @@ Once the guest computer has downloaded and booted a Linux kernel and loaded
 its initrd, it will try to mount the Live filesystem image through a NFS
 server.
 
-You need to install the #{nfs-kernel-server}# package.
+You need to install the /{nfs-kernel-server}/ package.
 
 Then, make the filesystem image available through NFS by adding a line like
 the following to #{/etc/exports}#:
@@ -454,7 +454,7 @@ To make our life easier, we can use virtualization. There are two solutions.
 
 3~ Qemu
 
-_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#.
+_* Install /{qemu}/, /{bridge-utils}/, /{sudo}/.
 
 Edit #{/etc/qemu-ifup}#:
 
diff --git a/manual/ro/user_customization-contents.ssi b/manual/ro/user_customization-contents.ssi
index 4d67a3c..e6237cf 100644
--- a/manual/ro/user_customization-contents.ssi
+++ b/manual/ro/user_customization-contents.ssi
@@ -43,7 +43,7 @@ see {Live/chroot local hooks}#live-chroot-local-hooks if processing is
 needed.
 
 To include files, simply add them to your #{config/includes.chroot}#
-directory. This directory corresponds to the root directory (#{/}#) of the
+directory. This directory corresponds to the root directory #{/}# of the
 live system. For example, to add a file #{/var/www/index.html}# in the live
 system, use:
 
@@ -151,5 +151,5 @@ 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.
 
-For more information about debconf, please see debconf(7) in the #{debconf}#
-package.
+For more information about debconf, please see #{debconf(7)}# in the
+/{debconf}/ package.
diff --git a/manual/ro/user_customization-overview.ssi b/manual/ro/user_customization-overview.ssi
index 137e322..0e2fec2 100644
--- a/manual/ro/user_customization-overview.ssi
+++ b/manual/ro/user_customization-overview.ssi
@@ -55,7 +55,7 @@ in place.
 
 2~ Supplement lb config with files
 
-Although #{lb config}# does create a skeletal configuration in the config/
+Although #{lb config}# creates a skeletal configuration in the config/
 directory, to accomplish your goals, you may need to provide additional
 files in subdirectories of config/. Depending on where the files are stored
 in the configuration, they may be copied into the live system's filesystem
diff --git a/manual/ro/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
index 89ab2f6..1145a94 100644
--- a/manual/ro/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -11,12 +11,12 @@ areas. To ensure decent download speeds, you should choose a nearby
 distribution mirror. You can also add your own repositories for backports,
 experimental or custom packages, or include packages directly as files. You
 can define your own lists of packages to include, use live-build's
-predefined lists, use #{tasksel}# tasks, or a combination of all
-three. Finally, a number of options give some control over apt, or if you
-prefer, aptitude, at build time when packages are installed. You may find
-these handy if you use a proxy, want to disable installation of recommended
-packages to save space, or need to control which versions of packages are
-installed via APT pinning, to name a few possibilities.
+predefined lists, use /{tasksel}/ tasks, or a combination of all
+three. Finally, a number of options give some control over /{apt}/, or if
+you prefer, /{aptitude}/, at build time when packages are installed. You may
+find these handy if you use a proxy, want to disable installation of
+recommended packages to save space, or need to control which versions of
+packages are installed via APT pinning, to name a few possibilities.
 
 2~ Package sources
 
@@ -24,7 +24,7 @@ installed via APT pinning, to name a few possibilities.
 
 The distribution you choose has the broadest impact on which packages are
 available to include in your live image. Specify the codename, which
-defaults to #{wheezy}# for the wheezy version of live-build. Any current
+defaults to wheezy for the wheezy version of live-build. Any current
 distribution carried in the Debian archive may be specified by its codename
 here. (See {Terms}#terms for more details.) The #{--distribution}# option
 not only influences the source of packages within the archive, but also
@@ -209,8 +209,8 @@ includes. Refer to these in the #{/usr/share/live/build/package-lists/}#
 directory, as they serve as good examples of how to write your own lists.
 
 For example, to make a list that includes the predefined #{gnome}# list plus
-iceweasel, create #{config/package-lists/my.list.chroot}# with the following
-contents:
+/{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the
+following contents:
 
 code{
 
@@ -240,7 +240,7 @@ code{
 }code
 
 You may test for any one of a number of values, e.g. to install
-#{memtest86+}# if either #{--architectures i386}# or #{--architectures
+/{memtest86+}/ if either #{--architectures i386}# or #{--architectures
 amd64}# is specified:
 
 code{
@@ -427,7 +427,7 @@ man page.
 
 3~choosing-apt-or-aptitude Choosing apt or aptitude
 
-You can elect to use either #{apt}# or #{aptitude}# when installing packages
+You can elect to use either /{apt}/ or /{aptitude}/ when installing packages
 at build time. Which utility is used is governed by the #{--apt}# argument
 to #{lb config}#. Choose the method implementing the preferred behaviour for
 package installation, the notable difference being how missing packages are
@@ -541,9 +541,9 @@ Negative pin priorities will prevent a package from being installed, as in
 the case where you do not want a package that is recommended by another
 package. Suppose you are building an LXDE image using #{--package-lists
 lxde}# option, but don't want the user prompted to store wifi passwords in
-the keyring. This list includes #{gdm}#, which depends on #{gksu}#, which in
-turn recommends #{gnome-keyring}#. So you want to omit the recommended
-#{gnome-keyring}# package. This can be done by adding the following stanza
+the keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in
+turn recommends /{gnome-keyring}/. So you want to omit the recommended
+/{gnome-keyring}/ package. This can be done by adding the following stanza
 to #{config/chroot_apt/preferences}#:
 
 code{
diff --git a/manual/ro/user_examples.ssi b/manual/ro/user_examples.ssi
index 81d18f6..c5eb275 100644
--- a/manual/ro/user_examples.ssi
+++ b/manual/ro/user_examples.ssi
@@ -149,9 +149,9 @@ code{
 First, #{--architectures i386}# ensures that on our #{amd64}# build system,
 we build a 32-bit version suitable for use on most machines. Second, we use
 #{--linux-flavours 686-pae}# because we don't anticipate using this image on
-much older systems. Third, we've chosen the #{lxde}# package list to give us
+much older systems. Third, we've chosen the /{lxde}/ package list to give us
 a minimal desktop. And finally, we have added two initial favourite
-packages: #{iceweasel}# and #{xchat}#.
+packages: /{iceweasel}/ and /{xchat}/.
 
 Now, build the image:
 
diff --git a/manual/ro/user_managing_a_configuration.ssi b/manual/ro/user_managing_a_configuration.ssi
index 7df1d34..8f6089a 100644
--- a/manual/ro/user_managing_a_configuration.ssi
+++ b/manual/ro/user_managing_a_configuration.ssi
@@ -34,7 +34,7 @@ options, and an auto/clean that removes the files containing configuration
 variable values, and each time you run #{lb config}# and #{lb clean}#, these
 files will be executed. This will ensure that your configuration is kept
 internally consistent from one revision to the next and from one live-build
-release to the next (though you will still have to take care and read the
+release to the next (Although you will still have to take care and read the
 documentation when you upgrade live-build and make adjustments as needed).
 
 2~ Example auto scripts
diff --git a/manual/ro/user_overview.ssi b/manual/ro/user_overview.ssi
index 100ca04..c0e59b5 100644
--- a/manual/ro/user_overview.ssi
+++ b/manual/ro/user_overview.ssi
@@ -29,7 +29,7 @@ each command.
 
 Unlike /{debhelper}/, live-build contains a tool to generate a skeleton
 configuration directory, #{lb config}#. This could be considered to be
-similar to tools such as #{dh-make}#. For more information about #{lb
+similar to tools such as /{dh-make}/. For more information about #{lb
 config}#, please see {The lb config command}#lb-config.
 
 The remainder of this section discusses the three most important commands:

-- 
live-manual



More information about the debian-live-changes mailing list