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

chals chals at altorricon.com
Sun Apr 8 10:17:41 UTC 2012


The following commit has been merged in the debian-next branch:
commit 53b9033ae30c466fc74538b4e571efdd2186f6b0
Author: chals <chals at altorricon.com>
Date:   Sun Apr 8 12:17:22 2012 +0200

    Using unified markup style for names of packages and commands.

diff --git a/manual/de/about_manual.ssi b/manual/de/about_manual.ssi
index 0486de5..0c58fa8 100644
--- a/manual/de/about_manual.ssi
+++ b/manual/de/about_manual.ssi
@@ -72,8 +72,8 @@ _* *{live-boot}*: A collection of scripts used to boot live
 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 earlier
-known as live-package.
+Live systems. live-build was formerly known as /{live-helper}/, and even
+earlier known as /{live-package}/.
 
 _* *{live-config}*: A collection of scripts used to configure a live system
 during the boot process. live-config was formerly a part of live-initramfs.
@@ -87,7 +87,7 @@ Debian distribution.
 _* *{Boot parameters}*: Parameters that can be entered at the bootloader
 prompt to influence the kernel or live-config.
 
-_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run
+_* *{chroot}*: The /{chroot}/ program, #{chroot(8)}#, enables us to run
 different instances of the GNU/Linux environment on a single system
 simultaneously without rebooting.
 
diff --git a/manual/de/project_bugs.ssi b/manual/de/project_bugs.ssi
index b0c34fc..a051509 100644
--- a/manual/de/project_bugs.ssi
+++ b/manual/de/project_bugs.ssi
@@ -71,7 +71,7 @@ _* Version of live-boot on the live system
 
 _* Version of live-config on the live system
 
-_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system
+_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system
 
 _* Architecture of the live system
 
@@ -122,8 +122,8 @@ Where does the bug appear?
 
 3~ At build time whilst bootstrapping
 
-live-build first bootstraps a basic Debian system with #{debootstrap}# or
-#{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian
+live-build first bootstraps a basic Debian system with /{debootstrap}/ or
+/{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian
 distribution it is bootstrapping, it may fail. If a bug appears here, check
 if the error is related to a specific Debian package (most likely), or if it
 is related to bootstrapping tool itself.
@@ -140,7 +140,7 @@ can fail. If a bug appears here, check if the error is also reproducible on
 a normal system.
 
 If this is the case, this is not a bug in Debian Live, but rather in Debian
-- please report it against the failing package. Running #{debootstrap}#
+- please report it against the failing package. Running /{debootstrap}/
 separately from the Live system build or running #{lb bootstrap --debug}#
 will give you more information.
 
diff --git a/manual/de/style_guide.ssi b/manual/de/style_guide.ssi
index 8b01cc3..fd6c6fd 100644
--- a/manual/de/style_guide.ssi
+++ b/manual/de/style_guide.ssi
@@ -342,11 +342,11 @@ intervention if the code changes.
 Leave the code blocks empty (they will be automatically added then) if you
 want to make your translation easier to maintain.
 
-_* /{New lines}/
+_* /{Newlines}/
 
-The translated texts need to have the exact same new lines as the original
+The translated texts need to have the exact same newlines as the original
 texts. Be careful to press the "Enter" key or type *{\n}* if they appear in
-the original files. These new lines often appear, for instance, in the code
+the original files. These newlines often appear, for instance, in the code
 blocks.
 
 Make no mistake, this does not mean that the translated text needs to have
diff --git a/manual/de/user_basics.ssi b/manual/de/user_basics.ssi
index 2eee04a..d66ad78 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/de/user_basics.ssi
@@ -218,10 +218,7 @@ code{
 Create a new virtual machine, change the storage settings to use
 #{binary-hybrid.iso}# as the CD/DVD device, and start the machine.
 
-Note: For live systems containing X.org that you want to test with
-#{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver
-package, #{virtualbox-ose-guest-x11}#, in your live-build
-configuration. Otherwise, the resolution is limited to 800x600.
+*{Note:}* For live systems containing X.org that you want to test with #{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. Otherwise, the resolution is limited to 800x600.
 
 code{
 
@@ -240,9 +237,7 @@ which does not handle hybrid images properly, or want to use the remaining
 space on the media for some purpose, such as a persistence partition, you
 need an HDD image.
 
-Note: if you created an ISO hybrid image with the previous example, you will
-need to clean up your working directory with the #{lb clean}# command (see
-{The lb clean command}#lb-clean):
+*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):
 
 code{
 
@@ -327,8 +322,7 @@ The following sequence of commands will create a basic netboot image
 containing the Debian standard system without X.org. It is suitable for
 booting over the network.
 
-Note: if you performed any previous examples, you will need to clean up your
-working directory with the #{lb clean}# command:
+*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:
 
 code{
 
diff --git a/manual/de/user_customization-binary.ssi b/manual/de/user_customization-binary.ssi
index 73cfb15..c83563a 100644
--- a/manual/de/user_customization-binary.ssi
+++ b/manual/de/user_customization-binary.ssi
@@ -47,7 +47,7 @@ code{
  include menu.cfg
  default vesamenu.c32
  prompt 0
- timeout 5
+ timeout 50
 
 }code
 
@@ -59,7 +59,7 @@ code{
 
  #!/bin/sh
 
- sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg
+ sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg
 
 }code
 
diff --git a/manual/de/user_customization-installer.ssi b/manual/de/user_customization-installer.ssi
index a41a62d..4a10f2f 100644
--- a/manual/de/user_customization-installer.ssi
+++ b/manual/de/user_customization-installer.ssi
@@ -18,7 +18,7 @@ The three main types of installer are:
 *{"Regular" Debian Installer}*: This is a normal Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as "combined images".
 
 On such images, Debian is installed by fetching and installing .deb packages
-using #{debootstrap}# or #{cdebootstrap}#, from the local media or some
+using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some
 network-based network, resulting in a standard Debian system being installed
 to the hard disk.
 
@@ -31,16 +31,14 @@ the image and enable it for you.
 
 Installation will proceed in an identical fashion to the "Regular"
 installation described above, but at the actual package installation stage,
-instead of using #{debootstrap}# to fetch and install packages, the live
+instead of using /{debootstrap}/ to fetch and install packages, the live
 filesystem image is copied to the target. This is achieved with a special
 udeb called live-installer.
 
 After this stage, the Debian Installer continues as normal, installing and
 configuring items such as bootloaders and local users, etc.
 
-Note: to support both normal and live installer entries in the bootloader of
-the same live media, you must disable live-installer by preseeding
-#{live-installer/enable=false}#.
+*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.
 
 *{"Desktop" Debian Installer}*: Regardless of the type of Debian Installer included, #{d-i}# can be launched from the Desktop by clicking on an icon. This is user friendlier in some situations. In order to make use of this, the debian-installer-launcher package needs to be included.
 
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index 4542f38..cdb8cac 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -28,7 +28,7 @@ defaults to #{wheezy}# for the Wheezy version of live-build. Any current
 distribution carried in the Debian archive may be specified by its codename
 here. (See {Terms}#terms for more details.) The #{--distribution}# option
 not only influences the source of packages within the archive, but also
-instructs #{live-build}# to behave as needed to build each supported
+instructs live-build to behave as needed to build each supported
 distribution. For example, to build against the *{unstable}* release, Sid,
 specify:
 
@@ -294,7 +294,7 @@ code{
 
 The primary tasks available in the Debian Installer can be listed with
 #{tasksel --list-tasks}# in the live system. The contents of any task,
-including ones not included in this list, may be examined with #{tasksel
+including the ones not included in this list, may be examined with #{tasksel
 --task-packages}#.
 
 3~desktop-and-language-tasks Desktop and language tasks
@@ -466,11 +466,11 @@ code{
 
 }code
 
-This will not influence the entries in /etc/apt/sources.list, but merely
-whether /var/lib/apt contains the indices files or not. The tradeoff is that
-APT needs those indices in order to operate in the live system, so before
-performing #{apt-cache search}# or #{apt-get install}#, for instance, the
-user must #{apt-get update}# first to create those indices.
+This will not influence the entries in #{/etc/apt/sources.list}#, but merely
+whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is
+that APT needs those indices in order to operate in the live system, so
+before performing #{apt-cache search}# or #{apt-get install}#, for instance,
+the user must #{apt-get update}# first to create those indices.
 
 If you find the installation of recommended packages bloats your image too
 much, you may disable that default option of APT with:
diff --git a/manual/de/user_customization-runtime.ssi b/manual/de/user_customization-runtime.ssi
index dc37bec..30b0b38 100644
--- a/manual/de/user_customization-runtime.ssi
+++ b/manual/de/user_customization-runtime.ssi
@@ -228,14 +228,14 @@ code{
 
 }code
 
-Then we reboot. During the first boot the contents of /home and
-/var/cache/apt will be copied into the persistent volume, and from then on
-all changes to these directories will live in the persistent volume. Please
-note that any paths listed in the #{live.persist}# file cannot contain white
-spaces or the special "." and ".." path components. Also, neither "/live"
-(or any of its sub-directories) nor "/" can be made persistent using custom
-mounts (for the latter, use the #{full-ov}# type persistence described
-above).
+Then we reboot. During the first boot the contents of #{/home}# and
+#{/var/cache/apt}# will be copied into the persistent volume, and from then
+on all changes to these directories will live in the persistent
+volume. Please note that any paths listed in the #{live.persist}# file
+cannot contain white spaces or the special #{.}# and #{..}# path
+components. Also, neither #{/live}# (or any of its sub-directories) nor
+#{/}# can be made persistent using custom mounts (for the latter, use the
+#{full-ov}# type persistence described above).
 
 Several different custom overlay volumes (with their own #{live.persist}#
 files) can be used at the same time, but if several volumes make the same
diff --git a/manual/de/user_examples.ssi b/manual/de/user_examples.ssi
index a87a36f..64756f2 100644
--- a/manual/de/user_examples.ssi
+++ b/manual/de/user_examples.ssi
@@ -179,7 +179,7 @@ code{
 3~ Second revision
 
 In this revision, we're going to clean up from the first build, add the
-#{vlc}# package to our configuration, rebuild, test and commit.
+/{vlc}/ package to our configuration, rebuild, test and commit.
 
 The #{lb clean}# command will clean up all generated files from the previous
 build except for the cache, which saves having to re-download packages. This
@@ -192,7 +192,7 @@ code{
 
 }code
 
-Now append the #{vlc}# package to our local package list in
+Now append the /{vlc}/ package to our local package list in
 #{config/package-lists/my.list.chroot}#:
 
 code{
@@ -235,8 +235,8 @@ cases drawn from the collected experiences of users of Debian Live.
 *{Use case:}* Create an image with live-build to boot directly to a VNC server.
 
 Make a build directory and create a skeletal configuration in it built
-around the standard-x11 list, including #{gdm3}#, #{metacity}# and
-#{xvnc4viewer}#, disabling recommends to make a minimal system:
+around the standard-x11 list, including /{gdm3}/, /{metacity}/ and
+/{xvnc4viewer}/, disabling recommends to make a minimal system:
 
 code{
 
@@ -249,8 +249,8 @@ code{
 }code
 
 Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for
-the default user that will launch metacity and start xvncviewer, connecting
-to port #{5901}# on a server at #{192.168.1.2}#:
+the default user that will launch /{metacity}/ and start /{xvncviewer}/,
+connecting to port #{5901}# on a server at #{192.168.1.2}#:
 
 code{
 
@@ -285,7 +285,7 @@ the tradeoffs you are making between size and functionality. In this
 example, we trim only so much as to make room for additional material within
 a 128M media size, but without doing anything to destroy integrity of the
 packages contained within, such as the purging of locale data via the
-#{localepurge}# package, or other such "intrusive" optimizations. Of
+/{localepurge}/ package, or other such "intrusive" optimizations. Of
 particular note, you should not use #{--bootstrap-flavour minimal}# unless
 you really know what you're doing, as omitting priority #{important}#
 packages will most likely produce a broken live system.
@@ -318,7 +318,7 @@ system. Choosing the #{minimal}# package list leaves out the large
 #{locales}# package and associated utilities. Dropping recommended packages
 with #{--apt-recommends false}# saves some additional space, at the expense
 of omitting some packages you might otherwise expect to be there, such as
-#{firmware-linux-free}# which may be needed to support certain hardware. The
+/{firmware-linux-free}/ which may be needed to support certain hardware. The
 remaining options shave off additional small amounts of space. It's up to
 you to decide if the functionality that is sacrificed with each optimization
 is worth the loss in functionality.
@@ -385,7 +385,7 @@ code{
 
 }code
 
-Note that we have included the #{debian-installer-launcher}# package to
-launch the installer from the live desktop, and have also specified the 486
-flavour kernel, as it is currently necessary to make the installer and live
-system kernels match for the launcher to work properly.
+Note that we have included the debian-installer-launcher package to launch
+the installer from the live desktop, and have also specified the 486 flavour
+kernel, as it is currently necessary to make the installer and live system
+kernels match for the launcher to work properly.
diff --git a/manual/de/user_installation.ssi b/manual/de/user_installation.ssi
index 1949e3d..7382051 100644
--- a/manual/de/user_installation.ssi
+++ b/manual/de/user_installation.ssi
@@ -136,8 +136,8 @@ your target platform: this means if your target is Wheezy then you should
 build against Wheezy.
 
 Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to
-build #{live-boot}# for a target distribution that differs from your build
-system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy
+build live-boot for a target distribution that differs from your build
+system. For example, for Wheezy live images, build live-boot in a Wheezy
 chroot. If your target distribution happens to match your build system
 distribution, you may build directly on the build system using
 #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
diff --git a/manual/de/user_overview.ssi b/manual/de/user_overview.ssi
index beda6d4..100ca04 100644
--- a/manual/de/user_overview.ssi
+++ b/manual/de/user_overview.ssi
@@ -14,11 +14,11 @@ The idea behind live-build is to be a framework that uses a configuration
 directory to completely automate and customize all aspects of building a
 Live image.
 
-Many concepts are similar to those in the debhelper Debian package tools
+Many concepts are similar to those in the /{debhelper}/ Debian package tools
 written by Joey Hess:
 
 _* The scripts have a central location for configuring their operation. In
-debhelper, this is the #{debian/}# subdirectory of a package tree. For
+/{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For
 example, dh_install will look, amongst others, for a file called
 #{debian/install}# to determine which files should exist in a particular
 binary package. In much the same way, live-build stores its configuration
@@ -27,7 +27,7 @@ entirely under a #{config/}# subdirectory.
 _* The scripts are independent - that is to say, it is always safe to run
 each command.
 
-Unlike debhelper, live-build contains a tool to generate a skeleton
+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}#, please see {The lb config command}#lb-config.
diff --git a/manual/en/about_manual.ssi b/manual/en/about_manual.ssi
index 9837e62..6f04a4a 100644
--- a/manual/en/about_manual.ssi
+++ b/manual/en/about_manual.ssi
@@ -30,7 +30,7 @@ _* *{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.
 
-_* *{live-build}*: A collection of scripts used to build customized Debian Live systems. live-build was formerly known as live-helper, and even earlier known as live-package.
+_* *{live-build}*: A collection of scripts used to build customized Debian Live systems. live-build was formerly known as /{live-helper}/, and even earlier known as /{live-package}/.
 
 _* *{live-config}*: A collection of scripts used to configure a live system during the boot process. live-config was formerly a part of live-initramfs.
 
@@ -40,7 +40,7 @@ _* *{Debian Installer (d-i)}*: The official installation system for the Debian d
 
 _* *{Boot parameters}*: Parameters that can be entered at the bootloader prompt to influence the kernel or live-config.
 
-_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run different instances of the GNU/Linux environment on a single system simultaneously without rebooting.
+_* *{chroot}*: The /{chroot}/ program, #{chroot(8)}#, enables us to run different instances of the GNU/Linux environment on a single system simultaneously without rebooting.
 
 _* *{Binary image}*: A file containing the live system, such as binary.iso or binary.img.
 
diff --git a/manual/en/project_bugs.ssi b/manual/en/project_bugs.ssi
index 765508e..e5b5edc 100644
--- a/manual/en/project_bugs.ssi
+++ b/manual/en/project_bugs.ssi
@@ -46,7 +46,7 @@ _* Version of live-boot on the live system
 
 _* Version of live-config on the live system
 
-_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system
+_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system
 
 _* Architecture of the live system
 
@@ -78,7 +78,7 @@ Where does the bug appear?
 
 3~ At build time whilst bootstrapping
 
-live-build first bootstraps a basic Debian system with #{debootstrap}# or #{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian distribution it is bootstrapping, it may fail. If a bug appears here, check if the error is related to a specific Debian package (most likely), or if it is related to bootstrapping tool itself.
+live-build first bootstraps a basic Debian system with /{debootstrap}/ or /{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian distribution it is bootstrapping, it may fail. If a bug appears here, check if the error is related to a specific Debian package (most likely), or if it is related to bootstrapping tool itself.
 
 In both cases, this is not a bug in Debian Live, but rather in Debian itself which we can not fix this directly. Please report such a bug against the bootstrapping tool or the failing package.
 
@@ -86,7 +86,7 @@ In both cases, this is not a bug in Debian Live, but rather in Debian itself whi
 
 live-build installs additional packages from the Debian archive and depending on the Debian distribution used and the daily archive state, it can fail. If a bug appears here, check if the error is also reproducible on a normal system.
 
-If this is the case, this is not a bug in Debian Live, but rather in Debian - please report it against the failing package. Running #{debootstrap}# separately from the Live system build or running #{lb bootstrap --debug}# will give you more information.
+If this is the case, this is not a bug in Debian Live, but rather in Debian - please report it against the failing package. Running /{debootstrap}/ separately from the Live system build or running #{lb bootstrap --debug}# will give you more information.
 
 Also, if you are using a local mirror and/or any of sort of proxy and you are experiencing a problem, please always reproduce it first by bootstrapping from an official mirror.
 
diff --git a/manual/en/style_guide.ssi b/manual/en/style_guide.ssi
index 9958459..417150b 100644
--- a/manual/en/style_guide.ssi
+++ b/manual/en/style_guide.ssi
@@ -224,9 +224,9 @@ On the other hand some translators prefer to leave the code blocks "untranslated
 
 Leave the code blocks empty (they will be automatically added then) if you want to make your translation easier to maintain.
 
-_* /{New lines}/
+_* /{Newlines}/
 
-The translated texts need to have the exact same new lines as the original texts. Be careful to press the "Enter" key or type *{\n}* if they appear in the original files. These new lines often appear, for instance, in the code blocks.
+The translated texts need to have the exact same newlines as the original texts. Be careful to press the "Enter" key or type *{\n}* if they appear in the original files. These newlines often appear, for instance, in the code blocks.
 
 Make no mistake, this does not mean that the translated text needs to have the same length as the English version. That is nearly impossible.
 
diff --git a/manual/en/user_basics.ssi b/manual/en/user_basics.ssi
index e835b61..f279a04 100644
--- a/manual/en/user_basics.ssi
+++ b/manual/en/user_basics.ssi
@@ -134,7 +134,7 @@ code{
 
 Create a new virtual machine, change the storage settings to use #{binary-hybrid.iso}# as the CD/DVD device, and start the machine.
 
-Note: For live systems containing X.org that you want to test with #{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. Otherwise, the resolution is limited to 800x600.
+*{Note:}* For live systems containing X.org that you want to test with #{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. Otherwise, the resolution is limited to 800x600.
 
 code{
 
@@ -146,7 +146,7 @@ code{
 
 Building an HDD image is similar to ISO hybrid in all respects except you specify #{-b hdd}# and the resulting filename is #{binary.img}# which cannot be burnt to optical media. It is suitable for booting from USB sticks, USB hard drives, and various other portable storage devices. Normally, an ISO hybrid image can be used for this purpose instead, but if you have a BIOS which does not handle hybrid images properly, or want to use the remaining space on the media for some purpose, such as a persistence partition, you need an HDD image.
 
-Note: if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):
+*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):
 
 code{
 
@@ -212,7 +212,7 @@ Note: If you want to use the extra space with Windows, apparently that OS cannot
 
 The following sequence of commands will create a basic netboot image containing the Debian standard system without X.org. It is suitable for booting over the network.
 
-Note: if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:
+*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:
 
 code{
 
diff --git a/manual/en/user_customization-binary.ssi b/manual/en/user_customization-binary.ssi
index fb05339..3d3d75b 100644
--- a/manual/en/user_customization-binary.ssi
+++ b/manual/en/user_customization-binary.ssi
@@ -29,7 +29,7 @@ code{
  include menu.cfg
  default vesamenu.c32
  prompt 0
- timeout 5
+ timeout 50
 
 }code
 
@@ -39,7 +39,7 @@ code{
 
  #!/bin/sh
 
- sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg
+ sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg
 
 }code
 
diff --git a/manual/en/user_customization-installer.ssi b/manual/en/user_customization-installer.ssi
index f524781..52009de 100644
--- a/manual/en/user_customization-installer.ssi
+++ b/manual/en/user_customization-installer.ssi
@@ -12,17 +12,17 @@ The three main types of installer are:
 
 *{"Regular" Debian Installer}*: This is a normal Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as "combined images".
 
-On such images, Debian is installed by fetching and installing .deb packages using #{debootstrap}# or #{cdebootstrap}#, from the local media or some network-based network, resulting in a standard Debian system being installed to the hard disk.
+On such images, Debian is installed by fetching and installing .deb packages using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some network-based network, resulting in a standard Debian system being installed to the hard disk.
 
 This whole process can be preseeded and customized in a number of ways; see the relevant pages in the Debian Installer manual for more information. Once you have a working preseeding file, live-build can automatically put it in the image and enable it for you.
 
 *{"Live" Debian Installer}*: This is a Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into an instance of the Debian Installer.
 
-Installation will proceed in an identical fashion to the "Regular" installation described above, but at the actual package installation stage, instead of using #{debootstrap}# to fetch and install packages, the live filesystem image is copied to the target. This is achieved with a special udeb called live-installer.
+Installation will proceed in an identical fashion to the "Regular" installation described above, but at the actual package installation stage, instead of using /{debootstrap}/ to fetch and install packages, the live filesystem image is copied to the target. This is achieved with a special udeb called live-installer.
 
 After this stage, the Debian Installer continues as normal, installing and configuring items such as bootloaders and local users, etc.
 
-Note: to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.
+*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.
 
 *{"Desktop" Debian Installer}*: Regardless of the type of Debian Installer included, #{d-i}# can be launched from the Desktop by clicking on an icon. This is user friendlier in some situations. In order to make use of this, the debian-installer-launcher package needs to be included.
 
diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index a93062b..7cb86c0 100644
--- a/manual/en/user_customization-packages.ssi
+++ b/manual/en/user_customization-packages.ssi
@@ -8,7 +8,7 @@ Perhaps the most basic customization of a Debian live system is the selection of
 
 3~ Distribution, archive areas and mode
 
-The distribution you choose has the broadest impact on which packages are available to include in your live image. Specify the codename, which defaults to #{wheezy}# for the Wheezy version of live-build. Any current distribution carried in the Debian archive may be specified by its codename here. (See {Terms}#terms for more details.) The #{--distribution}# option not only influences the source of packages within the archive, but also instructs #{live-build}# to behave as needed to build each supported distribution. For example, to build against the *{unstable}* release, Sid, specify:
+The distribution you choose has the broadest impact on which packages are available to include in your live image. Specify the codename, which defaults to #{wheezy}# for the Wheezy version of live-build. Any current distribution carried in the Debian archive may be specified by its codename here. (See {Terms}#terms for more details.) The #{--distribution}# option not only influences the source of packages within the archive, but also instructs live-build to behave as needed to build each supported distribution. For example, to build against the *{unstable}* release, Sid, specify:
 
 code{
 
@@ -187,7 +187,7 @@ code{
 
 }code
 
-The primary tasks available in the Debian Installer can be listed with #{tasksel --list-tasks}# in the live system. The contents of any task, including ones not included in this list, may be examined with #{tasksel --task-packages}#.
+The primary tasks available in the Debian Installer can be listed with #{tasksel --list-tasks}# in the live system. The contents of any task, including the ones not included in this list, may be examined with #{tasksel --task-packages}#.
 
 3~desktop-and-language-tasks Desktop and language tasks
 
@@ -290,7 +290,7 @@ code{
 
 }code
 
-This will not influence the entries in /etc/apt/sources.list, but merely whether /var/lib/apt contains the indices files or not. The tradeoff is that APT needs those indices in order to operate in the live system, so before performing #{apt-cache search}# or #{apt-get install}#, for instance, the user must #{apt-get update}# first to create those indices.
+This will not influence the entries in #{/etc/apt/sources.list}#, but merely whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is that APT needs those indices in order to operate in the live system, so before performing #{apt-cache search}# or #{apt-get install}#, for instance, the user must #{apt-get update}# first to create those indices.
 
 If you find the installation of recommended packages bloats your image too much, you may disable that default option of APT with:
 
diff --git a/manual/en/user_customization-runtime.ssi b/manual/en/user_customization-runtime.ssi
index 4c64692..1bea8a5 100644
--- a/manual/en/user_customization-runtime.ssi
+++ b/manual/en/user_customization-runtime.ssi
@@ -160,7 +160,7 @@ code{
 
 }code
 
-Then we reboot. During the first boot the contents of /home and /var/cache/apt will be copied into the persistent volume, and from then on all changes to these directories will live in the persistent volume. Please note that any paths listed in the #{live.persist}# file cannot contain white spaces or the special "." and ".." path components. Also, neither "/live" (or any of its sub-directories) nor "/" can be made persistent using custom mounts (for the latter, use the #{full-ov}# type persistence described above).
+Then we reboot. During the first boot the contents of #{/home}# and #{/var/cache/apt}# will be copied into the persistent volume, and from then on all changes to these directories will live in the persistent volume. Please note that any paths listed in the #{live.persist}# file cannot contain white spaces or the special #{.}# and #{..}# path components. Also, neither #{/live}# (or any of its sub-directories) nor #{/}# can be made persistent using custom mounts (for the latter, use the #{full-ov}# type persistence described above).
 
 Several different custom overlay volumes (with their own #{live.persist}# files) can be used at the same time, but if several volumes make the same directory persistent, only one of them will be used. If any two mounts are "nested" (i.e. one is a sub-directory of the other) the parent will be mounted before the child so no mount will be hidden by the other. Nested custom mounts are problematic if they are listed in the same #{live.persist}# file. See the live.persist(5) man page for how to handle that case if you really need it (hint: you usually don't).
 
diff --git a/manual/en/user_examples.ssi b/manual/en/user_examples.ssi
index 17835e8..fa24f19 100644
--- a/manual/en/user_examples.ssi
+++ b/manual/en/user_examples.ssi
@@ -133,7 +133,7 @@ code{
 
 3~ Second revision
 
-In this revision, we're going to clean up from the first build, add the #{vlc}# package to our configuration, rebuild, test and commit.
+In this revision, we're going to clean up from the first build, add the /{vlc}/ package to our configuration, rebuild, test and commit.
 
 The #{lb clean}# command will clean up all generated files from the previous build except for the cache, which saves having to re-download packages. This ensures that the subsequent #{lb build}# will re-run all stages to regenerate the files from our new configuration.
 
@@ -143,7 +143,7 @@ code{
 
 }code
 
-Now append the #{vlc}# package to our local package list in #{config/package-lists/my.list.chroot}#:
+Now append the /{vlc}/ package to our local package list in #{config/package-lists/my.list.chroot}#:
 
 code{
 
@@ -175,7 +175,7 @@ We've come to the end of our tutorial series. While many more kinds of customiza
 
 *{Use case:}* Create an image with live-build to boot directly to a VNC server.
 
-Make a build directory and create a skeletal configuration in it built around the standard-x11 list, including #{gdm3}#, #{metacity}# and #{xvnc4viewer}#, disabling recommends to make a minimal system:
+Make a build directory and create a skeletal configuration in it built around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /{xvnc4viewer}/, disabling recommends to make a minimal system:
 
 code{
 
@@ -187,7 +187,7 @@ code{
 
 }code
 
-Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for the default user that will launch metacity and start xvncviewer, connecting to port #{5901}# on a server at #{192.168.1.2}#:
+Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for the default user that will launch /{metacity}/ and start /{xvncviewer}/, connecting to port #{5901}# on a server at #{192.168.1.2}#:
 
 code{
 
@@ -217,7 +217,7 @@ Enjoy.
 
 *{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.
 
-When optimizing an image to fit a certain media size, you need to understand the tradeoffs you are making between size and functionality. In this example, we trim only so much as to make room for additional material within a 128M media size, but without doing anything to destroy integrity of the packages contained within, such as the purging of locale data via the #{localepurge}# package, or other such "intrusive" optimizations. Of particular note, you should not use #{--bootstrap-flavour minimal}# unless you really know what you're doing, as omitting priority #{important}# packages will most likely produce a broken live system.
+When optimizing an image to fit a certain media size, you need to understand the tradeoffs you are making between size and functionality. In this example, we trim only so much as to make room for additional material within a 128M media size, but without doing anything to destroy integrity of the packages contained within, such as the purging of locale data via the /{localepurge}/ package, or other such "intrusive" optimizations. Of particular note, you should not use #{--bootstrap-flavour minimal}# unless you really know what you're doing, as omitting priority #{important}# packages will most likely produce a broken live system.
 
 code{
 
@@ -236,7 +236,7 @@ code{
 
 On the author's system at time of writing, the above configuration produced a 78Mbyte image. This compares favourably with the 166Mbyte image produced by the default configuration in {Tutorial 1}#tutorial-1.
 
-The biggest space-saver here, compared to building a standard image on an #{i386}# architecture system, is to select only the #{486}# kernel flavour instead of the default #{-k "486 686-pae"}#. Leaving off APT's indices with #{--apt-indices false}# also saves a fair amount of space, the tradeoff being that you need to #{apt-get update}# before using apt in the live system. Choosing the #{minimal}# package list leaves out the large #{locales}# package and associated utilities. Dropping recommended packages with #{--apt-recommends false}# saves some additional space, at the expense of omitting some packages you might otherwise expect to be there, such as #{firmware-linux-free}# which may be needed to support certain hardware. The remaining options shave off additional small amounts of space. It's up to you to decide if the functionality that is sacrificed with each optimization is worth the loss in functionality.
+The biggest space-saver here, compared to building a standard image on an #{i386}# architecture system, is to select only the #{486}# kernel flavour instead of the default #{-k "486 686-pae"}#. Leaving off APT's indices with #{--apt-indices false}# also saves a fair amount of space, the tradeoff being that you need to #{apt-get update}# before using apt in the live system. Choosing the #{minimal}# package list leaves out the large #{locales}# package and associated utilities. Dropping recommended packages with #{--apt-recommends false}# saves some additional space, at the expense of omitting some packages you might otherwise expect to be there, such as /{firmware-linux-free}/ which may be needed to support certain hardware. The remaining options shave off additional small amounts of space. It's up to you to decide if the functionality that is sacrificed with each optimization is worth the loss in functionality.
 
 2~ A localized KDE desktop and installer
 
@@ -289,4 +289,4 @@ code{
 
 }code
 
-Note that we have included the #{debian-installer-launcher}# package to launch the installer from the live desktop, and have also specified the 486 flavour kernel, as it is currently necessary to make the installer and live system kernels match for the launcher to work properly.
+Note that we have included the debian-installer-launcher package to launch the installer from the live desktop, and have also specified the 486 flavour kernel, as it is currently necessary to make the installer and live system kernels match for the launcher to work properly.
diff --git a/manual/en/user_installation.ssi b/manual/en/user_installation.ssi
index 4c92140..bf7d983 100644
--- a/manual/en/user_installation.ssi
+++ b/manual/en/user_installation.ssi
@@ -123,7 +123,7 @@ _* Build live-boot and live-config .deb files
 
 You must build either on your target distribution or in a chroot containing your target platform: this means if your target is Wheezy then you should build against Wheezy.
 
-Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to build #{live-boot}# for a target distribution that differs from your build system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy chroot. If your target distribution happens to match your build system distribution, you may build directly on the build system using #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
+Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to build live-boot for a target distribution that differs from your build system. For example, for Wheezy live images, build live-boot in a Wheezy chroot. If your target distribution happens to match your build system distribution, you may build directly on the build system using #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
 
 code{
 
diff --git a/manual/en/user_overview.ssi b/manual/en/user_overview.ssi
index ff22e63..2da8890 100644
--- a/manual/en/user_overview.ssi
+++ b/manual/en/user_overview.ssi
@@ -10,13 +10,13 @@ live-build is a collection of scripts to build Debian Live systems. These script
 
 The idea behind live-build is to be a framework that uses a configuration directory to completely automate and customize all aspects of building a Live image.
 
-Many concepts are similar to those in the debhelper Debian package tools written by Joey Hess:
+Many concepts are similar to those in the /{debhelper}/ Debian package tools written by Joey Hess:
 
-_* The scripts have a central location for configuring their operation. In debhelper, this is the #{debian/}# subdirectory of a package tree. For example, dh_install will look, amongst others, for a file called #{debian/install}# to determine which files should exist in a particular binary package. In much the same way, live-build stores its configuration entirely under a #{config/}# subdirectory.
+_* The scripts have a central location for configuring their operation. In /{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For example, dh_install will look, amongst others, for a file called #{debian/install}# to determine which files should exist in a particular binary package. In much the same way, live-build stores its configuration entirely under a #{config/}# subdirectory.
 
 _* The scripts are independent - that is to say, it is always safe to run 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 config}#, please see {The lb config command}#lb-config.
+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}#, please see {The lb config command}#lb-config.
 
 The remainder of this section discusses the three most important commands:
 
diff --git a/manual/es/about_manual.ssi b/manual/es/about_manual.ssi
index 8db2483..9865ebe 100644
--- a/manual/es/about_manual.ssi
+++ b/manual/es/about_manual.ssi
@@ -81,9 +81,9 @@ _* *{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.
 
-_* *{live-build}*: Es una colección de scripts utilizados para construir
-sistemas Debian Live personalizados. live-build fue conocido anteriormente
-como live-helper, y en una versión anterior como live-package.
+_* *{live-build}*: A collection of scripts used to build customized Debian
+Live systems. live-build was formerly known as /{live-helper}/, and even
+earlier known as /{live-package}/.
 
 _* *{live-config}*: Es una colección de scripts utilizados para configurar
 un sistema en vivo durante el proceso de arranque. live-config fue
@@ -100,9 +100,9 @@ arranque (bootloader) para modificar el comportamiento del kernel o del
 conjunto de scripts live-config. Son llamados también Parámetros de kernel u
 Opciones de arranque.
 
-_* *{chroot}*: El programa chroot, #{chroot(8)}#, permite ejecutar
-diferentes instancias de un entorno GNU/Linux en un solo sistema de manera
-simultánea sin necesidad de reiniciar el sistema.
+_* *{chroot}*: The /{chroot}/ program, #{chroot(8)}#, enables us to run
+different instances of the GNU/Linux environment on a single system
+simultaneously without rebooting.
 
 _* *{Imagen binaria}*: Es un fichero binario que contiene el sistema en
 vivo. Su nombre puede ser binary.iso o binary.img dependiendo de su formato.
diff --git a/manual/es/project_bugs.ssi b/manual/es/project_bugs.ssi
index 6fdea3a..03f145c 100644
--- a/manual/es/project_bugs.ssi
+++ b/manual/es/project_bugs.ssi
@@ -76,7 +76,7 @@ _* Versión de live-boot en el sistema en vivo.
 
 _* Versión de live-config en el sistema en vivo.
 
-_* Versión de #{debootstrap}# y/o #{cdebootstrap}# en el sistema anfitrión.
+_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system
 
 _* Arquitectura del sistema en vivo.
 
@@ -130,12 +130,11 @@ más pequeños.
 
 3~ En la preinstalación (bootstrap) en tiempo de creación.
 
-live-build arranca primero un sistema Debian básico con #{debootstrap}# o
-#{cdebootstrap}#. Puede fallar dependiendo de la herramienta usada en la
-preinstalación y de la distribución Debian empleada. Si un error aparece en
-este momento, se debe comprobar si está relacionado con un paquete
-específico de Debian (es lo más probable), o si está relacionado con la
-herramienta de preinstalación en sí.
+live-build first bootstraps a basic Debian system with /{debootstrap}/ or
+/{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian
+distribution it is bootstrapping, it may fail. If a bug appears here, check
+if the error is related to a specific Debian package (most likely), or if it
+is related to bootstrapping tool itself.
 
 En ambos casos, esto no es un error de Debian Live, sino de Debian en sí
 mismo, por lo cual el equipo de Debian Live no puede solucionarlo
@@ -149,10 +148,10 @@ fallar en función de la distribución Debian utilizada y del estado diario
 del archivo Debian. Se debe comprobar si el error es reproducible en un
 sistema Debian normal, si el fallo aparece en esta etapa.
 
-Si este es el caso, esto no es un error de Debian Live, sino de Debian - se
-debe informar sobre el paquete que falla. Se puede obtener más información
-ejecutando #{debootstrap}# de forma separada del sistema de creación en vivo
-o ejecutando #{lb bootstrap --debug}#.
+If this is the case, this is not a bug in Debian Live, but rather in Debian
+- please report it against the failing package. Running /{debootstrap}/
+separately from the Live system build or running #{lb bootstrap --debug}#
+will give you more information.
 
 Además, si se está utilizando una réplica local y/o cualquier tipo de proxy
 y se experimenta un problema, se debe intentar reproducir siempre
diff --git a/manual/es/style_guide.ssi b/manual/es/style_guide.ssi
index 31a364a..6e45dc4 100644
--- a/manual/es/style_guide.ssi
+++ b/manual/es/style_guide.ssi
@@ -342,11 +342,11 @@ intervention if the code changes.
 Leave the code blocks empty (they will be automatically added then) if you
 want to make your translation easier to maintain.
 
-_* /{New lines}/
+_* /{Newlines}/
 
-The translated texts need to have the exact same new lines as the original
+The translated texts need to have the exact same newlines as the original
 texts. Be careful to press the "Enter" key or type *{\n}* if they appear in
-the original files. These new lines often appear, for instance, in the code
+the original files. These newlines often appear, for instance, in the code
 blocks.
 
 Make no mistake, this does not mean that the translated text needs to have
diff --git a/manual/es/user_basics.ssi b/manual/es/user_basics.ssi
index 3970e2f..1ef2355 100644
--- a/manual/es/user_basics.ssi
+++ b/manual/es/user_basics.ssi
@@ -240,10 +240,7 @@ Crear una nueva máquina virtual, cambiar la configuración de almacenamiento
 para utilizar #{binary-hybrid.iso}# como dispositivo CD/DVD y arrancar la
 máquina.
 
-Nota: Para probar los sistemas en vivo con soporte X.org en virtualbox-ose,
-se puede incluir el paquete del driver de VirtualBox X.org,
-#{virtualbox-ose-guest-x11}#, en la configuración de live-build. De lo
-contrario, la resolución se limita a 800x600
+*{Note:}* For live systems containing X.org that you want to test with #{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. Otherwise, the resolution is limited to 800x600.
 
 code{
 
@@ -263,9 +260,7 @@ BIOS no maneje adecuadamente las imágenes híbridas. También es interesante
 una imagen HDD si se desea utilizar el espacio restante en los medios de
 almacenamiento para una partición con persistencia.
 
-Nota: si se ha creado una imagen ISO híbrida con el ejemplo anterior, se
-tendrá que limpiar el directorio de trabajo con el comando #{lb clean}# (ver
-{El comando lb clean}#lb-clean):
+*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):
 
 code{
 
@@ -351,8 +346,7 @@ La siguiente secuencia de comandos creará una imagen de arranque en red
 básica que contendrá el sistema estándar de Debian sin X.org. Se puede usar
 para el arranque en red.
 
-Nota: si se ha seguido algúno de los ejemplos anteriores, se tendrá que
-limpiar el directorio de trabajo con el comando #{lb clean}#:
+*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:
 
 code{
 
diff --git a/manual/es/user_customization-binary.ssi b/manual/es/user_customization-binary.ssi
index 1b8ccb7..080b51d 100644
--- a/manual/es/user_customization-binary.ssi
+++ b/manual/es/user_customization-binary.ssi
@@ -49,7 +49,7 @@ code{
  include menu.cfg
  default vesamenu.c32
  prompt 0
- timeout 5
+ timeout 50
 
 }code
 
@@ -61,7 +61,7 @@ code{
 
  #!/bin/sh
 
- sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg
+ sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg
 
 }code
 
diff --git a/manual/es/user_customization-installer.ssi b/manual/es/user_customization-installer.ssi
index cbdd8a7..f103f4d 100644
--- a/manual/es/user_customization-installer.ssi
+++ b/manual/es/user_customization-installer.ssi
@@ -17,10 +17,10 @@ Principalmente existen tres tipos de imágenes según el instalador:
 
 *{Imágenes con Instalador Debian «official»}*: Esta imagen de Debian Live se puede considerar como la imagen habitual. Dispone de un kernel y un initrd diferenciados que, al ser seleccionados desde el gestor de arranque, ejecuta un Instalador de Debian estándar, de la misma manera que lo haría si se arrancase desde una imagen de CD descargada desde el sitio oficial de Debian. Las imágenes que contienen un sistema en vivo con otro instalador independiente se suelen llamar «imágenes combinadas».
 
-En estas imágenes, el sistema operativo Debian se instala mediante la
-herramienta #{debootstrap}# o #{cdebootstrap}# que descarga paquetes .deb,
-desde medios locales o por red local, y los instala de forma tradicional. El
-resultado final es un sistema Debian estándar instalado en el disco duro.
+On such images, Debian is installed by fetching and installing .deb packages
+using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some
+network-based network, resulting in a standard Debian system being installed
+to the hard disk.
 
 El conjunto de este proceso puede ser preconfigurado (preseeded) y
 personalizado de muchas maneras; Para más información, ver las páginas
@@ -30,20 +30,17 @@ encargarse de depositarlo en la imagen y activarlo de forma automática.
 
 *{Imágenes con Instalador Debian «Live»}*: Estas imágenes de Debian Live también disponen de un kernel y un initrd diferenciados que, al ser seleccionados desde el gestor de arranque, ejecutan un Instalador de Debian algo diferente.
 
-El procedimiento de instalación es idéntico al realizado por las imagenes
-«Regulares» pero, en lugar de utilizar #{debootstrap}# para obtener e
-instalar paquetes .deb, lo que hace es copiar al disco duro la imagen del
-sistema de ficheros que se había preparado para lanzar el sistema en
-vivo. Esto se logra mediante un .udeb especial llamado live-installer.
+Installation will proceed in an identical fashion to the "Regular"
+installation described above, but at the actual package installation stage,
+instead of using /{debootstrap}/ to fetch and install packages, the live
+filesystem image is copied to the target. This is achieved with a special
+udeb called live-installer.
 
 Una vez finalizada esta etapa, el Instalador de Debian continua normalmente,
 instalando y configurando los siguientes elementos como pueden ser gestor de
 arranque, creación de usuarios locales, etc.
 
-Nota: Para poder arrancar los dos tipos de imágenes, Regular y Live, en el
-mismo medio, el gestor de arranque debe poder deshabilitar
-live-installer. Esto se hace utilizando la variable de preconfiguración
-(preseed) #{live-installer/enable=false}#.
+*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.
 
 *{Instalador Debian «del escritorio»}*: Una vez el sistema en vivo está ejecutandose, se puede lanzar el Instalador de Debian haciendo clic en el icono correspondiente, sin importar el tipo de Instalador Debian utilizado en el arranque. Esta manera de instalar Debian es más sencilla para el usuario y aconsejable en algunas situaciones. Para poder realizar esta acción se debe instalar el paquete debian-installer-launcher.
 
diff --git a/manual/es/user_customization-packages.ssi b/manual/es/user_customization-packages.ssi
index 54a7a7c..84f585e 100644
--- a/manual/es/user_customization-packages.ssi
+++ b/manual/es/user_customization-packages.ssi
@@ -27,16 +27,15 @@ algunas posibilidades.
 
 3~ Distribución, áreas de archivo y modo
 
-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: 
+The distribution you choose has the broadest impact on which packages are
+available to include in your live image. Specify the codename, which
+defaults to #{wheezy}# for the Wheezy version of live-build. Any current
+distribution carried in the Debian archive may be specified by its codename
+here. (See {Terms}#terms for more details.) The #{--distribution}# option
+not only influences the source of packages within the archive, but also
+instructs live-build to behave as needed to build each supported
+distribution. For example, to build against the *{unstable}* release, Sid,
+specify:
 
 code{
 
@@ -320,11 +319,10 @@ code{
 
 }code
 
-Una vez ha sido arrancado el sistema en vivo puede conocerse qué tareas
-primarias están disponibles en el Instalador de Debian mediante la orden
-#{tasksel --list-tasks}#. La lista de paquetes contenidos en cualquier tarea
-(incluidas aquellas que no aparecen en la lista de tareas primarias) puede
-obtenerse mediante la orden #{tasksel --task-packages}#.
+The primary tasks available in the Debian Installer can be listed with
+#{tasksel --list-tasks}# in the live system. The contents of any task,
+including the ones not included in this list, may be examined with #{tasksel
+--task-packages}#.
 
 3~desktop-and-language-tasks Tareas de Escritorio e Idioma
 
@@ -508,13 +506,11 @@ code{
 
 }code
 
-Esto no modificará el comportamiento de las entradas definidas en
-/etc/apt/sources.list, sino que solo afecta a si exitirán o no ficheros de
-índice en el directorio /var/lib/apt. El compromiso viene de que APT
-necesita estos ficheros índices para funcionar en el sistema en vivo, así
-que, si no existen, el usuario deberá ejecutar la orden #{apt-get update}#
-para crear estos índices antes de poder ejecutar una orden del tipo
-#{apt-cache search}# o #{apt-get install}#.
+This will not influence the entries in #{/etc/apt/sources.list}#, but merely
+whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is
+that APT needs those indices in order to operate in the live system, so
+before performing #{apt-cache search}# or #{apt-get install}#, for instance,
+the user must #{apt-get update}# first to create those indices.
 
 Si la instalación de los paquetes recomendados aumenta demasiado el tamaño
 de la imagen, se puede desactivar el valor por defecto de esta opción de APT
diff --git a/manual/es/user_customization-runtime.ssi b/manual/es/user_customization-runtime.ssi
index 081755f..6ad046c 100644
--- a/manual/es/user_customization-runtime.ssi
+++ b/manual/es/user_customization-runtime.ssi
@@ -248,14 +248,14 @@ code{
 
 }code
 
-Entonces reiniciamos. Durante el primer arranque los contenidos de /home y
-/var/cache/apt se copiarán en el volumen persistente y a partir de ese
-momento todos los cambios en esos directorios se guardarán allí. Tener en
-cuenta que los rutas listadas en el fichero #{live.persist}# no pueden
-contener espacios en blanco o los componentes especiales "." y  "..". Además
-ni "/live" (o ninguno de sus sub-directorios) ni "/" pueden hacerse
-persistentes montándolos de forma personalizada. Para este último, usar el
-tipo de persistencia #{full-ov}# descrito anteriormente.
+Then we reboot. During the first boot the contents of #{/home}# and
+#{/var/cache/apt}# will be copied into the persistent volume, and from then
+on all changes to these directories will live in the persistent
+volume. Please note that any paths listed in the #{live.persist}# file
+cannot contain white spaces or the special #{.}# and #{..}# path
+components. Also, neither #{/live}# (or any of its sub-directories) nor
+#{/}# can be made persistent using custom mounts (for the latter, use the
+#{full-ov}# type persistence described above).
 
 Se puede usar diferentes volúmenes de capas personalizados al mismo tiempo
 (con sus propios ficheros #{live.persist}#) pero si varios volúmenes hacen
diff --git a/manual/es/user_examples.ssi b/manual/es/user_examples.ssi
index b02d079..9677863 100644
--- a/manual/es/user_examples.ssi
+++ b/manual/es/user_examples.ssi
@@ -191,9 +191,8 @@ code{
 
 3~ Segunda revisión
 
-En esta revisión, vamos a limpiar desde la primera creación, agregar el
-paquete #{vlc}# a nuestra configuración, crear de nuevo, probar y enviar los
-cambios al git.
+In this revision, we're going to clean up from the first build, add the
+/{vlc}/ package to our configuration, rebuild, test and commit.
 
 El comando #{lb clean}# limpiará todos los ficheros generados en las
 primeras creaciones a excepción del caché, lo cual ahorra tener que volver a
@@ -207,7 +206,7 @@ code{
 
 }code
 
-Añadir ahora el paquete #{vlc}# a nuestra lista de paquetes local en
+Now append the /{vlc}/ package to our local package list in
 #{config/package-lists/my.list.chroot}#:
 
 code{
@@ -250,9 +249,9 @@ experiencias recogidas de los usuarios de Debian Live.
 
 *{Caso Práctico:}* Crear una imagen con live-build para arrancar directamente un servidor VNC.
 
-Hacer un directorio de creación y crear una configuración en esqueleto según
-la lista estándar-x11, incluyendo #{gdm3}#, #{metacity}# y #{xvnc4viewer}#,
-desactivando los paquetes recomendados para conseguir un sistema mínimo:
+Make a build directory and create a skeletal configuration in it built
+around the standard-x11 list, including /{gdm3}/, /{metacity}/ and
+/{xvnc4viewer}/, disabling recommends to make a minimal system:
 
 code{
 
@@ -264,10 +263,9 @@ code{
 
 }code
 
-Crear el directorio #{/etc/skel}# y poner un fichero #{.xsession}#
-personalizado para el usuario que por defecto ejecutará metacity e iniciará
-el xvncviewer, conectándo al puerto #{5901}# de un servidor en
-#{192.168.1.2}#:
+Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for
+the default user that will launch /{metacity}/ and start /{xvncviewer}/,
+connecting to port #{5901}# on a server at #{192.168.1.2}#:
 
 code{
 
@@ -297,16 +295,15 @@ Disfrutarlo.
 
 *{Caso Práctico:}* Crear una imagen estándar quitando algunos componentes para que quepa en un pendrive USB de 128M dejándo espacio libre para poder usarlo.
 
-Al optimizar una imagen para adaptarla al tamaño de algunos medios de
-almacenamiento, es necesario comprender el equilibrio que se está haciendo
-entre tamaño y funcionalidad. En este ejemplo, se recorta tanto sólo para
-dar cabida a material adicional dentro de un tamaño de 128M, pero sin hacer
-nada para destruir la integridad de los paquetes que contiene, tales como la
-depuración de las variantes locales a través del paquete #{localepurge}# u
-otro tipo de optimizaciones «intrusivas». Cabe destacar que no se debe usar
-#{--bootstrap-flavour minimal}# a menos de que realmente se sepa lo que se
-está haciendo, ya que al omitir paquetes de prioridad #{importante}# lo más
-probable es que se produzca un sistema roto.
+When optimizing an image to fit a certain media size, you need to understand
+the tradeoffs you are making between size and functionality. In this
+example, we trim only so much as to make room for additional material within
+a 128M media size, but without doing anything to destroy integrity of the
+packages contained within, such as the purging of locale data via the
+/{localepurge}/ package, or other such "intrusive" optimizations. Of
+particular note, you should not use #{--bootstrap-flavour minimal}# unless
+you really know what you're doing, as omitting priority #{important}#
+packages will most likely produce a broken live system.
 
 code{
 
@@ -328,20 +325,19 @@ anterior produjo una imagen de 78Mbytes. Esto se compara favorablemente en
 tamaño con la imagen de 166Mbytes producida por la configuración por defecto
 en el {Tutorial 1}#tutorial-1.
 
-El mayor ahorro de espacio aquí, en comparación con la creación de una
-imagen estándar en un sistema de arquitectura #{i386}# es seleccionar sólo
-la versión del kernel #{486}# en lugar de la de por defecto #{-k "486
-686-pae"}#. Dejar fuera los índices de APT con #{--apt-indices false}#
-también ahorra una cantidad importante de espacio, la desventaja es que es
-necesario hacer un #{apt-get update}# antes de usar apt en el sistema en
-vivo. Elegir la lista del paquete #{minimal}# deja fuera el gran paquete de
-#{locales}# y sus utilidades asociadas. Dejando los paquetes recomendados
-con #{--apt-recommends false}# se ahorra un poco de espacio adicional a
-costa de omitir algunos paquetes que de otro modo podría esperarse que
-estuvieran alli, tal como #{firmware-linux-free}# que puede ser necesario
-para el soporte de cierto hardware. Las opciones restantes recortan pequeñas
-cantidades adicionales de espacio. Es necesario decidir si vale la pena la
-funcionalidad que se sacrifica con cada optimización.
+The biggest space-saver here, compared to building a standard image on an
+#{i386}# architecture system, is to select only the #{486}# kernel flavour
+instead of the default #{-k "486 686-pae"}#. Leaving off APT's indices with
+#{--apt-indices false}# also saves a fair amount of space, the tradeoff
+being that you need to #{apt-get update}# before using apt in the live
+system. Choosing the #{minimal}# package list leaves out the large
+#{locales}# package and associated utilities. Dropping recommended packages
+with #{--apt-recommends false}# saves some additional space, at the expense
+of omitting some packages you might otherwise expect to be there, such as
+/{firmware-linux-free}/ which may be needed to support certain hardware. The
+remaining options shave off additional small amounts of space. It's up to
+you to decide if the functionality that is sacrificed with each optimization
+is worth the loss in functionality.
 
 2~ Un escritorio KDE con variante local e instalador
 
@@ -406,8 +402,7 @@ code{
 
 }code
 
-Tener en cuenta que se ha incluido el paquete #{debian-installer-launcher}#
-para lanzar el instalador desde el escritorio en vivo, y que también se ha
-especificado el kernel 486, ya que actualmente es necesario que el
-instalador y el kernel del sistema en vivo coincidan para que el lanzador
-funcione correctamente.
+Note that we have included the debian-installer-launcher package to launch
+the installer from the live desktop, and have also specified the 486 flavour
+kernel, as it is currently necessary to make the installer and live system
+kernels match for the launcher to work properly.
diff --git a/manual/es/user_installation.ssi b/manual/es/user_installation.ssi
index 72abc83..b3158be 100644
--- a/manual/es/user_installation.ssi
+++ b/manual/es/user_installation.ssi
@@ -141,13 +141,12 @@ Se debe crear ya sea en la distribución de destino o en un entorno chroot
 que contenga la plataforma de destino: es decir, si el objetivo es Wheezy
 entonces se debe crear usando Wheezy.
 
-Utilizar un programa creador personal como /{pbuilder}/ o /{sbuild}/ si se
-necesita crear #{live-boot}# para una distribución de destino diferente del
-sistema de creación. Por ejemplo, para las imágenes en vivo de Wheezy, crear
-#{live-boot}# en un entorno chroot. Si la distribución de destino coincide
-con la distribución actual, se puede crear directamente sobre el sistema de
-creación con #{dpkg-buildpackage}# (proporcionada por el paquete
-/{dpkg-dev}/ ):
+Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to
+build live-boot for a target distribution that differs from your build
+system. For example, for Wheezy live images, build live-boot in a Wheezy
+chroot. If your target distribution happens to match your build system
+distribution, you may build directly on the build system using
+#{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
 
 code{
 
diff --git a/manual/es/user_overview.ssi b/manual/es/user_overview.ssi
index fbab7e2..2325511 100644
--- a/manual/es/user_overview.ssi
+++ b/manual/es/user_overview.ssi
@@ -15,24 +15,23 @@ La idea detrás de live-build es ser un marco (framework) que utiliza un
 directorio de configuración para automatizar completamente y personalizar
 todos los aspectos de la creación de una imagen de un sistema en vivo.
 
-Muchos conceptos son similares a los del paquete de herramientas de Debian
-debhelper escrito por Joey Hess:
+Many concepts are similar to those in the /{debhelper}/ Debian package tools
+written by Joey Hess:
 
-_* Los scripts tienen una ubicación central para la configuración de su
-funcionamiento. En debhelper, éste es el subdirectorio #{debian/}# de un
-árbol de paquetes. Por ejemplo, dh_install buscará, entre otros, un fichero
-llamado #{debian/install}# para determinar qué ficheros deben existir en un
-paquete binario en particular. De la misma manera, live-build almacena toda
-su configuración bajo un subdirectorio #{config/}#.
+_* The scripts have a central location for configuring their operation. In
+/{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For
+example, dh_install will look, amongst others, for a file called
+#{debian/install}# to determine which files should exist in a particular
+binary package. In much the same way, live-build stores its configuration
+entirely under a #{config/}# subdirectory.
 
 _* Los scripts son independientes - es decir, siempre es seguro ejecutar
 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 comando lb config
-}#lb-config
+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}#, please see {The lb config command}#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 a10be75..3a144e5 100644
--- a/manual/fr/about_manual.ssi
+++ b/manual/fr/about_manual.ssi
@@ -77,9 +77,9 @@ 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.
 
-_* *{live-build}*: Une collection de scripts utilisés pour personnaliser les
-systèmes Debian Live. live-build était initialement nommé live-package, puis
-live-helper.
+_* *{live-build}*: A collection of scripts used to build customized Debian
+Live systems. live-build was formerly known as /{live-helper}/, and even
+earlier known as /{live-package}/.
 
 _* *{live-config}*: Une collection de scripts utilisés pour configurer un
 système live durant le processus d'amorçage. live-config faisait
@@ -94,9 +94,9 @@ distribution Debian.
 _* *{Paramètres d'amorçage}*: Les paramètres pouvant être entrés à l'invite
 de démarrage afin de modifier le noyau ou live-config.
 
-_* *{chroot}*: Le programme chroot, #{chroot(8)}#, nous permet de faire
-tourner plusieurs instances concurrentes de l'environnement GNU/Linux sur un
-système sans redémarrage.
+_* *{chroot}*: The /{chroot}/ program, #{chroot(8)}#, enables us to run
+different instances of the GNU/Linux environment on a single system
+simultaneously without rebooting.
 
 _* *{Image binaire}*: Un fichier contenant le système live, tel que
 binary.iso ou binary.img.
diff --git a/manual/fr/project_bugs.ssi b/manual/fr/project_bugs.ssi
index 05eddc8..9e19e61 100644
--- a/manual/fr/project_bugs.ssi
+++ b/manual/fr/project_bugs.ssi
@@ -78,7 +78,7 @@ _* Version de live-boot sur le système live
 
 _* Version de live-config sur le système live
 
-_* Version de #{debootstrap}# et/ou #{cdebootstrap}# sur le système hôte
+_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system
 
 _* L'architecture du système live
 
@@ -132,11 +132,11 @@ Où est-ce que le bogue apparaît?
 
 3~ Au moment de la construction tandis l'amorçage
 
-live-build amorce d'abord un système Debian de base avec #{debootstrap}# ou
-#{cdebootstrap}#. Selon l'outil d'amorçage utilisé et de la distribution
-Debian il peut échouer. Si un bogue apparaît ici, vérifiez si l'erreur est
-liée à un paquet Debian spécifique (plus probable), ou si il est liée à
-l'outil d'amorçage lui-même.
+live-build first bootstraps a basic Debian system with /{debootstrap}/ or
+/{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian
+distribution it is bootstrapping, it may fail. If a bug appears here, check
+if the error is related to a specific Debian package (most likely), or if it
+is related to bootstrapping tool itself.
 
 Dans les deux cas, ce n'est pas un bogue dans Debian Live, mais plutôt dans
 Debian lui-même que nous ne pouvons résoudre directement. S'il vous plaît
@@ -149,11 +149,10 @@ fonction de la distribution Debian utilisée et l'état quotidienne de
 l'archive, il peut échouer. Si un bogue apparaît ici, vérifiez si l'erreur
 est également reproductible sur un système normal.
 
-Si c'est le cas, ce n'est pas un bogue dans Debian Live, mais plutôt dans
-Debian - s'il vous plaît faire le rapport sur le paquet
-défaillant. L'exécution de #{debootstrap}# séparément du système de
-construction ou l'exécution de #{lb bootstrap --debug}# vous donnera plus
-d'informations.
+If this is the case, this is not a bug in Debian Live, but rather in Debian
+- please report it against the failing package. Running /{debootstrap}/
+separately from the Live system build or running #{lb bootstrap --debug}#
+will give you more information.
 
 Aussi, si vous utilisez un miroir local et/ou un proxy et vous rencontrez un
 problème, s'il vous plaît toujours le reproduire d'abord en amorçant sur un
diff --git a/manual/fr/style_guide.ssi b/manual/fr/style_guide.ssi
index 8b01cc3..fd6c6fd 100644
--- a/manual/fr/style_guide.ssi
+++ b/manual/fr/style_guide.ssi
@@ -342,11 +342,11 @@ intervention if the code changes.
 Leave the code blocks empty (they will be automatically added then) if you
 want to make your translation easier to maintain.
 
-_* /{New lines}/
+_* /{Newlines}/
 
-The translated texts need to have the exact same new lines as the original
+The translated texts need to have the exact same newlines as the original
 texts. Be careful to press the "Enter" key or type *{\n}* if they appear in
-the original files. These new lines often appear, for instance, in the code
+the original files. These newlines often appear, for instance, in the code
 blocks.
 
 Make no mistake, this does not mean that the translated text needs to have
diff --git a/manual/fr/user_basics.ssi b/manual/fr/user_basics.ssi
index 0bea152..efd3cc0 100644
--- a/manual/fr/user_basics.ssi
+++ b/manual/fr/user_basics.ssi
@@ -238,10 +238,7 @@ Créer une nouvelle machine virtuelle, modifiez les paramètres de stockage
 pour utiliser #{binary-hybrid.iso}# comme le périphérique CD/DVD et démarrer
 la machine.
 
-Remarque: Pour les systèmes live contenant X.org que vous voulez essayer
-avec #{virtualbox-ose}#, vous pouvez inclure le paquet des pilotes
-VirtualBox X.org, #{virtualbox-ose-guest-x11}#, dans votre configuration de
-live-build. Sinon, la résolution est limitée à 800x600.
+*{Note:}* For live systems containing X.org that you want to test with #{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. Otherwise, the resolution is limited to 800x600.
 
 code{
 
@@ -261,9 +258,7 @@ pas correctement des images hybrides, ou si vous voulez utiliser l'espace
 disponible sur le support à certaines fins, tel que la persistance d'une
 partition, vous devez utiliser une image HDD. 
 
-Remarque: si vous avez créé une image ISO hybride avec l'exemple précédent,
-vous devrez nettoyer votre répertoire de travail avec la commande #{lb
-clean}# (voir {La commande lb clean}#lb-clean):
+*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):
 
 code{
 
@@ -350,9 +345,7 @@ La séquence de commandes suivante va créer une image NetBoot de base
 contenant le système Debian standard sans X.org. Elle peut être démarrée sur
 le réseau.
 
-Remarque: Si vous avez réalisé tous les exemples précédents, vous aurez
-besoin de nettoyer votre répertoire de travail avec la commande #{lb
-clean}#:
+*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:
 
 code{
 
diff --git a/manual/fr/user_customization-binary.ssi b/manual/fr/user_customization-binary.ssi
index 170dc39..043163b 100644
--- a/manual/fr/user_customization-binary.ssi
+++ b/manual/fr/user_customization-binary.ssi
@@ -47,7 +47,7 @@ code{
  include menu.cfg
  default vesamenu.c32
  prompt 0
- timeout 5
+ timeout 50
 
 }code
 
@@ -59,7 +59,7 @@ code{
 
  #!/bin/sh
 
- sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg
+ sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg
 
 }code
 
diff --git a/manual/fr/user_customization-installer.ssi b/manual/fr/user_customization-installer.ssi
index f169770..77f9c7d 100644
--- a/manual/fr/user_customization-installer.ssi
+++ b/manual/fr/user_customization-installer.ssi
@@ -17,10 +17,10 @@ Les trois principaux types de programme d'installation sont:
 
 *{Installateur Debian «Régulière»}*: C'est une image de Debian Live normale avec un noyau et initrd séparés qui (lorsqu'ils sont sélectionnés à partir du chargeur d'amorçage approprié) se lancen dans une instance d'installateur Debian standard, exactement comme si vous aviez téléchargé une image CD de Debian et la auriez démarrée. Les images contenant un système live et un installateur indépendant sont souvent appelés «images combinées".
 
-Sur ces images, Debian est installé par l'extraction et l'installation de
-paquets .deb à l'aide de #{debootstrap}# ou #{cdebootstrap}#, à partir des
-supports locaux ou à partir du réseau, résultant en un système Debian
-standard en cours d'installation sur le disque dur.
+On such images, Debian is installed by fetching and installing .deb packages
+using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some
+network-based network, resulting in a standard Debian system being installed
+to the hard disk.
 
 Tout ce processus peut être préconfiguré et personnalisé dans un certain
 nombre de façons, voir les pages correspondantes dans le manuel de
@@ -30,20 +30,17 @@ le mettre à l'image et l'activer pour vous.
 
 *{Installateur Debian "Live" }*: C'est une image de Debian Live avec un noyau et initrd séparés qui (lorsqu'ils sont sélectionnés à partir du chargeur d'amorçage approprié) se lancen dans une instance de l'installateur Debian.
 
-L'installation se poursuit de manière identique à l'installation "régulière"
-décrite ci-dessus, mais à l'étape de l'installation des paquets, au lieu
-d'utiliser #{debootstrap}# pour aller chercher et installer des paquets,
-l'image du système de fichiers live est copiée vers la cible. Ce résultat
-est obtenu avec un udeb spécial appelé «live-installer».
+Installation will proceed in an identical fashion to the "Regular"
+installation described above, but at the actual package installation stage,
+instead of using /{debootstrap}/ to fetch and install packages, the live
+filesystem image is copied to the target. This is achieved with a special
+udeb called live-installer.
 
 Après cette étape, l'installateur Debian se poursuit normalement, en
 installant et configurant des éléments tels que chargeurs de démarrage et
 les utilisateurs locaux, etc
 
-Remarque: Pour soutenir les deux options: installateur normal et live dans
-le chargeur d'amorçage du même support live, vous devez désactiver
-«live-installer» en utilisant la préconfiguration
-#{live-installer/enable=false}#.
+*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.
 
 *{Installateur Debian "de bureau"}*: Indépendamment du type d'installateur Debian inclus, #{d-i}# peut être lancé à partir du Bureau en cliquant sur une icône. C'est facile à utiliser dans certaines situations. Afin de faire usage de cela, le paquet debian-installer-launcher doit être inclus.
 
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index b2d619d..91af193 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -26,15 +26,15 @@ sont installés via APT pinning, pour n'en nommer quelques possibilités.
 
 3~ Distribution, archive areas et mode
 
-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: 
+The distribution you choose has the broadest impact on which packages are
+available to include in your live image. Specify the codename, which
+defaults to #{wheezy}# for the Wheezy version of live-build. Any current
+distribution carried in the Debian archive may be specified by its codename
+here. (See {Terms}#terms for more details.) The #{--distribution}# option
+not only influences the source of packages within the archive, but also
+instructs live-build to behave as needed to build each supported
+distribution. For example, to build against the *{unstable}* release, Sid,
+specify:
 
 code{
 
@@ -314,10 +314,10 @@ code{
 
 }code
 
-Les tâches principales disponibles dans l'installateur Debian peuvent être
-listés avec #{tasksel --list-tasks}# dans le système live. Le contenu de
-n'importe quelle tâche, y compris ceux non inclus dans cette liste, peuvent
-être examinées avec #{tasksel --task-packages}#.
+The primary tasks available in the Debian Installer can be listed with
+#{tasksel --list-tasks}# in the live system. The contents of any task,
+including the ones not included in this list, may be examined with #{tasksel
+--task-packages}#.
 
 3~desktop-and-language-tasks Tâches de bureau et de la langue
 
@@ -499,12 +499,11 @@ code{
 
 }code
 
-Cela ne influencera les entrées dans /etc/apt/sources.list, mais simplement
-de savoir si /var/lib/apt contient les fichiers indices ou non. La
-contrepartie est que APT a besoin de ces indices afin d'opérer dans le
-système live, alors avant de procéder à #{apt-cache search}# or #{apt-get
-install}#, par exemple, l'utilisateur doit faire #{apt-get update}# pour
-créer ces indices.
+This will not influence the entries in #{/etc/apt/sources.list}#, but merely
+whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is
+that APT needs those indices in order to operate in the live system, so
+before performing #{apt-cache search}# or #{apt-get install}#, for instance,
+the user must #{apt-get update}# first to create those indices.
 
 Si vous trouvez que l'installation des paquets recommandés gonfle votre
 image trop, vous pouvez désactiver l'option par défaut d'APT avec:
diff --git a/manual/fr/user_customization-runtime.ssi b/manual/fr/user_customization-runtime.ssi
index c1046ce..48a3ddd 100644
--- a/manual/fr/user_customization-runtime.ssi
+++ b/manual/fr/user_customization-runtime.ssi
@@ -247,15 +247,14 @@ code{
 
 }code
 
-Alors nous redémarrons. Lors du premier démarrage les contenus du /home et
-/var/cache/apt seront copiés dans le volume persistant, et à partir de ce
-moment tous les changements dans ces répertoires seront stockés dans le
-volume persistant. S'il vous plaît souligner que les chemins d'accès aux
-répertoriés dans le fichier #{live.persist}# ne peuvent pas contenir
-d'espaces blancs ou les éléments spéciaux "." et "..". En outre, ni "/live"
-(ou un de ses sous-répertoires), ni "/" peuvent être rendus persistants en
-utilisant custom mounts (pour ce dernier, utilisez la persistance
-#{full-ov}# décrite ci-dessus).
+Then we reboot. During the first boot the contents of #{/home}# and
+#{/var/cache/apt}# will be copied into the persistent volume, and from then
+on all changes to these directories will live in the persistent
+volume. Please note that any paths listed in the #{live.persist}# file
+cannot contain white spaces or the special #{.}# and #{..}# path
+components. Also, neither #{/live}# (or any of its sub-directories) nor
+#{/}# can be made persistent using custom mounts (for the latter, use the
+#{full-ov}# type persistence described above).
 
 Plusieurs différents volumes de couches personnalisés (avec leurs propres
 fichiers #{live.persist}#) peuvent être utilisés au même temps, mais si
diff --git a/manual/fr/user_examples.ssi b/manual/fr/user_examples.ssi
index 5c96aa7..8694a58 100644
--- a/manual/fr/user_examples.ssi
+++ b/manual/fr/user_examples.ssi
@@ -192,9 +192,8 @@ code{
 
 3~ Deuxième révision
 
-Dans cette révision, nous allons nettoyer à partir de la première
-construction, ajouter le paquet #{vlc}# à notre configuration, reconstruire,
-tester et faire le commit.
+In this revision, we're going to clean up from the first build, add the
+/{vlc}/ package to our configuration, rebuild, test and commit.
 
 La commande #{lb clean}# va nettoyer tous les fichiers générés par la
 construction précédente à l'exception du cache, ça évite d'avoir à
@@ -208,7 +207,7 @@ code{
 
 }code
 
-Maintenant ajouter le paquet #{vlc}# à votre liste de paquets local dans
+Now append the /{vlc}/ package to our local package list in
 #{config/package-lists/my.list.chroot}#:
 
 code{
@@ -252,9 +251,9 @@ expériences recueillies des utilisateurs de Debian Live.
 
 *{Cas d'utilisation:}* Créer une image avec live-build pour démarrer directement à un serveur VNC.
 
-Faire un répertoire de construction et créer une configuration du squelette
-construit autour de la liste standard x11, avec #{gdm3}#, #{metacity}# et
-#{xvnc4viewer}#, désactivant «recommends» pour faire un système minimal:
+Make a build directory and create a skeletal configuration in it built
+around the standard-x11 list, including /{gdm3}/, /{metacity}/ and
+/{xvnc4viewer}/, disabling recommends to make a minimal system:
 
 code{
 
@@ -266,9 +265,9 @@ code{
 
 }code
 
-Créez le répertoire #{/etc/skel}# avec une #{.xsession}# personnalisée pour
-l'utilisateur par défaut qui va lancer metacity et commencer xvncviewer, en
-reliant le port #{5901}# sur un serveur à  #{192.168.1.2}#:
+Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for
+the default user that will launch /{metacity}/ and start /{xvncviewer}/,
+connecting to port #{5901}# on a server at #{192.168.1.2}#:
 
 code{
 
@@ -298,16 +297,15 @@ Amusez-vous bien!
 
 *{Cas d'utilisation:}* Créer une image standard avec certains composants éliminés afin de s'adapter sur une clé USB avec 128M avec espace laissé pour l'utiliser à votre convenance.
 
-Lorsque l'optimisation d'une image adaptée à une dimension des certains
-supports, vous avez besoin de comprendre le compromis que vous faites entre
-la taille et la fonctionnalité. Dans cet exemple, nous réduisons uniquement
-que pour faire place à du matériel supplémentaire au sein d'une taille de
-128M, mais sans rien faire pour détruire l'intégrité des paquets contenus,
-telles que la purge des données de localisation via le paquet
-#{localepurge}#, ou d'autres tels optimisations "intrusives". On notera en
-particulier, vous ne devriez pas utiliser #{--bootstrap-flavour minimal}#
-sauf si vous savez vraiment ce que vous faites, que l'omission de paquets de
-priorité #{importants}# produira probablement un système live cassé.
+When optimizing an image to fit a certain media size, you need to understand
+the tradeoffs you are making between size and functionality. In this
+example, we trim only so much as to make room for additional material within
+a 128M media size, but without doing anything to destroy integrity of the
+packages contained within, such as the purging of locale data via the
+/{localepurge}/ package, or other such "intrusive" optimizations. Of
+particular note, you should not use #{--bootstrap-flavour minimal}# unless
+you really know what you're doing, as omitting priority #{important}#
+packages will most likely produce a broken live system.
 
 code{
 
@@ -329,21 +327,19 @@ ci-dessus produit une image de 78Mbyte. Cela se compare favorablement avec
 l'image de 166Mbyte produite par la configuration par défaut dans {Tutoriel
 1}#tutorial-1.
 
-Le plus grand espace-économiseur ici, par rapport à la construction d'une
-image standard sur une architecture #{i386}#, est de sélectionner uniquement
-le saveur du noyau #{486}# au lieu de la valeur par défaut #{-k "486
-686-pae"}#. Laissant hors indices APT avec #{--apt-indices false}# permet
-aussi d'économiser une bonne quantité d'espace, le compromis étant que vous
-devez faire  #{apt-get update}# avant d'utiliser apt dans le système
-live. Le choix de la liste #{minimal}# laisse de côté les grands paquets de
-#{locales}# et les services associés. Laissant hors les paquets recommandés
-avec #{--apt-recommends false}# économise de l'espace supplémentaire, au
-détriment d'omettre certains paquets vous pourriez autrement attendre à être
-là, tel que #{firmware-linux-free}# qui peuvent être nécessaires pour
-soutenir certains supports matériels. Les options restantes économisent
-petites quantités d'espace supplémentaires. C'est à vous de décider si la
-fonctionnalité qui est sacrifié avec chaque optimisation est en vaut la
-perte de fonctionnalité.
+The biggest space-saver here, compared to building a standard image on an
+#{i386}# architecture system, is to select only the #{486}# kernel flavour
+instead of the default #{-k "486 686-pae"}#. Leaving off APT's indices with
+#{--apt-indices false}# also saves a fair amount of space, the tradeoff
+being that you need to #{apt-get update}# before using apt in the live
+system. Choosing the #{minimal}# package list leaves out the large
+#{locales}# package and associated utilities. Dropping recommended packages
+with #{--apt-recommends false}# saves some additional space, at the expense
+of omitting some packages you might otherwise expect to be there, such as
+/{firmware-linux-free}/ which may be needed to support certain hardware. The
+remaining options shave off additional small amounts of space. It's up to
+you to decide if the functionality that is sacrificed with each optimization
+is worth the loss in functionality.
 
 2~ Un bureau KDE localisé et installateur 
 
@@ -410,8 +406,7 @@ code{
 
 }code
 
-Notez que nous avons inclus le paquet #{debian-installer-launcher}# pour
-lancer l'installateur à partir du bureau live, nous avons également précisé
-le noyau 486, parce qu'il est actuellement nécessaire faire que
-l'installateur et le noyau du systéme live coïncident pour que le lanceur
-fonctionne correctement.
+Note that we have included the debian-installer-launcher package to launch
+the installer from the live desktop, and have also specified the 486 flavour
+kernel, as it is currently necessary to make the installer and live system
+kernels match for the launcher to work properly.
diff --git a/manual/fr/user_installation.ssi b/manual/fr/user_installation.ssi
index ec8d672..a744b28 100644
--- a/manual/fr/user_installation.ssi
+++ b/manual/fr/user_installation.ssi
@@ -141,13 +141,12 @@ Vous devez créer sur votre distribution objectif ou en chroot contenant
 votre plateforme objectif: cela signifie que si votre objectif est Wheezy
 alors vous devez créer sur Wheezy.
 
-Utilisez un système de construction automatique personnel tels que
-/{pbuilder}/ ou /{sbuild}/ si vous avez besoin pour créer #{live-boot}# pour
-une distribution objectif qui diffère de votre système de construction. Par
-exemple, pour les images live de Wheezy, créez #{live-boot}# dans un chroot
-Wheezy. Si votre distribution objectif correspond à votre distribution vous
-pouvez créer directement sur le système de construction en utilisant
-#{dpkg-buildpackage}# (fournis par le paquet /{dpkg-dev}/):
+Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to
+build live-boot for a target distribution that differs from your build
+system. For example, for Wheezy live images, build live-boot in a Wheezy
+chroot. If your target distribution happens to match your build system
+distribution, you may build directly on the build system using
+#{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
 
 code{
 
diff --git a/manual/fr/user_overview.ssi b/manual/fr/user_overview.ssi
index 22ea572..7790a99 100644
--- a/manual/fr/user_overview.ssi
+++ b/manual/fr/user_overview.ssi
@@ -14,25 +14,23 @@ L'idée derrière live-build est de constituer un cadre qui utilise un
 répertoire de configuration pour automatiser et personnaliser complètement
 tous les aspects de la construction d'une image Live.
 
-Plusieurs concepts sont similaires à celles ceux dans le paquet Debian
-debhelper écrit par Joey Hess:
+Many concepts are similar to those in the /{debhelper}/ Debian package tools
+written by Joey Hess:
 
-_* Les scripts ont un emplacement central pour la configuration de leur
-fonctionnement. Avec debhelper, c'est le sous-répertoire #{debian/}# d'un
-arbre de paquets. Par exemple, dh_install cherchera, entre autres, un
-fichier appelé #{debian/install}# pour déterminer quels fichiers doivent
-exister dans un paquet binaire particulier. De la même manière, live-build
-enregistre son configuration entièrement sous un sous-répertoire
-#{config/}#.
+_* The scripts have a central location for configuring their operation. In
+/{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For
+example, dh_install will look, amongst others, for a file called
+#{debian/install}# to determine which files should exist in a particular
+binary package. In much the same way, live-build stores its configuration
+entirely under a #{config/}# subdirectory.
 
 _* Les scripts sont indépendants - c'est-à-dire, il est toujours sûr
 d'exécuter chaque commande.
 
-Contrairement à debhelper, live-build contient un outil pour générer un
-répertoire de configuration en squelette, #{lb config}#. Cela pourrait être
-considéré 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.
+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}#, please see {The lb config command}#lb-config.
 
 Le reste de cette section examine les trois commandes les plus importantes:
 
diff --git a/manual/it/about_manual.ssi b/manual/it/about_manual.ssi
index 9f4d88b..8d575d9 100644
--- a/manual/it/about_manual.ssi
+++ b/manual/it/about_manual.ssi
@@ -70,9 +70,9 @@ _* *{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-build}*: Una raccolta di script usati per creare sistemi Debian
-Live personalizzati. live-build era conosciuto come live-helper, ed ancora
-prima come live-package.
+_* *{live-build}*: A collection of scripts used to build customized Debian
+Live systems. live-build was formerly known as /{live-helper}/, and even
+earlier known as /{live-package}/.
 
 _* *{live-config}*: Una raccolta di script usati per configurare un sistema
 live durante il processo di inizializzazione. live-config era una parte di
@@ -87,9 +87,9 @@ distribuzione Debian.
 _* *{Boot parameters}*: Parametri che possono essere immessi nel prompt del
 boot loader per modificare il comportamento del kernel o di live-config.
 
-_* *{chroot}*: Il programma chroot, #{chroot(8)}#, rende possibile eseguire
-diverse istanze dell'ambiente GNU/Linux su un singolo sistema
-simultaneamente senza riavviare.
+_* *{chroot}*: The /{chroot}/ program, #{chroot(8)}#, enables us to run
+different instances of the GNU/Linux environment on a single system
+simultaneously without rebooting.
 
 _* *{Binary image}*: Un file che contiene il sistema live, come binary.iso o
 binary.img.
diff --git a/manual/it/project_bugs.ssi b/manual/it/project_bugs.ssi
index 3f32eaf..b026410 100644
--- a/manual/it/project_bugs.ssi
+++ b/manual/it/project_bugs.ssi
@@ -75,7 +75,7 @@ _* Versione di live-boot sul sistema ospitante
 
 _* Versione di live-config sul sistema live
 
-_* Versione di #{debootstrap}# o #{cdebootstrap}# sul sistema ospitante
+_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system
 
 _* Architettura del sistema live
 
@@ -127,11 +127,11 @@ Dove appare il bug?
 
 3~ Durante la compilazione mentre esegue il bootstrap
 
-live-build avvia inizialmente un sistema Debian di base con #{debootstrap}#
-o #{cdebootstrap}#; può fallire a seconda dello strumento utilizzato e della
-distribuzione Debian che si sta avviando. Se il bug appare a questo punto
-controllare che l'errore sia relativo ad uno specifico pacchetto Debian (più
-probabile) o allo strumento di avvio stesso.
+live-build first bootstraps a basic Debian system with /{debootstrap}/ or
+/{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian
+distribution it is bootstrapping, it may fail. If a bug appears here, check
+if the error is related to a specific Debian package (most likely), or if it
+is related to bootstrapping tool itself.
 
 In entrambi i casi non è un bug in Debian Live, ma piuttosto in Debian
 stessa che non può essere risolto direttamente. Si prega di inviare una
@@ -145,10 +145,10 @@ a seconda della distribuzione Debian e lo stato dell'archivio giornaliero.Se
 il bug appare a questo punto, controllare che l'errore sia riproducibile su
 un sistema normale.
 
-In questo caso non è un bug in Debian Live, ma piuttosto in Debian, inviare
-una segnalazione sul pacchetto che ha fallito. Si otterranno maggiori
-informazioni eseguendo #{debootstrap}# separatamente dal sistema live o
-eseguendo #{lb bootstrap --debug}#.
+If this is the case, this is not a bug in Debian Live, but rather in Debian
+- please report it against the failing package. Running /{debootstrap}/
+separately from the Live system build or running #{lb bootstrap --debug}#
+will give you more information.
 
 Se si verifica un problema utilizzando un mirror locale o un qualsiasi tipo
 di proxy è bene riprodurlo avviando da un mirror ufficiale.
diff --git a/manual/it/style_guide.ssi b/manual/it/style_guide.ssi
index 8b01cc3..fd6c6fd 100644
--- a/manual/it/style_guide.ssi
+++ b/manual/it/style_guide.ssi
@@ -342,11 +342,11 @@ intervention if the code changes.
 Leave the code blocks empty (they will be automatically added then) if you
 want to make your translation easier to maintain.
 
-_* /{New lines}/
+_* /{Newlines}/
 
-The translated texts need to have the exact same new lines as the original
+The translated texts need to have the exact same newlines as the original
 texts. Be careful to press the "Enter" key or type *{\n}* if they appear in
-the original files. These new lines often appear, for instance, in the code
+the original files. These newlines often appear, for instance, in the code
 blocks.
 
 Make no mistake, this does not mean that the translated text needs to have
diff --git a/manual/it/user_basics.ssi b/manual/it/user_basics.ssi
index 3689651..54a88fd 100644
--- a/manual/it/user_basics.ssi
+++ b/manual/it/user_basics.ssi
@@ -231,10 +231,7 @@ Creare una nuova macchina virtuale, modificare le impostazione di
 archiviazione in modo da usare #{binary-hybrid.iso}# come dispositivo
 CD/DVD, e avviare la macchina.
 
-Nota: per sistemi live contenenti X.org che si vogliono provare con
-#{virtualbox-ose}#, si può voler includere il pacchetto dei driver per X.org
-di VirtualBox, #{virtualbox-ose-guest-x11}#, nella configurazione di
-live-build. In caso contrario la risoluzione è limitata a 800x600.
+*{Note:}* For live systems containing X.org that you want to test with #{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. Otherwise, the resolution is limited to 800x600.
 
 code{
 
@@ -254,9 +251,7 @@ che non supporta le immagini ibride, o si vuole usare lo spazio rimanente
 sul supporto per altri scopi, come una partizione persistente, allora
 occorre un'immagine HDD.
 
-Nota: se si è creata un'immagine ISO ibrida con gli esempi precedenti,
-occorre pulire la directory di lavoro con il comando #{lb clean}# (vedere
-{Il comando lb clean}#lb-clean):
+*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):
 
 code{
 
@@ -342,8 +337,7 @@ La seguente sequenza di comandi creerà un'immagine netboot di base
 contenente il sistema Debian standard senza X.org. È adatta per il boot
 tramite rete.
 
-Nota: se qualcuno tra gli esempi precedenti è stato seguito, bisogna pulire
-la directory di lavoro con il comando #{lb clean}#:
+*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:
 
 code{
 
diff --git a/manual/it/user_customization-binary.ssi b/manual/it/user_customization-binary.ssi
index 0ec2a1e..27ece15 100644
--- a/manual/it/user_customization-binary.ssi
+++ b/manual/it/user_customization-binary.ssi
@@ -47,7 +47,7 @@ code{
  include menu.cfg
  default vesamenu.c32
  prompt 0
- timeout 5
+ timeout 50
 
 }code
 
@@ -59,7 +59,7 @@ code{
 
  #!/bin/sh
 
- sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg
+ sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg
 
 }code
 
diff --git a/manual/it/user_customization-installer.ssi b/manual/it/user_customization-installer.ssi
index e1ebe0a..22eb032 100644
--- a/manual/it/user_customization-installer.ssi
+++ b/manual/it/user_customization-installer.ssi
@@ -17,9 +17,10 @@ I tre principali tipi dell'installer sono:
 
 *{Installatore Debian "normale"}*: un'immagine Debian Live con un kernel e un initrd separati i quali (quando viene selezionato dal bootloader appropriato) lancia un'istanza standard dell'Installatore Debian, come quando si scarica un'immagine di Debian per CD e la si avvia. Le immagini che contengono un sistema live e un'installatore indipendenti sono spesso definite "immagini combinate".
 
-In queste immagini, Debian è installata prendendo e installando i pacchetti
-.deb usando {debootstrap}# o #{cdebootstrap}#, da supporti locali o dalla
-rete, risultante in un sistema Debian standard installato sul disco rigido.
+On such images, Debian is installed by fetching and installing .deb packages
+using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some
+network-based network, resulting in a standard Debian system being installed
+to the hard disk.
 
 L'intero processo può essere preimpostato e personalizzato in diversi modi;
 per ulteriori informazioni si vedano le corrispondenti pagine del manuale
@@ -29,18 +30,16 @@ abilitarlo.
 
 *{Installatore Debian "live"}*: un'immagine Debian Live con un kernel e un initrd separato che (quando selezionato dall'appropriato bootloader) avvia un'instanza dell'Installatore Debian.
 
-L'installazione procederà nello stesso modo di un'installazione "Normale"
-come descritto sopra, ma nella fase dell'installazione del pacchetto, invece
-di usare #{debootstrap}# per prelevare e installare i pacchetti, l'immagine
-del filesystem live viene copiata sulla destinazione. Questo si ottiene con
-uno speciale udeb chiamato live-installer.
+Installation will proceed in an identical fashion to the "Regular"
+installation described above, but at the actual package installation stage,
+instead of using /{debootstrap}/ to fetch and install packages, the live
+filesystem image is copied to the target. This is achieved with a special
+udeb called live-installer.
 
 Dopo questa fase, l'Installatore Debian continua normalmente, installando e
 configurando elementi come bootloader e utenti locali, ecc.
 
-Nota: per supportare nel bootloader sia la voce normale che quella live
-dell'installatore sullo stesso supporto si deve disabilitare live-installer
-preconfigurando #{live-installer/enable=false}#.
+*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.
 
 *{Installatore Debian "Desktop"}*: indipendentemente dal tipo di Installatore Debian incluso, #{d-i}# può essere lanciato cliccando un'icona sul desktop, in alcune situazioni più semplice per l'utente. Per poterne usufruire deve essere incluso il pacchetto debian-installer-launcher.
 
diff --git a/manual/it/user_customization-packages.ssi b/manual/it/user_customization-packages.ssi
index 99bed21..96d38ae 100644
--- a/manual/it/user_customization-packages.ssi
+++ b/manual/it/user_customization-packages.ssi
@@ -25,16 +25,15 @@ installate con il pinning, giusto per citare alcune possibilità.
 
 3~ Distribuzione, le aree di archivio e le modalità
 
-La distribuzione che viene scelta ha un ampio impatto su quali pacchetti
-siano disponibili per essere inclusi nell'immagine live. Specificare il nome
-in codice, il predefinito per la versione Wheezy di live-build è #{wheezy}#;
-qualsiasi attuale distribuzione mantenuta negli archivi Debian può essere
-qui specificata con il suo nome in codice. (Per ulteriori dettagli
-consultare il {Glossario}#terms). L'opzione #{--distribution}# non solo
-influenza la sorgente dei pacchetti nell'archivio, ma indica a
-#{live-build}# di comportarsi secondo la necessità per compilare ciascuna
-distribuzione supportata. Ad esempio se si vuole costruire un rilascio
-*{unstable}*, Sid, specificare:
+The distribution you choose has the broadest impact on which packages are
+available to include in your live image. Specify the codename, which
+defaults to #{wheezy}# for the Wheezy version of live-build. Any current
+distribution carried in the Debian archive may be specified by its codename
+here. (See {Terms}#terms for more details.) The #{--distribution}# option
+not only influences the source of packages within the archive, but also
+instructs live-build to behave as needed to build each supported
+distribution. For example, to build against the *{unstable}* release, Sid,
+specify:
 
 code{
 
@@ -304,10 +303,10 @@ code{
 
 }code
 
-I task principali disponibili nell'installatore Debian possono essere
-elencati nel sistema live con #{tasksel --list-tasks}#. I contenuti di ogni
-task, inclusi quelli non inclusi in questo elenco, possono essere esaminati
-con #{tasksel --task-packages}#.
+The primary tasks available in the Debian Installer can be listed with
+#{tasksel --list-tasks}# in the live system. The contents of any task,
+including the ones not included in this list, may be examined with #{tasksel
+--task-packages}#.
 
 3~desktop-and-language-tasks Task per desktop e lingua
 
@@ -481,11 +480,11 @@ code{
 
 }code
 
-Questo non influenzerà le voci in /etc/apt/sources.list, determina solo se
-/var/lib/apt contiene o meno i file degli indici. Il compromesso è che APT
-necessita di quegli indici per operar enel sistema live, perciò prima di
-eseguire #{apt-cache search}# o #{apt-get install}#, per esempio, l'utente
-deve usare prima #{apt-get update}# per crearli.
+This will not influence the entries in #{/etc/apt/sources.list}#, but merely
+whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is
+that APT needs those indices in order to operate in the live system, so
+before performing #{apt-cache search}# or #{apt-get install}#, for instance,
+the user must #{apt-get update}# first to create those indices.
 
 In caso si trovi che l'installazione dei pacchetti raccomandati appesantisca
 troppo l'immagine, si può disabilitare l'opzione predefinita di APT con:
diff --git a/manual/it/user_customization-runtime.ssi b/manual/it/user_customization-runtime.ssi
index c99f796..3661341 100644
--- a/manual/it/user_customization-runtime.ssi
+++ b/manual/it/user_customization-runtime.ssi
@@ -236,14 +236,14 @@ code{
 
 }code
 
-Quindi riavviare. Durante il primo avvio il contenuto di /home e
-/var/cache/apt saranno copiati nel volume persistente e da allora tutte le
-modifiche a queste directory risiederanno in modo persistente sul
-volume. C'è da considerare che tutti i path elencati nel file
-#{live.persist}# non possono contenere spazi o i caratteri speciali "." e
-".."; inoltre, né "/live" (o nessuna delle sue sottodirectory) né "/" può
-essere resa persistente tramite i mount personalizzati (per l'ultimo usare
-la tipologia #{full-ov}# descritta prima).
+Then we reboot. During the first boot the contents of #{/home}# and
+#{/var/cache/apt}# will be copied into the persistent volume, and from then
+on all changes to these directories will live in the persistent
+volume. Please note that any paths listed in the #{live.persist}# file
+cannot contain white spaces or the special #{.}# and #{..}# path
+components. Also, neither #{/live}# (or any of its sub-directories) nor
+#{/}# can be made persistent using custom mounts (for the latter, use the
+#{full-ov}# type persistence described above).
 
 Possono essere utilizzati svariati volumi di stratificazione personalizzati
 (con i rispettivi file #{live.persist}#) allo stesso tempo ma se questi
diff --git a/manual/it/user_examples.ssi b/manual/it/user_examples.ssi
index 3eb9723..41cd349 100644
--- a/manual/it/user_examples.ssi
+++ b/manual/it/user_examples.ssi
@@ -186,9 +186,8 @@ code{
 
 3~ Seconda revisione
 
-In questa revisione ripuliremo la prima compilazione, aggiungeremo il
-pacchetto #{vlc}# alla configurazione, dunque avverrà una ricompilazione,
-verifica e commit.
+In this revision, we're going to clean up from the first build, add the
+/{vlc}/ package to our configuration, rebuild, test and commit.
 
 Il comando #{lb clean}# ripulirà tutti i file ottenuti con la precedente
 generazione eccetto la cache, che ci evita un nuovo download dei
@@ -201,7 +200,7 @@ code{
 
 }code
 
-Ora inserire il pacchetto #{vlc}# all'elenco locale dei pacchetti
+Now append the /{vlc}/ package to our local package list in
 #{config/package-lists/my.list.chroot}#:
 
 code{
@@ -246,10 +245,9 @@ utenti Debian Live.
 
 *{Caso d'uso:}* creazione di un'immagine con live-build per avviare direttamente un server VNC.
 
-Creare una directory con al suo interno una configurazione scheletrica
-costruita sulla base dell'elenco di standard-x11, tra cui #{gdm3}#,
-#{metacity}# e #{xvnc4viewer}#, disabilitando i raccomandati per ottenere un
-sistema minimale:
+Make a build directory and create a skeletal configuration in it built
+around the standard-x11 list, including /{gdm3}/, /{metacity}/ and
+/{xvnc4viewer}/, disabling recommends to make a minimal system:
 
 code{
 
@@ -261,10 +259,9 @@ code{
 
 }code
 
-Creare la directory #{/etc/skel}# e inserirvi un #{.xsession}#
-personalizzato per l'utente predefinito che lancerà metacity e avvierà
-xvncviewer, connesso alla porta #{5901}# su un server all'indirizzo
-#{192.168.1.2}#:
+Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for
+the default user that will launch /{metacity}/ and start /{xvncviewer}/,
+connecting to port #{5901}# on a server at #{192.168.1.2}#:
 
 code{
 
@@ -294,15 +291,15 @@ Buon divertimento.
 
 *{Caso d'uso:}* creazione di un'immagine standard con alcuni componenti rimossi affinché possa stare su una chiavetta USB da 128M, con lo spazio che rimane da usarsi come meglio si crede.
 
-Quando si cerca di ottimizzare un'immagine affinché sia contenuta in un
-supporto, è necessario capire il compromesso che si deve fare tra la
-dimensione e la funzionalità. In questo esempio, taglieremo solo quanto
-basta per far sì che il tutto stia in 128M, senza fare nient'altro che
-distrugga l'integrità dei pacchetti contenuti, come eliminare localizzazioni
-con il pacchetto #{localepurge}# o altre ottimizzazioni "intrusive". È da
-notare che non va usato #{--bootstrap-flavour minimal}# a meno che non si
-sappia cosa si sta facendo, come omettere la priorità dei pacchetti
-#{important}# che molto probabilmente produrrà un sistema live danneggiato.
+When optimizing an image to fit a certain media size, you need to understand
+the tradeoffs you are making between size and functionality. In this
+example, we trim only so much as to make room for additional material within
+a 128M media size, but without doing anything to destroy integrity of the
+packages contained within, such as the purging of locale data via the
+/{localepurge}/ package, or other such "intrusive" optimizations. Of
+particular note, you should not use #{--bootstrap-flavour minimal}# unless
+you really know what you're doing, as omitting priority #{important}#
+packages will most likely produce a broken live system.
 
 code{
 
@@ -323,19 +320,19 @@ All'autore del sistema al momento di scrivere, la seguente configurazione ha
 prodotto una immagine di 78Mbyte. Comparabile favorevolmente con i 166Mbyte
 prodotta dalla configurazione predefinita nel {Tutorial 1}#tutorial-1.
 
-Ciò che salva più spazio, comparato alla costruzione di un'immagine standard
-su un sistema con architettura #{i386}#, è la selezione del solo kernel
-#{486}# invece che quello predefinito #{-k "486 686-pae"}#. Lasciando fuori
-anche gli indici di APT con #{--apt-indices false}# si può salvare una certa
-quantità di spazio, il compromesso è usare #{apt-get update}# prima di usare
-apt nel sistema live. Scegliendo la lista #{minima}# dei pacchetti si
-esclude il grosso pacchetto #{locales}# e le utilità associate. Saltare i
-pacchetti raccomandati con #{--apt-recommends false}# salva altro spazio, a
-scapito di alcuni pacchetti che ci si aspetta di trovare, come
-#{firmware-linux-free}# che potrebbe servire a supportare un certo
-hardware. Le restanti opzioni limano altre piccole quantità di spazio. Sta a
-voi decidere se le funzionalità sacrificate con ciascuna ottimizzazione
-valgono la pena.
+The biggest space-saver here, compared to building a standard image on an
+#{i386}# architecture system, is to select only the #{486}# kernel flavour
+instead of the default #{-k "486 686-pae"}#. Leaving off APT's indices with
+#{--apt-indices false}# also saves a fair amount of space, the tradeoff
+being that you need to #{apt-get update}# before using apt in the live
+system. Choosing the #{minimal}# package list leaves out the large
+#{locales}# package and associated utilities. Dropping recommended packages
+with #{--apt-recommends false}# saves some additional space, at the expense
+of omitting some packages you might otherwise expect to be there, such as
+/{firmware-linux-free}/ which may be needed to support certain hardware. The
+remaining options shave off additional small amounts of space. It's up to
+you to decide if the functionality that is sacrificed with each optimization
+is worth the loss in functionality.
 
 2~ Un desktop KDE localizzato e l'installer
 
@@ -400,8 +397,7 @@ code{
 
 }code
 
-Si noti che è stato incluso il pacchetto #{debian-installer-launcher}# in
-modo da poter lanciare l'installer dal desktop della live, e che è stato
-anche specificato il kernel 486, dato che attualmente è necessario che il
-kernel dell'installer e quello del sistema live coincidano affinché il
-launcher funzioni correttamente.
+Note that we have included the debian-installer-launcher package to launch
+the installer from the live desktop, and have also specified the 486 flavour
+kernel, as it is currently necessary to make the installer and live system
+kernels match for the launcher to work properly.
diff --git a/manual/it/user_installation.ssi b/manual/it/user_installation.ssi
index 2976841..6d89747 100644
--- a/manual/it/user_installation.ssi
+++ b/manual/it/user_installation.ssi
@@ -140,12 +140,12 @@ _* Costruire un .deb di live-boot e live-config
 chroot contenente la piattaforma di destinazione: significa che se
 l'obiettivo è Wheezy allora bisogna compilare su Wheezy.
 
-Se si deve compilare #{live-boot}# per una distribuzione di destinazione
-diversa dal proprio sistema, utilizzare un compilatore tipo /{pbuilder}/ o
-/{sbuild}/. Ad esempio, per immagini live Wheezy, si generi #{live-boot}# in
-un chroot Wheezy. Se la distribuzione di destinazione corrisponde con la
-distribuzione del proprio sistema, si può costruire direttamente sul sistema
-usando #{dpkg-buildpackage}# (fornito dal pacchetto /{dpkg-dev}/):
+Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to
+build live-boot for a target distribution that differs from your build
+system. For example, for Wheezy live images, build live-boot in a Wheezy
+chroot. If your target distribution happens to match your build system
+distribution, you may build directly on the build system using
+#{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
 
 code{
 
diff --git a/manual/it/user_overview.ssi b/manual/it/user_overview.ssi
index e2961d4..080be7e 100644
--- a/manual/it/user_overview.ssi
+++ b/manual/it/user_overview.ssi
@@ -15,23 +15,23 @@ L'idea dietro live-build è di essere un'infrastruttura che utilizza una
 directory di configurazione per automatizzare totalmente e personalizzare
 tutti gli aspetti della creazione di un'immagine live.
 
-Molti concetti sono simili a quelli negli strumenti del pacchetto Debian
-debhelper scritto da Joey Hess:
+Many concepts are similar to those in the /{debhelper}/ Debian package tools
+written by Joey Hess:
 
-_* Gli script hanno una locazione centrale per configurare le loro
-operazioni, in debhelper questa è la sottodirectory #{debian/}# dell'albero
-di un pacchetto. Ad esempio dh_install cercherà, tra gli altri, un file
-chiamato #{debian/install}# per determinare quali file dovrebbero esistere
-in un certo pacchetto binario. Allo stesso modo, live-build salva la sua
-configurazione interamente in una sottodirectory #{config/}#.
+_* The scripts have a central location for configuring their operation. In
+/{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For
+example, dh_install will look, amongst others, for a file called
+#{debian/install}# to determine which files should exist in a particular
+binary package. In much the same way, live-build stores its configuration
+entirely under a #{config/}# subdirectory.
 
 _* Gli script sono indipendenti, vale a dire che è sempre sicuro eseguire
 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 informazioni su
-#{lb config}# si veda {Il comando lb config}#lb-config.
+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}#, please see {The lb config command}#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 be0b3cb..e9ba4aa 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-03 19:01+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -170,8 +170,8 @@ msgstr ""
 #: en/about_manual.ssi:34
 msgid ""
 "_* *{live-build}*: A collection of scripts used to build customized Debian "
-"Live systems. live-build was formerly known as live-helper, and even earlier "
-"known as live-package."
+"Live systems. live-build was formerly known as /{live-helper}/, and even "
+"earlier known as /{live-package}/."
 msgstr ""
 
 #. type: Plain text
@@ -205,7 +205,7 @@ msgstr ""
 #. type: Plain text
 #: en/about_manual.ssi:44
 msgid ""
-"_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+"_* *{chroot}*: The /{chroot}/ program, #{chroot(8)}#, enables us to run "
 "different instances of the GNU/Linux environment on a single system "
 "simultaneously without rebooting."
 msgstr ""
@@ -353,12 +353,12 @@ msgstr ""
 #: 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/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/style_guide.ssi:134
+#: 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
@@ -429,12 +429,12 @@ msgstr ""
 #: 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/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/style_guide.ssi:138
+#: 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
diff --git a/manual/po/de/project_bugs.ssi.po b/manual/po/de/project_bugs.ssi.po
index 75fc676..c547ad6 100644
--- a/manual/po/de/project_bugs.ssi.po
+++ b/manual/po/de/project_bugs.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-08 12:15+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/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: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/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,63 +37,70 @@ 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-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:43
+#: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi: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:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 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_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:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/project_bugs.ssi:64
-#: en/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: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/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
@@ -98,49 +108,53 @@ 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-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:37
-#: en/user_customization-installer.ssi:48
+#: 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
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi: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:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 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_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:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr ""
 
@@ -304,7 +318,7 @@ msgstr ""
 #. type: Plain text
 #: en/project_bugs.ssi:50
 msgid ""
-"_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system"
+"_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system"
 msgstr ""
 
 #. type: Plain text
@@ -400,8 +414,8 @@ msgstr ""
 #. type: Plain text
 #: en/project_bugs.ssi:82
 msgid ""
-"live-build first bootstraps a basic Debian system with #{debootstrap}# or #"
-"{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
+"live-build first bootstraps a basic Debian system with /{debootstrap}/ or /"
+"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
 "distribution it is bootstrapping, it may fail. If a bug appears here, check "
 "if the error is related to a specific Debian package (most likely), or if it "
 "is related to bootstrapping tool itself."
@@ -433,7 +447,7 @@ msgstr ""
 #: en/project_bugs.ssi:90
 msgid ""
 "If this is the case, this is not a bug in Debian Live, but rather in Debian "
-"- please report it against the failing package. Running #{debootstrap}# "
+"- please report it against the failing package. Running /{debootstrap}/ "
 "separately from the Live system build or running #{lb bootstrap --debug}# "
 "will give you more information."
 msgstr ""
diff --git a/manual/po/de/style_guide.ssi.po b/manual/po/de/style_guide.ssi.po
index b2173dd..c6f898a 100644
--- a/manual/po/de/style_guide.ssi.po
+++ b/manual/po/de/style_guide.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-31 19:15+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2012-02-11 16:42+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -22,17 +22,17 @@ msgid ":B~ Appendix"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi: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/style_guide.ssi:134
+#: 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/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
@@ -93,17 +93,17 @@ 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/style_guide.ssi:138
+#: 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/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
@@ -832,15 +832,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/style_guide.ssi:228
-msgid "_* /{New lines}/"
+msgid "_* /{Newlines}/"
 msgstr ""
 
 #. type: Plain text
 #: en/style_guide.ssi:230
 msgid ""
-"The translated texts need to have the exact same new lines as the original "
+"The translated texts need to have the exact same newlines as the original "
 "texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
-"in the original files. These new lines often appear, for instance, in the "
+"in the original files. These newlines often appear, for instance, in the "
 "code blocks."
 msgstr ""
 
diff --git a/manual/po/de/user_basics.ssi.po b/manual/po/de/user_basics.ssi.po
index 2f218d4..c18b51c 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-01-12 08:28-0400\n"
+"POT-Creation-Date: 2012-04-08 12:15+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: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/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,8 +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-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
@@ -59,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: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/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
@@ -99,8 +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-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
@@ -124,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 ""
 
@@ -537,11 +549,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:138
-msgid ""
-"Note: For live systems containing X.org that you want to test with #"
-"{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver "
-"package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. "
-"Otherwise, the resolution is limited to 800x600."
+#, no-wrap
+msgid "*{Note:}* For live systems containing X.org that you want to test with #{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. Otherwise, the resolution is limited to 800x600.\n"
 msgstr ""
 
 #. type: Plain text
@@ -570,10 +579,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:150
-msgid ""
-"Note: if you created an ISO hybrid image with the previous example, you will "
-"need to clean up your working directory with the #{lb clean}# command (see "
-"{The lb clean command}#lb-clean):"
+#, no-wrap
+msgid "*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):\n"
 msgstr ""
 
 #. type: Plain text
@@ -706,9 +713,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:216
-msgid ""
-"Note: if you performed any previous examples, you will need to clean up your "
-"working directory with the #{lb clean}# command:"
+#, no-wrap
+msgid "*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/user_customization-binary.ssi.po b/manual/po/de/user_customization-binary.ssi.po
index d97664e..f51e3b3 100644
--- a/manual/po/de/user_customization-binary.ssi.po
+++ b/manual/po/de/user_customization-binary.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-25 21:42+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+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: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/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,51 +64,54 @@ 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: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: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/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,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 ""
 
@@ -239,7 +245,7 @@ msgid ""
 " include menu.cfg\n"
 " default vesamenu.c32\n"
 " prompt 0\n"
-" timeout 5\n"
+" timeout 50\n"
 msgstr ""
 
 #. type: Plain text
@@ -259,7 +265,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-binary.ssi:43
 #, no-wrap
-msgid " sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg\n"
+msgid " sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/user_customization-installer.ssi.po b/manual/po/de/user_customization-installer.ssi.po
index b0250d5..8567e69 100644
--- a/manual/po/de/user_customization-installer.ssi.po
+++ b/manual/po/de/user_customization-installer.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+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: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/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: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/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
@@ -199,7 +205,7 @@ msgstr ""
 #: en/user_customization-installer.ssi:16
 msgid ""
 "On such images, Debian is installed by fetching and installing .deb packages "
-"using #{debootstrap}# or #{cdebootstrap}#, from the local media or some "
+"using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some "
 "network-based network, resulting in a standard Debian system being installed "
 "to the hard disk."
 msgstr ""
@@ -224,7 +230,7 @@ msgstr ""
 msgid ""
 "Installation will proceed in an identical fashion to the \"Regular\" "
 "installation described above, but at the actual package installation stage, "
-"instead of using #{debootstrap}# to fetch and install packages, the live "
+"instead of using /{debootstrap}/ to fetch and install packages, the live "
 "filesystem image is copied to the target. This is achieved with a special "
 "udeb called live-installer."
 msgstr ""
@@ -238,10 +244,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:26
-msgid ""
-"Note: to support both normal and live installer entries in the bootloader of "
-"the same live media, you must disable live-installer by preseeding #{live-"
-"installer/enable=false}#."
+#, no-wrap
+msgid "*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index 6276c19..f9300e0 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-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+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: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/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: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/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
@@ -201,7 +207,7 @@ msgid ""
 "distribution carried in the Debian archive may be specified by its codename "
 "here. (See {Terms}#terms for more details.) The #{--distribution}# option "
 "not only influences the source of packages within the archive, but also "
-"instructs #{live-build}# to behave as needed to build each supported "
+"instructs live-build to behave as needed to build each supported "
 "distribution. For example, to build against the *{unstable}* release, Sid, "
 "specify:"
 msgstr ""
@@ -637,8 +643,8 @@ msgstr ""
 msgid ""
 "The primary tasks available in the Debian Installer can be listed with #"
 "{tasksel --list-tasks}# in the live system. The contents of any task, "
-"including ones not included in this list, may be examined with #{tasksel --"
-"task-packages}#."
+"including the ones not included in this list, may be examined with #{tasksel "
+"--task-packages}#."
 msgstr ""
 
 #. type: Plain text
@@ -952,11 +958,11 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:294
 msgid ""
-"This will not influence the entries in /etc/apt/sources.list, but merely "
-"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
-"APT needs those indices in order to operate in the live system, so before "
-"performing #{apt-cache search}# or #{apt-get install}#, for instance, the "
-"user must #{apt-get update}# first to create those indices."
+"This will not influence the entries in #{/etc/apt/sources.list}#, but merely "
+"whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is "
+"that APT needs those indices in order to operate in the live system, so "
+"before performing #{apt-cache search}# or #{apt-get install}#, for instance, "
+"the user must #{apt-get update}# first to create those indices."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/user_customization-runtime.ssi.po b/manual/po/de/user_customization-runtime.ssi.po
index e7f1581..d5aa423 100644
--- a/manual/po/de/user_customization-runtime.ssi.po
+++ b/manual/po/de/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 11:16+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -548,14 +548,14 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-runtime.ssi:164
 msgid ""
-"Then we reboot. During the first boot the contents of /home and /var/cache/"
-"apt will be copied into the persistent volume, and from then on all changes "
-"to these directories will live in the persistent volume. Please note that "
-"any paths listed in the #{live.persist}# file cannot contain white spaces or "
-"the special \".\" and \"..\" path components. Also, neither \"/live\" (or "
-"any of its sub-directories) nor \"/\" can be made persistent using custom "
-"mounts (for the latter, use the #{full-ov}# type persistence described "
-"above)."
+"Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
+"cache/apt}# will be copied into the persistent volume, and from then on all "
+"changes to these directories will live in the persistent volume. Please note "
+"that any paths listed in the #{live.persist}# file cannot contain white "
+"spaces or the special #{.}# and #{..}# path components. Also, neither #{/"
+"live}# (or any of its sub-directories) nor #{/}# can be made persistent "
+"using custom mounts (for the latter, use the #{full-ov}# type persistence "
+"described above)."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/user_examples.ssi.po b/manual/po/de/user_examples.ssi.po
index 75705a5..3c55b17 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-02-13 14:44+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -22,26 +22,28 @@ msgid ":B~ Examples"
 msgstr ":B~ Beispiele"
 
 #. 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:16
-#: en/user_customization-binary.ssi:27 en/user_customization-contents.ssi:26
+#: 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/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
@@ -67,49 +69,52 @@ msgstr ":B~ Beispiele"
 #: 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: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:23
-#: en/user_customization-binary.ssi:33 en/user_customization-contents.ssi:31
+#: 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/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
@@ -135,25 +140,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 ""
 
@@ -165,7 +171,7 @@ msgid " # lb build\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-binary.ssi:29 en/user_examples.ssi:95
+#: en/user_customization-binary.ssi:41 en/user_examples.ssi:95
 #, no-wrap
 msgid " #!/bin/sh\n"
 msgstr ""
@@ -445,8 +451,8 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:137
 msgid ""
-"In this revision, we're going to clean up from the first build, add the #"
-"{vlc}# package to our configuration, rebuild, test and commit."
+"In this revision, we're going to clean up from the first build, add the /"
+"{vlc}/ package to our configuration, rebuild, test and commit."
 msgstr ""
 
 #. type: Plain text
@@ -467,7 +473,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:147
 msgid ""
-"Now append the #{vlc}# package to our local package list in #{config/package-"
+"Now append the /{vlc}/ package to our local package list in #{config/package-"
 "lists/my.list.chroot}#:"
 msgstr ""
 
@@ -534,8 +540,8 @@ msgstr ""
 #: en/user_examples.ssi:179
 msgid ""
 "Make a build directory and create a skeletal configuration in it built "
-"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
-"{xvnc4viewer}#, disabling recommends to make a minimal system:"
+"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
+"{xvnc4viewer}/, disabling recommends to make a minimal system:"
 msgstr ""
 
 #. type: Plain text
@@ -553,8 +559,8 @@ msgstr ""
 #: en/user_examples.ssi:191
 msgid ""
 "Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
-"the default user that will launch metacity and start xvncviewer, connecting "
-"to port #{5901}# on a server at #{192.168.1.2}#:"
+"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
+"connecting to port #{5901}# on a server at #{192.168.1.2}#:"
 msgstr ""
 
 #. type: Plain text
@@ -610,8 +616,8 @@ msgid ""
 "the tradeoffs you are making between size and functionality. In this "
 "example, we trim only so much as to make room for additional material within "
 "a 128M media size, but without doing anything to destroy integrity of the "
-"packages contained within, such as the purging of locale data via the #"
-"{localepurge}# package, or other such \"intrusive\" optimizations. Of "
+"packages contained within, such as the purging of locale data via the /"
+"{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
 "particular note, you should not use #{--bootstrap-flavour minimal}# unless "
 "you really know what you're doing, as omitting priority #{important}# "
 "packages will most likely produce a broken live system."
@@ -649,8 +655,8 @@ msgid ""
 "system. Choosing the #{minimal}# package list leaves out the large #{locales}"
 "# package and associated utilities. Dropping recommended packages with #{--"
 "apt-recommends false}# saves some additional space, at the expense of "
-"omitting some packages you might otherwise expect to be there, such as #"
-"{firmware-linux-free}# which may be needed to support certain hardware. The "
+"omitting some packages you might otherwise expect to be there, such as /"
+"{firmware-linux-free}/ which may be needed to support certain hardware. The "
 "remaining options shave off additional small amounts of space. It's up to "
 "you to decide if the functionality that is sacrificed with each optimization "
 "is worth the loss in functionality."
@@ -750,8 +756,8 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:292
 msgid ""
-"Note that we have included the #{debian-installer-launcher}# package to "
-"launch the installer from the live desktop, and have also specified the 486 "
-"flavour kernel, as it is currently necessary to make the installer and live "
-"system kernels match for the launcher to work properly."
+"Note that we have included the debian-installer-launcher package to launch "
+"the installer from the live desktop, and have also specified the 486 flavour "
+"kernel, as it is currently necessary to make the installer and live system "
+"kernels match for the launcher to work properly."
 msgstr ""
diff --git a/manual/po/de/user_installation.ssi.po b/manual/po/de/user_installation.ssi.po
index 68590fe..5cb7c21 100644
--- a/manual/po/de/user_installation.ssi.po
+++ b/manual/po/de/user_installation.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-31 16:32+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,29 +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/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 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: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/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
@@ -87,29 +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/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 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: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/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
@@ -416,8 +418,8 @@ msgstr ""
 #: en/user_installation.ssi:127
 msgid ""
 "Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
-"build #{live-boot}# for a target distribution that differs from your build "
-"system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy "
+"build live-boot for a target distribution that differs from your build "
+"system. For example, for Wheezy live images, build live-boot in a Wheezy "
 "chroot. If your target distribution happens to match your build system "
 "distribution, you may build directly on the build system using #{dpkg-"
 "buildpackage}# (provided by the /{dpkg-dev}/ package):"
diff --git a/manual/po/de/user_overview.ssi.po b/manual/po/de/user_overview.ssi.po
index 67349d8..de69ec1 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-03-19 18:09+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+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: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/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: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/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
@@ -192,15 +198,15 @@ msgstr ""
 #. type: Plain text
 #: en/user_overview.ssi:14
 msgid ""
-"Many concepts are similar to those in the debhelper Debian package tools "
+"Many concepts are similar to those in the /{debhelper}/ Debian package tools "
 "written by Joey Hess:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:16
 msgid ""
-"_* The scripts have a central location for configuring their operation. In "
-"debhelper, this is the #{debian/}# subdirectory of a package tree. For "
+"_* The scripts have a central location for configuring their operation. In /"
+"{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For "
 "example, dh_install will look, amongst others, for a file called #{debian/"
 "install}# to determine which files should exist in a particular binary "
 "package. In much the same way, live-build stores its configuration entirely "
@@ -217,7 +223,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_overview.ssi:20
 msgid ""
-"Unlike debhelper, live-build contains a tool to generate a skeleton "
+"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}"
 "#, please see {The lb config command}#lb-config."
diff --git a/manual/po/es/about_manual.ssi.po b/manual/po/es/about_manual.ssi.po
index 04b4fa0..5f64c25 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-03 19:01+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2012-03-07 22:32+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -220,10 +220,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:34
+#, fuzzy
+#| msgid ""
+#| "_* *{live-build}*: A collection of scripts used to build customized "
+#| "Debian Live systems. live-build was formerly known as live-helper, and "
+#| "even earlier known as live-package."
 msgid ""
 "_* *{live-build}*: A collection of scripts used to build customized Debian "
-"Live systems. live-build was formerly known as live-helper, and even earlier "
-"known as live-package."
+"Live systems. live-build was formerly known as /{live-helper}/, and even "
+"earlier known as /{live-package}/."
 msgstr ""
 "_* *{live-build}*: Es una colección de scripts utilizados para construir "
 "sistemas Debian Live personalizados. live-build fue conocido anteriormente "
@@ -273,8 +278,13 @@ msgstr ""
 # No se ha traducido chroot entendiendo que es nombre propio, manteniendo la minúscula deliberadamente.
 #. type: Plain text
 #: en/about_manual.ssi:44
+#, fuzzy
+#| msgid ""
+#| "_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+#| "different instances of the GNU/Linux environment on a single system "
+#| "simultaneously without rebooting."
 msgid ""
-"_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+"_* *{chroot}*: The /{chroot}/ program, #{chroot(8)}#, enables us to run "
 "different instances of the GNU/Linux environment on a single system "
 "simultaneously without rebooting."
 msgstr ""
@@ -457,12 +467,12 @@ msgstr ""
 #: 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/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/style_guide.ssi:134
+#: 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
@@ -533,12 +543,12 @@ msgstr ""
 #: 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/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/style_guide.ssi:138
+#: 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
diff --git a/manual/po/es/project_bugs.ssi.po b/manual/po/es/project_bugs.ssi.po
index c6e60bb..9ccb095 100644
--- a/manual/po/es/project_bugs.ssi.po
+++ b/manual/po/es/project_bugs.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-08 12:15+0300\n"
 "PO-Revision-Date: 2012-02-19 18:14+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -22,16 +22,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/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: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/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
@@ -39,63 +42,70 @@ 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-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:43
+#: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi: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:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 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_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:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/project_bugs.ssi:64
-#: en/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: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/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
@@ -103,49 +113,53 @@ 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-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:37
-#: en/user_customization-installer.ssi:48
+#: 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
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi: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:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 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_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:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr "}code"
 
@@ -350,8 +364,11 @@ msgstr "_* Versión de live-config en el sistema en vivo."
 
 #. type: Plain text
 #: en/project_bugs.ssi:50
+#, fuzzy
+#| msgid ""
+#| "_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system"
 msgid ""
-"_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system"
+"_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system"
 msgstr ""
 "_* Versión de #{debootstrap}# y/o #{cdebootstrap}# en el sistema anfitrión."
 
@@ -474,9 +491,16 @@ msgstr "3~ En la preinstalación (bootstrap) en tiempo de creación."
 
 #. type: Plain text
 #: en/project_bugs.ssi:82
-msgid ""
-"live-build first bootstraps a basic Debian system with #{debootstrap}# or #"
-"{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
+#, fuzzy
+#| msgid ""
+#| "live-build first bootstraps a basic Debian system with #{debootstrap}# or "
+#| "#{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
+#| "distribution it is bootstrapping, it may fail. If a bug appears here, "
+#| "check if the error is related to a specific Debian package (most likely), "
+#| "or if it is related to bootstrapping tool itself."
+msgid ""
+"live-build first bootstraps a basic Debian system with /{debootstrap}/ or /"
+"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
 "distribution it is bootstrapping, it may fail. If a bug appears here, check "
 "if the error is related to a specific Debian package (most likely), or if it "
 "is related to bootstrapping tool itself."
@@ -520,9 +544,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:90
+#, fuzzy
+#| msgid ""
+#| "If this is the case, this is not a bug in Debian Live, but rather in "
+#| "Debian - please report it against the failing package. Running #"
+#| "{debootstrap}# separately from the Live system build or running #{lb "
+#| "bootstrap --debug}# will give you more information."
 msgid ""
 "If this is the case, this is not a bug in Debian Live, but rather in Debian "
-"- please report it against the failing package. Running #{debootstrap}# "
+"- please report it against the failing package. Running /{debootstrap}/ "
 "separately from the Live system build or running #{lb bootstrap --debug}# "
 "will give you more information."
 msgstr ""
diff --git a/manual/po/es/style_guide.ssi.po b/manual/po/es/style_guide.ssi.po
index a893b5b..86919b3 100644
--- a/manual/po/es/style_guide.ssi.po
+++ b/manual/po/es/style_guide.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-31 19:15+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2012-02-11 16:42+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -22,17 +22,17 @@ msgid ":B~ Appendix"
 msgstr ":B~ Apéndice"
 
 #. 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/style_guide.ssi:134
+#: 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/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
@@ -93,17 +93,17 @@ 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/style_guide.ssi:138
+#: 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/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
@@ -832,15 +832,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/style_guide.ssi:228
-msgid "_* /{New lines}/"
+msgid "_* /{Newlines}/"
 msgstr ""
 
 #. type: Plain text
 #: en/style_guide.ssi:230
 msgid ""
-"The translated texts need to have the exact same new lines as the original "
+"The translated texts need to have the exact same newlines as the original "
 "texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
-"in the original files. These new lines often appear, for instance, in the "
+"in the original files. These newlines often appear, for instance, in the "
 "code blocks."
 msgstr ""
 
diff --git a/manual/po/es/user_basics.ssi.po b/manual/po/es/user_basics.ssi.po
index 7783e2a..163b9ff 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-01-12 08:28-0400\n"
+"POT-Creation-Date: 2012-04-08 12:15+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,16 +22,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: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/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
@@ -39,8 +42,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-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
@@ -64,39 +69,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: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/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
@@ -104,8 +113,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-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
@@ -129,25 +140,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"
 
@@ -681,16 +693,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:138
-msgid ""
-"Note: For live systems containing X.org that you want to test with #"
-"{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver "
-"package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. "
-"Otherwise, the resolution is limited to 800x600."
-msgstr ""
-"Nota: Para probar los sistemas en vivo con soporte X.org en virtualbox-ose, "
-"se puede incluir el paquete del driver de VirtualBox X.org, #{virtualbox-ose-"
-"guest-x11}#, en la configuración de live-build. De lo contrario, la "
-"resolución se limita a 800x600"
+#, fuzzy, no-wrap
+#| msgid "Note: For live systems containing X.org that you want to test with #{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. Otherwise, the resolution is limited to 800x600."
+msgid "*{Note:}* For live systems containing X.org that you want to test with #{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. Otherwise, the resolution is limited to 800x600.\n"
+msgstr "Nota: Para probar los sistemas en vivo con soporte X.org en virtualbox-ose, se puede incluir el paquete del driver de VirtualBox X.org, #{virtualbox-ose-guest-x11}#, en la configuración de live-build. De lo contrario, la resolución se limita a 800x600"
 
 #. type: Plain text
 #: en/user_basics.ssi:142
@@ -727,14 +733,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:150
-msgid ""
-"Note: if you created an ISO hybrid image with the previous example, you will "
-"need to clean up your working directory with the #{lb clean}# command (see "
-"{The lb clean command}#lb-clean):"
-msgstr ""
-"Nota: si se ha creado una imagen ISO híbrida con el ejemplo anterior, se "
-"tendrá que limpiar el directorio de trabajo con el comando #{lb clean}# (ver "
-"{El comando lb clean}#lb-clean):"
+#, fuzzy, no-wrap
+#| msgid "Note: if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):"
+msgid "*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):\n"
+msgstr "Nota: si se ha creado una imagen ISO híbrida con el ejemplo anterior, se tendrá que limpiar el directorio de trabajo con el comando #{lb clean}# (ver {El comando lb clean}#lb-clean):"
 
 #. type: Plain text
 #: en/user_basics.ssi:154 en/user_basics.ssi:220
@@ -894,12 +896,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:216
-msgid ""
-"Note: if you performed any previous examples, you will need to clean up your "
-"working directory with the #{lb clean}# command:"
-msgstr ""
-"Nota: si se ha seguido algúno de los ejemplos anteriores, se tendrá que "
-"limpiar el directorio de trabajo con el comando #{lb clean}#:"
+#, fuzzy, no-wrap
+#| msgid "Note: if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:"
+msgid "*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:\n"
+msgstr "Nota: si se ha seguido algúno de los ejemplos anteriores, se tendrá que limpiar el directorio de trabajo con el comando #{lb clean}#:"
 
 #. type: Plain text
 #: en/user_basics.ssi:224
diff --git a/manual/po/es/user_customization-binary.ssi.po b/manual/po/es/user_customization-binary.ssi.po
index 0b309e2..e06a3a5 100644
--- a/manual/po/es/user_customization-binary.ssi.po
+++ b/manual/po/es/user_customization-binary.ssi.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-25 21:42+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2012-02-24 16: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: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/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,51 +69,54 @@ 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: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: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/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,25 +140,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,7 +276,7 @@ msgid ""
 " include menu.cfg\n"
 " default vesamenu.c32\n"
 " prompt 0\n"
-" timeout 5\n"
+" timeout 50\n"
 msgstr ""
 
 #. type: Plain text
@@ -293,7 +299,7 @@ msgstr " #!/bin/sh\n"
 #. type: Plain text
 #: en/user_customization-binary.ssi:43
 #, no-wrap
-msgid " sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg\n"
+msgid " sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/es/user_customization-installer.ssi.po b/manual/po/es/user_customization-installer.ssi.po
index a33ad84..39d976e 100644
--- a/manual/po/es/user_customization-installer.ssi.po
+++ b/manual/po/es/user_customization-installer.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-08 12:15+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"
@@ -24,28 +24,30 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\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: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/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
@@ -69,21 +71,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
@@ -92,28 +95,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: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/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
@@ -137,21 +142,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
@@ -211,9 +217,15 @@ msgstr "*{Imágenes con Instalador Debian «official»}*: Esta imagen de Debian
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:16
+#, fuzzy
+#| msgid ""
+#| "On such images, Debian is installed by fetching and installing .deb "
+#| "packages using #{debootstrap}# or #{cdebootstrap}#, from the local media "
+#| "or some network-based network, resulting in a standard Debian system "
+#| "being installed to the hard disk."
 msgid ""
 "On such images, Debian is installed by fetching and installing .deb packages "
-"using #{debootstrap}# or #{cdebootstrap}#, from the local media or some "
+"using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some "
 "network-based network, resulting in a standard Debian system being installed "
 "to the hard disk."
 msgstr ""
@@ -244,10 +256,17 @@ msgstr "*{Imágenes con Instalador Debian «Live»}*: Estas imágenes de Debian
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:22
+#, fuzzy
+#| msgid ""
+#| "Installation will proceed in an identical fashion to the \"Regular\" "
+#| "installation described above, but at the actual package installation "
+#| "stage, instead of using #{debootstrap}# to fetch and install packages, "
+#| "the live filesystem image is copied to the target. This is achieved with "
+#| "a special udeb called live-installer."
 msgid ""
 "Installation will proceed in an identical fashion to the \"Regular\" "
 "installation described above, but at the actual package installation stage, "
-"instead of using #{debootstrap}# to fetch and install packages, the live "
+"instead of using /{debootstrap}/ to fetch and install packages, the live "
 "filesystem image is copied to the target. This is achieved with a special "
 "udeb called live-installer."
 msgstr ""
@@ -269,15 +288,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:26
-msgid ""
-"Note: to support both normal and live installer entries in the bootloader of "
-"the same live media, you must disable live-installer by preseeding #{live-"
-"installer/enable=false}#."
-msgstr ""
-"Nota: Para poder arrancar los dos tipos de imágenes, Regular y Live, en el "
-"mismo medio, el gestor de arranque debe poder deshabilitar live-installer. "
-"Esto se hace utilizando la variable de preconfiguración (preseed) #{live-"
-"installer/enable=false}#."
+#, fuzzy, no-wrap
+#| msgid "Note: to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#."
+msgid "*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.\n"
+msgstr "Nota: Para poder arrancar los dos tipos de imágenes, Regular y Live, en el mismo medio, el gestor de arranque debe poder deshabilitar live-installer. Esto se hace utilizando la variable de preconfiguración (preseed) #{live-installer/enable=false}#."
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:28
diff --git a/manual/po/es/user_customization-packages.ssi.po b/manual/po/es/user_customization-packages.ssi.po
index 1f4e7b9..7b9b165 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-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+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,28 +24,30 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\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: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/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
@@ -69,21 +71,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
@@ -92,28 +95,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: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/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
@@ -137,21 +142,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
@@ -222,6 +228,17 @@ msgstr "3~ Distribución, áreas de archivo y modo"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:12
+#, fuzzy
+#| msgid ""
+#| "The distribution you choose has the broadest impact on which packages are "
+#| "available to include in your live image. Specify the codename, which "
+#| "defaults to #{wheezy}# for the Wheezy version of live-build. Any current "
+#| "distribution carried in the Debian archive may be specified by its "
+#| "codename here. (See {Terms}#terms for more details.) The #{--distribution}"
+#| "# option not only influences the source of packages within the archive, "
+#| "but also instructs #{live-build}# to behave as needed to build each "
+#| "supported distribution. For example, to build against the *{unstable}* "
+#| "release, Sid, specify:"
 msgid ""
 "The distribution you choose has the broadest impact on which packages are "
 "available to include in your live image. Specify the codename, which "
@@ -229,7 +246,7 @@ msgid ""
 "distribution carried in the Debian archive may be specified by its codename "
 "here. (See {Terms}#terms for more details.) The #{--distribution}# option "
 "not only influences the source of packages within the archive, but also "
-"instructs #{live-build}# to behave as needed to build each supported "
+"instructs live-build to behave as needed to build each supported "
 "distribution. For example, to build against the *{unstable}* release, Sid, "
 "specify:"
 msgstr ""
@@ -804,11 +821,17 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:191
+#, fuzzy
+#| msgid ""
+#| "The primary tasks available in the Debian Installer can be listed with #"
+#| "{tasksel --list-tasks}# in the live system. The contents of any task, "
+#| "including ones not included in this list, may be examined with #{tasksel "
+#| "--task-packages}#."
 msgid ""
 "The primary tasks available in the Debian Installer can be listed with #"
 "{tasksel --list-tasks}# in the live system. The contents of any task, "
-"including ones not included in this list, may be examined with #{tasksel --"
-"task-packages}#."
+"including the ones not included in this list, may be examined with #{tasksel "
+"--task-packages}#."
 msgstr ""
 "Una vez ha sido arrancado el sistema en vivo puede conocerse qué tareas "
 "primarias están disponibles en el Instalador de Debian mediante la orden #"
@@ -1230,12 +1253,19 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:294
-msgid ""
-"This will not influence the entries in /etc/apt/sources.list, but merely "
-"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
-"APT needs those indices in order to operate in the live system, so before "
-"performing #{apt-cache search}# or #{apt-get install}#, for instance, the "
-"user must #{apt-get update}# first to create those indices."
+#, fuzzy
+#| msgid ""
+#| "This will not influence the entries in /etc/apt/sources.list, but merely "
+#| "whether /var/lib/apt contains the indices files or not. The tradeoff is "
+#| "that APT needs those indices in order to operate in the live system, so "
+#| "before performing #{apt-cache search}# or #{apt-get install}#, for "
+#| "instance, the user must #{apt-get update}# first to create those indices."
+msgid ""
+"This will not influence the entries in #{/etc/apt/sources.list}#, but merely "
+"whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is "
+"that APT needs those indices in order to operate in the live system, so "
+"before performing #{apt-cache search}# or #{apt-get install}#, for instance, "
+"the user must #{apt-get update}# first to create those indices."
 msgstr ""
 "Esto no modificará el comportamiento de las entradas definidas en /etc/apt/"
 "sources.list, sino que solo afecta a si exitirán o no ficheros de índice en "
diff --git a/manual/po/es/user_customization-runtime.ssi.po b/manual/po/es/user_customization-runtime.ssi.po
index e6ce50c..c8fc20f 100644
--- a/manual/po/es/user_customization-runtime.ssi.po
+++ b/manual/po/es/user_customization-runtime.ssi.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 11:16+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2012-03-24 13:18+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -670,15 +670,25 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:164
-msgid ""
-"Then we reboot. During the first boot the contents of /home and /var/cache/"
-"apt will be copied into the persistent volume, and from then on all changes "
-"to these directories will live in the persistent volume. Please note that "
-"any paths listed in the #{live.persist}# file cannot contain white spaces or "
-"the special \".\" and \"..\" path components. Also, neither \"/live\" (or "
-"any of its sub-directories) nor \"/\" can be made persistent using custom "
-"mounts (for the latter, use the #{full-ov}# type persistence described "
-"above)."
+#, fuzzy
+#| msgid ""
+#| "Then we reboot. During the first boot the contents of /home and /var/"
+#| "cache/apt will be copied into the persistent volume, and from then on all "
+#| "changes to these directories will live in the persistent volume. Please "
+#| "note that any paths listed in the #{live.persist}# file cannot contain "
+#| "white spaces or the special \".\" and \"..\" path components. Also, "
+#| "neither \"/live\" (or any of its sub-directories) nor \"/\" can be made "
+#| "persistent using custom mounts (for the latter, use the #{full-ov}# type "
+#| "persistence described above)."
+msgid ""
+"Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
+"cache/apt}# will be copied into the persistent volume, and from then on all "
+"changes to these directories will live in the persistent volume. Please note "
+"that any paths listed in the #{live.persist}# file cannot contain white "
+"spaces or the special #{.}# and #{..}# path components. Also, neither #{/"
+"live}# (or any of its sub-directories) nor #{/}# can be made persistent "
+"using custom mounts (for the latter, use the #{full-ov}# type persistence "
+"described above)."
 msgstr ""
 "Entonces reiniciamos. Durante el primer arranque los contenidos de /home y /"
 "var/cache/apt se copiarán en el volumen persistente y a partir de ese "
diff --git a/manual/po/es/user_examples.ssi.po b/manual/po/es/user_examples.ssi.po
index e8e6f1b..af5d425 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-02-13 14:44+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+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,26 +27,28 @@ msgid ":B~ Examples"
 msgstr ":B~ Ejemplos"
 
 #. 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:16
-#: en/user_customization-binary.ssi:27 en/user_customization-contents.ssi:26
+#: 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/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
@@ -72,49 +74,52 @@ msgstr ":B~ Ejemplos"
 #: 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: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:23
-#: en/user_customization-binary.ssi:33 en/user_customization-contents.ssi:31
+#: 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/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
@@ -140,25 +145,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"
 
@@ -170,7 +176,7 @@ msgid " # lb build\n"
 msgstr " # lb build\n"
 
 #. type: Plain text
-#: en/user_customization-binary.ssi:29 en/user_examples.ssi:95
+#: en/user_customization-binary.ssi:41 en/user_examples.ssi:95
 #, no-wrap
 msgid " #!/bin/sh\n"
 msgstr " #!/bin/sh\n"
@@ -521,9 +527,13 @@ msgstr "3~ Segunda revisión"
 
 #. type: Plain text
 #: en/user_examples.ssi:137
+#, fuzzy
+#| msgid ""
+#| "In this revision, we're going to clean up from the first build, add the #"
+#| "{vlc}# package to our configuration, rebuild, test and commit."
 msgid ""
-"In this revision, we're going to clean up from the first build, add the #"
-"{vlc}# package to our configuration, rebuild, test and commit."
+"In this revision, we're going to clean up from the first build, add the /"
+"{vlc}/ package to our configuration, rebuild, test and commit."
 msgstr ""
 "En esta revisión, vamos a limpiar desde la primera creación, agregar el "
 "paquete #{vlc}# a nuestra configuración, crear de nuevo, probar y enviar los "
@@ -551,8 +561,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:147
+#, fuzzy
+#| msgid ""
+#| "Now append the #{vlc}# package to our local package list in #{config/"
+#| "package-lists/my.list.chroot}#:"
 msgid ""
-"Now append the #{vlc}# package to our local package list in #{config/package-"
+"Now append the /{vlc}/ package to our local package list in #{config/package-"
 "lists/my.list.chroot}#:"
 msgstr ""
 "Añadir ahora el paquete #{vlc}# a nuestra lista de paquetes local en #"
@@ -633,10 +647,15 @@ msgstr "*{Caso Práctico:}* Crear una imagen con live-build para arrancar direct
 
 #. type: Plain text
 #: en/user_examples.ssi:179
+#, fuzzy
+#| msgid ""
+#| "Make a build directory and create a skeletal configuration in it built "
+#| "around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
+#| "{xvnc4viewer}#, disabling recommends to make a minimal system:"
 msgid ""
 "Make a build directory and create a skeletal configuration in it built "
-"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
-"{xvnc4viewer}#, disabling recommends to make a minimal system:"
+"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
+"{xvnc4viewer}/, disabling recommends to make a minimal system:"
 msgstr ""
 "Hacer un directorio de creación y crear una configuración en esqueleto según "
 "la lista estándar-x11, incluyendo #{gdm3}#, #{metacity}# y #{xvnc4viewer}#, "
@@ -655,10 +674,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:191
+#, fuzzy
+#| msgid ""
+#| "Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it "
+#| "for the default user that will launch metacity and start xvncviewer, "
+#| "connecting to port #{5901}# on a server at #{192.168.1.2}#:"
 msgid ""
 "Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
-"the default user that will launch metacity and start xvncviewer, connecting "
-"to port #{5901}# on a server at #{192.168.1.2}#:"
+"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
+"connecting to port #{5901}# on a server at #{192.168.1.2}#:"
 msgstr ""
 "Crear el directorio #{/etc/skel}# y poner un fichero #{.xsession}# "
 "personalizado para el usuario que por defecto ejecutará metacity e iniciará "
@@ -713,13 +737,25 @@ msgstr "*{Caso Práctico:}* Crear una imagen estándar quitando algunos componen
 
 #. type: Plain text
 #: en/user_examples.ssi:221
+#, fuzzy
+#| msgid ""
+#| "When optimizing an image to fit a certain media size, you need to "
+#| "understand the tradeoffs you are making between size and functionality. "
+#| "In this example, we trim only so much as to make room for additional "
+#| "material within a 128M media size, but without doing anything to destroy "
+#| "integrity of the packages contained within, such as the purging of locale "
+#| "data via the #{localepurge}# package, or other such \"intrusive\" "
+#| "optimizations. Of particular note, you should not use #{--bootstrap-"
+#| "flavour minimal}# unless you really know what you're doing, as omitting "
+#| "priority #{important}# packages will most likely produce a broken live "
+#| "system."
 msgid ""
 "When optimizing an image to fit a certain media size, you need to understand "
 "the tradeoffs you are making between size and functionality. In this "
 "example, we trim only so much as to make room for additional material within "
 "a 128M media size, but without doing anything to destroy integrity of the "
-"packages contained within, such as the purging of locale data via the #"
-"{localepurge}# package, or other such \"intrusive\" optimizations. Of "
+"packages contained within, such as the purging of locale data via the /"
+"{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
 "particular note, you should not use #{--bootstrap-flavour minimal}# unless "
 "you really know what you're doing, as omitting priority #{important}# "
 "packages will most likely produce a broken live system."
@@ -762,6 +798,21 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:240
+#, fuzzy
+#| msgid ""
+#| "The biggest space-saver here, compared to building a standard image on an "
+#| "#{i386}# architecture system, is to select only the #{486}# kernel "
+#| "flavour instead of the default #{-k \"486 686-pae\"}#. Leaving off APT's "
+#| "indices with #{--apt-indices false}# also saves a fair amount of space, "
+#| "the tradeoff being that you need to #{apt-get update}# before using apt "
+#| "in the live system. Choosing the #{minimal}# package list leaves out the "
+#| "large #{locales}# package and associated utilities. Dropping recommended "
+#| "packages with #{--apt-recommends false}# saves some additional space, at "
+#| "the expense of omitting some packages you might otherwise expect to be "
+#| "there, such as #{firmware-linux-free}# which may be needed to support "
+#| "certain hardware. The remaining options shave off additional small "
+#| "amounts of space. It's up to you to decide if the functionality that is "
+#| "sacrificed with each optimization is worth the loss in functionality."
 msgid ""
 "The biggest space-saver here, compared to building a standard image on an #"
 "{i386}# architecture system, is to select only the #{486}# kernel flavour "
@@ -771,8 +822,8 @@ msgid ""
 "system. Choosing the #{minimal}# package list leaves out the large #{locales}"
 "# package and associated utilities. Dropping recommended packages with #{--"
 "apt-recommends false}# saves some additional space, at the expense of "
-"omitting some packages you might otherwise expect to be there, such as #"
-"{firmware-linux-free}# which may be needed to support certain hardware. The "
+"omitting some packages you might otherwise expect to be there, such as /"
+"{firmware-linux-free}/ which may be needed to support certain hardware. The "
 "remaining options shave off additional small amounts of space. It's up to "
 "you to decide if the functionality that is sacrificed with each optimization "
 "is worth the loss in functionality."
@@ -902,11 +953,17 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:292
-msgid ""
-"Note that we have included the #{debian-installer-launcher}# package to "
-"launch the installer from the live desktop, and have also specified the 486 "
-"flavour kernel, as it is currently necessary to make the installer and live "
-"system kernels match for the launcher to work properly."
+#, fuzzy
+#| msgid ""
+#| "Note that we have included the #{debian-installer-launcher}# package to "
+#| "launch the installer from the live desktop, and have also specified the "
+#| "486 flavour kernel, as it is currently necessary to make the installer "
+#| "and live system kernels match for the launcher to work properly."
+msgid ""
+"Note that we have included the debian-installer-launcher package to launch "
+"the installer from the live desktop, and have also specified the 486 flavour "
+"kernel, as it is currently necessary to make the installer and live system "
+"kernels match for the launcher to work properly."
 msgstr ""
 "Tener en cuenta que se ha incluido el paquete #{debian-installer-launcher}# "
 "para lanzar el instalador desde el escritorio en vivo, y que también se ha "
diff --git a/manual/po/es/user_installation.ssi.po b/manual/po/es/user_installation.ssi.po
index 92b9bdd..b3a1668 100644
--- a/manual/po/es/user_installation.ssi.po
+++ b/manual/po/es/user_installation.ssi.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-31 16:32+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2012-02-19 21:35+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -21,29 +21,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/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 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: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/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
@@ -91,29 +92,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/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 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: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/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
@@ -448,10 +450,18 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:127
+#, fuzzy
+#| msgid ""
+#| "Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
+#| "build #{live-boot}# for a target distribution that differs from your "
+#| "build system. For example, for Wheezy live images, build #{live-boot}# in "
+#| "a Wheezy chroot. If your target distribution happens to match your build "
+#| "system distribution, you may build directly on the build system using #"
+#| "{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):"
 msgid ""
 "Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
-"build #{live-boot}# for a target distribution that differs from your build "
-"system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy "
+"build live-boot for a target distribution that differs from your build "
+"system. For example, for Wheezy live images, build live-boot in a Wheezy "
 "chroot. If your target distribution happens to match your build system "
 "distribution, you may build directly on the build system using #{dpkg-"
 "buildpackage}# (provided by the /{dpkg-dev}/ package):"
diff --git a/manual/po/es/user_overview.ssi.po b/manual/po/es/user_overview.ssi.po
index a73e8ee..244c617 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-03-19 18:09+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+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,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: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/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: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/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
@@ -204,8 +210,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:14
+#, fuzzy
+#| msgid ""
+#| "Many concepts are similar to those in the debhelper Debian package tools "
+#| "written by Joey Hess:"
 msgid ""
-"Many concepts are similar to those in the debhelper Debian package tools "
+"Many concepts are similar to those in the /{debhelper}/ Debian package tools "
 "written by Joey Hess:"
 msgstr ""
 "Muchos conceptos son similares a los del paquete de herramientas de Debian "
@@ -213,9 +223,17 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:16
+#, fuzzy
+#| msgid ""
+#| "_* The scripts have a central location for configuring their operation. "
+#| "In debhelper, this is the #{debian/}# subdirectory of a package tree. For "
+#| "example, dh_install will look, amongst others, for a file called #{debian/"
+#| "install}# to determine which files should exist in a particular binary "
+#| "package. In much the same way, live-build stores its configuration "
+#| "entirely under a #{config/}# subdirectory."
 msgid ""
-"_* The scripts have a central location for configuring their operation. In "
-"debhelper, this is the #{debian/}# subdirectory of a package tree. For "
+"_* The scripts have a central location for configuring their operation. In /"
+"{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For "
 "example, dh_install will look, amongst others, for a file called #{debian/"
 "install}# to determine which files should exist in a particular binary "
 "package. In much the same way, live-build stores its configuration entirely "
@@ -239,8 +257,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:20
+#, fuzzy
+#| 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}#, please see {The lb config command}#lb-config."
 msgid ""
-"Unlike debhelper, live-build contains a tool to generate a skeleton "
+"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}"
 "#, please see {The lb config command}#lb-config."
diff --git a/manual/po/fr/about_manual.ssi.po b/manual/po/fr/about_manual.ssi.po
index 108419c..d4a514e 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-03 19:01+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2012-03-17 19:42+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -204,10 +204,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:34
+#, fuzzy
+#| msgid ""
+#| "_* *{live-build}*: A collection of scripts used to build customized "
+#| "Debian Live systems. live-build was formerly known as live-helper, and "
+#| "even earlier known as live-package."
 msgid ""
 "_* *{live-build}*: A collection of scripts used to build customized Debian "
-"Live systems. live-build was formerly known as live-helper, and even earlier "
-"known as live-package."
+"Live systems. live-build was formerly known as /{live-helper}/, and even "
+"earlier known as /{live-package}/."
 msgstr ""
 "_* *{live-build}*: Une collection de scripts utilisés pour personnaliser les "
 "systèmes Debian Live. live-build était initialement nommé live-package, puis "
@@ -252,8 +257,13 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:44
+#, fuzzy
+#| msgid ""
+#| "_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+#| "different instances of the GNU/Linux environment on a single system "
+#| "simultaneously without rebooting."
 msgid ""
-"_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+"_* *{chroot}*: The /{chroot}/ program, #{chroot(8)}#, enables us to run "
 "different instances of the GNU/Linux environment on a single system "
 "simultaneously without rebooting."
 msgstr ""
@@ -432,12 +442,12 @@ msgstr ""
 #: 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/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/style_guide.ssi:134
+#: 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
@@ -508,12 +518,12 @@ msgstr ""
 #: 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/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/style_guide.ssi:138
+#: 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
diff --git a/manual/po/fr/project_bugs.ssi.po b/manual/po/fr/project_bugs.ssi.po
index 4d858d5..b528068 100644
--- a/manual/po/fr/project_bugs.ssi.po
+++ b/manual/po/fr/project_bugs.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-24 14:17-0400\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2012-03-17 17:43+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -18,130 +18,144 @@ 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:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 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:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/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/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:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_basics.ssi: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:43
+#: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi: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:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 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_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:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 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:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/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/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:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
-#: 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:37
-#: en/user_customization-installer.ssi:48
+#: 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
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi: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:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_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:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr "}code"
 
@@ -347,8 +361,11 @@ msgstr "_* Version de live-config sur le système live"
 
 #. type: Plain text
 #: en/project_bugs.ssi:50
+#, fuzzy
+#| msgid ""
+#| "_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system"
 msgid ""
-"_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system"
+"_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system"
 msgstr ""
 "_* Version de #{debootstrap}# et/ou #{cdebootstrap}# sur le système hôte"
 
@@ -471,9 +488,16 @@ msgstr "3~ Au moment de la construction tandis l'amorçage"
 
 #. type: Plain text
 #: en/project_bugs.ssi:82
-msgid ""
-"live-build first bootstraps a basic Debian system with #{debootstrap}# or #"
-"{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
+#, fuzzy
+#| msgid ""
+#| "live-build first bootstraps a basic Debian system with #{debootstrap}# or "
+#| "#{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
+#| "distribution it is bootstrapping, it may fail. If a bug appears here, "
+#| "check if the error is related to a specific Debian package (most likely), "
+#| "or if it is related to bootstrapping tool itself."
+msgid ""
+"live-build first bootstraps a basic Debian system with /{debootstrap}/ or /"
+"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
 "distribution it is bootstrapping, it may fail. If a bug appears here, check "
 "if the error is related to a specific Debian package (most likely), or if it "
 "is related to bootstrapping tool itself."
@@ -515,9 +539,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:90
+#, fuzzy
+#| msgid ""
+#| "If this is the case, this is not a bug in Debian Live, but rather in "
+#| "Debian - please report it against the failing package. Running #"
+#| "{debootstrap}# separately from the Live system build or running #{lb "
+#| "bootstrap --debug}# will give you more information."
 msgid ""
 "If this is the case, this is not a bug in Debian Live, but rather in Debian "
-"- please report it against the failing package. Running #{debootstrap}# "
+"- please report it against the failing package. Running /{debootstrap}/ "
 "separately from the Live system build or running #{lb bootstrap --debug}# "
 "will give you more information."
 msgstr ""
diff --git a/manual/po/fr/style_guide.ssi.po b/manual/po/fr/style_guide.ssi.po
index 9715a55..0b6a47a 100644
--- a/manual/po/fr/style_guide.ssi.po
+++ b/manual/po/fr/style_guide.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-31 19:15+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2012-02-11 16:42+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -22,17 +22,17 @@ msgid ":B~ Appendix"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi: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/style_guide.ssi:134
+#: 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/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
@@ -93,17 +93,17 @@ 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/style_guide.ssi:138
+#: 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/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
@@ -832,15 +832,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/style_guide.ssi:228
-msgid "_* /{New lines}/"
+msgid "_* /{Newlines}/"
 msgstr ""
 
 #. type: Plain text
 #: en/style_guide.ssi:230
 msgid ""
-"The translated texts need to have the exact same new lines as the original "
+"The translated texts need to have the exact same newlines as the original "
 "texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
-"in the original files. These new lines often appear, for instance, in the "
+"in the original files. These newlines often appear, for instance, in the "
 "code blocks."
 msgstr ""
 
diff --git a/manual/po/fr/user_basics.ssi.po b/manual/po/fr/user_basics.ssi.po
index aaae78f..1ac3728 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-01-12 08:28-0400\n"
+"POT-Creation-Date: 2012-04-08 12:15+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,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: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/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,8 +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-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 +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: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/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,8 +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-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
@@ -125,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"
 
@@ -674,16 +686,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:138
-msgid ""
-"Note: For live systems containing X.org that you want to test with #"
-"{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver "
-"package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. "
-"Otherwise, the resolution is limited to 800x600."
-msgstr ""
-"Remarque: Pour les systèmes live contenant X.org que vous voulez essayer "
-"avec #{virtualbox-ose}#, vous pouvez inclure le paquet des pilotes "
-"VirtualBox X.org, #{virtualbox-ose-guest-x11}#, dans votre configuration de "
-"live-build. Sinon, la résolution est limitée à 800x600."
+#, fuzzy, no-wrap
+#| msgid "Note: For live systems containing X.org that you want to test with #{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. Otherwise, the resolution is limited to 800x600."
+msgid "*{Note:}* For live systems containing X.org that you want to test with #{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. Otherwise, the resolution is limited to 800x600.\n"
+msgstr "Remarque: Pour les systèmes live contenant X.org que vous voulez essayer avec #{virtualbox-ose}#, vous pouvez inclure le paquet des pilotes VirtualBox X.org, #{virtualbox-ose-guest-x11}#, dans votre configuration de live-build. Sinon, la résolution est limitée à 800x600."
 
 #. type: Plain text
 #: en/user_basics.ssi:142
@@ -720,14 +726,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:150
-msgid ""
-"Note: if you created an ISO hybrid image with the previous example, you will "
-"need to clean up your working directory with the #{lb clean}# command (see "
-"{The lb clean command}#lb-clean):"
-msgstr ""
-"Remarque: si vous avez créé une image ISO hybride avec l'exemple précédent, "
-"vous devrez nettoyer votre répertoire de travail avec la commande #{lb clean}"
-"# (voir {La commande lb clean}#lb-clean):"
+#, fuzzy, no-wrap
+#| msgid "Note: if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):"
+msgid "*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):\n"
+msgstr "Remarque: si vous avez créé une image ISO hybride avec l'exemple précédent, vous devrez nettoyer votre répertoire de travail avec la commande #{lb clean}# (voir {La commande lb clean}#lb-clean):"
 
 #. type: Plain text
 #: en/user_basics.ssi:154 en/user_basics.ssi:220
@@ -889,12 +891,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:216
-msgid ""
-"Note: if you performed any previous examples, you will need to clean up your "
-"working directory with the #{lb clean}# command:"
-msgstr ""
-"Remarque: Si vous avez réalisé tous les exemples précédents, vous aurez "
-"besoin de nettoyer votre répertoire de travail avec la commande #{lb clean}#:"
+#, fuzzy, no-wrap
+#| msgid "Note: if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:"
+msgid "*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:\n"
+msgstr "Remarque: Si vous avez réalisé tous les exemples précédents, vous aurez besoin de nettoyer votre répertoire de travail avec la commande #{lb clean}#:"
 
 #. type: Plain text
 #: en/user_basics.ssi:224
diff --git a/manual/po/fr/user_customization-binary.ssi.po b/manual/po/fr/user_customization-binary.ssi.po
index 558ba75..80559e8 100644
--- a/manual/po/fr/user_customization-binary.ssi.po
+++ b/manual/po/fr/user_customization-binary.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-25 21:42+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2012-03-17 17:01+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: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/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,51 +65,54 @@ 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: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: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/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,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"
 
@@ -265,7 +271,7 @@ msgid ""
 " include menu.cfg\n"
 " default vesamenu.c32\n"
 " prompt 0\n"
-" timeout 5\n"
+" timeout 50\n"
 msgstr ""
 
 #. type: Plain text
@@ -288,7 +294,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-binary.ssi:43
 #, no-wrap
-msgid " sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg\n"
+msgid " sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/fr/user_customization-installer.ssi.po b/manual/po/fr/user_customization-installer.ssi.po
index 57db8fd..677127a 100644
--- a/manual/po/fr/user_customization-installer.ssi.po
+++ b/manual/po/fr/user_customization-installer.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-08 12:15+0300\n"
 "PO-Revision-Date: 2012-03-19 21:01+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -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: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/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: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/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
@@ -205,9 +211,15 @@ msgstr "*{Installateur Debian «Régulière»}*: C'est une image de Debian Live
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:16
+#, fuzzy
+#| msgid ""
+#| "On such images, Debian is installed by fetching and installing .deb "
+#| "packages using #{debootstrap}# or #{cdebootstrap}#, from the local media "
+#| "or some network-based network, resulting in a standard Debian system "
+#| "being installed to the hard disk."
 msgid ""
 "On such images, Debian is installed by fetching and installing .deb packages "
-"using #{debootstrap}# or #{cdebootstrap}#, from the local media or some "
+"using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some "
 "network-based network, resulting in a standard Debian system being installed "
 "to the hard disk."
 msgstr ""
@@ -238,10 +250,17 @@ msgstr "*{Installateur Debian \"Live\" }*: C'est une image de Debian Live avec u
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:22
+#, fuzzy
+#| msgid ""
+#| "Installation will proceed in an identical fashion to the \"Regular\" "
+#| "installation described above, but at the actual package installation "
+#| "stage, instead of using #{debootstrap}# to fetch and install packages, "
+#| "the live filesystem image is copied to the target. This is achieved with "
+#| "a special udeb called live-installer."
 msgid ""
 "Installation will proceed in an identical fashion to the \"Regular\" "
 "installation described above, but at the actual package installation stage, "
-"instead of using #{debootstrap}# to fetch and install packages, the live "
+"instead of using /{debootstrap}/ to fetch and install packages, the live "
 "filesystem image is copied to the target. This is achieved with a special "
 "udeb called live-installer."
 msgstr ""
@@ -263,14 +282,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:26
-msgid ""
-"Note: to support both normal and live installer entries in the bootloader of "
-"the same live media, you must disable live-installer by preseeding #{live-"
-"installer/enable=false}#."
-msgstr ""
-"Remarque: Pour soutenir les deux options: installateur normal et live dans "
-"le chargeur d'amorçage du même support live, vous devez désactiver «live-"
-"installer» en utilisant la préconfiguration #{live-installer/enable=false}#."
+#, fuzzy, no-wrap
+#| msgid "Note: to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#."
+msgid "*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.\n"
+msgstr "Remarque: Pour soutenir les deux options: installateur normal et live dans le chargeur d'amorçage du même support live, vous devez désactiver «live-installer» en utilisant la préconfiguration #{live-installer/enable=false}#."
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:28
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index 3a07cbc..014e880 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-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+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,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: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/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: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/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
@@ -215,6 +221,17 @@ msgstr "3~ Distribution, archive areas et mode"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:12
+#, fuzzy
+#| msgid ""
+#| "The distribution you choose has the broadest impact on which packages are "
+#| "available to include in your live image. Specify the codename, which "
+#| "defaults to #{wheezy}# for the Wheezy version of live-build. Any current "
+#| "distribution carried in the Debian archive may be specified by its "
+#| "codename here. (See {Terms}#terms for more details.) The #{--distribution}"
+#| "# option not only influences the source of packages within the archive, "
+#| "but also instructs #{live-build}# to behave as needed to build each "
+#| "supported distribution. For example, to build against the *{unstable}* "
+#| "release, Sid, specify:"
 msgid ""
 "The distribution you choose has the broadest impact on which packages are "
 "available to include in your live image. Specify the codename, which "
@@ -222,7 +239,7 @@ msgid ""
 "distribution carried in the Debian archive may be specified by its codename "
 "here. (See {Terms}#terms for more details.) The #{--distribution}# option "
 "not only influences the source of packages within the archive, but also "
-"instructs #{live-build}# to behave as needed to build each supported "
+"instructs live-build to behave as needed to build each supported "
 "distribution. For example, to build against the *{unstable}* release, Sid, "
 "specify:"
 msgstr ""
@@ -788,11 +805,17 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:191
+#, fuzzy
+#| msgid ""
+#| "The primary tasks available in the Debian Installer can be listed with #"
+#| "{tasksel --list-tasks}# in the live system. The contents of any task, "
+#| "including ones not included in this list, may be examined with #{tasksel "
+#| "--task-packages}#."
 msgid ""
 "The primary tasks available in the Debian Installer can be listed with #"
 "{tasksel --list-tasks}# in the live system. The contents of any task, "
-"including ones not included in this list, may be examined with #{tasksel --"
-"task-packages}#."
+"including the ones not included in this list, may be examined with #{tasksel "
+"--task-packages}#."
 msgstr ""
 "Les tâches principales disponibles dans l'installateur Debian peuvent être "
 "listés avec #{tasksel --list-tasks}# dans le système live. Le contenu de "
@@ -1211,12 +1234,19 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:294
-msgid ""
-"This will not influence the entries in /etc/apt/sources.list, but merely "
-"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
-"APT needs those indices in order to operate in the live system, so before "
-"performing #{apt-cache search}# or #{apt-get install}#, for instance, the "
-"user must #{apt-get update}# first to create those indices."
+#, fuzzy
+#| msgid ""
+#| "This will not influence the entries in /etc/apt/sources.list, but merely "
+#| "whether /var/lib/apt contains the indices files or not. The tradeoff is "
+#| "that APT needs those indices in order to operate in the live system, so "
+#| "before performing #{apt-cache search}# or #{apt-get install}#, for "
+#| "instance, the user must #{apt-get update}# first to create those indices."
+msgid ""
+"This will not influence the entries in #{/etc/apt/sources.list}#, but merely "
+"whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is "
+"that APT needs those indices in order to operate in the live system, so "
+"before performing #{apt-cache search}# or #{apt-get install}#, for instance, "
+"the user must #{apt-get update}# first to create those indices."
 msgstr ""
 "Cela ne influencera les entrées dans /etc/apt/sources.list, mais simplement "
 "de savoir si /var/lib/apt contient les fichiers indices ou non. La "
diff --git a/manual/po/fr/user_customization-runtime.ssi.po b/manual/po/fr/user_customization-runtime.ssi.po
index 02197a1..4afbf1d 100644
--- a/manual/po/fr/user_customization-runtime.ssi.po
+++ b/manual/po/fr/user_customization-runtime.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 11:16+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2012-03-24 17:38+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -664,15 +664,25 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:164
-msgid ""
-"Then we reboot. During the first boot the contents of /home and /var/cache/"
-"apt will be copied into the persistent volume, and from then on all changes "
-"to these directories will live in the persistent volume. Please note that "
-"any paths listed in the #{live.persist}# file cannot contain white spaces or "
-"the special \".\" and \"..\" path components. Also, neither \"/live\" (or "
-"any of its sub-directories) nor \"/\" can be made persistent using custom "
-"mounts (for the latter, use the #{full-ov}# type persistence described "
-"above)."
+#, fuzzy
+#| msgid ""
+#| "Then we reboot. During the first boot the contents of /home and /var/"
+#| "cache/apt will be copied into the persistent volume, and from then on all "
+#| "changes to these directories will live in the persistent volume. Please "
+#| "note that any paths listed in the #{live.persist}# file cannot contain "
+#| "white spaces or the special \".\" and \"..\" path components. Also, "
+#| "neither \"/live\" (or any of its sub-directories) nor \"/\" can be made "
+#| "persistent using custom mounts (for the latter, use the #{full-ov}# type "
+#| "persistence described above)."
+msgid ""
+"Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
+"cache/apt}# will be copied into the persistent volume, and from then on all "
+"changes to these directories will live in the persistent volume. Please note "
+"that any paths listed in the #{live.persist}# file cannot contain white "
+"spaces or the special #{.}# and #{..}# path components. Also, neither #{/"
+"live}# (or any of its sub-directories) nor #{/}# can be made persistent "
+"using custom mounts (for the latter, use the #{full-ov}# type persistence "
+"described above)."
 msgstr ""
 "Alors nous redémarrons. Lors du premier démarrage les contenus du /home et /"
 "var/cache/apt seront copiés dans le volume persistant, et à partir de ce "
diff --git a/manual/po/fr/user_examples.ssi.po b/manual/po/fr/user_examples.ssi.po
index c733337..6df08e8 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-02-13 14:44+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+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,26 +23,28 @@ msgid ":B~ Examples"
 msgstr ":B~ Exemples"
 
 #. 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:16
-#: en/user_customization-binary.ssi:27 en/user_customization-contents.ssi:26
+#: 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/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
@@ -68,49 +70,52 @@ msgstr ":B~ Exemples"
 #: 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: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:23
-#: en/user_customization-binary.ssi:33 en/user_customization-contents.ssi:31
+#: 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/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
@@ -136,25 +141,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"
 
@@ -166,7 +172,7 @@ msgid " # lb build\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-binary.ssi:29 en/user_examples.ssi:95
+#: en/user_customization-binary.ssi:41 en/user_examples.ssi:95
 #, no-wrap
 msgid " #!/bin/sh\n"
 msgstr ""
@@ -516,9 +522,13 @@ msgstr "3~ Deuxième révision"
 
 #. type: Plain text
 #: en/user_examples.ssi:137
+#, fuzzy
+#| msgid ""
+#| "In this revision, we're going to clean up from the first build, add the #"
+#| "{vlc}# package to our configuration, rebuild, test and commit."
 msgid ""
-"In this revision, we're going to clean up from the first build, add the #"
-"{vlc}# package to our configuration, rebuild, test and commit."
+"In this revision, we're going to clean up from the first build, add the /"
+"{vlc}/ package to our configuration, rebuild, test and commit."
 msgstr ""
 "Dans cette révision, nous allons nettoyer à partir de la première "
 "construction, ajouter le paquet #{vlc}# à notre configuration, reconstruire, "
@@ -546,8 +556,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:147
+#, fuzzy
+#| msgid ""
+#| "Now append the #{vlc}# package to our local package list in #{config/"
+#| "package-lists/my.list.chroot}#:"
 msgid ""
-"Now append the #{vlc}# package to our local package list in #{config/package-"
+"Now append the /{vlc}/ package to our local package list in #{config/package-"
 "lists/my.list.chroot}#:"
 msgstr ""
 "Maintenant ajouter le paquet #{vlc}# à votre liste de paquets local dans #"
@@ -627,10 +641,15 @@ msgstr "*{Cas d'utilisation:}* Créer une image avec live-build pour démarrer d
 
 #. type: Plain text
 #: en/user_examples.ssi:179
+#, fuzzy
+#| msgid ""
+#| "Make a build directory and create a skeletal configuration in it built "
+#| "around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
+#| "{xvnc4viewer}#, disabling recommends to make a minimal system:"
 msgid ""
 "Make a build directory and create a skeletal configuration in it built "
-"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
-"{xvnc4viewer}#, disabling recommends to make a minimal system:"
+"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
+"{xvnc4viewer}/, disabling recommends to make a minimal system:"
 msgstr ""
 "Faire un répertoire de construction et créer une configuration du squelette "
 "construit autour de la liste standard x11, avec #{gdm3}#, #{metacity}# et #"
@@ -649,10 +668,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:191
+#, fuzzy
+#| msgid ""
+#| "Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it "
+#| "for the default user that will launch metacity and start xvncviewer, "
+#| "connecting to port #{5901}# on a server at #{192.168.1.2}#:"
 msgid ""
 "Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
-"the default user that will launch metacity and start xvncviewer, connecting "
-"to port #{5901}# on a server at #{192.168.1.2}#:"
+"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
+"connecting to port #{5901}# on a server at #{192.168.1.2}#:"
 msgstr ""
 "Créez le répertoire #{/etc/skel}# avec une #{.xsession}# personnalisée pour "
 "l'utilisateur par défaut qui va lancer metacity et commencer xvncviewer, en "
@@ -706,13 +730,25 @@ msgstr "*{Cas d'utilisation:}* Créer une image standard avec certains composant
 
 #. type: Plain text
 #: en/user_examples.ssi:221
+#, fuzzy
+#| msgid ""
+#| "When optimizing an image to fit a certain media size, you need to "
+#| "understand the tradeoffs you are making between size and functionality. "
+#| "In this example, we trim only so much as to make room for additional "
+#| "material within a 128M media size, but without doing anything to destroy "
+#| "integrity of the packages contained within, such as the purging of locale "
+#| "data via the #{localepurge}# package, or other such \"intrusive\" "
+#| "optimizations. Of particular note, you should not use #{--bootstrap-"
+#| "flavour minimal}# unless you really know what you're doing, as omitting "
+#| "priority #{important}# packages will most likely produce a broken live "
+#| "system."
 msgid ""
 "When optimizing an image to fit a certain media size, you need to understand "
 "the tradeoffs you are making between size and functionality. In this "
 "example, we trim only so much as to make room for additional material within "
 "a 128M media size, but without doing anything to destroy integrity of the "
-"packages contained within, such as the purging of locale data via the #"
-"{localepurge}# package, or other such \"intrusive\" optimizations. Of "
+"packages contained within, such as the purging of locale data via the /"
+"{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
 "particular note, you should not use #{--bootstrap-flavour minimal}# unless "
 "you really know what you're doing, as omitting priority #{important}# "
 "packages will most likely produce a broken live system."
@@ -755,6 +791,21 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:240
+#, fuzzy
+#| msgid ""
+#| "The biggest space-saver here, compared to building a standard image on an "
+#| "#{i386}# architecture system, is to select only the #{486}# kernel "
+#| "flavour instead of the default #{-k \"486 686-pae\"}#. Leaving off APT's "
+#| "indices with #{--apt-indices false}# also saves a fair amount of space, "
+#| "the tradeoff being that you need to #{apt-get update}# before using apt "
+#| "in the live system. Choosing the #{minimal}# package list leaves out the "
+#| "large #{locales}# package and associated utilities. Dropping recommended "
+#| "packages with #{--apt-recommends false}# saves some additional space, at "
+#| "the expense of omitting some packages you might otherwise expect to be "
+#| "there, such as #{firmware-linux-free}# which may be needed to support "
+#| "certain hardware. The remaining options shave off additional small "
+#| "amounts of space. It's up to you to decide if the functionality that is "
+#| "sacrificed with each optimization is worth the loss in functionality."
 msgid ""
 "The biggest space-saver here, compared to building a standard image on an #"
 "{i386}# architecture system, is to select only the #{486}# kernel flavour "
@@ -764,8 +815,8 @@ msgid ""
 "system. Choosing the #{minimal}# package list leaves out the large #{locales}"
 "# package and associated utilities. Dropping recommended packages with #{--"
 "apt-recommends false}# saves some additional space, at the expense of "
-"omitting some packages you might otherwise expect to be there, such as #"
-"{firmware-linux-free}# which may be needed to support certain hardware. The "
+"omitting some packages you might otherwise expect to be there, such as /"
+"{firmware-linux-free}/ which may be needed to support certain hardware. The "
 "remaining options shave off additional small amounts of space. It's up to "
 "you to decide if the functionality that is sacrificed with each optimization "
 "is worth the loss in functionality."
@@ -897,11 +948,17 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:292
-msgid ""
-"Note that we have included the #{debian-installer-launcher}# package to "
-"launch the installer from the live desktop, and have also specified the 486 "
-"flavour kernel, as it is currently necessary to make the installer and live "
-"system kernels match for the launcher to work properly."
+#, fuzzy
+#| msgid ""
+#| "Note that we have included the #{debian-installer-launcher}# package to "
+#| "launch the installer from the live desktop, and have also specified the "
+#| "486 flavour kernel, as it is currently necessary to make the installer "
+#| "and live system kernels match for the launcher to work properly."
+msgid ""
+"Note that we have included the debian-installer-launcher package to launch "
+"the installer from the live desktop, and have also specified the 486 flavour "
+"kernel, as it is currently necessary to make the installer and live system "
+"kernels match for the launcher to work properly."
 msgstr ""
 "Notez que nous avons inclus le paquet #{debian-installer-launcher}# pour "
 "lancer l'installateur à partir du bureau live, nous avons également précisé "
diff --git a/manual/po/fr/user_installation.ssi.po b/manual/po/fr/user_installation.ssi.po
index dc97c48..c358d6c 100644
--- a/manual/po/fr/user_installation.ssi.po
+++ b/manual/po/fr/user_installation.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-31 16:32+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2012-03-17 20:00+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -18,29 +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/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 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: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/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
@@ -88,29 +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/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 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: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/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
@@ -445,10 +447,18 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:127
+#, fuzzy
+#| msgid ""
+#| "Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
+#| "build #{live-boot}# for a target distribution that differs from your "
+#| "build system. For example, for Wheezy live images, build #{live-boot}# in "
+#| "a Wheezy chroot. If your target distribution happens to match your build "
+#| "system distribution, you may build directly on the build system using #"
+#| "{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):"
 msgid ""
 "Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
-"build #{live-boot}# for a target distribution that differs from your build "
-"system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy "
+"build live-boot for a target distribution that differs from your build "
+"system. For example, for Wheezy live images, build live-boot in a Wheezy "
 "chroot. If your target distribution happens to match your build system "
 "distribution, you may build directly on the build system using #{dpkg-"
 "buildpackage}# (provided by the /{dpkg-dev}/ package):"
diff --git a/manual/po/fr/user_overview.ssi.po b/manual/po/fr/user_overview.ssi.po
index 5298f33..bea4ac6 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-03-19 18:09+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+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,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: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/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: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/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
@@ -199,8 +205,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:14
+#, fuzzy
+#| msgid ""
+#| "Many concepts are similar to those in the debhelper Debian package tools "
+#| "written by Joey Hess:"
 msgid ""
-"Many concepts are similar to those in the debhelper Debian package tools "
+"Many concepts are similar to those in the /{debhelper}/ Debian package tools "
 "written by Joey Hess:"
 msgstr ""
 "Plusieurs concepts sont similaires à celles ceux dans le paquet Debian "
@@ -208,9 +218,17 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:16
+#, fuzzy
+#| msgid ""
+#| "_* The scripts have a central location for configuring their operation. "
+#| "In debhelper, this is the #{debian/}# subdirectory of a package tree. For "
+#| "example, dh_install will look, amongst others, for a file called #{debian/"
+#| "install}# to determine which files should exist in a particular binary "
+#| "package. In much the same way, live-build stores its configuration "
+#| "entirely under a #{config/}# subdirectory."
 msgid ""
-"_* The scripts have a central location for configuring their operation. In "
-"debhelper, this is the #{debian/}# subdirectory of a package tree. For "
+"_* The scripts have a central location for configuring their operation. In /"
+"{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For "
 "example, dh_install will look, amongst others, for a file called #{debian/"
 "install}# to determine which files should exist in a particular binary "
 "package. In much the same way, live-build stores its configuration entirely "
@@ -234,8 +252,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:20
+#, fuzzy
+#| 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}#, please see {The lb config command}#lb-config."
 msgid ""
-"Unlike debhelper, live-build contains a tool to generate a skeleton "
+"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}"
 "#, please see {The lb config command}#lb-config."
diff --git a/manual/po/it/about_manual.ssi.po b/manual/po/it/about_manual.ssi.po
index 847808b..d63a309 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-03 19:01+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+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"
@@ -178,10 +178,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:34
+#, fuzzy
+#| msgid ""
+#| "_* *{live-build}*: A collection of scripts used to build customized "
+#| "Debian Live systems. live-build was formerly known as live-helper, and "
+#| "even earlier known as live-package."
 msgid ""
 "_* *{live-build}*: A collection of scripts used to build customized Debian "
-"Live systems. live-build was formerly known as live-helper, and even earlier "
-"known as live-package."
+"Live systems. live-build was formerly known as /{live-helper}/, and even "
+"earlier known as /{live-package}/."
 msgstr ""
 "_* *{live-build}*: Una raccolta di script usati per creare sistemi Debian "
 "Live personalizzati. live-build era conosciuto come live-helper, ed ancora "
@@ -226,8 +231,13 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:44
+#, fuzzy
+#| msgid ""
+#| "_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+#| "different instances of the GNU/Linux environment on a single system "
+#| "simultaneously without rebooting."
 msgid ""
-"_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+"_* *{chroot}*: The /{chroot}/ program, #{chroot(8)}#, enables us to run "
 "different instances of the GNU/Linux environment on a single system "
 "simultaneously without rebooting."
 msgstr ""
@@ -411,12 +421,12 @@ msgstr ""
 #: 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/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/style_guide.ssi:134
+#: 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
@@ -487,12 +497,12 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
 #: 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/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/style_guide.ssi:138
+#: 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
diff --git a/manual/po/it/project_bugs.ssi.po b/manual/po/it/project_bugs.ssi.po
index b36b8de..3feda06 100644
--- a/manual/po/it/project_bugs.ssi.po
+++ b/manual/po/it/project_bugs.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-24 14:17-0400\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2011-03-11 10:40+0100\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -18,130 +18,144 @@ 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:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 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:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/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/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:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_basics.ssi: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:43
+#: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi: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:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 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_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:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 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:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/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/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:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
-#: 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:37
-#: en/user_customization-installer.ssi:48
+#: 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
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi: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:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_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:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr "}code"
 
@@ -345,8 +359,11 @@ msgstr "_* Versione di live-config sul sistema live"
 
 #. type: Plain text
 #: en/project_bugs.ssi:50
+#, fuzzy
+#| msgid ""
+#| "_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system"
 msgid ""
-"_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system"
+"_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system"
 msgstr ""
 "_* Versione di #{debootstrap}# o #{cdebootstrap}# sul sistema ospitante"
 
@@ -467,9 +484,16 @@ msgstr "3~ Durante la compilazione mentre esegue il bootstrap"
 
 #. type: Plain text
 #: en/project_bugs.ssi:82
-msgid ""
-"live-build first bootstraps a basic Debian system with #{debootstrap}# or #"
-"{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
+#, fuzzy
+#| msgid ""
+#| "live-build first bootstraps a basic Debian system with #{debootstrap}# or "
+#| "#{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
+#| "distribution it is bootstrapping, it may fail. If a bug appears here, "
+#| "check if the error is related to a specific Debian package (most likely), "
+#| "or if it is related to bootstrapping tool itself."
+msgid ""
+"live-build first bootstraps a basic Debian system with /{debootstrap}/ or /"
+"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
 "distribution it is bootstrapping, it may fail. If a bug appears here, check "
 "if the error is related to a specific Debian package (most likely), or if it "
 "is related to bootstrapping tool itself."
@@ -512,9 +536,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:90
+#, fuzzy
+#| msgid ""
+#| "If this is the case, this is not a bug in Debian Live, but rather in "
+#| "Debian - please report it against the failing package. Running #"
+#| "{debootstrap}# separately from the Live system build or running #{lb "
+#| "bootstrap --debug}# will give you more information."
 msgid ""
 "If this is the case, this is not a bug in Debian Live, but rather in Debian "
-"- please report it against the failing package. Running #{debootstrap}# "
+"- please report it against the failing package. Running /{debootstrap}/ "
 "separately from the Live system build or running #{lb bootstrap --debug}# "
 "will give you more information."
 msgstr ""
diff --git a/manual/po/it/style_guide.ssi.po b/manual/po/it/style_guide.ssi.po
index cf48ab5..18108a5 100644
--- a/manual/po/it/style_guide.ssi.po
+++ b/manual/po/it/style_guide.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-31 19:15+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2012-02-11 16:42+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -22,17 +22,17 @@ msgid ":B~ Appendix"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi: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/style_guide.ssi:134
+#: 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/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
@@ -93,17 +93,17 @@ 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/style_guide.ssi:138
+#: 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/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
@@ -832,15 +832,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/style_guide.ssi:228
-msgid "_* /{New lines}/"
+msgid "_* /{Newlines}/"
 msgstr ""
 
 #. type: Plain text
 #: en/style_guide.ssi:230
 msgid ""
-"The translated texts need to have the exact same new lines as the original "
+"The translated texts need to have the exact same newlines as the original "
 "texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
-"in the original files. These new lines often appear, for instance, in the "
+"in the original files. These newlines often appear, for instance, in the "
 "code blocks."
 msgstr ""
 
diff --git a/manual/po/it/user_basics.ssi.po b/manual/po/it/user_basics.ssi.po
index 90ae894..25bc37e 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-01-12 08:28-0400\n"
+"POT-Creation-Date: 2012-04-08 12:15+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,16 +19,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: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/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
@@ -36,8 +39,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-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 +66,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: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/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,8 +110,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-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 +137,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"
 
@@ -664,16 +676,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:138
-msgid ""
-"Note: For live systems containing X.org that you want to test with #"
-"{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver "
-"package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. "
-"Otherwise, the resolution is limited to 800x600."
-msgstr ""
-"Nota: per sistemi live contenenti X.org che si vogliono provare con #"
-"{virtualbox-ose}#, si può voler includere il pacchetto dei driver per X.org "
-"di VirtualBox, #{virtualbox-ose-guest-x11}#, nella configurazione di live-"
-"build. In caso contrario la risoluzione è limitata a 800x600."
+#, fuzzy, no-wrap
+#| msgid "Note: For live systems containing X.org that you want to test with #{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. Otherwise, the resolution is limited to 800x600."
+msgid "*{Note:}* For live systems containing X.org that you want to test with #{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. Otherwise, the resolution is limited to 800x600.\n"
+msgstr "Nota: per sistemi live contenenti X.org che si vogliono provare con #{virtualbox-ose}#, si può voler includere il pacchetto dei driver per X.org di VirtualBox, #{virtualbox-ose-guest-x11}#, nella configurazione di live-build. In caso contrario la risoluzione è limitata a 800x600."
 
 #. type: Plain text
 #: en/user_basics.ssi:142
@@ -710,14 +716,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:150
-msgid ""
-"Note: if you created an ISO hybrid image with the previous example, you will "
-"need to clean up your working directory with the #{lb clean}# command (see "
-"{The lb clean command}#lb-clean):"
-msgstr ""
-"Nota: se si è creata un'immagine ISO ibrida con gli esempi precedenti, "
-"occorre pulire la directory di lavoro con il comando #{lb clean}# (vedere "
-"{Il comando lb clean}#lb-clean):"
+#, fuzzy, no-wrap
+#| msgid "Note: if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):"
+msgid "*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):\n"
+msgstr "Nota: se si è creata un'immagine ISO ibrida con gli esempi precedenti, occorre pulire la directory di lavoro con il comando #{lb clean}# (vedere {Il comando lb clean}#lb-clean):"
 
 #. type: Plain text
 #: en/user_basics.ssi:154 en/user_basics.ssi:220
@@ -877,12 +879,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:216
-msgid ""
-"Note: if you performed any previous examples, you will need to clean up your "
-"working directory with the #{lb clean}# command:"
-msgstr ""
-"Nota: se qualcuno tra gli esempi precedenti è stato seguito, bisogna pulire "
-"la directory di lavoro con il comando #{lb clean}#:"
+#, fuzzy, no-wrap
+#| msgid "Note: if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:"
+msgid "*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:\n"
+msgstr "Nota: se qualcuno tra gli esempi precedenti è stato seguito, bisogna pulire la directory di lavoro con il comando #{lb clean}#:"
 
 #. type: Plain text
 #: en/user_basics.ssi:224
diff --git a/manual/po/it/user_customization-binary.ssi.po b/manual/po/it/user_customization-binary.ssi.po
index 4640784..b9e447e 100644
--- a/manual/po/it/user_customization-binary.ssi.po
+++ b/manual/po/it/user_customization-binary.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-25 21:42+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2011-03-11 10:57+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: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/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,51 +65,54 @@ 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: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: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/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,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"
 
@@ -240,7 +246,7 @@ msgid ""
 " include menu.cfg\n"
 " default vesamenu.c32\n"
 " prompt 0\n"
-" timeout 5\n"
+" timeout 50\n"
 msgstr ""
 
 #. type: Plain text
@@ -260,7 +266,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-binary.ssi:43
 #, no-wrap
-msgid " sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg\n"
+msgid " sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/it/user_customization-installer.ssi.po b/manual/po/it/user_customization-installer.ssi.po
index c3b3a6a..649cb39 100644
--- a/manual/po/it/user_customization-installer.ssi.po
+++ b/manual/po/it/user_customization-installer.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2011-12-06 00:05+0100\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -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: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/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: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/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
@@ -205,9 +211,15 @@ msgstr "*{Installatore Debian \"normale\"}*: un'immagine Debian Live con un kern
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:16
+#, fuzzy
+#| msgid ""
+#| "On such images, Debian is installed by fetching and installing .deb "
+#| "packages using #{debootstrap}# or #{cdebootstrap}#, from the local media "
+#| "or some network-based network, resulting in a standard Debian system "
+#| "being installed to the hard disk."
 msgid ""
 "On such images, Debian is installed by fetching and installing .deb packages "
-"using #{debootstrap}# or #{cdebootstrap}#, from the local media or some "
+"using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some "
 "network-based network, resulting in a standard Debian system being installed "
 "to the hard disk."
 msgstr ""
@@ -237,10 +249,17 @@ msgstr "*{Installatore Debian \"live\"}*: un'immagine Debian Live con un kernel
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:22
+#, fuzzy
+#| msgid ""
+#| "Installation will proceed in an identical fashion to the \"Regular\" "
+#| "installation described above, but at the actual package installation "
+#| "stage, instead of using #{debootstrap}# to fetch and install packages, "
+#| "the live filesystem image is copied to the target. This is achieved with "
+#| "a special udeb called live-installer."
 msgid ""
 "Installation will proceed in an identical fashion to the \"Regular\" "
 "installation described above, but at the actual package installation stage, "
-"instead of using #{debootstrap}# to fetch and install packages, the live "
+"instead of using /{debootstrap}/ to fetch and install packages, the live "
 "filesystem image is copied to the target. This is achieved with a special "
 "udeb called live-installer."
 msgstr ""
@@ -261,14 +280,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:26
-msgid ""
-"Note: to support both normal and live installer entries in the bootloader of "
-"the same live media, you must disable live-installer by preseeding #{live-"
-"installer/enable=false}#."
-msgstr ""
-"Nota: per supportare nel bootloader sia la voce normale che quella live "
-"dell'installatore sullo stesso supporto si deve disabilitare live-installer "
-"preconfigurando #{live-installer/enable=false}#."
+#, fuzzy, no-wrap
+#| msgid "Note: to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#."
+msgid "*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.\n"
+msgstr "Nota: per supportare nel bootloader sia la voce normale che quella live dell'installatore sullo stesso supporto si deve disabilitare live-installer preconfigurando #{live-installer/enable=false}#."
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:28
diff --git a/manual/po/it/user_customization-packages.ssi.po b/manual/po/it/user_customization-packages.ssi.po
index a0686f7..1beb49f 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-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+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,28 +19,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: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/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
@@ -64,21 +66,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
@@ -87,28 +90,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: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/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
@@ -132,21 +137,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
@@ -215,6 +221,17 @@ msgstr "3~ Distribuzione, le aree di archivio e le modalità"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:12
+#, fuzzy
+#| msgid ""
+#| "The distribution you choose has the broadest impact on which packages are "
+#| "available to include in your live image. Specify the codename, which "
+#| "defaults to #{wheezy}# for the Wheezy version of live-build. Any current "
+#| "distribution carried in the Debian archive may be specified by its "
+#| "codename here. (See {Terms}#terms for more details.) The #{--distribution}"
+#| "# option not only influences the source of packages within the archive, "
+#| "but also instructs #{live-build}# to behave as needed to build each "
+#| "supported distribution. For example, to build against the *{unstable}* "
+#| "release, Sid, specify:"
 msgid ""
 "The distribution you choose has the broadest impact on which packages are "
 "available to include in your live image. Specify the codename, which "
@@ -222,7 +239,7 @@ msgid ""
 "distribution carried in the Debian archive may be specified by its codename "
 "here. (See {Terms}#terms for more details.) The #{--distribution}# option "
 "not only influences the source of packages within the archive, but also "
-"instructs #{live-build}# to behave as needed to build each supported "
+"instructs live-build to behave as needed to build each supported "
 "distribution. For example, to build against the *{unstable}* release, Sid, "
 "specify:"
 msgstr ""
@@ -781,11 +798,17 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:191
+#, fuzzy
+#| msgid ""
+#| "The primary tasks available in the Debian Installer can be listed with #"
+#| "{tasksel --list-tasks}# in the live system. The contents of any task, "
+#| "including ones not included in this list, may be examined with #{tasksel "
+#| "--task-packages}#."
 msgid ""
 "The primary tasks available in the Debian Installer can be listed with #"
 "{tasksel --list-tasks}# in the live system. The contents of any task, "
-"including ones not included in this list, may be examined with #{tasksel --"
-"task-packages}#."
+"including the ones not included in this list, may be examined with #{tasksel "
+"--task-packages}#."
 msgstr ""
 "I task principali disponibili nell'installatore Debian possono essere "
 "elencati nel sistema live con #{tasksel --list-tasks}#. I contenuti di ogni "
@@ -1198,12 +1221,19 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:294
-msgid ""
-"This will not influence the entries in /etc/apt/sources.list, but merely "
-"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
-"APT needs those indices in order to operate in the live system, so before "
-"performing #{apt-cache search}# or #{apt-get install}#, for instance, the "
-"user must #{apt-get update}# first to create those indices."
+#, fuzzy
+#| msgid ""
+#| "This will not influence the entries in /etc/apt/sources.list, but merely "
+#| "whether /var/lib/apt contains the indices files or not. The tradeoff is "
+#| "that APT needs those indices in order to operate in the live system, so "
+#| "before performing #{apt-cache search}# or #{apt-get install}#, for "
+#| "instance, the user must #{apt-get update}# first to create those indices."
+msgid ""
+"This will not influence the entries in #{/etc/apt/sources.list}#, but merely "
+"whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is "
+"that APT needs those indices in order to operate in the live system, so "
+"before performing #{apt-cache search}# or #{apt-get install}#, for instance, "
+"the user must #{apt-get update}# first to create those indices."
 msgstr ""
 "Questo non influenzerà le voci in /etc/apt/sources.list, determina solo se /"
 "var/lib/apt contiene o meno i file degli indici. Il compromesso è che APT "
diff --git a/manual/po/it/user_customization-runtime.ssi.po b/manual/po/it/user_customization-runtime.ssi.po
index 9767f27..123e4e9 100644
--- a/manual/po/it/user_customization-runtime.ssi.po
+++ b/manual/po/it/user_customization-runtime.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 11:16+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2012-04-02 23:25+0100\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -654,15 +654,25 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:164
-msgid ""
-"Then we reboot. During the first boot the contents of /home and /var/cache/"
-"apt will be copied into the persistent volume, and from then on all changes "
-"to these directories will live in the persistent volume. Please note that "
-"any paths listed in the #{live.persist}# file cannot contain white spaces or "
-"the special \".\" and \"..\" path components. Also, neither \"/live\" (or "
-"any of its sub-directories) nor \"/\" can be made persistent using custom "
-"mounts (for the latter, use the #{full-ov}# type persistence described "
-"above)."
+#, fuzzy
+#| msgid ""
+#| "Then we reboot. During the first boot the contents of /home and /var/"
+#| "cache/apt will be copied into the persistent volume, and from then on all "
+#| "changes to these directories will live in the persistent volume. Please "
+#| "note that any paths listed in the #{live.persist}# file cannot contain "
+#| "white spaces or the special \".\" and \"..\" path components. Also, "
+#| "neither \"/live\" (or any of its sub-directories) nor \"/\" can be made "
+#| "persistent using custom mounts (for the latter, use the #{full-ov}# type "
+#| "persistence described above)."
+msgid ""
+"Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
+"cache/apt}# will be copied into the persistent volume, and from then on all "
+"changes to these directories will live in the persistent volume. Please note "
+"that any paths listed in the #{live.persist}# file cannot contain white "
+"spaces or the special #{.}# and #{..}# path components. Also, neither #{/"
+"live}# (or any of its sub-directories) nor #{/}# can be made persistent "
+"using custom mounts (for the latter, use the #{full-ov}# type persistence "
+"described above)."
 msgstr ""
 "Quindi riavviare. Durante il primo avvio il contenuto di /home e /var/cache/"
 "apt saranno copiati nel volume persistente e da allora tutte le modifiche a "
diff --git a/manual/po/it/user_examples.ssi.po b/manual/po/it/user_examples.ssi.po
index bc63eb7..2634109 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-02-13 14:44+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+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,26 +24,28 @@ msgid ":B~ Examples"
 msgstr ":B~ Esempi"
 
 #. 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:16
-#: en/user_customization-binary.ssi:27 en/user_customization-contents.ssi:26
+#: 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/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
@@ -69,49 +71,52 @@ msgstr ":B~ Esempi"
 #: 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: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:23
-#: en/user_customization-binary.ssi:33 en/user_customization-contents.ssi:31
+#: 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/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
@@ -137,25 +142,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"
 
@@ -167,7 +173,7 @@ msgid " # lb build\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-binary.ssi:29 en/user_examples.ssi:95
+#: en/user_customization-binary.ssi:41 en/user_examples.ssi:95
 #, no-wrap
 msgid " #!/bin/sh\n"
 msgstr ""
@@ -514,9 +520,13 @@ msgstr "3~ Seconda revisione"
 
 #. type: Plain text
 #: en/user_examples.ssi:137
+#, fuzzy
+#| msgid ""
+#| "In this revision, we're going to clean up from the first build, add the #"
+#| "{vlc}# package to our configuration, rebuild, test and commit."
 msgid ""
-"In this revision, we're going to clean up from the first build, add the #"
-"{vlc}# package to our configuration, rebuild, test and commit."
+"In this revision, we're going to clean up from the first build, add the /"
+"{vlc}/ package to our configuration, rebuild, test and commit."
 msgstr ""
 "In questa revisione ripuliremo la prima compilazione, aggiungeremo il "
 "pacchetto #{vlc}# alla configurazione, dunque avverrà una ricompilazione, "
@@ -543,8 +553,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:147
+#, fuzzy
+#| msgid ""
+#| "Now append the #{vlc}# package to our local package list in #{config/"
+#| "package-lists/my.list.chroot}#:"
 msgid ""
-"Now append the #{vlc}# package to our local package list in #{config/package-"
+"Now append the /{vlc}/ package to our local package list in #{config/package-"
 "lists/my.list.chroot}#:"
 msgstr ""
 "Ora inserire il pacchetto #{vlc}# all'elenco locale dei pacchetti #{config/"
@@ -626,10 +640,15 @@ msgstr "*{Caso d'uso:}* creazione di un'immagine con live-build per avviare dire
 
 #. type: Plain text
 #: en/user_examples.ssi:179
+#, fuzzy
+#| msgid ""
+#| "Make a build directory and create a skeletal configuration in it built "
+#| "around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
+#| "{xvnc4viewer}#, disabling recommends to make a minimal system:"
 msgid ""
 "Make a build directory and create a skeletal configuration in it built "
-"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
-"{xvnc4viewer}#, disabling recommends to make a minimal system:"
+"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
+"{xvnc4viewer}/, disabling recommends to make a minimal system:"
 msgstr ""
 "Creare una directory con al suo interno una configurazione scheletrica "
 "costruita sulla base dell'elenco di standard-x11, tra cui #{gdm3}#, #"
@@ -649,10 +668,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:191
+#, fuzzy
+#| msgid ""
+#| "Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it "
+#| "for the default user that will launch metacity and start xvncviewer, "
+#| "connecting to port #{5901}# on a server at #{192.168.1.2}#:"
 msgid ""
 "Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
-"the default user that will launch metacity and start xvncviewer, connecting "
-"to port #{5901}# on a server at #{192.168.1.2}#:"
+"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
+"connecting to port #{5901}# on a server at #{192.168.1.2}#:"
 msgstr ""
 "Creare la directory #{/etc/skel}# e inserirvi un #{.xsession}# "
 "personalizzato per l'utente predefinito che lancerà metacity e avvierà "
@@ -707,13 +731,25 @@ msgstr "*{Caso d'uso:}* creazione di un'immagine standard con alcuni componenti
 
 #. type: Plain text
 #: en/user_examples.ssi:221
+#, fuzzy
+#| msgid ""
+#| "When optimizing an image to fit a certain media size, you need to "
+#| "understand the tradeoffs you are making between size and functionality. "
+#| "In this example, we trim only so much as to make room for additional "
+#| "material within a 128M media size, but without doing anything to destroy "
+#| "integrity of the packages contained within, such as the purging of locale "
+#| "data via the #{localepurge}# package, or other such \"intrusive\" "
+#| "optimizations. Of particular note, you should not use #{--bootstrap-"
+#| "flavour minimal}# unless you really know what you're doing, as omitting "
+#| "priority #{important}# packages will most likely produce a broken live "
+#| "system."
 msgid ""
 "When optimizing an image to fit a certain media size, you need to understand "
 "the tradeoffs you are making between size and functionality. In this "
 "example, we trim only so much as to make room for additional material within "
 "a 128M media size, but without doing anything to destroy integrity of the "
-"packages contained within, such as the purging of locale data via the #"
-"{localepurge}# package, or other such \"intrusive\" optimizations. Of "
+"packages contained within, such as the purging of locale data via the /"
+"{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
 "particular note, you should not use #{--bootstrap-flavour minimal}# unless "
 "you really know what you're doing, as omitting priority #{important}# "
 "packages will most likely produce a broken live system."
@@ -754,6 +790,21 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:240
+#, fuzzy
+#| msgid ""
+#| "The biggest space-saver here, compared to building a standard image on an "
+#| "#{i386}# architecture system, is to select only the #{486}# kernel "
+#| "flavour instead of the default #{-k \"486 686-pae\"}#. Leaving off APT's "
+#| "indices with #{--apt-indices false}# also saves a fair amount of space, "
+#| "the tradeoff being that you need to #{apt-get update}# before using apt "
+#| "in the live system. Choosing the #{minimal}# package list leaves out the "
+#| "large #{locales}# package and associated utilities. Dropping recommended "
+#| "packages with #{--apt-recommends false}# saves some additional space, at "
+#| "the expense of omitting some packages you might otherwise expect to be "
+#| "there, such as #{firmware-linux-free}# which may be needed to support "
+#| "certain hardware. The remaining options shave off additional small "
+#| "amounts of space. It's up to you to decide if the functionality that is "
+#| "sacrificed with each optimization is worth the loss in functionality."
 msgid ""
 "The biggest space-saver here, compared to building a standard image on an #"
 "{i386}# architecture system, is to select only the #{486}# kernel flavour "
@@ -763,8 +814,8 @@ msgid ""
 "system. Choosing the #{minimal}# package list leaves out the large #{locales}"
 "# package and associated utilities. Dropping recommended packages with #{--"
 "apt-recommends false}# saves some additional space, at the expense of "
-"omitting some packages you might otherwise expect to be there, such as #"
-"{firmware-linux-free}# which may be needed to support certain hardware. The "
+"omitting some packages you might otherwise expect to be there, such as /"
+"{firmware-linux-free}/ which may be needed to support certain hardware. The "
 "remaining options shave off additional small amounts of space. It's up to "
 "you to decide if the functionality that is sacrificed with each optimization "
 "is worth the loss in functionality."
@@ -891,11 +942,17 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:292
-msgid ""
-"Note that we have included the #{debian-installer-launcher}# package to "
-"launch the installer from the live desktop, and have also specified the 486 "
-"flavour kernel, as it is currently necessary to make the installer and live "
-"system kernels match for the launcher to work properly."
+#, fuzzy
+#| msgid ""
+#| "Note that we have included the #{debian-installer-launcher}# package to "
+#| "launch the installer from the live desktop, and have also specified the "
+#| "486 flavour kernel, as it is currently necessary to make the installer "
+#| "and live system kernels match for the launcher to work properly."
+msgid ""
+"Note that we have included the debian-installer-launcher package to launch "
+"the installer from the live desktop, and have also specified the 486 flavour "
+"kernel, as it is currently necessary to make the installer and live system "
+"kernels match for the launcher to work properly."
 msgstr ""
 "Si noti che è stato incluso il pacchetto #{debian-installer-launcher}# in "
 "modo da poter lanciare l'installer dal desktop della live, e che è stato "
diff --git a/manual/po/it/user_installation.ssi.po b/manual/po/it/user_installation.ssi.po
index b2cd872..1e23c11 100644
--- a/manual/po/it/user_installation.ssi.po
+++ b/manual/po/it/user_installation.ssi.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-31 16:32+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2011-06-21 13:11+0200\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -19,29 +19,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/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 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: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/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
@@ -89,29 +90,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/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 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: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/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
@@ -444,10 +446,18 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:127
+#, fuzzy
+#| msgid ""
+#| "Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
+#| "build #{live-boot}# for a target distribution that differs from your "
+#| "build system. For example, for Wheezy live images, build #{live-boot}# in "
+#| "a Wheezy chroot. If your target distribution happens to match your build "
+#| "system distribution, you may build directly on the build system using #"
+#| "{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):"
 msgid ""
 "Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
-"build #{live-boot}# for a target distribution that differs from your build "
-"system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy "
+"build live-boot for a target distribution that differs from your build "
+"system. For example, for Wheezy live images, build live-boot in a Wheezy "
 "chroot. If your target distribution happens to match your build system "
 "distribution, you may build directly on the build system using #{dpkg-"
 "buildpackage}# (provided by the /{dpkg-dev}/ package):"
diff --git a/manual/po/it/user_overview.ssi.po b/manual/po/it/user_overview.ssi.po
index 9f68063..fc446d5 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-03-19 18:09+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+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,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: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/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: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/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
@@ -200,8 +206,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:14
+#, fuzzy
+#| msgid ""
+#| "Many concepts are similar to those in the debhelper Debian package tools "
+#| "written by Joey Hess:"
 msgid ""
-"Many concepts are similar to those in the debhelper Debian package tools "
+"Many concepts are similar to those in the /{debhelper}/ Debian package tools "
 "written by Joey Hess:"
 msgstr ""
 "Molti concetti sono simili a quelli negli strumenti del pacchetto Debian "
@@ -209,9 +219,17 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:16
+#, fuzzy
+#| msgid ""
+#| "_* The scripts have a central location for configuring their operation. "
+#| "In debhelper, this is the #{debian/}# subdirectory of a package tree. For "
+#| "example, dh_install will look, amongst others, for a file called #{debian/"
+#| "install}# to determine which files should exist in a particular binary "
+#| "package. In much the same way, live-build stores its configuration "
+#| "entirely under a #{config/}# subdirectory."
 msgid ""
-"_* The scripts have a central location for configuring their operation. In "
-"debhelper, this is the #{debian/}# subdirectory of a package tree. For "
+"_* The scripts have a central location for configuring their operation. In /"
+"{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For "
 "example, dh_install will look, amongst others, for a file called #{debian/"
 "install}# to determine which files should exist in a particular binary "
 "package. In much the same way, live-build stores its configuration entirely "
@@ -235,8 +253,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:20
+#, fuzzy
+#| 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}#, please see {The lb config command}#lb-config."
 msgid ""
-"Unlike debhelper, live-build contains a tool to generate a skeleton "
+"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}"
 "#, please see {The lb config command}#lb-config."
diff --git a/manual/po/pt_BR/about_manual.ssi.po b/manual/po/pt_BR/about_manual.ssi.po
index 1a30403..688dd0c 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-03 19:01+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+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"
@@ -165,10 +165,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:34
+#, fuzzy
+#| msgid ""
+#| "_* *{live-build}*: A collection of scripts used to build customized "
+#| "Debian Live systems. live-build was formerly known as live-helper, and "
+#| "even earlier known as live-package."
 msgid ""
 "_* *{live-build}*: A collection of scripts used to build customized Debian "
-"Live systems. live-build was formerly known as live-helper, and even earlier "
-"known as live-package."
+"Live systems. live-build was formerly known as /{live-helper}/, and even "
+"earlier known as /{live-package}/."
 msgstr ""
 "_* *{live-build}*: Uma coleção de scripts usados para construir sistemas "
 "Debian live customizados. live-build era formalmente conhecido como live-"
@@ -213,8 +218,13 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:44
+#, fuzzy
+#| msgid ""
+#| "_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+#| "different instances of the GNU/Linux environment on a single system "
+#| "simultaneously without rebooting."
 msgid ""
-"_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+"_* *{chroot}*: The /{chroot}/ program, #{chroot(8)}#, enables us to run "
 "different instances of the GNU/Linux environment on a single system "
 "simultaneously without rebooting."
 msgstr ""
@@ -382,12 +392,12 @@ msgstr ""
 #: 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/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/style_guide.ssi:134
+#: 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
@@ -458,12 +468,12 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
 #: 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/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/style_guide.ssi:138
+#: 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
diff --git a/manual/po/pt_BR/project_bugs.ssi.po b/manual/po/pt_BR/project_bugs.ssi.po
index 092ea3d..569cdde 100644
--- a/manual/po/pt_BR/project_bugs.ssi.po
+++ b/manual/po/pt_BR/project_bugs.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-24 14:17-0400\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2010-10-25 23:27+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,130 +17,144 @@ 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:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 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:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/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/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:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_basics.ssi: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:43
+#: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi: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:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 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_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:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 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:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/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/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:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
-#: 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:37
-#: en/user_customization-installer.ssi:48
+#: 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
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi: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:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_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:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr "}code"
 
@@ -304,7 +318,7 @@ msgstr ""
 #. type: Plain text
 #: en/project_bugs.ssi:50
 msgid ""
-"_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system"
+"_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system"
 msgstr ""
 
 #. type: Plain text
@@ -400,8 +414,8 @@ msgstr ""
 #. type: Plain text
 #: en/project_bugs.ssi:82
 msgid ""
-"live-build first bootstraps a basic Debian system with #{debootstrap}# or #"
-"{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
+"live-build first bootstraps a basic Debian system with /{debootstrap}/ or /"
+"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
 "distribution it is bootstrapping, it may fail. If a bug appears here, check "
 "if the error is related to a specific Debian package (most likely), or if it "
 "is related to bootstrapping tool itself."
@@ -433,7 +447,7 @@ msgstr ""
 #: en/project_bugs.ssi:90
 msgid ""
 "If this is the case, this is not a bug in Debian Live, but rather in Debian "
-"- please report it against the failing package. Running #{debootstrap}# "
+"- please report it against the failing package. Running /{debootstrap}/ "
 "separately from the Live system build or running #{lb bootstrap --debug}# "
 "will give you more information."
 msgstr ""
diff --git a/manual/po/pt_BR/style_guide.ssi.po b/manual/po/pt_BR/style_guide.ssi.po
index 5e76aff..a0dd212 100644
--- a/manual/po/pt_BR/style_guide.ssi.po
+++ b/manual/po/pt_BR/style_guide.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-31 19:15+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2012-02-11 16:42+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -22,17 +22,17 @@ msgid ":B~ Appendix"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi: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/style_guide.ssi:134
+#: 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/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
@@ -93,17 +93,17 @@ 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/style_guide.ssi:138
+#: 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/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
@@ -832,15 +832,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/style_guide.ssi:228
-msgid "_* /{New lines}/"
+msgid "_* /{Newlines}/"
 msgstr ""
 
 #. type: Plain text
 #: en/style_guide.ssi:230
 msgid ""
-"The translated texts need to have the exact same new lines as the original "
+"The translated texts need to have the exact same newlines as the original "
 "texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
-"in the original files. These new lines often appear, for instance, in the "
+"in the original files. These newlines often appear, for instance, in the "
 "code blocks."
 msgstr ""
 
diff --git a/manual/po/pt_BR/user_basics.ssi.po b/manual/po/pt_BR/user_basics.ssi.po
index e8d7712..74f884d 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-01-12 08:28-0400\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2010-10-20 06:53-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: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/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,8 +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-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
@@ -59,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: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/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
@@ -99,8 +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-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
@@ -124,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"
 
@@ -537,11 +549,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:138
-msgid ""
-"Note: For live systems containing X.org that you want to test with #"
-"{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver "
-"package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. "
-"Otherwise, the resolution is limited to 800x600."
+#, no-wrap
+msgid "*{Note:}* For live systems containing X.org that you want to test with #{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. Otherwise, the resolution is limited to 800x600.\n"
 msgstr ""
 
 #. type: Plain text
@@ -570,10 +579,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:150
-msgid ""
-"Note: if you created an ISO hybrid image with the previous example, you will "
-"need to clean up your working directory with the #{lb clean}# command (see "
-"{The lb clean command}#lb-clean):"
+#, no-wrap
+msgid "*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):\n"
 msgstr ""
 
 #. type: Plain text
@@ -706,9 +713,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:216
-msgid ""
-"Note: if you performed any previous examples, you will need to clean up your "
-"working directory with the #{lb clean}# command:"
+#, no-wrap
+msgid "*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-binary.ssi.po b/manual/po/pt_BR/user_customization-binary.ssi.po
index 2da678b..b723cc6 100644
--- a/manual/po/pt_BR/user_customization-binary.ssi.po
+++ b/manual/po/pt_BR/user_customization-binary.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-25 21:42+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2010-11-30 11:20+0100\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: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/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,51 +64,54 @@ 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: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: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/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,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"
 
@@ -239,7 +245,7 @@ msgid ""
 " include menu.cfg\n"
 " default vesamenu.c32\n"
 " prompt 0\n"
-" timeout 5\n"
+" timeout 50\n"
 msgstr ""
 
 #. type: Plain text
@@ -259,7 +265,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-binary.ssi:43
 #, no-wrap
-msgid " sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg\n"
+msgid " sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-installer.ssi.po b/manual/po/pt_BR/user_customization-installer.ssi.po
index ef1b05f..edbaa13 100644
--- a/manual/po/pt_BR/user_customization-installer.ssi.po
+++ b/manual/po/pt_BR/user_customization-installer.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2010-11-30 10:53+0100\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: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/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: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/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
@@ -199,7 +205,7 @@ msgstr ""
 #: en/user_customization-installer.ssi:16
 msgid ""
 "On such images, Debian is installed by fetching and installing .deb packages "
-"using #{debootstrap}# or #{cdebootstrap}#, from the local media or some "
+"using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some "
 "network-based network, resulting in a standard Debian system being installed "
 "to the hard disk."
 msgstr ""
@@ -224,7 +230,7 @@ msgstr ""
 msgid ""
 "Installation will proceed in an identical fashion to the \"Regular\" "
 "installation described above, but at the actual package installation stage, "
-"instead of using #{debootstrap}# to fetch and install packages, the live "
+"instead of using /{debootstrap}/ to fetch and install packages, the live "
 "filesystem image is copied to the target. This is achieved with a special "
 "udeb called live-installer."
 msgstr ""
@@ -238,10 +244,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:26
-msgid ""
-"Note: to support both normal and live installer entries in the bootloader of "
-"the same live media, you must disable live-installer by preseeding #{live-"
-"installer/enable=false}#."
+#, no-wrap
+msgid "*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-packages.ssi.po b/manual/po/pt_BR/user_customization-packages.ssi.po
index 5f05987..b481f49 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-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2010-10-22 08:58-0200\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: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/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: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/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
@@ -201,7 +207,7 @@ msgid ""
 "distribution carried in the Debian archive may be specified by its codename "
 "here. (See {Terms}#terms for more details.) The #{--distribution}# option "
 "not only influences the source of packages within the archive, but also "
-"instructs #{live-build}# to behave as needed to build each supported "
+"instructs live-build to behave as needed to build each supported "
 "distribution. For example, to build against the *{unstable}* release, Sid, "
 "specify:"
 msgstr ""
@@ -637,8 +643,8 @@ msgstr ""
 msgid ""
 "The primary tasks available in the Debian Installer can be listed with #"
 "{tasksel --list-tasks}# in the live system. The contents of any task, "
-"including ones not included in this list, may be examined with #{tasksel --"
-"task-packages}#."
+"including the ones not included in this list, may be examined with #{tasksel "
+"--task-packages}#."
 msgstr ""
 
 #. type: Plain text
@@ -952,11 +958,11 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:294
 msgid ""
-"This will not influence the entries in /etc/apt/sources.list, but merely "
-"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
-"APT needs those indices in order to operate in the live system, so before "
-"performing #{apt-cache search}# or #{apt-get install}#, for instance, the "
-"user must #{apt-get update}# first to create those indices."
+"This will not influence the entries in #{/etc/apt/sources.list}#, but merely "
+"whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is "
+"that APT needs those indices in order to operate in the live system, so "
+"before performing #{apt-cache search}# or #{apt-get install}#, for instance, "
+"the user must #{apt-get update}# first to create those indices."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-runtime.ssi.po b/manual/po/pt_BR/user_customization-runtime.ssi.po
index 0723fa1..9e87c0f 100644
--- a/manual/po/pt_BR/user_customization-runtime.ssi.po
+++ b/manual/po/pt_BR/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 11:16+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2010-11-30 11:40+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -548,14 +548,14 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-runtime.ssi:164
 msgid ""
-"Then we reboot. During the first boot the contents of /home and /var/cache/"
-"apt will be copied into the persistent volume, and from then on all changes "
-"to these directories will live in the persistent volume. Please note that "
-"any paths listed in the #{live.persist}# file cannot contain white spaces or "
-"the special \".\" and \"..\" path components. Also, neither \"/live\" (or "
-"any of its sub-directories) nor \"/\" can be made persistent using custom "
-"mounts (for the latter, use the #{full-ov}# type persistence described "
-"above)."
+"Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
+"cache/apt}# will be copied into the persistent volume, and from then on all "
+"changes to these directories will live in the persistent volume. Please note "
+"that any paths listed in the #{live.persist}# file cannot contain white "
+"spaces or the special #{.}# and #{..}# path components. Also, neither #{/"
+"live}# (or any of its sub-directories) nor #{/}# can be made persistent "
+"using custom mounts (for the latter, use the #{full-ov}# type persistence "
+"described above)."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/pt_BR/user_examples.ssi.po b/manual/po/pt_BR/user_examples.ssi.po
index f3f1f51..97d2638 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-02-13 14:44+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2010-11-04 16:34-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -22,26 +22,28 @@ msgid ":B~ Examples"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi: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:16
-#: en/user_customization-binary.ssi:27 en/user_customization-contents.ssi:26
+#: 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/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
@@ -67,49 +69,52 @@ 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: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:23
-#: en/user_customization-binary.ssi:33 en/user_customization-contents.ssi:31
+#: 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/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
@@ -135,25 +140,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"
 
@@ -165,7 +171,7 @@ msgid " # lb build\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-binary.ssi:29 en/user_examples.ssi:95
+#: en/user_customization-binary.ssi:41 en/user_examples.ssi:95
 #, no-wrap
 msgid " #!/bin/sh\n"
 msgstr ""
@@ -445,8 +451,8 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:137
 msgid ""
-"In this revision, we're going to clean up from the first build, add the #"
-"{vlc}# package to our configuration, rebuild, test and commit."
+"In this revision, we're going to clean up from the first build, add the /"
+"{vlc}/ package to our configuration, rebuild, test and commit."
 msgstr ""
 
 #. type: Plain text
@@ -467,7 +473,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:147
 msgid ""
-"Now append the #{vlc}# package to our local package list in #{config/package-"
+"Now append the /{vlc}/ package to our local package list in #{config/package-"
 "lists/my.list.chroot}#:"
 msgstr ""
 
@@ -534,8 +540,8 @@ msgstr ""
 #: en/user_examples.ssi:179
 msgid ""
 "Make a build directory and create a skeletal configuration in it built "
-"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
-"{xvnc4viewer}#, disabling recommends to make a minimal system:"
+"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
+"{xvnc4viewer}/, disabling recommends to make a minimal system:"
 msgstr ""
 
 #. type: Plain text
@@ -553,8 +559,8 @@ msgstr ""
 #: en/user_examples.ssi:191
 msgid ""
 "Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
-"the default user that will launch metacity and start xvncviewer, connecting "
-"to port #{5901}# on a server at #{192.168.1.2}#:"
+"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
+"connecting to port #{5901}# on a server at #{192.168.1.2}#:"
 msgstr ""
 
 #. type: Plain text
@@ -610,8 +616,8 @@ msgid ""
 "the tradeoffs you are making between size and functionality. In this "
 "example, we trim only so much as to make room for additional material within "
 "a 128M media size, but without doing anything to destroy integrity of the "
-"packages contained within, such as the purging of locale data via the #"
-"{localepurge}# package, or other such \"intrusive\" optimizations. Of "
+"packages contained within, such as the purging of locale data via the /"
+"{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
 "particular note, you should not use #{--bootstrap-flavour minimal}# unless "
 "you really know what you're doing, as omitting priority #{important}# "
 "packages will most likely produce a broken live system."
@@ -649,8 +655,8 @@ msgid ""
 "system. Choosing the #{minimal}# package list leaves out the large #{locales}"
 "# package and associated utilities. Dropping recommended packages with #{--"
 "apt-recommends false}# saves some additional space, at the expense of "
-"omitting some packages you might otherwise expect to be there, such as #"
-"{firmware-linux-free}# which may be needed to support certain hardware. The "
+"omitting some packages you might otherwise expect to be there, such as /"
+"{firmware-linux-free}/ which may be needed to support certain hardware. The "
 "remaining options shave off additional small amounts of space. It's up to "
 "you to decide if the functionality that is sacrificed with each optimization "
 "is worth the loss in functionality."
@@ -750,8 +756,8 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:292
 msgid ""
-"Note that we have included the #{debian-installer-launcher}# package to "
-"launch the installer from the live desktop, and have also specified the 486 "
-"flavour kernel, as it is currently necessary to make the installer and live "
-"system kernels match for the launcher to work properly."
+"Note that we have included the debian-installer-launcher package to launch "
+"the installer from the live desktop, and have also specified the 486 flavour "
+"kernel, as it is currently necessary to make the installer and live system "
+"kernels match for the launcher to work properly."
 msgstr ""
diff --git a/manual/po/pt_BR/user_installation.ssi.po b/manual/po/pt_BR/user_installation.ssi.po
index db27275..92455ad 100644
--- a/manual/po/pt_BR/user_installation.ssi.po
+++ b/manual/po/pt_BR/user_installation.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-31 16:32+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2010-10-16 20:36-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,29 +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/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 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: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/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
@@ -87,29 +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/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 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: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/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
@@ -416,8 +418,8 @@ msgstr ""
 #: en/user_installation.ssi:127
 msgid ""
 "Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
-"build #{live-boot}# for a target distribution that differs from your build "
-"system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy "
+"build live-boot for a target distribution that differs from your build "
+"system. For example, for Wheezy live images, build live-boot in a Wheezy "
 "chroot. If your target distribution happens to match your build system "
 "distribution, you may build directly on the build system using #{dpkg-"
 "buildpackage}# (provided by the /{dpkg-dev}/ package):"
diff --git a/manual/po/pt_BR/user_overview.ssi.po b/manual/po/pt_BR/user_overview.ssi.po
index d52e9cb..2deae85 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-03-19 18:09+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2010-10-22 07:52-0200\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: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/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: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/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
@@ -192,15 +198,15 @@ msgstr ""
 #. type: Plain text
 #: en/user_overview.ssi:14
 msgid ""
-"Many concepts are similar to those in the debhelper Debian package tools "
+"Many concepts are similar to those in the /{debhelper}/ Debian package tools "
 "written by Joey Hess:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:16
 msgid ""
-"_* The scripts have a central location for configuring their operation. In "
-"debhelper, this is the #{debian/}# subdirectory of a package tree. For "
+"_* The scripts have a central location for configuring their operation. In /"
+"{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For "
 "example, dh_install will look, amongst others, for a file called #{debian/"
 "install}# to determine which files should exist in a particular binary "
 "package. In much the same way, live-build stores its configuration entirely "
@@ -217,7 +223,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_overview.ssi:20
 msgid ""
-"Unlike debhelper, live-build contains a tool to generate a skeleton "
+"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}"
 "#, please see {The lb config command}#lb-config."
diff --git a/manual/po/ro/about_manual.ssi.po b/manual/po/ro/about_manual.ssi.po
index 51fe3dd..d4ccbd0 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-03 19:01+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+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"
@@ -163,10 +163,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:34
+#, fuzzy
+#| msgid ""
+#| "_* *{live-build}*: A collection of scripts used to build customized "
+#| "Debian Live systems. live-build was formerly known as live-helper, and "
+#| "even earlier known as live-package."
 msgid ""
 "_* *{live-build}*: A collection of scripts used to build customized Debian "
-"Live systems. live-build was formerly known as live-helper, and even earlier "
-"known as live-package."
+"Live systems. live-build was formerly known as /{live-helper}/, and even "
+"earlier known as /{live-package}/."
 msgstr ""
 "_* *{live-build}*: O colectie de scripte folosite la particularizatrea "
 "sistemelor Debian Live. live-build a fost cunoscut ca live-helper, iar mai "
@@ -210,8 +215,13 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:44
+#, fuzzy
+#| msgid ""
+#| "_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+#| "different instances of the GNU/Linux environment on a single system "
+#| "simultaneously without rebooting."
 msgid ""
-"_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+"_* *{chroot}*: The /{chroot}/ program, #{chroot(8)}#, enables us to run "
 "different instances of the GNU/Linux environment on a single system "
 "simultaneously without rebooting."
 msgstr ""
@@ -382,12 +392,12 @@ msgstr ""
 #: 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/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/style_guide.ssi:134
+#: 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
@@ -458,12 +468,12 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
 #: 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/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/style_guide.ssi:138
+#: 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
diff --git a/manual/po/ro/project_bugs.ssi.po b/manual/po/ro/project_bugs.ssi.po
index 683cf40..5716538 100644
--- a/manual/po/ro/project_bugs.ssi.po
+++ b/manual/po/ro/project_bugs.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-24 14:17-0400\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2010-10-27 22:56+0200\n"
 "Last-Translator: Creak <romain.failliot at foolstep.com>\n"
 "Language-Team: Français <debian-live at lists.debian.org>\n"
@@ -18,130 +18,144 @@ 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:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 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:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/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/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:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
-#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_basics.ssi: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:43
+#: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi: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:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 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_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:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 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:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/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/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:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
-#: 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:37
-#: en/user_customization-installer.ssi:48
+#: 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
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi: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:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:70 en/user_installation.ssi:78
-#: en/user_installation.ssi:86 en/user_installation.ssi:94
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_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:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr "}code"
 
@@ -305,7 +319,7 @@ msgstr ""
 #. type: Plain text
 #: en/project_bugs.ssi:50
 msgid ""
-"_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system"
+"_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system"
 msgstr ""
 
 #. type: Plain text
@@ -401,8 +415,8 @@ msgstr ""
 #. type: Plain text
 #: en/project_bugs.ssi:82
 msgid ""
-"live-build first bootstraps a basic Debian system with #{debootstrap}# or #"
-"{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
+"live-build first bootstraps a basic Debian system with /{debootstrap}/ or /"
+"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
 "distribution it is bootstrapping, it may fail. If a bug appears here, check "
 "if the error is related to a specific Debian package (most likely), or if it "
 "is related to bootstrapping tool itself."
@@ -434,7 +448,7 @@ msgstr ""
 #: en/project_bugs.ssi:90
 msgid ""
 "If this is the case, this is not a bug in Debian Live, but rather in Debian "
-"- please report it against the failing package. Running #{debootstrap}# "
+"- please report it against the failing package. Running /{debootstrap}/ "
 "separately from the Live system build or running #{lb bootstrap --debug}# "
 "will give you more information."
 msgstr ""
diff --git a/manual/po/ro/style_guide.ssi.po b/manual/po/ro/style_guide.ssi.po
index 649aead..0b4e44d 100644
--- a/manual/po/ro/style_guide.ssi.po
+++ b/manual/po/ro/style_guide.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-31 19:15+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2012-02-11 16:42+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -23,17 +23,17 @@ msgid ":B~ Appendix"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi: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/style_guide.ssi:134
+#: 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/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
@@ -94,17 +94,17 @@ 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/style_guide.ssi:138
+#: 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/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
@@ -833,15 +833,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/style_guide.ssi:228
-msgid "_* /{New lines}/"
+msgid "_* /{Newlines}/"
 msgstr ""
 
 #. type: Plain text
 #: en/style_guide.ssi:230
 msgid ""
-"The translated texts need to have the exact same new lines as the original "
+"The translated texts need to have the exact same newlines as the original "
 "texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
-"in the original files. These new lines often appear, for instance, in the "
+"in the original files. These newlines often appear, for instance, in the "
 "code blocks."
 msgstr ""
 
diff --git a/manual/po/ro/user_basics.ssi.po b/manual/po/ro/user_basics.ssi.po
index dd059e7..3d62358 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-01-12 08:28-0400\n"
+"POT-Creation-Date: 2012-04-08 12:15+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: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/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,8 +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-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 +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: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/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,8 +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-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
@@ -125,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"
 
@@ -538,11 +550,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:138
-msgid ""
-"Note: For live systems containing X.org that you want to test with #"
-"{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver "
-"package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. "
-"Otherwise, the resolution is limited to 800x600."
+#, no-wrap
+msgid "*{Note:}* For live systems containing X.org that you want to test with #{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. Otherwise, the resolution is limited to 800x600.\n"
 msgstr ""
 
 #. type: Plain text
@@ -571,10 +580,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:150
-msgid ""
-"Note: if you created an ISO hybrid image with the previous example, you will "
-"need to clean up your working directory with the #{lb clean}# command (see "
-"{The lb clean command}#lb-clean):"
+#, no-wrap
+msgid "*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):\n"
 msgstr ""
 
 #. type: Plain text
@@ -707,9 +714,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:216
-msgid ""
-"Note: if you performed any previous examples, you will need to clean up your "
-"working directory with the #{lb clean}# command:"
+#, no-wrap
+msgid "*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/user_customization-binary.ssi.po b/manual/po/ro/user_customization-binary.ssi.po
index 0f33aaa..8c8c9d7 100644
--- a/manual/po/ro/user_customization-binary.ssi.po
+++ b/manual/po/ro/user_customization-binary.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-25 21:42+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2010-11-30 11:20+0100\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: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/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,51 +65,54 @@ 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: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: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/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,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"
 
@@ -240,7 +246,7 @@ msgid ""
 " include menu.cfg\n"
 " default vesamenu.c32\n"
 " prompt 0\n"
-" timeout 5\n"
+" timeout 50\n"
 msgstr ""
 
 #. type: Plain text
@@ -260,7 +266,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-binary.ssi:43
 #, no-wrap
-msgid " sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg\n"
+msgid " sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/user_customization-installer.ssi.po b/manual/po/ro/user_customization-installer.ssi.po
index e60444c..6c1ba22 100644
--- a/manual/po/ro/user_customization-installer.ssi.po
+++ b/manual/po/ro/user_customization-installer.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2010-11-30 10:53+0100\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: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/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: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/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
@@ -200,7 +206,7 @@ msgstr ""
 #: en/user_customization-installer.ssi:16
 msgid ""
 "On such images, Debian is installed by fetching and installing .deb packages "
-"using #{debootstrap}# or #{cdebootstrap}#, from the local media or some "
+"using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some "
 "network-based network, resulting in a standard Debian system being installed "
 "to the hard disk."
 msgstr ""
@@ -225,7 +231,7 @@ msgstr ""
 msgid ""
 "Installation will proceed in an identical fashion to the \"Regular\" "
 "installation described above, but at the actual package installation stage, "
-"instead of using #{debootstrap}# to fetch and install packages, the live "
+"instead of using /{debootstrap}/ to fetch and install packages, the live "
 "filesystem image is copied to the target. This is achieved with a special "
 "udeb called live-installer."
 msgstr ""
@@ -239,10 +245,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:26
-msgid ""
-"Note: to support both normal and live installer entries in the bootloader of "
-"the same live media, you must disable live-installer by preseeding #{live-"
-"installer/enable=false}#."
+#, no-wrap
+msgid "*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/user_customization-packages.ssi.po b/manual/po/ro/user_customization-packages.ssi.po
index c39b866..d4284ea 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-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2010-10-22 08:58-0200\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: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/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: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/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
@@ -202,7 +208,7 @@ msgid ""
 "distribution carried in the Debian archive may be specified by its codename "
 "here. (See {Terms}#terms for more details.) The #{--distribution}# option "
 "not only influences the source of packages within the archive, but also "
-"instructs #{live-build}# to behave as needed to build each supported "
+"instructs live-build to behave as needed to build each supported "
 "distribution. For example, to build against the *{unstable}* release, Sid, "
 "specify:"
 msgstr ""
@@ -638,8 +644,8 @@ msgstr ""
 msgid ""
 "The primary tasks available in the Debian Installer can be listed with #"
 "{tasksel --list-tasks}# in the live system. The contents of any task, "
-"including ones not included in this list, may be examined with #{tasksel --"
-"task-packages}#."
+"including the ones not included in this list, may be examined with #{tasksel "
+"--task-packages}#."
 msgstr ""
 
 #. type: Plain text
@@ -953,11 +959,11 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:294
 msgid ""
-"This will not influence the entries in /etc/apt/sources.list, but merely "
-"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
-"APT needs those indices in order to operate in the live system, so before "
-"performing #{apt-cache search}# or #{apt-get install}#, for instance, the "
-"user must #{apt-get update}# first to create those indices."
+"This will not influence the entries in #{/etc/apt/sources.list}#, but merely "
+"whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is "
+"that APT needs those indices in order to operate in the live system, so "
+"before performing #{apt-cache search}# or #{apt-get install}#, for instance, "
+"the user must #{apt-get update}# first to create those indices."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/user_customization-runtime.ssi.po b/manual/po/ro/user_customization-runtime.ssi.po
index 2252945..e03fda9 100644
--- a/manual/po/ro/user_customization-runtime.ssi.po
+++ b/manual/po/ro/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 11:16+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2010-11-30 11:40+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -549,14 +549,14 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-runtime.ssi:164
 msgid ""
-"Then we reboot. During the first boot the contents of /home and /var/cache/"
-"apt will be copied into the persistent volume, and from then on all changes "
-"to these directories will live in the persistent volume. Please note that "
-"any paths listed in the #{live.persist}# file cannot contain white spaces or "
-"the special \".\" and \"..\" path components. Also, neither \"/live\" (or "
-"any of its sub-directories) nor \"/\" can be made persistent using custom "
-"mounts (for the latter, use the #{full-ov}# type persistence described "
-"above)."
+"Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
+"cache/apt}# will be copied into the persistent volume, and from then on all "
+"changes to these directories will live in the persistent volume. Please note "
+"that any paths listed in the #{live.persist}# file cannot contain white "
+"spaces or the special #{.}# and #{..}# path components. Also, neither #{/"
+"live}# (or any of its sub-directories) nor #{/}# can be made persistent "
+"using custom mounts (for the latter, use the #{full-ov}# type persistence "
+"described above)."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/user_examples.ssi.po b/manual/po/ro/user_examples.ssi.po
index d463d5d..5832fea 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-02-13 14:44+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2010-11-04 16:34-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -23,26 +23,28 @@ msgid ":B~ Examples"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi: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:16
-#: en/user_customization-binary.ssi:27 en/user_customization-contents.ssi:26
+#: 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/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
@@ -68,49 +70,52 @@ 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: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:23
-#: en/user_customization-binary.ssi:33 en/user_customization-contents.ssi:31
+#: 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/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
@@ -136,25 +141,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"
 
@@ -166,7 +172,7 @@ msgid " # lb build\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-binary.ssi:29 en/user_examples.ssi:95
+#: en/user_customization-binary.ssi:41 en/user_examples.ssi:95
 #, no-wrap
 msgid " #!/bin/sh\n"
 msgstr ""
@@ -446,8 +452,8 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:137
 msgid ""
-"In this revision, we're going to clean up from the first build, add the #"
-"{vlc}# package to our configuration, rebuild, test and commit."
+"In this revision, we're going to clean up from the first build, add the /"
+"{vlc}/ package to our configuration, rebuild, test and commit."
 msgstr ""
 
 #. type: Plain text
@@ -468,7 +474,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:147
 msgid ""
-"Now append the #{vlc}# package to our local package list in #{config/package-"
+"Now append the /{vlc}/ package to our local package list in #{config/package-"
 "lists/my.list.chroot}#:"
 msgstr ""
 
@@ -535,8 +541,8 @@ msgstr ""
 #: en/user_examples.ssi:179
 msgid ""
 "Make a build directory and create a skeletal configuration in it built "
-"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
-"{xvnc4viewer}#, disabling recommends to make a minimal system:"
+"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
+"{xvnc4viewer}/, disabling recommends to make a minimal system:"
 msgstr ""
 
 #. type: Plain text
@@ -554,8 +560,8 @@ msgstr ""
 #: en/user_examples.ssi:191
 msgid ""
 "Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
-"the default user that will launch metacity and start xvncviewer, connecting "
-"to port #{5901}# on a server at #{192.168.1.2}#:"
+"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
+"connecting to port #{5901}# on a server at #{192.168.1.2}#:"
 msgstr ""
 
 #. type: Plain text
@@ -611,8 +617,8 @@ msgid ""
 "the tradeoffs you are making between size and functionality. In this "
 "example, we trim only so much as to make room for additional material within "
 "a 128M media size, but without doing anything to destroy integrity of the "
-"packages contained within, such as the purging of locale data via the #"
-"{localepurge}# package, or other such \"intrusive\" optimizations. Of "
+"packages contained within, such as the purging of locale data via the /"
+"{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
 "particular note, you should not use #{--bootstrap-flavour minimal}# unless "
 "you really know what you're doing, as omitting priority #{important}# "
 "packages will most likely produce a broken live system."
@@ -650,8 +656,8 @@ msgid ""
 "system. Choosing the #{minimal}# package list leaves out the large #{locales}"
 "# package and associated utilities. Dropping recommended packages with #{--"
 "apt-recommends false}# saves some additional space, at the expense of "
-"omitting some packages you might otherwise expect to be there, such as #"
-"{firmware-linux-free}# which may be needed to support certain hardware. The "
+"omitting some packages you might otherwise expect to be there, such as /"
+"{firmware-linux-free}/ which may be needed to support certain hardware. The "
 "remaining options shave off additional small amounts of space. It's up to "
 "you to decide if the functionality that is sacrificed with each optimization "
 "is worth the loss in functionality."
@@ -751,8 +757,8 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:292
 msgid ""
-"Note that we have included the #{debian-installer-launcher}# package to "
-"launch the installer from the live desktop, and have also specified the 486 "
-"flavour kernel, as it is currently necessary to make the installer and live "
-"system kernels match for the launcher to work properly."
+"Note that we have included the debian-installer-launcher package to launch "
+"the installer from the live desktop, and have also specified the 486 flavour "
+"kernel, as it is currently necessary to make the installer and live system "
+"kernels match for the launcher to work properly."
 msgstr ""
diff --git a/manual/po/ro/user_installation.ssi.po b/manual/po/ro/user_installation.ssi.po
index 7cbb419..614c4a7 100644
--- a/manual/po/ro/user_installation.ssi.po
+++ b/manual/po/ro/user_installation.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-03-31 16:32+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2010-10-23 16:43+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,29 +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/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 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: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/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
@@ -88,29 +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/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 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: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/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
@@ -417,8 +419,8 @@ msgstr ""
 #: en/user_installation.ssi:127
 msgid ""
 "Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
-"build #{live-boot}# for a target distribution that differs from your build "
-"system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy "
+"build live-boot for a target distribution that differs from your build "
+"system. For example, for Wheezy live images, build live-boot in a Wheezy "
 "chroot. If your target distribution happens to match your build system "
 "distribution, you may build directly on the build system using #{dpkg-"
 "buildpackage}# (provided by the /{dpkg-dev}/ package):"
diff --git a/manual/po/ro/user_overview.ssi.po b/manual/po/ro/user_overview.ssi.po
index 7870778..d77183d 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-03-19 18:09+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+0300\n"
 "PO-Revision-Date: 2010-10-22 07:52-0200\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: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/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: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/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
@@ -193,15 +199,15 @@ msgstr ""
 #. type: Plain text
 #: en/user_overview.ssi:14
 msgid ""
-"Many concepts are similar to those in the debhelper Debian package tools "
+"Many concepts are similar to those in the /{debhelper}/ Debian package tools "
 "written by Joey Hess:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:16
 msgid ""
-"_* The scripts have a central location for configuring their operation. In "
-"debhelper, this is the #{debian/}# subdirectory of a package tree. For "
+"_* The scripts have a central location for configuring their operation. In /"
+"{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For "
 "example, dh_install will look, amongst others, for a file called #{debian/"
 "install}# to determine which files should exist in a particular binary "
 "package. In much the same way, live-build stores its configuration entirely "
@@ -218,7 +224,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_overview.ssi:20
 msgid ""
-"Unlike debhelper, live-build contains a tool to generate a skeleton "
+"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}"
 "#, please see {The lb config command}#lb-config."
diff --git a/manual/pot/about_manual.ssi.pot b/manual/pot/about_manual.ssi.pot
index b2053ce..91fb86f 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-03 19:01+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+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"
@@ -148,8 +148,8 @@ msgstr ""
 #: en/about_manual.ssi:34
 msgid ""
 "_* *{live-build}*: A collection of scripts used to build customized Debian "
-"Live systems. live-build was formerly known as live-helper, and even earlier "
-"known as live-package."
+"Live systems. live-build was formerly known as /{live-helper}/, and even "
+"earlier known as /{live-package}/."
 msgstr ""
 
 #. type: Plain text
@@ -183,7 +183,7 @@ msgstr ""
 #. type: Plain text
 #: en/about_manual.ssi:44
 msgid ""
-"_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+"_* *{chroot}*: The /{chroot}/ program, #{chroot(8)}#, enables us to run "
 "different instances of the GNU/Linux environment on a single system "
 "simultaneously without rebooting."
 msgstr ""
@@ -331,12 +331,12 @@ msgstr ""
 #: 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/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/style_guide.ssi:134
+#: 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
@@ -407,12 +407,12 @@ msgstr ""
 #: 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/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/style_guide.ssi:138
+#: 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
diff --git a/manual/pot/project_bugs.ssi.pot b/manual/pot/project_bugs.ssi.pot
index 7bd185d..60d3da5 100644
--- a/manual/pot/project_bugs.ssi.pot
+++ b/manual/pot/project_bugs.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-08 12:15+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/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: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/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,63 +37,70 @@ 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-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:43
+#: en/user_customization-installer.ssi:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
+#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi: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:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 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_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:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:49 en/user_overview.ssi:57
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/project_bugs.ssi:64
-#: en/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: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/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
@@ -98,49 +108,53 @@ 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-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:37
-#: en/user_customization-installer.ssi:48
+#: 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
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
+#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
+#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-runtime.ssi: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:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 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_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:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:43
+#: en/user_overview.ssi:53 en/user_overview.ssi:61
 msgid "}code"
 msgstr ""
 
@@ -304,7 +318,7 @@ msgstr ""
 #. type: Plain text
 #: en/project_bugs.ssi:50
 msgid ""
-"_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system"
+"_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system"
 msgstr ""
 
 #. type: Plain text
@@ -400,8 +414,8 @@ msgstr ""
 #. type: Plain text
 #: en/project_bugs.ssi:82
 msgid ""
-"live-build first bootstraps a basic Debian system with #{debootstrap}# or #"
-"{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
+"live-build first bootstraps a basic Debian system with /{debootstrap}/ or /"
+"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
 "distribution it is bootstrapping, it may fail. If a bug appears here, check "
 "if the error is related to a specific Debian package (most likely), or if it "
 "is related to bootstrapping tool itself."
@@ -433,7 +447,7 @@ msgstr ""
 #: en/project_bugs.ssi:90
 msgid ""
 "If this is the case, this is not a bug in Debian Live, but rather in Debian "
-"- please report it against the failing package. Running #{debootstrap}# "
+"- please report it against the failing package. Running /{debootstrap}/ "
 "separately from the Live system build or running #{lb bootstrap --debug}# "
 "will give you more information."
 msgstr ""
diff --git a/manual/pot/style_guide.ssi.pot b/manual/pot/style_guide.ssi.pot
index 5b3e060..0529c7d 100644
--- a/manual/pot/style_guide.ssi.pot
+++ b/manual/pot/style_guide.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-31 19:15+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+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,17 +22,17 @@ msgid ":B~ Appendix"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi: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/style_guide.ssi:134
+#: 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/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
@@ -93,17 +93,17 @@ 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/style_guide.ssi:138
+#: 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/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
@@ -832,15 +832,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/style_guide.ssi:228
-msgid "_* /{New lines}/"
+msgid "_* /{Newlines}/"
 msgstr ""
 
 #. type: Plain text
 #: en/style_guide.ssi:230
 msgid ""
-"The translated texts need to have the exact same new lines as the original "
+"The translated texts need to have the exact same newlines as the original "
 "texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
-"in the original files. These new lines often appear, for instance, in the "
+"in the original files. These newlines often appear, for instance, in the "
 "code blocks."
 msgstr ""
 
diff --git a/manual/pot/user_basics.ssi.pot b/manual/pot/user_basics.ssi.pot
index 0cd1d12..7697649 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-01-12 08:28-0400\n"
+"POT-Creation-Date: 2012-04-08 12:15+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: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/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,8 +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-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
@@ -59,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: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/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
@@ -99,8 +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-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
@@ -124,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 ""
 
@@ -537,11 +549,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:138
-msgid ""
-"Note: For live systems containing X.org that you want to test with #"
-"{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver "
-"package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. "
-"Otherwise, the resolution is limited to 800x600."
+#, no-wrap
+msgid "*{Note:}* For live systems containing X.org that you want to test with #{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. Otherwise, the resolution is limited to 800x600.\n"
 msgstr ""
 
 #. type: Plain text
@@ -570,10 +579,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:150
-msgid ""
-"Note: if you created an ISO hybrid image with the previous example, you will "
-"need to clean up your working directory with the #{lb clean}# command (see "
-"{The lb clean command}#lb-clean):"
+#, no-wrap
+msgid "*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):\n"
 msgstr ""
 
 #. type: Plain text
@@ -706,9 +713,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:216
-msgid ""
-"Note: if you performed any previous examples, you will need to clean up your "
-"working directory with the #{lb clean}# command:"
+#, no-wrap
+msgid "*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/user_customization-binary.ssi.pot b/manual/pot/user_customization-binary.ssi.pot
index 22d4ac2..542f63f 100644
--- a/manual/pot/user_customization-binary.ssi.pot
+++ b/manual/pot/user_customization-binary.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-25 21:42+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+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: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/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,51 +64,54 @@ 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: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: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/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,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 ""
 
@@ -239,7 +245,7 @@ msgid ""
 " include menu.cfg\n"
 " default vesamenu.c32\n"
 " prompt 0\n"
-" timeout 5\n"
+" timeout 50\n"
 msgstr ""
 
 #. type: Plain text
@@ -259,7 +265,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-binary.ssi:43
 #, no-wrap
-msgid " sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg\n"
+msgid " sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/user_customization-installer.ssi.pot b/manual/pot/user_customization-installer.ssi.pot
index 07c2a1e..e4b2330 100644
--- a/manual/pot/user_customization-installer.ssi.pot
+++ b/manual/pot/user_customization-installer.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+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: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/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: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/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
@@ -199,7 +205,7 @@ msgstr ""
 #: en/user_customization-installer.ssi:16
 msgid ""
 "On such images, Debian is installed by fetching and installing .deb packages "
-"using #{debootstrap}# or #{cdebootstrap}#, from the local media or some "
+"using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some "
 "network-based network, resulting in a standard Debian system being installed "
 "to the hard disk."
 msgstr ""
@@ -224,7 +230,7 @@ msgstr ""
 msgid ""
 "Installation will proceed in an identical fashion to the \"Regular\" "
 "installation described above, but at the actual package installation stage, "
-"instead of using #{debootstrap}# to fetch and install packages, the live "
+"instead of using /{debootstrap}/ to fetch and install packages, the live "
 "filesystem image is copied to the target. This is achieved with a special "
 "udeb called live-installer."
 msgstr ""
@@ -238,10 +244,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:26
-msgid ""
-"Note: to support both normal and live installer entries in the bootloader of "
-"the same live media, you must disable live-installer by preseeding #{live-"
-"installer/enable=false}#."
+#, no-wrap
+msgid "*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index 036e06b..47d3c71 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-03-19 20:50+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+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: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/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: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/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
@@ -201,7 +207,7 @@ msgid ""
 "distribution carried in the Debian archive may be specified by its codename "
 "here. (See {Terms}#terms for more details.) The #{--distribution}# option "
 "not only influences the source of packages within the archive, but also "
-"instructs #{live-build}# to behave as needed to build each supported "
+"instructs live-build to behave as needed to build each supported "
 "distribution. For example, to build against the *{unstable}* release, Sid, "
 "specify:"
 msgstr ""
@@ -637,8 +643,8 @@ msgstr ""
 msgid ""
 "The primary tasks available in the Debian Installer can be listed with #"
 "{tasksel --list-tasks}# in the live system. The contents of any task, "
-"including ones not included in this list, may be examined with #{tasksel --"
-"task-packages}#."
+"including the ones not included in this list, may be examined with #{tasksel "
+"--task-packages}#."
 msgstr ""
 
 #. type: Plain text
@@ -952,11 +958,11 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:294
 msgid ""
-"This will not influence the entries in /etc/apt/sources.list, but merely "
-"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
-"APT needs those indices in order to operate in the live system, so before "
-"performing #{apt-cache search}# or #{apt-get install}#, for instance, the "
-"user must #{apt-get update}# first to create those indices."
+"This will not influence the entries in #{/etc/apt/sources.list}#, but merely "
+"whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is "
+"that APT needs those indices in order to operate in the live system, so "
+"before performing #{apt-cache search}# or #{apt-get install}#, for instance, "
+"the user must #{apt-get update}# first to create those indices."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/user_customization-runtime.ssi.pot b/manual/pot/user_customization-runtime.ssi.pot
index f136274..982ed6e 100644
--- a/manual/pot/user_customization-runtime.ssi.pot
+++ b/manual/pot/user_customization-runtime.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 11:16+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+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"
@@ -548,14 +548,14 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-runtime.ssi:164
 msgid ""
-"Then we reboot. During the first boot the contents of /home and /var/cache/"
-"apt will be copied into the persistent volume, and from then on all changes "
-"to these directories will live in the persistent volume. Please note that "
-"any paths listed in the #{live.persist}# file cannot contain white spaces or "
-"the special \".\" and \"..\" path components. Also, neither \"/live\" (or "
-"any of its sub-directories) nor \"/\" can be made persistent using custom "
-"mounts (for the latter, use the #{full-ov}# type persistence described "
-"above)."
+"Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
+"cache/apt}# will be copied into the persistent volume, and from then on all "
+"changes to these directories will live in the persistent volume. Please note "
+"that any paths listed in the #{live.persist}# file cannot contain white "
+"spaces or the special #{.}# and #{..}# path components. Also, neither #{/"
+"live}# (or any of its sub-directories) nor #{/}# can be made persistent "
+"using custom mounts (for the latter, use the #{full-ov}# type persistence "
+"described above)."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/user_examples.ssi.pot b/manual/pot/user_examples.ssi.pot
index 57ea9e9..69985d4 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-02-13 14:44+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+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,26 +22,28 @@ msgid ":B~ Examples"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi: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:16
-#: en/user_customization-binary.ssi:27 en/user_customization-contents.ssi:26
+#: 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/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
@@ -67,49 +69,52 @@ 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: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:23
-#: en/user_customization-binary.ssi:33 en/user_customization-contents.ssi:31
+#: 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/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
@@ -135,25 +140,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 ""
 
@@ -165,7 +171,7 @@ msgid " # lb build\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-binary.ssi:29 en/user_examples.ssi:95
+#: en/user_customization-binary.ssi:41 en/user_examples.ssi:95
 #, no-wrap
 msgid " #!/bin/sh\n"
 msgstr ""
@@ -445,8 +451,8 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:137
 msgid ""
-"In this revision, we're going to clean up from the first build, add the #"
-"{vlc}# package to our configuration, rebuild, test and commit."
+"In this revision, we're going to clean up from the first build, add the /"
+"{vlc}/ package to our configuration, rebuild, test and commit."
 msgstr ""
 
 #. type: Plain text
@@ -467,7 +473,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:147
 msgid ""
-"Now append the #{vlc}# package to our local package list in #{config/package-"
+"Now append the /{vlc}/ package to our local package list in #{config/package-"
 "lists/my.list.chroot}#:"
 msgstr ""
 
@@ -534,8 +540,8 @@ msgstr ""
 #: en/user_examples.ssi:179
 msgid ""
 "Make a build directory and create a skeletal configuration in it built "
-"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
-"{xvnc4viewer}#, disabling recommends to make a minimal system:"
+"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
+"{xvnc4viewer}/, disabling recommends to make a minimal system:"
 msgstr ""
 
 #. type: Plain text
@@ -553,8 +559,8 @@ msgstr ""
 #: en/user_examples.ssi:191
 msgid ""
 "Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
-"the default user that will launch metacity and start xvncviewer, connecting "
-"to port #{5901}# on a server at #{192.168.1.2}#:"
+"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
+"connecting to port #{5901}# on a server at #{192.168.1.2}#:"
 msgstr ""
 
 #. type: Plain text
@@ -610,8 +616,8 @@ msgid ""
 "the tradeoffs you are making between size and functionality. In this "
 "example, we trim only so much as to make room for additional material within "
 "a 128M media size, but without doing anything to destroy integrity of the "
-"packages contained within, such as the purging of locale data via the #"
-"{localepurge}# package, or other such \"intrusive\" optimizations. Of "
+"packages contained within, such as the purging of locale data via the /"
+"{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
 "particular note, you should not use #{--bootstrap-flavour minimal}# unless "
 "you really know what you're doing, as omitting priority #{important}# "
 "packages will most likely produce a broken live system."
@@ -649,8 +655,8 @@ msgid ""
 "system. Choosing the #{minimal}# package list leaves out the large #{locales}"
 "# package and associated utilities. Dropping recommended packages with #{--"
 "apt-recommends false}# saves some additional space, at the expense of "
-"omitting some packages you might otherwise expect to be there, such as #"
-"{firmware-linux-free}# which may be needed to support certain hardware. The "
+"omitting some packages you might otherwise expect to be there, such as /"
+"{firmware-linux-free}/ which may be needed to support certain hardware. The "
 "remaining options shave off additional small amounts of space. It's up to "
 "you to decide if the functionality that is sacrificed with each optimization "
 "is worth the loss in functionality."
@@ -750,8 +756,8 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:292
 msgid ""
-"Note that we have included the #{debian-installer-launcher}# package to "
-"launch the installer from the live desktop, and have also specified the 486 "
-"flavour kernel, as it is currently necessary to make the installer and live "
-"system kernels match for the launcher to work properly."
+"Note that we have included the debian-installer-launcher package to launch "
+"the installer from the live desktop, and have also specified the 486 flavour "
+"kernel, as it is currently necessary to make the installer and live system "
+"kernels match for the launcher to work properly."
 msgstr ""
diff --git a/manual/pot/user_installation.ssi.pot b/manual/pot/user_installation.ssi.pot
index 243e075..9af86d5 100644
--- a/manual/pot/user_installation.ssi.pot
+++ b/manual/pot/user_installation.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-03-31 16:32+0300\n"
+"POT-Creation-Date: 2012-04-08 12:15+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,29 +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/style_guide.ssi:134
-#: en/style_guide.ssi:144 en/style_guide.ssi:154 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: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/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
@@ -87,29 +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/style_guide.ssi:138
-#: en/style_guide.ssi:148 en/style_guide.ssi:158 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: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/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
@@ -416,8 +418,8 @@ msgstr ""
 #: en/user_installation.ssi:127
 msgid ""
 "Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
-"build #{live-boot}# for a target distribution that differs from your build "
-"system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy "
+"build live-boot for a target distribution that differs from your build "
+"system. For example, for Wheezy live images, build live-boot in a Wheezy "
 "chroot. If your target distribution happens to match your build system "
 "distribution, you may build directly on the build system using #{dpkg-"
 "buildpackage}# (provided by the /{dpkg-dev}/ package):"
diff --git a/manual/pot/user_overview.ssi.pot b/manual/pot/user_overview.ssi.pot
index 83720ad..adee664 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-03-19 18:09+0100\n"
+"POT-Creation-Date: 2012-04-08 12:15+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: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/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: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/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
@@ -192,15 +198,15 @@ msgstr ""
 #. type: Plain text
 #: en/user_overview.ssi:14
 msgid ""
-"Many concepts are similar to those in the debhelper Debian package tools "
+"Many concepts are similar to those in the /{debhelper}/ Debian package tools "
 "written by Joey Hess:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:16
 msgid ""
-"_* The scripts have a central location for configuring their operation. In "
-"debhelper, this is the #{debian/}# subdirectory of a package tree. For "
+"_* The scripts have a central location for configuring their operation. In /"
+"{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For "
 "example, dh_install will look, amongst others, for a file called #{debian/"
 "install}# to determine which files should exist in a particular binary "
 "package. In much the same way, live-build stores its configuration entirely "
@@ -217,7 +223,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_overview.ssi:20
 msgid ""
-"Unlike debhelper, live-build contains a tool to generate a skeleton "
+"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}"
 "#, please see {The lb config command}#lb-config."
diff --git a/manual/pt_BR/about_manual.ssi b/manual/pt_BR/about_manual.ssi
index b450271..d5c9d81 100644
--- a/manual/pt_BR/about_manual.ssi
+++ b/manual/pt_BR/about_manual.ssi
@@ -69,9 +69,9 @@ _* *{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-build}*: Uma coleção de scripts usados para construir sistemas
-Debian live customizados. live-build era formalmente conhecido como
-live-helper, e ainda antes conhecido como live-package.
+_* *{live-build}*: A collection of scripts used to build customized Debian
+Live systems. live-build was formerly known as /{live-helper}/, and even
+earlier known as /{live-package}/.
 
 _* *{live-config}*: Uma coleção de scripts usados para configurar um sistema
 live durante o processo de boot. live-config era formalmente parte do
@@ -86,9 +86,9 @@ distribuição Debian.
 _* *{Boot parameters}*: Parametros que podem ser entrados no prompt do
 bootloader para influenciar o kernel ou o live-config.
 
-_* *{chroot}*: O programa chroot, #{chroot(8)}#, nos habilita a rodar
-simultâneamente diferentes instâncias do ambiente do GNU/Linux em um único
-sistema sem reinicialização.
+_* *{chroot}*: The /{chroot}/ program, #{chroot(8)}#, enables us to run
+different instances of the GNU/Linux environment on a single system
+simultaneously without rebooting.
 
 _* *{Binary image}*: Um arquivo contendo o sistema live, como binary.iso ou
 binary.img.
diff --git a/manual/pt_BR/project_bugs.ssi b/manual/pt_BR/project_bugs.ssi
index b0c34fc..a051509 100644
--- a/manual/pt_BR/project_bugs.ssi
+++ b/manual/pt_BR/project_bugs.ssi
@@ -71,7 +71,7 @@ _* Version of live-boot on the live system
 
 _* Version of live-config on the live system
 
-_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system
+_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system
 
 _* Architecture of the live system
 
@@ -122,8 +122,8 @@ Where does the bug appear?
 
 3~ At build time whilst bootstrapping
 
-live-build first bootstraps a basic Debian system with #{debootstrap}# or
-#{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian
+live-build first bootstraps a basic Debian system with /{debootstrap}/ or
+/{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian
 distribution it is bootstrapping, it may fail. If a bug appears here, check
 if the error is related to a specific Debian package (most likely), or if it
 is related to bootstrapping tool itself.
@@ -140,7 +140,7 @@ can fail. If a bug appears here, check if the error is also reproducible on
 a normal system.
 
 If this is the case, this is not a bug in Debian Live, but rather in Debian
-- please report it against the failing package. Running #{debootstrap}#
+- please report it against the failing package. Running /{debootstrap}/
 separately from the Live system build or running #{lb bootstrap --debug}#
 will give you more information.
 
diff --git a/manual/pt_BR/style_guide.ssi b/manual/pt_BR/style_guide.ssi
index 8b01cc3..fd6c6fd 100644
--- a/manual/pt_BR/style_guide.ssi
+++ b/manual/pt_BR/style_guide.ssi
@@ -342,11 +342,11 @@ intervention if the code changes.
 Leave the code blocks empty (they will be automatically added then) if you
 want to make your translation easier to maintain.
 
-_* /{New lines}/
+_* /{Newlines}/
 
-The translated texts need to have the exact same new lines as the original
+The translated texts need to have the exact same newlines as the original
 texts. Be careful to press the "Enter" key or type *{\n}* if they appear in
-the original files. These new lines often appear, for instance, in the code
+the original files. These newlines often appear, for instance, in the code
 blocks.
 
 Make no mistake, this does not mean that the translated text needs to have
diff --git a/manual/pt_BR/user_basics.ssi b/manual/pt_BR/user_basics.ssi
index 2eee04a..d66ad78 100644
--- a/manual/pt_BR/user_basics.ssi
+++ b/manual/pt_BR/user_basics.ssi
@@ -218,10 +218,7 @@ code{
 Create a new virtual machine, change the storage settings to use
 #{binary-hybrid.iso}# as the CD/DVD device, and start the machine.
 
-Note: For live systems containing X.org that you want to test with
-#{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver
-package, #{virtualbox-ose-guest-x11}#, in your live-build
-configuration. Otherwise, the resolution is limited to 800x600.
+*{Note:}* For live systems containing X.org that you want to test with #{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. Otherwise, the resolution is limited to 800x600.
 
 code{
 
@@ -240,9 +237,7 @@ which does not handle hybrid images properly, or want to use the remaining
 space on the media for some purpose, such as a persistence partition, you
 need an HDD image.
 
-Note: if you created an ISO hybrid image with the previous example, you will
-need to clean up your working directory with the #{lb clean}# command (see
-{The lb clean command}#lb-clean):
+*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):
 
 code{
 
@@ -327,8 +322,7 @@ The following sequence of commands will create a basic netboot image
 containing the Debian standard system without X.org. It is suitable for
 booting over the network.
 
-Note: if you performed any previous examples, you will need to clean up your
-working directory with the #{lb clean}# command:
+*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:
 
 code{
 
diff --git a/manual/pt_BR/user_customization-binary.ssi b/manual/pt_BR/user_customization-binary.ssi
index 73cfb15..c83563a 100644
--- a/manual/pt_BR/user_customization-binary.ssi
+++ b/manual/pt_BR/user_customization-binary.ssi
@@ -47,7 +47,7 @@ code{
  include menu.cfg
  default vesamenu.c32
  prompt 0
- timeout 5
+ timeout 50
 
 }code
 
@@ -59,7 +59,7 @@ code{
 
  #!/bin/sh
 
- sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg
+ sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg
 
 }code
 
diff --git a/manual/pt_BR/user_customization-installer.ssi b/manual/pt_BR/user_customization-installer.ssi
index a41a62d..4a10f2f 100644
--- a/manual/pt_BR/user_customization-installer.ssi
+++ b/manual/pt_BR/user_customization-installer.ssi
@@ -18,7 +18,7 @@ The three main types of installer are:
 *{"Regular" Debian Installer}*: This is a normal Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as "combined images".
 
 On such images, Debian is installed by fetching and installing .deb packages
-using #{debootstrap}# or #{cdebootstrap}#, from the local media or some
+using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some
 network-based network, resulting in a standard Debian system being installed
 to the hard disk.
 
@@ -31,16 +31,14 @@ the image and enable it for you.
 
 Installation will proceed in an identical fashion to the "Regular"
 installation described above, but at the actual package installation stage,
-instead of using #{debootstrap}# to fetch and install packages, the live
+instead of using /{debootstrap}/ to fetch and install packages, the live
 filesystem image is copied to the target. This is achieved with a special
 udeb called live-installer.
 
 After this stage, the Debian Installer continues as normal, installing and
 configuring items such as bootloaders and local users, etc.
 
-Note: to support both normal and live installer entries in the bootloader of
-the same live media, you must disable live-installer by preseeding
-#{live-installer/enable=false}#.
+*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.
 
 *{"Desktop" Debian Installer}*: Regardless of the type of Debian Installer included, #{d-i}# can be launched from the Desktop by clicking on an icon. This is user friendlier in some situations. In order to make use of this, the debian-installer-launcher package needs to be included.
 
diff --git a/manual/pt_BR/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
index 4542f38..cdb8cac 100644
--- a/manual/pt_BR/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -28,7 +28,7 @@ defaults to #{wheezy}# for the Wheezy version of live-build. Any current
 distribution carried in the Debian archive may be specified by its codename
 here. (See {Terms}#terms for more details.) The #{--distribution}# option
 not only influences the source of packages within the archive, but also
-instructs #{live-build}# to behave as needed to build each supported
+instructs live-build to behave as needed to build each supported
 distribution. For example, to build against the *{unstable}* release, Sid,
 specify:
 
@@ -294,7 +294,7 @@ code{
 
 The primary tasks available in the Debian Installer can be listed with
 #{tasksel --list-tasks}# in the live system. The contents of any task,
-including ones not included in this list, may be examined with #{tasksel
+including the ones not included in this list, may be examined with #{tasksel
 --task-packages}#.
 
 3~desktop-and-language-tasks Desktop and language tasks
@@ -466,11 +466,11 @@ code{
 
 }code
 
-This will not influence the entries in /etc/apt/sources.list, but merely
-whether /var/lib/apt contains the indices files or not. The tradeoff is that
-APT needs those indices in order to operate in the live system, so before
-performing #{apt-cache search}# or #{apt-get install}#, for instance, the
-user must #{apt-get update}# first to create those indices.
+This will not influence the entries in #{/etc/apt/sources.list}#, but merely
+whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is
+that APT needs those indices in order to operate in the live system, so
+before performing #{apt-cache search}# or #{apt-get install}#, for instance,
+the user must #{apt-get update}# first to create those indices.
 
 If you find the installation of recommended packages bloats your image too
 much, you may disable that default option of APT with:
diff --git a/manual/pt_BR/user_customization-runtime.ssi b/manual/pt_BR/user_customization-runtime.ssi
index dc37bec..30b0b38 100644
--- a/manual/pt_BR/user_customization-runtime.ssi
+++ b/manual/pt_BR/user_customization-runtime.ssi
@@ -228,14 +228,14 @@ code{
 
 }code
 
-Then we reboot. During the first boot the contents of /home and
-/var/cache/apt will be copied into the persistent volume, and from then on
-all changes to these directories will live in the persistent volume. Please
-note that any paths listed in the #{live.persist}# file cannot contain white
-spaces or the special "." and ".." path components. Also, neither "/live"
-(or any of its sub-directories) nor "/" can be made persistent using custom
-mounts (for the latter, use the #{full-ov}# type persistence described
-above).
+Then we reboot. During the first boot the contents of #{/home}# and
+#{/var/cache/apt}# will be copied into the persistent volume, and from then
+on all changes to these directories will live in the persistent
+volume. Please note that any paths listed in the #{live.persist}# file
+cannot contain white spaces or the special #{.}# and #{..}# path
+components. Also, neither #{/live}# (or any of its sub-directories) nor
+#{/}# can be made persistent using custom mounts (for the latter, use the
+#{full-ov}# type persistence described above).
 
 Several different custom overlay volumes (with their own #{live.persist}#
 files) can be used at the same time, but if several volumes make the same
diff --git a/manual/pt_BR/user_examples.ssi b/manual/pt_BR/user_examples.ssi
index 428c580..c91ed1a 100644
--- a/manual/pt_BR/user_examples.ssi
+++ b/manual/pt_BR/user_examples.ssi
@@ -179,7 +179,7 @@ code{
 3~ Second revision
 
 In this revision, we're going to clean up from the first build, add the
-#{vlc}# package to our configuration, rebuild, test and commit.
+/{vlc}/ package to our configuration, rebuild, test and commit.
 
 The #{lb clean}# command will clean up all generated files from the previous
 build except for the cache, which saves having to re-download packages. This
@@ -192,7 +192,7 @@ code{
 
 }code
 
-Now append the #{vlc}# package to our local package list in
+Now append the /{vlc}/ package to our local package list in
 #{config/package-lists/my.list.chroot}#:
 
 code{
@@ -235,8 +235,8 @@ cases drawn from the collected experiences of users of Debian Live.
 *{Use case:}* Create an image with live-build to boot directly to a VNC server.
 
 Make a build directory and create a skeletal configuration in it built
-around the standard-x11 list, including #{gdm3}#, #{metacity}# and
-#{xvnc4viewer}#, disabling recommends to make a minimal system:
+around the standard-x11 list, including /{gdm3}/, /{metacity}/ and
+/{xvnc4viewer}/, disabling recommends to make a minimal system:
 
 code{
 
@@ -249,8 +249,8 @@ code{
 }code
 
 Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for
-the default user that will launch metacity and start xvncviewer, connecting
-to port #{5901}# on a server at #{192.168.1.2}#:
+the default user that will launch /{metacity}/ and start /{xvncviewer}/,
+connecting to port #{5901}# on a server at #{192.168.1.2}#:
 
 code{
 
@@ -285,7 +285,7 @@ the tradeoffs you are making between size and functionality. In this
 example, we trim only so much as to make room for additional material within
 a 128M media size, but without doing anything to destroy integrity of the
 packages contained within, such as the purging of locale data via the
-#{localepurge}# package, or other such "intrusive" optimizations. Of
+/{localepurge}/ package, or other such "intrusive" optimizations. Of
 particular note, you should not use #{--bootstrap-flavour minimal}# unless
 you really know what you're doing, as omitting priority #{important}#
 packages will most likely produce a broken live system.
@@ -318,7 +318,7 @@ system. Choosing the #{minimal}# package list leaves out the large
 #{locales}# package and associated utilities. Dropping recommended packages
 with #{--apt-recommends false}# saves some additional space, at the expense
 of omitting some packages you might otherwise expect to be there, such as
-#{firmware-linux-free}# which may be needed to support certain hardware. The
+/{firmware-linux-free}/ which may be needed to support certain hardware. The
 remaining options shave off additional small amounts of space. It's up to
 you to decide if the functionality that is sacrificed with each optimization
 is worth the loss in functionality.
@@ -385,7 +385,7 @@ code{
 
 }code
 
-Note that we have included the #{debian-installer-launcher}# package to
-launch the installer from the live desktop, and have also specified the 486
-flavour kernel, as it is currently necessary to make the installer and live
-system kernels match for the launcher to work properly.
+Note that we have included the debian-installer-launcher package to launch
+the installer from the live desktop, and have also specified the 486 flavour
+kernel, as it is currently necessary to make the installer and live system
+kernels match for the launcher to work properly.
diff --git a/manual/pt_BR/user_installation.ssi b/manual/pt_BR/user_installation.ssi
index 1949e3d..7382051 100644
--- a/manual/pt_BR/user_installation.ssi
+++ b/manual/pt_BR/user_installation.ssi
@@ -136,8 +136,8 @@ your target platform: this means if your target is Wheezy then you should
 build against Wheezy.
 
 Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to
-build #{live-boot}# for a target distribution that differs from your build
-system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy
+build live-boot for a target distribution that differs from your build
+system. For example, for Wheezy live images, build live-boot in a Wheezy
 chroot. If your target distribution happens to match your build system
 distribution, you may build directly on the build system using
 #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
diff --git a/manual/pt_BR/user_overview.ssi b/manual/pt_BR/user_overview.ssi
index beda6d4..100ca04 100644
--- a/manual/pt_BR/user_overview.ssi
+++ b/manual/pt_BR/user_overview.ssi
@@ -14,11 +14,11 @@ The idea behind live-build is to be a framework that uses a configuration
 directory to completely automate and customize all aspects of building a
 Live image.
 
-Many concepts are similar to those in the debhelper Debian package tools
+Many concepts are similar to those in the /{debhelper}/ Debian package tools
 written by Joey Hess:
 
 _* The scripts have a central location for configuring their operation. In
-debhelper, this is the #{debian/}# subdirectory of a package tree. For
+/{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For
 example, dh_install will look, amongst others, for a file called
 #{debian/install}# to determine which files should exist in a particular
 binary package. In much the same way, live-build stores its configuration
@@ -27,7 +27,7 @@ entirely under a #{config/}# subdirectory.
 _* The scripts are independent - that is to say, it is always safe to run
 each command.
 
-Unlike debhelper, live-build contains a tool to generate a skeleton
+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}#, please see {The lb config command}#lb-config.
diff --git a/manual/ro/about_manual.ssi b/manual/ro/about_manual.ssi
index 011ce24..cc0b30f 100644
--- a/manual/ro/about_manual.ssi
+++ b/manual/ro/about_manual.ssi
@@ -67,9 +67,9 @@ _* *{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-build}*: O colectie de scripte folosite la particularizatrea
-sistemelor Debian Live. live-build a fost cunoscut ca live-helper, iar mai
-inainte ca live-package.
+_* *{live-build}*: A collection of scripts used to build customized Debian
+Live systems. live-build was formerly known as /{live-helper}/, and even
+earlier known as /{live-package}/.
 
 _* *{live-config}*: O colectie de scripte folosite la configurarea sitemului
 live in timpul procesului de pornire. live-config a fost cunoscut ca parte
@@ -84,9 +84,9 @@ distributia Debian.
 _* *{Boot parameters}*: Parameti care pot fi adaugati la promptul
 bootloader-ului care sa infuenteze kernelul sau live-config.
 
-_* *{chroot}*: Programul chroot, #{chroot(8)}#, permite rularea a diferite
-instante din mediul GNU/Linux pe un singur sistem si in simultan fara a
-necesita o repornire a sistemului.
+_* *{chroot}*: The /{chroot}/ program, #{chroot(8)}#, enables us to run
+different instances of the GNU/Linux environment on a single system
+simultaneously without rebooting.
 
 _* *{Binary image}*: Un fisier ce contine sistemul live, ca de exemplu
 binary.iso sau binary.img.
diff --git a/manual/ro/project_bugs.ssi b/manual/ro/project_bugs.ssi
index b0c34fc..a051509 100644
--- a/manual/ro/project_bugs.ssi
+++ b/manual/ro/project_bugs.ssi
@@ -71,7 +71,7 @@ _* Version of live-boot on the live system
 
 _* Version of live-config on the live system
 
-_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system
+_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system
 
 _* Architecture of the live system
 
@@ -122,8 +122,8 @@ Where does the bug appear?
 
 3~ At build time whilst bootstrapping
 
-live-build first bootstraps a basic Debian system with #{debootstrap}# or
-#{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian
+live-build first bootstraps a basic Debian system with /{debootstrap}/ or
+/{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian
 distribution it is bootstrapping, it may fail. If a bug appears here, check
 if the error is related to a specific Debian package (most likely), or if it
 is related to bootstrapping tool itself.
@@ -140,7 +140,7 @@ can fail. If a bug appears here, check if the error is also reproducible on
 a normal system.
 
 If this is the case, this is not a bug in Debian Live, but rather in Debian
-- please report it against the failing package. Running #{debootstrap}#
+- please report it against the failing package. Running /{debootstrap}/
 separately from the Live system build or running #{lb bootstrap --debug}#
 will give you more information.
 
diff --git a/manual/ro/style_guide.ssi b/manual/ro/style_guide.ssi
index 8b01cc3..fd6c6fd 100644
--- a/manual/ro/style_guide.ssi
+++ b/manual/ro/style_guide.ssi
@@ -342,11 +342,11 @@ intervention if the code changes.
 Leave the code blocks empty (they will be automatically added then) if you
 want to make your translation easier to maintain.
 
-_* /{New lines}/
+_* /{Newlines}/
 
-The translated texts need to have the exact same new lines as the original
+The translated texts need to have the exact same newlines as the original
 texts. Be careful to press the "Enter" key or type *{\n}* if they appear in
-the original files. These new lines often appear, for instance, in the code
+the original files. These newlines often appear, for instance, in the code
 blocks.
 
 Make no mistake, this does not mean that the translated text needs to have
diff --git a/manual/ro/user_basics.ssi b/manual/ro/user_basics.ssi
index 2eee04a..d66ad78 100644
--- a/manual/ro/user_basics.ssi
+++ b/manual/ro/user_basics.ssi
@@ -218,10 +218,7 @@ code{
 Create a new virtual machine, change the storage settings to use
 #{binary-hybrid.iso}# as the CD/DVD device, and start the machine.
 
-Note: For live systems containing X.org that you want to test with
-#{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver
-package, #{virtualbox-ose-guest-x11}#, in your live-build
-configuration. Otherwise, the resolution is limited to 800x600.
+*{Note:}* For live systems containing X.org that you want to test with #{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver package, #{virtualbox-ose-guest-x11}#, in your live-build configuration. Otherwise, the resolution is limited to 800x600.
 
 code{
 
@@ -240,9 +237,7 @@ which does not handle hybrid images properly, or want to use the remaining
 space on the media for some purpose, such as a persistence partition, you
 need an HDD image.
 
-Note: if you created an ISO hybrid image with the previous example, you will
-need to clean up your working directory with the #{lb clean}# command (see
-{The lb clean command}#lb-clean):
+*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):
 
 code{
 
@@ -327,8 +322,7 @@ The following sequence of commands will create a basic netboot image
 containing the Debian standard system without X.org. It is suitable for
 booting over the network.
 
-Note: if you performed any previous examples, you will need to clean up your
-working directory with the #{lb clean}# command:
+*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:
 
 code{
 
diff --git a/manual/ro/user_customization-binary.ssi b/manual/ro/user_customization-binary.ssi
index 73cfb15..c83563a 100644
--- a/manual/ro/user_customization-binary.ssi
+++ b/manual/ro/user_customization-binary.ssi
@@ -47,7 +47,7 @@ code{
  include menu.cfg
  default vesamenu.c32
  prompt 0
- timeout 5
+ timeout 50
 
 }code
 
@@ -59,7 +59,7 @@ code{
 
  #!/bin/sh
 
- sed -i 's/timeout 0/timeout 5/' binary/isolinux/isolinux.cfg
+ sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg
 
 }code
 
diff --git a/manual/ro/user_customization-installer.ssi b/manual/ro/user_customization-installer.ssi
index a41a62d..4a10f2f 100644
--- a/manual/ro/user_customization-installer.ssi
+++ b/manual/ro/user_customization-installer.ssi
@@ -18,7 +18,7 @@ The three main types of installer are:
 *{"Regular" Debian Installer}*: This is a normal Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as "combined images".
 
 On such images, Debian is installed by fetching and installing .deb packages
-using #{debootstrap}# or #{cdebootstrap}#, from the local media or some
+using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some
 network-based network, resulting in a standard Debian system being installed
 to the hard disk.
 
@@ -31,16 +31,14 @@ the image and enable it for you.
 
 Installation will proceed in an identical fashion to the "Regular"
 installation described above, but at the actual package installation stage,
-instead of using #{debootstrap}# to fetch and install packages, the live
+instead of using /{debootstrap}/ to fetch and install packages, the live
 filesystem image is copied to the target. This is achieved with a special
 udeb called live-installer.
 
 After this stage, the Debian Installer continues as normal, installing and
 configuring items such as bootloaders and local users, etc.
 
-Note: to support both normal and live installer entries in the bootloader of
-the same live media, you must disable live-installer by preseeding
-#{live-installer/enable=false}#.
+*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.
 
 *{"Desktop" Debian Installer}*: Regardless of the type of Debian Installer included, #{d-i}# can be launched from the Desktop by clicking on an icon. This is user friendlier in some situations. In order to make use of this, the debian-installer-launcher package needs to be included.
 
diff --git a/manual/ro/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
index 4542f38..cdb8cac 100644
--- a/manual/ro/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -28,7 +28,7 @@ defaults to #{wheezy}# for the Wheezy version of live-build. Any current
 distribution carried in the Debian archive may be specified by its codename
 here. (See {Terms}#terms for more details.) The #{--distribution}# option
 not only influences the source of packages within the archive, but also
-instructs #{live-build}# to behave as needed to build each supported
+instructs live-build to behave as needed to build each supported
 distribution. For example, to build against the *{unstable}* release, Sid,
 specify:
 
@@ -294,7 +294,7 @@ code{
 
 The primary tasks available in the Debian Installer can be listed with
 #{tasksel --list-tasks}# in the live system. The contents of any task,
-including ones not included in this list, may be examined with #{tasksel
+including the ones not included in this list, may be examined with #{tasksel
 --task-packages}#.
 
 3~desktop-and-language-tasks Desktop and language tasks
@@ -466,11 +466,11 @@ code{
 
 }code
 
-This will not influence the entries in /etc/apt/sources.list, but merely
-whether /var/lib/apt contains the indices files or not. The tradeoff is that
-APT needs those indices in order to operate in the live system, so before
-performing #{apt-cache search}# or #{apt-get install}#, for instance, the
-user must #{apt-get update}# first to create those indices.
+This will not influence the entries in #{/etc/apt/sources.list}#, but merely
+whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is
+that APT needs those indices in order to operate in the live system, so
+before performing #{apt-cache search}# or #{apt-get install}#, for instance,
+the user must #{apt-get update}# first to create those indices.
 
 If you find the installation of recommended packages bloats your image too
 much, you may disable that default option of APT with:
diff --git a/manual/ro/user_customization-runtime.ssi b/manual/ro/user_customization-runtime.ssi
index dc37bec..30b0b38 100644
--- a/manual/ro/user_customization-runtime.ssi
+++ b/manual/ro/user_customization-runtime.ssi
@@ -228,14 +228,14 @@ code{
 
 }code
 
-Then we reboot. During the first boot the contents of /home and
-/var/cache/apt will be copied into the persistent volume, and from then on
-all changes to these directories will live in the persistent volume. Please
-note that any paths listed in the #{live.persist}# file cannot contain white
-spaces or the special "." and ".." path components. Also, neither "/live"
-(or any of its sub-directories) nor "/" can be made persistent using custom
-mounts (for the latter, use the #{full-ov}# type persistence described
-above).
+Then we reboot. During the first boot the contents of #{/home}# and
+#{/var/cache/apt}# will be copied into the persistent volume, and from then
+on all changes to these directories will live in the persistent
+volume. Please note that any paths listed in the #{live.persist}# file
+cannot contain white spaces or the special #{.}# and #{..}# path
+components. Also, neither #{/live}# (or any of its sub-directories) nor
+#{/}# can be made persistent using custom mounts (for the latter, use the
+#{full-ov}# type persistence described above).
 
 Several different custom overlay volumes (with their own #{live.persist}#
 files) can be used at the same time, but if several volumes make the same
diff --git a/manual/ro/user_examples.ssi b/manual/ro/user_examples.ssi
index 428c580..c91ed1a 100644
--- a/manual/ro/user_examples.ssi
+++ b/manual/ro/user_examples.ssi
@@ -179,7 +179,7 @@ code{
 3~ Second revision
 
 In this revision, we're going to clean up from the first build, add the
-#{vlc}# package to our configuration, rebuild, test and commit.
+/{vlc}/ package to our configuration, rebuild, test and commit.
 
 The #{lb clean}# command will clean up all generated files from the previous
 build except for the cache, which saves having to re-download packages. This
@@ -192,7 +192,7 @@ code{
 
 }code
 
-Now append the #{vlc}# package to our local package list in
+Now append the /{vlc}/ package to our local package list in
 #{config/package-lists/my.list.chroot}#:
 
 code{
@@ -235,8 +235,8 @@ cases drawn from the collected experiences of users of Debian Live.
 *{Use case:}* Create an image with live-build to boot directly to a VNC server.
 
 Make a build directory and create a skeletal configuration in it built
-around the standard-x11 list, including #{gdm3}#, #{metacity}# and
-#{xvnc4viewer}#, disabling recommends to make a minimal system:
+around the standard-x11 list, including /{gdm3}/, /{metacity}/ and
+/{xvnc4viewer}/, disabling recommends to make a minimal system:
 
 code{
 
@@ -249,8 +249,8 @@ code{
 }code
 
 Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for
-the default user that will launch metacity and start xvncviewer, connecting
-to port #{5901}# on a server at #{192.168.1.2}#:
+the default user that will launch /{metacity}/ and start /{xvncviewer}/,
+connecting to port #{5901}# on a server at #{192.168.1.2}#:
 
 code{
 
@@ -285,7 +285,7 @@ the tradeoffs you are making between size and functionality. In this
 example, we trim only so much as to make room for additional material within
 a 128M media size, but without doing anything to destroy integrity of the
 packages contained within, such as the purging of locale data via the
-#{localepurge}# package, or other such "intrusive" optimizations. Of
+/{localepurge}/ package, or other such "intrusive" optimizations. Of
 particular note, you should not use #{--bootstrap-flavour minimal}# unless
 you really know what you're doing, as omitting priority #{important}#
 packages will most likely produce a broken live system.
@@ -318,7 +318,7 @@ system. Choosing the #{minimal}# package list leaves out the large
 #{locales}# package and associated utilities. Dropping recommended packages
 with #{--apt-recommends false}# saves some additional space, at the expense
 of omitting some packages you might otherwise expect to be there, such as
-#{firmware-linux-free}# which may be needed to support certain hardware. The
+/{firmware-linux-free}/ which may be needed to support certain hardware. The
 remaining options shave off additional small amounts of space. It's up to
 you to decide if the functionality that is sacrificed with each optimization
 is worth the loss in functionality.
@@ -385,7 +385,7 @@ code{
 
 }code
 
-Note that we have included the #{debian-installer-launcher}# package to
-launch the installer from the live desktop, and have also specified the 486
-flavour kernel, as it is currently necessary to make the installer and live
-system kernels match for the launcher to work properly.
+Note that we have included the debian-installer-launcher package to launch
+the installer from the live desktop, and have also specified the 486 flavour
+kernel, as it is currently necessary to make the installer and live system
+kernels match for the launcher to work properly.
diff --git a/manual/ro/user_installation.ssi b/manual/ro/user_installation.ssi
index 1949e3d..7382051 100644
--- a/manual/ro/user_installation.ssi
+++ b/manual/ro/user_installation.ssi
@@ -136,8 +136,8 @@ your target platform: this means if your target is Wheezy then you should
 build against Wheezy.
 
 Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to
-build #{live-boot}# for a target distribution that differs from your build
-system. For example, for Wheezy live images, build #{live-boot}# in a Wheezy
+build live-boot for a target distribution that differs from your build
+system. For example, for Wheezy live images, build live-boot in a Wheezy
 chroot. If your target distribution happens to match your build system
 distribution, you may build directly on the build system using
 #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
diff --git a/manual/ro/user_overview.ssi b/manual/ro/user_overview.ssi
index beda6d4..100ca04 100644
--- a/manual/ro/user_overview.ssi
+++ b/manual/ro/user_overview.ssi
@@ -14,11 +14,11 @@ The idea behind live-build is to be a framework that uses a configuration
 directory to completely automate and customize all aspects of building a
 Live image.
 
-Many concepts are similar to those in the debhelper Debian package tools
+Many concepts are similar to those in the /{debhelper}/ Debian package tools
 written by Joey Hess:
 
 _* The scripts have a central location for configuring their operation. In
-debhelper, this is the #{debian/}# subdirectory of a package tree. For
+/{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For
 example, dh_install will look, amongst others, for a file called
 #{debian/install}# to determine which files should exist in a particular
 binary package. In much the same way, live-build stores its configuration
@@ -27,7 +27,7 @@ entirely under a #{config/}# subdirectory.
 _* The scripts are independent - that is to say, it is always safe to run
 each command.
 
-Unlike debhelper, live-build contains a tool to generate a skeleton
+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}#, please see {The lb config command}#lb-config.

-- 
live-manual



More information about the debian-live-changes mailing list