[SCM] live-manual branch, debian, updated. debian/2.0.0-1-52-g4e07906

Ben Armstrong synrg at debian.org
Mon Dec 20 01:58:17 UTC 2010


The following commit has been merged in the debian branch:
commit 4e07906b88a34f4b23654ba8f122a04a120da733
Author: Ben Armstrong <synrg at debian.org>
Date:   Sun Dec 19 21:46:58 2010 -0400

    Fixing badly wrapped (by po4a) code blocks throughout manual by indenting every line by one.

diff --git a/manual/de/about_manual.ssi b/manual/de/about_manual.ssi
index 0c93b29..77666b4 100644
--- a/manual/de/about_manual.ssi
+++ b/manual/de/about_manual.ssi
@@ -152,7 +152,7 @@ installed by executing:
 
 code{
 
-# apt-get install make po4a sisu-complete
+ # apt-get install make po4a sisu-complete
 
 }code
 
@@ -161,7 +161,7 @@ checkout by executing:
 
 code{
 
-$ make build
+ $ make build
 
 }code
 
@@ -171,7 +171,7 @@ executing:
 
 code{
 
-$ make build LANGUAGES=en
+ $ make build LANGUAGES=en
 
 }code
 
@@ -185,12 +185,12 @@ _* Fetch the public commit key:
 
 code{
 
-$ mkdir -p ~/.ssh/identity.d
-$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \
-	-O ~/.ssh/identity.d/gitosis at live.debian.net
-$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \
-	-O ~/.ssh/identity.d/gitosis at live.debian.net.pub
-$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*
+ $ mkdir -p ~/.ssh/identity.d
+ $ wget http://live.debian.net/other/keys/gitosis@live.debian.net \
+     -O ~/.ssh/identity.d/gitosis at live.debian.net
+ $ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \
+     -O ~/.ssh/identity.d/gitosis at live.debian.net.pub
+ $ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*
 
 }code
 
@@ -198,12 +198,12 @@ _* Add the following section to your openssh-client config:
 
 code{
 
-$ cat >> ~/.ssh/config << EOF
-Host live.debian.net
-        Hostname live.debian.net
-        User gitosis
-        IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net
-EOF
+ $ cat >> ~/.ssh/config << EOF
+ Host live.debian.net
+     Hostname live.debian.net
+     User gitosis
+     IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net
+ EOF
 
 }code
 
@@ -211,7 +211,7 @@ _* Check out a clone of the manual through ssh:
 
 code{
 
-$ git clone gitosis at live.debian.net:/live-manual.git
+ $ git clone gitosis at live.debian.net:/live-manual.git
 
 }code
 
@@ -221,7 +221,7 @@ translation files:
 
 code{
 
-$ make commit
+ $ make commit
 
 }code
 
@@ -232,7 +232,7 @@ ending with a full stop. Usually, these will start with the form
 
 code{
 
-$ git commit -a -m "Adding a section on applying patches."
+ $ git commit -a -m "Adding a section on applying patches."
 
 }code
 
@@ -240,7 +240,7 @@ _* Push the commit to the server:
 
 code{
 
-$ git push
+ $ git push
 
 }code
 
diff --git a/manual/de/project_bugs.ssi b/manual/de/project_bugs.ssi
index e468f78..685bead 100644
--- a/manual/de/project_bugs.ssi
+++ b/manual/de/project_bugs.ssi
@@ -81,7 +81,7 @@ You can generate a log of the build process by using the tee command:
 
 code{
 
-# lb build 2>&1 | tee build.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
diff --git a/manual/de/project_coding-style.ssi b/manual/de/project_coding-style.ssi
index 696ead9..d53655c 100644
--- a/manual/de/project_coding-style.ssi
+++ b/manual/de/project_coding-style.ssi
@@ -27,9 +27,9 @@ Bad:
 
 code{
 
-if foo; then
-        bar
-fi
+ if foo; then
+         bar
+ fi
 
 }code
 
@@ -37,10 +37,10 @@ Good:
 
 code{
 
-if foo
-then
-        bar
-fi
+ if foo
+ then
+         bar
+ fi
 
 }code
 
@@ -50,9 +50,9 @@ Bad:
 
 code{
 
-foo () {
-        bar
-}
+ foo () {
+         bar
+ }
 
 }code
 
@@ -60,10 +60,10 @@ Good:
 
 code{
 
-foo ()
-{
-        bar
-}
+ foo ()
+ {
+         bar
+ }
 
 }code
 
@@ -95,7 +95,7 @@ Bad:
 
 code{
 
-FOO=bar
+ FOO=bar
 
 }code
 
@@ -103,7 +103,7 @@ Good:
 
 code{
 
-FOO="bar"
+ FOO="bar"
 
 }code
 
@@ -113,10 +113,10 @@ Bad:
 
 code{
 
-if [ -f "${FOO}"/foo/"${BAR}"/bar ]
-then
-        foobar
-fi
+ if [ -f "${FOO}"/foo/"${BAR}"/bar ]
+ then
+         foobar
+ fi
 
 }code
 
@@ -124,10 +124,10 @@ Good:
 
 code{
 
-if [ -f "${FOO}/foo/${BAR}/bar" ]
-then
-        foobar
-fi
+ if [ -f "${FOO}/foo/${BAR}/bar" ]
+ then
+         foobar
+ fi
 
 }code
 
diff --git a/manual/de/project_procedures.ssi b/manual/de/project_procedures.ssi
index eead1ee..55b408e 100644
--- a/manual/de/project_procedures.ssi
+++ b/manual/de/project_procedures.ssi
@@ -11,7 +11,7 @@ Before commiting releases of a udeb in d-i svn, one has to call:
 
 code{
 
-$ ../../scripts/l10n/output-l10n-changes . -d
+ $ ../../scripts/l10n/output-l10n-changes . -d
 
 }code
 
@@ -51,11 +51,11 @@ below and the following command:
 
 code{
 
-$ sed \
-  -e 's|%major%|5.0|g' \
-  -e 's|%minor%|5.0.2|g' \
-  -e 's|%codename%|lenny|g' \
-  -e 's|%release_mail%|2009/msg00007.html|g'
+ $ sed \
+     -e 's|%major%|5.0|g' \
+     -e 's|%minor%|5.0.2|g' \
+     -e 's|%codename%|lenny|g' \
+     -e 's|%release_mail%|2009/msg00007.html|g'
 
 }code
 
@@ -64,76 +64,76 @@ proof-reading.
 
 code{
 
-Debian Live images for Debian GNU/Linux %major% updated
+ Debian Live images for Debian GNU/Linux %major% updated
 
-The Debian Live project is pleased to announce the availability of updated
-Live images for its stable distribution Debian GNU/Linux %major% (codename
-"%codename%").
+ The Debian Live project is pleased to announce the availability of
+ updated Live images for its stable distribution Debian GNU/Linux %major%
+ (codename "%codename%").
 
-The images are available for download at:
+ The images are available for download at:
 
-    <http://cdimage.debian.org/cdimage/release/current-live/>
+     <http://cdimage.debian.org/cdimage/release/current-live/>
 
-This update incorporates the changes made in the %minor% point release,
-which adds corrections for security problems to the stable release along
-with a few adjustments for serious problems. A full list of the changes may
-be viewed at:
+ This update incorporates the changes made in the %minor% point release,
+ which adds corrections for security problems to the stable release
+ along with a few adjustments for serious problems. A full list of the
+ changes may be viewed at:
 
-    <http://lists.debian.org/debian-announce/%release_mail%>
+     <http://lists.debian.org/debian-announce/%release_mail%>
 
-It also includes the following Live-specific changes:
+ It also includes the following Live-specific changes:
 
- * [INSERT LIVE-SPECIFIC CHANGE HERE]
- * [INSERT LIVE-SPECIFIC CHANGE HERE]
- * [LARGER ISSUES MAY DESERVE THEIR OWN SECTION]
+  * [INSERT LIVE-SPECIFIC CHANGE HERE]
+  * [INSERT LIVE-SPECIFIC CHANGE HERE]
+  * [LARGER ISSUES MAY DESERVE THEIR OWN SECTION]
 
 
-URLs
-----
+ URLs
+ ----
 
-Download location of updated images:
+ Download location of updated images:
 
-  <http://cdimage.debian.org/cdimage/release/current-live/>
+   <http://cdimage.debian.org/cdimage/release/current-live/>
 
-Debian Live Projekt Homepage:
+ Debian Live Projekt Homepage:
 
-  <http://live.debian.net/>
+   <http://live.debian.net/>
 
-The current stable distribution:
+ The current stable distribution:
 
-  <http://ftp.debian.org/debian/dists/stable>
+   <http://ftp.debian.org/debian/dists/stable>
 
-stable distribution information (release notes, errata etc.):
+ stable distribution information (release notes, errata etc.):
 
-  <http://www.debian.org/releases/stable/>
+   <http://www.debian.org/releases/stable/>
 
-Security announcements and information:
+ Security announcements and information:
 
-  <http://www.debian.org/security/>
+   <http://www.debian.org/security/>
 
 
-About Debian
--------------
+ About Debian
+ -------------
 
-The Debian Project is an association of Free Software developers who
-volunteer their time and effort in order to produce the completely free
-operating system Debian GNU/Linux.
+ The Debian Project is an association of Free Software developers who
+ volunteer their time and effort in order to produce the completely free
+ operating system Debian GNU/Linux.
 
 
-About Debian Live
------------------
+ About Debian Live
+ -----------------
 
-Debian Live is an official sub-project of Debian which produces Debian
-systems that do not require a classical installer. Images are available for
-CD/DVD discs, USB sticks and PXE netbooting as well as a bare filesystem
-images for booting directly from the internet.
+ Debian Live is an official sub-project of Debian which produces Debian
+ systems that do not require a classical installer. Images are available
+ for CD/DVD discs, USB sticks and PXE netbooting as well as a bare
+ filesystem images for booting directly from the internet.
 
 
-Contact Information
--------------------
+ Contact Information
+ -------------------
 
-For further information, please visit the Debian Live web pages at
-<http://live.debian.net/> or alternatively send mail to
-<debian-live at lists.debian.org>.
+ For further information, please visit the Debian Live web pages at
+ <http://live.debian.net/> or alternatively send mail to
+ <debian-live at lists.debian.org>.
 
 }code
diff --git a/manual/de/user_basics.ssi b/manual/de/user_basics.ssi
index b39c457..ae7318e 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/de/user_basics.ssi
@@ -65,7 +65,7 @@ hierarchy in the current directory for use by other commands:
 
 code{
 
-$ lb config
+ $ lb config
 
 }code
 
@@ -77,7 +77,7 @@ build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -90,9 +90,9 @@ Testing an ISO is simple:
 
 code{
 
-# apt-get install qemu
+ # apt-get install qemu
 
-$ qemu -cdrom binary.iso
+ $ qemu -cdrom binary.iso
 
 }code
 
@@ -102,9 +102,9 @@ In order to test the ISO with virtualbox-ose:
 
 code{
 
-# apt-get install virtualbox-ose virtualbox-ose-dkms
+ # apt-get install virtualbox-ose virtualbox-ose-dkms
 
-$ virtualbox
+ $ virtualbox
 
 }code
 
@@ -118,7 +118,7 @@ resolution is limited to 800x600.
 
 code{
 
-# lb config --packages virtualbox-ose-guest-x11
+ $ lb config --packages virtualbox-ose-guest-x11
 
 }code
 
@@ -128,9 +128,9 @@ Burning an ISO image is easy:
 
 code{
 
-# apt-get install wodim
+ # apt-get install wodim
 
-$ wodim binary.iso
+ $ wodim binary.iso
 
 }code
 
@@ -150,7 +150,7 @@ lb clean command}#lb-clean):
 
 code{
 
-$ lb clean --binary
+ # lb clean --binary
 
 }code
 
@@ -159,7 +159,7 @@ Run the #{lb config}# command with the parameters to configure the
 
 code{
 
-$ lb config -b usb-hdd
+ $ lb config -b usb-hdd
 
 }code
 
@@ -167,7 +167,7 @@ Now build the image with the #{lb build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -179,7 +179,7 @@ with a size larger than that of binary.img and type:
 
 code{
 
-$ dd if=binary.img of=${USBSTICK}
+ $ dd if=binary.img of=${USBSTICK}
 
 }code
 
@@ -197,9 +197,9 @@ type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images.
 
 code{
 
-# apt-get install qemu
+ # apt-get install qemu
 
-$ qemu -hda binary.img
+ $ qemu -hda binary.img
 
 }code
 
@@ -212,7 +212,7 @@ be used by the Debian Live system.
 
 code{
 
-# gparted ${USBSTICK}
+ # gparted ${USBSTICK}
 
 }code
 
@@ -221,7 +221,7 @@ it. One possible choice would be ext4.
 
 code{
 
-# mkfs.ext4 ${USBSTICK}
+ # mkfs.ext4 ${USBSTICK}
 
 }code
 
@@ -229,7 +229,7 @@ If you want to use this data partition with Windows, use FAT32.
 
 code{
 
-# mkfs.vfat -F 32
+ # mkfs.vfat -F 32
 
 }code
 
@@ -246,7 +246,7 @@ working directory with the #{lb clean}# command:
 
 code{
 
-# lb clean --binary
+ # lb clean --binary
 
 }code
 
@@ -255,8 +255,7 @@ netbooting:
 
 code{
 
-$ lb config -b net --net-root-path "/srv/debian-live" --net-root-server
-"192.168.0.1"
+ $ lb config -b net --net-root-path "/srv/debian-live" --net-root-server "192.168.0.1"
 
 }code
 
@@ -271,7 +270,7 @@ Now build the image with the #{lb build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -301,21 +300,22 @@ Here is an example for inspiration, written for the ISC DHCP server
 
 code{
 
-# /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server
+ # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server
 
-ddns-update-style none;
+ ddns-update-style none;
 
-option domain-name "example.org"; option domain-name-servers
-ns1.example.org, ns2.example.org;
+ option domain-name "example.org";
+ option domain-name-servers ns1.example.org, ns2.example.org;
 
-default-lease-time 600; max-lease-time 7200;
+ default-lease-time 600;
+ max-lease-time 7200;
 
-log-facility local7;
+ log-facility local7;
 
-subnet 192.168.0.0 netmask 255.255.255.0 {
-  range 192.168.0.1 192.168.0.254;
-  next-server servername;
-  filename "pxelinux.0";
+ subnet 192.168.0.0 netmask 255.255.255.0 {
+   range 192.168.0.1 192.168.0.254;
+   next-server servername;
+   filename "pxelinux.0";
 }
 
 }code
@@ -330,7 +330,7 @@ inside a root directory, usually #{/srv/tftp}#. To let it serve files inside
 
 code{
 
-# dpkg-reconfigure -plow tftpd-hpa
+ # dpkg-reconfigure -plow tftpd-hpa
 
 }code
 
@@ -349,7 +349,7 @@ the following to #{/etc/exports}#:
 
 code{
 
-/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)
+ /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)
 
 }code
 
@@ -357,7 +357,7 @@ and tell the NFS server about this new export with the following command:
 
 code{
 
-# exportfs -rv
+ # exportfs -rv
 
 }code
 
@@ -383,10 +383,14 @@ Edit #{/etc/qemu-ifup}#:
 
 code{
 
-#!/bin/sh sudo -p "Password for $0:" /sbin/ifconfig $1 172.20.0.1 echo
-"Executing /etc/qemu-ifup" echo "Bringing up $1 for bridged mode..." sudo
-/sbin/ifconfig $1 0.0.0.0 promisc up echo "Adding $1 to br0..." sudo
-/usr/sbin/brctl addif br0 $1 sleep 2
+ #!/bin/sh
+ sudo -p "Password for $0:" /sbin/ifconfig $1 172.20.0.1
+ echo "Executing /etc/qemu-ifup"
+ echo "Bringing up $1 for bridged mode..."
+ sudo /sbin/ifconfig $1 0.0.0.0 promisc up
+ echo "Adding $1 to br0..."
+ sudo /usr/sbin/brctl addif br0 $1
+ sleep 2
 
 }code
 
@@ -405,19 +409,28 @@ _* Paste this text inside:
 
 code{
 
-#!/usr/bin/vmware config.version = "8" virtualHW.version = "4" memsize =
-"512" MemAllowAutoScaleDown = "FALSE"
+ #!/usr/bin/vmware
+ config.version = "8"
+ virtualHW.version = "4"
+ memsize = "512"
+ MemAllowAutoScaleDown = "FALSE"
 
-ide0:0.present = "FALSE" ide1:0.present = "FALSE" floppy0.present = "FALSE"
-sound.present = "FALSE" tools.remindInstall = "FALSE"
+ ide0:0.present = "FALSE"
+ ide1:0.present = "FALSE"
+ floppy0.present = "FALSE"
+ sound.present = "FALSE"
+ tools.remindInstall = "FALSE"
 
-ethernet0.present = "TRUE" ethernet0.addressType = "generated"
+ ethernet0.present = "TRUE"
+ ethernet0.addressType = "generated"
 
-displayName = "Test Boot PXE" guestOS = "other"
+ displayName = "Test Boot PXE"
+ guestOS = "other"
 
-ethernet0.generatedAddress = "00:0c:29:8d:71:3b" uuid.location = "56 4d 83
-72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b" uuid.bios = "56 4d 83 72 5c c4 de
-3f-ae 9e 07 91 1d 8d 71 3b" ethernet0.generatedAddressOffset = "0"
+ ethernet0.generatedAddress = "00:0c:29:8d:71:3b"
+ uuid.location = "56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b"
+ uuid.bios = "56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b"
+ ethernet0.generatedAddressOffset = "0"
 
 }code
 
diff --git a/manual/de/user_customization-contents.ssi b/manual/de/user_customization-contents.ssi
index cc19244..3906219 100644
--- a/manual/de/user_customization-contents.ssi
+++ b/manual/de/user_customization-contents.ssi
@@ -49,8 +49,8 @@ system, use:
 
 code{
 
-$ mkdir -p config/chroot_local-includes/var/www $ cp /path/to/my/index.html
-config/chroot_local-includes/var/www
+ $ mkdir -p config/chroot_local-includes/var/www
+ $ cp /path/to/my/index.html config/chroot_local-includes/var/www
 
 }code
 
@@ -58,14 +58,14 @@ Your configuration will then have the following layout:
 
 code{
 
--- config
-   [...]
-    |-- chroot_local-includes
-    |   `-- var
-    |       `-- www
-    |           `-- index.html
-   [...]
-    `-- templates
+ -- config
+    [...]
+     |-- chroot_local-includes
+     |   `-- var
+     |       `-- www
+     |           `-- index.html
+    [...]
+     `-- templates
 
 }code
 
@@ -84,7 +84,7 @@ linked to by an HTML index page. Simply copy the material to
 
 code{
 
-$ cp ~/video_demo.* config/binary_local-includes/
+ $ cp ~/video_demo.* config/binary_local-includes/
 
 }code
 
@@ -97,7 +97,7 @@ in the default configuration on every live media. This can be disabled with:
 
 code{
 
-$ lb config --includes none
+ $ lb config --includes none
 
 }code
 
diff --git a/manual/de/user_customization-installer.ssi b/manual/de/user_customization-installer.ssi
index 8e6dd98..6ed2152 100644
--- a/manual/de/user_customization-installer.ssi
+++ b/manual/de/user_customization-installer.ssi
@@ -52,8 +52,8 @@ architecture. For example:
 
 code{
 
-$ lb config --architecture i386 --linux-flavours 486 --debian-installer live
---packages debian-installer-launcher
+ $ lb config --architecture i386 --linux-flavours 486 \
+     --debian-installer live --packages debian-installer-launcher
 
 }code
 
@@ -72,8 +72,8 @@ locale to #{en_US}#:
 
 code{
 
-$ echo "d-i debian-installer/locale string en_US" >>
-config/binary_debian-installer/preseed.cfg
+ $ echo "d-i debian-installer/locale string en_US" \
+     >> config/binary_debian-installer/preseed.cfg
 
 }code
 
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index 03c9a6e..327106f 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -34,7 +34,7 @@ specify:
 
 code{
 
-$ lb config --distribution sid
+ $ lb config --distribution sid
 
 }code
 
@@ -46,7 +46,7 @@ specified, e.g.
 
 code{
 
-$ lb config --archive-areas "main contrib"
+ $ lb config --archive-areas "main contrib"
 
 }code
 
@@ -81,8 +81,8 @@ mirror, it is sufficient to set #{--mirror-bootstrap}# and
 
 code{
 
-$ lb config --mirror-bootstrap http://localhost/debian/ \
-            --mirror-chroot-security http://localhost/debian-security/
+ $ lb config --mirror-bootstrap http://localhost/debian/ \
+             --mirror-chroot-security http://localhost/debian-security/
 
 }code
 
@@ -102,8 +102,8 @@ suitable for users on a network where "#{mirror}#" is reachable.
 
 code{
 
-$ lb config --mirror-binary http://mirror/debian/ \
-            --mirror-binary-security http://mirror/debian-security/
+ $ lb config --mirror-binary http://mirror/debian/ \
+             --mirror-binary-security http://mirror/debian-security/
 
 }code
 
@@ -123,7 +123,7 @@ packages from the debian live snapshot repository at live system build time.
 
 code{
 
-deb http://live.debian.net/ sid-snapshots main contrib non-free
+ deb http://live.debian.net/ sid-snapshots main contrib non-free
 
 }code
 
@@ -142,7 +142,7 @@ snapshots, a simple command is enough to enable it:
 
 code{
 
-$ lb config --repository live.debian.net
+ $ lb config --repository live.debian.net
 
 }code
 
@@ -164,7 +164,7 @@ When the number of packages added is small, simply specify
 
 code{
 
-$ lb config --packages "package1 package2 package3"
+ $ lb config --packages "package1 package2 package3"
 
 }code
 
@@ -194,7 +194,7 @@ with the #{--packages-lists}# option. For example:
 
 code{
 
-$ lb config --packages-lists "gnome-core rescue"
+ $ lb config --packages-lists "gnome-core rescue"
 
 }code
 
@@ -247,7 +247,8 @@ the following contents:
 
 code{
 
-#include <gnome> iceweasel
+ #include <gnome>
+ iceweasel
 
 }code
 
@@ -265,7 +266,9 @@ specified:
 
 code{
 
-#if ARCHITECTURE amd64 ia32-libs #endif
+ #if ARCHITECTURE amd64
+ ia32-libs
+ #endif
 
 }code
 
@@ -275,7 +278,9 @@ is specified:
 
 code{
 
-#if ARCHITECTURE i386 amd64 memtest86+ #endif
+ #if ARCHITECTURE i386 amd64
+ memtest86+
+ #endif
 
 }code
 
@@ -285,7 +290,9 @@ via #{--archive-areas}#:
 
 code{
 
-#if ARCHIVE_AREAS contrib non-free vrms #endif
+ #if ARCHIVE_AREAS contrib non-free
+ vrms
+ #endif
 
 }code
 
@@ -293,7 +300,9 @@ A conditional may surround an #{#include}# directive:
 
 code{
 
-#if ARCHITECTURE amd64 #include <gnome-full> #endif
+ #if ARCHITECTURE amd64
+ #include <gnome-full>
+ #endif
 
 }code
 
@@ -310,7 +319,7 @@ via the #{--tasks}# option, as in the example below.
 
 code{
 
-$ lb config --tasks "mail-server file-server"
+ $ lb config --tasks "mail-server file-server"
 
 }code
 
@@ -340,7 +349,7 @@ in your configuration. For example:
 
 code{
 
-$ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
+ $ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
 
 }code
 
@@ -362,7 +371,7 @@ different desktop flavours.
 
 code{
 
-$ lb config --language es
+ $ lb config --language es
 
 }code
 
@@ -474,7 +483,7 @@ or #{--apt-http-proxy}# options as needed, e.g.
 
 code{
 
-$ lb config --apt-http-proxy http://proxy/
+ $ lb config --apt-http-proxy http://proxy/
 
 }code
 
@@ -489,7 +498,7 @@ with:
 
 code{
 
-$ lb config --binary-indices false
+ $ lb config --binary-indices false
 
 }code
 
@@ -504,7 +513,7 @@ much, you may disable that default option of APT with:
 
 code{
 
-$ lb config --apt-recommends false
+ $ lb config --apt-recommends false
 
 }code
 
@@ -542,11 +551,16 @@ distribution, Squeeze. The following will accomplish this:
 
 code{
 
-$ echo "deb http://mirror/debian sid main" >
-config/chroot_sources/sid.chroot $ cat >>config/chroot_apt/preferences <<END
-Package: live-* Pin: release n=sid Pin-Priority: 600
+ $ echo "deb http://mirror/debian sid main" > config/chroot_sources/sid.chroot
+ $ cat >>config/chroot_apt/preferences <<END
+ Package: live-*
+ Pin: release n=sid
+ Pin-Priority: 600
 
-Package: * Pin: release n=sid Pin-Priority: 1 END
+ Package: *
+ Pin: release n=sid
+ Pin-Priority: 1
+ END
 
 }code
 
@@ -559,7 +573,9 @@ following stanza to #{config/chroot_apt/preferences}#:
 
 code{
 
-Package: gnome-keyring Pin: version * Pin-Priority: -1
+ Package: gnome-keyring
+ Pin: version *
+ Pin-Priority: -1
 
 }code
 
diff --git a/manual/de/user_customization-runtime.ssi b/manual/de/user_customization-runtime.ssi
index 35d331f..471abb4 100644
--- a/manual/de/user_customization-runtime.ssi
+++ b/manual/de/user_customization-runtime.ssi
@@ -21,8 +21,7 @@ add the live user to the #{fuse}# group, add the following to a file in the
 
 code{
 
-debconf passwd/user-default-groups string audio cdrom dialout floppy video
-plugdev netdev powerdev fuse
+ debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse
 
 }code
 
@@ -42,7 +41,7 @@ the #{--bootappend-live}# option of #{lb config}#, e.g.
 
 code{
 
-$ lb config --bootappend-live "locales=de_CH.UTF-8"
+ $ lb config --bootappend-live "locales=de_CH.UTF-8"
 
 }code
 
@@ -59,8 +58,8 @@ spoken, e.g:
 
 code{
 
-$ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
-<name>se</name>
+ $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
+ <name>se</name>
 
 }code
 
@@ -69,7 +68,7 @@ use:
 
 code{
 
-$ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
+ $ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
 
 }code
 
@@ -78,8 +77,8 @@ with the following command:
 
 code{
 
-$ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); do basename $i |
-head -c -9; echo; done | sort | less
+ $ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); \
+     do basename $i | head -c -9; echo; done | sort | less
 
 }code
 
@@ -93,8 +92,8 @@ TypeMatrix keyboard, both in console and X11, use:
 
 code{
 
-$ lb config --bootappend-live "locales=fr_FR.UTF-8 keyboard-layouts=fr
-keyboard-variant=bepo keyboard-model=tm2030usb"
+ $ lb config --bootappend-live \
+     "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
 
 }code
 
@@ -134,7 +133,7 @@ hard disk or on a usb key created with, e.g.:
 
 code{
 
-# mkfs.ext2 -L live-rw /dev/sdb1
+ # mkfs.ext2 -L live-rw /dev/sdb1
 
 }code
 
@@ -143,8 +142,8 @@ label with one of the following:
 
 code{
 
-# tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems # dosfslabel
-/dev/sdb1 live-rw # for a fat filesystem
+ # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems
+ # dosfslabel /dev/sdb1 live-rw # for a fat filesystem
 
 }code
 
@@ -156,8 +155,8 @@ a foreign OS, with something like:
 
 code{
 
-$ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file $
-/sbin/mkfs.ext2 -F live-rw
+ $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file
+ $ /sbin/mkfs.ext2 -F live-rw
 
 }code
 
diff --git a/manual/de/user_examples.ssi b/manual/de/user_examples.ssi
index ee55c5b..8d10188 100644
--- a/manual/de/user_examples.ssi
+++ b/manual/de/user_examples.ssi
@@ -24,9 +24,9 @@ preferred mirror. For example:
 
 code{
 
-LB_MIRROR_BOOTSTRAP="http://mirror/debian"
-LB_MIRROR_CHROOT="http://mirror/debian"
-LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_MIRROR_CHROOT="http://mirror/debian"
+ LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
 
 }code
 
@@ -42,7 +42,7 @@ You can't get much simpler than this:
 
 code{
 
-$ mkdir tutorial1 ; cd tutorial1 ; lb config
+ $ mkdir tutorial1 ; cd tutorial1 ; lb config
 
 }code
 
@@ -54,7 +54,7 @@ Now, as superuser, build the image, saving a log as you build with #{tee}#.
 
 code{
 
-# lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee binary.log
 
 }code
 
@@ -76,7 +76,7 @@ utility, serving as an introduction to customizing Debian Live images.
 
 code{
 
-$ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel
+ $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel
 
 }code
 
@@ -93,7 +93,7 @@ Build the image, again as superuser, keeping a log as in {Tutorial
 
 code{
 
-# lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee binary.log
 
 }code
 
@@ -114,8 +114,9 @@ in {Managing a configuration}#managing-a-configuration.
 
 code{
 
-$ mkdir -p tutorial3/auto $ cp /usr/share/live/build/examples/auto/*
-tutorial3/auto/ $ cd tutorial3
+ $ mkdir -p tutorial3/auto
+ $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/
+ $ cd tutorial3
 
 }code
 
@@ -123,14 +124,14 @@ Edit #{auto/config}# to read as follows:
 
 code{
 
-#!/bin/sh
+ #!/bin/sh
 
-lb config noauto \
-    --architecture i386 \
-    --linux-flavours 686 \
-    --packages-lists lxde \
-    --packages "iceweasel xchat" \
-    "${@}"
+ lb config noauto \
+     --architecture i386 \
+     --linux-flavours 686 \
+     --packages-lists lxde \
+     --packages "iceweasel xchat" \
+     "${@}"
 
 }code
 
@@ -145,7 +146,7 @@ Now, build the image:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -158,7 +159,9 @@ only the auto scripts we just created, and then make the first commit:
 
 code{
 
-$ git init $ git add auto $ git commit -a -m "Initial import."
+ $ git init
+ $ git add auto
+ $ git commit -a -m "Initial import."
 
 }code
 
@@ -174,7 +177,7 @@ regenerate the files from our new configuration.
 
 code{
 
-# lb clean
+ # lb clean
 
 }code
 
@@ -182,14 +185,14 @@ Now edit #{auto/config}# to add the #{vlc}# package:
 
 code{
 
-#!/bin/sh
+ #!/bin/sh
 
-lb config noauto \
-    --architecture i386 \
-    --linux-flavours 686 \
-    --packages-lists lxde \
-    --packages "iceweasel xchat vlc" \
-    "${@}"
+ lb config noauto \
+     --architecture i386 \
+     --linux-flavours 686 \
+     --packages-lists lxde \
+     --packages "iceweasel xchat vlc" \
+     "${@}"
 
 }code
 
@@ -205,7 +208,7 @@ Test, and when you're satisfied, commit the next revision:
 
 code{
 
-$ git commit -a -m "Adding vlc media player."
+ $ git commit -a -m "Adding vlc media player."
 
 }code
 
@@ -232,11 +235,11 @@ around the standard-x11 list, including #{gdm3}#, #{metacity}# and
 
 code{
 
-$ mkdir vnc_kiosk_client
-$ cd vnc_kiosk_client
-$ lb config -a i386 -k 686 -p standard-x11 \
-    --packages "gdm3 metacity xvnc4viewer" \
-    --apt-recommends false
+ $ mkdir vnc_kiosk_client
+ $ cd vnc_kiosk_client
+ $ lb config -a i386 -k 686 -p standard-x11 \
+     --packages "gdm3 metacity xvnc4viewer" \
+     --apt-recommends false
 
 }code
 
@@ -246,12 +249,15 @@ to port #{5901}# on a server at #{192.168.1.2}#:
 
 code{
 
-$ mkdir -p config/chroot_local-includes/etc/skel $ cat
->config/chroot_local-includes/etc/skel/.xsession <<END #!/bin/sh
+ $ mkdir -p config/chroot_local-includes/etc/skel
+ $ cat >config/chroot_local-includes/etc/skel/.xsession <<END
+ #!/bin/sh
 
-/usr/bin/metacity & /usr/bin/xvncviewer 192.168.1.2:1
+ /usr/bin/metacity &
+ /usr/bin/xvncviewer 192.168.1.2:1
 
-exit END
+ exit
+ END
 
 }code
 
@@ -259,7 +265,7 @@ Build the image:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -281,8 +287,8 @@ packages will most likely produce a broken live system.
 
 code{
 
-$ lb config -k 486 -p minimal --binary-indices false --memtest none
---apt-recommends false --includes none
+ $ lb config -k 486 -p minimal --binary-indices false \
+     --memtest none --apt-recommends false --includes none
 
 }code
 
@@ -290,7 +296,7 @@ Now, build the image in the usual way:
 
 code{
 
-# lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee binary.log
 
 }code
 
@@ -328,7 +334,7 @@ prepare, make sure you have both of those things:
 
 code{
 
-# apt-get install dctrl-tools tasksel-data
+ # apt-get install dctrl-tools tasksel-data
 
 }code
 
@@ -336,12 +342,12 @@ Now we can search for the appropriate tasks, first with:
 
 code{
 
-$ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description
-Task: brazilian-portuguese
-Description: Brazilian Portuguese environment
- This task installs programs, data files, and
- documentation that make it easier for Brazilian Portuguese speakers
- to use Debian.
+ $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ Task: brazilian-portuguese
+ Description: Brazilian Portuguese environment
+  This task installs programs, data files, and
+  documentation that make it easier for Brazilian Portuguese speakers
+  to use Debian.
 
 }code
 
@@ -350,14 +356,14 @@ brazilian-portuguese. Now to find the related tasks:
 
 code{
 
-$ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description
-Task: brazilian-portuguese-desktop
-Description: Brazilian Portuguese desktop
- This task localises the desktop in Brasilian Portuguese.
+ $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ Task: brazilian-portuguese-desktop
+ Description: Brazilian Portuguese desktop
+  This task localises the desktop in Brasilian Portuguese.
 
-Task: brazilian-portuguese-kde-desktop
-Description: Brazilian Portuguese KDE desktop
- This task localises the KDE desktop in Brazilian Portuguese.
+ Task: brazilian-portuguese-kde-desktop
+ Description: Brazilian Portuguese KDE desktop
+  This task localises the KDE desktop in Brazilian Portuguese.
 
 }code
 
@@ -369,9 +375,9 @@ layout. Now let's put the pieces together:
 
 code{
 
-$ mkdir live-pt_BR-kde
-$ cd live-pt_BR-kde
-$ lb config \
+ $ mkdir live-pt_BR-kde
+ $ cd live-pt_BR-kde
+ $ lb config \
      -a i386 \
      -k 486 \
      -p kde-desktop \
diff --git a/manual/de/user_installation.ssi b/manual/de/user_installation.ssi
index 7802167..2d324d3 100644
--- a/manual/de/user_installation.ssi
+++ b/manual/de/user_installation.ssi
@@ -38,7 +38,7 @@ Simply install live-build like any other package:
 
 code{
 
-# apt-get install live-build
+ # apt-get install live-build
 
 }code
 
@@ -46,7 +46,7 @@ or
 
 code{
 
-# aptitude install live-build
+ # aptitude install live-build
 
 }code
 
@@ -58,7 +58,7 @@ code, execute:
 
 code{
 
-$ git clone git://live.debian.net/git/live-build.git
+ $ git clone git://live.debian.net/git/live-build.git
 
 }code
 
@@ -66,7 +66,9 @@ You can build and install your own Debian package by executing:
 
 code{
 
-$ cd live-build $ dpkg-buildpackage -rfakeroot -b -uc -us $ cd ..
+ $ cd live-build
+ $ dpkg-buildpackage -rfakeroot -b -uc -us
+ $ cd ..
 
 }code
 
@@ -75,7 +77,7 @@ interested in, e.g.
 
 code{
 
-# dpkg -i live-build_2.0.8-1_all.deb
+ # dpkg -i live-build_2.0.8-1_all.deb
 
 }code
 
@@ -83,7 +85,7 @@ You can also install live-build directly to your system by executing:
 
 code{
 
-# make install
+ # make install
 
 }code
 
@@ -91,7 +93,7 @@ and uninstall it with:
 
 code{
 
-# make uninstall
+ # make uninstall
 
 }code
 
@@ -119,8 +121,8 @@ _* Checkout the live-boot and live-config source
 
 code{
 
-$ git clone git://live.debian.net/git/live-boot.git $ git clone
-git://live.debian.net/git/live-config.git
+ $ git clone git://live.debian.net/git/live-boot.git
+ $ git clone git://live.debian.net/git/live-config.git
 
 }code
 
@@ -142,8 +144,10 @@ system distribution, you may build directly on the build system using
 
 code{
 
-$ cd live-boot $ dpkg-buildpackage -b -uc -us $ cd ../live-config $
-dpkg-buildpackage -b -uc -us
+ $ cd live-boot
+ $ dpkg-buildpackage -b -uc -us
+ $ cd ../live-config
+ $ dpkg-buildpackage -b -uc -us
 
 }code
 
@@ -165,7 +169,7 @@ tree with #{lb config}#:
 
 code{
 
-$ lb config --repository live.debian.net
+ $ lb config --repository live.debian.net
 
 }code
 
diff --git a/manual/de/user_managing_a_configuration.ssi b/manual/de/user_managing_a_configuration.ssi
index 4270690..abab4fa 100644
--- a/manual/de/user_managing_a_configuration.ssi
+++ b/manual/de/user_managing_a_configuration.ssi
@@ -50,10 +50,10 @@ recursively. Also, don't forget to ensure the scripts are executable
 
 code{
 
-#!/bin/sh
-lb config noauto \
-	--packages-lists "standard" \
-	"${@}"
+ #!/bin/sh
+ lb config noauto \
+     --packages-lists "standard" \
+     "${@}"
 
 }code
 
@@ -61,11 +61,11 @@ lb config noauto \
 
 code{
 
-#!/bin/sh
-lb clean noauto "${@}"
-rm -f config/binary config/bootstrap \
-	config/chroot config/common config/source
-rm -f binary.log
+ #!/bin/sh
+ lb clean noauto "${@}"
+ rm -f config/binary config/bootstrap \
+     config/chroot config/common config/source
+ rm -f binary.log
 
 }code
 
@@ -73,7 +73,8 @@ rm -f binary.log
 
 code{
 
-#!/bin/sh lb build noauto "${@}" 2>&1 | tee binary.log
+ #!/bin/sh
+ lb build noauto "${@}" 2>&1 | tee binary.log
 
 }code
 
@@ -82,7 +83,7 @@ above. You may copy those as your starting point.
 
 code{
 
-$ cp /usr/share/live/build/examples/auto/* auto/
+ $ cp /usr/share/live/build/examples/auto/* auto/
 
 }code
 
diff --git a/manual/de/user_overview.ssi b/manual/de/user_overview.ssi
index d1e72c1..3d6b063 100644
--- a/manual/de/user_overview.ssi
+++ b/manual/de/user_overview.ssi
@@ -56,32 +56,41 @@ subdirectory which it populates with some default settings:
 
 code{
 
-$ lb config P: Creating config tree
-
-$ ls -l total 8 drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto drwxr-xr-x 22
-user user 4096 Sep 7 13:02 config
-
-$ ls -l config/ total 104 -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary
-drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer drwxr-xr-x 2
-user user 4096 Sep 7 13:02 binary_debian-installer-includes drwxr-xr-x 2
-user user 4096 Sep 7 13:02 binary_grub drwxr-xr-x 2 user user 4096 Sep 7
-13:02 binary_local-debs drwxr-xr-x 2 user user 4096 Sep 7 13:02
-binary_local-hooks drwxr-xr-x 2 user user 4096 Sep 7 13:02
-binary_local-includes drwxr-xr-x 2 user user 4096 Sep 7 13:02
-binary_local-packageslists drwxr-xr-x 2 user user 4096 Sep 7 13:02
-binary_local-udebs drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs
-drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux -rw-r--r-- 1 user
-user 2051 Sep 7 13:02 bootstrap -rw-r--r-- 1 user user 1647 Sep 7 13:02
-chroot drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt drwxr-xr-x 2 user
-user 4096 Sep 7 13:02 chroot_local-hooks drwxr-xr-x 2 user user 4096 Sep 7
-13:02 chroot_local-includes drwxr-xr-x 2 user user 4096 Sep 7 13:02
-chroot_local-packages drwxr-xr-x 2 user user 4096 Sep 7 13:02
-chroot_local-packageslists drwxr-xr-x 2 user user 4096 Sep 7 13:02
-chroot_local-patches drwxr-xr-x 2 user user 4096 Sep 7 13:02
-chroot_local-preseed drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources
--rw-r--r-- 1 user user 2954 Sep 7 13:02 common drwxr-xr-x 2 user user 4096
-Sep 7 13:02 includes -rw-r--r-- 1 user user 205 Sep 7 13:02 source
-drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates
+ $ lb config
+ P: Creating config tree
+
+ $ ls -l
+ total 8
+ drwxr-xr-x  3 user user 4096 Sep  7 13:02 auto
+ drwxr-xr-x 22 user user 4096 Sep  7 13:02 config
+
+ $ ls -l config/
+ total 104
+ -rw-r--r-- 1 user user 4197 Sep  7 13:02 binary
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_debian-installer
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_debian-installer-includes
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_grub
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-debs
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-hooks
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-includes
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-packageslists
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-udebs
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_rootfs
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_syslinux
+ -rw-r--r-- 1 user user 2051 Sep  7 13:02 bootstrap
+ -rw-r--r-- 1 user user 1647 Sep  7 13:02 chroot
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_apt
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-hooks
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-includes
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-packages
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-packageslists
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-patches
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-preseed
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_sources
+ -rw-r--r-- 1 user user 2954 Sep  7 13:02 common
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 includes
+ -rw-r--r-- 1 user user  205 Sep  7 13:02 source
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 templates
 
 }code
 
@@ -95,7 +104,7 @@ Normally, you will want to specify some options. For example, to include the
 
 code{
 
-$ lb config -p gnome
+ $ lb config -p gnome
 
 }code
 
@@ -103,8 +112,7 @@ It is possible to specify many options, such as:
 
 code{
 
-$ lb config --binary-images net --hostname live-machine --username live-user
-...
+ $ lb config --binary-images net --hostname live-machine --username live-user ...
 
 }code
 
diff --git a/manual/en/about_manual.ssi b/manual/en/about_manual.ssi
index 0c393a4..dfc06c7 100644
--- a/manual/en/about_manual.ssi
+++ b/manual/en/about_manual.ssi
@@ -90,7 +90,7 @@ Prior to submission of your contribution, please preview your work. To preview t
 
 code{
 
-# apt-get install make po4a sisu-complete
+ # apt-get install make po4a sisu-complete
 
 }code
 
@@ -98,7 +98,7 @@ You may build the live-manual from the top level directory of your Git checkout
 
 code{
 
-$ make build
+ $ make build
 
 }code
 
@@ -106,7 +106,7 @@ Since it takes a while to build the manual in all supported languages, you may f
 
 code{
 
-$ make build LANGUAGES=en
+ $ make build LANGUAGES=en
 
 }code
 
@@ -118,12 +118,12 @@ _* Fetch the public commit key:
 
 code{
 
-$ mkdir -p ~/.ssh/identity.d
-$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \
-	-O ~/.ssh/identity.d/gitosis at live.debian.net
-$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \
-	-O ~/.ssh/identity.d/gitosis at live.debian.net.pub
-$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*
+ $ mkdir -p ~/.ssh/identity.d
+ $ wget http://live.debian.net/other/keys/gitosis@live.debian.net \
+     -O ~/.ssh/identity.d/gitosis at live.debian.net
+ $ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \
+     -O ~/.ssh/identity.d/gitosis at live.debian.net.pub
+ $ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*
 
 }code
 
@@ -131,12 +131,12 @@ _* Add the following section to your openssh-client config:
 
 code{
 
-$ cat >> ~/.ssh/config << EOF
-Host live.debian.net
-        Hostname live.debian.net
-        User gitosis
-        IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net
-EOF
+ $ cat >> ~/.ssh/config << EOF
+ Host live.debian.net
+     Hostname live.debian.net
+     User gitosis
+     IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net
+ EOF
 
 }code
 
@@ -144,7 +144,7 @@ _* Check out a clone of the manual through ssh:
 
 code{
 
-$ git clone gitosis at live.debian.net:/live-manual.git
+ $ git clone gitosis at live.debian.net:/live-manual.git
 
 }code
 
@@ -152,7 +152,7 @@ _* After editing the files in #{manual/en/}#, please call the 'commit' target in
 
 code{
 
-$ make commit
+ $ make commit
 
 }code
 
@@ -160,7 +160,7 @@ _* After sanitizing, commit the changes. Write commit messages that consist of f
 
 code{
 
-$ git commit -a -m "Adding a section on applying patches."
+ $ git commit -a -m "Adding a section on applying patches."
 
 }code
 
@@ -168,7 +168,7 @@ _* Push the commit to the server:
 
 code{
 
-$ git push
+ $ git push
 
 }code
 
diff --git a/manual/en/project_bugs.ssi b/manual/en/project_bugs.ssi
index b8d63b8..7512d4f 100644
--- a/manual/en/project_bugs.ssi
+++ b/manual/en/project_bugs.ssi
@@ -56,7 +56,7 @@ You can generate a log of the build process by using the tee command:
 
 code{
 
-# lb build 2>&1 | tee build.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
diff --git a/manual/en/project_coding-style.ssi b/manual/en/project_coding-style.ssi
index da9dc98..4f5d1b6 100644
--- a/manual/en/project_coding-style.ssi
+++ b/manual/en/project_coding-style.ssi
@@ -26,9 +26,9 @@ Bad:
 
 code{
 
-if foo; then
-        bar
-fi
+ if foo; then
+         bar
+ fi
 
 }code
 
@@ -36,10 +36,10 @@ Good:
 
 code{
 
-if foo
-then
-        bar
-fi
+ if foo
+ then
+         bar
+ fi
 
 }code
 
@@ -49,9 +49,9 @@ Bad:
 
 code{
 
-foo () {
-        bar
-}
+ foo () {
+         bar
+ }
 
 }code
 
@@ -59,10 +59,10 @@ Good:
 
 code{
 
-foo ()
-{
-        bar
-}
+ foo ()
+ {
+         bar
+ }
 
 }code
 
@@ -90,7 +90,7 @@ Bad:
 
 code{
 
-FOO=bar
+ FOO=bar
 
 }code
 
@@ -98,7 +98,7 @@ Good:
 
 code{
 
-FOO="bar"
+ FOO="bar"
 
 }code
 
@@ -108,10 +108,10 @@ Bad:
 
 code{
 
-if [ -f "${FOO}"/foo/"${BAR}"/bar ]
-then
-        foobar
-fi
+ if [ -f "${FOO}"/foo/"${BAR}"/bar ]
+ then
+         foobar
+ fi
 
 }code
 
@@ -119,10 +119,10 @@ Good:
 
 code{
 
-if [ -f "${FOO}/foo/${BAR}/bar" ]
-then
-        foobar
-fi
+ if [ -f "${FOO}/foo/${BAR}/bar" ]
+ then
+         foobar
+ fi
 
 }code
 
diff --git a/manual/en/project_procedures.ssi b/manual/en/project_procedures.ssi
index 509fd19..16260bb 100644
--- a/manual/en/project_procedures.ssi
+++ b/manual/en/project_procedures.ssi
@@ -10,7 +10,7 @@ Before commiting releases of a udeb in d-i svn, one has to call:
 
 code{
 
-$ ../../scripts/l10n/output-l10n-changes . -d
+ $ ../../scripts/l10n/output-l10n-changes . -d
 
 }code
 
@@ -44,11 +44,11 @@ An annoucement mail for point releases can be generated using the template below
 
 code{
 
-$ sed \
-  -e 's|%major%|5.0|g' \
-  -e 's|%minor%|5.0.2|g' \
-  -e 's|%codename%|lenny|g' \
-  -e 's|%release_mail%|2009/msg00007.html|g'
+ $ sed \
+     -e 's|%major%|5.0|g' \
+     -e 's|%minor%|5.0.2|g' \
+     -e 's|%codename%|lenny|g' \
+     -e 's|%release_mail%|2009/msg00007.html|g'
 
 }code
 
@@ -56,76 +56,76 @@ Please check the mail carefully before sending and pass it to others for proof-r
 
 code{
 
-Debian Live images for Debian GNU/Linux %major% updated
+ Debian Live images for Debian GNU/Linux %major% updated
 
-The Debian Live project is pleased to announce the availability of
-updated Live images for its stable distribution Debian GNU/Linux %major%
-(codename "%codename%").
+ The Debian Live project is pleased to announce the availability of
+ updated Live images for its stable distribution Debian GNU/Linux %major%
+ (codename "%codename%").
 
-The images are available for download at:
+ The images are available for download at:
 
-    <http://cdimage.debian.org/cdimage/release/current-live/>
+     <http://cdimage.debian.org/cdimage/release/current-live/>
 
-This update incorporates the changes made in the %minor% point release,
-which adds corrections for security problems to the stable release
-along with a few adjustments for serious problems. A full list of the
-changes may be viewed at:
+ This update incorporates the changes made in the %minor% point release,
+ which adds corrections for security problems to the stable release
+ along with a few adjustments for serious problems. A full list of the
+ changes may be viewed at:
 
-    <http://lists.debian.org/debian-announce/%release_mail%>
+     <http://lists.debian.org/debian-announce/%release_mail%>
 
-It also includes the following Live-specific changes:
+ It also includes the following Live-specific changes:
 
- * [INSERT LIVE-SPECIFIC CHANGE HERE]
- * [INSERT LIVE-SPECIFIC CHANGE HERE]
- * [LARGER ISSUES MAY DESERVE THEIR OWN SECTION]
+  * [INSERT LIVE-SPECIFIC CHANGE HERE]
+  * [INSERT LIVE-SPECIFIC CHANGE HERE]
+  * [LARGER ISSUES MAY DESERVE THEIR OWN SECTION]
 
 
-URLs
-----
+ URLs
+ ----
 
-Download location of updated images:
+ Download location of updated images:
 
-  <http://cdimage.debian.org/cdimage/release/current-live/>
+   <http://cdimage.debian.org/cdimage/release/current-live/>
 
-Debian Live project homepage:
+ Debian Live project homepage:
 
-  <http://live.debian.net/>
+   <http://live.debian.net/>
 
-The current stable distribution:
+ The current stable distribution:
 
-  <http://ftp.debian.org/debian/dists/stable>
+   <http://ftp.debian.org/debian/dists/stable>
 
-stable distribution information (release notes, errata etc.):
+ stable distribution information (release notes, errata etc.):
 
-  <http://www.debian.org/releases/stable/>
+   <http://www.debian.org/releases/stable/>
 
-Security announcements and information:
+ Security announcements and information:
 
-  <http://www.debian.org/security/>
+   <http://www.debian.org/security/>
 
 
-About Debian
--------------
+ About Debian
+ -------------
 
-The Debian Project is an association of Free Software developers who
-volunteer their time and effort in order to produce the completely free
-operating system Debian GNU/Linux.
+ The Debian Project is an association of Free Software developers who
+ volunteer their time and effort in order to produce the completely free
+ operating system Debian GNU/Linux.
 
 
-About Debian Live
------------------
+ About Debian Live
+ -----------------
 
-Debian Live is an official sub-project of Debian which produces Debian
-systems that do not require a classical installer. Images are available
-for CD/DVD discs, USB sticks and PXE netbooting as well as a bare
-filesystem images for booting directly from the internet.
+ Debian Live is an official sub-project of Debian which produces Debian
+ systems that do not require a classical installer. Images are available
+ for CD/DVD discs, USB sticks and PXE netbooting as well as a bare
+ filesystem images for booting directly from the internet.
 
 
-Contact Information
--------------------
+ Contact Information
+ -------------------
 
-For further information, please visit the Debian Live web pages at
-<http://live.debian.net/> or alternatively send mail to
-<debian-live at lists.debian.org>.
+ For further information, please visit the Debian Live web pages at
+ <http://live.debian.net/> or alternatively send mail to
+ <debian-live at lists.debian.org>.
 
 }code
diff --git a/manual/en/user_basics.ssi b/manual/en/user_basics.ssi
index cd08d76..20e0dba 100644
--- a/manual/en/user_basics.ssi
+++ b/manual/en/user_basics.ssi
@@ -28,7 +28,7 @@ First, we run the #{lb config}# command which will create a "config/" hierarchy
 
 code{
 
-$ lb config
+ $ lb config
 
 }code
 
@@ -38,7 +38,7 @@ Now that we have a "config/" hierarchy, we may build the image with the #{lb bui
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -50,9 +50,9 @@ Testing an ISO is simple:
 
 code{
 
-# apt-get install qemu
+ # apt-get install qemu
 
-$ qemu -cdrom binary.iso
+ $ qemu -cdrom binary.iso
 
 }code
 
@@ -62,9 +62,9 @@ In order to test the ISO with virtualbox-ose:
 
 code{
 
-# apt-get install virtualbox-ose virtualbox-ose-dkms
+ # apt-get install virtualbox-ose virtualbox-ose-dkms
 
-$ virtualbox
+ $ virtualbox
 
 }code
 
@@ -74,7 +74,7 @@ Note: For live systems containing X.org that you want to test with virtualbox-os
 
 code{
 
-# lb config --packages virtualbox-ose-guest-x11
+ $ lb config --packages virtualbox-ose-guest-x11
 
 }code
 
@@ -84,9 +84,9 @@ Burning an ISO image is easy:
 
 code{
 
-# apt-get install wodim
+ # apt-get install wodim
 
-$ wodim binary.iso
+ $ wodim binary.iso
 
 }code
 
@@ -98,7 +98,7 @@ Note: if you created an ISO image with the previous example, you will need to cl
 
 code{
 
-$ lb clean --binary
+ # lb clean --binary
 
 }code
 
@@ -106,7 +106,7 @@ Run the #{lb config}# command with the parameters to configure the #{config/}# h
 
 code{
 
-$ lb config -b usb-hdd
+ $ lb config -b usb-hdd
 
 }code
 
@@ -114,7 +114,7 @@ Now build the image with the #{lb build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -124,7 +124,7 @@ The generated binary image contains a VFAT partition and the syslinux bootloader
 
 code{
 
-$ dd if=binary.img of=${USBSTICK}
+ $ dd if=binary.img of=${USBSTICK}
 
 }code
 
@@ -138,9 +138,9 @@ Note: As discussed earlier, this same process can be used for #{iso-hybrid}# typ
 
 code{
 
-# apt-get install qemu
+ # apt-get install qemu
 
-$ qemu -hda binary.img
+ $ qemu -hda binary.img
 
 }code
 
@@ -150,7 +150,7 @@ If you want to use the remaining free space after you have installed the binary.
 
 code{
 
-# gparted ${USBSTICK}
+ # gparted ${USBSTICK}
 
 }code
 
@@ -158,7 +158,7 @@ After the creation of the partition, you have to create a filesystem on it. One
 
 code{
 
-# mkfs.ext4 ${USBSTICK}
+ # mkfs.ext4 ${USBSTICK}
 
 }code
 
@@ -166,7 +166,7 @@ If you want to use this data partition with Windows, use FAT32.
 
 code{
 
-# mkfs.vfat -F 32
+ # mkfs.vfat -F 32
 
 }code
 
@@ -180,7 +180,7 @@ Note: if you performed any previous examples, you will need to clean up your wor
 
 code{
 
-# lb clean --binary
+ # lb clean --binary
 
 }code
 
@@ -188,7 +188,7 @@ Run the #{lb config}# command as follows to configure your image for netbooting:
 
 code{
 
-$ lb config -b net --net-root-path "/srv/debian-live" --net-root-server "192.168.0.1"
+ $ lb config -b net --net-root-path "/srv/debian-live" --net-root-server "192.168.0.1"
 
 }code
 
@@ -198,7 +198,7 @@ Now build the image with the #{lb build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -216,22 +216,22 @@ Here is an example for inspiration, written for the ISC DHCP server #{isc-dhcp-s
 
 code{
 
-# /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server
+ # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server
 
-ddns-update-style none;
+ ddns-update-style none;
 
-option domain-name "example.org";
-option domain-name-servers ns1.example.org, ns2.example.org;
+ option domain-name "example.org";
+ option domain-name-servers ns1.example.org, ns2.example.org;
 
-default-lease-time 600;
-max-lease-time 7200;
+ default-lease-time 600;
+ max-lease-time 7200;
 
-log-facility local7;
+ log-facility local7;
 
-subnet 192.168.0.0 netmask 255.255.255.0 {
-  range 192.168.0.1 192.168.0.254;
-  next-server servername;
-  filename "pxelinux.0";
+ subnet 192.168.0.0 netmask 255.255.255.0 {
+   range 192.168.0.1 192.168.0.254;
+   next-server servername;
+   filename "pxelinux.0";
 }
 
 }code
@@ -244,7 +244,7 @@ You should install the tftpd-hpa package. It can serve all files contained insid
 
 code{
 
-# dpkg-reconfigure -plow tftpd-hpa
+ # dpkg-reconfigure -plow tftpd-hpa
 
 }code
 
@@ -260,7 +260,7 @@ Then, make the filesystem image available through NFS by adding a line like the
 
 code{
 
-/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)
+ /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)
 
 }code
 
@@ -268,7 +268,7 @@ and tell the NFS server about this new export with the following command:
 
 code{
 
-# exportfs -rv
+ # exportfs -rv
 
 }code
 
@@ -288,14 +288,14 @@ Edit #{/etc/qemu-ifup}#:
 
 code{
 
-#!/bin/sh
-sudo -p "Password for $0:" /sbin/ifconfig $1 172.20.0.1
-echo "Executing /etc/qemu-ifup"
-echo "Bringing up $1 for bridged mode..."
-sudo /sbin/ifconfig $1 0.0.0.0 promisc up
-echo "Adding $1 to br0..."
-sudo /usr/sbin/brctl addif br0 $1
-sleep 2
+ #!/bin/sh
+ sudo -p "Password for $0:" /sbin/ifconfig $1 172.20.0.1
+ echo "Executing /etc/qemu-ifup"
+ echo "Bringing up $1 for bridged mode..."
+ sudo /sbin/ifconfig $1 0.0.0.0 promisc up
+ echo "Adding $1 to br0..."
+ sudo /usr/sbin/brctl addif br0 $1
+ sleep 2
 
 }code
 
@@ -313,28 +313,28 @@ _* Paste this text inside:
 
 code{
 
-#!/usr/bin/vmware
-config.version = "8"
-virtualHW.version = "4"
-memsize = "512"
-MemAllowAutoScaleDown = "FALSE"
+ #!/usr/bin/vmware
+ config.version = "8"
+ virtualHW.version = "4"
+ memsize = "512"
+ MemAllowAutoScaleDown = "FALSE"
 
-ide0:0.present = "FALSE"
-ide1:0.present = "FALSE"
-floppy0.present = "FALSE"
-sound.present = "FALSE"
-tools.remindInstall = "FALSE"
+ ide0:0.present = "FALSE"
+ ide1:0.present = "FALSE"
+ floppy0.present = "FALSE"
+ sound.present = "FALSE"
+ tools.remindInstall = "FALSE"
 
-ethernet0.present = "TRUE"
-ethernet0.addressType = "generated"
+ ethernet0.present = "TRUE"
+ ethernet0.addressType = "generated"
 
-displayName = "Test Boot PXE"
-guestOS = "other"
+ displayName = "Test Boot PXE"
+ guestOS = "other"
 
-ethernet0.generatedAddress = "00:0c:29:8d:71:3b"
-uuid.location = "56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b"
-uuid.bios = "56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b"
-ethernet0.generatedAddressOffset = "0"
+ ethernet0.generatedAddress = "00:0c:29:8d:71:3b"
+ uuid.location = "56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b"
+ uuid.bios = "56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b"
+ ethernet0.generatedAddressOffset = "0"
 
 }code
 
diff --git a/manual/en/user_customization-contents.ssi b/manual/en/user_customization-contents.ssi
index afa72ce..4c43cca 100644
--- a/manual/en/user_customization-contents.ssi
+++ b/manual/en/user_customization-contents.ssi
@@ -24,8 +24,8 @@ To include files, simply add them to your #{config/chroot_local-includes}# direc
 
 code{
 
-$ mkdir -p config/chroot_local-includes/var/www
-$ cp /path/to/my/index.html config/chroot_local-includes/var/www
+ $ mkdir -p config/chroot_local-includes/var/www
+ $ cp /path/to/my/index.html config/chroot_local-includes/var/www
 
 }code
 
@@ -33,14 +33,14 @@ Your configuration will then have the following layout:
 
 code{
 
--- config
-   [...]
-    |-- chroot_local-includes
-    |   `-- var
-    |       `-- www
-    |           `-- index.html
-   [...]
-    `-- templates
+ -- config
+    [...]
+     |-- chroot_local-includes
+     |   `-- var
+     |       `-- www
+     |           `-- index.html
+    [...]
+     `-- templates
 
 }code
 
@@ -52,7 +52,7 @@ To include material such as documentation or videos on the media filesystem so t
 
 code{
 
-$ cp ~/video_demo.* config/binary_local-includes/
+ $ cp ~/video_demo.* config/binary_local-includes/
 
 }code
 
@@ -64,7 +64,7 @@ live-build has some standard files (like documentation) that gets included in th
 
 code{
 
-$ lb config --includes none
+ $ lb config --includes none
 
 }code
 
diff --git a/manual/en/user_customization-installer.ssi b/manual/en/user_customization-installer.ssi
index ebdc2e3..e6f614e 100644
--- a/manual/en/user_customization-installer.ssi
+++ b/manual/en/user_customization-installer.ssi
@@ -30,7 +30,8 @@ Note that by default, live-build does not include Debian Installer images in the
 
 code{
 
-$ lb config --architecture i386 --linux-flavours 486 --debian-installer live --packages debian-installer-launcher
+ $ lb config --architecture i386 --linux-flavours 486 \
+     --debian-installer live --packages debian-installer-launcher
 
 }code
 
@@ -40,7 +41,8 @@ As described in the Debian Installer Manual, Appendix B at http://www.debian.org
 
 code{
 
-$ echo "d-i debian-installer/locale string en_US" >> config/binary_debian-installer/preseed.cfg
+ $ echo "d-i debian-installer/locale string en_US" \
+     >> config/binary_debian-installer/preseed.cfg
 
 }code
 
diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index ac6ff88..6264a7d 100644
--- a/manual/en/user_customization-packages.ssi
+++ b/manual/en/user_customization-packages.ssi
@@ -12,7 +12,7 @@ The distribution you choose has the broadest impact on which packages are availa
 
 code{
 
-$ lb config --distribution sid
+ $ lb config --distribution sid
 
 }code
 
@@ -20,7 +20,7 @@ Within the distribution archive, archive areas are major divisions of the archiv
 
 code{
 
-$ lb config --archive-areas "main contrib"
+ $ lb config --archive-areas "main contrib"
 
 }code
 
@@ -38,8 +38,8 @@ To set the distribution mirrors used at build time to point at a local mirror, i
 
 code{
 
-$ lb config --mirror-bootstrap http://localhost/debian/ \
-            --mirror-chroot-security http://localhost/debian-security/
+ $ lb config --mirror-bootstrap http://localhost/debian/ \
+             --mirror-chroot-security http://localhost/debian-security/
 
 }code
 
@@ -51,8 +51,8 @@ The #{--mirror-binary*}# options govern the distribution mirrors placed in the b
 
 code{
 
-$ lb config --mirror-binary http://mirror/debian/ \
-            --mirror-binary-security http://mirror/debian-security/
+ $ lb config --mirror-binary http://mirror/debian/ \
+             --mirror-binary-security http://mirror/debian-security/
 
 }code
 
@@ -64,7 +64,7 @@ For example, #{config/chroot_sources/live.chroot}# allows you to install package
 
 code{
 
-deb http://live.debian.net/ sid-snapshots main contrib non-free
+ deb http://live.debian.net/ sid-snapshots main contrib non-free
 
 }code
 
@@ -78,7 +78,7 @@ Note: some preconfigured package repositories are available for easy selection t
 
 code{
 
-$ lb config --repository live.debian.net
+ $ lb config --repository live.debian.net
 
 }code
 
@@ -92,7 +92,7 @@ When the number of packages added is small, simply specify #{--packages}#. For e
 
 code{
 
-$ lb config --packages "package1 package2 package3"
+ $ lb config --packages "package1 package2 package3"
 
 }code
 
@@ -110,7 +110,7 @@ The simplest way to use lists is to specify one or more predefined lists with th
 
 code{
 
-$ lb config --packages-lists "gnome-core rescue"
+ $ lb config --packages-lists "gnome-core rescue"
 
 }code
 
@@ -140,8 +140,8 @@ For example, to make a list that includes the predefined #{gnome}# list plus ice
 
 code{
 
-#include <gnome>
-iceweasel
+ #include <gnome>
+ iceweasel
 
 }code
 
@@ -153,9 +153,9 @@ For example, to install #{ia32-libs}# if the #{--architecture amd64}# is specifi
 
 code{
 
-#if ARCHITECTURE amd64
-ia32-libs
-#endif
+ #if ARCHITECTURE amd64
+ ia32-libs
+ #endif
 
 }code
 
@@ -163,9 +163,9 @@ You may test for any one of a number of values, e.g. to install #{memtest86+}# i
 
 code{
 
-#if ARCHITECTURE i386 amd64
-memtest86+
-#endif
+ #if ARCHITECTURE i386 amd64
+ memtest86+
+ #endif
 
 }code
 
@@ -173,9 +173,9 @@ You may also test against variables that may contain more than one value, e.g. t
 
 code{
 
-#if ARCHIVE_AREAS contrib non-free
-vrms
-#endif
+ #if ARCHIVE_AREAS contrib non-free
+ vrms
+ #endif
 
 }code
 
@@ -183,9 +183,9 @@ A conditional may surround an #{#include}# directive:
 
 code{
 
-#if ARCHITECTURE amd64
-#include <gnome-full>
-#endif
+ #if ARCHITECTURE amd64
+ #include <gnome-full>
+ #endif
 
 }code
 
@@ -197,7 +197,7 @@ The Debian Installer offers the user choices of a number of preselected lists of
 
 code{
 
-$ lb config --tasks "mail-server file-server"
+ $ lb config --tasks "mail-server file-server"
 
 }code
 
@@ -213,7 +213,7 @@ First, there is no provision made yet automatically for language tasks, although
 
 code{
 
-$ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
+ $ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
 
 }code
 
@@ -225,7 +225,7 @@ Third, if any of the tasks for these desktop flavours are selected, either expli
 
 code{
 
-$ lb config --language es
+ $ lb config --language es
 
 }code
 
@@ -289,7 +289,7 @@ One commonly required APT configuration is to deal with building an image behind
 
 code{
 
-$ lb config --apt-http-proxy http://proxy/
+ $ lb config --apt-http-proxy http://proxy/
 
 }code
 
@@ -301,7 +301,7 @@ If you don't want to include APT indices in the image, you can omit those with:
 
 code{
 
-$ lb config --binary-indices false
+ $ lb config --binary-indices false
 
 }code
 
@@ -311,7 +311,7 @@ If you find the installation of recommended packages bloats your image too much,
 
 code{
 
-$ lb config --apt-recommends false
+ $ lb config --apt-recommends false
 
 }code
 
@@ -329,16 +329,16 @@ Let's say you are building a Squeeze live system but need all #{live-*}# package
 
 code{
 
-$ echo "deb http://mirror/debian sid main" > config/chroot_sources/sid.chroot
-$ cat >>config/chroot_apt/preferences <<END
-Package: live-*
-Pin: release n=sid
-Pin-Priority: 600
+ $ echo "deb http://mirror/debian sid main" > config/chroot_sources/sid.chroot
+ $ cat >>config/chroot_apt/preferences <<END
+ Package: live-*
+ Pin: release n=sid
+ Pin-Priority: 600
 
-Package: *
-Pin: release n=sid
-Pin-Priority: 1
-END
+ Package: *
+ Pin: release n=sid
+ Pin-Priority: 1
+ END
 
 }code
 
@@ -346,9 +346,9 @@ Negative pin priorities will prevent a package from being installed, as in the c
 
 code{
 
-Package: gnome-keyring
-Pin: version *
-Pin-Priority: -1
+ Package: gnome-keyring
+ Pin: version *
+ Pin-Priority: -1
 
 }code
 
diff --git a/manual/en/user_customization-runtime.ssi b/manual/en/user_customization-runtime.ssi
index bc32772..79d6528 100644
--- a/manual/en/user_customization-runtime.ssi
+++ b/manual/en/user_customization-runtime.ssi
@@ -12,7 +12,7 @@ You can specify additional groups that the live user will belong to by preseedin
 
 code{
 
-debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse
+ debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse
 
 }code
 
@@ -30,7 +30,7 @@ The default locale when building a Live system is "locales=en_US.UTF-8". To defi
 
 code{
 
-$ lb config --bootappend-live "locales=de_CH.UTF-8"
+ $ lb config --bootappend-live "locales=de_CH.UTF-8"
 
 }code
 
@@ -40,8 +40,8 @@ Both the console and X keyboard configuration depend on the #{keyboard-layouts}#
 
 code{
 
-$ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
-<name>se</name>
+ $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
+ <name>se</name>
 
 }code
 
@@ -49,7 +49,7 @@ To get the locale files for German and Swiss German keyboard layout in X use:
 
 code{
 
-$ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
+ $ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
 
 }code
 
@@ -57,7 +57,8 @@ A list of the valid values of the keyboards for the console can be figured with
 
 code{
 
-$ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); do basename $i | head -c -9; echo; done | sort | less
+ $ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); \
+     do basename $i | head -c -9; echo; done | sort | less
 
 }code
 
@@ -65,7 +66,8 @@ Alternatively, you can use the #{console-setup}# package, a tool to let you conf
 
 code{
 
-$ lb config --bootappend-live "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
+ $ lb config --bootappend-live \
+     "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
 
 }code
 
@@ -85,7 +87,7 @@ By 'full persistence' it is meant that instead of using a tmpfs for storing modi
 
 code{
 
-# mkfs.ext2 -L live-rw /dev/sdb1
+ # mkfs.ext2 -L live-rw /dev/sdb1
 
 }code
 
@@ -93,8 +95,8 @@ If you already have a partition on your device, you could just change the label
 
 code{
 
-# tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems
-# dosfslabel /dev/sdb1 live-rw # for a fat filesystem
+ # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems
+ # dosfslabel /dev/sdb1 live-rw # for a fat filesystem
 
 }code
 
@@ -102,8 +104,8 @@ But since live system users cannot always use a hard drive partition, and consid
 
 code{
 
-$ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file
-$ /sbin/mkfs.ext2 -F live-rw
+ $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file
+ $ /sbin/mkfs.ext2 -F live-rw
 
 }code
 
diff --git a/manual/en/user_examples.ssi b/manual/en/user_examples.ssi
index 48966d7..faf4a65 100644
--- a/manual/en/user_examples.ssi
+++ b/manual/en/user_examples.ssi
@@ -12,9 +12,9 @@ Note that, for the sake of brevity, in these examples we do not specify a local
 
 code{
 
-LB_MIRROR_BOOTSTRAP="http://mirror/debian"
-LB_MIRROR_CHROOT="http://mirror/debian"
-LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_MIRROR_CHROOT="http://mirror/debian"
+ LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
 
 }code
 
@@ -28,7 +28,7 @@ You can't get much simpler than this:
 
 code{
 
-$ mkdir tutorial1 ; cd tutorial1 ; lb config
+ $ mkdir tutorial1 ; cd tutorial1 ; lb config
 
 }code
 
@@ -38,7 +38,7 @@ Now, as superuser, build the image, saving a log as you build with #{tee}#.
 
 code{
 
-# lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee binary.log
 
 }code
 
@@ -52,7 +52,7 @@ In this tutorial, we will create an image suitable for use as a web browser util
 
 code{
 
-$ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel
+ $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel
 
 }code
 
@@ -62,7 +62,7 @@ Build the image, again as superuser, keeping a log as in {Tutorial 1}#tutorial-1
 
 code{
 
-# lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee binary.log
 
 }code
 
@@ -78,9 +78,9 @@ Since we will be changing our personalized image over a number of revisions, and
 
 code{
 
-$ mkdir -p tutorial3/auto
-$ cp /usr/share/live/build/examples/auto/* tutorial3/auto/
-$ cd tutorial3
+ $ mkdir -p tutorial3/auto
+ $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/
+ $ cd tutorial3
 
 }code
 
@@ -88,14 +88,14 @@ Edit #{auto/config}# to read as follows:
 
 code{
 
-#!/bin/sh
+ #!/bin/sh
 
-lb config noauto \
-    --architecture i386 \
-    --linux-flavours 686 \
-    --packages-lists lxde \
-    --packages "iceweasel xchat" \
-    "${@}"
+ lb config noauto \
+     --architecture i386 \
+     --linux-flavours 686 \
+     --packages-lists lxde \
+     --packages "iceweasel xchat" \
+     "${@}"
 
 }code
 
@@ -105,7 +105,7 @@ Now, build the image:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -115,9 +115,9 @@ Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are satisfied i
 
 code{
 
-$ git init
-$ git add auto
-$ git commit -a -m "Initial import."
+ $ git init
+ $ git add auto
+ $ git commit -a -m "Initial import."
 
 }code
 
@@ -129,7 +129,7 @@ The #{lb clean}# command will clean up all generated files from the previous bui
 
 code{
 
-# lb clean
+ # lb clean
 
 }code
 
@@ -137,14 +137,14 @@ Now edit #{auto/config}# to add the #{vlc}# package:
 
 code{
 
-#!/bin/sh
+ #!/bin/sh
 
-lb config noauto \
-    --architecture i386 \
-    --linux-flavours 686 \
-    --packages-lists lxde \
-    --packages "iceweasel xchat vlc" \
-    "${@}"
+ lb config noauto \
+     --architecture i386 \
+     --linux-flavours 686 \
+     --packages-lists lxde \
+     --packages "iceweasel xchat vlc" \
+     "${@}"
 
 }code
 
@@ -160,7 +160,7 @@ Test, and when you're satisfied, commit the next revision:
 
 code{
 
-$ git commit -a -m "Adding vlc media player."
+ $ git commit -a -m "Adding vlc media player."
 
 }code
 
@@ -176,11 +176,11 @@ Make a build directory and create a skeletal configuration in it built around th
 
 code{
 
-$ mkdir vnc_kiosk_client
-$ cd vnc_kiosk_client
-$ lb config -a i386 -k 686 -p standard-x11 \
-    --packages "gdm3 metacity xvnc4viewer" \
-    --apt-recommends false
+ $ mkdir vnc_kiosk_client
+ $ cd vnc_kiosk_client
+ $ lb config -a i386 -k 686 -p standard-x11 \
+     --packages "gdm3 metacity xvnc4viewer" \
+     --apt-recommends false
 
 }code
 
@@ -188,15 +188,15 @@ Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for the
 
 code{
 
-$ mkdir -p config/chroot_local-includes/etc/skel
-$ cat >config/chroot_local-includes/etc/skel/.xsession <<END
-#!/bin/sh
+ $ mkdir -p config/chroot_local-includes/etc/skel
+ $ cat >config/chroot_local-includes/etc/skel/.xsession <<END
+ #!/bin/sh
 
-/usr/bin/metacity &
-/usr/bin/xvncviewer 192.168.1.2:1
+ /usr/bin/metacity &
+ /usr/bin/xvncviewer 192.168.1.2:1
 
-exit
-END
+ exit
+ END
 
 }code
 
@@ -204,7 +204,7 @@ Build the image:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -218,7 +218,8 @@ When optimizing an image to fit a certain media size, you need to understand the
 
 code{
 
-$ lb config -k 486 -p minimal --binary-indices false --memtest none --apt-recommends false --includes none
+ $ lb config -k 486 -p minimal --binary-indices false \
+     --memtest none --apt-recommends false --includes none
 
 }code
 
@@ -226,7 +227,7 @@ Now, build the image in the usual way:
 
 code{
 
-# lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee binary.log
 
 }code
 
@@ -244,7 +245,7 @@ Our initial problem is the discovery of the names of the appropriate tasks. Curr
 
 code{
 
-# apt-get install dctrl-tools tasksel-data
+ # apt-get install dctrl-tools tasksel-data
 
 }code
 
@@ -252,12 +253,12 @@ Now we can search for the appropriate tasks, first with:
 
 code{
 
-$ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description
-Task: brazilian-portuguese
-Description: Brazilian Portuguese environment
- This task installs programs, data files, and
- documentation that make it easier for Brazilian Portuguese speakers
- to use Debian.
+ $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ Task: brazilian-portuguese
+ Description: Brazilian Portuguese environment
+  This task installs programs, data files, and
+  documentation that make it easier for Brazilian Portuguese speakers
+  to use Debian.
 
 }code
 
@@ -265,14 +266,14 @@ By this command, we discover the task is called, plainly enough, brazilian-portu
 
 code{
 
-$ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description
-Task: brazilian-portuguese-desktop
-Description: Brazilian Portuguese desktop
- This task localises the desktop in Brasilian Portuguese.
+ $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ Task: brazilian-portuguese-desktop
+ Description: Brazilian Portuguese desktop
+  This task localises the desktop in Brasilian Portuguese.
 
-Task: brazilian-portuguese-kde-desktop
-Description: Brazilian Portuguese KDE desktop
- This task localises the KDE desktop in Brazilian Portuguese.
+ Task: brazilian-portuguese-kde-desktop
+ Description: Brazilian Portuguese KDE desktop
+  This task localises the KDE desktop in Brazilian Portuguese.
 
 }code
 
@@ -280,9 +281,9 @@ We will use the experimental #{--language}# option, as live-build happens to inc
 
 code{
 
-$ mkdir live-pt_BR-kde
-$ cd live-pt_BR-kde
-$ lb config \
+ $ mkdir live-pt_BR-kde
+ $ cd live-pt_BR-kde
+ $ lb config \
      -a i386 \
      -k 486 \
      -p kde-desktop \
diff --git a/manual/en/user_installation.ssi b/manual/en/user_installation.ssi
index 594ccd0..1358318 100644
--- a/manual/en/user_installation.ssi
+++ b/manual/en/user_installation.ssi
@@ -36,7 +36,7 @@ Simply install live-build like any other package:
 
 code{
 
-# apt-get install live-build
+ # apt-get install live-build
 
 }code
 
@@ -44,7 +44,7 @@ or
 
 code{
 
-# aptitude install live-build
+ # aptitude install live-build
 
 }code
 
@@ -54,7 +54,7 @@ live-build is developed using the Git version control system. On Debian systems,
 
 code{
 
-$ git clone git://live.debian.net/git/live-build.git
+ $ git clone git://live.debian.net/git/live-build.git
 
 }code
 
@@ -62,9 +62,9 @@ You can build and install your own Debian package by executing:
 
 code{
 
-$ cd live-build
-$ dpkg-buildpackage -rfakeroot -b -uc -us
-$ cd ..
+ $ cd live-build
+ $ dpkg-buildpackage -rfakeroot -b -uc -us
+ $ cd ..
 
 }code
 
@@ -72,7 +72,7 @@ Now install whichever of the freshly built #{.deb}# files you were interested in
 
 code{
 
-# dpkg -i live-build_2.0.8-1_all.deb
+ # dpkg -i live-build_2.0.8-1_all.deb
 
 }code
 
@@ -80,7 +80,7 @@ You can also install live-build directly to your system by executing:
 
 code{
 
-# make install
+ # make install
 
 }code
 
@@ -88,7 +88,7 @@ and uninstall it with:
 
 code{
 
-# make uninstall
+ # make uninstall
 
 }code
 
@@ -112,8 +112,8 @@ _* Checkout the live-boot and live-config source
 
 code{
 
-$ git clone git://live.debian.net/git/live-boot.git
-$ git clone git://live.debian.net/git/live-config.git
+ $ git clone git://live.debian.net/git/live-boot.git
+ $ git clone git://live.debian.net/git/live-config.git
 
 }code
 
@@ -127,10 +127,10 @@ Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to build #
 
 code{
 
-$ cd live-boot
-$ dpkg-buildpackage -b -uc -us
-$ cd ../live-config
-$ dpkg-buildpackage -b -uc -us
+ $ cd live-boot
+ $ dpkg-buildpackage -b -uc -us
+ $ cd ../live-config
+ $ dpkg-buildpackage -b -uc -us
 
 }code
 
@@ -144,7 +144,7 @@ You can let live-build automatically use the latest snapshots of live-boot and l
 
 code{
 
-$ lb config --repository live.debian.net
+ $ lb config --repository live.debian.net
 
 }code
 
diff --git a/manual/en/user_managing_a_configuration.ssi b/manual/en/user_managing_a_configuration.ssi
index 92f2cda..016b2e5 100644
--- a/manual/en/user_managing_a_configuration.ssi
+++ b/manual/en/user_managing_a_configuration.ssi
@@ -22,10 +22,10 @@ Use auto script examples such as the following as the starting point for your ne
 
 code{
 
-#!/bin/sh
-lb config noauto \
-	--packages-lists "standard" \
-	"${@}"
+ #!/bin/sh
+ lb config noauto \
+     --packages-lists "standard" \
+     "${@}"
 
 }code
 
@@ -33,11 +33,11 @@ lb config noauto \
 
 code{
 
-#!/bin/sh
-lb clean noauto "${@}"
-rm -f config/binary config/bootstrap \
-	config/chroot config/common config/source
-rm -f binary.log
+ #!/bin/sh
+ lb clean noauto "${@}"
+ rm -f config/binary config/bootstrap \
+     config/chroot config/common config/source
+ rm -f binary.log
 
 }code
 
@@ -45,8 +45,8 @@ rm -f binary.log
 
 code{
 
-#!/bin/sh
-lb build noauto "${@}" 2>&1 | tee binary.log
+ #!/bin/sh
+ lb build noauto "${@}" 2>&1 | tee binary.log
 
 }code
 
@@ -54,7 +54,7 @@ We now ship example auto scripts with live-build based on the examples above. Yo
 
 code{
 
-$ cp /usr/share/live/build/examples/auto/* auto/
+ $ cp /usr/share/live/build/examples/auto/* auto/
 
 }code
 
diff --git a/manual/en/user_overview.ssi b/manual/en/user_overview.ssi
index 5692e87..520553d 100644
--- a/manual/en/user_overview.ssi
+++ b/manual/en/user_overview.ssi
@@ -34,41 +34,41 @@ Issuing #{lb config}# without any arguments creates a #{config/}# subdirectory w
 
 code{
 
-$ lb config
-P: Creating config tree
-
-$ ls -l
-total 8
-drwxr-xr-x  3 user user 4096 Sep  7 13:02 auto
-drwxr-xr-x 22 user user 4096 Sep  7 13:02 config
-
-$ ls -l config/
-total 104
--rw-r--r-- 1 user user 4197 Sep  7 13:02 binary
-drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_debian-installer
-drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_debian-installer-includes
-drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_grub
-drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-debs
-drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-hooks
-drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-includes
-drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-packageslists
-drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-udebs
-drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_rootfs
-drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_syslinux
--rw-r--r-- 1 user user 2051 Sep  7 13:02 bootstrap
--rw-r--r-- 1 user user 1647 Sep  7 13:02 chroot
-drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_apt
-drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-hooks
-drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-includes
-drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-packages
-drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-packageslists
-drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-patches
-drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-preseed
-drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_sources
--rw-r--r-- 1 user user 2954 Sep  7 13:02 common
-drwxr-xr-x 2 user user 4096 Sep  7 13:02 includes
--rw-r--r-- 1 user user  205 Sep  7 13:02 source
-drwxr-xr-x 2 user user 4096 Sep  7 13:02 templates
+ $ lb config
+ P: Creating config tree
+
+ $ ls -l
+ total 8
+ drwxr-xr-x  3 user user 4096 Sep  7 13:02 auto
+ drwxr-xr-x 22 user user 4096 Sep  7 13:02 config
+
+ $ ls -l config/
+ total 104
+ -rw-r--r-- 1 user user 4197 Sep  7 13:02 binary
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_debian-installer
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_debian-installer-includes
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_grub
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-debs
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-hooks
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-includes
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-packageslists
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-udebs
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_rootfs
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_syslinux
+ -rw-r--r-- 1 user user 2051 Sep  7 13:02 bootstrap
+ -rw-r--r-- 1 user user 1647 Sep  7 13:02 chroot
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_apt
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-hooks
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-includes
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-packages
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-packageslists
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-patches
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-preseed
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_sources
+ -rw-r--r-- 1 user user 2954 Sep  7 13:02 common
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 includes
+ -rw-r--r-- 1 user user  205 Sep  7 13:02 source
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 templates
 
 }code
 
@@ -78,7 +78,7 @@ Normally, you will want to specify some options. For example, to include the 'gn
 
 code{
 
-$ lb config -p gnome
+ $ lb config -p gnome
 
 }code
 
@@ -86,7 +86,7 @@ It is possible to specify many options, such as:
 
 code{
 
-$ lb config --binary-images net --hostname live-machine --username live-user ...
+ $ lb config --binary-images net --hostname live-machine --username live-user ...
 
 }code
 
diff --git a/manual/fr/about_manual.ssi b/manual/fr/about_manual.ssi
index b53704a..54eb5ff 100644
--- a/manual/fr/about_manual.ssi
+++ b/manual/fr/about_manual.ssi
@@ -157,7 +157,7 @@ nécessaires sont installés en exécutant:
 
 code{
 
-# apt-get install make po4a sisu-complete
+ # apt-get install make po4a sisu-complete
 
 }code
 
@@ -166,7 +166,7 @@ checkout git en exécutant:
 
 code{
 
-$ make build
+ $ make build
 
 }code
 
@@ -176,7 +176,7 @@ executing:
 
 code{
 
-$ make build LANGUAGES=en
+ $ make build LANGUAGES=en
 
 }code
 
@@ -191,12 +191,12 @@ _* Téléchargez la clé publique:
 
 code{
 
-$ mkdir -p ~/.ssh/identity.d
-$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \
-	-O ~/.ssh/identity.d/gitosis at live.debian.net
-$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \
-	-O ~/.ssh/identity.d/gitosis at live.debian.net.pub
-$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*
+ $ mkdir -p ~/.ssh/identity.d
+ $ wget http://live.debian.net/other/keys/gitosis@live.debian.net \
+     -O ~/.ssh/identity.d/gitosis at live.debian.net
+ $ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \
+     -O ~/.ssh/identity.d/gitosis at live.debian.net.pub
+ $ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*
 
 }code
 
@@ -204,12 +204,12 @@ _* Ajoutez la section suivante à votre configuration openssh-client:
 
 code{
 
-$ cat >> ~/.ssh/config << EOF
-Host live.debian.net
-        Hostname live.debian.net
-        User gitosis
-        IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net
-EOF
+ $ cat >> ~/.ssh/config << EOF
+ Host live.debian.net
+     Hostname live.debian.net
+     User gitosis
+     IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net
+ EOF
 
 }code
 
@@ -217,7 +217,7 @@ _* Clonez le manuel via ssh:
 
 code{
 
-$ git clone gitosis at live.debian.net:/live-manual.git
+ $ git clone gitosis at live.debian.net:/live-manual.git
 
 }code
 
@@ -227,7 +227,7 @@ mettre à jour les fichiers de traduction:
 
 code{
 
-$ make commit
+ $ make commit
 
 }code
 
@@ -238,7 +238,7 @@ majuscule et en terminant par un point, et en commençant par
 
 code{
 
-$ git commit -a -m "Adding a section on applying patches."
+ $ git commit -a -m "Adding a section on applying patches."
 
 }code
 
@@ -246,7 +246,7 @@ _* Envoyez votre commit au serveur:
 
 code{
 
-$ git push
+ $ git push
 
 }code
 
diff --git a/manual/fr/project_bugs.ssi b/manual/fr/project_bugs.ssi
index e468f78..685bead 100644
--- a/manual/fr/project_bugs.ssi
+++ b/manual/fr/project_bugs.ssi
@@ -81,7 +81,7 @@ You can generate a log of the build process by using the tee command:
 
 code{
 
-# lb build 2>&1 | tee build.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
diff --git a/manual/fr/project_coding-style.ssi b/manual/fr/project_coding-style.ssi
index 696ead9..d53655c 100644
--- a/manual/fr/project_coding-style.ssi
+++ b/manual/fr/project_coding-style.ssi
@@ -27,9 +27,9 @@ Bad:
 
 code{
 
-if foo; then
-        bar
-fi
+ if foo; then
+         bar
+ fi
 
 }code
 
@@ -37,10 +37,10 @@ Good:
 
 code{
 
-if foo
-then
-        bar
-fi
+ if foo
+ then
+         bar
+ fi
 
 }code
 
@@ -50,9 +50,9 @@ Bad:
 
 code{
 
-foo () {
-        bar
-}
+ foo () {
+         bar
+ }
 
 }code
 
@@ -60,10 +60,10 @@ Good:
 
 code{
 
-foo ()
-{
-        bar
-}
+ foo ()
+ {
+         bar
+ }
 
 }code
 
@@ -95,7 +95,7 @@ Bad:
 
 code{
 
-FOO=bar
+ FOO=bar
 
 }code
 
@@ -103,7 +103,7 @@ Good:
 
 code{
 
-FOO="bar"
+ FOO="bar"
 
 }code
 
@@ -113,10 +113,10 @@ Bad:
 
 code{
 
-if [ -f "${FOO}"/foo/"${BAR}"/bar ]
-then
-        foobar
-fi
+ if [ -f "${FOO}"/foo/"${BAR}"/bar ]
+ then
+         foobar
+ fi
 
 }code
 
@@ -124,10 +124,10 @@ Good:
 
 code{
 
-if [ -f "${FOO}/foo/${BAR}/bar" ]
-then
-        foobar
-fi
+ if [ -f "${FOO}/foo/${BAR}/bar" ]
+ then
+         foobar
+ fi
 
 }code
 
diff --git a/manual/fr/project_procedures.ssi b/manual/fr/project_procedures.ssi
index cfa7775..d9a2561 100644
--- a/manual/fr/project_procedures.ssi
+++ b/manual/fr/project_procedures.ssi
@@ -11,7 +11,7 @@ Before commiting releases of a udeb in d-i svn, one has to call:
 
 code{
 
-$ ../../scripts/l10n/output-l10n-changes . -d
+ $ ../../scripts/l10n/output-l10n-changes . -d
 
 }code
 
@@ -51,11 +51,11 @@ below and the following command:
 
 code{
 
-$ sed \
-  -e 's|%major%|5.0|g' \
-  -e 's|%minor%|5.0.2|g' \
-  -e 's|%codename%|lenny|g' \
-  -e 's|%release_mail%|2009/msg00007.html|g'
+ $ sed \
+     -e 's|%major%|5.0|g' \
+     -e 's|%minor%|5.0.2|g' \
+     -e 's|%codename%|lenny|g' \
+     -e 's|%release_mail%|2009/msg00007.html|g'
 
 }code
 
@@ -64,76 +64,76 @@ proof-reading.
 
 code{
 
-Debian Live images for Debian GNU/Linux %major% updated
+ Debian Live images for Debian GNU/Linux %major% updated
 
-The Debian Live project is pleased to announce the availability of updated
-Live images for its stable distribution Debian GNU/Linux %major% (codename
-"%codename%").
+ The Debian Live project is pleased to announce the availability of
+ updated Live images for its stable distribution Debian GNU/Linux %major%
+ (codename "%codename%").
 
-The images are available for download at:
+ The images are available for download at:
 
-    <http://cdimage.debian.org/cdimage/release/current-live/>
+     <http://cdimage.debian.org/cdimage/release/current-live/>
 
-This update incorporates the changes made in the %minor% point release,
-which adds corrections for security problems to the stable release along
-with a few adjustments for serious problems. A full list of the changes may
-be viewed at:
+ This update incorporates the changes made in the %minor% point release,
+ which adds corrections for security problems to the stable release
+ along with a few adjustments for serious problems. A full list of the
+ changes may be viewed at:
 
-    <http://lists.debian.org/debian-announce/%release_mail%>
+     <http://lists.debian.org/debian-announce/%release_mail%>
 
-It also includes the following Live-specific changes:
+ It also includes the following Live-specific changes:
 
- * [INSERT LIVE-SPECIFIC CHANGE HERE]
- * [INSERT LIVE-SPECIFIC CHANGE HERE]
- * [LARGER ISSUES MAY DESERVE THEIR OWN SECTION]
+  * [INSERT LIVE-SPECIFIC CHANGE HERE]
+  * [INSERT LIVE-SPECIFIC CHANGE HERE]
+  * [LARGER ISSUES MAY DESERVE THEIR OWN SECTION]
 
 
-URLs
-----
+ URLs
+ ----
 
-Download location of updated images:
+ Download location of updated images:
 
-  <http://cdimage.debian.org/cdimage/release/current-live/>
+   <http://cdimage.debian.org/cdimage/release/current-live/>
 
-Projet Debian Live Homepage:
+ Projet Debian Live Homepage:
 
-  <http://live.debian.net/>
+   <http://live.debian.net/>
 
-The current stable distribution:
+ The current stable distribution:
 
-  <http://ftp.debian.org/debian/dists/stable>
+   <http://ftp.debian.org/debian/dists/stable>
 
-stable distribution information (release notes, errata etc.):
+ stable distribution information (release notes, errata etc.):
 
-  <http://www.debian.org/releases/stable/>
+   <http://www.debian.org/releases/stable/>
 
-Security announcements and information:
+ Security announcements and information:
 
-  <http://www.debian.org/security/>
+   <http://www.debian.org/security/>
 
 
-About Debian
--------------
+ About Debian
+ -------------
 
-The Debian Project is an association of Free Software developers who
-volunteer their time and effort in order to produce the completely free
-operating system Debian GNU/Linux.
+ The Debian Project is an association of Free Software developers who
+ volunteer their time and effort in order to produce the completely free
+ operating system Debian GNU/Linux.
 
 
-About Debian Live
------------------
+ About Debian Live
+ -----------------
 
-Debian Live is an official sub-project of Debian which produces Debian
-systems that do not require a classical installer. Images are available for
-CD/DVD discs, USB sticks and PXE netbooting as well as a bare filesystem
-images for booting directly from the internet.
+ Debian Live is an official sub-project of Debian which produces Debian
+ systems that do not require a classical installer. Images are available
+ for CD/DVD discs, USB sticks and PXE netbooting as well as a bare
+ filesystem images for booting directly from the internet.
 
 
-Contact Information
--------------------
+ Contact Information
+ -------------------
 
-For further information, please visit the Debian Live web pages at
-<http://live.debian.net/> or alternatively send mail to
-<debian-live at lists.debian.org>.
+ For further information, please visit the Debian Live web pages at
+ <http://live.debian.net/> or alternatively send mail to
+ <debian-live at lists.debian.org>.
 
 }code
diff --git a/manual/fr/user_basics.ssi b/manual/fr/user_basics.ssi
index b39c457..ae7318e 100644
--- a/manual/fr/user_basics.ssi
+++ b/manual/fr/user_basics.ssi
@@ -65,7 +65,7 @@ hierarchy in the current directory for use by other commands:
 
 code{
 
-$ lb config
+ $ lb config
 
 }code
 
@@ -77,7 +77,7 @@ build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -90,9 +90,9 @@ Testing an ISO is simple:
 
 code{
 
-# apt-get install qemu
+ # apt-get install qemu
 
-$ qemu -cdrom binary.iso
+ $ qemu -cdrom binary.iso
 
 }code
 
@@ -102,9 +102,9 @@ In order to test the ISO with virtualbox-ose:
 
 code{
 
-# apt-get install virtualbox-ose virtualbox-ose-dkms
+ # apt-get install virtualbox-ose virtualbox-ose-dkms
 
-$ virtualbox
+ $ virtualbox
 
 }code
 
@@ -118,7 +118,7 @@ resolution is limited to 800x600.
 
 code{
 
-# lb config --packages virtualbox-ose-guest-x11
+ $ lb config --packages virtualbox-ose-guest-x11
 
 }code
 
@@ -128,9 +128,9 @@ Burning an ISO image is easy:
 
 code{
 
-# apt-get install wodim
+ # apt-get install wodim
 
-$ wodim binary.iso
+ $ wodim binary.iso
 
 }code
 
@@ -150,7 +150,7 @@ lb clean command}#lb-clean):
 
 code{
 
-$ lb clean --binary
+ # lb clean --binary
 
 }code
 
@@ -159,7 +159,7 @@ Run the #{lb config}# command with the parameters to configure the
 
 code{
 
-$ lb config -b usb-hdd
+ $ lb config -b usb-hdd
 
 }code
 
@@ -167,7 +167,7 @@ Now build the image with the #{lb build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -179,7 +179,7 @@ with a size larger than that of binary.img and type:
 
 code{
 
-$ dd if=binary.img of=${USBSTICK}
+ $ dd if=binary.img of=${USBSTICK}
 
 }code
 
@@ -197,9 +197,9 @@ type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images.
 
 code{
 
-# apt-get install qemu
+ # apt-get install qemu
 
-$ qemu -hda binary.img
+ $ qemu -hda binary.img
 
 }code
 
@@ -212,7 +212,7 @@ be used by the Debian Live system.
 
 code{
 
-# gparted ${USBSTICK}
+ # gparted ${USBSTICK}
 
 }code
 
@@ -221,7 +221,7 @@ it. One possible choice would be ext4.
 
 code{
 
-# mkfs.ext4 ${USBSTICK}
+ # mkfs.ext4 ${USBSTICK}
 
 }code
 
@@ -229,7 +229,7 @@ If you want to use this data partition with Windows, use FAT32.
 
 code{
 
-# mkfs.vfat -F 32
+ # mkfs.vfat -F 32
 
 }code
 
@@ -246,7 +246,7 @@ working directory with the #{lb clean}# command:
 
 code{
 
-# lb clean --binary
+ # lb clean --binary
 
 }code
 
@@ -255,8 +255,7 @@ netbooting:
 
 code{
 
-$ lb config -b net --net-root-path "/srv/debian-live" --net-root-server
-"192.168.0.1"
+ $ lb config -b net --net-root-path "/srv/debian-live" --net-root-server "192.168.0.1"
 
 }code
 
@@ -271,7 +270,7 @@ Now build the image with the #{lb build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -301,21 +300,22 @@ Here is an example for inspiration, written for the ISC DHCP server
 
 code{
 
-# /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server
+ # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server
 
-ddns-update-style none;
+ ddns-update-style none;
 
-option domain-name "example.org"; option domain-name-servers
-ns1.example.org, ns2.example.org;
+ option domain-name "example.org";
+ option domain-name-servers ns1.example.org, ns2.example.org;
 
-default-lease-time 600; max-lease-time 7200;
+ default-lease-time 600;
+ max-lease-time 7200;
 
-log-facility local7;
+ log-facility local7;
 
-subnet 192.168.0.0 netmask 255.255.255.0 {
-  range 192.168.0.1 192.168.0.254;
-  next-server servername;
-  filename "pxelinux.0";
+ subnet 192.168.0.0 netmask 255.255.255.0 {
+   range 192.168.0.1 192.168.0.254;
+   next-server servername;
+   filename "pxelinux.0";
 }
 
 }code
@@ -330,7 +330,7 @@ inside a root directory, usually #{/srv/tftp}#. To let it serve files inside
 
 code{
 
-# dpkg-reconfigure -plow tftpd-hpa
+ # dpkg-reconfigure -plow tftpd-hpa
 
 }code
 
@@ -349,7 +349,7 @@ the following to #{/etc/exports}#:
 
 code{
 
-/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)
+ /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)
 
 }code
 
@@ -357,7 +357,7 @@ and tell the NFS server about this new export with the following command:
 
 code{
 
-# exportfs -rv
+ # exportfs -rv
 
 }code
 
@@ -383,10 +383,14 @@ Edit #{/etc/qemu-ifup}#:
 
 code{
 
-#!/bin/sh sudo -p "Password for $0:" /sbin/ifconfig $1 172.20.0.1 echo
-"Executing /etc/qemu-ifup" echo "Bringing up $1 for bridged mode..." sudo
-/sbin/ifconfig $1 0.0.0.0 promisc up echo "Adding $1 to br0..." sudo
-/usr/sbin/brctl addif br0 $1 sleep 2
+ #!/bin/sh
+ sudo -p "Password for $0:" /sbin/ifconfig $1 172.20.0.1
+ echo "Executing /etc/qemu-ifup"
+ echo "Bringing up $1 for bridged mode..."
+ sudo /sbin/ifconfig $1 0.0.0.0 promisc up
+ echo "Adding $1 to br0..."
+ sudo /usr/sbin/brctl addif br0 $1
+ sleep 2
 
 }code
 
@@ -405,19 +409,28 @@ _* Paste this text inside:
 
 code{
 
-#!/usr/bin/vmware config.version = "8" virtualHW.version = "4" memsize =
-"512" MemAllowAutoScaleDown = "FALSE"
+ #!/usr/bin/vmware
+ config.version = "8"
+ virtualHW.version = "4"
+ memsize = "512"
+ MemAllowAutoScaleDown = "FALSE"
 
-ide0:0.present = "FALSE" ide1:0.present = "FALSE" floppy0.present = "FALSE"
-sound.present = "FALSE" tools.remindInstall = "FALSE"
+ ide0:0.present = "FALSE"
+ ide1:0.present = "FALSE"
+ floppy0.present = "FALSE"
+ sound.present = "FALSE"
+ tools.remindInstall = "FALSE"
 
-ethernet0.present = "TRUE" ethernet0.addressType = "generated"
+ ethernet0.present = "TRUE"
+ ethernet0.addressType = "generated"
 
-displayName = "Test Boot PXE" guestOS = "other"
+ displayName = "Test Boot PXE"
+ guestOS = "other"
 
-ethernet0.generatedAddress = "00:0c:29:8d:71:3b" uuid.location = "56 4d 83
-72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b" uuid.bios = "56 4d 83 72 5c c4 de
-3f-ae 9e 07 91 1d 8d 71 3b" ethernet0.generatedAddressOffset = "0"
+ ethernet0.generatedAddress = "00:0c:29:8d:71:3b"
+ uuid.location = "56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b"
+ uuid.bios = "56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b"
+ ethernet0.generatedAddressOffset = "0"
 
 }code
 
diff --git a/manual/fr/user_customization-contents.ssi b/manual/fr/user_customization-contents.ssi
index cc19244..3906219 100644
--- a/manual/fr/user_customization-contents.ssi
+++ b/manual/fr/user_customization-contents.ssi
@@ -49,8 +49,8 @@ system, use:
 
 code{
 
-$ mkdir -p config/chroot_local-includes/var/www $ cp /path/to/my/index.html
-config/chroot_local-includes/var/www
+ $ mkdir -p config/chroot_local-includes/var/www
+ $ cp /path/to/my/index.html config/chroot_local-includes/var/www
 
 }code
 
@@ -58,14 +58,14 @@ Your configuration will then have the following layout:
 
 code{
 
--- config
-   [...]
-    |-- chroot_local-includes
-    |   `-- var
-    |       `-- www
-    |           `-- index.html
-   [...]
-    `-- templates
+ -- config
+    [...]
+     |-- chroot_local-includes
+     |   `-- var
+     |       `-- www
+     |           `-- index.html
+    [...]
+     `-- templates
 
 }code
 
@@ -84,7 +84,7 @@ linked to by an HTML index page. Simply copy the material to
 
 code{
 
-$ cp ~/video_demo.* config/binary_local-includes/
+ $ cp ~/video_demo.* config/binary_local-includes/
 
 }code
 
@@ -97,7 +97,7 @@ in the default configuration on every live media. This can be disabled with:
 
 code{
 
-$ lb config --includes none
+ $ lb config --includes none
 
 }code
 
diff --git a/manual/fr/user_customization-installer.ssi b/manual/fr/user_customization-installer.ssi
index 8e6dd98..6ed2152 100644
--- a/manual/fr/user_customization-installer.ssi
+++ b/manual/fr/user_customization-installer.ssi
@@ -52,8 +52,8 @@ architecture. For example:
 
 code{
 
-$ lb config --architecture i386 --linux-flavours 486 --debian-installer live
---packages debian-installer-launcher
+ $ lb config --architecture i386 --linux-flavours 486 \
+     --debian-installer live --packages debian-installer-launcher
 
 }code
 
@@ -72,8 +72,8 @@ locale to #{en_US}#:
 
 code{
 
-$ echo "d-i debian-installer/locale string en_US" >>
-config/binary_debian-installer/preseed.cfg
+ $ echo "d-i debian-installer/locale string en_US" \
+     >> config/binary_debian-installer/preseed.cfg
 
 }code
 
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index 03c9a6e..327106f 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -34,7 +34,7 @@ specify:
 
 code{
 
-$ lb config --distribution sid
+ $ lb config --distribution sid
 
 }code
 
@@ -46,7 +46,7 @@ specified, e.g.
 
 code{
 
-$ lb config --archive-areas "main contrib"
+ $ lb config --archive-areas "main contrib"
 
 }code
 
@@ -81,8 +81,8 @@ mirror, it is sufficient to set #{--mirror-bootstrap}# and
 
 code{
 
-$ lb config --mirror-bootstrap http://localhost/debian/ \
-            --mirror-chroot-security http://localhost/debian-security/
+ $ lb config --mirror-bootstrap http://localhost/debian/ \
+             --mirror-chroot-security http://localhost/debian-security/
 
 }code
 
@@ -102,8 +102,8 @@ suitable for users on a network where "#{mirror}#" is reachable.
 
 code{
 
-$ lb config --mirror-binary http://mirror/debian/ \
-            --mirror-binary-security http://mirror/debian-security/
+ $ lb config --mirror-binary http://mirror/debian/ \
+             --mirror-binary-security http://mirror/debian-security/
 
 }code
 
@@ -123,7 +123,7 @@ packages from the debian live snapshot repository at live system build time.
 
 code{
 
-deb http://live.debian.net/ sid-snapshots main contrib non-free
+ deb http://live.debian.net/ sid-snapshots main contrib non-free
 
 }code
 
@@ -142,7 +142,7 @@ snapshots, a simple command is enough to enable it:
 
 code{
 
-$ lb config --repository live.debian.net
+ $ lb config --repository live.debian.net
 
 }code
 
@@ -164,7 +164,7 @@ When the number of packages added is small, simply specify
 
 code{
 
-$ lb config --packages "package1 package2 package3"
+ $ lb config --packages "package1 package2 package3"
 
 }code
 
@@ -194,7 +194,7 @@ with the #{--packages-lists}# option. For example:
 
 code{
 
-$ lb config --packages-lists "gnome-core rescue"
+ $ lb config --packages-lists "gnome-core rescue"
 
 }code
 
@@ -247,7 +247,8 @@ the following contents:
 
 code{
 
-#include <gnome> iceweasel
+ #include <gnome>
+ iceweasel
 
 }code
 
@@ -265,7 +266,9 @@ specified:
 
 code{
 
-#if ARCHITECTURE amd64 ia32-libs #endif
+ #if ARCHITECTURE amd64
+ ia32-libs
+ #endif
 
 }code
 
@@ -275,7 +278,9 @@ is specified:
 
 code{
 
-#if ARCHITECTURE i386 amd64 memtest86+ #endif
+ #if ARCHITECTURE i386 amd64
+ memtest86+
+ #endif
 
 }code
 
@@ -285,7 +290,9 @@ via #{--archive-areas}#:
 
 code{
 
-#if ARCHIVE_AREAS contrib non-free vrms #endif
+ #if ARCHIVE_AREAS contrib non-free
+ vrms
+ #endif
 
 }code
 
@@ -293,7 +300,9 @@ A conditional may surround an #{#include}# directive:
 
 code{
 
-#if ARCHITECTURE amd64 #include <gnome-full> #endif
+ #if ARCHITECTURE amd64
+ #include <gnome-full>
+ #endif
 
 }code
 
@@ -310,7 +319,7 @@ via the #{--tasks}# option, as in the example below.
 
 code{
 
-$ lb config --tasks "mail-server file-server"
+ $ lb config --tasks "mail-server file-server"
 
 }code
 
@@ -340,7 +349,7 @@ in your configuration. For example:
 
 code{
 
-$ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
+ $ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
 
 }code
 
@@ -362,7 +371,7 @@ different desktop flavours.
 
 code{
 
-$ lb config --language es
+ $ lb config --language es
 
 }code
 
@@ -474,7 +483,7 @@ or #{--apt-http-proxy}# options as needed, e.g.
 
 code{
 
-$ lb config --apt-http-proxy http://proxy/
+ $ lb config --apt-http-proxy http://proxy/
 
 }code
 
@@ -489,7 +498,7 @@ with:
 
 code{
 
-$ lb config --binary-indices false
+ $ lb config --binary-indices false
 
 }code
 
@@ -504,7 +513,7 @@ much, you may disable that default option of APT with:
 
 code{
 
-$ lb config --apt-recommends false
+ $ lb config --apt-recommends false
 
 }code
 
@@ -542,11 +551,16 @@ distribution, Squeeze. The following will accomplish this:
 
 code{
 
-$ echo "deb http://mirror/debian sid main" >
-config/chroot_sources/sid.chroot $ cat >>config/chroot_apt/preferences <<END
-Package: live-* Pin: release n=sid Pin-Priority: 600
+ $ echo "deb http://mirror/debian sid main" > config/chroot_sources/sid.chroot
+ $ cat >>config/chroot_apt/preferences <<END
+ Package: live-*
+ Pin: release n=sid
+ Pin-Priority: 600
 
-Package: * Pin: release n=sid Pin-Priority: 1 END
+ Package: *
+ Pin: release n=sid
+ Pin-Priority: 1
+ END
 
 }code
 
@@ -559,7 +573,9 @@ following stanza to #{config/chroot_apt/preferences}#:
 
 code{
 
-Package: gnome-keyring Pin: version * Pin-Priority: -1
+ Package: gnome-keyring
+ Pin: version *
+ Pin-Priority: -1
 
 }code
 
diff --git a/manual/fr/user_customization-runtime.ssi b/manual/fr/user_customization-runtime.ssi
index 35d331f..471abb4 100644
--- a/manual/fr/user_customization-runtime.ssi
+++ b/manual/fr/user_customization-runtime.ssi
@@ -21,8 +21,7 @@ add the live user to the #{fuse}# group, add the following to a file in the
 
 code{
 
-debconf passwd/user-default-groups string audio cdrom dialout floppy video
-plugdev netdev powerdev fuse
+ debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse
 
 }code
 
@@ -42,7 +41,7 @@ the #{--bootappend-live}# option of #{lb config}#, e.g.
 
 code{
 
-$ lb config --bootappend-live "locales=de_CH.UTF-8"
+ $ lb config --bootappend-live "locales=de_CH.UTF-8"
 
 }code
 
@@ -59,8 +58,8 @@ spoken, e.g:
 
 code{
 
-$ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
-<name>se</name>
+ $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
+ <name>se</name>
 
 }code
 
@@ -69,7 +68,7 @@ use:
 
 code{
 
-$ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
+ $ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
 
 }code
 
@@ -78,8 +77,8 @@ with the following command:
 
 code{
 
-$ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); do basename $i |
-head -c -9; echo; done | sort | less
+ $ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); \
+     do basename $i | head -c -9; echo; done | sort | less
 
 }code
 
@@ -93,8 +92,8 @@ TypeMatrix keyboard, both in console and X11, use:
 
 code{
 
-$ lb config --bootappend-live "locales=fr_FR.UTF-8 keyboard-layouts=fr
-keyboard-variant=bepo keyboard-model=tm2030usb"
+ $ lb config --bootappend-live \
+     "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
 
 }code
 
@@ -134,7 +133,7 @@ hard disk or on a usb key created with, e.g.:
 
 code{
 
-# mkfs.ext2 -L live-rw /dev/sdb1
+ # mkfs.ext2 -L live-rw /dev/sdb1
 
 }code
 
@@ -143,8 +142,8 @@ label with one of the following:
 
 code{
 
-# tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems # dosfslabel
-/dev/sdb1 live-rw # for a fat filesystem
+ # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems
+ # dosfslabel /dev/sdb1 live-rw # for a fat filesystem
 
 }code
 
@@ -156,8 +155,8 @@ a foreign OS, with something like:
 
 code{
 
-$ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file $
-/sbin/mkfs.ext2 -F live-rw
+ $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file
+ $ /sbin/mkfs.ext2 -F live-rw
 
 }code
 
diff --git a/manual/fr/user_examples.ssi b/manual/fr/user_examples.ssi
index ee55c5b..8d10188 100644
--- a/manual/fr/user_examples.ssi
+++ b/manual/fr/user_examples.ssi
@@ -24,9 +24,9 @@ preferred mirror. For example:
 
 code{
 
-LB_MIRROR_BOOTSTRAP="http://mirror/debian"
-LB_MIRROR_CHROOT="http://mirror/debian"
-LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_MIRROR_CHROOT="http://mirror/debian"
+ LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
 
 }code
 
@@ -42,7 +42,7 @@ You can't get much simpler than this:
 
 code{
 
-$ mkdir tutorial1 ; cd tutorial1 ; lb config
+ $ mkdir tutorial1 ; cd tutorial1 ; lb config
 
 }code
 
@@ -54,7 +54,7 @@ Now, as superuser, build the image, saving a log as you build with #{tee}#.
 
 code{
 
-# lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee binary.log
 
 }code
 
@@ -76,7 +76,7 @@ utility, serving as an introduction to customizing Debian Live images.
 
 code{
 
-$ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel
+ $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel
 
 }code
 
@@ -93,7 +93,7 @@ Build the image, again as superuser, keeping a log as in {Tutorial
 
 code{
 
-# lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee binary.log
 
 }code
 
@@ -114,8 +114,9 @@ in {Managing a configuration}#managing-a-configuration.
 
 code{
 
-$ mkdir -p tutorial3/auto $ cp /usr/share/live/build/examples/auto/*
-tutorial3/auto/ $ cd tutorial3
+ $ mkdir -p tutorial3/auto
+ $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/
+ $ cd tutorial3
 
 }code
 
@@ -123,14 +124,14 @@ Edit #{auto/config}# to read as follows:
 
 code{
 
-#!/bin/sh
+ #!/bin/sh
 
-lb config noauto \
-    --architecture i386 \
-    --linux-flavours 686 \
-    --packages-lists lxde \
-    --packages "iceweasel xchat" \
-    "${@}"
+ lb config noauto \
+     --architecture i386 \
+     --linux-flavours 686 \
+     --packages-lists lxde \
+     --packages "iceweasel xchat" \
+     "${@}"
 
 }code
 
@@ -145,7 +146,7 @@ Now, build the image:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -158,7 +159,9 @@ only the auto scripts we just created, and then make the first commit:
 
 code{
 
-$ git init $ git add auto $ git commit -a -m "Initial import."
+ $ git init
+ $ git add auto
+ $ git commit -a -m "Initial import."
 
 }code
 
@@ -174,7 +177,7 @@ regenerate the files from our new configuration.
 
 code{
 
-# lb clean
+ # lb clean
 
 }code
 
@@ -182,14 +185,14 @@ Now edit #{auto/config}# to add the #{vlc}# package:
 
 code{
 
-#!/bin/sh
+ #!/bin/sh
 
-lb config noauto \
-    --architecture i386 \
-    --linux-flavours 686 \
-    --packages-lists lxde \
-    --packages "iceweasel xchat vlc" \
-    "${@}"
+ lb config noauto \
+     --architecture i386 \
+     --linux-flavours 686 \
+     --packages-lists lxde \
+     --packages "iceweasel xchat vlc" \
+     "${@}"
 
 }code
 
@@ -205,7 +208,7 @@ Test, and when you're satisfied, commit the next revision:
 
 code{
 
-$ git commit -a -m "Adding vlc media player."
+ $ git commit -a -m "Adding vlc media player."
 
 }code
 
@@ -232,11 +235,11 @@ around the standard-x11 list, including #{gdm3}#, #{metacity}# and
 
 code{
 
-$ mkdir vnc_kiosk_client
-$ cd vnc_kiosk_client
-$ lb config -a i386 -k 686 -p standard-x11 \
-    --packages "gdm3 metacity xvnc4viewer" \
-    --apt-recommends false
+ $ mkdir vnc_kiosk_client
+ $ cd vnc_kiosk_client
+ $ lb config -a i386 -k 686 -p standard-x11 \
+     --packages "gdm3 metacity xvnc4viewer" \
+     --apt-recommends false
 
 }code
 
@@ -246,12 +249,15 @@ to port #{5901}# on a server at #{192.168.1.2}#:
 
 code{
 
-$ mkdir -p config/chroot_local-includes/etc/skel $ cat
->config/chroot_local-includes/etc/skel/.xsession <<END #!/bin/sh
+ $ mkdir -p config/chroot_local-includes/etc/skel
+ $ cat >config/chroot_local-includes/etc/skel/.xsession <<END
+ #!/bin/sh
 
-/usr/bin/metacity & /usr/bin/xvncviewer 192.168.1.2:1
+ /usr/bin/metacity &
+ /usr/bin/xvncviewer 192.168.1.2:1
 
-exit END
+ exit
+ END
 
 }code
 
@@ -259,7 +265,7 @@ Build the image:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -281,8 +287,8 @@ packages will most likely produce a broken live system.
 
 code{
 
-$ lb config -k 486 -p minimal --binary-indices false --memtest none
---apt-recommends false --includes none
+ $ lb config -k 486 -p minimal --binary-indices false \
+     --memtest none --apt-recommends false --includes none
 
 }code
 
@@ -290,7 +296,7 @@ Now, build the image in the usual way:
 
 code{
 
-# lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee binary.log
 
 }code
 
@@ -328,7 +334,7 @@ prepare, make sure you have both of those things:
 
 code{
 
-# apt-get install dctrl-tools tasksel-data
+ # apt-get install dctrl-tools tasksel-data
 
 }code
 
@@ -336,12 +342,12 @@ Now we can search for the appropriate tasks, first with:
 
 code{
 
-$ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description
-Task: brazilian-portuguese
-Description: Brazilian Portuguese environment
- This task installs programs, data files, and
- documentation that make it easier for Brazilian Portuguese speakers
- to use Debian.
+ $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ Task: brazilian-portuguese
+ Description: Brazilian Portuguese environment
+  This task installs programs, data files, and
+  documentation that make it easier for Brazilian Portuguese speakers
+  to use Debian.
 
 }code
 
@@ -350,14 +356,14 @@ brazilian-portuguese. Now to find the related tasks:
 
 code{
 
-$ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description
-Task: brazilian-portuguese-desktop
-Description: Brazilian Portuguese desktop
- This task localises the desktop in Brasilian Portuguese.
+ $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ Task: brazilian-portuguese-desktop
+ Description: Brazilian Portuguese desktop
+  This task localises the desktop in Brasilian Portuguese.
 
-Task: brazilian-portuguese-kde-desktop
-Description: Brazilian Portuguese KDE desktop
- This task localises the KDE desktop in Brazilian Portuguese.
+ Task: brazilian-portuguese-kde-desktop
+ Description: Brazilian Portuguese KDE desktop
+  This task localises the KDE desktop in Brazilian Portuguese.
 
 }code
 
@@ -369,9 +375,9 @@ layout. Now let's put the pieces together:
 
 code{
 
-$ mkdir live-pt_BR-kde
-$ cd live-pt_BR-kde
-$ lb config \
+ $ mkdir live-pt_BR-kde
+ $ cd live-pt_BR-kde
+ $ lb config \
      -a i386 \
      -k 486 \
      -p kde-desktop \
diff --git a/manual/fr/user_installation.ssi b/manual/fr/user_installation.ssi
index 7802167..2d324d3 100644
--- a/manual/fr/user_installation.ssi
+++ b/manual/fr/user_installation.ssi
@@ -38,7 +38,7 @@ Simply install live-build like any other package:
 
 code{
 
-# apt-get install live-build
+ # apt-get install live-build
 
 }code
 
@@ -46,7 +46,7 @@ or
 
 code{
 
-# aptitude install live-build
+ # aptitude install live-build
 
 }code
 
@@ -58,7 +58,7 @@ code, execute:
 
 code{
 
-$ git clone git://live.debian.net/git/live-build.git
+ $ git clone git://live.debian.net/git/live-build.git
 
 }code
 
@@ -66,7 +66,9 @@ You can build and install your own Debian package by executing:
 
 code{
 
-$ cd live-build $ dpkg-buildpackage -rfakeroot -b -uc -us $ cd ..
+ $ cd live-build
+ $ dpkg-buildpackage -rfakeroot -b -uc -us
+ $ cd ..
 
 }code
 
@@ -75,7 +77,7 @@ interested in, e.g.
 
 code{
 
-# dpkg -i live-build_2.0.8-1_all.deb
+ # dpkg -i live-build_2.0.8-1_all.deb
 
 }code
 
@@ -83,7 +85,7 @@ You can also install live-build directly to your system by executing:
 
 code{
 
-# make install
+ # make install
 
 }code
 
@@ -91,7 +93,7 @@ and uninstall it with:
 
 code{
 
-# make uninstall
+ # make uninstall
 
 }code
 
@@ -119,8 +121,8 @@ _* Checkout the live-boot and live-config source
 
 code{
 
-$ git clone git://live.debian.net/git/live-boot.git $ git clone
-git://live.debian.net/git/live-config.git
+ $ git clone git://live.debian.net/git/live-boot.git
+ $ git clone git://live.debian.net/git/live-config.git
 
 }code
 
@@ -142,8 +144,10 @@ system distribution, you may build directly on the build system using
 
 code{
 
-$ cd live-boot $ dpkg-buildpackage -b -uc -us $ cd ../live-config $
-dpkg-buildpackage -b -uc -us
+ $ cd live-boot
+ $ dpkg-buildpackage -b -uc -us
+ $ cd ../live-config
+ $ dpkg-buildpackage -b -uc -us
 
 }code
 
@@ -165,7 +169,7 @@ tree with #{lb config}#:
 
 code{
 
-$ lb config --repository live.debian.net
+ $ lb config --repository live.debian.net
 
 }code
 
diff --git a/manual/fr/user_managing_a_configuration.ssi b/manual/fr/user_managing_a_configuration.ssi
index 4270690..abab4fa 100644
--- a/manual/fr/user_managing_a_configuration.ssi
+++ b/manual/fr/user_managing_a_configuration.ssi
@@ -50,10 +50,10 @@ recursively. Also, don't forget to ensure the scripts are executable
 
 code{
 
-#!/bin/sh
-lb config noauto \
-	--packages-lists "standard" \
-	"${@}"
+ #!/bin/sh
+ lb config noauto \
+     --packages-lists "standard" \
+     "${@}"
 
 }code
 
@@ -61,11 +61,11 @@ lb config noauto \
 
 code{
 
-#!/bin/sh
-lb clean noauto "${@}"
-rm -f config/binary config/bootstrap \
-	config/chroot config/common config/source
-rm -f binary.log
+ #!/bin/sh
+ lb clean noauto "${@}"
+ rm -f config/binary config/bootstrap \
+     config/chroot config/common config/source
+ rm -f binary.log
 
 }code
 
@@ -73,7 +73,8 @@ rm -f binary.log
 
 code{
 
-#!/bin/sh lb build noauto "${@}" 2>&1 | tee binary.log
+ #!/bin/sh
+ lb build noauto "${@}" 2>&1 | tee binary.log
 
 }code
 
@@ -82,7 +83,7 @@ above. You may copy those as your starting point.
 
 code{
 
-$ cp /usr/share/live/build/examples/auto/* auto/
+ $ cp /usr/share/live/build/examples/auto/* auto/
 
 }code
 
diff --git a/manual/fr/user_overview.ssi b/manual/fr/user_overview.ssi
index d1e72c1..3d6b063 100644
--- a/manual/fr/user_overview.ssi
+++ b/manual/fr/user_overview.ssi
@@ -56,32 +56,41 @@ subdirectory which it populates with some default settings:
 
 code{
 
-$ lb config P: Creating config tree
-
-$ ls -l total 8 drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto drwxr-xr-x 22
-user user 4096 Sep 7 13:02 config
-
-$ ls -l config/ total 104 -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary
-drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer drwxr-xr-x 2
-user user 4096 Sep 7 13:02 binary_debian-installer-includes drwxr-xr-x 2
-user user 4096 Sep 7 13:02 binary_grub drwxr-xr-x 2 user user 4096 Sep 7
-13:02 binary_local-debs drwxr-xr-x 2 user user 4096 Sep 7 13:02
-binary_local-hooks drwxr-xr-x 2 user user 4096 Sep 7 13:02
-binary_local-includes drwxr-xr-x 2 user user 4096 Sep 7 13:02
-binary_local-packageslists drwxr-xr-x 2 user user 4096 Sep 7 13:02
-binary_local-udebs drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs
-drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux -rw-r--r-- 1 user
-user 2051 Sep 7 13:02 bootstrap -rw-r--r-- 1 user user 1647 Sep 7 13:02
-chroot drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt drwxr-xr-x 2 user
-user 4096 Sep 7 13:02 chroot_local-hooks drwxr-xr-x 2 user user 4096 Sep 7
-13:02 chroot_local-includes drwxr-xr-x 2 user user 4096 Sep 7 13:02
-chroot_local-packages drwxr-xr-x 2 user user 4096 Sep 7 13:02
-chroot_local-packageslists drwxr-xr-x 2 user user 4096 Sep 7 13:02
-chroot_local-patches drwxr-xr-x 2 user user 4096 Sep 7 13:02
-chroot_local-preseed drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources
--rw-r--r-- 1 user user 2954 Sep 7 13:02 common drwxr-xr-x 2 user user 4096
-Sep 7 13:02 includes -rw-r--r-- 1 user user 205 Sep 7 13:02 source
-drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates
+ $ lb config
+ P: Creating config tree
+
+ $ ls -l
+ total 8
+ drwxr-xr-x  3 user user 4096 Sep  7 13:02 auto
+ drwxr-xr-x 22 user user 4096 Sep  7 13:02 config
+
+ $ ls -l config/
+ total 104
+ -rw-r--r-- 1 user user 4197 Sep  7 13:02 binary
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_debian-installer
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_debian-installer-includes
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_grub
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-debs
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-hooks
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-includes
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-packageslists
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-udebs
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_rootfs
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_syslinux
+ -rw-r--r-- 1 user user 2051 Sep  7 13:02 bootstrap
+ -rw-r--r-- 1 user user 1647 Sep  7 13:02 chroot
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_apt
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-hooks
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-includes
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-packages
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-packageslists
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-patches
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-preseed
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_sources
+ -rw-r--r-- 1 user user 2954 Sep  7 13:02 common
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 includes
+ -rw-r--r-- 1 user user  205 Sep  7 13:02 source
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 templates
 
 }code
 
@@ -95,7 +104,7 @@ Normally, you will want to specify some options. For example, to include the
 
 code{
 
-$ lb config -p gnome
+ $ lb config -p gnome
 
 }code
 
@@ -103,8 +112,7 @@ It is possible to specify many options, such as:
 
 code{
 
-$ lb config --binary-images net --hostname live-machine --username live-user
-...
+ $ lb config --binary-images net --hostname live-machine --username live-user ...
 
 }code
 
diff --git a/manual/it/about_manual.ssi b/manual/it/about_manual.ssi
index 930f6aa..48d8bf2 100644
--- a/manual/it/about_manual.ssi
+++ b/manual/it/about_manual.ssi
@@ -154,7 +154,7 @@ avere installati i pacchetti necessari per la sua compilazione eseguendo:
 
 code{
 
-# apt-get install make po4a sisu-complete
+ # apt-get install make po4a sisu-complete
 
 }code
 
@@ -163,7 +163,7 @@ Git eseguendo:
 
 code{
 
-$ make build
+ $ make build
 
 }code
 
@@ -173,7 +173,7 @@ eseguendo:
 
 code{
 
-$ make build LANGUAGES=en
+ $ make build LANGUAGES=en
 
 }code
 
@@ -188,12 +188,12 @@ _* Prelevare la chiave pubblica:
 
 code{
 
-$ mkdir -p ~/.ssh/identity.d
-$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \
-	-O ~/.ssh/identity.d/gitosis at live.debian.net
-$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \
-	-O ~/.ssh/identity.d/gitosis at live.debian.net.pub
-$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*
+ $ mkdir -p ~/.ssh/identity.d
+ $ wget http://live.debian.net/other/keys/gitosis@live.debian.net \
+     -O ~/.ssh/identity.d/gitosis at live.debian.net
+ $ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \
+     -O ~/.ssh/identity.d/gitosis at live.debian.net.pub
+ $ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*
 
 }code
 
@@ -202,12 +202,12 @@ openssh-client:
 
 code{
 
-$ cat >> ~/.ssh/config << EOF
-Host live.debian.net
-        Hostname live.debian.net
-        User gitosis
-        IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net
-EOF
+ $ cat >> ~/.ssh/config << EOF
+ Host live.debian.net
+     Hostname live.debian.net
+     User gitosis
+     IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net
+ EOF
 
 }code
 
@@ -215,7 +215,7 @@ _* Scaricare tramite ssh un clone del manuale:
 
 code{
 
-$ git clone gitosis at live.debian.net:/live-manual.git
+ $ git clone gitosis at live.debian.net:/live-manual.git
 
 }code
 
@@ -225,7 +225,7 @@ file di traduzione:
 
 code{
 
-$ make commit
+ $ make commit
 
 }code
 
@@ -237,7 +237,7 @@ ad esempio.
 
 code{
 
-$ git commit -a -m "Adding a section on applying patches."
+ $ git commit -a -m "Adding a section on applying patches."
 
 }code
 
@@ -245,7 +245,7 @@ _* Inviare il commit al server:
 
 code{
 
-$ git push
+ $ git push
 
 }code
 
diff --git a/manual/it/project_bugs.ssi b/manual/it/project_bugs.ssi
index 9b37b65..6e7ef77 100644
--- a/manual/it/project_bugs.ssi
+++ b/manual/it/project_bugs.ssi
@@ -83,7 +83,7 @@ comando tee:
 
 code{
 
-# lb build 2>&1 | tee build.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
diff --git a/manual/it/project_coding-style.ssi b/manual/it/project_coding-style.ssi
index 309988f..798835c 100644
--- a/manual/it/project_coding-style.ssi
+++ b/manual/it/project_coding-style.ssi
@@ -29,9 +29,9 @@ Sbagliato:
 
 code{
 
-if foo; then
-        bar
-fi
+ if foo; then
+         bar
+ fi
 
 }code
 
@@ -39,10 +39,10 @@ Corretto:
 
 code{
 
-if foo
-then
-        bar
-fi
+ if foo
+ then
+         bar
+ fi
 
 }code
 
@@ -52,9 +52,9 @@ Sbagliato:
 
 code{
 
-foo () {
-        bar
-}
+ foo () {
+         bar
+ }
 
 }code
 
@@ -62,10 +62,10 @@ Corretto:
 
 code{
 
-foo ()
-{
-        bar
-}
+ foo ()
+ {
+         bar
+ }
 
 }code
 
@@ -99,7 +99,7 @@ Sbagliato:
 
 code{
 
-FOO=bar
+ FOO=bar
 
 }code
 
@@ -107,7 +107,7 @@ Corretto:
 
 code{
 
-FOO="bar"
+ FOO="bar"
 
 }code
 
@@ -117,10 +117,10 @@ Sbagliato:
 
 code{
 
-if [ -f "${FOO}"/foo/"${BAR}"/bar ]
-then
-        foobar
-fi
+ if [ -f "${FOO}"/foo/"${BAR}"/bar ]
+ then
+         foobar
+ fi
 
 }code
 
@@ -128,10 +128,10 @@ Corretto:
 
 code{
 
-if [ -f "${FOO}/foo/${BAR}/bar" ]
-then
-        foobar
-fi
+ if [ -f "${FOO}/foo/${BAR}/bar" ]
+ then
+         foobar
+ fi
 
 }code
 
diff --git a/manual/it/project_procedures.ssi b/manual/it/project_procedures.ssi
index 288dc90..334c2d8 100644
--- a/manual/it/project_procedures.ssi
+++ b/manual/it/project_procedures.ssi
@@ -12,7 +12,7 @@ dell'installatore Debian va eseguito:
 
 code{
 
-$ ../../scripts/l10n/output-l10n-changes . -d
+ $ ../../scripts/l10n/output-l10n-changes . -d
 
 }code
 
@@ -54,11 +54,11 @@ sottostante e il seguente comando:
 
 code{
 
-$ sed \
-  -e 's|%major%|5.0|g' \
-  -e 's|%minor%|5.0.2|g' \
-  -e 's|%codename%|lenny|g' \
-  -e 's|%release_mail%|2009/msg00007.html|g'
+ $ sed \
+     -e 's|%major%|5.0|g' \
+     -e 's|%minor%|5.0.2|g' \
+     -e 's|%codename%|lenny|g' \
+     -e 's|%release_mail%|2009/msg00007.html|g'
 
 }code
 
@@ -67,76 +67,76 @@ altri per le correzioni.
 
 code{
 
-Debian Live images for Debian GNU/Linux %major% updated
+ Debian Live images for Debian GNU/Linux %major% updated
 
-The Debian Live project is pleased to announce the availability of updated
-Live images for its stable distribution Debian GNU/Linux %major% (codename
-"%codename%").
+ The Debian Live project is pleased to announce the availability of
+ updated Live images for its stable distribution Debian GNU/Linux %major%
+ (codename "%codename%").
 
-The images are available for download at:
+ The images are available for download at:
 
-    <http://cdimage.debian.org/cdimage/release/current-live/>
+     <http://cdimage.debian.org/cdimage/release/current-live/>
 
-This update incorporates the changes made in the %minor% point release,
-which adds corrections for security problems to the stable release along
-with a few adjustments for serious problems. A full list of the changes may
-be viewed at:
+ This update incorporates the changes made in the %minor% point release,
+ which adds corrections for security problems to the stable release
+ along with a few adjustments for serious problems. A full list of the
+ changes may be viewed at:
 
-    <http://lists.debian.org/debian-announce/%release_mail%>
+     <http://lists.debian.org/debian-announce/%release_mail%>
 
-It also includes the following Live-specific changes:
+ It also includes the following Live-specific changes:
 
- * [INSERT LIVE-SPECIFIC CHANGE HERE]
- * [INSERT LIVE-SPECIFIC CHANGE HERE]
- * [LARGER ISSUES MAY DESERVE THEIR OWN SECTION]
+  * [INSERT LIVE-SPECIFIC CHANGE HERE]
+  * [INSERT LIVE-SPECIFIC CHANGE HERE]
+  * [LARGER ISSUES MAY DESERVE THEIR OWN SECTION]
 
 
-URLs
-----
+ URLs
+ ----
 
-Download location of updated images:
+ Download location of updated images:
 
-  <http://cdimage.debian.org/cdimage/release/current-live/>
+   <http://cdimage.debian.org/cdimage/release/current-live/>
 
-Debian Live project homepage:
+ Debian Live project homepage:
 
-  <http://live.debian.net/>
+   <http://live.debian.net/>
 
-The current stable distribution:
+ The current stable distribution:
 
-  <http://ftp.debian.org/debian/dists/stable>
+   <http://ftp.debian.org/debian/dists/stable>
 
-stable distribution information (release notes, errata etc.):
+ stable distribution information (release notes, errata etc.):
 
-  <http://www.debian.org/releases/stable/>
+   <http://www.debian.org/releases/stable/>
 
-Security announcements and information:
+ Security announcements and information:
 
-  <http://www.debian.org/security/>
+   <http://www.debian.org/security/>
 
 
-About Debian
--------------
+ About Debian
+ -------------
 
-The Debian Project is an association of Free Software developers who
-volunteer their time and effort in order to produce the completely free
-operating system Debian GNU/Linux.
+ The Debian Project is an association of Free Software developers who
+ volunteer their time and effort in order to produce the completely free
+ operating system Debian GNU/Linux.
 
 
-About Debian Live
------------------
+ About Debian Live
+ -----------------
 
-Debian Live is an official sub-project of Debian which produces Debian
-systems that do not require a classical installer. Images are available for
-CD/DVD discs, USB sticks and PXE netbooting as well as a bare filesystem
-images for booting directly from the internet.
+ Debian Live is an official sub-project of Debian which produces Debian
+ systems that do not require a classical installer. Images are available
+ for CD/DVD discs, USB sticks and PXE netbooting as well as a bare
+ filesystem images for booting directly from the internet.
 
 
-Contact Information
--------------------
+ Contact Information
+ -------------------
 
-For further information, please visit the Debian Live web pages at
-<http://live.debian.net/> or alternatively send mail to
-<debian-live at lists.debian.org>.
+ For further information, please visit the Debian Live web pages at
+ <http://live.debian.net/> or alternatively send mail to
+ <debian-live at lists.debian.org>.
 
 }code
diff --git a/manual/it/user_basics.ssi b/manual/it/user_basics.ssi
index 4d4eae4..1982ab7 100644
--- a/manual/it/user_basics.ssi
+++ b/manual/it/user_basics.ssi
@@ -73,7 +73,7 @@ comandi:
 
 code{
 
-$ lb config
+ $ lb config
 
 }code
 
@@ -86,7 +86,7 @@ comando #{lb build}#:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -99,9 +99,9 @@ Collaudare una ISO è semplice:
 
 code{
 
-# apt-get install qemu
+ # apt-get install qemu
 
-$ qemu -cdrom binary.iso
+ $ qemu -cdrom binary.iso
 
 }code
 
@@ -111,9 +111,9 @@ Per provare la ISO con virtualbox-ose:
 
 code{
 
-# apt-get install virtualbox-ose virtualbox-ose-dkms
+ # apt-get install virtualbox-ose virtualbox-ose-dkms
 
-$ virtualbox
+ $ virtualbox
 
 }code
 
@@ -128,7 +128,7 @@ live-build. Altrimenti, la risoluzione è limitata a 800x600.
 
 code{
 
-# lb config --packages virtualbox-ose-guest-x11
+ $ lb config --packages virtualbox-ose-guest-x11
 
 }code
 
@@ -138,9 +138,9 @@ Masterizzare un'immagine ISO è semplice:
 
 code{
 
-# apt-get install wodim
+ # apt-get install wodim
 
-$ wodim binary.iso
+ $ wodim binary.iso
 
 }code
 
@@ -160,7 +160,7 @@ comando lb clean}#lb-clean):
 
 code{
 
-$ lb clean --binary
+ # lb clean --binary
 
 }code
 
@@ -169,7 +169,7 @@ struttura #{config/}# per creare un'immagine di tipo USB/HDD:
 
 code{
 
-$ lb config -b usb-hdd
+ $ lb config -b usb-hdd
 
 }code
 
@@ -177,7 +177,7 @@ Si crei ora l'immagine con il comando #{lb build}#:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -190,7 +190,7 @@ digitare:
 
 code{
 
-$ dd if=binary.img of=${USBSTICK}
+ $ dd if=binary.img of=${USBSTICK}
 
 }code
 
@@ -209,9 +209,9 @@ per le immagini di tipo #{iso}#.
 
 code{
 
-# apt-get install qemu
+ # apt-get install qemu
 
-$ qemu -hda binary.img
+ $ qemu -hda binary.img
 
 }code
 
@@ -224,7 +224,7 @@ verrà utilizzata dal sistema Debian Live.
 
 code{
 
-# gparted ${USBSTICK}
+ # gparted ${USBSTICK}
 
 }code
 
@@ -233,7 +233,7 @@ scelta possibile potrebbe essere ext4.
 
 code{
 
-# mkfs.ext4 ${USBSTICK}
+ # mkfs.ext4 ${USBSTICK}
 
 }code
 
@@ -241,7 +241,7 @@ Usare FAT32 se si vuole usare questa partizione dati con Windows.
 
 code{
 
-# mkfs.vfat -F 32
+ # mkfs.vfat -F 32
 
 }code
 
@@ -258,7 +258,7 @@ la directory di lavoro con il comando #{lb clean}#:
 
 code{
 
-# lb clean --binary
+ # lb clean --binary
 
 }code
 
@@ -267,8 +267,7 @@ config}# come segue:
 
 code{
 
-$ lb config -b net --net-root-path "/srv/debian-live" --net-root-server
-"192.168.0.1"
+ $ lb config -b net --net-root-path "/srv/debian-live" --net-root-server "192.168.0.1"
 
 }code
 
@@ -283,7 +282,7 @@ Si crei ora l'immagine con il comando #{lb build}#:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -314,21 +313,22 @@ di configurazione #{/etc/dhcp/dhcpd.conf}#:
 
 code{
 
-# /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server
+ # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server
 
-ddns-update-style none;
+ ddns-update-style none;
 
-option domain-name "example.org"; option domain-name-servers
-ns1.example.org, ns2.example.org;
+ option domain-name "example.org";
+ option domain-name-servers ns1.example.org, ns2.example.org;
 
-default-lease-time 600; max-lease-time 7200;
+ default-lease-time 600;
+ max-lease-time 7200;
 
-log-facility local7;
+ log-facility local7;
 
-subnet 192.168.0.0 netmask 255.255.255.0 {
-  range 192.168.0.1 192.168.0.254;
-  next-server servername;
-  filename "pxelinux.0";
+ subnet 192.168.0.0 netmask 255.255.255.0 {
+   range 192.168.0.1 192.168.0.254;
+   next-server servername;
+   filename "pxelinux.0";
 }
 
 }code
@@ -344,7 +344,7 @@ seguente comando come utente root:
 
 code{
 
-# dpkg-reconfigure -plow tftpd-hpa
+ # dpkg-reconfigure -plow tftpd-hpa
 
 }code
 
@@ -363,7 +363,7 @@ una riga come la seguente in #{/etc/exports}#:
 
 code{
 
-/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)
+ /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)
 
 }code
 
@@ -371,7 +371,7 @@ e comunicare il nuovo export al server NFS con il seguente comando:
 
 code{
 
-# exportfs -rv
+ # exportfs -rv
 
 }code
 
@@ -399,10 +399,14 @@ Modificare #{/etc/qemu-ifup}#:
 
 code{
 
-#!/bin/sh sudo -p "Password for $0:" /sbin/ifconfig $1 172.20.0.1 echo
-"Executing /etc/qemu-ifup" echo "Bringing up $1 for bridged mode..." sudo
-/sbin/ifconfig $1 0.0.0.0 promisc up echo "Adding $1 to br0..." sudo
-/usr/sbin/brctl addif br0 $1 sleep 2
+ #!/bin/sh
+ sudo -p "Password for $0:" /sbin/ifconfig $1 172.20.0.1
+ echo "Executing /etc/qemu-ifup"
+ echo "Bringing up $1 for bridged mode..."
+ sudo /sbin/ifconfig $1 0.0.0.0 promisc up
+ echo "Adding $1 to br0..."
+ sudo /usr/sbin/brctl addif br0 $1
+ sleep 2
 
 }code
 
@@ -421,19 +425,28 @@ _* Vi si copi dentro questo testo:
 
 code{
 
-#!/usr/bin/vmware config.version = "8" virtualHW.version = "4" memsize =
-"512" MemAllowAutoScaleDown = "FALSE"
+ #!/usr/bin/vmware
+ config.version = "8"
+ virtualHW.version = "4"
+ memsize = "512"
+ MemAllowAutoScaleDown = "FALSE"
 
-ide0:0.present = "FALSE" ide1:0.present = "FALSE" floppy0.present = "FALSE"
-sound.present = "FALSE" tools.remindInstall = "FALSE"
+ ide0:0.present = "FALSE"
+ ide1:0.present = "FALSE"
+ floppy0.present = "FALSE"
+ sound.present = "FALSE"
+ tools.remindInstall = "FALSE"
 
-ethernet0.present = "TRUE" ethernet0.addressType = "generated"
+ ethernet0.present = "TRUE"
+ ethernet0.addressType = "generated"
 
-displayName = "Test Boot PXE" guestOS = "other"
+ displayName = "Test Boot PXE"
+ guestOS = "other"
 
-ethernet0.generatedAddress = "00:0c:29:8d:71:3b" uuid.location = "56 4d 83
-72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b" uuid.bios = "56 4d 83 72 5c c4 de
-3f-ae 9e 07 91 1d 8d 71 3b" ethernet0.generatedAddressOffset = "0"
+ ethernet0.generatedAddress = "00:0c:29:8d:71:3b"
+ uuid.location = "56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b"
+ uuid.bios = "56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b"
+ ethernet0.generatedAddressOffset = "0"
 
 }code
 
diff --git a/manual/it/user_customization-contents.ssi b/manual/it/user_customization-contents.ssi
index f6961c8..53626b3 100644
--- a/manual/it/user_customization-contents.ssi
+++ b/manual/it/user_customization-contents.ssi
@@ -50,8 +50,8 @@ Per includere i file si aggiungano semplicemente alla directory
 
 code{
 
-$ mkdir -p config/chroot_local-includes/var/www $ cp /path/to/my/index.html
-config/chroot_local-includes/var/www
+ $ mkdir -p config/chroot_local-includes/var/www
+ $ cp /path/to/my/index.html config/chroot_local-includes/var/www
 
 }code
 
@@ -59,14 +59,14 @@ La configurazione avrà quindi il seguente schema:
 
 code{
 
--- config
-   [...]
-    |-- chroot_local-includes
-    |   `-- var
-    |       `-- www
-    |           `-- index.html
-   [...]
-    `-- templates
+ -- config
+    [...]
+     |-- chroot_local-includes
+     |   `-- var
+     |       `-- www
+     |           `-- index.html
+    [...]
+     `-- templates
 
 }code
 
@@ -85,7 +85,7 @@ da e collegati a una pagina HTML indice, basta copiare il materiale in
 
 code{
 
-$ cp ~/video_demo.* config/binary_local-includes/
+ $ cp ~/video_demo.* config/binary_local-includes/
 
 }code
 
@@ -99,7 +99,7 @@ disabilitato con:
 
 code{
 
-$ lb config --includes none
+ $ lb config --includes none
 
 }code
 
diff --git a/manual/it/user_customization-installer.ssi b/manual/it/user_customization-installer.ssi
index 83811a7..bb11268 100644
--- a/manual/it/user_customization-installer.ssi
+++ b/manual/it/user_customization-installer.ssi
@@ -53,8 +53,8 @@ l'architettura specificata. Per esempio:
 
 code{
 
-$ lb config --architecture i386 --linux-flavours 486 --debian-installer live
---packages debian-installer-launcher
+ $ lb config --architecture i386 --linux-flavours 486 \
+     --debian-installer live --packages debian-installer-launcher
 
 }code
 
@@ -73,8 +73,8 @@ l'impostazione della localizzazione su #{en_US}#:
 
 code{
 
-$ echo "d-i debian-installer/locale string en_US" >>
-config/binary_debian-installer/preseed.cfg
+ $ echo "d-i debian-installer/locale string en_US" \
+     >> config/binary_debian-installer/preseed.cfg
 
 }code
 
diff --git a/manual/it/user_customization-packages.ssi b/manual/it/user_customization-packages.ssi
index ac0af01..1473ab4 100644
--- a/manual/it/user_customization-packages.ssi
+++ b/manual/it/user_customization-packages.ssi
@@ -38,7 +38,7 @@ distribuzione supportata. Ad esempio se si vuole costruire un rilascio
 
 code{
 
-$ lb config --distribution sid
+ $ lb config --distribution sid
 
 }code
 
@@ -50,7 +50,7 @@ specificati uno o più valori:
 
 code{
 
-$ lb config --archive-areas "main contrib"
+ $ lb config --archive-areas "main contrib"
 
 }code
 
@@ -88,8 +88,8 @@ uno locale, è sufficiente impostare #{--mirror-bootstrap}# e
 
 code{
 
-$ lb config --mirror-bootstrap http://localhost/debian/ \
-            --mirror-chroot-security http://localhost/debian-security/
+ $ lb config --mirror-bootstrap http://localhost/debian/ \
+             --mirror-chroot-security http://localhost/debian-security/
 
 }code
 
@@ -111,8 +111,8 @@ raggiungibile il "#{mirror}#".
 
 code{
 
-$ lb config --mirror-binary http://mirror/debian/ \
-            --mirror-binary-security http://mirror/debian-security/
+ $ lb config --mirror-binary http://mirror/debian/ \
+             --mirror-binary-security http://mirror/debian-security/
 
 }code
 
@@ -134,7 +134,7 @@ del sistema live.
 
 code{
 
-deb http://live.debian.net/ sid-snapshots main contrib non-free
+ deb http://live.debian.net/ sid-snapshots main contrib non-free
 
 }code
 
@@ -153,7 +153,7 @@ snapshot live è sufficiente un semplice comando:
 
 code{
 
-$ lb config --repository live.debian.net
+ $ lb config --repository live.debian.net
 
 }code
 
@@ -175,7 +175,7 @@ specificare #{--packages}#. Per esempio:
 
 code{
 
-$ lb config --packages "package1 package2 package3"
+ $ lb config --packages "package1 package2 package3"
 
 }code
 
@@ -205,7 +205,7 @@ l'opzione #{--packages-lists}#. Per esempio:
 
 code{
 
-$ lb config --packages-lists "gnome-core rescue"
+ $ lb config --packages-lists "gnome-core rescue"
 
 }code
 
@@ -258,7 +258,8 @@ Per esempio, per creare un elenco che includa quello predefinito di
 
 code{
 
-#include <gnome> iceweasel
+ #include <gnome>
+ iceweasel
 
 }code
 
@@ -277,7 +278,9 @@ amd64}#:
 
 code{
 
-#if ARCHITECTURE amd64 ia32-libs #endif
+ #if ARCHITECTURE amd64
+ ia32-libs
+ #endif
 
 }code
 
@@ -287,7 +290,9 @@ installare #{memtest86+}# specificando sia #{--architecture i386}# sia
 
 code{
 
-#if ARCHITECTURE i386 amd64 memtest86+ #endif
+ #if ARCHITECTURE i386 amd64
+ memtest86+
+ #endif
 
 }code
 
@@ -297,7 +302,9 @@ esempio per installare #{vrms}# specificando sia da #{contrib}# sia da
 
 code{
 
-#if ARCHIVE_AREAS contrib non-free vrms #endif
+ #if ARCHIVE_AREAS contrib non-free
+ vrms
+ #endif
 
 }code
 
@@ -305,7 +312,9 @@ Una condizione può coinvolegere una direttiva #{#include}#:
 
 code{
 
-#if ARCHITECTURE amd64 #include <gnome-full> #endif
+ #if ARCHITECTURE amd64
+ #include <gnome-full>
+ #endif
 
 }code
 
@@ -323,7 +332,7 @@ nell'esempio seguente.
 
 code{
 
-$ lb config --tasks "mail-server file-server"
+ $ lb config --tasks "mail-server file-server"
 
 }code
 
@@ -354,7 +363,7 @@ specificati nella configurazione. Per esempio:
 
 code{
 
-$ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
+ $ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
 
 }code
 
@@ -376,7 +385,7 @@ i vari tipi di desktop.
 
 code{
 
-$ lb config --language es
+ $ lb config --language es
 
 }code
 
@@ -490,7 +499,7 @@ un'immagine dietro un proxy, lo si può specificare con le opzioni
 
 code{
 
-$ lb config --apt-http-proxy http://proxy/
+ $ lb config --apt-http-proxy http://proxy/
 
 }code
 
@@ -504,7 +513,7 @@ d'interesse.
 
 code{
 
-$ lb config --binary-indices false
+ $ lb config --binary-indices false
 
 }code
 
@@ -519,7 +528,7 @@ troppo l'immagine, si può disabilitare l'opzione predefinita di APT con:
 
 code{
 
-$ lb config --apt-recommends false
+ $ lb config --apt-recommends false
 
 }code
 
@@ -557,11 +566,16 @@ dalla distribuzione principale, Squeeze. Quanto segue servirà allo scopo:
 
 code{
 
-$ echo "deb http://mirror/debian sid main" >
-config/chroot_sources/sid.chroot $ cat >>config/chroot_apt/preferences <<END
-Package: live-* Pin: release n=sid Pin-Priority: 600
+ $ echo "deb http://mirror/debian sid main" > config/chroot_sources/sid.chroot
+ $ cat >>config/chroot_apt/preferences <<END
+ Package: live-*
+ Pin: release n=sid
+ Pin-Priority: 600
 
-Package: * Pin: release n=sid Pin-Priority: 1 END
+ Package: *
+ Pin: release n=sid
+ Pin-Priority: 1
+ END
 
 }code
 
@@ -574,7 +588,9 @@ following stanza to #{config/chroot_apt/preferences}#:
 
 code{
 
-Package: gnome-keyring Pin: version * Pin-Priority: -1
+ Package: gnome-keyring
+ Pin: version *
+ Pin-Priority: -1
 
 }code
 
diff --git a/manual/it/user_customization-runtime.ssi b/manual/it/user_customization-runtime.ssi
index e8b6ce7..e548351 100644
--- a/manual/it/user_customization-runtime.ssi
+++ b/manual/it/user_customization-runtime.ssi
@@ -24,8 +24,7 @@ ad un file nella directory #{config/chroot_local-preseed}#:
 
 code{
 
-debconf passwd/user-default-groups string audio cdrom dialout floppy video
-plugdev netdev powerdev fuse
+ debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse
 
 }code
 
@@ -46,7 +45,7 @@ Quando si crea un sistema live la localizzazione predefinita è
 
 code{
 
-$ lb config --bootappend-live "locales=de_CH.UTF-8"
+ $ lb config --bootappend-live "locales=de_CH.UTF-8"
 
 }code
 
@@ -63,8 +62,8 @@ cui si parla tale lingua:
 
 code{
 
-$ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
-<name>se</name>
+ $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
+ <name>se</name>
 
 }code
 
@@ -73,7 +72,7 @@ svizzero-tedesco in X:
 
 code{
 
-$ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
+ $ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
 
 }code
 
@@ -82,8 +81,8 @@ il seguente comando:
 
 code{
 
-$ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); do basename $i |
-head -c -9; echo; done | sort | less
+ $ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); \
+     do basename $i | head -c -9; echo; done | sort | less
 
 }code
 
@@ -97,8 +96,8 @@ francese con una tastiera TypeMatrix, sia in console sia in X11:
 
 code{
 
-$ lb config --bootappend-live "locales=fr_FR.UTF-8 keyboard-layouts=fr
-keyboard-variant=bepo keyboard-model=tm2030usb"
+ $ lb config --bootappend-live \
+     "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
 
 }code
 
@@ -141,7 +140,7 @@ o una penna usb creata ad esempio con:
 
 code{
 
-# mkfs.ext2 -L live-rw /dev/sdb1
+ # mkfs.ext2 -L live-rw /dev/sdb1
 
 }code
 
@@ -150,8 +149,8 @@ l'etichetta con una delle seguenti:
 
 code{
 
-# tune2fs -L live-rw /dev/sdb1 # per filesystem ext2,3,4 # dosfslabel
-/dev/sdb1 live-rw # per un filesystem fat
+ # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems
+ # dosfslabel /dev/sdb1 live-rw # for a fat filesystem
 
 }code
 
@@ -164,8 +163,8 @@ su una partizione NTFS di un sistema operativo estraneo, qualcosa come:
 
 code{
 
-$ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file $
-/sbin/mkfs.ext2 -F live-rw
+ $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file
+ $ /sbin/mkfs.ext2 -F live-rw
 
 }code
 
diff --git a/manual/it/user_examples.ssi b/manual/it/user_examples.ssi
index 376cffb..8d6db2b 100644
--- a/manual/it/user_examples.ssi
+++ b/manual/it/user_examples.ssi
@@ -26,9 +26,9 @@ desiderato. Ad esempio:
 
 code{
 
-LB_MIRROR_BOOTSTRAP="http://mirror/debian"
-LB_MIRROR_CHROOT="http://mirror/debian"
-LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_MIRROR_CHROOT="http://mirror/debian"
+ LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
 
 }code
 
@@ -44,7 +44,7 @@ Non può essere più semplice:
 
 code{
 
-$ mkdir tutorial1 ; cd tutorial1 ; lb config
+ $ mkdir tutorial1 ; cd tutorial1 ; lb config
 
 }code
 
@@ -56,7 +56,7 @@ Ora, come super-utente, si generi l'immagine, salvando un log con #{tee}#.
 
 code{
 
-# lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee binary.log
 
 }code
 
@@ -80,7 +80,7 @@ Live.
 
 code{
 
-$ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel
+ $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel
 
 }code
 
@@ -97,7 +97,7 @@ Si generi l'immagine, ancora come super-utente, conservando un log come in
 
 code{
 
-# lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee binary.log
 
 }code
 
@@ -120,8 +120,9 @@ configurazione}#managing-a-configuration.
 
 code{
 
-$ mkdir -p tutorial3/auto $ cp /usr/share/live/build/examples/auto/*
-tutorial3/auto/ $ cd tutorial3
+ $ mkdir -p tutorial3/auto
+ $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/
+ $ cd tutorial3
 
 }code
 
@@ -129,14 +130,14 @@ Modificare #{auto/config}# come segue:
 
 code{
 
-#!/bin/sh
+ #!/bin/sh
 
-lb config noauto \
-    --architecture i386 \
-    --linux-flavours 686 \
-    --packages-lists lxde \
-    --packages "iceweasel xchat" \
-    "${@}"
+ lb config noauto \
+     --architecture i386 \
+     --linux-flavours 686 \
+     --packages-lists lxde \
+     --packages "iceweasel xchat" \
+     "${@}"
 
 }code
 
@@ -152,7 +153,7 @@ Costruire quindi l'immagine:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -166,7 +167,9 @@ creati, e poi fare il primo commit:
 
 code{
 
-$ git init $ git add auto $ git commit -a -m "Initial import."
+ $ git init
+ $ git add auto
+ $ git commit -a -m "Initial import."
 
 }code
 
@@ -183,7 +186,7 @@ tutti i passaggi per rigenerare i file dalla nuova configurazione.
 
 code{
 
-# lb clean
+ # lb clean
 
 }code
 
@@ -191,14 +194,14 @@ Si modifichi ora #{auto/config}# per aggiungere il pacchetto #{vlc}#:
 
 code{
 
-#!/bin/sh
+ #!/bin/sh
 
-lb config noauto \
-    --architecture i386 \
-    --linux-flavours 686 \
-    --packages-lists lxde \
-    --packages "iceweasel xchat vlc" \
-    "${@}"
+ lb config noauto \
+     --architecture i386 \
+     --linux-flavours 686 \
+     --packages-lists lxde \
+     --packages "iceweasel xchat vlc" \
+     "${@}"
 
 }code
 
@@ -215,7 +218,7 @@ successiva:
 
 code{
 
-$ git commit -a -m "Adding vlc media player."
+ $ git commit -a -m "Adding vlc media player."
 
 }code
 
@@ -245,11 +248,11 @@ ottenere un sistema minimale:
 
 code{
 
-$ mkdir vnc_kiosk_client
-$ cd vnc_kiosk_client
-$ lb config -a i386 -k 686 -p standard-x11 \
-    --packages "gdm3 metacity xvnc4viewer" \
-    --apt-recommends false
+ $ mkdir vnc_kiosk_client
+ $ cd vnc_kiosk_client
+ $ lb config -a i386 -k 686 -p standard-x11 \
+     --packages "gdm3 metacity xvnc4viewer" \
+     --apt-recommends false
 
 }code
 
@@ -260,12 +263,15 @@ xvncviewer, connesso alla porta #{5901}# su un server all'indirizzo
 
 code{
 
-$ mkdir -p config/chroot_local-includes/etc/skel $ cat
->config/chroot_local-includes/etc/skel/.xsession <<END #!/bin/sh
+ $ mkdir -p config/chroot_local-includes/etc/skel
+ $ cat >config/chroot_local-includes/etc/skel/.xsession <<END
+ #!/bin/sh
 
-/usr/bin/metacity & /usr/bin/xvncviewer 192.168.1.2:1
+ /usr/bin/metacity &
+ /usr/bin/xvncviewer 192.168.1.2:1
 
-exit END
+ exit
+ END
 
 }code
 
@@ -273,7 +279,7 @@ Costruire l'immagine:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -295,8 +301,8 @@ sappia cosa si sta facendo, come omettere la priorità dei pacchetti
 
 code{
 
-$ lb config -k 486 -p minimal --binary-indices false --memtest none
---apt-recommends false --includes none
+ $ lb config -k 486 -p minimal --binary-indices false \
+     --memtest none --apt-recommends false --includes none
 
 }code
 
@@ -304,7 +310,7 @@ Costruire quindi l'immagine nel modo consueto:
 
 code{
 
-# lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee binary.log
 
 }code
 
@@ -343,7 +349,7 @@ di avere entrambi questi pacchetti:
 
 code{
 
-# apt-get install dctrl-tools tasksel-data
+ # apt-get install dctrl-tools tasksel-data
 
 }code
 
@@ -351,12 +357,12 @@ Ora si possono cercare i task appropriati:
 
 code{
 
-$ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description
-Task: brazilian-portuguese
-Description: Brazilian Portuguese environment
- This task installs programs, data files, and
- documentation that make it easier for Brazilian Portuguese speakers
- to use Debian.
+ $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ Task: brazilian-portuguese
+ Description: Brazilian Portuguese environment
+  This task installs programs, data files, and
+  documentation that make it easier for Brazilian Portuguese speakers
+  to use Debian.
 
 }code
 
@@ -365,14 +371,14 @@ chiaramente, brazilian-portuguese. Ora per trovare i task correlati:
 
 code{
 
-$ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description
-Task: brazilian-portuguese-desktop
-Description: Brazilian Portuguese desktop
- This task localises the desktop in Brasilian Portuguese.
+ $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ Task: brazilian-portuguese-desktop
+ Description: Brazilian Portuguese desktop
+  This task localises the desktop in Brasilian Portuguese.
 
-Task: brazilian-portuguese-kde-desktop
-Description: Brazilian Portuguese KDE desktop
- This task localises the KDE desktop in Brazilian Portuguese.
+ Task: brazilian-portuguese-kde-desktop
+ Description: Brazilian Portuguese KDE desktop
+  This task localises the KDE desktop in Brazilian Portuguese.
 
 }code
 
@@ -384,9 +390,9 @@ tastiera. Ora mettiamo insieme i pezzi:
 
 code{
 
-$ mkdir live-pt_BR-kde
-$ cd live-pt_BR-kde
-$ lb config \
+ $ mkdir live-pt_BR-kde
+ $ cd live-pt_BR-kde
+ $ lb config \
      -a i386 \
      -k 486 \
      -p kde-desktop \
diff --git a/manual/it/user_installation.ssi b/manual/it/user_installation.ssi
index 394a6c0..9b6d97f 100644
--- a/manual/it/user_installation.ssi
+++ b/manual/it/user_installation.ssi
@@ -40,7 +40,7 @@ Installare live-build semplicemente come qualsiasi altro pacchetto:
 
 code{
 
-# apt-get install live-build
+ # apt-get install live-build
 
 }code
 
@@ -48,7 +48,7 @@ o
 
 code{
 
-# aptitude install live-build
+ # aptitude install live-build
 
 }code
 
@@ -60,7 +60,7 @@ aggiornato, eseguire:
 
 code{
 
-$ git clone git://live.debian.net/git/live-build.git
+ $ git clone git://live.debian.net/git/live-build.git
 
 }code
 
@@ -68,7 +68,9 @@ $ git clone git://live.debian.net/git/live-build.git
 
 code{
 
-$ cd live-build $ dpkg-buildpackage -rfakeroot -b -uc -us $ cd ..
+ $ cd live-build
+ $ dpkg-buildpackage -rfakeroot -b -uc -us
+ $ cd ..
 
 }code
 
@@ -77,7 +79,7 @@ ad esempio:
 
 code{
 
-# dpkg -i live-build_2.0.8-1_all.deb
+ # dpkg -i live-build_2.0.8-1_all.deb
 
 }code
 
@@ -86,7 +88,7 @@ eseguendo:
 
 code{
 
-# make install
+ # make install
 
 }code
 
@@ -94,7 +96,7 @@ e disinstallarlo con:
 
 code{
 
-# make uninstall
+ # make uninstall
 
 }code
 
@@ -123,8 +125,8 @@ _* Scaricare i sorgenti di live-boot e live-config
 
 code{
 
-$ git clone git://live.debian.net/git/live-boot.git $ git clone
-git://live.debian.net/git/live-config.git
+ $ git clone git://live.debian.net/git/live-boot.git
+ $ git clone git://live.debian.net/git/live-config.git
 
 }code
 
@@ -148,8 +150,10 @@ pacchetto /{dpkg-dev}/):
 
 code{
 
-$ cd live-boot $ dpkg-buildpackage -b -uc -us $ cd ../live-config $
-dpkg-buildpackage -b -uc -us
+ $ cd live-boot
+ $ dpkg-buildpackage -b -uc -us
+ $ cd ../live-config
+ $ dpkg-buildpackage -b -uc -us
 
 }code
 
@@ -171,7 +175,7 @@ di configurazione con #{lb config}#:
 
 code{
 
-$ lb config --repository live.debian.net
+ $ lb config --repository live.debian.net
 
 }code
 
diff --git a/manual/it/user_managing_a_configuration.ssi b/manual/it/user_managing_a_configuration.ssi
index 57958a6..e797fe7 100644
--- a/manual/it/user_managing_a_configuration.ssi
+++ b/manual/it/user_managing_a_configuration.ssi
@@ -50,10 +50,10 @@ ricorsivamente. Non dimenticare, inoltre, di rendere lo script eseguibile
 
 code{
 
-#!/bin/sh
-lb config noauto \
-	--packages-lists "standard" \
-	"${@}"
+ #!/bin/sh
+ lb config noauto \
+     --packages-lists "standard" \
+     "${@}"
 
 }code
 
@@ -61,11 +61,11 @@ lb config noauto \
 
 code{
 
-#!/bin/sh
-lb clean noauto "${@}"
-rm -f config/binary config/bootstrap \
-	config/chroot config/common config/source
-rm -f binary.log
+ #!/bin/sh
+ lb clean noauto "${@}"
+ rm -f config/binary config/bootstrap \
+     config/chroot config/common config/source
+ rm -f binary.log
 
 }code
 
@@ -73,7 +73,8 @@ rm -f binary.log
 
 code{
 
-#!/bin/sh lb build noauto "${@}" 2>&1 | tee binary.log
+ #!/bin/sh
+ lb build noauto "${@}" 2>&1 | tee binary.log
 
 }code
 
@@ -82,7 +83,7 @@ precedente. Si possono copiare come punto di partenza.
 
 code{
 
-$ cp /usr/share/live/build/examples/auto/* auto/
+ $ cp /usr/share/live/build/examples/auto/* auto/
 
 }code
 
diff --git a/manual/it/user_overview.ssi b/manual/it/user_overview.ssi
index 4e0ad83..76176a9 100644
--- a/manual/it/user_overview.ssi
+++ b/manual/it/user_overview.ssi
@@ -59,32 +59,41 @@ L'esecuzione di #{lb config}# senza argomenti crea una sottodirectory di
 
 code{
 
-$ lb config P: Creating config tree
-
-$ ls -l total 8 drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto drwxr-xr-x 22
-user user 4096 Sep 7 13:02 config
-
-$ ls -l config/ total 104 -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary
-drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer drwxr-xr-x 2
-user user 4096 Sep 7 13:02 binary_debian-installer-includes drwxr-xr-x 2
-user user 4096 Sep 7 13:02 binary_grub drwxr-xr-x 2 user user 4096 Sep 7
-13:02 binary_local-debs drwxr-xr-x 2 user user 4096 Sep 7 13:02
-binary_local-hooks drwxr-xr-x 2 user user 4096 Sep 7 13:02
-binary_local-includes drwxr-xr-x 2 user user 4096 Sep 7 13:02
-binary_local-packageslists drwxr-xr-x 2 user user 4096 Sep 7 13:02
-binary_local-udebs drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs
-drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux -rw-r--r-- 1 user
-user 2051 Sep 7 13:02 bootstrap -rw-r--r-- 1 user user 1647 Sep 7 13:02
-chroot drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt drwxr-xr-x 2 user
-user 4096 Sep 7 13:02 chroot_local-hooks drwxr-xr-x 2 user user 4096 Sep 7
-13:02 chroot_local-includes drwxr-xr-x 2 user user 4096 Sep 7 13:02
-chroot_local-packages drwxr-xr-x 2 user user 4096 Sep 7 13:02
-chroot_local-packageslists drwxr-xr-x 2 user user 4096 Sep 7 13:02
-chroot_local-patches drwxr-xr-x 2 user user 4096 Sep 7 13:02
-chroot_local-preseed drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources
--rw-r--r-- 1 user user 2954 Sep 7 13:02 common drwxr-xr-x 2 user user 4096
-Sep 7 13:02 includes -rw-r--r-- 1 user user 205 Sep 7 13:02 source
-drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates
+ $ lb config
+ P: Creating config tree
+
+ $ ls -l
+ total 8
+ drwxr-xr-x  3 user user 4096 Sep  7 13:02 auto
+ drwxr-xr-x 22 user user 4096 Sep  7 13:02 config
+
+ $ ls -l config/
+ total 104
+ -rw-r--r-- 1 user user 4197 Sep  7 13:02 binary
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_debian-installer
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_debian-installer-includes
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_grub
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-debs
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-hooks
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-includes
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-packageslists
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-udebs
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_rootfs
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_syslinux
+ -rw-r--r-- 1 user user 2051 Sep  7 13:02 bootstrap
+ -rw-r--r-- 1 user user 1647 Sep  7 13:02 chroot
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_apt
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-hooks
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-includes
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-packages
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-packageslists
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-patches
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-preseed
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_sources
+ -rw-r--r-- 1 user user 2954 Sep  7 13:02 common
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 includes
+ -rw-r--r-- 1 user user  205 Sep  7 13:02 source
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 templates
 
 }code
 
@@ -98,7 +107,7 @@ nella propria configurazione l'elenco del pacchetto "gnome":
 
 code{
 
-$ lb config -p gnome
+ $ lb config -p gnome
 
 }code
 
@@ -106,8 +115,7 @@ $ lb config -p gnome
 
 code{
 
-$ lb config --binary-images net --hostname live-machine --username live-user
-...
+ $ lb config --binary-images net --hostname live-machine --username live-user ...
 
 }code
 
diff --git a/manual/po/de/about_manual.ssi.po b/manual/po/de/about_manual.ssi.po
index 73a71e8..a3f3379 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 2.0.0\n"
-"POT-Creation-Date: 2010-12-09 10:51-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-22 08:36-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -305,31 +305,28 @@ msgstr ""
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
-#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
-#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
-#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
-#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
-#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
-#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/about_manual.ssi:170 en/project_bugs.ssi:58
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
-#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
-#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-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/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi: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_customization-installer.ssi:32
+#: en/user_customization-installer.ssi:43
+#: 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
@@ -339,27 +336,28 @@ msgstr ""
 #: en/user_customization-packages.ssi:199
 #: en/user_customization-packages.ssi:215
 #: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:290
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:312
-#: en/user_customization-packages.ssi:330 en/user_customization-runtime.ssi:14
+#: en/user_customization-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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:132 en/user_installation.ssi:147
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -376,31 +374,28 @@ msgstr ""
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
 #: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/other_faq.ssi:37 en/other_faq.ssi:46
-#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
-#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
-#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
-#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
-#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
-#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/about_manual.ssi:174 en/project_bugs.ssi:62
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70 en/user_customization-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/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi: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_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
@@ -409,27 +404,29 @@ msgstr ""
 #: en/user_customization-packages.ssi:191
 #: en/user_customization-packages.ssi:203
 #: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:294
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:316
-#: en/user_customization-packages.ssi:343 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:118
-#: en/user_installation.ssi:137 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -447,7 +444,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:94
-msgid "# apt-get install make po4a sisu-complete"
+#, no-wrap
+msgid " # apt-get install make po4a sisu-complete\n"
 msgstr ""
 
 #. type: Plain text
@@ -459,7 +457,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:102
-msgid "$ make build"
+#, no-wrap
+msgid " $ make build\n"
 msgstr ""
 
 #. type: Plain text
@@ -472,7 +471,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:110
-msgid "$ make build LANGUAGES=en"
+#, no-wrap
+msgid " $ make build LANGUAGES=en\n"
 msgstr ""
 
 #. type: Plain text
@@ -497,12 +497,12 @@ msgstr ""
 #: en/about_manual.ssi:127
 #, no-wrap
 msgid ""
-"$ mkdir -p ~/.ssh/identity.d\n"
-"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
-"\t-O ~/.ssh/identity.d/gitosis at live.debian.net\n"
-"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-"\t-O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
+" $ mkdir -p ~/.ssh/identity.d\n"
+" $ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
+"     -O ~/.ssh/identity.d/gitosis at live.debian.net\n"
+" $ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
+"     -O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
+" $ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
 msgstr ""
 
 #. type: Plain text
@@ -514,12 +514,12 @@ msgstr ""
 #: en/about_manual.ssi:140
 #, no-wrap
 msgid ""
-"$ cat >> ~/.ssh/config << EOF\n"
-"Host live.debian.net\n"
-"        Hostname live.debian.net\n"
-"        User gitosis\n"
-"        IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
-"EOF\n"
+" $ cat >> ~/.ssh/config << EOF\n"
+" Host live.debian.net\n"
+"     Hostname live.debian.net\n"
+"     User gitosis\n"
+"     IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
+" EOF\n"
 msgstr ""
 
 #. type: Plain text
@@ -529,7 +529,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:148
-msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
+#, no-wrap
+msgid " $ git clone gitosis at live.debian.net:/live-manual.git\n"
 msgstr ""
 
 #. type: Plain text
@@ -542,7 +543,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:156
-msgid "$ make commit"
+#, no-wrap
+msgid " $ make commit\n"
 msgstr ""
 
 #. type: Plain text
@@ -556,7 +558,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:164
-msgid "$ git commit -a -m \"Adding a section on applying patches.\""
+#, no-wrap
+msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -566,7 +569,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:172
-msgid "$ git push"
+#, no-wrap
+msgid " $ git push\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/project_bugs.ssi.po b/manual/po/de/project_bugs.ssi.po
index c7aeee0..3e2811c 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 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-25 23:27+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -58,16 +58,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -100,8 +100,8 @@ msgstr ""
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -121,17 +121,17 @@ msgstr ""
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -323,7 +323,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:60
-msgid "# lb build 2>&1 | tee build.log"
+#, no-wrap
+msgid " # lb build 2>&1 | tee build.log\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/project_coding-style.ssi.po b/manual/po/de/project_coding-style.ssi.po
index 2915c01..4a0bdfc 100644
--- a/manual/po/de/project_coding-style.ssi.po
+++ b/manual/po/de/project_coding-style.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-17 14:37+0100\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-11-30 11:05+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -54,24 +54,25 @@ msgstr ""
 #: 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-runtime.ssi:14
+#: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi: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: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -99,8 +100,8 @@ msgstr ""
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -117,24 +118,25 @@ msgstr ""
 #: 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-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi: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: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -214,9 +216,9 @@ msgstr ""
 #: en/project_coding-style.ssi:32
 #, no-wrap
 msgid ""
-"if foo; then\n"
-"        bar\n"
-"fi\n"
+" if foo; then\n"
+"         bar\n"
+" fi\n"
 msgstr ""
 
 #. type: Plain text
@@ -229,10 +231,10 @@ msgstr ""
 #: en/project_coding-style.ssi:43
 #, no-wrap
 msgid ""
-"if foo\n"
-"then\n"
-"        bar\n"
-"fi\n"
+" if foo\n"
+" then\n"
+"         bar\n"
+" fi\n"
 msgstr ""
 
 #. type: Plain text
@@ -244,19 +246,19 @@ msgstr ""
 #: en/project_coding-style.ssi:55
 #, no-wrap
 msgid ""
-"foo () {\n"
-"        bar\n"
-"}\n"
+" foo () {\n"
+"         bar\n"
+" }\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:66
 #, no-wrap
 msgid ""
-"foo ()\n"
-"{\n"
-"        bar\n"
-"}\n"
+" foo ()\n"
+" {\n"
+"         bar\n"
+" }\n"
 msgstr ""
 
 #. type: Plain text
@@ -321,12 +323,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:94
-msgid "FOO=bar"
+#, no-wrap
+msgid " FOO=bar\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:102
-msgid "FOO=\"bar\""
+#, no-wrap
+msgid " FOO=\"bar\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -338,20 +342,20 @@ msgstr ""
 #: en/project_coding-style.ssi:115
 #, no-wrap
 msgid ""
-"if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
-"then\n"
-"        foobar\n"
-"fi\n"
+" if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
+" then\n"
+"         foobar\n"
+" fi\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:126
 #, no-wrap
 msgid ""
-"if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
-"then\n"
-"        foobar\n"
-"fi\n"
+" if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
+" then\n"
+"         foobar\n"
+" fi\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/project_procedures.ssi.po b/manual/po/de/project_procedures.ssi.po
index 37b88cb..e2f43bc 100644
--- a/manual/po/de/project_procedures.ssi.po
+++ b/manual/po/de/project_procedures.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 18:55-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-11-30 10:35+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -58,16 +58,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -100,8 +100,8 @@ msgstr ""
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -121,17 +121,17 @@ msgstr ""
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -173,7 +173,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:14
-msgid "$ ../../scripts/l10n/output-l10n-changes . -d"
+#, no-wrap
+msgid " $ ../../scripts/l10n/output-l10n-changes . -d\n"
 msgstr ""
 
 #. type: Plain text
@@ -257,11 +258,11 @@ msgstr ""
 #: en/project_procedures.ssi:52
 #, no-wrap
 msgid ""
-"$ sed \\\n"
-"  -e 's|%major%|5.0|g' \\\n"
-"  -e 's|%minor%|5.0.2|g' \\\n"
-"  -e 's|%codename%|lenny|g' \\\n"
-"  -e 's|%release_mail%|2009/msg00007.html|g'\n"
+" $ sed \\\n"
+"     -e 's|%major%|5.0|g' \\\n"
+"     -e 's|%minor%|5.0.2|g' \\\n"
+"     -e 's|%codename%|lenny|g' \\\n"
+"     -e 's|%release_mail%|2009/msg00007.html|g'\n"
 msgstr ""
 
 #. type: Plain text
@@ -273,166 +274,179 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:60
-msgid "Debian Live images for Debian GNU/Linux %major% updated"
+#, no-wrap
+msgid " Debian Live images for Debian GNU/Linux %major% updated\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:64
+#, no-wrap
 msgid ""
-"The Debian Live project is pleased to announce the availability of updated "
-"Live images for its stable distribution Debian GNU/Linux %major% (codename "
-"\"%codename%\")."
+" The Debian Live project is pleased to announce the availability of\n"
+" updated Live images for its stable distribution Debian GNU/Linux %major%\n"
+" (codename \"%codename%\").\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:66
-msgid "The images are available for download at:"
+#, no-wrap
+msgid " The images are available for download at:\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:68
 #, no-wrap
-msgid "    <http://cdimage.debian.org/cdimage/release/current-live/>\n"
+msgid "     <http://cdimage.debian.org/cdimage/release/current-live/>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:73
+#, no-wrap
 msgid ""
-"This update incorporates the changes made in the %minor% point release, "
-"which adds corrections for security problems to the stable release along "
-"with a few adjustments for serious problems. A full list of the changes may "
-"be viewed at:"
+" This update incorporates the changes made in the %minor% point release,\n"
+" which adds corrections for security problems to the stable release\n"
+" along with a few adjustments for serious problems. A full list of the\n"
+" changes may be viewed at:\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:75
 #, no-wrap
-msgid "    <http://lists.debian.org/debian-announce/%release_mail%>\n"
+msgid "     <http://lists.debian.org/debian-announce/%release_mail%>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:77
-msgid "It also includes the following Live-specific changes:"
+#, no-wrap
+msgid " It also includes the following Live-specific changes:\n"
 msgstr ""
 
-#. type: Bullet: ' * '
+#. type: Bullet: '  * '
 #: en/project_procedures.ssi:81
 msgid "[INSERT LIVE-SPECIFIC CHANGE HERE]"
 msgstr ""
 
-#. type: Bullet: ' * '
+#. type: Bullet: '  * '
 #: en/project_procedures.ssi:81
 msgid "[LARGER ISSUES MAY DESERVE THEIR OWN SECTION]"
 msgstr ""
 
 #. type: Plain text
-#: en/project_procedures.ssi:84
+#: en/project_procedures.ssi:85
 #, no-wrap
 msgid ""
-"URLs\n"
-"----\n"
+" URLs\n"
+" ----\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:87
-msgid "Download location of updated images:"
+#, no-wrap
+msgid " Download location of updated images:\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:89
 #, no-wrap
-msgid "  <http://cdimage.debian.org/cdimage/release/current-live/>\n"
+msgid "   <http://cdimage.debian.org/cdimage/release/current-live/>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:91
-msgid "Debian Live project homepage:"
-msgstr "Debian Live Projekt Homepage:"
+#, no-wrap
+msgid " Debian Live project homepage:\n"
+msgstr " Debian Live Projekt Homepage:\n"
 
 #. type: Plain text
 #: en/project_procedures.ssi:93
 #, no-wrap
-msgid "  <http://live.debian.net/>\n"
+msgid "   <http://live.debian.net/>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:95
-msgid "The current stable distribution:"
+#, no-wrap
+msgid " The current stable distribution:\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:97
 #, no-wrap
-msgid "  <http://ftp.debian.org/debian/dists/stable>\n"
+msgid "   <http://ftp.debian.org/debian/dists/stable>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:99
-msgid "stable distribution information (release notes, errata etc.):"
+#, no-wrap
+msgid " stable distribution information (release notes, errata etc.):\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:101
 #, no-wrap
-msgid "  <http://www.debian.org/releases/stable/>\n"
+msgid "   <http://www.debian.org/releases/stable/>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:103
-msgid "Security announcements and information:"
+#, no-wrap
+msgid " Security announcements and information:\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:105
 #, no-wrap
-msgid "  <http://www.debian.org/security/>\n"
+msgid "   <http://www.debian.org/security/>\n"
 msgstr ""
 
 #. type: Plain text
-#: en/project_procedures.ssi:108
+#: en/project_procedures.ssi:109
 #, no-wrap
 msgid ""
-"About Debian\n"
-"-------------\n"
+" About Debian\n"
+" -------------\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:113
+#, no-wrap
 msgid ""
-"The Debian Project is an association of Free Software developers who "
-"volunteer their time and effort in order to produce the completely free "
-"operating system Debian GNU/Linux."
+" The Debian Project is an association of Free Software developers who\n"
+" volunteer their time and effort in order to produce the completely free\n"
+" operating system Debian GNU/Linux.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/project_procedures.ssi:116
+#: en/project_procedures.ssi:117
 #, no-wrap
 msgid ""
-"About Debian Live\n"
-"-----------------\n"
+" About Debian Live\n"
+" -----------------\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:122
+#, no-wrap
 msgid ""
-"Debian Live is an official sub-project of Debian which produces Debian "
-"systems that do not require a classical installer. Images are available for "
-"CD/DVD discs, USB sticks and PXE netbooting as well as a bare filesystem "
-"images for booting directly from the internet."
+" Debian Live is an official sub-project of Debian which produces Debian\n"
+" systems that do not require a classical installer. Images are available\n"
+" for CD/DVD discs, USB sticks and PXE netbooting as well as a bare\n"
+" filesystem images for booting directly from the internet.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/project_procedures.ssi:125
+#: en/project_procedures.ssi:126
 #, no-wrap
 msgid ""
-"Contact Information\n"
-"-------------------\n"
+" Contact Information\n"
+" -------------------\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:130
+#, no-wrap
 msgid ""
-"For further information, please visit the Debian Live web pages at <http://"
-"live.debian.net/> or alternatively send mail to <debian-live at lists.debian."
-"org>."
+" For further information, please visit the Debian Live web pages at\n"
+" <http://live.debian.net/> or alternatively send mail to\n"
+" <debian-live at lists.debian.org>.\n"
 msgstr ""
diff --git a/manual/po/de/user_basics.ssi.po b/manual/po/de/user_basics.ssi.po
index e39af56..ff2836f 100644
--- a/manual/po/de/user_basics.ssi.po
+++ b/manual/po/de/user_basics.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 10:06-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -57,17 +57,17 @@ msgstr ""
 #: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_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:188
-#: en/user_examples.ssi:204 en/user_examples.ssi:218 en/user_examples.ssi:226
-#: en/user_examples.ssi:244 en/user_examples.ssi:252 en/user_examples.ssi:265
-#: en/user_examples.ssi:280 en/user_installation.ssi:38
+#: 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
@@ -100,8 +100,8 @@ msgstr ""
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -120,18 +120,18 @@ msgstr ""
 #: 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:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_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:184 en/user_examples.ssi:200
-#: en/user_examples.ssi:208 en/user_examples.ssi:222 en/user_examples.ssi:230
-#: en/user_examples.ssi:248 en/user_examples.ssi:261 en/user_examples.ssi:276
-#: en/user_examples.ssi:294 en/user_installation.ssi:42
+#: 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
@@ -262,7 +262,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:32
-msgid "$ lb config"
+#, no-wrap
+msgid " $ lb config\n"
 msgstr ""
 
 #. type: Plain text
@@ -281,8 +282,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
-#: en/user_examples.ssi:109 en/user_examples.ssi:156 en/user_examples.ssi:206
-msgid "# lb build"
+#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#, no-wrap
+msgid " # lb build\n"
 msgstr ""
 
 #. type: Plain text
@@ -304,12 +306,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:54 en/user_basics.ssi:142
-msgid "# apt-get install qemu"
+#, no-wrap
+msgid " # apt-get install qemu\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:56
-msgid "$ qemu -cdrom binary.iso"
+#, no-wrap
+msgid " $ qemu -cdrom binary.iso\n"
 msgstr ""
 
 #. type: Plain text
@@ -324,12 +328,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:66
-msgid "# apt-get install virtualbox-ose virtualbox-ose-dkms"
+#, no-wrap
+msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:68
-msgid "$ virtualbox"
+#, no-wrap
+msgid " $ virtualbox\n"
 msgstr ""
 
 #. type: Plain text
@@ -350,7 +356,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:78
-msgid "# lb config --packages virtualbox-ose-guest-x11"
+#, no-wrap
+msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
 msgstr ""
 
 #. type: Plain text
@@ -365,12 +372,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:88
-msgid "# apt-get install wodim"
+#, no-wrap
+msgid " # apt-get install wodim\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:90
-msgid "$ wodim binary.iso"
+#, no-wrap
+msgid " $ wodim binary.iso\n"
 msgstr ""
 
 #. type: Plain text
@@ -399,8 +408,9 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:102
-msgid "$ lb clean --binary"
+#: en/user_basics.ssi:102 en/user_basics.ssi:184
+#, no-wrap
+msgid " # lb clean --binary\n"
 msgstr ""
 
 #. type: Plain text
@@ -412,7 +422,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:110
-msgid "$ lb config -b usb-hdd"
+#, no-wrap
+msgid " $ lb config -b usb-hdd\n"
 msgstr ""
 
 #. type: Plain text
@@ -435,7 +446,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:128
-msgid "$ dd if=binary.img of=${USBSTICK}"
+#, no-wrap
+msgid " $ dd if=binary.img of=${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
@@ -467,7 +479,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:144
-msgid "$ qemu -hda binary.img"
+#, no-wrap
+msgid " $ qemu -hda binary.img\n"
 msgstr ""
 
 #. type: Plain text
@@ -486,7 +499,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:154
-msgid "# gparted ${USBSTICK}"
+#, no-wrap
+msgid " # gparted ${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
@@ -498,7 +512,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:162
-msgid "# mkfs.ext4 ${USBSTICK}"
+#, no-wrap
+msgid " # mkfs.ext4 ${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
@@ -508,7 +523,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:170
-msgid "# mkfs.vfat -F 32"
+#, no-wrap
+msgid " # mkfs.vfat -F 32\n"
 msgstr ""
 
 #. type: Plain text
@@ -538,11 +554,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:184
-msgid "# lb clean --binary"
-msgstr ""
-
-#. type: Plain text
 #: en/user_basics.ssi:188
 msgid ""
 "Run the #{lb config}# command as follows to configure your image for "
@@ -551,9 +562,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:192
-msgid ""
-"$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
-"\"192.168.0.1\""
+#, no-wrap
+msgid " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -616,39 +626,46 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:220
-msgid "# /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server"
+#, no-wrap
+msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:222
-msgid "ddns-update-style none;"
+#, no-wrap
+msgid " ddns-update-style none;\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:225
+#, no-wrap
 msgid ""
-"option domain-name \"example.org\"; option domain-name-servers ns1.example."
-"org, ns2.example.org;"
+" option domain-name \"example.org\";\n"
+" option domain-name-servers ns1.example.org, ns2.example.org;\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:228
-msgid "default-lease-time 600; max-lease-time 7200;"
+#, no-wrap
+msgid ""
+" default-lease-time 600;\n"
+" max-lease-time 7200;\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:230
-msgid "log-facility local7;"
+#, no-wrap
+msgid " log-facility local7;\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:236
 #, no-wrap
 msgid ""
-"subnet 192.168.0.0 netmask 255.255.255.0 {\n"
-"  range 192.168.0.1 192.168.0.254;\n"
-"  next-server servername;\n"
-"  filename \"pxelinux.0\";\n"
+" subnet 192.168.0.0 netmask 255.255.255.0 {\n"
+"   range 192.168.0.1 192.168.0.254;\n"
+"   next-server servername;\n"
+"   filename \"pxelinux.0\";\n"
 "}\n"
 msgstr ""
 
@@ -672,7 +689,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:248
-msgid "# dpkg-reconfigure -plow tftpd-hpa"
+#, no-wrap
+msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
 msgstr ""
 
 #. type: Plain text
@@ -707,7 +725,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:264
-msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
+#, no-wrap
+msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
 msgstr ""
 
 #. type: Plain text
@@ -718,7 +737,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:272
-msgid "# exportfs -rv"
+#, no-wrap
+msgid " # exportfs -rv\n"
 msgstr ""
 
 #. type: Plain text
@@ -767,11 +787,16 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:299
+#, no-wrap
 msgid ""
-"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
-"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
-"sudo /sbin/ifconfig $1 0.0.0.0 promisc up echo \"Adding $1 to br0...\" sudo /"
-"usr/sbin/brctl addif br0 $1 sleep 2"
+" #!/bin/sh\n"
+" sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1\n"
+" echo \"Executing /etc/qemu-ifup\"\n"
+" echo \"Bringing up $1 for bridged mode...\"\n"
+" sudo /sbin/ifconfig $1 0.0.0.0 promisc up\n"
+" echo \"Adding $1 to br0...\"\n"
+" sudo /usr/sbin/brctl addif br0 $1\n"
+" sleep 2\n"
 msgstr ""
 
 #. type: Plain text
@@ -809,34 +834,50 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:321
+#, no-wrap
 msgid ""
-"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
-"\"512\" MemAllowAutoScaleDown = \"FALSE\""
+" #!/usr/bin/vmware\n"
+" config.version = \"8\"\n"
+" virtualHW.version = \"4\"\n"
+" memsize = \"512\"\n"
+" MemAllowAutoScaleDown = \"FALSE\"\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:327
+#, no-wrap
 msgid ""
-"ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
-"\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
+" ide0:0.present = \"FALSE\"\n"
+" ide1:0.present = \"FALSE\"\n"
+" floppy0.present = \"FALSE\"\n"
+" sound.present = \"FALSE\"\n"
+" tools.remindInstall = \"FALSE\"\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:330
-msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
+#, no-wrap
+msgid ""
+" ethernet0.present = \"TRUE\"\n"
+" ethernet0.addressType = \"generated\"\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:333
-msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
+#, no-wrap
+msgid ""
+" displayName = \"Test Boot PXE\"\n"
+" guestOS = \"other\"\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:338
+#, no-wrap
 msgid ""
-"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
-"83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
-"de 3f-ae 9e 07 91 1d 8d 71 3b\" ethernet0.generatedAddressOffset = \"0\""
+" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\"\n"
+" uuid.location = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
+" uuid.bios = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
+" ethernet0.generatedAddressOffset = \"0\"\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/user_customization-contents.ssi.po b/manual/po/de/user_customization-contents.ssi.po
index 6d36bdb..36aa0fc 100644
--- a/manual/po/de/user_customization-contents.ssi.po
+++ b/manual/po/de/user_customization-contents.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-10 16:54-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -20,28 +20,24 @@ msgstr ""
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
-#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
-#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
-#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
-#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
-#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
-#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/about_manual.ssi:170 en/project_bugs.ssi:58
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
-#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
-#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi: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_customization-installer.ssi:32
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -55,27 +51,28 @@ msgstr ""
 #: en/user_customization-packages.ssi:199
 #: en/user_customization-packages.ssi:215
 #: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:290
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:312
-#: en/user_customization-packages.ssi:330 en/user_customization-runtime.ssi:14
+#: en/user_customization-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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:132 en/user_installation.ssi:147
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi: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_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 +84,24 @@ msgstr ""
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
 #: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/other_faq.ssi:37 en/other_faq.ssi:46
-#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
-#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
-#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
-#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
-#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
-#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/about_manual.ssi:174 en/project_bugs.ssi:62
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi: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_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
@@ -121,27 +114,29 @@ msgstr ""
 #: en/user_customization-packages.ssi:191
 #: en/user_customization-packages.ssi:203
 #: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:294
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:316
-#: en/user_customization-packages.ssi:343 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:118
-#: en/user_installation.ssi:137 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -244,9 +239,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:29
+#, no-wrap
 msgid ""
-"$ mkdir -p config/chroot_local-includes/var/www $ cp /path/to/my/index.html "
-"config/chroot_local-includes/var/www"
+" $ mkdir -p config/chroot_local-includes/var/www\n"
+" $ cp /path/to/my/index.html config/chroot_local-includes/var/www\n"
 msgstr ""
 
 #. type: Plain text
@@ -258,14 +254,14 @@ msgstr ""
 #: en/user_customization-contents.ssi:44
 #, no-wrap
 msgid ""
-"-- config\n"
-"   [...]\n"
-"    |-- chroot_local-includes\n"
-"    |   `-- var\n"
-"    |       `-- www\n"
-"    |           `-- index.html\n"
-"   [...]\n"
-"    `-- templates\n"
+" -- config\n"
+"    [...]\n"
+"     |-- chroot_local-includes\n"
+"     |   `-- var\n"
+"     |       `-- www\n"
+"     |           `-- index.html\n"
+"    [...]\n"
+"     `-- templates\n"
 msgstr ""
 
 #. type: Plain text
@@ -294,7 +290,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:56
-msgid "$ cp ~/video_demo.* config/binary_local-includes/"
+#, no-wrap
+msgid " $ cp ~/video_demo.* config/binary_local-includes/\n"
 msgstr ""
 
 #. type: Plain text
@@ -316,7 +313,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:68
-msgid "$ lb config --includes none"
+#, no-wrap
+msgid " $ lb config --includes none\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 8040eac..2de4c0e 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 2.0.0\n"
-"POT-Creation-Date: 2010-12-16 08:39-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-11-30 10:53+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -32,12 +32,12 @@ msgstr ""
 #: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
 #: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
 #: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_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_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -54,24 +54,25 @@ msgstr ""
 #: 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-runtime.ssi:14
+#: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi: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: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -95,12 +96,12 @@ msgstr ""
 #: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
 #: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
 #: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -117,24 +118,25 @@ msgstr ""
 #: 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-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi: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: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -251,19 +253,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:34
+#: en/user_customization-installer.ssi:35
+#, no-wrap
 msgid ""
-"$ lb config --architecture i386 --linux-flavours 486 --debian-installer live "
-"--packages debian-installer-launcher"
+" $ lb config --architecture i386 --linux-flavours 486 \\\n"
+"     --debian-installer live --packages debian-installer-launcher\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:39
 msgid "2~ Customizing Debian Installer by preseeding"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:40
+#: en/user_customization-installer.ssi:41
 msgid ""
 "As described in the Debian Installer Manual, Appendix B at http://www.debian."
 "org/releases/stable/i386/apb.html, \"Preseeding provides a way to set "
@@ -277,19 +280,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:44
+#: en/user_customization-installer.ssi:46
+#, no-wrap
 msgid ""
-"$ echo \"d-i debian-installer/locale string en_US\" >> config/binary_debian-"
-"installer/preseed.cfg"
+" $ echo \"d-i debian-installer/locale string en_US\" \\\n"
+"     >> config/binary_debian-installer/preseed.cfg\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:50
 msgid "2~ Customizing Debian Installer content"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:50
+#: en/user_customization-installer.ssi:52
 msgid ""
 "For experimental or debugging purposes, you might want to include locally "
 "built #{d-i}# component udeb packages. Place these in #{config/binary_local-"
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index d4e91d8..d3f95b0 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 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -58,16 +58,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -100,8 +100,8 @@ msgstr ""
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -121,17 +121,17 @@ msgstr ""
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -200,7 +200,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:16
-msgid "$ lb config --distribution sid"
+#, no-wrap
+msgid " $ lb config --distribution sid\n"
 msgstr ""
 
 #. type: Plain text
@@ -215,7 +216,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:24
-msgid "$ lb config --archive-areas \"main contrib\""
+#, no-wrap
+msgid " $ lb config --archive-areas \"main contrib\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -274,8 +276,8 @@ msgstr ""
 #: en/user_customization-packages.ssi:43
 #, no-wrap
 msgid ""
-"$ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
-"            --mirror-chroot-security http://localhost/debian-security/\n"
+" $ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
+"             --mirror-chroot-security http://localhost/debian-security/\n"
 msgstr ""
 
 #. type: Plain text
@@ -307,8 +309,8 @@ msgstr ""
 #: en/user_customization-packages.ssi:56
 #, no-wrap
 msgid ""
-"$ lb config --mirror-binary http://mirror/debian/ \\\n"
-"            --mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --mirror-binary http://mirror/debian/ \\\n"
+"             --mirror-binary-security http://mirror/debian-security/\n"
 msgstr ""
 
 #. type: Plain text
@@ -338,7 +340,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:68
-msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
+#, no-wrap
+msgid " deb http://live.debian.net/ sid-snapshots main contrib non-free\n"
 msgstr ""
 
 #. type: Plain text
@@ -371,7 +374,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
-msgid "$ lb config --repository live.debian.net"
+#, no-wrap
+msgid " $ lb config --repository live.debian.net\n"
 msgstr ""
 
 #. type: Plain text
@@ -406,7 +410,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:96
-msgid "$ lb config --packages \"package1 package2 package3\""
+#, no-wrap
+msgid " $ lb config --packages \"package1 package2 package3\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -457,7 +462,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:114
-msgid "$ lb config --packages-lists \"gnome-core rescue\""
+#, no-wrap
+msgid " $ lb config --packages-lists \"gnome-core rescue\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -553,7 +559,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:145
-msgid "#include <gnome> iceweasel"
+#, no-wrap
+msgid ""
+" #include <gnome>\n"
+" iceweasel\n"
 msgstr ""
 
 #. type: Plain text
@@ -581,7 +590,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:159
-msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
+#, no-wrap
+msgid ""
+" #if ARCHITECTURE amd64\n"
+" ia32-libs\n"
+" #endif\n"
 msgstr ""
 
 #. type: Plain text
@@ -593,7 +606,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:169
-msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
+#, no-wrap
+msgid ""
+" #if ARCHITECTURE i386 amd64\n"
+" memtest86+\n"
+" #endif\n"
 msgstr ""
 
 #. type: Plain text
@@ -606,7 +623,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:179
-msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
+#, no-wrap
+msgid ""
+" #if ARCHIVE_AREAS contrib non-free\n"
+" vrms\n"
+" #endif\n"
 msgstr ""
 
 #. type: Plain text
@@ -616,7 +637,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:189
-msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
+#, no-wrap
+msgid ""
+" #if ARCHITECTURE amd64\n"
+" #include <gnome-full>\n"
+" #endif\n"
 msgstr ""
 
 #. type: Plain text
@@ -642,7 +667,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:201
-msgid "$ lb config --tasks \"mail-server file-server\""
+#, no-wrap
+msgid " $ lb config --tasks \"mail-server file-server\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -690,8 +716,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:217
-msgid ""
-"$ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\""
+#, no-wrap
+msgid " $ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -724,7 +750,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:229
-msgid "$ lb config --language es"
+#, no-wrap
+msgid " $ lb config --language es\n"
 msgstr ""
 
 #. type: Plain text
@@ -941,7 +968,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:293
-msgid "$ lb config --apt-http-proxy http://proxy/"
+#, no-wrap
+msgid " $ lb config --apt-http-proxy http://proxy/\n"
 msgstr ""
 
 #. type: Plain text
@@ -966,7 +994,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:305
-msgid "$ lb config --binary-indices false"
+#, no-wrap
+msgid " $ lb config --binary-indices false\n"
 msgstr ""
 
 #. type: Plain text
@@ -988,7 +1017,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:315
-msgid "$ lb config --apt-recommends false"
+#, no-wrap
+msgid " $ lb config --apt-recommends false\n"
 msgstr ""
 
 #. type: Plain text
@@ -1047,15 +1077,23 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:337
+#, no-wrap
 msgid ""
-"$ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid."
-"chroot $ cat >>config/chroot_apt/preferences <<END Package: live-* Pin: "
-"release n=sid Pin-Priority: 600"
+" $ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid.chroot\n"
+" $ cat >>config/chroot_apt/preferences <<END\n"
+" Package: live-*\n"
+" Pin: release n=sid\n"
+" Pin-Priority: 600\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:342
-msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
+#, no-wrap
+msgid ""
+" Package: *\n"
+" Pin: release n=sid\n"
+" Pin-Priority: 1\n"
+" END\n"
 msgstr ""
 
 #. type: Plain text
@@ -1071,5 +1109,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:352
-msgid "Package: gnome-keyring Pin: version * Pin-Priority: -1"
+#, no-wrap
+msgid ""
+" Package: gnome-keyring\n"
+" Pin: version *\n"
+" Pin-Priority: -1\n"
 msgstr ""
diff --git a/manual/po/de/user_customization-runtime.ssi.po b/manual/po/de/user_customization-runtime.ssi.po
index bc5f1b2..88ff610 100644
--- a/manual/po/de/user_customization-runtime.ssi.po
+++ b/manual/po/de/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-11-30 11:40+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -58,16 +58,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -100,8 +100,8 @@ msgstr ""
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -121,17 +121,17 @@ msgstr ""
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -188,9 +188,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:16
-msgid ""
-"debconf passwd/user-default-groups string audio cdrom dialout floppy video "
-"plugdev netdev powerdev fuse"
+#, no-wrap
+msgid " debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse\n"
 msgstr ""
 
 #. type: Plain text
@@ -228,7 +227,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:34
-msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
+#, no-wrap
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -251,9 +251,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:45
+#, no-wrap
 msgid ""
-"$ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name <name>se</"
-"name>"
+" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
+" <name>se</name>\n"
 msgstr ""
 
 #. type: Plain text
@@ -264,8 +265,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:53
-msgid ""
-"$ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\""
+#, no-wrap
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -276,14 +277,15 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:61
+#: en/user_customization-runtime.ssi:62
+#, no-wrap
 msgid ""
-"$ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); do basename $i | "
-"head -c -9; echo; done | sort | less"
+" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
+"     do basename $i | head -c -9; echo; done | sort | less\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:65
+#: en/user_customization-runtime.ssi:66
 msgid ""
 "Alternatively, you can use the #{console-setup}# package, a tool to let you "
 "configure console layout using X (XKB) definitions; you can then set your "
@@ -295,19 +297,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:69
+#: en/user_customization-runtime.ssi:71
+#, no-wrap
 msgid ""
-"$ lb config --bootappend-live \"locales=fr_FR.UTF-8 keyboard-layouts=fr "
-"keyboard-variant=bepo keyboard-model=tm2030usb\""
+" $ lb config --bootappend-live \\\n"
+"     \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:73
+#: en/user_customization-runtime.ssi:75
 msgid "2~persistence Persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:75
+#: en/user_customization-runtime.ssi:77
 msgid ""
 "A live cd paradigm is a pre-installed system which runs from read-only "
 "media, like a cdrom, where writes and modifications do not survive reboots "
@@ -315,7 +318,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:77
+#: en/user_customization-runtime.ssi:79
 msgid ""
 "A Debian Live system is a generalization of this paradigm and thus supports "
 "other media in addition to CDs; but still, in its default behaviour, it "
@@ -324,7 +327,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:79
+#: en/user_customization-runtime.ssi:81
 msgid ""
 "Persistence is a common name for different kinds of solutions for saving "
 "across reboots some, or all, of this run-time evolution of the system. To "
@@ -335,7 +338,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:81
+#: en/user_customization-runtime.ssi:83
 msgid ""
 "The data stored on this ramdisk should be saved on a writable persistent "
 "medium like a Hard Disk, a USB key, a network share or even a session of a "
@@ -345,12 +348,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:85
 msgid "3~ Full persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:87
 msgid ""
 "By 'full persistence' it is meant that instead of using a tmpfs for storing "
 "modifications to the read-only media (with the copy-on-write, COW, system) a "
@@ -362,26 +365,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:89
-msgid "# mkfs.ext2 -L live-rw /dev/sdb1"
+#: en/user_customization-runtime.ssi:91
+#, no-wrap
+msgid " # mkfs.ext2 -L live-rw /dev/sdb1\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:95
 msgid ""
 "If you already have a partition on your device, you could just change the "
 "label with one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:100
+#, no-wrap
 msgid ""
-"# tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems # dosfslabel /dev/"
-"sdb1 live-rw # for a fat filesystem"
+" # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
+" # dosfslabel /dev/sdb1 live-rw # for a fat filesystem\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:102
+#: en/user_customization-runtime.ssi:104
 msgid ""
 "But since live system users cannot always use a hard drive partition, and "
 "considering that most USB keys have poor write speeds, 'full' persistence "
@@ -391,26 +396,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:107
+#: en/user_customization-runtime.ssi:109
+#, no-wrap
 msgid ""
-"$ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file $ /"
-"sbin/mkfs.ext2 -F live-rw"
+" $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
+" $ /sbin/mkfs.ext2 -F live-rw\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:113
 msgid ""
 "Then copy the #{live-rw}# file to a writable partition and reboot with the "
 "boot parameter 'persistent'."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:113
+#: en/user_customization-runtime.ssi:115
 msgid "3~ Home automounting"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:117
 msgid ""
 "If during the boot a partition (filesystem) image file or a partition "
 "labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
@@ -419,12 +425,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:117
+#: en/user_customization-runtime.ssi:119
 msgid "3~ Snapshots"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:119
+#: en/user_customization-runtime.ssi:121
 msgid ""
 "Snapshots are collections of files and directories which are not mounted "
 "while running but which are copied from a persistent device to the system "
@@ -441,26 +447,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:121
+#: en/user_customization-runtime.ssi:123
 msgid ""
 "A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
 "works the same as the main snapshot but it is only applied to /home."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:123
+#: en/user_customization-runtime.ssi:125
 msgid ""
 "Snapshots cannot currently handle file deletion but full persistence and "
 "home automounting can."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:125
+#: en/user_customization-runtime.ssi:127
 msgid "3~ Persistent SubText"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:127
+#: en/user_customization-runtime.ssi:129
 msgid ""
 "If a user would need multiple persistent storage of the same type for "
 "different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-"
@@ -472,12 +478,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:129
+#: en/user_customization-runtime.ssi:131
 msgid "3~ Partial remastering"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:132
 msgid ""
 "The run-time modification of the tmpfs could be collected using live-"
 "snapshot in a squashfs and added to the cd by remastering the iso in the "
diff --git a/manual/po/de/user_examples.ssi.po b/manual/po/de/user_examples.ssi.po
index 2c3f74e..d9b0aa9 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 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-11-04 16:34-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -42,7 +42,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -63,16 +63,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -105,8 +105,8 @@ msgstr ""
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -126,17 +126,17 @@ msgstr ""
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -151,8 +151,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
-#: en/user_examples.ssi:109 en/user_examples.ssi:156 en/user_examples.ssi:208
-msgid "# lb build"
+#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#, no-wrap
+msgid " # lb build\n"
 msgstr ""
 
 #. type: Plain text
@@ -197,9 +198,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:18
+#, no-wrap
 msgid ""
-"LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\" LB_MIRROR_CHROOT=\"http://"
-"mirror/debian\" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\""
+" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
+" LB_MIRROR_CHROOT=\"http://mirror/debian\"\n"
+" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -228,7 +231,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:32
-msgid "$ mkdir tutorial1 ; cd tutorial1 ; lb config"
+#, no-wrap
+msgid " $ mkdir tutorial1 ; cd tutorial1 ; lb config\n"
 msgstr ""
 
 #. type: Plain text
@@ -246,8 +250,9 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:230
-msgid "# lb build 2>&1 | tee binary.log"
+#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:231
+#, no-wrap
+msgid " # lb build 2>&1 | tee binary.log\n"
 msgstr ""
 
 #. type: Plain text
@@ -283,8 +288,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:56
-msgid ""
-"$ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel"
+#, no-wrap
+msgid " $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel\n"
 msgstr ""
 
 #. type: Plain text
@@ -339,9 +344,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:84
+#, no-wrap
 msgid ""
-"$ mkdir -p tutorial3/auto $ cp /usr/share/live/build/examples/auto/* "
-"tutorial3/auto/ $ cd tutorial3"
+" $ mkdir -p tutorial3/auto\n"
+" $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/\n"
+" $ cd tutorial3\n"
 msgstr ""
 
 #. type: Plain text
@@ -351,19 +358,20 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:92 en/user_examples.ssi:141
-msgid "#!/bin/sh"
+#, no-wrap
+msgid " #!/bin/sh\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:99
 #, no-wrap
 msgid ""
-"lb config noauto \\\n"
-"    --architecture i386 \\\n"
-"    --linux-flavours 686 \\\n"
-"    --packages-lists lxde \\\n"
-"    --packages \"iceweasel xchat\" \\\n"
-"    \"${@}\"\n"
+" lb config noauto \\\n"
+"     --architecture i386 \\\n"
+"     --linux-flavours 686 \\\n"
+"     --packages-lists lxde \\\n"
+"     --packages \"iceweasel xchat\" \\\n"
+"     \"${@}\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -399,7 +407,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:121
-msgid "$ git init $ git add auto $ git commit -a -m \"Initial import.\""
+#, no-wrap
+msgid ""
+" $ git init\n"
+" $ git add auto\n"
+" $ git commit -a -m \"Initial import.\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -425,7 +437,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:133
-msgid "# lb clean"
+#, no-wrap
+msgid " # lb clean\n"
 msgstr ""
 
 #. type: Plain text
@@ -437,12 +450,12 @@ msgstr ""
 #: en/user_examples.ssi:148
 #, no-wrap
 msgid ""
-"lb config noauto \\\n"
-"    --architecture i386 \\\n"
-"    --linux-flavours 686 \\\n"
-"    --packages-lists lxde \\\n"
-"    --packages \"iceweasel xchat vlc\" \\\n"
-"    \"${@}\"\n"
+" lb config noauto \\\n"
+"     --architecture i386 \\\n"
+"     --linux-flavours 686 \\\n"
+"     --packages-lists lxde \\\n"
+"     --packages \"iceweasel xchat vlc\" \\\n"
+"     \"${@}\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -451,13 +464,19 @@ msgid "Build again:"
 msgstr ""
 
 #. type: Plain text
+#: en/user_examples.ssi:156
+msgid "# lb build"
+msgstr ""
+
+#. type: Plain text
 #: en/user_examples.ssi:160
 msgid "Test, and when you're satisfied, commit the next revision:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:164
-msgid "$ git commit -a -m \"Adding vlc media player.\""
+#, no-wrap
+msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -504,11 +523,11 @@ msgstr ""
 #: en/user_examples.ssi:184
 #, no-wrap
 msgid ""
-"$ mkdir vnc_kiosk_client\n"
-"$ cd vnc_kiosk_client\n"
-"$ lb config -a i386 -k 686 -p standard-x11 \\\n"
-"    --packages \"gdm3 metacity xvnc4viewer\" \\\n"
-"    --apt-recommends false\n"
+" $ mkdir vnc_kiosk_client\n"
+" $ cd vnc_kiosk_client\n"
+" $ lb config -a i386 -k 686 -p standard-x11 \\\n"
+"     --packages \"gdm3 metacity xvnc4viewer\" \\\n"
+"     --apt-recommends false\n"
 msgstr ""
 
 #. type: Plain text
@@ -521,19 +540,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:194
+#, no-wrap
 msgid ""
-"$ mkdir -p config/chroot_local-includes/etc/skel $ cat >config/chroot_local-"
-"includes/etc/skel/.xsession <<END #!/bin/sh"
+" $ mkdir -p config/chroot_local-includes/etc/skel\n"
+" $ cat >config/chroot_local-includes/etc/skel/.xsession <<END\n"
+" #!/bin/sh\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:197
-msgid "/usr/bin/metacity & /usr/bin/xvncviewer 192.168.1.2:1"
+#, no-wrap
+msgid ""
+" /usr/bin/metacity &\n"
+" /usr/bin/xvncviewer 192.168.1.2:1\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:200
-msgid "exit END"
+#, no-wrap
+msgid ""
+" exit\n"
+" END\n"
 msgstr ""
 
 #. type: Plain text
@@ -572,19 +599,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:222
+#: en/user_examples.ssi:223
+#, no-wrap
 msgid ""
-"$ lb config -k 486 -p minimal --binary-indices false --memtest none --apt-"
-"recommends false --includes none"
+" $ lb config -k 486 -p minimal --binary-indices false \\\n"
+"     --memtest none --apt-recommends false --includes none\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:226
+#: en/user_examples.ssi:227
 msgid "Now, build the image in the usual way:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:234
+#: en/user_examples.ssi:235
 msgid ""
 "On the author's system at time of writing, the above configuration produced "
 "a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
@@ -592,7 +620,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:236
+#: en/user_examples.ssi:237
 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 "
@@ -610,18 +638,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:238
+#: en/user_examples.ssi:239
 msgid "2~ A localized KDE desktop and installer"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:240
+#: en/user_examples.ssi:241
 #, no-wrap
 msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:242
+#: en/user_examples.ssi:243
 msgid ""
 "We want to make an iso-hybrid image for i386 architecture using our "
 "preferred desktop, in this case KDE, containing all of the same packages "
@@ -629,7 +657,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:244
+#: en/user_examples.ssi:245
 msgid ""
 "Our initial problem is the discovery of the names of the appropriate tasks. "
 "Currently, live-build cannot help with this. While we might get lucky and "
@@ -639,55 +667,56 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:248
-msgid "# apt-get install dctrl-tools tasksel-data"
+#: en/user_examples.ssi:249
+#, no-wrap
+msgid " # apt-get install dctrl-tools tasksel-data\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:252
+#: en/user_examples.ssi:253
 msgid "Now we can search for the appropriate tasks, first with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:261
+#: en/user_examples.ssi:262
 #, no-wrap
 msgid ""
-"$ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
-"Task: brazilian-portuguese\n"
-"Description: Brazilian Portuguese environment\n"
-" This task installs programs, data files, and\n"
-" documentation that make it easier for Brazilian Portuguese speakers\n"
-" to use Debian.\n"
+" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" Task: brazilian-portuguese\n"
+" Description: Brazilian Portuguese environment\n"
+"  This task installs programs, data files, and\n"
+"  documentation that make it easier for Brazilian Portuguese speakers\n"
+"  to use Debian.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:265
+#: en/user_examples.ssi:266
 msgid ""
 "By this command, we discover the task is called, plainly enough, brazilian-"
 "portuguese. Now to find the related tasks:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:272
+#: en/user_examples.ssi:273
 #, no-wrap
 msgid ""
-"$ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
-"Task: brazilian-portuguese-desktop\n"
-"Description: Brazilian Portuguese desktop\n"
-" This task localises the desktop in Brasilian Portuguese.\n"
+" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" Task: brazilian-portuguese-desktop\n"
+" Description: Brazilian Portuguese desktop\n"
+"  This task localises the desktop in Brasilian Portuguese.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:276
+#: en/user_examples.ssi:277
 #, no-wrap
 msgid ""
-"Task: brazilian-portuguese-kde-desktop\n"
-"Description: Brazilian Portuguese KDE desktop\n"
-" This task localises the KDE desktop in Brazilian Portuguese.\n"
+" Task: brazilian-portuguese-kde-desktop\n"
+" Description: Brazilian Portuguese KDE desktop\n"
+"  This task localises the KDE desktop in Brazilian Portuguese.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:280
+#: en/user_examples.ssi:281
 msgid ""
 "We will use the experimental #{--language}# option, as live-build happens to "
 "include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
@@ -697,12 +726,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:294
+#: en/user_examples.ssi:295
 #, no-wrap
 msgid ""
-"$ mkdir live-pt_BR-kde\n"
-"$ cd live-pt_BR-kde\n"
-"$ lb config \\\n"
+" $ mkdir live-pt_BR-kde\n"
+" $ cd live-pt_BR-kde\n"
+" $ lb config \\\n"
 "     -a i386 \\\n"
 "     -k 486 \\\n"
 "     -p kde-desktop \\\n"
@@ -714,7 +743,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:298
+#: en/user_examples.ssi:299
 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 "
diff --git a/manual/po/de/user_installation.ssi.po b/manual/po/de/user_installation.ssi.po
index 75f493b..3a895fd 100644
--- a/manual/po/de/user_installation.ssi.po
+++ b/manual/po/de/user_installation.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -58,16 +58,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -100,8 +100,8 @@ msgstr ""
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -121,17 +121,17 @@ msgstr ""
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -146,7 +146,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
-msgid "$ lb config --repository live.debian.net"
+#, no-wrap
+msgid " $ lb config --repository live.debian.net\n"
 msgstr ""
 
 #. type: Plain text
@@ -245,7 +246,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:40
-msgid "# apt-get install live-build"
+#, no-wrap
+msgid " # apt-get install live-build\n"
 msgstr ""
 
 #. type: Plain text
@@ -255,7 +257,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:48
-msgid "# aptitude install live-build"
+#, no-wrap
+msgid " # aptitude install live-build\n"
 msgstr ""
 
 #. type: Plain text
@@ -273,7 +276,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:58
-msgid "$ git clone git://live.debian.net/git/live-build.git"
+#, no-wrap
+msgid " $ git clone git://live.debian.net/git/live-build.git\n"
 msgstr ""
 
 #. type: Plain text
@@ -283,7 +287,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:68
-msgid "$ cd live-build $ dpkg-buildpackage -rfakeroot -b -uc -us $ cd .."
+#, no-wrap
+msgid ""
+" $ cd live-build\n"
+" $ dpkg-buildpackage -rfakeroot -b -uc -us\n"
+" $ cd ..\n"
 msgstr ""
 
 #. type: Plain text
@@ -295,7 +303,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:76
-msgid "# dpkg -i live-build_2.0.8-1_all.deb"
+#, no-wrap
+msgid " # dpkg -i live-build_2.0.8-1_all.deb\n"
 msgstr ""
 
 #. type: Plain text
@@ -305,7 +314,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:84
-msgid "# make install"
+#, no-wrap
+msgid " # make install\n"
 msgstr ""
 
 #. type: Plain text
@@ -315,7 +325,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:92
-msgid "# make uninstall"
+#, no-wrap
+msgid " # make uninstall\n"
 msgstr ""
 
 #. type: Plain text
@@ -363,12 +374,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:117
+#, no-wrap
 msgid ""
-"$ git clone git://live.debian.net/git/live-boot.git $ git clone git://live."
-"debian.net/git/live-config.git"
+" $ git clone git://live.debian.net/git/live-boot.git\n"
+" $ git clone git://live.debian.net/git/live-config.git\n"
 msgstr ""
-"$ git clone git://live.debian.net/git/live-boot.git $ git clone git://live."
-"debian.net/git/live-config.git"
 
 #. type: Plain text
 #: en/user_installation.ssi:121
@@ -403,9 +413,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:134
+#, no-wrap
 msgid ""
-"$ cd live-boot $ dpkg-buildpackage -b -uc -us $ cd ../live-config $ dpkg-"
-"buildpackage -b -uc -us"
+" $ cd live-boot\n"
+" $ dpkg-buildpackage -b -uc -us\n"
+" $ cd ../live-config\n"
+" $ dpkg-buildpackage -b -uc -us\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/user_managing_a_configuration.ssi.po b/manual/po/de/user_managing_a_configuration.ssi.po
index e2fc22d..450ef6d 100644
--- a/manual/po/de/user_managing_a_configuration.ssi.po
+++ b/manual/po/de/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-17 07:53-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-13 17:00+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -32,12 +32,12 @@ msgstr ""
 #: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
 #: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
 #: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_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_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -54,24 +54,25 @@ msgstr ""
 #: 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-runtime.ssi:14
+#: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi: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: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -95,12 +96,12 @@ msgstr ""
 #: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
 #: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
 #: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -117,24 +118,25 @@ msgstr ""
 #: 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-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi: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: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -235,10 +237,10 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:29
 #, no-wrap
 msgid ""
-"#!/bin/sh\n"
-"lb config noauto \\\n"
-"\t--packages-lists \"standard\" \\\n"
-"\t\"${@}\"\n"
+" #!/bin/sh\n"
+" lb config noauto \\\n"
+"     --packages-lists \"standard\" \\\n"
+"     \"${@}\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -250,11 +252,11 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:41
 #, no-wrap
 msgid ""
-"#!/bin/sh\n"
-"lb clean noauto \"${@}\"\n"
-"rm -f config/binary config/bootstrap \\\n"
-"\tconfig/chroot config/common config/source\n"
-"rm -f binary.log\n"
+" #!/bin/sh\n"
+" lb clean noauto \"${@}\"\n"
+" rm -f config/binary config/bootstrap \\\n"
+"     config/chroot config/common config/source\n"
+" rm -f binary.log\n"
 msgstr ""
 
 #. type: Plain text
@@ -264,7 +266,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_managing_a_configuration.ssi:50
-msgid "#!/bin/sh lb build noauto \"${@}\" 2>&1 | tee binary.log"
+#, no-wrap
+msgid ""
+" #!/bin/sh\n"
+" lb build noauto \"${@}\" 2>&1 | tee binary.log\n"
 msgstr ""
 
 #. type: Plain text
@@ -276,7 +281,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_managing_a_configuration.ssi:58
-msgid "$ cp /usr/share/live/build/examples/auto/* auto/"
+#, no-wrap
+msgid " $ cp /usr/share/live/build/examples/auto/* auto/\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/user_overview.ssi.po b/manual/po/de/user_overview.ssi.po
index 91e4fa9..5b697a8 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 2.0.0\n"
-"POT-Creation-Date: 2010-12-17 07:53-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -32,12 +32,12 @@ msgstr ""
 #: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
 #: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
 #: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_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_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -54,24 +54,25 @@ msgstr ""
 #: 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-runtime.ssi:14
+#: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi: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: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -95,12 +96,12 @@ msgstr ""
 #: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
 #: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
 #: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -117,24 +118,25 @@ msgstr ""
 #: 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-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi: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: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -264,39 +266,53 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:39
-msgid "$ lb config P: Creating config tree"
+#, no-wrap
+msgid ""
+" $ lb config\n"
+" P: Creating config tree\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:44
+#, no-wrap
 msgid ""
-"$ ls -l total 8 drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto drwxr-xr-x 22 "
-"user user 4096 Sep 7 13:02 config"
+" $ ls -l\n"
+" total 8\n"
+" drwxr-xr-x  3 user user 4096 Sep  7 13:02 auto\n"
+" drwxr-xr-x 22 user user 4096 Sep  7 13:02 config\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:72
+#, no-wrap
 msgid ""
-"$ ls -l config/ total 104 -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary "
-"drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer drwxr-xr-x 2 "
-"user user 4096 Sep 7 13:02 binary_debian-installer-includes drwxr-xr-x 2 "
-"user user 4096 Sep 7 13:02 binary_grub drwxr-xr-x 2 user user 4096 Sep 7 "
-"13:02 binary_local-debs drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-"
-"hooks drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes drwxr-xr-"
-"x 2 user user 4096 Sep 7 13:02 binary_local-packageslists drwxr-xr-x 2 user "
-"user 4096 Sep 7 13:02 binary_local-udebs drwxr-xr-x 2 user user 4096 Sep 7 "
-"13:02 binary_rootfs drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux -"
-"rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap -rw-r--r-- 1 user user 1647 "
-"Sep 7 13:02 chroot drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt drwxr-"
-"xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks drwxr-xr-x 2 user user "
-"4096 Sep 7 13:02 chroot_local-includes drwxr-xr-x 2 user user 4096 Sep 7 "
-"13:02 chroot_local-packages drwxr-xr-x 2 user user 4096 Sep 7 13:02 "
-"chroot_local-packageslists drwxr-xr-x 2 user user 4096 Sep 7 13:02 "
-"chroot_local-patches drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-"
-"preseed drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources -rw-r--r-- 1 "
-"user user 2954 Sep 7 13:02 common drwxr-xr-x 2 user user 4096 Sep 7 13:02 "
-"includes -rw-r--r-- 1 user user 205 Sep 7 13:02 source drwxr-xr-x 2 user "
-"user 4096 Sep 7 13:02 templates"
+" $ ls -l config/\n"
+" total 104\n"
+" -rw-r--r-- 1 user user 4197 Sep  7 13:02 binary\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_debian-installer\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_debian-installer-includes\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_grub\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-debs\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-hooks\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-includes\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-packageslists\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-udebs\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_rootfs\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_syslinux\n"
+" -rw-r--r-- 1 user user 2051 Sep  7 13:02 bootstrap\n"
+" -rw-r--r-- 1 user user 1647 Sep  7 13:02 chroot\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_apt\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-hooks\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-includes\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-packages\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-packageslists\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-patches\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-preseed\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_sources\n"
+" -rw-r--r-- 1 user user 2954 Sep  7 13:02 common\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 includes\n"
+" -rw-r--r-- 1 user user  205 Sep  7 13:02 source\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 templates\n"
 msgstr ""
 
 #. type: Plain text
@@ -317,7 +333,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:82
-msgid "$ lb config -p gnome"
+#, no-wrap
+msgid " $ lb config -p gnome\n"
 msgstr ""
 
 #. type: Plain text
@@ -327,9 +344,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:90
-msgid ""
-"$ lb config --binary-images net --hostname live-machine --username live-"
-"user ..."
+#, no-wrap
+msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/fr/about_manual.ssi.po b/manual/po/fr/about_manual.ssi.po
index 2d2f8e3..83e40d8 100644
--- a/manual/po/fr/about_manual.ssi.po
+++ b/manual/po/fr/about_manual.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-09 10:51-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-27 23:14+0200\n"
 "Last-Translator: Creak <romain.failliot at foolstep.com>\n"
 "Language-Team: Français <debian-live at lists.debian.org>\n"
@@ -370,31 +370,28 @@ msgstr ""
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
-#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
-#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
-#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
-#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
-#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
-#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/about_manual.ssi:170 en/project_bugs.ssi:58
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
-#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
-#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-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/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi: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_customization-installer.ssi:32
+#: en/user_customization-installer.ssi:43
+#: 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
@@ -404,27 +401,28 @@ msgstr ""
 #: en/user_customization-packages.ssi:199
 #: en/user_customization-packages.ssi:215
 #: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:290
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:312
-#: en/user_customization-packages.ssi:330 en/user_customization-runtime.ssi:14
+#: en/user_customization-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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:132 en/user_installation.ssi:147
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -441,31 +439,28 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
 #: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/other_faq.ssi:37 en/other_faq.ssi:46
-#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
-#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
-#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
-#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
-#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
-#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/about_manual.ssi:174 en/project_bugs.ssi:62
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70 en/user_customization-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/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi: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_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
@@ -474,27 +469,29 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
 #: en/user_customization-packages.ssi:191
 #: en/user_customization-packages.ssi:203
 #: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:294
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:316
-#: en/user_customization-packages.ssi:343 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:118
-#: en/user_installation.ssi:137 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -515,8 +512,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:94
-msgid "# apt-get install make po4a sisu-complete"
-msgstr "# apt-get install make po4a sisu-complete"
+#, no-wrap
+msgid " # apt-get install make po4a sisu-complete\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:98
@@ -529,8 +527,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:102
-msgid "$ make build"
-msgstr "$ make build"
+#, no-wrap
+msgid " $ make build\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:106
@@ -542,8 +541,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:110
-msgid "$ make build LANGUAGES=en"
-msgstr "$ make build LANGUAGES=en"
+#, no-wrap
+msgid " $ make build LANGUAGES=en\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:114
@@ -571,19 +571,13 @@ msgstr "_* Téléchargez la clé publique:"
 #: en/about_manual.ssi:127
 #, no-wrap
 msgid ""
-"$ mkdir -p ~/.ssh/identity.d\n"
-"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
-"\t-O ~/.ssh/identity.d/gitosis at live.debian.net\n"
-"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-"\t-O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
+" $ mkdir -p ~/.ssh/identity.d\n"
+" $ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
+"     -O ~/.ssh/identity.d/gitosis at live.debian.net\n"
+" $ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
+"     -O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
+" $ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
 msgstr ""
-"$ mkdir -p ~/.ssh/identity.d\n"
-"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
-"\t-O ~/.ssh/identity.d/gitosis at live.debian.net\n"
-"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-"\t-O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:131
@@ -594,19 +588,13 @@ msgstr "_* Ajoutez la section suivante à votre configuration openssh-client:"
 #: en/about_manual.ssi:140
 #, no-wrap
 msgid ""
-"$ cat >> ~/.ssh/config << EOF\n"
-"Host live.debian.net\n"
-"        Hostname live.debian.net\n"
-"        User gitosis\n"
-"        IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
-"EOF\n"
+" $ cat >> ~/.ssh/config << EOF\n"
+" Host live.debian.net\n"
+"     Hostname live.debian.net\n"
+"     User gitosis\n"
+"     IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
+" EOF\n"
 msgstr ""
-"$ cat >> ~/.ssh/config << EOF\n"
-"Host live.debian.net\n"
-"        Hostname live.debian.net\n"
-"        User gitosis\n"
-"        IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
-"EOF\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:144
@@ -615,8 +603,9 @@ msgstr "_* Clonez le manuel via ssh:"
 
 #. type: Plain text
 #: en/about_manual.ssi:148
-msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
-msgstr "$ git clone gitosis at live.debian.net:/live-manual.git"
+#, no-wrap
+msgid " $ git clone gitosis at live.debian.net:/live-manual.git\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:152
@@ -631,8 +620,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:156
-msgid "$ make commit"
-msgstr "$ make commit"
+#, no-wrap
+msgid " $ make commit\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:160
@@ -649,8 +639,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:164
-msgid "$ git commit -a -m \"Adding a section on applying patches.\""
-msgstr "$ git commit -a -m \"Adding a section on applying patches.\""
+#, no-wrap
+msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:168
@@ -659,8 +650,9 @@ msgstr "_* Envoyez votre commit au serveur:"
 
 #. type: Plain text
 #: en/about_manual.ssi:172
-msgid "$ git push"
-msgstr "$ git push"
+#, no-wrap
+msgid " $ git push\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:176
diff --git a/manual/po/fr/project_bugs.ssi.po b/manual/po/fr/project_bugs.ssi.po
index 0a27dc4..320a78d 100644
--- a/manual/po/fr/project_bugs.ssi.po
+++ b/manual/po/fr/project_bugs.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-25 23:27+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -58,16 +58,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -100,8 +100,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -121,17 +121,17 @@ msgstr "code{"
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -323,7 +323,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:60
-msgid "# lb build 2>&1 | tee build.log"
+#, no-wrap
+msgid " # lb build 2>&1 | tee build.log\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/fr/project_coding-style.ssi.po b/manual/po/fr/project_coding-style.ssi.po
index 3c3dfa7..f079589 100644
--- a/manual/po/fr/project_coding-style.ssi.po
+++ b/manual/po/fr/project_coding-style.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-17 14:37+0100\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-11-30 11:05+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -54,24 +54,25 @@ msgstr ""
 #: 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-runtime.ssi:14
+#: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi: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: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -99,8 +100,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -117,24 +118,25 @@ msgstr "code{"
 #: 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-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi: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: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -214,9 +216,9 @@ msgstr ""
 #: en/project_coding-style.ssi:32
 #, no-wrap
 msgid ""
-"if foo; then\n"
-"        bar\n"
-"fi\n"
+" if foo; then\n"
+"         bar\n"
+" fi\n"
 msgstr ""
 
 #. type: Plain text
@@ -229,10 +231,10 @@ msgstr ""
 #: en/project_coding-style.ssi:43
 #, no-wrap
 msgid ""
-"if foo\n"
-"then\n"
-"        bar\n"
-"fi\n"
+" if foo\n"
+" then\n"
+"         bar\n"
+" fi\n"
 msgstr ""
 
 #. type: Plain text
@@ -244,19 +246,19 @@ msgstr ""
 #: en/project_coding-style.ssi:55
 #, no-wrap
 msgid ""
-"foo () {\n"
-"        bar\n"
-"}\n"
+" foo () {\n"
+"         bar\n"
+" }\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:66
 #, no-wrap
 msgid ""
-"foo ()\n"
-"{\n"
-"        bar\n"
-"}\n"
+" foo ()\n"
+" {\n"
+"         bar\n"
+" }\n"
 msgstr ""
 
 #. type: Plain text
@@ -321,12 +323,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:94
-msgid "FOO=bar"
+#, no-wrap
+msgid " FOO=bar\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:102
-msgid "FOO=\"bar\""
+#, no-wrap
+msgid " FOO=\"bar\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -338,20 +342,20 @@ msgstr ""
 #: en/project_coding-style.ssi:115
 #, no-wrap
 msgid ""
-"if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
-"then\n"
-"        foobar\n"
-"fi\n"
+" if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
+" then\n"
+"         foobar\n"
+" fi\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:126
 #, no-wrap
 msgid ""
-"if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
-"then\n"
-"        foobar\n"
-"fi\n"
+" if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
+" then\n"
+"         foobar\n"
+" fi\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/fr/project_procedures.ssi.po b/manual/po/fr/project_procedures.ssi.po
index 08a7c3f..b2c6cb0 100644
--- a/manual/po/fr/project_procedures.ssi.po
+++ b/manual/po/fr/project_procedures.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 18:55-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-11-30 10:35+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -58,16 +58,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -100,8 +100,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -121,17 +121,17 @@ msgstr "code{"
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -173,7 +173,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:14
-msgid "$ ../../scripts/l10n/output-l10n-changes . -d"
+#, no-wrap
+msgid " $ ../../scripts/l10n/output-l10n-changes . -d\n"
 msgstr ""
 
 #. type: Plain text
@@ -257,11 +258,11 @@ msgstr ""
 #: en/project_procedures.ssi:52
 #, no-wrap
 msgid ""
-"$ sed \\\n"
-"  -e 's|%major%|5.0|g' \\\n"
-"  -e 's|%minor%|5.0.2|g' \\\n"
-"  -e 's|%codename%|lenny|g' \\\n"
-"  -e 's|%release_mail%|2009/msg00007.html|g'\n"
+" $ sed \\\n"
+"     -e 's|%major%|5.0|g' \\\n"
+"     -e 's|%minor%|5.0.2|g' \\\n"
+"     -e 's|%codename%|lenny|g' \\\n"
+"     -e 's|%release_mail%|2009/msg00007.html|g'\n"
 msgstr ""
 
 #. type: Plain text
@@ -273,166 +274,179 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:60
-msgid "Debian Live images for Debian GNU/Linux %major% updated"
+#, no-wrap
+msgid " Debian Live images for Debian GNU/Linux %major% updated\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:64
+#, no-wrap
 msgid ""
-"The Debian Live project is pleased to announce the availability of updated "
-"Live images for its stable distribution Debian GNU/Linux %major% (codename "
-"\"%codename%\")."
+" The Debian Live project is pleased to announce the availability of\n"
+" updated Live images for its stable distribution Debian GNU/Linux %major%\n"
+" (codename \"%codename%\").\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:66
-msgid "The images are available for download at:"
+#, no-wrap
+msgid " The images are available for download at:\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:68
 #, no-wrap
-msgid "    <http://cdimage.debian.org/cdimage/release/current-live/>\n"
+msgid "     <http://cdimage.debian.org/cdimage/release/current-live/>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:73
+#, no-wrap
 msgid ""
-"This update incorporates the changes made in the %minor% point release, "
-"which adds corrections for security problems to the stable release along "
-"with a few adjustments for serious problems. A full list of the changes may "
-"be viewed at:"
+" This update incorporates the changes made in the %minor% point release,\n"
+" which adds corrections for security problems to the stable release\n"
+" along with a few adjustments for serious problems. A full list of the\n"
+" changes may be viewed at:\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:75
 #, no-wrap
-msgid "    <http://lists.debian.org/debian-announce/%release_mail%>\n"
+msgid "     <http://lists.debian.org/debian-announce/%release_mail%>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:77
-msgid "It also includes the following Live-specific changes:"
+#, no-wrap
+msgid " It also includes the following Live-specific changes:\n"
 msgstr ""
 
-#. type: Bullet: ' * '
+#. type: Bullet: '  * '
 #: en/project_procedures.ssi:81
 msgid "[INSERT LIVE-SPECIFIC CHANGE HERE]"
 msgstr ""
 
-#. type: Bullet: ' * '
+#. type: Bullet: '  * '
 #: en/project_procedures.ssi:81
 msgid "[LARGER ISSUES MAY DESERVE THEIR OWN SECTION]"
 msgstr ""
 
 #. type: Plain text
-#: en/project_procedures.ssi:84
+#: en/project_procedures.ssi:85
 #, no-wrap
 msgid ""
-"URLs\n"
-"----\n"
+" URLs\n"
+" ----\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:87
-msgid "Download location of updated images:"
+#, no-wrap
+msgid " Download location of updated images:\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:89
 #, no-wrap
-msgid "  <http://cdimage.debian.org/cdimage/release/current-live/>\n"
+msgid "   <http://cdimage.debian.org/cdimage/release/current-live/>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:91
-msgid "Debian Live project homepage:"
-msgstr "Projet Debian Live Homepage:"
+#, no-wrap
+msgid " Debian Live project homepage:\n"
+msgstr " Projet Debian Live Homepage:\n"
 
 #. type: Plain text
 #: en/project_procedures.ssi:93
 #, no-wrap
-msgid "  <http://live.debian.net/>\n"
+msgid "   <http://live.debian.net/>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:95
-msgid "The current stable distribution:"
+#, no-wrap
+msgid " The current stable distribution:\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:97
 #, no-wrap
-msgid "  <http://ftp.debian.org/debian/dists/stable>\n"
+msgid "   <http://ftp.debian.org/debian/dists/stable>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:99
-msgid "stable distribution information (release notes, errata etc.):"
+#, no-wrap
+msgid " stable distribution information (release notes, errata etc.):\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:101
 #, no-wrap
-msgid "  <http://www.debian.org/releases/stable/>\n"
+msgid "   <http://www.debian.org/releases/stable/>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:103
-msgid "Security announcements and information:"
+#, no-wrap
+msgid " Security announcements and information:\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:105
 #, no-wrap
-msgid "  <http://www.debian.org/security/>\n"
+msgid "   <http://www.debian.org/security/>\n"
 msgstr ""
 
 #. type: Plain text
-#: en/project_procedures.ssi:108
+#: en/project_procedures.ssi:109
 #, no-wrap
 msgid ""
-"About Debian\n"
-"-------------\n"
+" About Debian\n"
+" -------------\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:113
+#, no-wrap
 msgid ""
-"The Debian Project is an association of Free Software developers who "
-"volunteer their time and effort in order to produce the completely free "
-"operating system Debian GNU/Linux."
+" The Debian Project is an association of Free Software developers who\n"
+" volunteer their time and effort in order to produce the completely free\n"
+" operating system Debian GNU/Linux.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/project_procedures.ssi:116
+#: en/project_procedures.ssi:117
 #, no-wrap
 msgid ""
-"About Debian Live\n"
-"-----------------\n"
+" About Debian Live\n"
+" -----------------\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:122
+#, no-wrap
 msgid ""
-"Debian Live is an official sub-project of Debian which produces Debian "
-"systems that do not require a classical installer. Images are available for "
-"CD/DVD discs, USB sticks and PXE netbooting as well as a bare filesystem "
-"images for booting directly from the internet."
+" Debian Live is an official sub-project of Debian which produces Debian\n"
+" systems that do not require a classical installer. Images are available\n"
+" for CD/DVD discs, USB sticks and PXE netbooting as well as a bare\n"
+" filesystem images for booting directly from the internet.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/project_procedures.ssi:125
+#: en/project_procedures.ssi:126
 #, no-wrap
 msgid ""
-"Contact Information\n"
-"-------------------\n"
+" Contact Information\n"
+" -------------------\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:130
+#, no-wrap
 msgid ""
-"For further information, please visit the Debian Live web pages at <http://"
-"live.debian.net/> or alternatively send mail to <debian-live at lists.debian."
-"org>."
+" For further information, please visit the Debian Live web pages at\n"
+" <http://live.debian.net/> or alternatively send mail to\n"
+" <debian-live at lists.debian.org>.\n"
 msgstr ""
diff --git a/manual/po/fr/user_basics.ssi.po b/manual/po/fr/user_basics.ssi.po
index 8521ede..8d2c1fb 100644
--- a/manual/po/fr/user_basics.ssi.po
+++ b/manual/po/fr/user_basics.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 10:06-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-20 06:53-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -57,17 +57,17 @@ msgstr ""
 #: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_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:188
-#: en/user_examples.ssi:204 en/user_examples.ssi:218 en/user_examples.ssi:226
-#: en/user_examples.ssi:244 en/user_examples.ssi:252 en/user_examples.ssi:265
-#: en/user_examples.ssi:280 en/user_installation.ssi:38
+#: 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
@@ -100,8 +100,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -120,18 +120,18 @@ msgstr "code{"
 #: 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:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_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:184 en/user_examples.ssi:200
-#: en/user_examples.ssi:208 en/user_examples.ssi:222 en/user_examples.ssi:230
-#: en/user_examples.ssi:248 en/user_examples.ssi:261 en/user_examples.ssi:276
-#: en/user_examples.ssi:294 en/user_installation.ssi:42
+#: 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
@@ -262,7 +262,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:32
-msgid "$ lb config"
+#, no-wrap
+msgid " $ lb config\n"
 msgstr ""
 
 #. type: Plain text
@@ -281,8 +282,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
-#: en/user_examples.ssi:109 en/user_examples.ssi:156 en/user_examples.ssi:206
-msgid "# lb build"
+#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#, no-wrap
+msgid " # lb build\n"
 msgstr ""
 
 #. type: Plain text
@@ -304,12 +306,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:54 en/user_basics.ssi:142
-msgid "# apt-get install qemu"
+#, no-wrap
+msgid " # apt-get install qemu\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:56
-msgid "$ qemu -cdrom binary.iso"
+#, no-wrap
+msgid " $ qemu -cdrom binary.iso\n"
 msgstr ""
 
 #. type: Plain text
@@ -324,12 +328,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:66
-msgid "# apt-get install virtualbox-ose virtualbox-ose-dkms"
+#, no-wrap
+msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:68
-msgid "$ virtualbox"
+#, no-wrap
+msgid " $ virtualbox\n"
 msgstr ""
 
 #. type: Plain text
@@ -350,7 +356,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:78
-msgid "# lb config --packages virtualbox-ose-guest-x11"
+#, no-wrap
+msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
 msgstr ""
 
 #. type: Plain text
@@ -365,12 +372,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:88
-msgid "# apt-get install wodim"
+#, no-wrap
+msgid " # apt-get install wodim\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:90
-msgid "$ wodim binary.iso"
+#, no-wrap
+msgid " $ wodim binary.iso\n"
 msgstr ""
 
 #. type: Plain text
@@ -399,8 +408,9 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:102
-msgid "$ lb clean --binary"
+#: en/user_basics.ssi:102 en/user_basics.ssi:184
+#, no-wrap
+msgid " # lb clean --binary\n"
 msgstr ""
 
 #. type: Plain text
@@ -412,7 +422,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:110
-msgid "$ lb config -b usb-hdd"
+#, no-wrap
+msgid " $ lb config -b usb-hdd\n"
 msgstr ""
 
 #. type: Plain text
@@ -435,7 +446,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:128
-msgid "$ dd if=binary.img of=${USBSTICK}"
+#, no-wrap
+msgid " $ dd if=binary.img of=${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
@@ -467,7 +479,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:144
-msgid "$ qemu -hda binary.img"
+#, no-wrap
+msgid " $ qemu -hda binary.img\n"
 msgstr ""
 
 #. type: Plain text
@@ -486,7 +499,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:154
-msgid "# gparted ${USBSTICK}"
+#, no-wrap
+msgid " # gparted ${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
@@ -498,7 +512,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:162
-msgid "# mkfs.ext4 ${USBSTICK}"
+#, no-wrap
+msgid " # mkfs.ext4 ${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
@@ -508,7 +523,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:170
-msgid "# mkfs.vfat -F 32"
+#, no-wrap
+msgid " # mkfs.vfat -F 32\n"
 msgstr ""
 
 #. type: Plain text
@@ -538,11 +554,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:184
-msgid "# lb clean --binary"
-msgstr ""
-
-#. type: Plain text
 #: en/user_basics.ssi:188
 msgid ""
 "Run the #{lb config}# command as follows to configure your image for "
@@ -551,9 +562,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:192
-msgid ""
-"$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
-"\"192.168.0.1\""
+#, no-wrap
+msgid " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -616,39 +626,46 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:220
-msgid "# /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server"
+#, no-wrap
+msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:222
-msgid "ddns-update-style none;"
+#, no-wrap
+msgid " ddns-update-style none;\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:225
+#, no-wrap
 msgid ""
-"option domain-name \"example.org\"; option domain-name-servers ns1.example."
-"org, ns2.example.org;"
+" option domain-name \"example.org\";\n"
+" option domain-name-servers ns1.example.org, ns2.example.org;\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:228
-msgid "default-lease-time 600; max-lease-time 7200;"
+#, no-wrap
+msgid ""
+" default-lease-time 600;\n"
+" max-lease-time 7200;\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:230
-msgid "log-facility local7;"
+#, no-wrap
+msgid " log-facility local7;\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:236
 #, no-wrap
 msgid ""
-"subnet 192.168.0.0 netmask 255.255.255.0 {\n"
-"  range 192.168.0.1 192.168.0.254;\n"
-"  next-server servername;\n"
-"  filename \"pxelinux.0\";\n"
+" subnet 192.168.0.0 netmask 255.255.255.0 {\n"
+"   range 192.168.0.1 192.168.0.254;\n"
+"   next-server servername;\n"
+"   filename \"pxelinux.0\";\n"
 "}\n"
 msgstr ""
 
@@ -672,7 +689,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:248
-msgid "# dpkg-reconfigure -plow tftpd-hpa"
+#, no-wrap
+msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
 msgstr ""
 
 #. type: Plain text
@@ -707,7 +725,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:264
-msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
+#, no-wrap
+msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
 msgstr ""
 
 #. type: Plain text
@@ -718,7 +737,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:272
-msgid "# exportfs -rv"
+#, no-wrap
+msgid " # exportfs -rv\n"
 msgstr ""
 
 #. type: Plain text
@@ -767,11 +787,16 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:299
+#, no-wrap
 msgid ""
-"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
-"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
-"sudo /sbin/ifconfig $1 0.0.0.0 promisc up echo \"Adding $1 to br0...\" sudo /"
-"usr/sbin/brctl addif br0 $1 sleep 2"
+" #!/bin/sh\n"
+" sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1\n"
+" echo \"Executing /etc/qemu-ifup\"\n"
+" echo \"Bringing up $1 for bridged mode...\"\n"
+" sudo /sbin/ifconfig $1 0.0.0.0 promisc up\n"
+" echo \"Adding $1 to br0...\"\n"
+" sudo /usr/sbin/brctl addif br0 $1\n"
+" sleep 2\n"
 msgstr ""
 
 #. type: Plain text
@@ -809,34 +834,50 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:321
+#, no-wrap
 msgid ""
-"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
-"\"512\" MemAllowAutoScaleDown = \"FALSE\""
+" #!/usr/bin/vmware\n"
+" config.version = \"8\"\n"
+" virtualHW.version = \"4\"\n"
+" memsize = \"512\"\n"
+" MemAllowAutoScaleDown = \"FALSE\"\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:327
+#, no-wrap
 msgid ""
-"ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
-"\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
+" ide0:0.present = \"FALSE\"\n"
+" ide1:0.present = \"FALSE\"\n"
+" floppy0.present = \"FALSE\"\n"
+" sound.present = \"FALSE\"\n"
+" tools.remindInstall = \"FALSE\"\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:330
-msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
+#, no-wrap
+msgid ""
+" ethernet0.present = \"TRUE\"\n"
+" ethernet0.addressType = \"generated\"\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:333
-msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
+#, no-wrap
+msgid ""
+" displayName = \"Test Boot PXE\"\n"
+" guestOS = \"other\"\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:338
+#, no-wrap
 msgid ""
-"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
-"83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
-"de 3f-ae 9e 07 91 1d 8d 71 3b\" ethernet0.generatedAddressOffset = \"0\""
+" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\"\n"
+" uuid.location = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
+" uuid.bios = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
+" ethernet0.generatedAddressOffset = \"0\"\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/fr/user_customization-contents.ssi.po b/manual/po/fr/user_customization-contents.ssi.po
index cf4f5c4..5e84b7a 100644
--- a/manual/po/fr/user_customization-contents.ssi.po
+++ b/manual/po/fr/user_customization-contents.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-10 16:54-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-16 14:45-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -20,28 +20,24 @@ msgstr ""
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
-#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
-#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
-#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
-#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
-#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
-#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/about_manual.ssi:170 en/project_bugs.ssi:58
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
-#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
-#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi: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_customization-installer.ssi:32
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -55,27 +51,28 @@ msgstr ""
 #: en/user_customization-packages.ssi:199
 #: en/user_customization-packages.ssi:215
 #: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:290
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:312
-#: en/user_customization-packages.ssi:330 en/user_customization-runtime.ssi:14
+#: en/user_customization-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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:132 en/user_installation.ssi:147
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi: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_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 +84,24 @@ msgstr "code{"
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
 #: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/other_faq.ssi:37 en/other_faq.ssi:46
-#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
-#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
-#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
-#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
-#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
-#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/about_manual.ssi:174 en/project_bugs.ssi:62
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi: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_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
@@ -121,27 +114,29 @@ msgstr "code{"
 #: en/user_customization-packages.ssi:191
 #: en/user_customization-packages.ssi:203
 #: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:294
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:316
-#: en/user_customization-packages.ssi:343 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:118
-#: en/user_installation.ssi:137 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -244,9 +239,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:29
+#, no-wrap
 msgid ""
-"$ mkdir -p config/chroot_local-includes/var/www $ cp /path/to/my/index.html "
-"config/chroot_local-includes/var/www"
+" $ mkdir -p config/chroot_local-includes/var/www\n"
+" $ cp /path/to/my/index.html config/chroot_local-includes/var/www\n"
 msgstr ""
 
 #. type: Plain text
@@ -258,14 +254,14 @@ msgstr ""
 #: en/user_customization-contents.ssi:44
 #, no-wrap
 msgid ""
-"-- config\n"
-"   [...]\n"
-"    |-- chroot_local-includes\n"
-"    |   `-- var\n"
-"    |       `-- www\n"
-"    |           `-- index.html\n"
-"   [...]\n"
-"    `-- templates\n"
+" -- config\n"
+"    [...]\n"
+"     |-- chroot_local-includes\n"
+"     |   `-- var\n"
+"     |       `-- www\n"
+"     |           `-- index.html\n"
+"    [...]\n"
+"     `-- templates\n"
 msgstr ""
 
 #. type: Plain text
@@ -294,7 +290,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:56
-msgid "$ cp ~/video_demo.* config/binary_local-includes/"
+#, no-wrap
+msgid " $ cp ~/video_demo.* config/binary_local-includes/\n"
 msgstr ""
 
 #. type: Plain text
@@ -316,7 +313,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:68
-msgid "$ lb config --includes none"
+#, no-wrap
+msgid " $ lb config --includes none\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 2cd1006..8ec8e50 100644
--- a/manual/po/fr/user_customization-installer.ssi.po
+++ b/manual/po/fr/user_customization-installer.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-16 08:39-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-11-30 10:53+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -32,12 +32,12 @@ msgstr ""
 #: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
 #: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
 #: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_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_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -54,24 +54,25 @@ msgstr ""
 #: 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-runtime.ssi:14
+#: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi: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: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -95,12 +96,12 @@ msgstr "code{"
 #: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
 #: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
 #: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -117,24 +118,25 @@ msgstr "code{"
 #: 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-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi: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: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -251,19 +253,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:34
+#: en/user_customization-installer.ssi:35
+#, no-wrap
 msgid ""
-"$ lb config --architecture i386 --linux-flavours 486 --debian-installer live "
-"--packages debian-installer-launcher"
+" $ lb config --architecture i386 --linux-flavours 486 \\\n"
+"     --debian-installer live --packages debian-installer-launcher\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:39
 msgid "2~ Customizing Debian Installer by preseeding"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:40
+#: en/user_customization-installer.ssi:41
 msgid ""
 "As described in the Debian Installer Manual, Appendix B at http://www.debian."
 "org/releases/stable/i386/apb.html, \"Preseeding provides a way to set "
@@ -277,19 +280,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:44
+#: en/user_customization-installer.ssi:46
+#, no-wrap
 msgid ""
-"$ echo \"d-i debian-installer/locale string en_US\" >> config/binary_debian-"
-"installer/preseed.cfg"
+" $ echo \"d-i debian-installer/locale string en_US\" \\\n"
+"     >> config/binary_debian-installer/preseed.cfg\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:50
 msgid "2~ Customizing Debian Installer content"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:50
+#: en/user_customization-installer.ssi:52
 msgid ""
 "For experimental or debugging purposes, you might want to include locally "
 "built #{d-i}# component udeb packages. Place these in #{config/binary_local-"
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index e02e5be..ee164c7 100644
--- a/manual/po/fr/user_customization-packages.ssi.po
+++ b/manual/po/fr/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-16 14:45-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -58,16 +58,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -100,8 +100,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -121,17 +121,17 @@ msgstr "code{"
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -200,7 +200,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:16
-msgid "$ lb config --distribution sid"
+#, no-wrap
+msgid " $ lb config --distribution sid\n"
 msgstr ""
 
 #. type: Plain text
@@ -215,7 +216,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:24
-msgid "$ lb config --archive-areas \"main contrib\""
+#, no-wrap
+msgid " $ lb config --archive-areas \"main contrib\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -274,8 +276,8 @@ msgstr ""
 #: en/user_customization-packages.ssi:43
 #, no-wrap
 msgid ""
-"$ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
-"            --mirror-chroot-security http://localhost/debian-security/\n"
+" $ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
+"             --mirror-chroot-security http://localhost/debian-security/\n"
 msgstr ""
 
 #. type: Plain text
@@ -307,8 +309,8 @@ msgstr ""
 #: en/user_customization-packages.ssi:56
 #, no-wrap
 msgid ""
-"$ lb config --mirror-binary http://mirror/debian/ \\\n"
-"            --mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --mirror-binary http://mirror/debian/ \\\n"
+"             --mirror-binary-security http://mirror/debian-security/\n"
 msgstr ""
 
 #. type: Plain text
@@ -338,7 +340,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:68
-msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
+#, no-wrap
+msgid " deb http://live.debian.net/ sid-snapshots main contrib non-free\n"
 msgstr ""
 
 #. type: Plain text
@@ -371,7 +374,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
-msgid "$ lb config --repository live.debian.net"
+#, no-wrap
+msgid " $ lb config --repository live.debian.net\n"
 msgstr ""
 
 #. type: Plain text
@@ -406,7 +410,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:96
-msgid "$ lb config --packages \"package1 package2 package3\""
+#, no-wrap
+msgid " $ lb config --packages \"package1 package2 package3\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -457,7 +462,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:114
-msgid "$ lb config --packages-lists \"gnome-core rescue\""
+#, no-wrap
+msgid " $ lb config --packages-lists \"gnome-core rescue\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -553,7 +559,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:145
-msgid "#include <gnome> iceweasel"
+#, no-wrap
+msgid ""
+" #include <gnome>\n"
+" iceweasel\n"
 msgstr ""
 
 #. type: Plain text
@@ -581,7 +590,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:159
-msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
+#, no-wrap
+msgid ""
+" #if ARCHITECTURE amd64\n"
+" ia32-libs\n"
+" #endif\n"
 msgstr ""
 
 #. type: Plain text
@@ -593,7 +606,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:169
-msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
+#, no-wrap
+msgid ""
+" #if ARCHITECTURE i386 amd64\n"
+" memtest86+\n"
+" #endif\n"
 msgstr ""
 
 #. type: Plain text
@@ -606,7 +623,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:179
-msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
+#, no-wrap
+msgid ""
+" #if ARCHIVE_AREAS contrib non-free\n"
+" vrms\n"
+" #endif\n"
 msgstr ""
 
 #. type: Plain text
@@ -616,7 +637,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:189
-msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
+#, no-wrap
+msgid ""
+" #if ARCHITECTURE amd64\n"
+" #include <gnome-full>\n"
+" #endif\n"
 msgstr ""
 
 #. type: Plain text
@@ -642,7 +667,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:201
-msgid "$ lb config --tasks \"mail-server file-server\""
+#, no-wrap
+msgid " $ lb config --tasks \"mail-server file-server\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -690,8 +716,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:217
-msgid ""
-"$ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\""
+#, no-wrap
+msgid " $ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -724,7 +750,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:229
-msgid "$ lb config --language es"
+#, no-wrap
+msgid " $ lb config --language es\n"
 msgstr ""
 
 #. type: Plain text
@@ -941,7 +968,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:293
-msgid "$ lb config --apt-http-proxy http://proxy/"
+#, no-wrap
+msgid " $ lb config --apt-http-proxy http://proxy/\n"
 msgstr ""
 
 #. type: Plain text
@@ -966,7 +994,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:305
-msgid "$ lb config --binary-indices false"
+#, no-wrap
+msgid " $ lb config --binary-indices false\n"
 msgstr ""
 
 #. type: Plain text
@@ -988,7 +1017,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:315
-msgid "$ lb config --apt-recommends false"
+#, no-wrap
+msgid " $ lb config --apt-recommends false\n"
 msgstr ""
 
 #. type: Plain text
@@ -1047,15 +1077,23 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:337
+#, no-wrap
 msgid ""
-"$ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid."
-"chroot $ cat >>config/chroot_apt/preferences <<END Package: live-* Pin: "
-"release n=sid Pin-Priority: 600"
+" $ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid.chroot\n"
+" $ cat >>config/chroot_apt/preferences <<END\n"
+" Package: live-*\n"
+" Pin: release n=sid\n"
+" Pin-Priority: 600\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:342
-msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
+#, no-wrap
+msgid ""
+" Package: *\n"
+" Pin: release n=sid\n"
+" Pin-Priority: 1\n"
+" END\n"
 msgstr ""
 
 #. type: Plain text
@@ -1071,5 +1109,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:352
-msgid "Package: gnome-keyring Pin: version * Pin-Priority: -1"
+#, no-wrap
+msgid ""
+" Package: gnome-keyring\n"
+" Pin: version *\n"
+" Pin-Priority: -1\n"
 msgstr ""
diff --git a/manual/po/fr/user_customization-runtime.ssi.po b/manual/po/fr/user_customization-runtime.ssi.po
index cc8e053..0e4050b 100644
--- a/manual/po/fr/user_customization-runtime.ssi.po
+++ b/manual/po/fr/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-11-30 11:40+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -58,16 +58,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -100,8 +100,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -121,17 +121,17 @@ msgstr "code{"
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -188,9 +188,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:16
-msgid ""
-"debconf passwd/user-default-groups string audio cdrom dialout floppy video "
-"plugdev netdev powerdev fuse"
+#, no-wrap
+msgid " debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse\n"
 msgstr ""
 
 #. type: Plain text
@@ -228,7 +227,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:34
-msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
+#, no-wrap
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -251,9 +251,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:45
+#, no-wrap
 msgid ""
-"$ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name <name>se</"
-"name>"
+" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
+" <name>se</name>\n"
 msgstr ""
 
 #. type: Plain text
@@ -264,8 +265,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:53
-msgid ""
-"$ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\""
+#, no-wrap
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -276,14 +277,15 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:61
+#: en/user_customization-runtime.ssi:62
+#, no-wrap
 msgid ""
-"$ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); do basename $i | "
-"head -c -9; echo; done | sort | less"
+" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
+"     do basename $i | head -c -9; echo; done | sort | less\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:65
+#: en/user_customization-runtime.ssi:66
 msgid ""
 "Alternatively, you can use the #{console-setup}# package, a tool to let you "
 "configure console layout using X (XKB) definitions; you can then set your "
@@ -295,19 +297,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:69
+#: en/user_customization-runtime.ssi:71
+#, no-wrap
 msgid ""
-"$ lb config --bootappend-live \"locales=fr_FR.UTF-8 keyboard-layouts=fr "
-"keyboard-variant=bepo keyboard-model=tm2030usb\""
+" $ lb config --bootappend-live \\\n"
+"     \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:73
+#: en/user_customization-runtime.ssi:75
 msgid "2~persistence Persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:75
+#: en/user_customization-runtime.ssi:77
 msgid ""
 "A live cd paradigm is a pre-installed system which runs from read-only "
 "media, like a cdrom, where writes and modifications do not survive reboots "
@@ -315,7 +318,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:77
+#: en/user_customization-runtime.ssi:79
 msgid ""
 "A Debian Live system is a generalization of this paradigm and thus supports "
 "other media in addition to CDs; but still, in its default behaviour, it "
@@ -324,7 +327,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:79
+#: en/user_customization-runtime.ssi:81
 msgid ""
 "Persistence is a common name for different kinds of solutions for saving "
 "across reboots some, or all, of this run-time evolution of the system. To "
@@ -335,7 +338,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:81
+#: en/user_customization-runtime.ssi:83
 msgid ""
 "The data stored on this ramdisk should be saved on a writable persistent "
 "medium like a Hard Disk, a USB key, a network share or even a session of a "
@@ -345,12 +348,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:85
 msgid "3~ Full persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:87
 msgid ""
 "By 'full persistence' it is meant that instead of using a tmpfs for storing "
 "modifications to the read-only media (with the copy-on-write, COW, system) a "
@@ -362,26 +365,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:89
-msgid "# mkfs.ext2 -L live-rw /dev/sdb1"
+#: en/user_customization-runtime.ssi:91
+#, no-wrap
+msgid " # mkfs.ext2 -L live-rw /dev/sdb1\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:95
 msgid ""
 "If you already have a partition on your device, you could just change the "
 "label with one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:100
+#, no-wrap
 msgid ""
-"# tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems # dosfslabel /dev/"
-"sdb1 live-rw # for a fat filesystem"
+" # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
+" # dosfslabel /dev/sdb1 live-rw # for a fat filesystem\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:102
+#: en/user_customization-runtime.ssi:104
 msgid ""
 "But since live system users cannot always use a hard drive partition, and "
 "considering that most USB keys have poor write speeds, 'full' persistence "
@@ -391,26 +396,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:107
+#: en/user_customization-runtime.ssi:109
+#, no-wrap
 msgid ""
-"$ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file $ /"
-"sbin/mkfs.ext2 -F live-rw"
+" $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
+" $ /sbin/mkfs.ext2 -F live-rw\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:113
 msgid ""
 "Then copy the #{live-rw}# file to a writable partition and reboot with the "
 "boot parameter 'persistent'."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:113
+#: en/user_customization-runtime.ssi:115
 msgid "3~ Home automounting"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:117
 msgid ""
 "If during the boot a partition (filesystem) image file or a partition "
 "labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
@@ -419,12 +425,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:117
+#: en/user_customization-runtime.ssi:119
 msgid "3~ Snapshots"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:119
+#: en/user_customization-runtime.ssi:121
 msgid ""
 "Snapshots are collections of files and directories which are not mounted "
 "while running but which are copied from a persistent device to the system "
@@ -441,26 +447,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:121
+#: en/user_customization-runtime.ssi:123
 msgid ""
 "A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
 "works the same as the main snapshot but it is only applied to /home."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:123
+#: en/user_customization-runtime.ssi:125
 msgid ""
 "Snapshots cannot currently handle file deletion but full persistence and "
 "home automounting can."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:125
+#: en/user_customization-runtime.ssi:127
 msgid "3~ Persistent SubText"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:127
+#: en/user_customization-runtime.ssi:129
 msgid ""
 "If a user would need multiple persistent storage of the same type for "
 "different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-"
@@ -472,12 +478,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:129
+#: en/user_customization-runtime.ssi:131
 msgid "3~ Partial remastering"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:132
 msgid ""
 "The run-time modification of the tmpfs could be collected using live-"
 "snapshot in a squashfs and added to the cd by remastering the iso in the "
diff --git a/manual/po/fr/user_examples.ssi.po b/manual/po/fr/user_examples.ssi.po
index faebfa6..8f2ea47 100644
--- a/manual/po/fr/user_examples.ssi.po
+++ b/manual/po/fr/user_examples.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-11-04 16:34-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -42,7 +42,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -63,16 +63,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -105,8 +105,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -126,17 +126,17 @@ msgstr "code{"
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -151,8 +151,9 @@ msgstr "}code"
 
 #. type: Plain text
 #: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
-#: en/user_examples.ssi:109 en/user_examples.ssi:156 en/user_examples.ssi:208
-msgid "# lb build"
+#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#, no-wrap
+msgid " # lb build\n"
 msgstr ""
 
 #. type: Plain text
@@ -197,9 +198,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:18
+#, no-wrap
 msgid ""
-"LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\" LB_MIRROR_CHROOT=\"http://"
-"mirror/debian\" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\""
+" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
+" LB_MIRROR_CHROOT=\"http://mirror/debian\"\n"
+" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -228,7 +231,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:32
-msgid "$ mkdir tutorial1 ; cd tutorial1 ; lb config"
+#, no-wrap
+msgid " $ mkdir tutorial1 ; cd tutorial1 ; lb config\n"
 msgstr ""
 
 #. type: Plain text
@@ -246,8 +250,9 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:230
-msgid "# lb build 2>&1 | tee binary.log"
+#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:231
+#, no-wrap
+msgid " # lb build 2>&1 | tee binary.log\n"
 msgstr ""
 
 #. type: Plain text
@@ -283,8 +288,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:56
-msgid ""
-"$ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel"
+#, no-wrap
+msgid " $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel\n"
 msgstr ""
 
 #. type: Plain text
@@ -339,9 +344,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:84
+#, no-wrap
 msgid ""
-"$ mkdir -p tutorial3/auto $ cp /usr/share/live/build/examples/auto/* "
-"tutorial3/auto/ $ cd tutorial3"
+" $ mkdir -p tutorial3/auto\n"
+" $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/\n"
+" $ cd tutorial3\n"
 msgstr ""
 
 #. type: Plain text
@@ -351,19 +358,20 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:92 en/user_examples.ssi:141
-msgid "#!/bin/sh"
+#, no-wrap
+msgid " #!/bin/sh\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:99
 #, no-wrap
 msgid ""
-"lb config noauto \\\n"
-"    --architecture i386 \\\n"
-"    --linux-flavours 686 \\\n"
-"    --packages-lists lxde \\\n"
-"    --packages \"iceweasel xchat\" \\\n"
-"    \"${@}\"\n"
+" lb config noauto \\\n"
+"     --architecture i386 \\\n"
+"     --linux-flavours 686 \\\n"
+"     --packages-lists lxde \\\n"
+"     --packages \"iceweasel xchat\" \\\n"
+"     \"${@}\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -399,7 +407,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:121
-msgid "$ git init $ git add auto $ git commit -a -m \"Initial import.\""
+#, no-wrap
+msgid ""
+" $ git init\n"
+" $ git add auto\n"
+" $ git commit -a -m \"Initial import.\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -425,7 +437,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:133
-msgid "# lb clean"
+#, no-wrap
+msgid " # lb clean\n"
 msgstr ""
 
 #. type: Plain text
@@ -437,12 +450,12 @@ msgstr ""
 #: en/user_examples.ssi:148
 #, no-wrap
 msgid ""
-"lb config noauto \\\n"
-"    --architecture i386 \\\n"
-"    --linux-flavours 686 \\\n"
-"    --packages-lists lxde \\\n"
-"    --packages \"iceweasel xchat vlc\" \\\n"
-"    \"${@}\"\n"
+" lb config noauto \\\n"
+"     --architecture i386 \\\n"
+"     --linux-flavours 686 \\\n"
+"     --packages-lists lxde \\\n"
+"     --packages \"iceweasel xchat vlc\" \\\n"
+"     \"${@}\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -451,13 +464,19 @@ msgid "Build again:"
 msgstr ""
 
 #. type: Plain text
+#: en/user_examples.ssi:156
+msgid "# lb build"
+msgstr ""
+
+#. type: Plain text
 #: en/user_examples.ssi:160
 msgid "Test, and when you're satisfied, commit the next revision:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:164
-msgid "$ git commit -a -m \"Adding vlc media player.\""
+#, no-wrap
+msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -504,11 +523,11 @@ msgstr ""
 #: en/user_examples.ssi:184
 #, no-wrap
 msgid ""
-"$ mkdir vnc_kiosk_client\n"
-"$ cd vnc_kiosk_client\n"
-"$ lb config -a i386 -k 686 -p standard-x11 \\\n"
-"    --packages \"gdm3 metacity xvnc4viewer\" \\\n"
-"    --apt-recommends false\n"
+" $ mkdir vnc_kiosk_client\n"
+" $ cd vnc_kiosk_client\n"
+" $ lb config -a i386 -k 686 -p standard-x11 \\\n"
+"     --packages \"gdm3 metacity xvnc4viewer\" \\\n"
+"     --apt-recommends false\n"
 msgstr ""
 
 #. type: Plain text
@@ -521,19 +540,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:194
+#, no-wrap
 msgid ""
-"$ mkdir -p config/chroot_local-includes/etc/skel $ cat >config/chroot_local-"
-"includes/etc/skel/.xsession <<END #!/bin/sh"
+" $ mkdir -p config/chroot_local-includes/etc/skel\n"
+" $ cat >config/chroot_local-includes/etc/skel/.xsession <<END\n"
+" #!/bin/sh\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:197
-msgid "/usr/bin/metacity & /usr/bin/xvncviewer 192.168.1.2:1"
+#, no-wrap
+msgid ""
+" /usr/bin/metacity &\n"
+" /usr/bin/xvncviewer 192.168.1.2:1\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:200
-msgid "exit END"
+#, no-wrap
+msgid ""
+" exit\n"
+" END\n"
 msgstr ""
 
 #. type: Plain text
@@ -572,19 +599,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:222
+#: en/user_examples.ssi:223
+#, no-wrap
 msgid ""
-"$ lb config -k 486 -p minimal --binary-indices false --memtest none --apt-"
-"recommends false --includes none"
+" $ lb config -k 486 -p minimal --binary-indices false \\\n"
+"     --memtest none --apt-recommends false --includes none\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:226
+#: en/user_examples.ssi:227
 msgid "Now, build the image in the usual way:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:234
+#: en/user_examples.ssi:235
 msgid ""
 "On the author's system at time of writing, the above configuration produced "
 "a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
@@ -592,7 +620,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:236
+#: en/user_examples.ssi:237
 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 "
@@ -610,18 +638,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:238
+#: en/user_examples.ssi:239
 msgid "2~ A localized KDE desktop and installer"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:240
+#: en/user_examples.ssi:241
 #, no-wrap
 msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:242
+#: en/user_examples.ssi:243
 msgid ""
 "We want to make an iso-hybrid image for i386 architecture using our "
 "preferred desktop, in this case KDE, containing all of the same packages "
@@ -629,7 +657,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:244
+#: en/user_examples.ssi:245
 msgid ""
 "Our initial problem is the discovery of the names of the appropriate tasks. "
 "Currently, live-build cannot help with this. While we might get lucky and "
@@ -639,55 +667,56 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:248
-msgid "# apt-get install dctrl-tools tasksel-data"
+#: en/user_examples.ssi:249
+#, no-wrap
+msgid " # apt-get install dctrl-tools tasksel-data\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:252
+#: en/user_examples.ssi:253
 msgid "Now we can search for the appropriate tasks, first with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:261
+#: en/user_examples.ssi:262
 #, no-wrap
 msgid ""
-"$ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
-"Task: brazilian-portuguese\n"
-"Description: Brazilian Portuguese environment\n"
-" This task installs programs, data files, and\n"
-" documentation that make it easier for Brazilian Portuguese speakers\n"
-" to use Debian.\n"
+" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" Task: brazilian-portuguese\n"
+" Description: Brazilian Portuguese environment\n"
+"  This task installs programs, data files, and\n"
+"  documentation that make it easier for Brazilian Portuguese speakers\n"
+"  to use Debian.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:265
+#: en/user_examples.ssi:266
 msgid ""
 "By this command, we discover the task is called, plainly enough, brazilian-"
 "portuguese. Now to find the related tasks:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:272
+#: en/user_examples.ssi:273
 #, no-wrap
 msgid ""
-"$ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
-"Task: brazilian-portuguese-desktop\n"
-"Description: Brazilian Portuguese desktop\n"
-" This task localises the desktop in Brasilian Portuguese.\n"
+" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" Task: brazilian-portuguese-desktop\n"
+" Description: Brazilian Portuguese desktop\n"
+"  This task localises the desktop in Brasilian Portuguese.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:276
+#: en/user_examples.ssi:277
 #, no-wrap
 msgid ""
-"Task: brazilian-portuguese-kde-desktop\n"
-"Description: Brazilian Portuguese KDE desktop\n"
-" This task localises the KDE desktop in Brazilian Portuguese.\n"
+" Task: brazilian-portuguese-kde-desktop\n"
+" Description: Brazilian Portuguese KDE desktop\n"
+"  This task localises the KDE desktop in Brazilian Portuguese.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:280
+#: en/user_examples.ssi:281
 msgid ""
 "We will use the experimental #{--language}# option, as live-build happens to "
 "include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
@@ -697,12 +726,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:294
+#: en/user_examples.ssi:295
 #, no-wrap
 msgid ""
-"$ mkdir live-pt_BR-kde\n"
-"$ cd live-pt_BR-kde\n"
-"$ lb config \\\n"
+" $ mkdir live-pt_BR-kde\n"
+" $ cd live-pt_BR-kde\n"
+" $ lb config \\\n"
 "     -a i386 \\\n"
 "     -k 486 \\\n"
 "     -p kde-desktop \\\n"
@@ -714,7 +743,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:298
+#: en/user_examples.ssi:299
 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 "
diff --git a/manual/po/fr/user_installation.ssi.po b/manual/po/fr/user_installation.ssi.po
index 58c3aeb..1f8e21d 100644
--- a/manual/po/fr/user_installation.ssi.po
+++ b/manual/po/fr/user_installation.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-16 20:36-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -58,16 +58,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -100,8 +100,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -121,17 +121,17 @@ msgstr "code{"
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -146,7 +146,8 @@ msgstr "}code"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
-msgid "$ lb config --repository live.debian.net"
+#, no-wrap
+msgid " $ lb config --repository live.debian.net\n"
 msgstr ""
 
 #. type: Plain text
@@ -245,7 +246,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:40
-msgid "# apt-get install live-build"
+#, no-wrap
+msgid " # apt-get install live-build\n"
 msgstr ""
 
 #. type: Plain text
@@ -255,7 +257,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:48
-msgid "# aptitude install live-build"
+#, no-wrap
+msgid " # aptitude install live-build\n"
 msgstr ""
 
 #. type: Plain text
@@ -273,7 +276,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:58
-msgid "$ git clone git://live.debian.net/git/live-build.git"
+#, no-wrap
+msgid " $ git clone git://live.debian.net/git/live-build.git\n"
 msgstr ""
 
 #. type: Plain text
@@ -283,7 +287,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:68
-msgid "$ cd live-build $ dpkg-buildpackage -rfakeroot -b -uc -us $ cd .."
+#, no-wrap
+msgid ""
+" $ cd live-build\n"
+" $ dpkg-buildpackage -rfakeroot -b -uc -us\n"
+" $ cd ..\n"
 msgstr ""
 
 #. type: Plain text
@@ -295,7 +303,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:76
-msgid "# dpkg -i live-build_2.0.8-1_all.deb"
+#, no-wrap
+msgid " # dpkg -i live-build_2.0.8-1_all.deb\n"
 msgstr ""
 
 #. type: Plain text
@@ -305,7 +314,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:84
-msgid "# make install"
+#, no-wrap
+msgid " # make install\n"
 msgstr ""
 
 #. type: Plain text
@@ -315,7 +325,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:92
-msgid "# make uninstall"
+#, no-wrap
+msgid " # make uninstall\n"
 msgstr ""
 
 #. type: Plain text
@@ -363,12 +374,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:117
+#, no-wrap
 msgid ""
-"$ git clone git://live.debian.net/git/live-boot.git $ git clone git://live."
-"debian.net/git/live-config.git"
+" $ git clone git://live.debian.net/git/live-boot.git\n"
+" $ git clone git://live.debian.net/git/live-config.git\n"
 msgstr ""
-"$ git clone git://live.debian.net/git/live-boot.git $ git clone git://live."
-"debian.net/git/live-config.git"
 
 #. type: Plain text
 #: en/user_installation.ssi:121
@@ -403,9 +413,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:134
+#, no-wrap
 msgid ""
-"$ cd live-boot $ dpkg-buildpackage -b -uc -us $ cd ../live-config $ dpkg-"
-"buildpackage -b -uc -us"
+" $ cd live-boot\n"
+" $ dpkg-buildpackage -b -uc -us\n"
+" $ cd ../live-config\n"
+" $ dpkg-buildpackage -b -uc -us\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/fr/user_managing_a_configuration.ssi.po b/manual/po/fr/user_managing_a_configuration.ssi.po
index 862aef4..c272cb7 100644
--- a/manual/po/fr/user_managing_a_configuration.ssi.po
+++ b/manual/po/fr/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-17 07:53-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-13 17:00+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -32,12 +32,12 @@ msgstr ""
 #: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
 #: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
 #: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_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_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -54,24 +54,25 @@ msgstr ""
 #: 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-runtime.ssi:14
+#: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi: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: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -95,12 +96,12 @@ msgstr "code{"
 #: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
 #: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
 #: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -117,24 +118,25 @@ msgstr "code{"
 #: 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-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi: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: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -235,10 +237,10 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:29
 #, no-wrap
 msgid ""
-"#!/bin/sh\n"
-"lb config noauto \\\n"
-"\t--packages-lists \"standard\" \\\n"
-"\t\"${@}\"\n"
+" #!/bin/sh\n"
+" lb config noauto \\\n"
+"     --packages-lists \"standard\" \\\n"
+"     \"${@}\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -250,11 +252,11 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:41
 #, no-wrap
 msgid ""
-"#!/bin/sh\n"
-"lb clean noauto \"${@}\"\n"
-"rm -f config/binary config/bootstrap \\\n"
-"\tconfig/chroot config/common config/source\n"
-"rm -f binary.log\n"
+" #!/bin/sh\n"
+" lb clean noauto \"${@}\"\n"
+" rm -f config/binary config/bootstrap \\\n"
+"     config/chroot config/common config/source\n"
+" rm -f binary.log\n"
 msgstr ""
 
 #. type: Plain text
@@ -264,7 +266,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_managing_a_configuration.ssi:50
-msgid "#!/bin/sh lb build noauto \"${@}\" 2>&1 | tee binary.log"
+#, no-wrap
+msgid ""
+" #!/bin/sh\n"
+" lb build noauto \"${@}\" 2>&1 | tee binary.log\n"
 msgstr ""
 
 #. type: Plain text
@@ -276,7 +281,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_managing_a_configuration.ssi:58
-msgid "$ cp /usr/share/live/build/examples/auto/* auto/"
+#, no-wrap
+msgid " $ cp /usr/share/live/build/examples/auto/* auto/\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/fr/user_overview.ssi.po b/manual/po/fr/user_overview.ssi.po
index de86c41..a16ff73 100644
--- a/manual/po/fr/user_overview.ssi.po
+++ b/manual/po/fr/user_overview.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-17 07:53-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-21 07:06-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -32,12 +32,12 @@ msgstr ""
 #: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
 #: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
 #: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_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_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -54,24 +54,25 @@ msgstr ""
 #: 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-runtime.ssi:14
+#: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi: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: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -95,12 +96,12 @@ msgstr "code{"
 #: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
 #: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
 #: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -117,24 +118,25 @@ msgstr "code{"
 #: 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-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi: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: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -264,39 +266,53 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:39
-msgid "$ lb config P: Creating config tree"
+#, no-wrap
+msgid ""
+" $ lb config\n"
+" P: Creating config tree\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:44
+#, no-wrap
 msgid ""
-"$ ls -l total 8 drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto drwxr-xr-x 22 "
-"user user 4096 Sep 7 13:02 config"
+" $ ls -l\n"
+" total 8\n"
+" drwxr-xr-x  3 user user 4096 Sep  7 13:02 auto\n"
+" drwxr-xr-x 22 user user 4096 Sep  7 13:02 config\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:72
+#, no-wrap
 msgid ""
-"$ ls -l config/ total 104 -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary "
-"drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer drwxr-xr-x 2 "
-"user user 4096 Sep 7 13:02 binary_debian-installer-includes drwxr-xr-x 2 "
-"user user 4096 Sep 7 13:02 binary_grub drwxr-xr-x 2 user user 4096 Sep 7 "
-"13:02 binary_local-debs drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-"
-"hooks drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes drwxr-xr-"
-"x 2 user user 4096 Sep 7 13:02 binary_local-packageslists drwxr-xr-x 2 user "
-"user 4096 Sep 7 13:02 binary_local-udebs drwxr-xr-x 2 user user 4096 Sep 7 "
-"13:02 binary_rootfs drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux -"
-"rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap -rw-r--r-- 1 user user 1647 "
-"Sep 7 13:02 chroot drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt drwxr-"
-"xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks drwxr-xr-x 2 user user "
-"4096 Sep 7 13:02 chroot_local-includes drwxr-xr-x 2 user user 4096 Sep 7 "
-"13:02 chroot_local-packages drwxr-xr-x 2 user user 4096 Sep 7 13:02 "
-"chroot_local-packageslists drwxr-xr-x 2 user user 4096 Sep 7 13:02 "
-"chroot_local-patches drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-"
-"preseed drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources -rw-r--r-- 1 "
-"user user 2954 Sep 7 13:02 common drwxr-xr-x 2 user user 4096 Sep 7 13:02 "
-"includes -rw-r--r-- 1 user user 205 Sep 7 13:02 source drwxr-xr-x 2 user "
-"user 4096 Sep 7 13:02 templates"
+" $ ls -l config/\n"
+" total 104\n"
+" -rw-r--r-- 1 user user 4197 Sep  7 13:02 binary\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_debian-installer\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_debian-installer-includes\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_grub\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-debs\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-hooks\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-includes\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-packageslists\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-udebs\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_rootfs\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_syslinux\n"
+" -rw-r--r-- 1 user user 2051 Sep  7 13:02 bootstrap\n"
+" -rw-r--r-- 1 user user 1647 Sep  7 13:02 chroot\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_apt\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-hooks\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-includes\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-packages\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-packageslists\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-patches\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-preseed\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_sources\n"
+" -rw-r--r-- 1 user user 2954 Sep  7 13:02 common\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 includes\n"
+" -rw-r--r-- 1 user user  205 Sep  7 13:02 source\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 templates\n"
 msgstr ""
 
 #. type: Plain text
@@ -317,7 +333,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:82
-msgid "$ lb config -p gnome"
+#, no-wrap
+msgid " $ lb config -p gnome\n"
 msgstr ""
 
 #. type: Plain text
@@ -327,9 +344,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:90
-msgid ""
-"$ lb config --binary-images net --hostname live-machine --username live-"
-"user ..."
+#, no-wrap
+msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/it/about_manual.ssi.po b/manual/po/it/about_manual.ssi.po
index 37bb47e..9a91e05 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: 2010-12-09 10:51-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-12-11 02:34+0100\n"
 "Last-Translator: Carlo Stemberger <carlo.stemberger at gmail.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -387,31 +387,28 @@ msgstr ""
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
-#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
-#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
-#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
-#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
-#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
-#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/about_manual.ssi:170 en/project_bugs.ssi:58
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
-#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
-#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-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/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi: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_customization-installer.ssi:32
+#: en/user_customization-installer.ssi:43
+#: 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
@@ -421,27 +418,28 @@ msgstr ""
 #: en/user_customization-packages.ssi:199
 #: en/user_customization-packages.ssi:215
 #: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:290
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:312
-#: en/user_customization-packages.ssi:330 en/user_customization-runtime.ssi:14
+#: en/user_customization-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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:132 en/user_installation.ssi:147
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -458,31 +456,28 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
 #: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/other_faq.ssi:37 en/other_faq.ssi:46
-#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
-#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
-#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
-#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
-#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
-#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/about_manual.ssi:174 en/project_bugs.ssi:62
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70 en/user_customization-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/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi: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_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
@@ -491,27 +486,29 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
 #: en/user_customization-packages.ssi:191
 #: en/user_customization-packages.ssi:203
 #: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:294
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:316
-#: en/user_customization-packages.ssi:343 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:118
-#: en/user_installation.ssi:137 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -532,8 +529,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:94
-msgid "# apt-get install make po4a sisu-complete"
-msgstr "# apt-get install make po4a sisu-complete"
+#, no-wrap
+msgid " # apt-get install make po4a sisu-complete\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:98
@@ -546,8 +544,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:102
-msgid "$ make build"
-msgstr "$ make build"
+#, no-wrap
+msgid " $ make build\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:106
@@ -562,8 +561,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:110
-msgid "$ make build LANGUAGES=en"
-msgstr "$ make build LANGUAGES=en"
+#, no-wrap
+msgid " $ make build LANGUAGES=en\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:114
@@ -591,19 +591,13 @@ msgstr "_* Prelevare la chiave pubblica:"
 #: en/about_manual.ssi:127
 #, no-wrap
 msgid ""
-"$ mkdir -p ~/.ssh/identity.d\n"
-"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
-"\t-O ~/.ssh/identity.d/gitosis at live.debian.net\n"
-"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-"\t-O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
+" $ mkdir -p ~/.ssh/identity.d\n"
+" $ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
+"     -O ~/.ssh/identity.d/gitosis at live.debian.net\n"
+" $ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
+"     -O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
+" $ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
 msgstr ""
-"$ mkdir -p ~/.ssh/identity.d\n"
-"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
-"\t-O ~/.ssh/identity.d/gitosis at live.debian.net\n"
-"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-"\t-O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:131
@@ -616,19 +610,13 @@ msgstr ""
 #: en/about_manual.ssi:140
 #, no-wrap
 msgid ""
-"$ cat >> ~/.ssh/config << EOF\n"
-"Host live.debian.net\n"
-"        Hostname live.debian.net\n"
-"        User gitosis\n"
-"        IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
-"EOF\n"
+" $ cat >> ~/.ssh/config << EOF\n"
+" Host live.debian.net\n"
+"     Hostname live.debian.net\n"
+"     User gitosis\n"
+"     IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
+" EOF\n"
 msgstr ""
-"$ cat >> ~/.ssh/config << EOF\n"
-"Host live.debian.net\n"
-"        Hostname live.debian.net\n"
-"        User gitosis\n"
-"        IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
-"EOF\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:144
@@ -637,8 +625,9 @@ msgstr "_* Scaricare tramite ssh un clone del manuale:"
 
 #. type: Plain text
 #: en/about_manual.ssi:148
-msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
-msgstr "$ git clone gitosis at live.debian.net:/live-manual.git"
+#, no-wrap
+msgid " $ git clone gitosis at live.debian.net:/live-manual.git\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:152
@@ -653,8 +642,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:156
-msgid "$ make commit"
-msgstr "$ make commit"
+#, no-wrap
+msgid " $ make commit\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:160
@@ -672,8 +662,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:164
-msgid "$ git commit -a -m \"Adding a section on applying patches.\""
-msgstr "$ git commit -a -m \"Adding a section on applying patches.\""
+#, no-wrap
+msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:168
@@ -682,8 +673,9 @@ msgstr "_* Inviare il commit al server:"
 
 #. type: Plain text
 #: en/about_manual.ssi:172
-msgid "$ git push"
-msgstr "$ git push"
+#, no-wrap
+msgid " $ git push\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:176
diff --git a/manual/po/it/project_bugs.ssi.po b/manual/po/it/project_bugs.ssi.po
index 27fcb6e..204bbe3 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-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-12-15 23:11+0100\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -38,7 +38,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -59,16 +59,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -101,8 +101,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -122,17 +122,17 @@ msgstr "code{"
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -364,8 +364,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:60
-msgid "# lb build 2>&1 | tee build.log"
-msgstr "# lb build 2>&1 | tee build.log"
+#, no-wrap
+msgid " # lb build 2>&1 | tee build.log\n"
+msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:64
diff --git a/manual/po/it/project_coding-style.ssi.po b/manual/po/it/project_coding-style.ssi.po
index 6c85a20..af766e6 100644
--- a/manual/po/it/project_coding-style.ssi.po
+++ b/manual/po/it/project_coding-style.ssi.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-17 14:37+0100\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-12-17 14:41+0100\n"
 "Last-Translator: Carlo Stemberger <carlo.stemberger at gmail.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -39,7 +39,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -56,24 +56,25 @@ msgstr ""
 #: 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-runtime.ssi:14
+#: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi: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: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -101,8 +102,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -119,24 +120,25 @@ msgstr "code{"
 #: 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-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi: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: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -223,13 +225,10 @@ msgstr "Sbagliato:"
 #: en/project_coding-style.ssi:32
 #, no-wrap
 msgid ""
-"if foo; then\n"
-"        bar\n"
-"fi\n"
+" if foo; then\n"
+"         bar\n"
+" fi\n"
 msgstr ""
-"if foo; then\n"
-"        bar\n"
-"fi\n"
 
 #. type: Plain text
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:59
@@ -241,15 +240,11 @@ msgstr "Corretto:"
 #: en/project_coding-style.ssi:43
 #, no-wrap
 msgid ""
-"if foo\n"
-"then\n"
-"        bar\n"
-"fi\n"
+" if foo\n"
+" then\n"
+"         bar\n"
+" fi\n"
 msgstr ""
-"if foo\n"
-"then\n"
-"        bar\n"
-"fi\n"
 
 #. type: Plain text
 #: en/project_coding-style.ssi:47
@@ -260,27 +255,20 @@ msgstr "_* Lo stesso vale per le funzioni:"
 #: en/project_coding-style.ssi:55
 #, no-wrap
 msgid ""
-"foo () {\n"
-"        bar\n"
-"}\n"
+" foo () {\n"
+"         bar\n"
+" }\n"
 msgstr ""
-"foo () {\n"
-"        bar\n"
-"}\n"
 
 #. type: Plain text
 #: en/project_coding-style.ssi:66
 #, no-wrap
 msgid ""
-"foo ()\n"
-"{\n"
-"        bar\n"
-"}\n"
+" foo ()\n"
+" {\n"
+"         bar\n"
+" }\n"
 msgstr ""
-"foo ()\n"
-"{\n"
-"        bar\n"
-"}\n"
 
 #. type: Plain text
 #: en/project_coding-style.ssi:70
@@ -358,13 +346,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:94
-msgid "FOO=bar"
-msgstr "FOO=bar"
+#, no-wrap
+msgid " FOO=bar\n"
+msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:102
-msgid "FOO=\"bar\""
-msgstr "FOO=\"bar\""
+#, no-wrap
+msgid " FOO=\"bar\"\n"
+msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:106
@@ -375,29 +365,21 @@ msgstr "_* Utilizzando variabili multiple, quotare l'intera espressione:"
 #: en/project_coding-style.ssi:115
 #, no-wrap
 msgid ""
-"if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
-"then\n"
-"        foobar\n"
-"fi\n"
+" if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
+" then\n"
+"         foobar\n"
+" fi\n"
 msgstr ""
-"if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
-"then\n"
-"        foobar\n"
-"fi\n"
 
 #. type: Plain text
 #: en/project_coding-style.ssi:126
 #, no-wrap
 msgid ""
-"if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
-"then\n"
-"        foobar\n"
-"fi\n"
+" if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
+" then\n"
+"         foobar\n"
+" fi\n"
 msgstr ""
-"if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
-"then\n"
-"        foobar\n"
-"fi\n"
 
 #. type: Plain text
 #: en/project_coding-style.ssi:130
diff --git a/manual/po/it/project_procedures.ssi.po b/manual/po/it/project_procedures.ssi.po
index e9ecd67..744f5b8 100644
--- a/manual/po/it/project_procedures.ssi.po
+++ b/manual/po/it/project_procedures.ssi.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 18:55-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-12-17 17:13+0100\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -39,7 +39,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -60,16 +60,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -102,8 +102,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -123,17 +123,17 @@ msgstr "code{"
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -179,8 +179,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:14
-msgid "$ ../../scripts/l10n/output-l10n-changes . -d"
-msgstr "$ ../../scripts/l10n/output-l10n-changes . -d"
+#, no-wrap
+msgid " $ ../../scripts/l10n/output-l10n-changes . -d\n"
+msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:18
@@ -276,17 +277,12 @@ msgstr ""
 #: en/project_procedures.ssi:52
 #, no-wrap
 msgid ""
-"$ sed \\\n"
-"  -e 's|%major%|5.0|g' \\\n"
-"  -e 's|%minor%|5.0.2|g' \\\n"
-"  -e 's|%codename%|lenny|g' \\\n"
-"  -e 's|%release_mail%|2009/msg00007.html|g'\n"
+" $ sed \\\n"
+"     -e 's|%major%|5.0|g' \\\n"
+"     -e 's|%minor%|5.0.2|g' \\\n"
+"     -e 's|%codename%|lenny|g' \\\n"
+"     -e 's|%release_mail%|2009/msg00007.html|g'\n"
 msgstr ""
-"$ sed \\\n"
-"  -e 's|%major%|5.0|g' \\\n"
-"  -e 's|%minor%|5.0.2|g' \\\n"
-"  -e 's|%codename%|lenny|g' \\\n"
-"  -e 's|%release_mail%|2009/msg00007.html|g'\n"
 
 #. type: Plain text
 #: en/project_procedures.ssi:56
@@ -299,191 +295,179 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:60
-msgid "Debian Live images for Debian GNU/Linux %major% updated"
-msgstr "Debian Live images for Debian GNU/Linux %major% updated"
+#, no-wrap
+msgid " Debian Live images for Debian GNU/Linux %major% updated\n"
+msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:64
+#, no-wrap
 msgid ""
-"The Debian Live project is pleased to announce the availability of updated "
-"Live images for its stable distribution Debian GNU/Linux %major% (codename "
-"\"%codename%\")."
+" The Debian Live project is pleased to announce the availability of\n"
+" updated Live images for its stable distribution Debian GNU/Linux %major%\n"
+" (codename \"%codename%\").\n"
 msgstr ""
-"The Debian Live project is pleased to announce the availability of updated "
-"Live images for its stable distribution Debian GNU/Linux %major% (codename "
-"\"%codename%\")."
 
 #. type: Plain text
 #: en/project_procedures.ssi:66
-msgid "The images are available for download at:"
-msgstr "The images are available for download at:"
+#, no-wrap
+msgid " The images are available for download at:\n"
+msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:68
 #, no-wrap
-msgid "    <http://cdimage.debian.org/cdimage/release/current-live/>\n"
-msgstr "    <http://cdimage.debian.org/cdimage/release/current-live/>\n"
+msgid "     <http://cdimage.debian.org/cdimage/release/current-live/>\n"
+msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:73
+#, no-wrap
 msgid ""
-"This update incorporates the changes made in the %minor% point release, "
-"which adds corrections for security problems to the stable release along "
-"with a few adjustments for serious problems. A full list of the changes may "
-"be viewed at:"
+" This update incorporates the changes made in the %minor% point release,\n"
+" which adds corrections for security problems to the stable release\n"
+" along with a few adjustments for serious problems. A full list of the\n"
+" changes may be viewed at:\n"
 msgstr ""
-"This update incorporates the changes made in the %minor% point release, "
-"which adds corrections for security problems to the stable release along "
-"with a few adjustments for serious problems. A full list of the changes may "
-"be viewed at:"
 
 #. type: Plain text
 #: en/project_procedures.ssi:75
 #, no-wrap
-msgid "    <http://lists.debian.org/debian-announce/%release_mail%>\n"
-msgstr "    <http://lists.debian.org/debian-announce/%release_mail%>\n"
+msgid "     <http://lists.debian.org/debian-announce/%release_mail%>\n"
+msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:77
-msgid "It also includes the following Live-specific changes:"
-msgstr "It also includes the following Live-specific changes:"
+#, no-wrap
+msgid " It also includes the following Live-specific changes:\n"
+msgstr ""
 
-#. type: Bullet: ' * '
+#. type: Bullet: '  * '
 #: en/project_procedures.ssi:81
 msgid "[INSERT LIVE-SPECIFIC CHANGE HERE]"
 msgstr "[INSERT LIVE-SPECIFIC CHANGE HERE]"
 
-#. type: Bullet: ' * '
+#. type: Bullet: '  * '
 #: en/project_procedures.ssi:81
 msgid "[LARGER ISSUES MAY DESERVE THEIR OWN SECTION]"
 msgstr "[LARGER ISSUES MAY DESERVE THEIR OWN SECTION]"
 
 #. type: Plain text
-#: en/project_procedures.ssi:84
+#: en/project_procedures.ssi:85
 #, no-wrap
 msgid ""
-"URLs\n"
-"----\n"
+" URLs\n"
+" ----\n"
 msgstr ""
-"URLs\n"
-"----\n"
 
 #. type: Plain text
 #: en/project_procedures.ssi:87
-msgid "Download location of updated images:"
-msgstr "Download location of updated images:"
+#, no-wrap
+msgid " Download location of updated images:\n"
+msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:89
 #, no-wrap
-msgid "  <http://cdimage.debian.org/cdimage/release/current-live/>\n"
-msgstr "  <http://cdimage.debian.org/cdimage/release/current-live/>\n"
+msgid "   <http://cdimage.debian.org/cdimage/release/current-live/>\n"
+msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:91
-msgid "Debian Live project homepage:"
-msgstr "Debian Live project homepage:"
+#, no-wrap
+msgid " Debian Live project homepage:\n"
+msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:93
 #, no-wrap
-msgid "  <http://live.debian.net/>\n"
-msgstr "  <http://live.debian.net/>\n"
+msgid "   <http://live.debian.net/>\n"
+msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:95
-msgid "The current stable distribution:"
-msgstr "The current stable distribution:"
+#, no-wrap
+msgid " The current stable distribution:\n"
+msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:97
 #, no-wrap
-msgid "  <http://ftp.debian.org/debian/dists/stable>\n"
-msgstr "  <http://ftp.debian.org/debian/dists/stable>\n"
+msgid "   <http://ftp.debian.org/debian/dists/stable>\n"
+msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:99
-msgid "stable distribution information (release notes, errata etc.):"
-msgstr "stable distribution information (release notes, errata etc.):"
+#, no-wrap
+msgid " stable distribution information (release notes, errata etc.):\n"
+msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:101
 #, no-wrap
-msgid "  <http://www.debian.org/releases/stable/>\n"
-msgstr "  <http://www.debian.org/releases/stable/>\n"
+msgid "   <http://www.debian.org/releases/stable/>\n"
+msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:103
-msgid "Security announcements and information:"
-msgstr "Security announcements and information:"
+#, no-wrap
+msgid " Security announcements and information:\n"
+msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:105
 #, no-wrap
-msgid "  <http://www.debian.org/security/>\n"
-msgstr "  <http://www.debian.org/security/>\n"
+msgid "   <http://www.debian.org/security/>\n"
+msgstr ""
 
 #. type: Plain text
-#: en/project_procedures.ssi:108
+#: en/project_procedures.ssi:109
 #, no-wrap
 msgid ""
-"About Debian\n"
-"-------------\n"
+" About Debian\n"
+" -------------\n"
 msgstr ""
-"About Debian\n"
-"-------------\n"
 
 #. type: Plain text
 #: en/project_procedures.ssi:113
+#, no-wrap
 msgid ""
-"The Debian Project is an association of Free Software developers who "
-"volunteer their time and effort in order to produce the completely free "
-"operating system Debian GNU/Linux."
+" The Debian Project is an association of Free Software developers who\n"
+" volunteer their time and effort in order to produce the completely free\n"
+" operating system Debian GNU/Linux.\n"
 msgstr ""
-"The Debian Project is an association of Free Software developers who "
-"volunteer their time and effort in order to produce the completely free "
-"operating system Debian GNU/Linux."
 
 #. type: Plain text
-#: en/project_procedures.ssi:116
+#: en/project_procedures.ssi:117
 #, no-wrap
 msgid ""
-"About Debian Live\n"
-"-----------------\n"
+" About Debian Live\n"
+" -----------------\n"
 msgstr ""
-"About Debian Live\n"
-"-----------------\n"
 
 #. type: Plain text
 #: en/project_procedures.ssi:122
+#, no-wrap
 msgid ""
-"Debian Live is an official sub-project of Debian which produces Debian "
-"systems that do not require a classical installer. Images are available for "
-"CD/DVD discs, USB sticks and PXE netbooting as well as a bare filesystem "
-"images for booting directly from the internet."
+" Debian Live is an official sub-project of Debian which produces Debian\n"
+" systems that do not require a classical installer. Images are available\n"
+" for CD/DVD discs, USB sticks and PXE netbooting as well as a bare\n"
+" filesystem images for booting directly from the internet.\n"
 msgstr ""
-"Debian Live is an official sub-project of Debian which produces Debian "
-"systems that do not require a classical installer. Images are available for "
-"CD/DVD discs, USB sticks and PXE netbooting as well as a bare filesystem "
-"images for booting directly from the internet."
 
 #. type: Plain text
-#: en/project_procedures.ssi:125
+#: en/project_procedures.ssi:126
 #, no-wrap
 msgid ""
-"Contact Information\n"
-"-------------------\n"
+" Contact Information\n"
+" -------------------\n"
 msgstr ""
-"Contact Information\n"
-"-------------------\n"
 
 #. type: Plain text
 #: en/project_procedures.ssi:130
+#, no-wrap
 msgid ""
-"For further information, please visit the Debian Live web pages at <http://"
-"live.debian.net/> or alternatively send mail to <debian-live at lists.debian."
-"org>."
+" For further information, please visit the Debian Live web pages at\n"
+" <http://live.debian.net/> or alternatively send mail to\n"
+" <debian-live at lists.debian.org>.\n"
 msgstr ""
-"For further information, please visit the Debian Live web pages at <http://"
-"live.debian.net/> or alternatively send mail to <debian-live at lists.debian."
-"org>."
diff --git a/manual/po/it/user_basics.ssi.po b/manual/po/it/user_basics.ssi.po
index fdc8269..70eab07 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: 2010-12-19 10:06-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-12-19 15:58+0100\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -39,7 +39,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -59,17 +59,17 @@ msgstr ""
 #: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_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:188
-#: en/user_examples.ssi:204 en/user_examples.ssi:218 en/user_examples.ssi:226
-#: en/user_examples.ssi:244 en/user_examples.ssi:252 en/user_examples.ssi:265
-#: en/user_examples.ssi:280 en/user_installation.ssi:38
+#: 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
@@ -102,8 +102,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -122,18 +122,18 @@ msgstr "code{"
 #: 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:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_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:184 en/user_examples.ssi:200
-#: en/user_examples.ssi:208 en/user_examples.ssi:222 en/user_examples.ssi:230
-#: en/user_examples.ssi:248 en/user_examples.ssi:261 en/user_examples.ssi:276
-#: en/user_examples.ssi:294 en/user_installation.ssi:42
+#: 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
@@ -317,8 +317,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:32
-msgid "$ lb config"
-msgstr "$ lb config"
+#, no-wrap
+msgid " $ lb config\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:36
@@ -341,9 +342,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
-#: en/user_examples.ssi:109 en/user_examples.ssi:156 en/user_examples.ssi:206
-msgid "# lb build"
-msgstr "# lb build"
+#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#, no-wrap
+msgid " # lb build\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:46
@@ -366,13 +368,15 @@ msgstr "Collaudare una ISO è semplice:"
 
 #. type: Plain text
 #: en/user_basics.ssi:54 en/user_basics.ssi:142
-msgid "# apt-get install qemu"
-msgstr "# apt-get install qemu"
+#, no-wrap
+msgid " # apt-get install qemu\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:56
-msgid "$ qemu -cdrom binary.iso"
-msgstr "$ qemu -cdrom binary.iso"
+#, no-wrap
+msgid " $ qemu -cdrom binary.iso\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:60
@@ -387,13 +391,15 @@ msgstr "Per provare la ISO con virtualbox-ose:"
 
 #. type: Plain text
 #: en/user_basics.ssi:66
-msgid "# apt-get install virtualbox-ose virtualbox-ose-dkms"
-msgstr "# apt-get install virtualbox-ose virtualbox-ose-dkms"
+#, no-wrap
+msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:68
-msgid "$ virtualbox"
-msgstr "$ virtualbox"
+#, no-wrap
+msgid " $ virtualbox\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:72
@@ -420,8 +426,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:78
-msgid "# lb config --packages virtualbox-ose-guest-x11"
-msgstr "# lb config --packages virtualbox-ose-guest-x11"
+#, no-wrap
+msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:82
@@ -435,13 +442,15 @@ msgstr "Masterizzare un'immagine ISO è semplice:"
 
 #. type: Plain text
 #: en/user_basics.ssi:88
-msgid "# apt-get install wodim"
-msgstr "# apt-get install wodim"
+#, no-wrap
+msgid " # apt-get install wodim\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:90
-msgid "$ wodim binary.iso"
-msgstr "$ wodim binary.iso"
+#, no-wrap
+msgid " $ wodim binary.iso\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:94
@@ -479,9 +488,10 @@ msgstr ""
 "comando lb clean}#lb-clean):"
 
 #. type: Plain text
-#: en/user_basics.ssi:102
-msgid "$ lb clean --binary"
-msgstr "$ lb clean --binary"
+#: en/user_basics.ssi:102 en/user_basics.ssi:184
+#, no-wrap
+msgid " # lb clean --binary\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:106
@@ -494,8 +504,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:110
-msgid "$ lb config -b usb-hdd"
-msgstr "$ lb config -b usb-hdd"
+#, no-wrap
+msgid " $ lb config -b usb-hdd\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:114 en/user_basics.ssi:198
@@ -521,8 +532,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:128
-msgid "$ dd if=binary.img of=${USBSTICK}"
-msgstr "$ dd if=binary.img of=${USBSTICK}"
+#, no-wrap
+msgid " $ dd if=binary.img of=${USBSTICK}\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:132
@@ -560,8 +572,9 @@ msgstr "3~testing-usb-hdd-with-qemu Provare un'immagine USB/HDD con Qemu"
 
 #. type: Plain text
 #: en/user_basics.ssi:144
-msgid "$ qemu -hda binary.img"
-msgstr "$ qemu -hda binary.img"
+#, no-wrap
+msgid " $ qemu -hda binary.img\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:148
@@ -583,8 +596,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:154
-msgid "# gparted ${USBSTICK}"
-msgstr "# gparted ${USBSTICK}"
+#, no-wrap
+msgid " # gparted ${USBSTICK}\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:158
@@ -597,8 +611,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:162
-msgid "# mkfs.ext4 ${USBSTICK}"
-msgstr "# mkfs.ext4 ${USBSTICK}"
+#, no-wrap
+msgid " # mkfs.ext4 ${USBSTICK}\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:166
@@ -607,8 +622,9 @@ msgstr "Usare FAT32 se si vuole usare questa partizione dati con Windows."
 
 #. type: Plain text
 #: en/user_basics.ssi:170
-msgid "# mkfs.vfat -F 32"
-msgstr "# mkfs.vfat -F 32"
+#, no-wrap
+msgid " # mkfs.vfat -F 32\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:174
@@ -642,11 +658,6 @@ msgstr ""
 "la directory di lavoro con il comando #{lb clean}#:"
 
 #. type: Plain text
-#: en/user_basics.ssi:184
-msgid "# lb clean --binary"
-msgstr "# lb clean --binary"
-
-#. type: Plain text
 #: en/user_basics.ssi:188
 msgid ""
 "Run the #{lb config}# command as follows to configure your image for "
@@ -657,12 +668,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:192
-msgid ""
-"$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
-"\"192.168.0.1\""
+#, no-wrap
+msgid " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
 msgstr ""
-"$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
-"\"192.168.0.1\""
 
 #. type: Plain text
 #: en/user_basics.ssi:196
@@ -748,48 +756,48 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:220
-msgid "# /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server"
-msgstr "# /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server"
+#, no-wrap
+msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:222
-msgid "ddns-update-style none;"
-msgstr "ddns-update-style none;"
+#, no-wrap
+msgid " ddns-update-style none;\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:225
+#, no-wrap
 msgid ""
-"option domain-name \"example.org\"; option domain-name-servers ns1.example."
-"org, ns2.example.org;"
+" option domain-name \"example.org\";\n"
+" option domain-name-servers ns1.example.org, ns2.example.org;\n"
 msgstr ""
-"option domain-name \"example.org\"; option domain-name-servers ns1.example."
-"org, ns2.example.org;"
 
 #. type: Plain text
 #: en/user_basics.ssi:228
-msgid "default-lease-time 600; max-lease-time 7200;"
-msgstr "default-lease-time 600; max-lease-time 7200;"
+#, no-wrap
+msgid ""
+" default-lease-time 600;\n"
+" max-lease-time 7200;\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:230
-msgid "log-facility local7;"
-msgstr "log-facility local7;"
+#, no-wrap
+msgid " log-facility local7;\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:236
 #, no-wrap
 msgid ""
-"subnet 192.168.0.0 netmask 255.255.255.0 {\n"
-"  range 192.168.0.1 192.168.0.254;\n"
-"  next-server servername;\n"
-"  filename \"pxelinux.0\";\n"
+" subnet 192.168.0.0 netmask 255.255.255.0 {\n"
+"   range 192.168.0.1 192.168.0.254;\n"
+"   next-server servername;\n"
+"   filename \"pxelinux.0\";\n"
 "}\n"
 msgstr ""
-"subnet 192.168.0.0 netmask 255.255.255.0 {\n"
-"  range 192.168.0.1 192.168.0.254;\n"
-"  next-server servername;\n"
-"  filename \"pxelinux.0\";\n"
-"}\n"
 
 #. type: Plain text
 #: en/user_basics.ssi:240
@@ -816,8 +824,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:248
-msgid "# dpkg-reconfigure -plow tftpd-hpa"
-msgstr "# dpkg-reconfigure -plow tftpd-hpa"
+#, no-wrap
+msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:252
@@ -856,8 +865,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:264
-msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
-msgstr "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
+#, no-wrap
+msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:268
@@ -867,8 +877,9 @@ msgstr "e comunicare il nuovo export al server NFS con il seguente comando:"
 
 #. type: Plain text
 #: en/user_basics.ssi:272
-msgid "# exportfs -rv"
-msgstr "# exportfs -rv"
+#, no-wrap
+msgid " # exportfs -rv\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:276
@@ -927,16 +938,17 @@ msgstr "Modificare #{/etc/qemu-ifup}#:"
 
 #. type: Plain text
 #: en/user_basics.ssi:299
+#, no-wrap
 msgid ""
-"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
-"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
-"sudo /sbin/ifconfig $1 0.0.0.0 promisc up echo \"Adding $1 to br0...\" sudo /"
-"usr/sbin/brctl addif br0 $1 sleep 2"
+" #!/bin/sh\n"
+" sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1\n"
+" echo \"Executing /etc/qemu-ifup\"\n"
+" echo \"Bringing up $1 for bridged mode...\"\n"
+" sudo /sbin/ifconfig $1 0.0.0.0 promisc up\n"
+" echo \"Adding $1 to br0...\"\n"
+" sudo /usr/sbin/brctl addif br0 $1\n"
+" sleep 2\n"
 msgstr ""
-"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
-"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
-"sudo /sbin/ifconfig $1 0.0.0.0 promisc up echo \"Adding $1 to br0...\" sudo /"
-"usr/sbin/brctl addif br0 $1 sleep 2"
 
 #. type: Plain text
 #: en/user_basics.ssi:303
@@ -976,42 +988,51 @@ msgstr "_* Vi si copi dentro questo testo:"
 
 #. type: Plain text
 #: en/user_basics.ssi:321
+#, no-wrap
 msgid ""
-"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
-"\"512\" MemAllowAutoScaleDown = \"FALSE\""
+" #!/usr/bin/vmware\n"
+" config.version = \"8\"\n"
+" virtualHW.version = \"4\"\n"
+" memsize = \"512\"\n"
+" MemAllowAutoScaleDown = \"FALSE\"\n"
 msgstr ""
-"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
-"\"512\" MemAllowAutoScaleDown = \"FALSE\""
 
 #. type: Plain text
 #: en/user_basics.ssi:327
+#, no-wrap
 msgid ""
-"ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
-"\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
+" ide0:0.present = \"FALSE\"\n"
+" ide1:0.present = \"FALSE\"\n"
+" floppy0.present = \"FALSE\"\n"
+" sound.present = \"FALSE\"\n"
+" tools.remindInstall = \"FALSE\"\n"
 msgstr ""
-"ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
-"\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
 
 #. type: Plain text
 #: en/user_basics.ssi:330
-msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
-msgstr "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
+#, no-wrap
+msgid ""
+" ethernet0.present = \"TRUE\"\n"
+" ethernet0.addressType = \"generated\"\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:333
-msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
-msgstr "displayName = \"Test Boot PXE\" guestOS = \"other\""
+#, no-wrap
+msgid ""
+" displayName = \"Test Boot PXE\"\n"
+" guestOS = \"other\"\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:338
+#, no-wrap
 msgid ""
-"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
-"83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
-"de 3f-ae 9e 07 91 1d 8d 71 3b\" ethernet0.generatedAddressOffset = \"0\""
+" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\"\n"
+" uuid.location = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
+" uuid.bios = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
+" ethernet0.generatedAddressOffset = \"0\"\n"
 msgstr ""
-"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
-"83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
-"de 3f-ae 9e 07 91 1d 8d 71 3b\" ethernet0.generatedAddressOffset = \"0\""
 
 #. type: Plain text
 #: en/user_basics.ssi:342
diff --git a/manual/po/it/user_customization-contents.ssi.po b/manual/po/it/user_customization-contents.ssi.po
index 3016903..7e0b4e2 100644
--- a/manual/po/it/user_customization-contents.ssi.po
+++ b/manual/po/it/user_customization-contents.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-10 16:54-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-12-15 23:27+0100\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -21,28 +21,24 @@ msgstr ""
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
-#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
-#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
-#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
-#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
-#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
-#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/about_manual.ssi:170 en/project_bugs.ssi:58
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
-#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
-#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi: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_customization-installer.ssi:32
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -56,27 +52,28 @@ msgstr ""
 #: en/user_customization-packages.ssi:199
 #: en/user_customization-packages.ssi:215
 #: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:290
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:312
-#: en/user_customization-packages.ssi:330 en/user_customization-runtime.ssi:14
+#: en/user_customization-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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:132 en/user_installation.ssi:147
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -88,28 +85,24 @@ msgstr "code{"
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
 #: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/other_faq.ssi:37 en/other_faq.ssi:46
-#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
-#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
-#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
-#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
-#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
-#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/about_manual.ssi:174 en/project_bugs.ssi:62
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi: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_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
@@ -122,27 +115,29 @@ msgstr "code{"
 #: en/user_customization-packages.ssi:191
 #: en/user_customization-packages.ssi:203
 #: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:294
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:316
-#: en/user_customization-packages.ssi:343 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:118
-#: en/user_installation.ssi:137 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -279,12 +274,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:29
+#, no-wrap
 msgid ""
-"$ mkdir -p config/chroot_local-includes/var/www $ cp /path/to/my/index.html "
-"config/chroot_local-includes/var/www"
+" $ mkdir -p config/chroot_local-includes/var/www\n"
+" $ cp /path/to/my/index.html config/chroot_local-includes/var/www\n"
 msgstr ""
-"$ mkdir -p config/chroot_local-includes/var/www $ cp /path/to/my/index.html "
-"config/chroot_local-includes/var/www"
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:33
@@ -295,23 +289,15 @@ msgstr "La configurazione avrà quindi il seguente schema:"
 #: en/user_customization-contents.ssi:44
 #, no-wrap
 msgid ""
-"-- config\n"
-"   [...]\n"
-"    |-- chroot_local-includes\n"
-"    |   `-- var\n"
-"    |       `-- www\n"
-"    |           `-- index.html\n"
-"   [...]\n"
-"    `-- templates\n"
+" -- config\n"
+"    [...]\n"
+"     |-- chroot_local-includes\n"
+"     |   `-- var\n"
+"     |       `-- www\n"
+"     |           `-- index.html\n"
+"    [...]\n"
+"     `-- templates\n"
 msgstr ""
-"-- config\n"
-"   [...]\n"
-"    |-- chroot_local-includes\n"
-"    |   `-- var\n"
-"    |       `-- www\n"
-"    |           `-- index.html\n"
-"   [...]\n"
-"    `-- templates\n"
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:48
@@ -348,8 +334,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:56
-msgid "$ cp ~/video_demo.* config/binary_local-includes/"
-msgstr "$ cp ~/video_demo.* config/binary_local-includes/"
+#, no-wrap
+msgid " $ cp ~/video_demo.* config/binary_local-includes/\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:60
@@ -373,8 +360,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:68
-msgid "$ lb config --includes none"
-msgstr "$ lb config --includes none"
+#, no-wrap
+msgid " $ lb config --includes none\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:72
diff --git a/manual/po/it/user_customization-installer.ssi.po b/manual/po/it/user_customization-installer.ssi.po
index def906f..595b61c 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: 2010-12-16 08:39-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-12-16 18:31+0100\n"
 "Last-Translator: lillo sciascia <lillosciascia at gmail.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -33,12 +33,12 @@ msgstr ""
 #: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
 #: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
 #: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_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_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -55,24 +55,25 @@ msgstr ""
 #: 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-runtime.ssi:14
+#: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi: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: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -96,12 +97,12 @@ msgstr "code{"
 #: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
 #: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
 #: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -118,24 +119,25 @@ msgstr "code{"
 #: 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-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi: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: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -282,21 +284,20 @@ msgstr ""
 "specificata. Per esempio:"
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:34
+#: en/user_customization-installer.ssi:35
+#, no-wrap
 msgid ""
-"$ lb config --architecture i386 --linux-flavours 486 --debian-installer live "
-"--packages debian-installer-launcher"
+" $ lb config --architecture i386 --linux-flavours 486 \\\n"
+"     --debian-installer live --packages debian-installer-launcher\n"
 msgstr ""
-"$ lb config --architecture i386 --linux-flavours 486 --debian-installer live "
-"--packages debian-installer-launcher"
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:39
 msgid "2~ Customizing Debian Installer by preseeding"
 msgstr "2~ Personalizzare il Debian Installer con la preconfigurazione"
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:40
+#: en/user_customization-installer.ssi:41
 msgid ""
 "As described in the Debian Installer Manual, Appendix B at http://www.debian."
 "org/releases/stable/i386/apb.html, \"Preseeding provides a way to set "
@@ -320,21 +321,20 @@ msgstr ""
 "l'impostazione della localizzazione su #{en_US}#:"
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:44
+#: en/user_customization-installer.ssi:46
+#, no-wrap
 msgid ""
-"$ echo \"d-i debian-installer/locale string en_US\" >> config/binary_debian-"
-"installer/preseed.cfg"
+" $ echo \"d-i debian-installer/locale string en_US\" \\\n"
+"     >> config/binary_debian-installer/preseed.cfg\n"
 msgstr ""
-"$ echo \"d-i debian-installer/locale string en_US\" >> config/binary_debian-"
-"installer/preseed.cfg"
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:50
 msgid "2~ Customizing Debian Installer content"
 msgstr "2~ Personalizzare il contenuto del Debian Installer"
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:50
+#: en/user_customization-installer.ssi:52
 msgid ""
 "For experimental or debugging purposes, you might want to include locally "
 "built #{d-i}# component udeb packages. Place these in #{config/binary_local-"
diff --git a/manual/po/it/user_customization-packages.ssi.po b/manual/po/it/user_customization-packages.ssi.po
index 96e94f4..15ed08b 100644
--- a/manual/po/it/user_customization-packages.ssi.po
+++ b/manual/po/it/user_customization-packages.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-12-17 22:07+0100\n"
 "Last-Translator: lillo sciascia <lillosciascia at gmail.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -38,7 +38,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -59,16 +59,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -101,8 +101,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -122,17 +122,17 @@ msgstr "code{"
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -230,8 +230,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:16
-msgid "$ lb config --distribution sid"
-msgstr "$ lb config --distribution sid"
+#, no-wrap
+msgid " $ lb config --distribution sid\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:20
@@ -250,8 +251,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:24
-msgid "$ lb config --archive-areas \"main contrib\""
-msgstr "$ lb config --archive-areas \"main contrib\""
+#, no-wrap
+msgid " $ lb config --archive-areas \"main contrib\"\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:28
@@ -333,11 +335,9 @@ msgstr ""
 #: en/user_customization-packages.ssi:43
 #, no-wrap
 msgid ""
-"$ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
-"            --mirror-chroot-security http://localhost/debian-security/\n"
+" $ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
+"             --mirror-chroot-security http://localhost/debian-security/\n"
 msgstr ""
-"$ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
-"            --mirror-chroot-security http://localhost/debian-security/\n"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:47
@@ -380,11 +380,9 @@ msgstr ""
 #: en/user_customization-packages.ssi:56
 #, no-wrap
 msgid ""
-"$ lb config --mirror-binary http://mirror/debian/ \\\n"
-"            --mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --mirror-binary http://mirror/debian/ \\\n"
+"             --mirror-binary-security http://mirror/debian-security/\n"
 msgstr ""
-"$ lb config --mirror-binary http://mirror/debian/ \\\n"
-"            --mirror-binary-security http://mirror/debian-security/\n"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:60
@@ -425,8 +423,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:68
-msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
-msgstr "deb http://live.debian.net/ sid-snapshots main contrib non-free"
+#, no-wrap
+msgid " deb http://live.debian.net/ sid-snapshots main contrib non-free\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:72
@@ -466,8 +465,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
-msgid "$ lb config --repository live.debian.net"
-msgstr "$ lb config --repository live.debian.net"
+#, no-wrap
+msgid " $ lb config --repository live.debian.net\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:86
@@ -511,8 +511,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:96
-msgid "$ lb config --packages \"package1 package2 package3\""
-msgstr "$ lb config --packages \"package1 package2 package3\""
+#, no-wrap
+msgid " $ lb config --packages \"package1 package2 package3\"\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:100
@@ -578,8 +579,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:114
-msgid "$ lb config --packages-lists \"gnome-core rescue\""
-msgstr "$ lb config --packages-lists \"gnome-core rescue\""
+#, no-wrap
+msgid " $ lb config --packages-lists \"gnome-core rescue\"\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:118
@@ -705,8 +707,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:145
-msgid "#include <gnome> iceweasel"
-msgstr "#include <gnome> iceweasel"
+#, no-wrap
+msgid ""
+" #include <gnome>\n"
+" iceweasel\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:149
@@ -741,8 +746,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:159
-msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
-msgstr "#if ARCHITECTURE amd64 ia32-libs #endif"
+#, no-wrap
+msgid ""
+" #if ARCHITECTURE amd64\n"
+" ia32-libs\n"
+" #endif\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:163
@@ -756,8 +765,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:169
-msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
-msgstr "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
+#, no-wrap
+msgid ""
+" #if ARCHITECTURE i386 amd64\n"
+" memtest86+\n"
+" #endif\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:173
@@ -772,8 +785,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:179
-msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
-msgstr "#if ARCHIVE_AREAS contrib non-free vrms #endif"
+#, no-wrap
+msgid ""
+" #if ARCHIVE_AREAS contrib non-free\n"
+" vrms\n"
+" #endif\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:183
@@ -782,8 +799,12 @@ msgstr "Una condizione può coinvolegere una direttiva #{#include}#:"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:189
-msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
-msgstr "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
+#, no-wrap
+msgid ""
+" #if ARCHITECTURE amd64\n"
+" #include <gnome-full>\n"
+" #endif\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:193
@@ -815,8 +836,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:201
-msgid "$ lb config --tasks \"mail-server file-server\""
-msgstr "$ lb config --tasks \"mail-server file-server\""
+#, no-wrap
+msgid " $ lb config --tasks \"mail-server file-server\"\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:205
@@ -882,10 +904,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:217
-msgid ""
-"$ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\""
+#, no-wrap
+msgid " $ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\"\n"
 msgstr ""
-"$ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:221
@@ -929,8 +950,9 @@ msgstr "*{Nota:}* Esiste anche l'opzione sperimentale #{--language}# con lo scop
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:229
-msgid "$ lb config --language es"
-msgstr "$ lb config --language es"
+#, no-wrap
+msgid " $ lb config --language es\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:233
@@ -1217,8 +1239,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:293
-msgid "$ lb config --apt-http-proxy http://proxy/"
-msgstr "$ lb config --apt-http-proxy http://proxy/"
+#, no-wrap
+msgid " $ lb config --apt-http-proxy http://proxy/\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:297
@@ -1244,8 +1267,9 @@ msgstr "È possibile non includere gli indici di APT con:"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:305
-msgid "$ lb config --binary-indices false"
-msgstr "$ lb config --binary-indices false"
+#, no-wrap
+msgid " $ lb config --binary-indices false\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:309
@@ -1273,8 +1297,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:315
-msgid "$ lb config --apt-recommends false"
-msgstr "$ lb config --apt-recommends false"
+#, no-wrap
+msgid " $ lb config --apt-recommends false\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:319
@@ -1369,19 +1394,24 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:337
+#, no-wrap
 msgid ""
-"$ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid."
-"chroot $ cat >>config/chroot_apt/preferences <<END Package: live-* Pin: "
-"release n=sid Pin-Priority: 600"
+" $ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid.chroot\n"
+" $ cat >>config/chroot_apt/preferences <<END\n"
+" Package: live-*\n"
+" Pin: release n=sid\n"
+" Pin-Priority: 600\n"
 msgstr ""
-"$ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid."
-"chroot $ cat >>config/chroot_apt/preferences <<END Package: live-* Pin: "
-"release n=sid Pin-Priority: 600"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:342
-msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
-msgstr "Package: * Pin: release n=sid Pin-Priority: 1 END"
+#, no-wrap
+msgid ""
+" Package: *\n"
+" Pin: release n=sid\n"
+" Pin-Priority: 1\n"
+" END\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:346
@@ -1396,5 +1426,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:352
-msgid "Package: gnome-keyring Pin: version * Pin-Priority: -1"
-msgstr "Package: gnome-keyring Pin: version * Pin-Priority: -1"
+#, no-wrap
+msgid ""
+" Package: gnome-keyring\n"
+" Pin: version *\n"
+" Pin-Priority: -1\n"
+msgstr ""
diff --git a/manual/po/it/user_customization-runtime.ssi.po b/manual/po/it/user_customization-runtime.ssi.po
index 16cf5ab..06e434c 100644
--- a/manual/po/it/user_customization-runtime.ssi.po
+++ b/manual/po/it/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-12-16 12:00+0100\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -58,16 +58,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -100,8 +100,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -121,17 +121,17 @@ msgstr "code{"
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -203,12 +203,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:16
-msgid ""
-"debconf passwd/user-default-groups string audio cdrom dialout floppy video "
-"plugdev netdev powerdev fuse"
+#, no-wrap
+msgid " debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse\n"
 msgstr ""
-"debconf passwd/user-default-groups string audio cdrom dialout floppy video "
-"plugdev netdev powerdev fuse"
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:20
@@ -250,8 +247,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:34
-msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
-msgstr "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
+#, no-wrap
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:38
@@ -282,12 +280,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:45
+#, no-wrap
 msgid ""
-"$ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name <name>se</"
-"name>"
+" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
+" <name>se</name>\n"
 msgstr ""
-"$ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name <name>se</"
-"name>"
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:49
@@ -299,10 +296,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:53
-msgid ""
-"$ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\""
+#, no-wrap
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
 msgstr ""
-"$ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:57
@@ -314,16 +310,15 @@ msgstr ""
 "il seguente comando:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:61
+#: en/user_customization-runtime.ssi:62
+#, no-wrap
 msgid ""
-"$ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); do basename $i | "
-"head -c -9; echo; done | sort | less"
+" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
+"     do basename $i | head -c -9; echo; done | sort | less\n"
 msgstr ""
-"$ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); do basename $i | "
-"head -c -9; echo; done | sort | less"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:65
+#: en/user_customization-runtime.ssi:66
 msgid ""
 "Alternatively, you can use the #{console-setup}# package, a tool to let you "
 "configure console layout using X (XKB) definitions; you can then set your "
@@ -342,21 +337,20 @@ msgstr ""
 "francese con una tastiera TypeMatrix, sia in console sia in X11:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:69
+#: en/user_customization-runtime.ssi:71
+#, no-wrap
 msgid ""
-"$ lb config --bootappend-live \"locales=fr_FR.UTF-8 keyboard-layouts=fr "
-"keyboard-variant=bepo keyboard-model=tm2030usb\""
+" $ lb config --bootappend-live \\\n"
+"     \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
 msgstr ""
-"$ lb config --bootappend-live \"locales=fr_FR.UTF-8 keyboard-layouts=fr "
-"keyboard-variant=bepo keyboard-model=tm2030usb\""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:73
+#: en/user_customization-runtime.ssi:75
 msgid "2~persistence Persistence"
 msgstr "2~persistence Persistenza"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:75
+#: en/user_customization-runtime.ssi:77
 msgid ""
 "A live cd paradigm is a pre-installed system which runs from read-only "
 "media, like a cdrom, where writes and modifications do not survive reboots "
@@ -367,7 +361,7 @@ msgstr ""
 "ai riavvii dell'hardware della macchina ospitante."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:77
+#: en/user_customization-runtime.ssi:79
 msgid ""
 "A Debian Live system is a generalization of this paradigm and thus supports "
 "other media in addition to CDs; but still, in its default behaviour, it "
@@ -381,7 +375,7 @@ msgstr ""
 "spegnimento."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:79
+#: en/user_customization-runtime.ssi:81
 msgid ""
 "Persistence is a common name for different kinds of solutions for saving "
 "across reboots some, or all, of this run-time evolution of the system. To "
@@ -398,7 +392,7 @@ msgstr ""
 "sui ram disk non sopravvivono ai riavii."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:81
+#: en/user_customization-runtime.ssi:83
 msgid ""
 "The data stored on this ramdisk should be saved on a writable persistent "
 "medium like a Hard Disk, a USB key, a network share or even a session of a "
@@ -414,12 +408,12 @@ msgstr ""
 "all'avvio: #{persistent}#."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:85
 msgid "3~ Full persistence"
 msgstr "3~ Persistenza completa"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:87
 msgid ""
 "By 'full persistence' it is meant that instead of using a tmpfs for storing "
 "modifications to the read-only media (with the copy-on-write, COW, system) a "
@@ -439,12 +433,13 @@ msgstr ""
 "penna usb creata ad esempio con:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:89
-msgid "# mkfs.ext2 -L live-rw /dev/sdb1"
-msgstr "# mkfs.ext2 -L live-rw /dev/sdb1"
+#: en/user_customization-runtime.ssi:91
+#, no-wrap
+msgid " # mkfs.ext2 -L live-rw /dev/sdb1\n"
+msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:95
 msgid ""
 "If you already have a partition on your device, you could just change the "
 "label with one of the following:"
@@ -453,16 +448,15 @@ msgstr ""
 "l'etichetta con una delle seguenti:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:100
+#, no-wrap
 msgid ""
-"# tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems # dosfslabel /dev/"
-"sdb1 live-rw # for a fat filesystem"
+" # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
+" # dosfslabel /dev/sdb1 live-rw # for a fat filesystem\n"
 msgstr ""
-"# tune2fs -L live-rw /dev/sdb1 # per filesystem ext2,3,4 # dosfslabel /dev/"
-"sdb1 live-rw # per un filesystem fat"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:102
+#: en/user_customization-runtime.ssi:104
 msgid ""
 "But since live system users cannot always use a hard drive partition, and "
 "considering that most USB keys have poor write speeds, 'full' persistence "
@@ -479,16 +473,15 @@ msgstr ""
 "qualcosa come:"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:107
+#: en/user_customization-runtime.ssi:109
+#, no-wrap
 msgid ""
-"$ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file $ /"
-"sbin/mkfs.ext2 -F live-rw"
+" $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
+" $ /sbin/mkfs.ext2 -F live-rw\n"
 msgstr ""
-"$ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file $ /"
-"sbin/mkfs.ext2 -F live-rw"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:113
 msgid ""
 "Then copy the #{live-rw}# file to a writable partition and reboot with the "
 "boot parameter 'persistent'."
@@ -497,12 +490,12 @@ msgstr ""
 "con il parametro d'avvio \"persistent\"."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:113
+#: en/user_customization-runtime.ssi:115
 msgid "3~ Home automounting"
 msgstr "3~ Mount automatico della home"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:117
 msgid ""
 "If during the boot a partition (filesystem) image file or a partition "
 "labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
@@ -516,12 +509,12 @@ msgstr ""
 "persistenza completa."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:117
+#: en/user_customization-runtime.ssi:119
 msgid "3~ Snapshots"
 msgstr "3~ Istantanee"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:119
+#: en/user_customization-runtime.ssi:121
 msgid ""
 "Snapshots are collections of files and directories which are not mounted "
 "while running but which are copied from a persistent device to the system "
@@ -551,7 +544,7 @@ msgstr ""
 "basati su memoria flash."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:121
+#: en/user_customization-runtime.ssi:123
 msgid ""
 "A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
 "works the same as the main snapshot but it is only applied to /home."
@@ -560,7 +553,7 @@ msgstr ""
 "come la principale ma viene applicata solo ad /home."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:123
+#: en/user_customization-runtime.ssi:125
 msgid ""
 "Snapshots cannot currently handle file deletion but full persistence and "
 "home automounting can."
@@ -569,12 +562,12 @@ msgstr ""
 "contrario della persistenza completa e il mount automatico della home. "
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:125
+#: en/user_customization-runtime.ssi:127
 msgid "3~ Persistent SubText"
 msgstr "3~ Sottotesto persistente"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:127
+#: en/user_customization-runtime.ssi:129
 msgid ""
 "If a user would need multiple persistent storage of the same type for "
 "different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-"
@@ -593,12 +586,12 @@ msgstr ""
 "subtext=sottotesto}#."
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:129
+#: en/user_customization-runtime.ssi:131
 msgid "3~ Partial remastering"
 msgstr "3~ Rimasterizzazione parziale"
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:132
 msgid ""
 "The run-time modification of the tmpfs could be collected using live-"
 "snapshot in a squashfs and added to the cd by remastering the iso in the "
diff --git a/manual/po/it/user_examples.ssi.po b/manual/po/it/user_examples.ssi.po
index 0ac63dd..eed26bb 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: 2010-12-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-12-18 16:10+0100\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -44,7 +44,7 @@ msgstr ":B~ Esempi"
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -65,16 +65,16 @@ msgstr ":B~ Esempi"
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -107,8 +107,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -128,17 +128,17 @@ msgstr "code{"
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -153,9 +153,10 @@ msgstr "}code"
 
 #. type: Plain text
 #: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
-#: en/user_examples.ssi:109 en/user_examples.ssi:156 en/user_examples.ssi:208
-msgid "# lb build"
-msgstr "# lb build"
+#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#, no-wrap
+msgid " # lb build\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:4
@@ -216,12 +217,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:18
+#, no-wrap
 msgid ""
-"LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\" LB_MIRROR_CHROOT=\"http://"
-"mirror/debian\" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\""
+" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
+" LB_MIRROR_CHROOT=\"http://mirror/debian\"\n"
+" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
 msgstr ""
-"LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\" LB_MIRROR_CHROOT=\"http://"
-"mirror/debian\" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\""
 
 #. type: Plain text
 #: en/user_examples.ssi:22
@@ -252,8 +253,9 @@ msgstr "Non può essere più semplice:"
 
 #. type: Plain text
 #: en/user_examples.ssi:32
-msgid "$ mkdir tutorial1 ; cd tutorial1 ; lb config"
-msgstr "$ mkdir tutorial1 ; cd tutorial1 ; lb config"
+#, no-wrap
+msgid " $ mkdir tutorial1 ; cd tutorial1 ; lb config\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:36
@@ -274,9 +276,10 @@ msgstr ""
 "Ora, come super-utente, si generi l'immagine, salvando un log con #{tee}#."
 
 #. type: Plain text
-#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:230
-msgid "# lb build 2>&1 | tee binary.log"
-msgstr "# lb build 2>&1 | tee binary.log"
+#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:231
+#, no-wrap
+msgid " # lb build 2>&1 | tee binary.log\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:46
@@ -323,10 +326,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:56
-msgid ""
-"$ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel"
+#, no-wrap
+msgid " $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel\n"
 msgstr ""
-"$ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel"
 
 #. type: Plain text
 #: en/user_examples.ssi:60
@@ -398,12 +400,12 @@ msgstr "3~ Prima revisione"
 
 #. type: Plain text
 #: en/user_examples.ssi:84
+#, no-wrap
 msgid ""
-"$ mkdir -p tutorial3/auto $ cp /usr/share/live/build/examples/auto/* "
-"tutorial3/auto/ $ cd tutorial3"
+" $ mkdir -p tutorial3/auto\n"
+" $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/\n"
+" $ cd tutorial3\n"
 msgstr ""
-"$ mkdir -p tutorial3/auto $ cp /usr/share/live/build/examples/auto/* "
-"tutorial3/auto/ $ cd tutorial3"
 
 #. type: Plain text
 #: en/user_examples.ssi:88
@@ -412,26 +414,21 @@ msgstr "Modificare #{auto/config}# come segue:"
 
 #. type: Plain text
 #: en/user_examples.ssi:92 en/user_examples.ssi:141
-msgid "#!/bin/sh"
-msgstr "#!/bin/sh"
+#, no-wrap
+msgid " #!/bin/sh\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:99
 #, no-wrap
 msgid ""
-"lb config noauto \\\n"
-"    --architecture i386 \\\n"
-"    --linux-flavours 686 \\\n"
-"    --packages-lists lxde \\\n"
-"    --packages \"iceweasel xchat\" \\\n"
-"    \"${@}\"\n"
+" lb config noauto \\\n"
+"     --architecture i386 \\\n"
+"     --linux-flavours 686 \\\n"
+"     --packages-lists lxde \\\n"
+"     --packages \"iceweasel xchat\" \\\n"
+"     \"${@}\"\n"
 msgstr ""
-"lb config noauto \\\n"
-"    --architecture i386 \\\n"
-"    --linux-flavours 686 \\\n"
-"    --packages-lists lxde \\\n"
-"    --packages \"iceweasel xchat\" \\\n"
-"    \"${@}\"\n"
 
 #. type: Plain text
 #: en/user_examples.ssi:103
@@ -479,8 +476,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:121
-msgid "$ git init $ git add auto $ git commit -a -m \"Initial import.\""
-msgstr "$ git init $ git add auto $ git commit -a -m \"Initial import.\""
+#, no-wrap
+msgid ""
+" $ git init\n"
+" $ git add auto\n"
+" $ git commit -a -m \"Initial import.\"\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:125
@@ -512,8 +513,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:133
-msgid "# lb clean"
-msgstr "# lb clean"
+#, no-wrap
+msgid " # lb clean\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:137
@@ -524,19 +526,13 @@ msgstr "Si modifichi ora #{auto/config}# per aggiungere il pacchetto #{vlc}#:"
 #: en/user_examples.ssi:148
 #, no-wrap
 msgid ""
-"lb config noauto \\\n"
-"    --architecture i386 \\\n"
-"    --linux-flavours 686 \\\n"
-"    --packages-lists lxde \\\n"
-"    --packages \"iceweasel xchat vlc\" \\\n"
-"    \"${@}\"\n"
+" lb config noauto \\\n"
+"     --architecture i386 \\\n"
+"     --linux-flavours 686 \\\n"
+"     --packages-lists lxde \\\n"
+"     --packages \"iceweasel xchat vlc\" \\\n"
+"     \"${@}\"\n"
 msgstr ""
-"lb config noauto \\\n"
-"    --architecture i386 \\\n"
-"    --linux-flavours 686 \\\n"
-"    --packages-lists lxde \\\n"
-"    --packages \"iceweasel xchat vlc\" \\\n"
-"    \"${@}\"\n"
 
 #. type: Plain text
 #: en/user_examples.ssi:152
@@ -544,6 +540,11 @@ msgid "Build again:"
 msgstr "Compilare nuovamente:"
 
 #. type: Plain text
+#: en/user_examples.ssi:156
+msgid "# lb build"
+msgstr "# lb build"
+
+#. type: Plain text
 #: en/user_examples.ssi:160
 msgid "Test, and when you're satisfied, commit the next revision:"
 msgstr ""
@@ -552,8 +553,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:164
-msgid "$ git commit -a -m \"Adding vlc media player.\""
-msgstr "$ git commit -a -m \"Adding vlc media player.\""
+#, no-wrap
+msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:168
@@ -616,17 +618,12 @@ msgstr ""
 #: en/user_examples.ssi:184
 #, no-wrap
 msgid ""
-"$ mkdir vnc_kiosk_client\n"
-"$ cd vnc_kiosk_client\n"
-"$ lb config -a i386 -k 686 -p standard-x11 \\\n"
-"    --packages \"gdm3 metacity xvnc4viewer\" \\\n"
-"    --apt-recommends false\n"
+" $ mkdir vnc_kiosk_client\n"
+" $ cd vnc_kiosk_client\n"
+" $ lb config -a i386 -k 686 -p standard-x11 \\\n"
+"     --packages \"gdm3 metacity xvnc4viewer\" \\\n"
+"     --apt-recommends false\n"
 msgstr ""
-"$ mkdir vnc_kiosk_client\n"
-"$ cd vnc_kiosk_client\n"
-"$ lb config -a i386 -k 686 -p standard-x11 \\\n"
-"    --packages \"gdm3 metacity xvnc4viewer\" \\\n"
-"    --apt-recommends false\n"
 
 #. type: Plain text
 #: en/user_examples.ssi:188
@@ -642,22 +639,28 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:194
+#, no-wrap
 msgid ""
-"$ mkdir -p config/chroot_local-includes/etc/skel $ cat >config/chroot_local-"
-"includes/etc/skel/.xsession <<END #!/bin/sh"
+" $ mkdir -p config/chroot_local-includes/etc/skel\n"
+" $ cat >config/chroot_local-includes/etc/skel/.xsession <<END\n"
+" #!/bin/sh\n"
 msgstr ""
-"$ mkdir -p config/chroot_local-includes/etc/skel $ cat >config/chroot_local-"
-"includes/etc/skel/.xsession <<END #!/bin/sh"
 
 #. type: Plain text
 #: en/user_examples.ssi:197
-msgid "/usr/bin/metacity & /usr/bin/xvncviewer 192.168.1.2:1"
-msgstr "/usr/bin/metacity & /usr/bin/xvncviewer 192.168.1.2:1"
+#, no-wrap
+msgid ""
+" /usr/bin/metacity &\n"
+" /usr/bin/xvncviewer 192.168.1.2:1\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:200
-msgid "exit END"
-msgstr "exit END"
+#, no-wrap
+msgid ""
+" exit\n"
+" END\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:204
@@ -704,21 +707,20 @@ msgstr ""
 "{important}# che molto probabilmente produrrà un sistema live danneggiato."
 
 #. type: Plain text
-#: en/user_examples.ssi:222
+#: en/user_examples.ssi:223
+#, no-wrap
 msgid ""
-"$ lb config -k 486 -p minimal --binary-indices false --memtest none --apt-"
-"recommends false --includes none"
+" $ lb config -k 486 -p minimal --binary-indices false \\\n"
+"     --memtest none --apt-recommends false --includes none\n"
 msgstr ""
-"$ lb config -k 486 -p minimal --binary-indices false --memtest none --apt-"
-"recommends false --includes none"
 
 #. type: Plain text
-#: en/user_examples.ssi:226
+#: en/user_examples.ssi:227
 msgid "Now, build the image in the usual way:"
 msgstr "Costruire quindi l'immagine nel modo consueto:"
 
 #. type: Plain text
-#: en/user_examples.ssi:234
+#: en/user_examples.ssi:235
 msgid ""
 "On the author's system at time of writing, the above configuration produced "
 "a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
@@ -729,7 +731,7 @@ msgstr ""
 "prodotta dalla configurazione predefinita nel {Tutorial 1}#tutorial-1."
 
 #. type: Plain text
-#: en/user_examples.ssi:236
+#: en/user_examples.ssi:237
 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 "
@@ -759,18 +761,18 @@ msgstr ""
 "se le funzionalità sacrificate con ciascuna ottimizzazione valgono la pena."
 
 #. type: Plain text
-#: en/user_examples.ssi:238
+#: en/user_examples.ssi:239
 msgid "2~ A localized KDE desktop and installer"
 msgstr "2~ Un desktop KDE localizzato e l'installer"
 
 #. type: Plain text
-#: en/user_examples.ssi:240
+#: en/user_examples.ssi:241
 #, no-wrap
 msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
 msgstr "*{Caso d'uso:}* creare un'immagine con il desktop KDE, localizzato per il Brasiliano Portoghese che includa l'installatore.\n"
 
 #. type: Plain text
-#: en/user_examples.ssi:242
+#: en/user_examples.ssi:243
 msgid ""
 "We want to make an iso-hybrid image for i386 architecture using our "
 "preferred desktop, in this case KDE, containing all of the same packages "
@@ -782,7 +784,7 @@ msgstr ""
 "KDE."
 
 #. type: Plain text
-#: en/user_examples.ssi:244
+#: en/user_examples.ssi:245
 msgid ""
 "Our initial problem is the discovery of the names of the appropriate tasks. "
 "Currently, live-build cannot help with this. While we might get lucky and "
@@ -797,35 +799,30 @@ msgstr ""
 "di avere entrambi questi pacchetti:"
 
 #. type: Plain text
-#: en/user_examples.ssi:248
-msgid "# apt-get install dctrl-tools tasksel-data"
-msgstr "# apt-get install dctrl-tools tasksel-data"
+#: en/user_examples.ssi:249
+#, no-wrap
+msgid " # apt-get install dctrl-tools tasksel-data\n"
+msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:252
+#: en/user_examples.ssi:253
 msgid "Now we can search for the appropriate tasks, first with:"
 msgstr "Ora si possono cercare i task appropriati:"
 
 #. type: Plain text
-#: en/user_examples.ssi:261
+#: en/user_examples.ssi:262
 #, no-wrap
 msgid ""
-"$ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
-"Task: brazilian-portuguese\n"
-"Description: Brazilian Portuguese environment\n"
-" This task installs programs, data files, and\n"
-" documentation that make it easier for Brazilian Portuguese speakers\n"
-" to use Debian.\n"
+" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" Task: brazilian-portuguese\n"
+" Description: Brazilian Portuguese environment\n"
+"  This task installs programs, data files, and\n"
+"  documentation that make it easier for Brazilian Portuguese speakers\n"
+"  to use Debian.\n"
 msgstr ""
-"$ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
-"Task: brazilian-portuguese\n"
-"Description: Brazilian Portuguese environment\n"
-" This task installs programs, data files, and\n"
-" documentation that make it easier for Brazilian Portuguese speakers\n"
-" to use Debian.\n"
 
 #. type: Plain text
-#: en/user_examples.ssi:265
+#: en/user_examples.ssi:266
 msgid ""
 "By this command, we discover the task is called, plainly enough, brazilian-"
 "portuguese. Now to find the related tasks:"
@@ -834,33 +831,26 @@ msgstr ""
 "chiaramente, brazilian-portuguese. Ora per trovare i task correlati:"
 
 #. type: Plain text
-#: en/user_examples.ssi:272
+#: en/user_examples.ssi:273
 #, no-wrap
 msgid ""
-"$ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
-"Task: brazilian-portuguese-desktop\n"
-"Description: Brazilian Portuguese desktop\n"
-" This task localises the desktop in Brasilian Portuguese.\n"
+" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" Task: brazilian-portuguese-desktop\n"
+" Description: Brazilian Portuguese desktop\n"
+"  This task localises the desktop in Brasilian Portuguese.\n"
 msgstr ""
-"$ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
-"Task: brazilian-portuguese-desktop\n"
-"Description: Brazilian Portuguese desktop\n"
-" This task localises the desktop in Brasilian Portuguese.\n"
 
 #. type: Plain text
-#: en/user_examples.ssi:276
+#: en/user_examples.ssi:277
 #, no-wrap
 msgid ""
-"Task: brazilian-portuguese-kde-desktop\n"
-"Description: Brazilian Portuguese KDE desktop\n"
-" This task localises the KDE desktop in Brazilian Portuguese.\n"
+" Task: brazilian-portuguese-kde-desktop\n"
+" Description: Brazilian Portuguese KDE desktop\n"
+"  This task localises the KDE desktop in Brazilian Portuguese.\n"
 msgstr ""
-"Task: brazilian-portuguese-kde-desktop\n"
-"Description: Brazilian Portuguese KDE desktop\n"
-" This task localises the KDE desktop in Brazilian Portuguese.\n"
 
 #. type: Plain text
-#: en/user_examples.ssi:280
+#: en/user_examples.ssi:281
 msgid ""
 "We will use the experimental #{--language}# option, as live-build happens to "
 "include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
@@ -875,12 +865,12 @@ msgstr ""
 "mettiamo insieme i pezzi:"
 
 #. type: Plain text
-#: en/user_examples.ssi:294
+#: en/user_examples.ssi:295
 #, no-wrap
 msgid ""
-"$ mkdir live-pt_BR-kde\n"
-"$ cd live-pt_BR-kde\n"
-"$ lb config \\\n"
+" $ mkdir live-pt_BR-kde\n"
+" $ cd live-pt_BR-kde\n"
+" $ lb config \\\n"
 "     -a i386 \\\n"
 "     -k 486 \\\n"
 "     -p kde-desktop \\\n"
@@ -890,20 +880,9 @@ msgid ""
 "     --debian-installer live \\\n"
 "     --packages debian-installer-launcher\n"
 msgstr ""
-"$ mkdir live-pt_BR-kde\n"
-"$ cd live-pt_BR-kde\n"
-"$ lb config \\\n"
-"     -a i386 \\\n"
-"     -k 486 \\\n"
-"     -p kde-desktop \\\n"
-"     --language pt_BR \\\n"
-"     --tasks \"brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop\" \\\n"
-"     --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
-"     --debian-installer live \\\n"
-"     --packages debian-installer-launcher\n"
 
 #. type: Plain text
-#: en/user_examples.ssi:298
+#: en/user_examples.ssi:299
 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 "
diff --git a/manual/po/it/user_installation.ssi.po b/manual/po/it/user_installation.ssi.po
index fdbfa7e..7d1ce4b 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: 2010-12-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-12-17 18:00+0100\n"
 "Last-Translator: lillo sciascia <lillosciascia at gmail.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -39,7 +39,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -60,16 +60,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -102,8 +102,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -123,17 +123,17 @@ msgstr "code{"
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -148,8 +148,9 @@ msgstr "}code"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
-msgid "$ lb config --repository live.debian.net"
-msgstr "$ lb config --repository live.debian.net"
+#, no-wrap
+msgid " $ lb config --repository live.debian.net\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:2
@@ -253,8 +254,9 @@ msgstr "Installare live-build semplicemente come qualsiasi altro pacchetto:"
 
 #. type: Plain text
 #: en/user_installation.ssi:40
-msgid "# apt-get install live-build"
-msgstr "# apt-get install live-build"
+#, no-wrap
+msgid " # apt-get install live-build\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:44
@@ -263,8 +265,9 @@ msgstr "o"
 
 #. type: Plain text
 #: en/user_installation.ssi:48
-msgid "# aptitude install live-build"
-msgstr "# aptitude install live-build"
+#, no-wrap
+msgid " # aptitude install live-build\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:52 en/user_installation.ssi:108
@@ -284,8 +287,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:58
-msgid "$ git clone git://live.debian.net/git/live-build.git"
-msgstr "$ git clone git://live.debian.net/git/live-build.git"
+#, no-wrap
+msgid " $ git clone git://live.debian.net/git/live-build.git\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:62
@@ -295,8 +299,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:68
-msgid "$ cd live-build $ dpkg-buildpackage -rfakeroot -b -uc -us $ cd .."
-msgstr "$ cd live-build $ dpkg-buildpackage -rfakeroot -b -uc -us $ cd .."
+#, no-wrap
+msgid ""
+" $ cd live-build\n"
+" $ dpkg-buildpackage -rfakeroot -b -uc -us\n"
+" $ cd ..\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:72
@@ -309,8 +317,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:76
-msgid "# dpkg -i live-build_2.0.8-1_all.deb"
-msgstr "# dpkg -i live-build_2.0.8-1_all.deb"
+#, no-wrap
+msgid " # dpkg -i live-build_2.0.8-1_all.deb\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:80
@@ -321,8 +330,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:84
-msgid "# make install"
-msgstr "# make install"
+#, no-wrap
+msgid " # make install\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:88
@@ -331,8 +341,9 @@ msgstr "e disinstallarlo con:"
 
 #. type: Plain text
 #: en/user_installation.ssi:92
-msgid "# make uninstall"
-msgstr "# make uninstall"
+#, no-wrap
+msgid " # make uninstall\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:96 en/user_installation.ssi:142
@@ -387,12 +398,11 @@ msgstr "_* Scaricare i sorgenti di live-boot e live-config"
 
 #. type: Plain text
 #: en/user_installation.ssi:117
+#, no-wrap
 msgid ""
-"$ git clone git://live.debian.net/git/live-boot.git $ git clone git://live."
-"debian.net/git/live-config.git"
+" $ git clone git://live.debian.net/git/live-boot.git\n"
+" $ git clone git://live.debian.net/git/live-config.git\n"
 msgstr ""
-"$ git clone git://live.debian.net/git/live-boot.git $ git clone git://live."
-"debian.net/git/live-config.git"
 
 #. type: Plain text
 #: en/user_installation.ssi:121
@@ -440,12 +450,13 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:134
+#, no-wrap
 msgid ""
-"$ cd live-boot $ dpkg-buildpackage -b -uc -us $ cd ../live-config $ dpkg-"
-"buildpackage -b -uc -us"
+" $ cd live-boot\n"
+" $ dpkg-buildpackage -b -uc -us\n"
+" $ cd ../live-config\n"
+" $ dpkg-buildpackage -b -uc -us\n"
 msgstr ""
-"$ cd live-boot $ dpkg-buildpackage -b -uc -us $ cd ../live-config $ dpkg-"
-"buildpackage -b -uc -us"
 
 #. type: Plain text
 #: en/user_installation.ssi:138
diff --git a/manual/po/it/user_managing_a_configuration.ssi.po b/manual/po/it/user_managing_a_configuration.ssi.po
index 6f7ad8a..22b36f2 100644
--- a/manual/po/it/user_managing_a_configuration.ssi.po
+++ b/manual/po/it/user_managing_a_configuration.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-17 07:53-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-12-12 12:46+0100\n"
 "Last-Translator: lillo sciascia <lillosciascia at gmail.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -33,12 +33,12 @@ msgstr ""
 #: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
 #: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
 #: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_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_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -55,24 +55,25 @@ msgstr ""
 #: 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-runtime.ssi:14
+#: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi: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: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -96,12 +97,12 @@ msgstr "code{"
 #: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
 #: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
 #: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -118,24 +119,25 @@ msgstr "code{"
 #: 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-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi: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: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -270,15 +272,11 @@ msgstr "#{auto/config}#"
 #: en/user_managing_a_configuration.ssi:29
 #, no-wrap
 msgid ""
-"#!/bin/sh\n"
-"lb config noauto \\\n"
-"\t--packages-lists \"standard\" \\\n"
-"\t\"${@}\"\n"
+" #!/bin/sh\n"
+" lb config noauto \\\n"
+"     --packages-lists \"standard\" \\\n"
+"     \"${@}\"\n"
 msgstr ""
-"#!/bin/sh\n"
-"lb config noauto \\\n"
-"\t--packages-lists \"standard\" \\\n"
-"\t\"${@}\"\n"
 
 #. type: Plain text
 #: en/user_managing_a_configuration.ssi:33
@@ -289,17 +287,12 @@ msgstr "#{auto/clean}#"
 #: en/user_managing_a_configuration.ssi:41
 #, no-wrap
 msgid ""
-"#!/bin/sh\n"
-"lb clean noauto \"${@}\"\n"
-"rm -f config/binary config/bootstrap \\\n"
-"\tconfig/chroot config/common config/source\n"
-"rm -f binary.log\n"
+" #!/bin/sh\n"
+" lb clean noauto \"${@}\"\n"
+" rm -f config/binary config/bootstrap \\\n"
+"     config/chroot config/common config/source\n"
+" rm -f binary.log\n"
 msgstr ""
-"#!/bin/sh\n"
-"lb clean noauto \"${@}\"\n"
-"rm -f config/binary config/bootstrap \\\n"
-"\tconfig/chroot config/common config/source\n"
-"rm -f binary.log\n"
 
 #. type: Plain text
 #: en/user_managing_a_configuration.ssi:45
@@ -308,8 +301,11 @@ msgstr "#{auto/build}#"
 
 #. type: Plain text
 #: en/user_managing_a_configuration.ssi:50
-msgid "#!/bin/sh lb build noauto \"${@}\" 2>&1 | tee binary.log"
-msgstr "#!/bin/sh lb build noauto \"${@}\" 2>&1 | tee binary.log"
+#, no-wrap
+msgid ""
+" #!/bin/sh\n"
+" lb build noauto \"${@}\" 2>&1 | tee binary.log\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_managing_a_configuration.ssi:54
@@ -322,8 +318,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_managing_a_configuration.ssi:58
-msgid "$ cp /usr/share/live/build/examples/auto/* auto/"
-msgstr "$ cp /usr/share/live/build/examples/auto/* auto/"
+#, no-wrap
+msgid " $ cp /usr/share/live/build/examples/auto/* auto/\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_managing_a_configuration.ssi:62
diff --git a/manual/po/it/user_overview.ssi.po b/manual/po/it/user_overview.ssi.po
index 0186338..21e8ffd 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: 2010-12-17 07:53-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-12-16 16:45+0100\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -33,12 +33,12 @@ msgstr ""
 #: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
 #: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
 #: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_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_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -55,24 +55,25 @@ msgstr ""
 #: 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-runtime.ssi:14
+#: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi: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: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -96,12 +97,12 @@ msgstr "code{"
 #: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
 #: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
 #: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -118,24 +119,25 @@ msgstr "code{"
 #: 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-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi: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: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -302,62 +304,54 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:39
-msgid "$ lb config P: Creating config tree"
-msgstr "$ lb config P: Creating config tree"
+#, no-wrap
+msgid ""
+" $ lb config\n"
+" P: Creating config tree\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:44
+#, no-wrap
 msgid ""
-"$ ls -l total 8 drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto drwxr-xr-x 22 "
-"user user 4096 Sep 7 13:02 config"
+" $ ls -l\n"
+" total 8\n"
+" drwxr-xr-x  3 user user 4096 Sep  7 13:02 auto\n"
+" drwxr-xr-x 22 user user 4096 Sep  7 13:02 config\n"
 msgstr ""
-"$ ls -l total 8 drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto drwxr-xr-x 22 "
-"user user 4096 Sep 7 13:02 config"
 
 #. type: Plain text
 #: en/user_overview.ssi:72
+#, no-wrap
 msgid ""
-"$ ls -l config/ total 104 -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary "
-"drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer drwxr-xr-x 2 "
-"user user 4096 Sep 7 13:02 binary_debian-installer-includes drwxr-xr-x 2 "
-"user user 4096 Sep 7 13:02 binary_grub drwxr-xr-x 2 user user 4096 Sep 7 "
-"13:02 binary_local-debs drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-"
-"hooks drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes drwxr-xr-"
-"x 2 user user 4096 Sep 7 13:02 binary_local-packageslists drwxr-xr-x 2 user "
-"user 4096 Sep 7 13:02 binary_local-udebs drwxr-xr-x 2 user user 4096 Sep 7 "
-"13:02 binary_rootfs drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux -"
-"rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap -rw-r--r-- 1 user user 1647 "
-"Sep 7 13:02 chroot drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt drwxr-"
-"xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks drwxr-xr-x 2 user user "
-"4096 Sep 7 13:02 chroot_local-includes drwxr-xr-x 2 user user 4096 Sep 7 "
-"13:02 chroot_local-packages drwxr-xr-x 2 user user 4096 Sep 7 13:02 "
-"chroot_local-packageslists drwxr-xr-x 2 user user 4096 Sep 7 13:02 "
-"chroot_local-patches drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-"
-"preseed drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources -rw-r--r-- 1 "
-"user user 2954 Sep 7 13:02 common drwxr-xr-x 2 user user 4096 Sep 7 13:02 "
-"includes -rw-r--r-- 1 user user 205 Sep 7 13:02 source drwxr-xr-x 2 user "
-"user 4096 Sep 7 13:02 templates"
+" $ ls -l config/\n"
+" total 104\n"
+" -rw-r--r-- 1 user user 4197 Sep  7 13:02 binary\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_debian-installer\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_debian-installer-includes\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_grub\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-debs\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-hooks\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-includes\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-packageslists\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-udebs\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_rootfs\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_syslinux\n"
+" -rw-r--r-- 1 user user 2051 Sep  7 13:02 bootstrap\n"
+" -rw-r--r-- 1 user user 1647 Sep  7 13:02 chroot\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_apt\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-hooks\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-includes\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-packages\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-packageslists\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-patches\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-preseed\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_sources\n"
+" -rw-r--r-- 1 user user 2954 Sep  7 13:02 common\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 includes\n"
+" -rw-r--r-- 1 user user  205 Sep  7 13:02 source\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 templates\n"
 msgstr ""
-"$ ls -l config/ total 104 -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary "
-"drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer drwxr-xr-x 2 "
-"user user 4096 Sep 7 13:02 binary_debian-installer-includes drwxr-xr-x 2 "
-"user user 4096 Sep 7 13:02 binary_grub drwxr-xr-x 2 user user 4096 Sep 7 "
-"13:02 binary_local-debs drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-"
-"hooks drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes drwxr-xr-"
-"x 2 user user 4096 Sep 7 13:02 binary_local-packageslists drwxr-xr-x 2 user "
-"user 4096 Sep 7 13:02 binary_local-udebs drwxr-xr-x 2 user user 4096 Sep 7 "
-"13:02 binary_rootfs drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux -"
-"rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap -rw-r--r-- 1 user user 1647 "
-"Sep 7 13:02 chroot drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt drwxr-"
-"xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks drwxr-xr-x 2 user user "
-"4096 Sep 7 13:02 chroot_local-includes drwxr-xr-x 2 user user 4096 Sep 7 "
-"13:02 chroot_local-packages drwxr-xr-x 2 user user 4096 Sep 7 13:02 "
-"chroot_local-packageslists drwxr-xr-x 2 user user 4096 Sep 7 13:02 "
-"chroot_local-patches drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-"
-"preseed drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources -rw-r--r-- 1 "
-"user user 2954 Sep 7 13:02 common drwxr-xr-x 2 user user 4096 Sep 7 13:02 "
-"includes -rw-r--r-- 1 user user 205 Sep 7 13:02 source drwxr-xr-x 2 user "
-"user 4096 Sep 7 13:02 templates"
 
 #. type: Plain text
 #: en/user_overview.ssi:76
@@ -383,8 +377,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:82
-msgid "$ lb config -p gnome"
-msgstr "$ lb config -p gnome"
+#, no-wrap
+msgid " $ lb config -p gnome\n"
+msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:86
@@ -393,12 +388,9 @@ msgstr "È possibile specificare molte opzioni, come:"
 
 #. type: Plain text
 #: en/user_overview.ssi:90
-msgid ""
-"$ lb config --binary-images net --hostname live-machine --username live-"
-"user ..."
+#, no-wrap
+msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
 msgstr ""
-"$ lb config --binary-images net --hostname live-machine --username live-"
-"user ..."
 
 #. type: Plain text
 #: en/user_overview.ssi:94
diff --git a/manual/po/pt_BR/about_manual.ssi.po b/manual/po/pt_BR/about_manual.ssi.po
index 7a132fd..3910d1b 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: 2010-12-09 10:51-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\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"
@@ -360,31 +360,28 @@ msgstr ""
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
-#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
-#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
-#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
-#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
-#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
-#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/about_manual.ssi:170 en/project_bugs.ssi:58
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
-#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
-#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-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/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi: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_customization-installer.ssi:32
+#: en/user_customization-installer.ssi:43
+#: 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
@@ -394,27 +391,28 @@ msgstr ""
 #: en/user_customization-packages.ssi:199
 #: en/user_customization-packages.ssi:215
 #: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:290
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:312
-#: en/user_customization-packages.ssi:330 en/user_customization-runtime.ssi:14
+#: en/user_customization-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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:132 en/user_installation.ssi:147
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -431,31 +429,28 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
 #: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/other_faq.ssi:37 en/other_faq.ssi:46
-#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
-#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
-#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
-#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
-#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
-#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/about_manual.ssi:174 en/project_bugs.ssi:62
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70 en/user_customization-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/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi: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_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
@@ -464,27 +459,29 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
 #: en/user_customization-packages.ssi:191
 #: en/user_customization-packages.ssi:203
 #: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:294
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:316
-#: en/user_customization-packages.ssi:343 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:118
-#: en/user_installation.ssi:137 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -505,8 +502,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:94
-msgid "# apt-get install make po4a sisu-complete"
-msgstr "# apt-get install make po4a sisu-complete"
+#, no-wrap
+msgid " # apt-get install make po4a sisu-complete\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:98
@@ -519,8 +517,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:102
-msgid "$ make build"
-msgstr "$ make build"
+#, no-wrap
+msgid " $ make build\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:106
@@ -532,8 +531,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:110
-msgid "$ make build LANGUAGES=en"
-msgstr "$ make build LANGUAGES=en"
+#, no-wrap
+msgid " $ make build LANGUAGES=en\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:114
@@ -561,19 +561,13 @@ msgstr "_* Obter a chave publica de commit:"
 #: en/about_manual.ssi:127
 #, no-wrap
 msgid ""
-"$ mkdir -p ~/.ssh/identity.d\n"
-"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
-"\t-O ~/.ssh/identity.d/gitosis at live.debian.net\n"
-"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-"\t-O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
+" $ mkdir -p ~/.ssh/identity.d\n"
+" $ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
+"     -O ~/.ssh/identity.d/gitosis at live.debian.net\n"
+" $ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
+"     -O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
+" $ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
 msgstr ""
-"$ mkdir -p ~/.ssh/identity.d\n"
-"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
-"\t-O ~/.ssh/identity.d/gitosis at live.debian.net\n"
-"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-"\t-O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:131
@@ -584,19 +578,13 @@ msgstr "_* Adicione a seguinte sessão na configuração do seu openssh-client:"
 #: en/about_manual.ssi:140
 #, no-wrap
 msgid ""
-"$ cat >> ~/.ssh/config << EOF\n"
-"Host live.debian.net\n"
-"        Hostname live.debian.net\n"
-"        User gitosis\n"
-"        IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
-"EOF\n"
+" $ cat >> ~/.ssh/config << EOF\n"
+" Host live.debian.net\n"
+"     Hostname live.debian.net\n"
+"     User gitosis\n"
+"     IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
+" EOF\n"
 msgstr ""
-"$ cat >> ~/.ssh/config << EOF\n"
-"Host live.debian.net\n"
-"        Hostname live.debian.net\n"
-"        User gitosis\n"
-"        IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
-"EOF\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:144
@@ -605,8 +593,9 @@ msgstr "_* Fazer o checkout de um clone do manual por ssh:"
 
 #. type: Plain text
 #: en/about_manual.ssi:148
-msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
-msgstr "$ git clone gitosis at live.debian.net:/live-manual.git"
+#, no-wrap
+msgid " $ git clone gitosis at live.debian.net:/live-manual.git\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:152
@@ -621,8 +610,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:156
-msgid "$ make commit"
-msgstr "$ make commit"
+#, no-wrap
+msgid " $ make commit\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:160
@@ -639,7 +629,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:164
-msgid "$ git commit -a -m \"Adding a section on applying patches.\""
+#, no-wrap
+msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -649,8 +640,9 @@ msgstr "_* Enviar as submissões para os servidor."
 
 #. type: Plain text
 #: en/about_manual.ssi:172
-msgid "$ git push"
-msgstr "$ git push"
+#, no-wrap
+msgid " $ git push\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:176
diff --git a/manual/po/pt_BR/project_bugs.ssi.po b/manual/po/pt_BR/project_bugs.ssi.po
index 4015b4b..010d47f 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-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-25 23:27+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -58,16 +58,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -100,8 +100,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -121,17 +121,17 @@ msgstr "code{"
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -323,7 +323,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:60
-msgid "# lb build 2>&1 | tee build.log"
+#, no-wrap
+msgid " # lb build 2>&1 | tee build.log\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/pt_BR/project_coding-style.ssi.po b/manual/po/pt_BR/project_coding-style.ssi.po
index cc265d2..73686a5 100644
--- a/manual/po/pt_BR/project_coding-style.ssi.po
+++ b/manual/po/pt_BR/project_coding-style.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-17 14:37+0100\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-11-30 11:05+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -54,24 +54,25 @@ msgstr ""
 #: 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-runtime.ssi:14
+#: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi: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: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -99,8 +100,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -117,24 +118,25 @@ msgstr "code{"
 #: 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-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi: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: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -214,9 +216,9 @@ msgstr ""
 #: en/project_coding-style.ssi:32
 #, no-wrap
 msgid ""
-"if foo; then\n"
-"        bar\n"
-"fi\n"
+" if foo; then\n"
+"         bar\n"
+" fi\n"
 msgstr ""
 
 #. type: Plain text
@@ -229,10 +231,10 @@ msgstr ""
 #: en/project_coding-style.ssi:43
 #, no-wrap
 msgid ""
-"if foo\n"
-"then\n"
-"        bar\n"
-"fi\n"
+" if foo\n"
+" then\n"
+"         bar\n"
+" fi\n"
 msgstr ""
 
 #. type: Plain text
@@ -244,19 +246,19 @@ msgstr ""
 #: en/project_coding-style.ssi:55
 #, no-wrap
 msgid ""
-"foo () {\n"
-"        bar\n"
-"}\n"
+" foo () {\n"
+"         bar\n"
+" }\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:66
 #, no-wrap
 msgid ""
-"foo ()\n"
-"{\n"
-"        bar\n"
-"}\n"
+" foo ()\n"
+" {\n"
+"         bar\n"
+" }\n"
 msgstr ""
 
 #. type: Plain text
@@ -321,12 +323,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:94
-msgid "FOO=bar"
+#, no-wrap
+msgid " FOO=bar\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:102
-msgid "FOO=\"bar\""
+#, no-wrap
+msgid " FOO=\"bar\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -338,20 +342,20 @@ msgstr ""
 #: en/project_coding-style.ssi:115
 #, no-wrap
 msgid ""
-"if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
-"then\n"
-"        foobar\n"
-"fi\n"
+" if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
+" then\n"
+"         foobar\n"
+" fi\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:126
 #, no-wrap
 msgid ""
-"if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
-"then\n"
-"        foobar\n"
-"fi\n"
+" if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
+" then\n"
+"         foobar\n"
+" fi\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/pt_BR/project_procedures.ssi.po b/manual/po/pt_BR/project_procedures.ssi.po
index 5a078a0..33678b6 100644
--- a/manual/po/pt_BR/project_procedures.ssi.po
+++ b/manual/po/pt_BR/project_procedures.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 18:55-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-11-30 10:35+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -58,16 +58,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -100,8 +100,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -121,17 +121,17 @@ msgstr "code{"
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -173,7 +173,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:14
-msgid "$ ../../scripts/l10n/output-l10n-changes . -d"
+#, no-wrap
+msgid " $ ../../scripts/l10n/output-l10n-changes . -d\n"
 msgstr ""
 
 #. type: Plain text
@@ -257,11 +258,11 @@ msgstr ""
 #: en/project_procedures.ssi:52
 #, no-wrap
 msgid ""
-"$ sed \\\n"
-"  -e 's|%major%|5.0|g' \\\n"
-"  -e 's|%minor%|5.0.2|g' \\\n"
-"  -e 's|%codename%|lenny|g' \\\n"
-"  -e 's|%release_mail%|2009/msg00007.html|g'\n"
+" $ sed \\\n"
+"     -e 's|%major%|5.0|g' \\\n"
+"     -e 's|%minor%|5.0.2|g' \\\n"
+"     -e 's|%codename%|lenny|g' \\\n"
+"     -e 's|%release_mail%|2009/msg00007.html|g'\n"
 msgstr ""
 
 #. type: Plain text
@@ -273,166 +274,179 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:60
-msgid "Debian Live images for Debian GNU/Linux %major% updated"
+#, no-wrap
+msgid " Debian Live images for Debian GNU/Linux %major% updated\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:64
+#, no-wrap
 msgid ""
-"The Debian Live project is pleased to announce the availability of updated "
-"Live images for its stable distribution Debian GNU/Linux %major% (codename "
-"\"%codename%\")."
+" The Debian Live project is pleased to announce the availability of\n"
+" updated Live images for its stable distribution Debian GNU/Linux %major%\n"
+" (codename \"%codename%\").\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:66
-msgid "The images are available for download at:"
+#, no-wrap
+msgid " The images are available for download at:\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:68
 #, no-wrap
-msgid "    <http://cdimage.debian.org/cdimage/release/current-live/>\n"
+msgid "     <http://cdimage.debian.org/cdimage/release/current-live/>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:73
+#, no-wrap
 msgid ""
-"This update incorporates the changes made in the %minor% point release, "
-"which adds corrections for security problems to the stable release along "
-"with a few adjustments for serious problems. A full list of the changes may "
-"be viewed at:"
+" This update incorporates the changes made in the %minor% point release,\n"
+" which adds corrections for security problems to the stable release\n"
+" along with a few adjustments for serious problems. A full list of the\n"
+" changes may be viewed at:\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:75
 #, no-wrap
-msgid "    <http://lists.debian.org/debian-announce/%release_mail%>\n"
+msgid "     <http://lists.debian.org/debian-announce/%release_mail%>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:77
-msgid "It also includes the following Live-specific changes:"
+#, no-wrap
+msgid " It also includes the following Live-specific changes:\n"
 msgstr ""
 
-#. type: Bullet: ' * '
+#. type: Bullet: '  * '
 #: en/project_procedures.ssi:81
 msgid "[INSERT LIVE-SPECIFIC CHANGE HERE]"
 msgstr ""
 
-#. type: Bullet: ' * '
+#. type: Bullet: '  * '
 #: en/project_procedures.ssi:81
 msgid "[LARGER ISSUES MAY DESERVE THEIR OWN SECTION]"
 msgstr ""
 
 #. type: Plain text
-#: en/project_procedures.ssi:84
+#: en/project_procedures.ssi:85
 #, no-wrap
 msgid ""
-"URLs\n"
-"----\n"
+" URLs\n"
+" ----\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:87
-msgid "Download location of updated images:"
+#, no-wrap
+msgid " Download location of updated images:\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:89
 #, no-wrap
-msgid "  <http://cdimage.debian.org/cdimage/release/current-live/>\n"
+msgid "   <http://cdimage.debian.org/cdimage/release/current-live/>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:91
-msgid "Debian Live project homepage:"
-msgstr "Projeto Debian Live Homepage:"
+#, no-wrap
+msgid " Debian Live project homepage:\n"
+msgstr " Projeto Debian Live Homepage:\n"
 
 #. type: Plain text
 #: en/project_procedures.ssi:93
 #, no-wrap
-msgid "  <http://live.debian.net/>\n"
+msgid "   <http://live.debian.net/>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:95
-msgid "The current stable distribution:"
+#, no-wrap
+msgid " The current stable distribution:\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:97
 #, no-wrap
-msgid "  <http://ftp.debian.org/debian/dists/stable>\n"
+msgid "   <http://ftp.debian.org/debian/dists/stable>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:99
-msgid "stable distribution information (release notes, errata etc.):"
+#, no-wrap
+msgid " stable distribution information (release notes, errata etc.):\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:101
 #, no-wrap
-msgid "  <http://www.debian.org/releases/stable/>\n"
+msgid "   <http://www.debian.org/releases/stable/>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:103
-msgid "Security announcements and information:"
+#, no-wrap
+msgid " Security announcements and information:\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:105
 #, no-wrap
-msgid "  <http://www.debian.org/security/>\n"
+msgid "   <http://www.debian.org/security/>\n"
 msgstr ""
 
 #. type: Plain text
-#: en/project_procedures.ssi:108
+#: en/project_procedures.ssi:109
 #, no-wrap
 msgid ""
-"About Debian\n"
-"-------------\n"
+" About Debian\n"
+" -------------\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:113
+#, no-wrap
 msgid ""
-"The Debian Project is an association of Free Software developers who "
-"volunteer their time and effort in order to produce the completely free "
-"operating system Debian GNU/Linux."
+" The Debian Project is an association of Free Software developers who\n"
+" volunteer their time and effort in order to produce the completely free\n"
+" operating system Debian GNU/Linux.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/project_procedures.ssi:116
+#: en/project_procedures.ssi:117
 #, no-wrap
 msgid ""
-"About Debian Live\n"
-"-----------------\n"
+" About Debian Live\n"
+" -----------------\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:122
+#, no-wrap
 msgid ""
-"Debian Live is an official sub-project of Debian which produces Debian "
-"systems that do not require a classical installer. Images are available for "
-"CD/DVD discs, USB sticks and PXE netbooting as well as a bare filesystem "
-"images for booting directly from the internet."
+" Debian Live is an official sub-project of Debian which produces Debian\n"
+" systems that do not require a classical installer. Images are available\n"
+" for CD/DVD discs, USB sticks and PXE netbooting as well as a bare\n"
+" filesystem images for booting directly from the internet.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/project_procedures.ssi:125
+#: en/project_procedures.ssi:126
 #, no-wrap
 msgid ""
-"Contact Information\n"
-"-------------------\n"
+" Contact Information\n"
+" -------------------\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:130
+#, no-wrap
 msgid ""
-"For further information, please visit the Debian Live web pages at <http://"
-"live.debian.net/> or alternatively send mail to <debian-live at lists.debian."
-"org>."
+" For further information, please visit the Debian Live web pages at\n"
+" <http://live.debian.net/> or alternatively send mail to\n"
+" <debian-live at lists.debian.org>.\n"
 msgstr ""
diff --git a/manual/po/pt_BR/user_basics.ssi.po b/manual/po/pt_BR/user_basics.ssi.po
index f0b147e..162f488 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: 2010-12-19 10:06-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-20 06:53-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -57,17 +57,17 @@ msgstr ""
 #: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_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:188
-#: en/user_examples.ssi:204 en/user_examples.ssi:218 en/user_examples.ssi:226
-#: en/user_examples.ssi:244 en/user_examples.ssi:252 en/user_examples.ssi:265
-#: en/user_examples.ssi:280 en/user_installation.ssi:38
+#: 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
@@ -100,8 +100,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -120,18 +120,18 @@ msgstr "code{"
 #: 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:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_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:184 en/user_examples.ssi:200
-#: en/user_examples.ssi:208 en/user_examples.ssi:222 en/user_examples.ssi:230
-#: en/user_examples.ssi:248 en/user_examples.ssi:261 en/user_examples.ssi:276
-#: en/user_examples.ssi:294 en/user_installation.ssi:42
+#: 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
@@ -262,7 +262,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:32
-msgid "$ lb config"
+#, no-wrap
+msgid " $ lb config\n"
 msgstr ""
 
 #. type: Plain text
@@ -281,8 +282,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
-#: en/user_examples.ssi:109 en/user_examples.ssi:156 en/user_examples.ssi:206
-msgid "# lb build"
+#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#, no-wrap
+msgid " # lb build\n"
 msgstr ""
 
 #. type: Plain text
@@ -304,12 +306,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:54 en/user_basics.ssi:142
-msgid "# apt-get install qemu"
+#, no-wrap
+msgid " # apt-get install qemu\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:56
-msgid "$ qemu -cdrom binary.iso"
+#, no-wrap
+msgid " $ qemu -cdrom binary.iso\n"
 msgstr ""
 
 #. type: Plain text
@@ -324,12 +328,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:66
-msgid "# apt-get install virtualbox-ose virtualbox-ose-dkms"
+#, no-wrap
+msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:68
-msgid "$ virtualbox"
+#, no-wrap
+msgid " $ virtualbox\n"
 msgstr ""
 
 #. type: Plain text
@@ -350,7 +356,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:78
-msgid "# lb config --packages virtualbox-ose-guest-x11"
+#, no-wrap
+msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
 msgstr ""
 
 #. type: Plain text
@@ -365,12 +372,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:88
-msgid "# apt-get install wodim"
+#, no-wrap
+msgid " # apt-get install wodim\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:90
-msgid "$ wodim binary.iso"
+#, no-wrap
+msgid " $ wodim binary.iso\n"
 msgstr ""
 
 #. type: Plain text
@@ -399,8 +408,9 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:102
-msgid "$ lb clean --binary"
+#: en/user_basics.ssi:102 en/user_basics.ssi:184
+#, no-wrap
+msgid " # lb clean --binary\n"
 msgstr ""
 
 #. type: Plain text
@@ -412,7 +422,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:110
-msgid "$ lb config -b usb-hdd"
+#, no-wrap
+msgid " $ lb config -b usb-hdd\n"
 msgstr ""
 
 #. type: Plain text
@@ -435,7 +446,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:128
-msgid "$ dd if=binary.img of=${USBSTICK}"
+#, no-wrap
+msgid " $ dd if=binary.img of=${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
@@ -467,7 +479,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:144
-msgid "$ qemu -hda binary.img"
+#, no-wrap
+msgid " $ qemu -hda binary.img\n"
 msgstr ""
 
 #. type: Plain text
@@ -486,7 +499,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:154
-msgid "# gparted ${USBSTICK}"
+#, no-wrap
+msgid " # gparted ${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
@@ -498,7 +512,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:162
-msgid "# mkfs.ext4 ${USBSTICK}"
+#, no-wrap
+msgid " # mkfs.ext4 ${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
@@ -508,7 +523,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:170
-msgid "# mkfs.vfat -F 32"
+#, no-wrap
+msgid " # mkfs.vfat -F 32\n"
 msgstr ""
 
 #. type: Plain text
@@ -538,11 +554,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:184
-msgid "# lb clean --binary"
-msgstr ""
-
-#. type: Plain text
 #: en/user_basics.ssi:188
 msgid ""
 "Run the #{lb config}# command as follows to configure your image for "
@@ -551,9 +562,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:192
-msgid ""
-"$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
-"\"192.168.0.1\""
+#, no-wrap
+msgid " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -616,39 +626,46 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:220
-msgid "# /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server"
+#, no-wrap
+msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:222
-msgid "ddns-update-style none;"
+#, no-wrap
+msgid " ddns-update-style none;\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:225
+#, no-wrap
 msgid ""
-"option domain-name \"example.org\"; option domain-name-servers ns1.example."
-"org, ns2.example.org;"
+" option domain-name \"example.org\";\n"
+" option domain-name-servers ns1.example.org, ns2.example.org;\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:228
-msgid "default-lease-time 600; max-lease-time 7200;"
+#, no-wrap
+msgid ""
+" default-lease-time 600;\n"
+" max-lease-time 7200;\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:230
-msgid "log-facility local7;"
+#, no-wrap
+msgid " log-facility local7;\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:236
 #, no-wrap
 msgid ""
-"subnet 192.168.0.0 netmask 255.255.255.0 {\n"
-"  range 192.168.0.1 192.168.0.254;\n"
-"  next-server servername;\n"
-"  filename \"pxelinux.0\";\n"
+" subnet 192.168.0.0 netmask 255.255.255.0 {\n"
+"   range 192.168.0.1 192.168.0.254;\n"
+"   next-server servername;\n"
+"   filename \"pxelinux.0\";\n"
 "}\n"
 msgstr ""
 
@@ -672,7 +689,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:248
-msgid "# dpkg-reconfigure -plow tftpd-hpa"
+#, no-wrap
+msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
 msgstr ""
 
 #. type: Plain text
@@ -707,7 +725,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:264
-msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
+#, no-wrap
+msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
 msgstr ""
 
 #. type: Plain text
@@ -718,7 +737,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:272
-msgid "# exportfs -rv"
+#, no-wrap
+msgid " # exportfs -rv\n"
 msgstr ""
 
 #. type: Plain text
@@ -767,11 +787,16 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:299
+#, no-wrap
 msgid ""
-"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
-"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
-"sudo /sbin/ifconfig $1 0.0.0.0 promisc up echo \"Adding $1 to br0...\" sudo /"
-"usr/sbin/brctl addif br0 $1 sleep 2"
+" #!/bin/sh\n"
+" sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1\n"
+" echo \"Executing /etc/qemu-ifup\"\n"
+" echo \"Bringing up $1 for bridged mode...\"\n"
+" sudo /sbin/ifconfig $1 0.0.0.0 promisc up\n"
+" echo \"Adding $1 to br0...\"\n"
+" sudo /usr/sbin/brctl addif br0 $1\n"
+" sleep 2\n"
 msgstr ""
 
 #. type: Plain text
@@ -809,34 +834,50 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:321
+#, no-wrap
 msgid ""
-"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
-"\"512\" MemAllowAutoScaleDown = \"FALSE\""
+" #!/usr/bin/vmware\n"
+" config.version = \"8\"\n"
+" virtualHW.version = \"4\"\n"
+" memsize = \"512\"\n"
+" MemAllowAutoScaleDown = \"FALSE\"\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:327
+#, no-wrap
 msgid ""
-"ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
-"\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
+" ide0:0.present = \"FALSE\"\n"
+" ide1:0.present = \"FALSE\"\n"
+" floppy0.present = \"FALSE\"\n"
+" sound.present = \"FALSE\"\n"
+" tools.remindInstall = \"FALSE\"\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:330
-msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
+#, no-wrap
+msgid ""
+" ethernet0.present = \"TRUE\"\n"
+" ethernet0.addressType = \"generated\"\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:333
-msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
+#, no-wrap
+msgid ""
+" displayName = \"Test Boot PXE\"\n"
+" guestOS = \"other\"\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:338
+#, no-wrap
 msgid ""
-"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
-"83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
-"de 3f-ae 9e 07 91 1d 8d 71 3b\" ethernet0.generatedAddressOffset = \"0\""
+" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\"\n"
+" uuid.location = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
+" uuid.bios = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
+" ethernet0.generatedAddressOffset = \"0\"\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-contents.ssi.po b/manual/po/pt_BR/user_customization-contents.ssi.po
index 5f1c528..b98204f 100644
--- a/manual/po/pt_BR/user_customization-contents.ssi.po
+++ b/manual/po/pt_BR/user_customization-contents.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-10 16:54-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-22 07:52-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -20,28 +20,24 @@ msgstr ""
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
-#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
-#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
-#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
-#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
-#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
-#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/about_manual.ssi:170 en/project_bugs.ssi:58
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
-#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
-#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi: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_customization-installer.ssi:32
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -55,27 +51,28 @@ msgstr ""
 #: en/user_customization-packages.ssi:199
 #: en/user_customization-packages.ssi:215
 #: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:290
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:312
-#: en/user_customization-packages.ssi:330 en/user_customization-runtime.ssi:14
+#: en/user_customization-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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:132 en/user_installation.ssi:147
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi: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_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 +84,24 @@ msgstr "code{"
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
 #: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/other_faq.ssi:37 en/other_faq.ssi:46
-#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
-#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
-#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
-#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
-#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
-#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/about_manual.ssi:174 en/project_bugs.ssi:62
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi: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_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
@@ -121,27 +114,29 @@ msgstr "code{"
 #: en/user_customization-packages.ssi:191
 #: en/user_customization-packages.ssi:203
 #: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:294
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:316
-#: en/user_customization-packages.ssi:343 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:118
-#: en/user_installation.ssi:137 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -244,9 +239,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:29
+#, no-wrap
 msgid ""
-"$ mkdir -p config/chroot_local-includes/var/www $ cp /path/to/my/index.html "
-"config/chroot_local-includes/var/www"
+" $ mkdir -p config/chroot_local-includes/var/www\n"
+" $ cp /path/to/my/index.html config/chroot_local-includes/var/www\n"
 msgstr ""
 
 #. type: Plain text
@@ -258,14 +254,14 @@ msgstr ""
 #: en/user_customization-contents.ssi:44
 #, no-wrap
 msgid ""
-"-- config\n"
-"   [...]\n"
-"    |-- chroot_local-includes\n"
-"    |   `-- var\n"
-"    |       `-- www\n"
-"    |           `-- index.html\n"
-"   [...]\n"
-"    `-- templates\n"
+" -- config\n"
+"    [...]\n"
+"     |-- chroot_local-includes\n"
+"     |   `-- var\n"
+"     |       `-- www\n"
+"     |           `-- index.html\n"
+"    [...]\n"
+"     `-- templates\n"
 msgstr ""
 
 #. type: Plain text
@@ -294,7 +290,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:56
-msgid "$ cp ~/video_demo.* config/binary_local-includes/"
+#, no-wrap
+msgid " $ cp ~/video_demo.* config/binary_local-includes/\n"
 msgstr ""
 
 #. type: Plain text
@@ -316,7 +313,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:68
-msgid "$ lb config --includes none"
+#, no-wrap
+msgid " $ lb config --includes none\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 2219eb2..7241f33 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: 2010-12-16 08:39-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-11-30 10:53+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -32,12 +32,12 @@ msgstr ""
 #: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
 #: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
 #: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_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_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -54,24 +54,25 @@ msgstr ""
 #: 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-runtime.ssi:14
+#: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi: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: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -95,12 +96,12 @@ msgstr "code{"
 #: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
 #: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
 #: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -117,24 +118,25 @@ msgstr "code{"
 #: 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-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi: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: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -251,19 +253,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:34
+#: en/user_customization-installer.ssi:35
+#, no-wrap
 msgid ""
-"$ lb config --architecture i386 --linux-flavours 486 --debian-installer live "
-"--packages debian-installer-launcher"
+" $ lb config --architecture i386 --linux-flavours 486 \\\n"
+"     --debian-installer live --packages debian-installer-launcher\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:39
 msgid "2~ Customizing Debian Installer by preseeding"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:40
+#: en/user_customization-installer.ssi:41
 msgid ""
 "As described in the Debian Installer Manual, Appendix B at http://www.debian."
 "org/releases/stable/i386/apb.html, \"Preseeding provides a way to set "
@@ -277,19 +280,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:44
+#: en/user_customization-installer.ssi:46
+#, no-wrap
 msgid ""
-"$ echo \"d-i debian-installer/locale string en_US\" >> config/binary_debian-"
-"installer/preseed.cfg"
+" $ echo \"d-i debian-installer/locale string en_US\" \\\n"
+"     >> config/binary_debian-installer/preseed.cfg\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:50
 msgid "2~ Customizing Debian Installer content"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:50
+#: en/user_customization-installer.ssi:52
 msgid ""
 "For experimental or debugging purposes, you might want to include locally "
 "built #{d-i}# component udeb packages. Place these in #{config/binary_local-"
diff --git a/manual/po/pt_BR/user_customization-packages.ssi.po b/manual/po/pt_BR/user_customization-packages.ssi.po
index dafdcd6..6972949 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: 2010-12-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-22 08:58-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -58,16 +58,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -100,8 +100,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -121,17 +121,17 @@ msgstr "code{"
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -200,7 +200,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:16
-msgid "$ lb config --distribution sid"
+#, no-wrap
+msgid " $ lb config --distribution sid\n"
 msgstr ""
 
 #. type: Plain text
@@ -215,7 +216,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:24
-msgid "$ lb config --archive-areas \"main contrib\""
+#, no-wrap
+msgid " $ lb config --archive-areas \"main contrib\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -274,8 +276,8 @@ msgstr ""
 #: en/user_customization-packages.ssi:43
 #, no-wrap
 msgid ""
-"$ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
-"            --mirror-chroot-security http://localhost/debian-security/\n"
+" $ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
+"             --mirror-chroot-security http://localhost/debian-security/\n"
 msgstr ""
 
 #. type: Plain text
@@ -307,8 +309,8 @@ msgstr ""
 #: en/user_customization-packages.ssi:56
 #, no-wrap
 msgid ""
-"$ lb config --mirror-binary http://mirror/debian/ \\\n"
-"            --mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --mirror-binary http://mirror/debian/ \\\n"
+"             --mirror-binary-security http://mirror/debian-security/\n"
 msgstr ""
 
 #. type: Plain text
@@ -338,7 +340,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:68
-msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
+#, no-wrap
+msgid " deb http://live.debian.net/ sid-snapshots main contrib non-free\n"
 msgstr ""
 
 #. type: Plain text
@@ -371,7 +374,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
-msgid "$ lb config --repository live.debian.net"
+#, no-wrap
+msgid " $ lb config --repository live.debian.net\n"
 msgstr ""
 
 #. type: Plain text
@@ -406,7 +410,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:96
-msgid "$ lb config --packages \"package1 package2 package3\""
+#, no-wrap
+msgid " $ lb config --packages \"package1 package2 package3\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -457,7 +462,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:114
-msgid "$ lb config --packages-lists \"gnome-core rescue\""
+#, no-wrap
+msgid " $ lb config --packages-lists \"gnome-core rescue\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -553,7 +559,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:145
-msgid "#include <gnome> iceweasel"
+#, no-wrap
+msgid ""
+" #include <gnome>\n"
+" iceweasel\n"
 msgstr ""
 
 #. type: Plain text
@@ -581,7 +590,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:159
-msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
+#, no-wrap
+msgid ""
+" #if ARCHITECTURE amd64\n"
+" ia32-libs\n"
+" #endif\n"
 msgstr ""
 
 #. type: Plain text
@@ -593,7 +606,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:169
-msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
+#, no-wrap
+msgid ""
+" #if ARCHITECTURE i386 amd64\n"
+" memtest86+\n"
+" #endif\n"
 msgstr ""
 
 #. type: Plain text
@@ -606,7 +623,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:179
-msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
+#, no-wrap
+msgid ""
+" #if ARCHIVE_AREAS contrib non-free\n"
+" vrms\n"
+" #endif\n"
 msgstr ""
 
 #. type: Plain text
@@ -616,7 +637,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:189
-msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
+#, no-wrap
+msgid ""
+" #if ARCHITECTURE amd64\n"
+" #include <gnome-full>\n"
+" #endif\n"
 msgstr ""
 
 #. type: Plain text
@@ -642,7 +667,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:201
-msgid "$ lb config --tasks \"mail-server file-server\""
+#, no-wrap
+msgid " $ lb config --tasks \"mail-server file-server\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -690,8 +716,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:217
-msgid ""
-"$ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\""
+#, no-wrap
+msgid " $ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -724,7 +750,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:229
-msgid "$ lb config --language es"
+#, no-wrap
+msgid " $ lb config --language es\n"
 msgstr ""
 
 #. type: Plain text
@@ -941,7 +968,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:293
-msgid "$ lb config --apt-http-proxy http://proxy/"
+#, no-wrap
+msgid " $ lb config --apt-http-proxy http://proxy/\n"
 msgstr ""
 
 #. type: Plain text
@@ -966,7 +994,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:305
-msgid "$ lb config --binary-indices false"
+#, no-wrap
+msgid " $ lb config --binary-indices false\n"
 msgstr ""
 
 #. type: Plain text
@@ -988,7 +1017,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:315
-msgid "$ lb config --apt-recommends false"
+#, no-wrap
+msgid " $ lb config --apt-recommends false\n"
 msgstr ""
 
 #. type: Plain text
@@ -1047,15 +1077,23 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:337
+#, no-wrap
 msgid ""
-"$ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid."
-"chroot $ cat >>config/chroot_apt/preferences <<END Package: live-* Pin: "
-"release n=sid Pin-Priority: 600"
+" $ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid.chroot\n"
+" $ cat >>config/chroot_apt/preferences <<END\n"
+" Package: live-*\n"
+" Pin: release n=sid\n"
+" Pin-Priority: 600\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:342
-msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
+#, no-wrap
+msgid ""
+" Package: *\n"
+" Pin: release n=sid\n"
+" Pin-Priority: 1\n"
+" END\n"
 msgstr ""
 
 #. type: Plain text
@@ -1071,5 +1109,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:352
-msgid "Package: gnome-keyring Pin: version * Pin-Priority: -1"
+#, no-wrap
+msgid ""
+" Package: gnome-keyring\n"
+" Pin: version *\n"
+" Pin-Priority: -1\n"
 msgstr ""
diff --git a/manual/po/pt_BR/user_customization-runtime.ssi.po b/manual/po/pt_BR/user_customization-runtime.ssi.po
index fd7a945..f1571ef 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: 2010-12-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-11-30 11:40+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -58,16 +58,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -100,8 +100,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -121,17 +121,17 @@ msgstr "code{"
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -188,9 +188,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:16
-msgid ""
-"debconf passwd/user-default-groups string audio cdrom dialout floppy video "
-"plugdev netdev powerdev fuse"
+#, no-wrap
+msgid " debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse\n"
 msgstr ""
 
 #. type: Plain text
@@ -228,7 +227,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:34
-msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
+#, no-wrap
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -251,9 +251,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:45
+#, no-wrap
 msgid ""
-"$ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name <name>se</"
-"name>"
+" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
+" <name>se</name>\n"
 msgstr ""
 
 #. type: Plain text
@@ -264,8 +265,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:53
-msgid ""
-"$ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\""
+#, no-wrap
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -276,14 +277,15 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:61
+#: en/user_customization-runtime.ssi:62
+#, no-wrap
 msgid ""
-"$ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); do basename $i | "
-"head -c -9; echo; done | sort | less"
+" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
+"     do basename $i | head -c -9; echo; done | sort | less\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:65
+#: en/user_customization-runtime.ssi:66
 msgid ""
 "Alternatively, you can use the #{console-setup}# package, a tool to let you "
 "configure console layout using X (XKB) definitions; you can then set your "
@@ -295,19 +297,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:69
+#: en/user_customization-runtime.ssi:71
+#, no-wrap
 msgid ""
-"$ lb config --bootappend-live \"locales=fr_FR.UTF-8 keyboard-layouts=fr "
-"keyboard-variant=bepo keyboard-model=tm2030usb\""
+" $ lb config --bootappend-live \\\n"
+"     \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:73
+#: en/user_customization-runtime.ssi:75
 msgid "2~persistence Persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:75
+#: en/user_customization-runtime.ssi:77
 msgid ""
 "A live cd paradigm is a pre-installed system which runs from read-only "
 "media, like a cdrom, where writes and modifications do not survive reboots "
@@ -315,7 +318,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:77
+#: en/user_customization-runtime.ssi:79
 msgid ""
 "A Debian Live system is a generalization of this paradigm and thus supports "
 "other media in addition to CDs; but still, in its default behaviour, it "
@@ -324,7 +327,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:79
+#: en/user_customization-runtime.ssi:81
 msgid ""
 "Persistence is a common name for different kinds of solutions for saving "
 "across reboots some, or all, of this run-time evolution of the system. To "
@@ -335,7 +338,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:81
+#: en/user_customization-runtime.ssi:83
 msgid ""
 "The data stored on this ramdisk should be saved on a writable persistent "
 "medium like a Hard Disk, a USB key, a network share or even a session of a "
@@ -345,12 +348,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:85
 msgid "3~ Full persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:87
 msgid ""
 "By 'full persistence' it is meant that instead of using a tmpfs for storing "
 "modifications to the read-only media (with the copy-on-write, COW, system) a "
@@ -362,26 +365,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:89
-msgid "# mkfs.ext2 -L live-rw /dev/sdb1"
+#: en/user_customization-runtime.ssi:91
+#, no-wrap
+msgid " # mkfs.ext2 -L live-rw /dev/sdb1\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:95
 msgid ""
 "If you already have a partition on your device, you could just change the "
 "label with one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:100
+#, no-wrap
 msgid ""
-"# tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems # dosfslabel /dev/"
-"sdb1 live-rw # for a fat filesystem"
+" # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
+" # dosfslabel /dev/sdb1 live-rw # for a fat filesystem\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:102
+#: en/user_customization-runtime.ssi:104
 msgid ""
 "But since live system users cannot always use a hard drive partition, and "
 "considering that most USB keys have poor write speeds, 'full' persistence "
@@ -391,26 +396,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:107
+#: en/user_customization-runtime.ssi:109
+#, no-wrap
 msgid ""
-"$ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file $ /"
-"sbin/mkfs.ext2 -F live-rw"
+" $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
+" $ /sbin/mkfs.ext2 -F live-rw\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:113
 msgid ""
 "Then copy the #{live-rw}# file to a writable partition and reboot with the "
 "boot parameter 'persistent'."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:113
+#: en/user_customization-runtime.ssi:115
 msgid "3~ Home automounting"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:117
 msgid ""
 "If during the boot a partition (filesystem) image file or a partition "
 "labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
@@ -419,12 +425,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:117
+#: en/user_customization-runtime.ssi:119
 msgid "3~ Snapshots"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:119
+#: en/user_customization-runtime.ssi:121
 msgid ""
 "Snapshots are collections of files and directories which are not mounted "
 "while running but which are copied from a persistent device to the system "
@@ -441,26 +447,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:121
+#: en/user_customization-runtime.ssi:123
 msgid ""
 "A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
 "works the same as the main snapshot but it is only applied to /home."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:123
+#: en/user_customization-runtime.ssi:125
 msgid ""
 "Snapshots cannot currently handle file deletion but full persistence and "
 "home automounting can."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:125
+#: en/user_customization-runtime.ssi:127
 msgid "3~ Persistent SubText"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:127
+#: en/user_customization-runtime.ssi:129
 msgid ""
 "If a user would need multiple persistent storage of the same type for "
 "different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-"
@@ -472,12 +478,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:129
+#: en/user_customization-runtime.ssi:131
 msgid "3~ Partial remastering"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:132
 msgid ""
 "The run-time modification of the tmpfs could be collected using live-"
 "snapshot in a squashfs and added to the cd by remastering the iso in the "
diff --git a/manual/po/pt_BR/user_examples.ssi.po b/manual/po/pt_BR/user_examples.ssi.po
index f268082..7d2295a 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: 2010-12-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-11-04 16:34-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -42,7 +42,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -63,16 +63,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -105,8 +105,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -126,17 +126,17 @@ msgstr "code{"
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -151,8 +151,9 @@ msgstr "}code"
 
 #. type: Plain text
 #: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
-#: en/user_examples.ssi:109 en/user_examples.ssi:156 en/user_examples.ssi:208
-msgid "# lb build"
+#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#, no-wrap
+msgid " # lb build\n"
 msgstr ""
 
 #. type: Plain text
@@ -197,9 +198,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:18
+#, no-wrap
 msgid ""
-"LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\" LB_MIRROR_CHROOT=\"http://"
-"mirror/debian\" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\""
+" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
+" LB_MIRROR_CHROOT=\"http://mirror/debian\"\n"
+" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -228,7 +231,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:32
-msgid "$ mkdir tutorial1 ; cd tutorial1 ; lb config"
+#, no-wrap
+msgid " $ mkdir tutorial1 ; cd tutorial1 ; lb config\n"
 msgstr ""
 
 #. type: Plain text
@@ -246,8 +250,9 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:230
-msgid "# lb build 2>&1 | tee binary.log"
+#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:231
+#, no-wrap
+msgid " # lb build 2>&1 | tee binary.log\n"
 msgstr ""
 
 #. type: Plain text
@@ -283,8 +288,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:56
-msgid ""
-"$ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel"
+#, no-wrap
+msgid " $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel\n"
 msgstr ""
 
 #. type: Plain text
@@ -339,9 +344,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:84
+#, no-wrap
 msgid ""
-"$ mkdir -p tutorial3/auto $ cp /usr/share/live/build/examples/auto/* "
-"tutorial3/auto/ $ cd tutorial3"
+" $ mkdir -p tutorial3/auto\n"
+" $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/\n"
+" $ cd tutorial3\n"
 msgstr ""
 
 #. type: Plain text
@@ -351,19 +358,20 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:92 en/user_examples.ssi:141
-msgid "#!/bin/sh"
+#, no-wrap
+msgid " #!/bin/sh\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:99
 #, no-wrap
 msgid ""
-"lb config noauto \\\n"
-"    --architecture i386 \\\n"
-"    --linux-flavours 686 \\\n"
-"    --packages-lists lxde \\\n"
-"    --packages \"iceweasel xchat\" \\\n"
-"    \"${@}\"\n"
+" lb config noauto \\\n"
+"     --architecture i386 \\\n"
+"     --linux-flavours 686 \\\n"
+"     --packages-lists lxde \\\n"
+"     --packages \"iceweasel xchat\" \\\n"
+"     \"${@}\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -399,7 +407,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:121
-msgid "$ git init $ git add auto $ git commit -a -m \"Initial import.\""
+#, no-wrap
+msgid ""
+" $ git init\n"
+" $ git add auto\n"
+" $ git commit -a -m \"Initial import.\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -425,7 +437,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:133
-msgid "# lb clean"
+#, no-wrap
+msgid " # lb clean\n"
 msgstr ""
 
 #. type: Plain text
@@ -437,12 +450,12 @@ msgstr ""
 #: en/user_examples.ssi:148
 #, no-wrap
 msgid ""
-"lb config noauto \\\n"
-"    --architecture i386 \\\n"
-"    --linux-flavours 686 \\\n"
-"    --packages-lists lxde \\\n"
-"    --packages \"iceweasel xchat vlc\" \\\n"
-"    \"${@}\"\n"
+" lb config noauto \\\n"
+"     --architecture i386 \\\n"
+"     --linux-flavours 686 \\\n"
+"     --packages-lists lxde \\\n"
+"     --packages \"iceweasel xchat vlc\" \\\n"
+"     \"${@}\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -451,13 +464,19 @@ msgid "Build again:"
 msgstr ""
 
 #. type: Plain text
+#: en/user_examples.ssi:156
+msgid "# lb build"
+msgstr ""
+
+#. type: Plain text
 #: en/user_examples.ssi:160
 msgid "Test, and when you're satisfied, commit the next revision:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:164
-msgid "$ git commit -a -m \"Adding vlc media player.\""
+#, no-wrap
+msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -504,11 +523,11 @@ msgstr ""
 #: en/user_examples.ssi:184
 #, no-wrap
 msgid ""
-"$ mkdir vnc_kiosk_client\n"
-"$ cd vnc_kiosk_client\n"
-"$ lb config -a i386 -k 686 -p standard-x11 \\\n"
-"    --packages \"gdm3 metacity xvnc4viewer\" \\\n"
-"    --apt-recommends false\n"
+" $ mkdir vnc_kiosk_client\n"
+" $ cd vnc_kiosk_client\n"
+" $ lb config -a i386 -k 686 -p standard-x11 \\\n"
+"     --packages \"gdm3 metacity xvnc4viewer\" \\\n"
+"     --apt-recommends false\n"
 msgstr ""
 
 #. type: Plain text
@@ -521,19 +540,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:194
+#, no-wrap
 msgid ""
-"$ mkdir -p config/chroot_local-includes/etc/skel $ cat >config/chroot_local-"
-"includes/etc/skel/.xsession <<END #!/bin/sh"
+" $ mkdir -p config/chroot_local-includes/etc/skel\n"
+" $ cat >config/chroot_local-includes/etc/skel/.xsession <<END\n"
+" #!/bin/sh\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:197
-msgid "/usr/bin/metacity & /usr/bin/xvncviewer 192.168.1.2:1"
+#, no-wrap
+msgid ""
+" /usr/bin/metacity &\n"
+" /usr/bin/xvncviewer 192.168.1.2:1\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:200
-msgid "exit END"
+#, no-wrap
+msgid ""
+" exit\n"
+" END\n"
 msgstr ""
 
 #. type: Plain text
@@ -572,19 +599,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:222
+#: en/user_examples.ssi:223
+#, no-wrap
 msgid ""
-"$ lb config -k 486 -p minimal --binary-indices false --memtest none --apt-"
-"recommends false --includes none"
+" $ lb config -k 486 -p minimal --binary-indices false \\\n"
+"     --memtest none --apt-recommends false --includes none\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:226
+#: en/user_examples.ssi:227
 msgid "Now, build the image in the usual way:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:234
+#: en/user_examples.ssi:235
 msgid ""
 "On the author's system at time of writing, the above configuration produced "
 "a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
@@ -592,7 +620,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:236
+#: en/user_examples.ssi:237
 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 "
@@ -610,18 +638,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:238
+#: en/user_examples.ssi:239
 msgid "2~ A localized KDE desktop and installer"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:240
+#: en/user_examples.ssi:241
 #, no-wrap
 msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:242
+#: en/user_examples.ssi:243
 msgid ""
 "We want to make an iso-hybrid image for i386 architecture using our "
 "preferred desktop, in this case KDE, containing all of the same packages "
@@ -629,7 +657,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:244
+#: en/user_examples.ssi:245
 msgid ""
 "Our initial problem is the discovery of the names of the appropriate tasks. "
 "Currently, live-build cannot help with this. While we might get lucky and "
@@ -639,55 +667,56 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:248
-msgid "# apt-get install dctrl-tools tasksel-data"
+#: en/user_examples.ssi:249
+#, no-wrap
+msgid " # apt-get install dctrl-tools tasksel-data\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:252
+#: en/user_examples.ssi:253
 msgid "Now we can search for the appropriate tasks, first with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:261
+#: en/user_examples.ssi:262
 #, no-wrap
 msgid ""
-"$ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
-"Task: brazilian-portuguese\n"
-"Description: Brazilian Portuguese environment\n"
-" This task installs programs, data files, and\n"
-" documentation that make it easier for Brazilian Portuguese speakers\n"
-" to use Debian.\n"
+" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" Task: brazilian-portuguese\n"
+" Description: Brazilian Portuguese environment\n"
+"  This task installs programs, data files, and\n"
+"  documentation that make it easier for Brazilian Portuguese speakers\n"
+"  to use Debian.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:265
+#: en/user_examples.ssi:266
 msgid ""
 "By this command, we discover the task is called, plainly enough, brazilian-"
 "portuguese. Now to find the related tasks:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:272
+#: en/user_examples.ssi:273
 #, no-wrap
 msgid ""
-"$ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
-"Task: brazilian-portuguese-desktop\n"
-"Description: Brazilian Portuguese desktop\n"
-" This task localises the desktop in Brasilian Portuguese.\n"
+" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" Task: brazilian-portuguese-desktop\n"
+" Description: Brazilian Portuguese desktop\n"
+"  This task localises the desktop in Brasilian Portuguese.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:276
+#: en/user_examples.ssi:277
 #, no-wrap
 msgid ""
-"Task: brazilian-portuguese-kde-desktop\n"
-"Description: Brazilian Portuguese KDE desktop\n"
-" This task localises the KDE desktop in Brazilian Portuguese.\n"
+" Task: brazilian-portuguese-kde-desktop\n"
+" Description: Brazilian Portuguese KDE desktop\n"
+"  This task localises the KDE desktop in Brazilian Portuguese.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:280
+#: en/user_examples.ssi:281
 msgid ""
 "We will use the experimental #{--language}# option, as live-build happens to "
 "include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
@@ -697,12 +726,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:294
+#: en/user_examples.ssi:295
 #, no-wrap
 msgid ""
-"$ mkdir live-pt_BR-kde\n"
-"$ cd live-pt_BR-kde\n"
-"$ lb config \\\n"
+" $ mkdir live-pt_BR-kde\n"
+" $ cd live-pt_BR-kde\n"
+" $ lb config \\\n"
 "     -a i386 \\\n"
 "     -k 486 \\\n"
 "     -p kde-desktop \\\n"
@@ -714,7 +743,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:298
+#: en/user_examples.ssi:299
 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 "
diff --git a/manual/po/pt_BR/user_installation.ssi.po b/manual/po/pt_BR/user_installation.ssi.po
index b186877..f666d3f 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: 2010-12-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-16 20:36-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -58,16 +58,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -100,8 +100,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -121,17 +121,17 @@ msgstr "code{"
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -146,7 +146,8 @@ msgstr "}code"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
-msgid "$ lb config --repository live.debian.net"
+#, no-wrap
+msgid " $ lb config --repository live.debian.net\n"
 msgstr ""
 
 #. type: Plain text
@@ -245,7 +246,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:40
-msgid "# apt-get install live-build"
+#, no-wrap
+msgid " # apt-get install live-build\n"
 msgstr ""
 
 #. type: Plain text
@@ -255,7 +257,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:48
-msgid "# aptitude install live-build"
+#, no-wrap
+msgid " # aptitude install live-build\n"
 msgstr ""
 
 #. type: Plain text
@@ -273,7 +276,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:58
-msgid "$ git clone git://live.debian.net/git/live-build.git"
+#, no-wrap
+msgid " $ git clone git://live.debian.net/git/live-build.git\n"
 msgstr ""
 
 #. type: Plain text
@@ -283,7 +287,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:68
-msgid "$ cd live-build $ dpkg-buildpackage -rfakeroot -b -uc -us $ cd .."
+#, no-wrap
+msgid ""
+" $ cd live-build\n"
+" $ dpkg-buildpackage -rfakeroot -b -uc -us\n"
+" $ cd ..\n"
 msgstr ""
 
 #. type: Plain text
@@ -295,7 +303,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:76
-msgid "# dpkg -i live-build_2.0.8-1_all.deb"
+#, no-wrap
+msgid " # dpkg -i live-build_2.0.8-1_all.deb\n"
 msgstr ""
 
 #. type: Plain text
@@ -305,7 +314,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:84
-msgid "# make install"
+#, no-wrap
+msgid " # make install\n"
 msgstr ""
 
 #. type: Plain text
@@ -315,7 +325,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:92
-msgid "# make uninstall"
+#, no-wrap
+msgid " # make uninstall\n"
 msgstr ""
 
 #. type: Plain text
@@ -363,12 +374,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:117
+#, no-wrap
 msgid ""
-"$ git clone git://live.debian.net/git/live-boot.git $ git clone git://live."
-"debian.net/git/live-config.git"
+" $ git clone git://live.debian.net/git/live-boot.git\n"
+" $ git clone git://live.debian.net/git/live-config.git\n"
 msgstr ""
-"$ git clone git://live.debian.net/git/live-boot.git $ git clone git://live."
-"debian.net/git/live-config.git"
 
 #. type: Plain text
 #: en/user_installation.ssi:121
@@ -403,9 +413,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:134
+#, no-wrap
 msgid ""
-"$ cd live-boot $ dpkg-buildpackage -b -uc -us $ cd ../live-config $ dpkg-"
-"buildpackage -b -uc -us"
+" $ cd live-boot\n"
+" $ dpkg-buildpackage -b -uc -us\n"
+" $ cd ../live-config\n"
+" $ dpkg-buildpackage -b -uc -us\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/pt_BR/user_managing_a_configuration.ssi.po b/manual/po/pt_BR/user_managing_a_configuration.ssi.po
index 40bc618..c44b90d 100644
--- a/manual/po/pt_BR/user_managing_a_configuration.ssi.po
+++ b/manual/po/pt_BR/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-17 07:53-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-13 17:00+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -32,12 +32,12 @@ msgstr ""
 #: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
 #: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
 #: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_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_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -54,24 +54,25 @@ msgstr ""
 #: 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-runtime.ssi:14
+#: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi: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: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -95,12 +96,12 @@ msgstr "code{"
 #: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
 #: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
 #: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -117,24 +118,25 @@ msgstr "code{"
 #: 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-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi: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: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -235,10 +237,10 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:29
 #, no-wrap
 msgid ""
-"#!/bin/sh\n"
-"lb config noauto \\\n"
-"\t--packages-lists \"standard\" \\\n"
-"\t\"${@}\"\n"
+" #!/bin/sh\n"
+" lb config noauto \\\n"
+"     --packages-lists \"standard\" \\\n"
+"     \"${@}\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -250,11 +252,11 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:41
 #, no-wrap
 msgid ""
-"#!/bin/sh\n"
-"lb clean noauto \"${@}\"\n"
-"rm -f config/binary config/bootstrap \\\n"
-"\tconfig/chroot config/common config/source\n"
-"rm -f binary.log\n"
+" #!/bin/sh\n"
+" lb clean noauto \"${@}\"\n"
+" rm -f config/binary config/bootstrap \\\n"
+"     config/chroot config/common config/source\n"
+" rm -f binary.log\n"
 msgstr ""
 
 #. type: Plain text
@@ -264,7 +266,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_managing_a_configuration.ssi:50
-msgid "#!/bin/sh lb build noauto \"${@}\" 2>&1 | tee binary.log"
+#, no-wrap
+msgid ""
+" #!/bin/sh\n"
+" lb build noauto \"${@}\" 2>&1 | tee binary.log\n"
 msgstr ""
 
 #. type: Plain text
@@ -276,7 +281,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_managing_a_configuration.ssi:58
-msgid "$ cp /usr/share/live/build/examples/auto/* auto/"
+#, no-wrap
+msgid " $ cp /usr/share/live/build/examples/auto/* auto/\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/pt_BR/user_overview.ssi.po b/manual/po/pt_BR/user_overview.ssi.po
index d49d7b7..72131e6 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: 2010-12-17 07:53-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-22 07:52-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -32,12 +32,12 @@ msgstr ""
 #: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
 #: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
 #: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_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_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -54,24 +54,25 @@ msgstr ""
 #: 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-runtime.ssi:14
+#: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi: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: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -95,12 +96,12 @@ msgstr "code{"
 #: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
 #: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
 #: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -117,24 +118,25 @@ msgstr "code{"
 #: 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-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi: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: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -264,39 +266,53 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:39
-msgid "$ lb config P: Creating config tree"
+#, no-wrap
+msgid ""
+" $ lb config\n"
+" P: Creating config tree\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:44
+#, no-wrap
 msgid ""
-"$ ls -l total 8 drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto drwxr-xr-x 22 "
-"user user 4096 Sep 7 13:02 config"
+" $ ls -l\n"
+" total 8\n"
+" drwxr-xr-x  3 user user 4096 Sep  7 13:02 auto\n"
+" drwxr-xr-x 22 user user 4096 Sep  7 13:02 config\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:72
+#, no-wrap
 msgid ""
-"$ ls -l config/ total 104 -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary "
-"drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer drwxr-xr-x 2 "
-"user user 4096 Sep 7 13:02 binary_debian-installer-includes drwxr-xr-x 2 "
-"user user 4096 Sep 7 13:02 binary_grub drwxr-xr-x 2 user user 4096 Sep 7 "
-"13:02 binary_local-debs drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-"
-"hooks drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes drwxr-xr-"
-"x 2 user user 4096 Sep 7 13:02 binary_local-packageslists drwxr-xr-x 2 user "
-"user 4096 Sep 7 13:02 binary_local-udebs drwxr-xr-x 2 user user 4096 Sep 7 "
-"13:02 binary_rootfs drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux -"
-"rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap -rw-r--r-- 1 user user 1647 "
-"Sep 7 13:02 chroot drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt drwxr-"
-"xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks drwxr-xr-x 2 user user "
-"4096 Sep 7 13:02 chroot_local-includes drwxr-xr-x 2 user user 4096 Sep 7 "
-"13:02 chroot_local-packages drwxr-xr-x 2 user user 4096 Sep 7 13:02 "
-"chroot_local-packageslists drwxr-xr-x 2 user user 4096 Sep 7 13:02 "
-"chroot_local-patches drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-"
-"preseed drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources -rw-r--r-- 1 "
-"user user 2954 Sep 7 13:02 common drwxr-xr-x 2 user user 4096 Sep 7 13:02 "
-"includes -rw-r--r-- 1 user user 205 Sep 7 13:02 source drwxr-xr-x 2 user "
-"user 4096 Sep 7 13:02 templates"
+" $ ls -l config/\n"
+" total 104\n"
+" -rw-r--r-- 1 user user 4197 Sep  7 13:02 binary\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_debian-installer\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_debian-installer-includes\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_grub\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-debs\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-hooks\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-includes\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-packageslists\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-udebs\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_rootfs\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_syslinux\n"
+" -rw-r--r-- 1 user user 2051 Sep  7 13:02 bootstrap\n"
+" -rw-r--r-- 1 user user 1647 Sep  7 13:02 chroot\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_apt\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-hooks\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-includes\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-packages\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-packageslists\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-patches\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-preseed\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_sources\n"
+" -rw-r--r-- 1 user user 2954 Sep  7 13:02 common\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 includes\n"
+" -rw-r--r-- 1 user user  205 Sep  7 13:02 source\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 templates\n"
 msgstr ""
 
 #. type: Plain text
@@ -317,7 +333,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:82
-msgid "$ lb config -p gnome"
+#, no-wrap
+msgid " $ lb config -p gnome\n"
 msgstr ""
 
 #. type: Plain text
@@ -327,9 +344,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:90
-msgid ""
-"$ lb config --binary-images net --hostname live-machine --username live-"
-"user ..."
+#, no-wrap
+msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/about_manual.ssi.po b/manual/po/ro/about_manual.ssi.po
index 6fe8a40..526d345 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: 2010-12-09 10:51-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-23 10:34-0200\n"
 "Last-Translator: Eugen Paiuc <linux51 at bluewin.ch>\n"
 "Language-Team: none\n"
@@ -360,31 +360,28 @@ msgstr ""
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
-#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
-#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
-#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
-#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
-#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
-#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/about_manual.ssi:170 en/project_bugs.ssi:58
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
-#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
-#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-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/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi: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_customization-installer.ssi:32
+#: en/user_customization-installer.ssi:43
+#: 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
@@ -394,27 +391,28 @@ msgstr ""
 #: en/user_customization-packages.ssi:199
 #: en/user_customization-packages.ssi:215
 #: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:290
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:312
-#: en/user_customization-packages.ssi:330 en/user_customization-runtime.ssi:14
+#: en/user_customization-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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:132 en/user_installation.ssi:147
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -431,31 +429,28 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
 #: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/other_faq.ssi:37 en/other_faq.ssi:46
-#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
-#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
-#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
-#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
-#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
-#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/about_manual.ssi:174 en/project_bugs.ssi:62
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70 en/user_customization-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/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi: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_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
@@ -464,27 +459,29 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
 #: en/user_customization-packages.ssi:191
 #: en/user_customization-packages.ssi:203
 #: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:294
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:316
-#: en/user_customization-packages.ssi:343 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:118
-#: en/user_installation.ssi:137 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -505,8 +502,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:94
-msgid "# apt-get install make po4a sisu-complete"
-msgstr "# apt-get install make po4a sisu-complete"
+#, no-wrap
+msgid " # apt-get install make po4a sisu-complete\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:98
@@ -519,8 +517,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:102
-msgid "$ make build"
-msgstr "$ make build"
+#, no-wrap
+msgid " $ make build\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:106
@@ -532,8 +531,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:110
-msgid "$ make build LANGUAGES=en"
-msgstr "$ make build LANGUAGES=en"
+#, no-wrap
+msgid " $ make build LANGUAGES=en\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:114
@@ -560,19 +560,13 @@ msgstr "_* Fetch the public commit key:"
 #: en/about_manual.ssi:127
 #, no-wrap
 msgid ""
-"$ mkdir -p ~/.ssh/identity.d\n"
-"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
-"\t-O ~/.ssh/identity.d/gitosis at live.debian.net\n"
-"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-"\t-O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
+" $ mkdir -p ~/.ssh/identity.d\n"
+" $ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
+"     -O ~/.ssh/identity.d/gitosis at live.debian.net\n"
+" $ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
+"     -O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
+" $ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
 msgstr ""
-"$ mkdir -p ~/.ssh/identity.d\n"
-"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
-"\t-O ~/.ssh/identity.d/gitosis at live.debian.net\n"
-"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-"\t-O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:131
@@ -583,19 +577,13 @@ msgstr "_* Adaugati urmatoarea sectiuna la openssh-client config:"
 #: en/about_manual.ssi:140
 #, no-wrap
 msgid ""
-"$ cat >> ~/.ssh/config << EOF\n"
-"Host live.debian.net\n"
-"        Hostname live.debian.net\n"
-"        User gitosis\n"
-"        IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
-"EOF\n"
+" $ cat >> ~/.ssh/config << EOF\n"
+" Host live.debian.net\n"
+"     Hostname live.debian.net\n"
+"     User gitosis\n"
+"     IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
+" EOF\n"
 msgstr ""
-"$ cat >> ~/.ssh/config << EOF\n"
-"Host live.debian.net\n"
-"        Hostname live.debian.net\n"
-"        User gitosis\n"
-"        IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
-"EOF\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:144
@@ -604,8 +592,9 @@ msgstr "_* Checkout un clon al manualului prin ssh:"
 
 #. type: Plain text
 #: en/about_manual.ssi:148
-msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
-msgstr "$ git clone gitosis at live.debian.net:/live-manual.git"
+#, no-wrap
+msgid " $ git clone gitosis at live.debian.net:/live-manual.git\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:152
@@ -617,8 +606,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:156
-msgid "$ make commit"
-msgstr "$ make commit"
+#, no-wrap
+msgid " $ make commit\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:160
@@ -635,8 +625,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:164
-msgid "$ git commit -a -m \"Adding a section on applying patches.\""
-msgstr "$ git commit -a -m \"Adding a section on applying patches.\""
+#, no-wrap
+msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:168
@@ -645,8 +636,9 @@ msgstr "_* Primite commit-ul la server:"
 
 #. type: Plain text
 #: en/about_manual.ssi:172
-msgid "$ git push"
-msgstr "$ git push"
+#, no-wrap
+msgid " $ git push\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:176
diff --git a/manual/po/ro/project_bugs.ssi.po b/manual/po/ro/project_bugs.ssi.po
index 746dc05..88c31d5 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-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\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"
@@ -38,7 +38,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -59,16 +59,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -101,8 +101,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -122,17 +122,17 @@ msgstr "code{"
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -324,7 +324,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:60
-msgid "# lb build 2>&1 | tee build.log"
+#, no-wrap
+msgid " # lb build 2>&1 | tee build.log\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/project_coding-style.ssi.po b/manual/po/ro/project_coding-style.ssi.po
index 5a61aea..7161a6f 100644
--- a/manual/po/ro/project_coding-style.ssi.po
+++ b/manual/po/ro/project_coding-style.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-17 14:37+0100\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-11-30 11:05+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -38,7 +38,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -55,24 +55,25 @@ msgstr ""
 #: 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-runtime.ssi:14
+#: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi: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: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -100,8 +101,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -118,24 +119,25 @@ msgstr "code{"
 #: 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-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi: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: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -215,9 +217,9 @@ msgstr ""
 #: en/project_coding-style.ssi:32
 #, no-wrap
 msgid ""
-"if foo; then\n"
-"        bar\n"
-"fi\n"
+" if foo; then\n"
+"         bar\n"
+" fi\n"
 msgstr ""
 
 #. type: Plain text
@@ -230,10 +232,10 @@ msgstr ""
 #: en/project_coding-style.ssi:43
 #, no-wrap
 msgid ""
-"if foo\n"
-"then\n"
-"        bar\n"
-"fi\n"
+" if foo\n"
+" then\n"
+"         bar\n"
+" fi\n"
 msgstr ""
 
 #. type: Plain text
@@ -245,19 +247,19 @@ msgstr ""
 #: en/project_coding-style.ssi:55
 #, no-wrap
 msgid ""
-"foo () {\n"
-"        bar\n"
-"}\n"
+" foo () {\n"
+"         bar\n"
+" }\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:66
 #, no-wrap
 msgid ""
-"foo ()\n"
-"{\n"
-"        bar\n"
-"}\n"
+" foo ()\n"
+" {\n"
+"         bar\n"
+" }\n"
 msgstr ""
 
 #. type: Plain text
@@ -322,12 +324,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:94
-msgid "FOO=bar"
+#, no-wrap
+msgid " FOO=bar\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:102
-msgid "FOO=\"bar\""
+#, no-wrap
+msgid " FOO=\"bar\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -339,20 +343,20 @@ msgstr ""
 #: en/project_coding-style.ssi:115
 #, no-wrap
 msgid ""
-"if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
-"then\n"
-"        foobar\n"
-"fi\n"
+" if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
+" then\n"
+"         foobar\n"
+" fi\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:126
 #, no-wrap
 msgid ""
-"if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
-"then\n"
-"        foobar\n"
-"fi\n"
+" if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
+" then\n"
+"         foobar\n"
+" fi\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/project_procedures.ssi.po b/manual/po/ro/project_procedures.ssi.po
index c6c20b1..8270539 100644
--- a/manual/po/ro/project_procedures.ssi.po
+++ b/manual/po/ro/project_procedures.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 18:55-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-11-30 10:35+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -38,7 +38,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -59,16 +59,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -101,8 +101,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -122,17 +122,17 @@ msgstr "code{"
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -174,7 +174,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:14
-msgid "$ ../../scripts/l10n/output-l10n-changes . -d"
+#, no-wrap
+msgid " $ ../../scripts/l10n/output-l10n-changes . -d\n"
 msgstr ""
 
 #. type: Plain text
@@ -258,11 +259,11 @@ msgstr ""
 #: en/project_procedures.ssi:52
 #, no-wrap
 msgid ""
-"$ sed \\\n"
-"  -e 's|%major%|5.0|g' \\\n"
-"  -e 's|%minor%|5.0.2|g' \\\n"
-"  -e 's|%codename%|lenny|g' \\\n"
-"  -e 's|%release_mail%|2009/msg00007.html|g'\n"
+" $ sed \\\n"
+"     -e 's|%major%|5.0|g' \\\n"
+"     -e 's|%minor%|5.0.2|g' \\\n"
+"     -e 's|%codename%|lenny|g' \\\n"
+"     -e 's|%release_mail%|2009/msg00007.html|g'\n"
 msgstr ""
 
 #. type: Plain text
@@ -274,166 +275,179 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:60
-msgid "Debian Live images for Debian GNU/Linux %major% updated"
+#, no-wrap
+msgid " Debian Live images for Debian GNU/Linux %major% updated\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:64
+#, no-wrap
 msgid ""
-"The Debian Live project is pleased to announce the availability of updated "
-"Live images for its stable distribution Debian GNU/Linux %major% (codename "
-"\"%codename%\")."
+" The Debian Live project is pleased to announce the availability of\n"
+" updated Live images for its stable distribution Debian GNU/Linux %major%\n"
+" (codename \"%codename%\").\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:66
-msgid "The images are available for download at:"
+#, no-wrap
+msgid " The images are available for download at:\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:68
 #, no-wrap
-msgid "    <http://cdimage.debian.org/cdimage/release/current-live/>\n"
+msgid "     <http://cdimage.debian.org/cdimage/release/current-live/>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:73
+#, no-wrap
 msgid ""
-"This update incorporates the changes made in the %minor% point release, "
-"which adds corrections for security problems to the stable release along "
-"with a few adjustments for serious problems. A full list of the changes may "
-"be viewed at:"
+" This update incorporates the changes made in the %minor% point release,\n"
+" which adds corrections for security problems to the stable release\n"
+" along with a few adjustments for serious problems. A full list of the\n"
+" changes may be viewed at:\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:75
 #, no-wrap
-msgid "    <http://lists.debian.org/debian-announce/%release_mail%>\n"
+msgid "     <http://lists.debian.org/debian-announce/%release_mail%>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:77
-msgid "It also includes the following Live-specific changes:"
+#, no-wrap
+msgid " It also includes the following Live-specific changes:\n"
 msgstr ""
 
-#. type: Bullet: ' * '
+#. type: Bullet: '  * '
 #: en/project_procedures.ssi:81
 msgid "[INSERT LIVE-SPECIFIC CHANGE HERE]"
 msgstr ""
 
-#. type: Bullet: ' * '
+#. type: Bullet: '  * '
 #: en/project_procedures.ssi:81
 msgid "[LARGER ISSUES MAY DESERVE THEIR OWN SECTION]"
 msgstr ""
 
 #. type: Plain text
-#: en/project_procedures.ssi:84
+#: en/project_procedures.ssi:85
 #, no-wrap
 msgid ""
-"URLs\n"
-"----\n"
+" URLs\n"
+" ----\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:87
-msgid "Download location of updated images:"
+#, no-wrap
+msgid " Download location of updated images:\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:89
 #, no-wrap
-msgid "  <http://cdimage.debian.org/cdimage/release/current-live/>\n"
+msgid "   <http://cdimage.debian.org/cdimage/release/current-live/>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:91
-msgid "Debian Live project homepage:"
-msgstr ""
+#, no-wrap
+msgid " Debian Live project homepage:\n"
+msgstr " Despre Proiectul Debian Live:\n"
 
 #. type: Plain text
 #: en/project_procedures.ssi:93
 #, no-wrap
-msgid "  <http://live.debian.net/>\n"
+msgid "   <http://live.debian.net/>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:95
-msgid "The current stable distribution:"
-msgstr "El reflecta starea (actuala) a distributiei:"
+#, no-wrap
+msgid " The current stable distribution:\n"
+msgstr " El reflecta starea (actuala) a distributiei:\n"
 
 #. type: Plain text
 #: en/project_procedures.ssi:97
 #, no-wrap
-msgid "  <http://ftp.debian.org/debian/dists/stable>\n"
+msgid "   <http://ftp.debian.org/debian/dists/stable>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:99
-msgid "stable distribution information (release notes, errata etc.):"
+#, no-wrap
+msgid " stable distribution information (release notes, errata etc.):\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:101
 #, no-wrap
-msgid "  <http://www.debian.org/releases/stable/>\n"
+msgid "   <http://www.debian.org/releases/stable/>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:103
-msgid "Security announcements and information:"
+#, no-wrap
+msgid " Security announcements and information:\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:105
 #, no-wrap
-msgid "  <http://www.debian.org/security/>\n"
+msgid "   <http://www.debian.org/security/>\n"
 msgstr ""
 
 #. type: Plain text
-#: en/project_procedures.ssi:108
+#: en/project_procedures.ssi:109
 #, no-wrap
 msgid ""
-"About Debian\n"
-"-------------\n"
+" About Debian\n"
+" -------------\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:113
+#, no-wrap
 msgid ""
-"The Debian Project is an association of Free Software developers who "
-"volunteer their time and effort in order to produce the completely free "
-"operating system Debian GNU/Linux."
+" The Debian Project is an association of Free Software developers who\n"
+" volunteer their time and effort in order to produce the completely free\n"
+" operating system Debian GNU/Linux.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/project_procedures.ssi:116
+#: en/project_procedures.ssi:117
 #, no-wrap
 msgid ""
-"About Debian Live\n"
-"-----------------\n"
+" About Debian Live\n"
+" -----------------\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:122
+#, no-wrap
 msgid ""
-"Debian Live is an official sub-project of Debian which produces Debian "
-"systems that do not require a classical installer. Images are available for "
-"CD/DVD discs, USB sticks and PXE netbooting as well as a bare filesystem "
-"images for booting directly from the internet."
+" Debian Live is an official sub-project of Debian which produces Debian\n"
+" systems that do not require a classical installer. Images are available\n"
+" for CD/DVD discs, USB sticks and PXE netbooting as well as a bare\n"
+" filesystem images for booting directly from the internet.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/project_procedures.ssi:125
+#: en/project_procedures.ssi:126
 #, no-wrap
 msgid ""
-"Contact Information\n"
-"-------------------\n"
+" Contact Information\n"
+" -------------------\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:130
+#, no-wrap
 msgid ""
-"For further information, please visit the Debian Live web pages at <http://"
-"live.debian.net/> or alternatively send mail to <debian-live at lists.debian."
-"org>."
+" For further information, please visit the Debian Live web pages at\n"
+" <http://live.debian.net/> or alternatively send mail to\n"
+" <debian-live at lists.debian.org>.\n"
 msgstr ""
diff --git a/manual/po/ro/user_basics.ssi.po b/manual/po/ro/user_basics.ssi.po
index 31ae82f..f7def21 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: 2010-12-19 10:06-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-23 16:43+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -38,7 +38,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -58,17 +58,17 @@ msgstr ""
 #: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_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:188
-#: en/user_examples.ssi:204 en/user_examples.ssi:218 en/user_examples.ssi:226
-#: en/user_examples.ssi:244 en/user_examples.ssi:252 en/user_examples.ssi:265
-#: en/user_examples.ssi:280 en/user_installation.ssi:38
+#: 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
@@ -101,8 +101,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -121,18 +121,18 @@ msgstr "code{"
 #: 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:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_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:184 en/user_examples.ssi:200
-#: en/user_examples.ssi:208 en/user_examples.ssi:222 en/user_examples.ssi:230
-#: en/user_examples.ssi:248 en/user_examples.ssi:261 en/user_examples.ssi:276
-#: en/user_examples.ssi:294 en/user_installation.ssi:42
+#: 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
@@ -263,7 +263,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:32
-msgid "$ lb config"
+#, no-wrap
+msgid " $ lb config\n"
 msgstr ""
 
 #. type: Plain text
@@ -282,8 +283,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
-#: en/user_examples.ssi:109 en/user_examples.ssi:156 en/user_examples.ssi:206
-msgid "# lb build"
+#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#, no-wrap
+msgid " # lb build\n"
 msgstr ""
 
 #. type: Plain text
@@ -305,12 +307,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:54 en/user_basics.ssi:142
-msgid "# apt-get install qemu"
+#, no-wrap
+msgid " # apt-get install qemu\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:56
-msgid "$ qemu -cdrom binary.iso"
+#, no-wrap
+msgid " $ qemu -cdrom binary.iso\n"
 msgstr ""
 
 #. type: Plain text
@@ -325,12 +329,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:66
-msgid "# apt-get install virtualbox-ose virtualbox-ose-dkms"
+#, no-wrap
+msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:68
-msgid "$ virtualbox"
+#, no-wrap
+msgid " $ virtualbox\n"
 msgstr ""
 
 #. type: Plain text
@@ -351,7 +357,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:78
-msgid "# lb config --packages virtualbox-ose-guest-x11"
+#, no-wrap
+msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
 msgstr ""
 
 #. type: Plain text
@@ -366,12 +373,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:88
-msgid "# apt-get install wodim"
+#, no-wrap
+msgid " # apt-get install wodim\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:90
-msgid "$ wodim binary.iso"
+#, no-wrap
+msgid " $ wodim binary.iso\n"
 msgstr ""
 
 #. type: Plain text
@@ -400,8 +409,9 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:102
-msgid "$ lb clean --binary"
+#: en/user_basics.ssi:102 en/user_basics.ssi:184
+#, no-wrap
+msgid " # lb clean --binary\n"
 msgstr ""
 
 #. type: Plain text
@@ -413,7 +423,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:110
-msgid "$ lb config -b usb-hdd"
+#, no-wrap
+msgid " $ lb config -b usb-hdd\n"
 msgstr ""
 
 #. type: Plain text
@@ -436,7 +447,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:128
-msgid "$ dd if=binary.img of=${USBSTICK}"
+#, no-wrap
+msgid " $ dd if=binary.img of=${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
@@ -468,7 +480,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:144
-msgid "$ qemu -hda binary.img"
+#, no-wrap
+msgid " $ qemu -hda binary.img\n"
 msgstr ""
 
 #. type: Plain text
@@ -487,7 +500,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:154
-msgid "# gparted ${USBSTICK}"
+#, no-wrap
+msgid " # gparted ${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
@@ -499,7 +513,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:162
-msgid "# mkfs.ext4 ${USBSTICK}"
+#, no-wrap
+msgid " # mkfs.ext4 ${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
@@ -509,7 +524,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:170
-msgid "# mkfs.vfat -F 32"
+#, no-wrap
+msgid " # mkfs.vfat -F 32\n"
 msgstr ""
 
 #. type: Plain text
@@ -539,11 +555,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:184
-msgid "# lb clean --binary"
-msgstr ""
-
-#. type: Plain text
 #: en/user_basics.ssi:188
 msgid ""
 "Run the #{lb config}# command as follows to configure your image for "
@@ -552,9 +563,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:192
-msgid ""
-"$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
-"\"192.168.0.1\""
+#, no-wrap
+msgid " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -617,39 +627,46 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:220
-msgid "# /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server"
+#, no-wrap
+msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:222
-msgid "ddns-update-style none;"
+#, no-wrap
+msgid " ddns-update-style none;\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:225
+#, no-wrap
 msgid ""
-"option domain-name \"example.org\"; option domain-name-servers ns1.example."
-"org, ns2.example.org;"
+" option domain-name \"example.org\";\n"
+" option domain-name-servers ns1.example.org, ns2.example.org;\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:228
-msgid "default-lease-time 600; max-lease-time 7200;"
+#, no-wrap
+msgid ""
+" default-lease-time 600;\n"
+" max-lease-time 7200;\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:230
-msgid "log-facility local7;"
+#, no-wrap
+msgid " log-facility local7;\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:236
 #, no-wrap
 msgid ""
-"subnet 192.168.0.0 netmask 255.255.255.0 {\n"
-"  range 192.168.0.1 192.168.0.254;\n"
-"  next-server servername;\n"
-"  filename \"pxelinux.0\";\n"
+" subnet 192.168.0.0 netmask 255.255.255.0 {\n"
+"   range 192.168.0.1 192.168.0.254;\n"
+"   next-server servername;\n"
+"   filename \"pxelinux.0\";\n"
 "}\n"
 msgstr ""
 
@@ -673,7 +690,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:248
-msgid "# dpkg-reconfigure -plow tftpd-hpa"
+#, no-wrap
+msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
 msgstr ""
 
 #. type: Plain text
@@ -708,7 +726,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:264
-msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
+#, no-wrap
+msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
 msgstr ""
 
 #. type: Plain text
@@ -719,7 +738,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:272
-msgid "# exportfs -rv"
+#, no-wrap
+msgid " # exportfs -rv\n"
 msgstr ""
 
 #. type: Plain text
@@ -768,11 +788,16 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:299
+#, no-wrap
 msgid ""
-"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
-"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
-"sudo /sbin/ifconfig $1 0.0.0.0 promisc up echo \"Adding $1 to br0...\" sudo /"
-"usr/sbin/brctl addif br0 $1 sleep 2"
+" #!/bin/sh\n"
+" sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1\n"
+" echo \"Executing /etc/qemu-ifup\"\n"
+" echo \"Bringing up $1 for bridged mode...\"\n"
+" sudo /sbin/ifconfig $1 0.0.0.0 promisc up\n"
+" echo \"Adding $1 to br0...\"\n"
+" sudo /usr/sbin/brctl addif br0 $1\n"
+" sleep 2\n"
 msgstr ""
 
 #. type: Plain text
@@ -810,34 +835,50 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:321
+#, no-wrap
 msgid ""
-"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
-"\"512\" MemAllowAutoScaleDown = \"FALSE\""
+" #!/usr/bin/vmware\n"
+" config.version = \"8\"\n"
+" virtualHW.version = \"4\"\n"
+" memsize = \"512\"\n"
+" MemAllowAutoScaleDown = \"FALSE\"\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:327
+#, no-wrap
 msgid ""
-"ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
-"\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
+" ide0:0.present = \"FALSE\"\n"
+" ide1:0.present = \"FALSE\"\n"
+" floppy0.present = \"FALSE\"\n"
+" sound.present = \"FALSE\"\n"
+" tools.remindInstall = \"FALSE\"\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:330
-msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
+#, no-wrap
+msgid ""
+" ethernet0.present = \"TRUE\"\n"
+" ethernet0.addressType = \"generated\"\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:333
-msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
+#, no-wrap
+msgid ""
+" displayName = \"Test Boot PXE\"\n"
+" guestOS = \"other\"\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:338
+#, no-wrap
 msgid ""
-"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
-"83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
-"de 3f-ae 9e 07 91 1d 8d 71 3b\" ethernet0.generatedAddressOffset = \"0\""
+" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\"\n"
+" uuid.location = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
+" uuid.bios = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
+" ethernet0.generatedAddressOffset = \"0\"\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/user_customization-contents.ssi.po b/manual/po/ro/user_customization-contents.ssi.po
index 3419522..126bd8d 100644
--- a/manual/po/ro/user_customization-contents.ssi.po
+++ b/manual/po/ro/user_customization-contents.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-10 16:54-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-23 16:43+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -21,28 +21,24 @@ msgstr ""
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
-#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
-#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
-#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
-#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
-#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
-#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/about_manual.ssi:170 en/project_bugs.ssi:58
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
-#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
-#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi: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_customization-installer.ssi:32
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -56,27 +52,28 @@ msgstr ""
 #: en/user_customization-packages.ssi:199
 #: en/user_customization-packages.ssi:215
 #: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:290
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:312
-#: en/user_customization-packages.ssi:330 en/user_customization-runtime.ssi:14
+#: en/user_customization-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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:132 en/user_installation.ssi:147
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -88,28 +85,24 @@ msgstr "code{"
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
 #: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/other_faq.ssi:37 en/other_faq.ssi:46
-#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
-#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
-#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
-#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
-#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
-#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/about_manual.ssi:174 en/project_bugs.ssi:62
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi: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_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
@@ -122,27 +115,29 @@ msgstr "code{"
 #: en/user_customization-packages.ssi:191
 #: en/user_customization-packages.ssi:203
 #: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:294
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:316
-#: en/user_customization-packages.ssi:343 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:118
-#: en/user_installation.ssi:137 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -245,9 +240,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:29
+#, no-wrap
 msgid ""
-"$ mkdir -p config/chroot_local-includes/var/www $ cp /path/to/my/index.html "
-"config/chroot_local-includes/var/www"
+" $ mkdir -p config/chroot_local-includes/var/www\n"
+" $ cp /path/to/my/index.html config/chroot_local-includes/var/www\n"
 msgstr ""
 
 #. type: Plain text
@@ -259,14 +255,14 @@ msgstr ""
 #: en/user_customization-contents.ssi:44
 #, no-wrap
 msgid ""
-"-- config\n"
-"   [...]\n"
-"    |-- chroot_local-includes\n"
-"    |   `-- var\n"
-"    |       `-- www\n"
-"    |           `-- index.html\n"
-"   [...]\n"
-"    `-- templates\n"
+" -- config\n"
+"    [...]\n"
+"     |-- chroot_local-includes\n"
+"     |   `-- var\n"
+"     |       `-- www\n"
+"     |           `-- index.html\n"
+"    [...]\n"
+"     `-- templates\n"
 msgstr ""
 
 #. type: Plain text
@@ -295,7 +291,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:56
-msgid "$ cp ~/video_demo.* config/binary_local-includes/"
+#, no-wrap
+msgid " $ cp ~/video_demo.* config/binary_local-includes/\n"
 msgstr ""
 
 #. type: Plain text
@@ -317,7 +314,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:68
-msgid "$ lb config --includes none"
+#, no-wrap
+msgid " $ lb config --includes none\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 16d90a5..11fed06 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: 2010-12-16 08:39-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-11-30 10:53+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -33,12 +33,12 @@ msgstr ""
 #: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
 #: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
 #: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_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_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -55,24 +55,25 @@ msgstr ""
 #: 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-runtime.ssi:14
+#: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi: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: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -96,12 +97,12 @@ msgstr "code{"
 #: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
 #: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
 #: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -118,24 +119,25 @@ msgstr "code{"
 #: 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-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi: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: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -252,19 +254,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:34
+#: en/user_customization-installer.ssi:35
+#, no-wrap
 msgid ""
-"$ lb config --architecture i386 --linux-flavours 486 --debian-installer live "
-"--packages debian-installer-launcher"
+" $ lb config --architecture i386 --linux-flavours 486 \\\n"
+"     --debian-installer live --packages debian-installer-launcher\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:39
 msgid "2~ Customizing Debian Installer by preseeding"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:40
+#: en/user_customization-installer.ssi:41
 msgid ""
 "As described in the Debian Installer Manual, Appendix B at http://www.debian."
 "org/releases/stable/i386/apb.html, \"Preseeding provides a way to set "
@@ -278,19 +281,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:44
+#: en/user_customization-installer.ssi:46
+#, no-wrap
 msgid ""
-"$ echo \"d-i debian-installer/locale string en_US\" >> config/binary_debian-"
-"installer/preseed.cfg"
+" $ echo \"d-i debian-installer/locale string en_US\" \\\n"
+"     >> config/binary_debian-installer/preseed.cfg\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:50
 msgid "2~ Customizing Debian Installer content"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:50
+#: en/user_customization-installer.ssi:52
 msgid ""
 "For experimental or debugging purposes, you might want to include locally "
 "built #{d-i}# component udeb packages. Place these in #{config/binary_local-"
diff --git a/manual/po/ro/user_customization-packages.ssi.po b/manual/po/ro/user_customization-packages.ssi.po
index 979b088..3169d24 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: 2010-12-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-22 08:58-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -38,7 +38,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -59,16 +59,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -101,8 +101,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -122,17 +122,17 @@ msgstr "code{"
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -201,7 +201,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:16
-msgid "$ lb config --distribution sid"
+#, no-wrap
+msgid " $ lb config --distribution sid\n"
 msgstr ""
 
 #. type: Plain text
@@ -216,7 +217,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:24
-msgid "$ lb config --archive-areas \"main contrib\""
+#, no-wrap
+msgid " $ lb config --archive-areas \"main contrib\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -275,8 +277,8 @@ msgstr ""
 #: en/user_customization-packages.ssi:43
 #, no-wrap
 msgid ""
-"$ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
-"            --mirror-chroot-security http://localhost/debian-security/\n"
+" $ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
+"             --mirror-chroot-security http://localhost/debian-security/\n"
 msgstr ""
 
 #. type: Plain text
@@ -308,8 +310,8 @@ msgstr ""
 #: en/user_customization-packages.ssi:56
 #, no-wrap
 msgid ""
-"$ lb config --mirror-binary http://mirror/debian/ \\\n"
-"            --mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --mirror-binary http://mirror/debian/ \\\n"
+"             --mirror-binary-security http://mirror/debian-security/\n"
 msgstr ""
 
 #. type: Plain text
@@ -339,7 +341,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:68
-msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
+#, no-wrap
+msgid " deb http://live.debian.net/ sid-snapshots main contrib non-free\n"
 msgstr ""
 
 #. type: Plain text
@@ -372,7 +375,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
-msgid "$ lb config --repository live.debian.net"
+#, no-wrap
+msgid " $ lb config --repository live.debian.net\n"
 msgstr ""
 
 #. type: Plain text
@@ -407,7 +411,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:96
-msgid "$ lb config --packages \"package1 package2 package3\""
+#, no-wrap
+msgid " $ lb config --packages \"package1 package2 package3\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -458,7 +463,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:114
-msgid "$ lb config --packages-lists \"gnome-core rescue\""
+#, no-wrap
+msgid " $ lb config --packages-lists \"gnome-core rescue\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -554,7 +560,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:145
-msgid "#include <gnome> iceweasel"
+#, no-wrap
+msgid ""
+" #include <gnome>\n"
+" iceweasel\n"
 msgstr ""
 
 #. type: Plain text
@@ -582,7 +591,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:159
-msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
+#, no-wrap
+msgid ""
+" #if ARCHITECTURE amd64\n"
+" ia32-libs\n"
+" #endif\n"
 msgstr ""
 
 #. type: Plain text
@@ -594,7 +607,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:169
-msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
+#, no-wrap
+msgid ""
+" #if ARCHITECTURE i386 amd64\n"
+" memtest86+\n"
+" #endif\n"
 msgstr ""
 
 #. type: Plain text
@@ -607,7 +624,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:179
-msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
+#, no-wrap
+msgid ""
+" #if ARCHIVE_AREAS contrib non-free\n"
+" vrms\n"
+" #endif\n"
 msgstr ""
 
 #. type: Plain text
@@ -617,7 +638,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:189
-msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
+#, no-wrap
+msgid ""
+" #if ARCHITECTURE amd64\n"
+" #include <gnome-full>\n"
+" #endif\n"
 msgstr ""
 
 #. type: Plain text
@@ -643,7 +668,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:201
-msgid "$ lb config --tasks \"mail-server file-server\""
+#, no-wrap
+msgid " $ lb config --tasks \"mail-server file-server\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -691,8 +717,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:217
-msgid ""
-"$ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\""
+#, no-wrap
+msgid " $ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -725,7 +751,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:229
-msgid "$ lb config --language es"
+#, no-wrap
+msgid " $ lb config --language es\n"
 msgstr ""
 
 #. type: Plain text
@@ -942,7 +969,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:293
-msgid "$ lb config --apt-http-proxy http://proxy/"
+#, no-wrap
+msgid " $ lb config --apt-http-proxy http://proxy/\n"
 msgstr ""
 
 #. type: Plain text
@@ -967,7 +995,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:305
-msgid "$ lb config --binary-indices false"
+#, no-wrap
+msgid " $ lb config --binary-indices false\n"
 msgstr ""
 
 #. type: Plain text
@@ -989,7 +1018,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:315
-msgid "$ lb config --apt-recommends false"
+#, no-wrap
+msgid " $ lb config --apt-recommends false\n"
 msgstr ""
 
 #. type: Plain text
@@ -1048,15 +1078,23 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:337
+#, no-wrap
 msgid ""
-"$ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid."
-"chroot $ cat >>config/chroot_apt/preferences <<END Package: live-* Pin: "
-"release n=sid Pin-Priority: 600"
+" $ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid.chroot\n"
+" $ cat >>config/chroot_apt/preferences <<END\n"
+" Package: live-*\n"
+" Pin: release n=sid\n"
+" Pin-Priority: 600\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:342
-msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
+#, no-wrap
+msgid ""
+" Package: *\n"
+" Pin: release n=sid\n"
+" Pin-Priority: 1\n"
+" END\n"
 msgstr ""
 
 #. type: Plain text
@@ -1072,5 +1110,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:352
-msgid "Package: gnome-keyring Pin: version * Pin-Priority: -1"
+#, no-wrap
+msgid ""
+" Package: gnome-keyring\n"
+" Pin: version *\n"
+" Pin-Priority: -1\n"
 msgstr ""
diff --git a/manual/po/ro/user_customization-runtime.ssi.po b/manual/po/ro/user_customization-runtime.ssi.po
index e3bb81f..6671956 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: 2010-12-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-11-30 11:40+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -38,7 +38,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -59,16 +59,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -101,8 +101,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -122,17 +122,17 @@ msgstr "code{"
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -189,9 +189,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:16
-msgid ""
-"debconf passwd/user-default-groups string audio cdrom dialout floppy video "
-"plugdev netdev powerdev fuse"
+#, no-wrap
+msgid " debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse\n"
 msgstr ""
 
 #. type: Plain text
@@ -229,7 +228,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:34
-msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
+#, no-wrap
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -252,9 +252,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:45
+#, no-wrap
 msgid ""
-"$ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name <name>se</"
-"name>"
+" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
+" <name>se</name>\n"
 msgstr ""
 
 #. type: Plain text
@@ -265,8 +266,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:53
-msgid ""
-"$ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\""
+#, no-wrap
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -277,14 +278,15 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:61
+#: en/user_customization-runtime.ssi:62
+#, no-wrap
 msgid ""
-"$ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); do basename $i | "
-"head -c -9; echo; done | sort | less"
+" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
+"     do basename $i | head -c -9; echo; done | sort | less\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:65
+#: en/user_customization-runtime.ssi:66
 msgid ""
 "Alternatively, you can use the #{console-setup}# package, a tool to let you "
 "configure console layout using X (XKB) definitions; you can then set your "
@@ -296,19 +298,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:69
+#: en/user_customization-runtime.ssi:71
+#, no-wrap
 msgid ""
-"$ lb config --bootappend-live \"locales=fr_FR.UTF-8 keyboard-layouts=fr "
-"keyboard-variant=bepo keyboard-model=tm2030usb\""
+" $ lb config --bootappend-live \\\n"
+"     \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:73
+#: en/user_customization-runtime.ssi:75
 msgid "2~persistence Persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:75
+#: en/user_customization-runtime.ssi:77
 msgid ""
 "A live cd paradigm is a pre-installed system which runs from read-only "
 "media, like a cdrom, where writes and modifications do not survive reboots "
@@ -316,7 +319,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:77
+#: en/user_customization-runtime.ssi:79
 msgid ""
 "A Debian Live system is a generalization of this paradigm and thus supports "
 "other media in addition to CDs; but still, in its default behaviour, it "
@@ -325,7 +328,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:79
+#: en/user_customization-runtime.ssi:81
 msgid ""
 "Persistence is a common name for different kinds of solutions for saving "
 "across reboots some, or all, of this run-time evolution of the system. To "
@@ -336,7 +339,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:81
+#: en/user_customization-runtime.ssi:83
 msgid ""
 "The data stored on this ramdisk should be saved on a writable persistent "
 "medium like a Hard Disk, a USB key, a network share or even a session of a "
@@ -346,12 +349,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:85
 msgid "3~ Full persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:87
 msgid ""
 "By 'full persistence' it is meant that instead of using a tmpfs for storing "
 "modifications to the read-only media (with the copy-on-write, COW, system) a "
@@ -363,26 +366,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:89
-msgid "# mkfs.ext2 -L live-rw /dev/sdb1"
+#: en/user_customization-runtime.ssi:91
+#, no-wrap
+msgid " # mkfs.ext2 -L live-rw /dev/sdb1\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:95
 msgid ""
 "If you already have a partition on your device, you could just change the "
 "label with one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:100
+#, no-wrap
 msgid ""
-"# tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems # dosfslabel /dev/"
-"sdb1 live-rw # for a fat filesystem"
+" # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
+" # dosfslabel /dev/sdb1 live-rw # for a fat filesystem\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:102
+#: en/user_customization-runtime.ssi:104
 msgid ""
 "But since live system users cannot always use a hard drive partition, and "
 "considering that most USB keys have poor write speeds, 'full' persistence "
@@ -392,26 +397,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:107
+#: en/user_customization-runtime.ssi:109
+#, no-wrap
 msgid ""
-"$ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file $ /"
-"sbin/mkfs.ext2 -F live-rw"
+" $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
+" $ /sbin/mkfs.ext2 -F live-rw\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:113
 msgid ""
 "Then copy the #{live-rw}# file to a writable partition and reboot with the "
 "boot parameter 'persistent'."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:113
+#: en/user_customization-runtime.ssi:115
 msgid "3~ Home automounting"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:117
 msgid ""
 "If during the boot a partition (filesystem) image file or a partition "
 "labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
@@ -420,12 +426,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:117
+#: en/user_customization-runtime.ssi:119
 msgid "3~ Snapshots"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:119
+#: en/user_customization-runtime.ssi:121
 msgid ""
 "Snapshots are collections of files and directories which are not mounted "
 "while running but which are copied from a persistent device to the system "
@@ -442,26 +448,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:121
+#: en/user_customization-runtime.ssi:123
 msgid ""
 "A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
 "works the same as the main snapshot but it is only applied to /home."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:123
+#: en/user_customization-runtime.ssi:125
 msgid ""
 "Snapshots cannot currently handle file deletion but full persistence and "
 "home automounting can."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:125
+#: en/user_customization-runtime.ssi:127
 msgid "3~ Persistent SubText"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:127
+#: en/user_customization-runtime.ssi:129
 msgid ""
 "If a user would need multiple persistent storage of the same type for "
 "different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-"
@@ -473,12 +479,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:129
+#: en/user_customization-runtime.ssi:131
 msgid "3~ Partial remastering"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:132
 msgid ""
 "The run-time modification of the tmpfs could be collected using live-"
 "snapshot in a squashfs and added to the cd by remastering the iso in the "
diff --git a/manual/po/ro/user_examples.ssi.po b/manual/po/ro/user_examples.ssi.po
index 0f09335..7314afb 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: 2010-12-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-11-04 16:34-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -43,7 +43,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -64,16 +64,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -106,8 +106,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -127,17 +127,17 @@ msgstr "code{"
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -152,8 +152,9 @@ msgstr "}code"
 
 #. type: Plain text
 #: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
-#: en/user_examples.ssi:109 en/user_examples.ssi:156 en/user_examples.ssi:208
-msgid "# lb build"
+#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#, no-wrap
+msgid " # lb build\n"
 msgstr ""
 
 #. type: Plain text
@@ -198,9 +199,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:18
+#, no-wrap
 msgid ""
-"LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\" LB_MIRROR_CHROOT=\"http://"
-"mirror/debian\" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\""
+" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
+" LB_MIRROR_CHROOT=\"http://mirror/debian\"\n"
+" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -229,7 +232,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:32
-msgid "$ mkdir tutorial1 ; cd tutorial1 ; lb config"
+#, no-wrap
+msgid " $ mkdir tutorial1 ; cd tutorial1 ; lb config\n"
 msgstr ""
 
 #. type: Plain text
@@ -247,8 +251,9 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:230
-msgid "# lb build 2>&1 | tee binary.log"
+#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:231
+#, no-wrap
+msgid " # lb build 2>&1 | tee binary.log\n"
 msgstr ""
 
 #. type: Plain text
@@ -284,8 +289,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:56
-msgid ""
-"$ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel"
+#, no-wrap
+msgid " $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel\n"
 msgstr ""
 
 #. type: Plain text
@@ -340,9 +345,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:84
+#, no-wrap
 msgid ""
-"$ mkdir -p tutorial3/auto $ cp /usr/share/live/build/examples/auto/* "
-"tutorial3/auto/ $ cd tutorial3"
+" $ mkdir -p tutorial3/auto\n"
+" $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/\n"
+" $ cd tutorial3\n"
 msgstr ""
 
 #. type: Plain text
@@ -352,19 +359,20 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:92 en/user_examples.ssi:141
-msgid "#!/bin/sh"
+#, no-wrap
+msgid " #!/bin/sh\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:99
 #, no-wrap
 msgid ""
-"lb config noauto \\\n"
-"    --architecture i386 \\\n"
-"    --linux-flavours 686 \\\n"
-"    --packages-lists lxde \\\n"
-"    --packages \"iceweasel xchat\" \\\n"
-"    \"${@}\"\n"
+" lb config noauto \\\n"
+"     --architecture i386 \\\n"
+"     --linux-flavours 686 \\\n"
+"     --packages-lists lxde \\\n"
+"     --packages \"iceweasel xchat\" \\\n"
+"     \"${@}\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -400,7 +408,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:121
-msgid "$ git init $ git add auto $ git commit -a -m \"Initial import.\""
+#, no-wrap
+msgid ""
+" $ git init\n"
+" $ git add auto\n"
+" $ git commit -a -m \"Initial import.\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -426,7 +438,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:133
-msgid "# lb clean"
+#, no-wrap
+msgid " # lb clean\n"
 msgstr ""
 
 #. type: Plain text
@@ -438,12 +451,12 @@ msgstr ""
 #: en/user_examples.ssi:148
 #, no-wrap
 msgid ""
-"lb config noauto \\\n"
-"    --architecture i386 \\\n"
-"    --linux-flavours 686 \\\n"
-"    --packages-lists lxde \\\n"
-"    --packages \"iceweasel xchat vlc\" \\\n"
-"    \"${@}\"\n"
+" lb config noauto \\\n"
+"     --architecture i386 \\\n"
+"     --linux-flavours 686 \\\n"
+"     --packages-lists lxde \\\n"
+"     --packages \"iceweasel xchat vlc\" \\\n"
+"     \"${@}\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -452,13 +465,19 @@ msgid "Build again:"
 msgstr ""
 
 #. type: Plain text
+#: en/user_examples.ssi:156
+msgid "# lb build"
+msgstr ""
+
+#. type: Plain text
 #: en/user_examples.ssi:160
 msgid "Test, and when you're satisfied, commit the next revision:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:164
-msgid "$ git commit -a -m \"Adding vlc media player.\""
+#, no-wrap
+msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -505,11 +524,11 @@ msgstr ""
 #: en/user_examples.ssi:184
 #, no-wrap
 msgid ""
-"$ mkdir vnc_kiosk_client\n"
-"$ cd vnc_kiosk_client\n"
-"$ lb config -a i386 -k 686 -p standard-x11 \\\n"
-"    --packages \"gdm3 metacity xvnc4viewer\" \\\n"
-"    --apt-recommends false\n"
+" $ mkdir vnc_kiosk_client\n"
+" $ cd vnc_kiosk_client\n"
+" $ lb config -a i386 -k 686 -p standard-x11 \\\n"
+"     --packages \"gdm3 metacity xvnc4viewer\" \\\n"
+"     --apt-recommends false\n"
 msgstr ""
 
 #. type: Plain text
@@ -522,19 +541,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:194
+#, no-wrap
 msgid ""
-"$ mkdir -p config/chroot_local-includes/etc/skel $ cat >config/chroot_local-"
-"includes/etc/skel/.xsession <<END #!/bin/sh"
+" $ mkdir -p config/chroot_local-includes/etc/skel\n"
+" $ cat >config/chroot_local-includes/etc/skel/.xsession <<END\n"
+" #!/bin/sh\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:197
-msgid "/usr/bin/metacity & /usr/bin/xvncviewer 192.168.1.2:1"
+#, no-wrap
+msgid ""
+" /usr/bin/metacity &\n"
+" /usr/bin/xvncviewer 192.168.1.2:1\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:200
-msgid "exit END"
+#, no-wrap
+msgid ""
+" exit\n"
+" END\n"
 msgstr ""
 
 #. type: Plain text
@@ -573,19 +600,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:222
+#: en/user_examples.ssi:223
+#, no-wrap
 msgid ""
-"$ lb config -k 486 -p minimal --binary-indices false --memtest none --apt-"
-"recommends false --includes none"
+" $ lb config -k 486 -p minimal --binary-indices false \\\n"
+"     --memtest none --apt-recommends false --includes none\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:226
+#: en/user_examples.ssi:227
 msgid "Now, build the image in the usual way:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:234
+#: en/user_examples.ssi:235
 msgid ""
 "On the author's system at time of writing, the above configuration produced "
 "a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
@@ -593,7 +621,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:236
+#: en/user_examples.ssi:237
 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 "
@@ -611,18 +639,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:238
+#: en/user_examples.ssi:239
 msgid "2~ A localized KDE desktop and installer"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:240
+#: en/user_examples.ssi:241
 #, no-wrap
 msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:242
+#: en/user_examples.ssi:243
 msgid ""
 "We want to make an iso-hybrid image for i386 architecture using our "
 "preferred desktop, in this case KDE, containing all of the same packages "
@@ -630,7 +658,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:244
+#: en/user_examples.ssi:245
 msgid ""
 "Our initial problem is the discovery of the names of the appropriate tasks. "
 "Currently, live-build cannot help with this. While we might get lucky and "
@@ -640,55 +668,56 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:248
-msgid "# apt-get install dctrl-tools tasksel-data"
+#: en/user_examples.ssi:249
+#, no-wrap
+msgid " # apt-get install dctrl-tools tasksel-data\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:252
+#: en/user_examples.ssi:253
 msgid "Now we can search for the appropriate tasks, first with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:261
+#: en/user_examples.ssi:262
 #, no-wrap
 msgid ""
-"$ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
-"Task: brazilian-portuguese\n"
-"Description: Brazilian Portuguese environment\n"
-" This task installs programs, data files, and\n"
-" documentation that make it easier for Brazilian Portuguese speakers\n"
-" to use Debian.\n"
+" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" Task: brazilian-portuguese\n"
+" Description: Brazilian Portuguese environment\n"
+"  This task installs programs, data files, and\n"
+"  documentation that make it easier for Brazilian Portuguese speakers\n"
+"  to use Debian.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:265
+#: en/user_examples.ssi:266
 msgid ""
 "By this command, we discover the task is called, plainly enough, brazilian-"
 "portuguese. Now to find the related tasks:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:272
+#: en/user_examples.ssi:273
 #, no-wrap
 msgid ""
-"$ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
-"Task: brazilian-portuguese-desktop\n"
-"Description: Brazilian Portuguese desktop\n"
-" This task localises the desktop in Brasilian Portuguese.\n"
+" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" Task: brazilian-portuguese-desktop\n"
+" Description: Brazilian Portuguese desktop\n"
+"  This task localises the desktop in Brasilian Portuguese.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:276
+#: en/user_examples.ssi:277
 #, no-wrap
 msgid ""
-"Task: brazilian-portuguese-kde-desktop\n"
-"Description: Brazilian Portuguese KDE desktop\n"
-" This task localises the KDE desktop in Brazilian Portuguese.\n"
+" Task: brazilian-portuguese-kde-desktop\n"
+" Description: Brazilian Portuguese KDE desktop\n"
+"  This task localises the KDE desktop in Brazilian Portuguese.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:280
+#: en/user_examples.ssi:281
 msgid ""
 "We will use the experimental #{--language}# option, as live-build happens to "
 "include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
@@ -698,12 +727,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:294
+#: en/user_examples.ssi:295
 #, no-wrap
 msgid ""
-"$ mkdir live-pt_BR-kde\n"
-"$ cd live-pt_BR-kde\n"
-"$ lb config \\\n"
+" $ mkdir live-pt_BR-kde\n"
+" $ cd live-pt_BR-kde\n"
+" $ lb config \\\n"
 "     -a i386 \\\n"
 "     -k 486 \\\n"
 "     -p kde-desktop \\\n"
@@ -715,7 +744,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:298
+#: en/user_examples.ssi:299
 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 "
diff --git a/manual/po/ro/user_installation.ssi.po b/manual/po/ro/user_installation.ssi.po
index 727d552..51bf046 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: 2010-12-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-23 16:43+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -38,7 +38,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -59,16 +59,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -101,8 +101,8 @@ msgstr "code{"
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -122,17 +122,17 @@ msgstr "code{"
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -147,7 +147,8 @@ msgstr "}code"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
-msgid "$ lb config --repository live.debian.net"
+#, no-wrap
+msgid " $ lb config --repository live.debian.net\n"
 msgstr ""
 
 #. type: Plain text
@@ -246,7 +247,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:40
-msgid "# apt-get install live-build"
+#, no-wrap
+msgid " # apt-get install live-build\n"
 msgstr ""
 
 #. type: Plain text
@@ -256,7 +258,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:48
-msgid "# aptitude install live-build"
+#, no-wrap
+msgid " # aptitude install live-build\n"
 msgstr ""
 
 #. type: Plain text
@@ -274,7 +277,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:58
-msgid "$ git clone git://live.debian.net/git/live-build.git"
+#, no-wrap
+msgid " $ git clone git://live.debian.net/git/live-build.git\n"
 msgstr ""
 
 #. type: Plain text
@@ -284,7 +288,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:68
-msgid "$ cd live-build $ dpkg-buildpackage -rfakeroot -b -uc -us $ cd .."
+#, no-wrap
+msgid ""
+" $ cd live-build\n"
+" $ dpkg-buildpackage -rfakeroot -b -uc -us\n"
+" $ cd ..\n"
 msgstr ""
 
 #. type: Plain text
@@ -296,7 +304,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:76
-msgid "# dpkg -i live-build_2.0.8-1_all.deb"
+#, no-wrap
+msgid " # dpkg -i live-build_2.0.8-1_all.deb\n"
 msgstr ""
 
 #. type: Plain text
@@ -306,7 +315,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:84
-msgid "# make install"
+#, no-wrap
+msgid " # make install\n"
 msgstr ""
 
 #. type: Plain text
@@ -316,7 +326,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:92
-msgid "# make uninstall"
+#, no-wrap
+msgid " # make uninstall\n"
 msgstr ""
 
 #. type: Plain text
@@ -364,12 +375,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:117
+#, no-wrap
 msgid ""
-"$ git clone git://live.debian.net/git/live-boot.git $ git clone git://live."
-"debian.net/git/live-config.git"
+" $ git clone git://live.debian.net/git/live-boot.git\n"
+" $ git clone git://live.debian.net/git/live-config.git\n"
 msgstr ""
-"$ git clone git://live.debian.net/git/live-boot.git $ git clone git://live."
-"debian.net/git/live-config.git"
 
 #. type: Plain text
 #: en/user_installation.ssi:121
@@ -404,9 +414,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:134
+#, no-wrap
 msgid ""
-"$ cd live-boot $ dpkg-buildpackage -b -uc -us $ cd ../live-config $ dpkg-"
-"buildpackage -b -uc -us"
+" $ cd live-boot\n"
+" $ dpkg-buildpackage -b -uc -us\n"
+" $ cd ../live-config\n"
+" $ dpkg-buildpackage -b -uc -us\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/user_managing_a_configuration.ssi.po b/manual/po/ro/user_managing_a_configuration.ssi.po
index 43dcda6..7508a18 100644
--- a/manual/po/ro/user_managing_a_configuration.ssi.po
+++ b/manual/po/ro/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-17 07:53-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-13 17:00+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -33,12 +33,12 @@ msgstr ""
 #: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
 #: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
 #: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_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_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -55,24 +55,25 @@ msgstr ""
 #: 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-runtime.ssi:14
+#: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi: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: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -96,12 +97,12 @@ msgstr "code{"
 #: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
 #: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
 #: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -118,24 +119,25 @@ msgstr "code{"
 #: 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-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi: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: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -236,10 +238,10 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:29
 #, no-wrap
 msgid ""
-"#!/bin/sh\n"
-"lb config noauto \\\n"
-"\t--packages-lists \"standard\" \\\n"
-"\t\"${@}\"\n"
+" #!/bin/sh\n"
+" lb config noauto \\\n"
+"     --packages-lists \"standard\" \\\n"
+"     \"${@}\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -251,11 +253,11 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:41
 #, no-wrap
 msgid ""
-"#!/bin/sh\n"
-"lb clean noauto \"${@}\"\n"
-"rm -f config/binary config/bootstrap \\\n"
-"\tconfig/chroot config/common config/source\n"
-"rm -f binary.log\n"
+" #!/bin/sh\n"
+" lb clean noauto \"${@}\"\n"
+" rm -f config/binary config/bootstrap \\\n"
+"     config/chroot config/common config/source\n"
+" rm -f binary.log\n"
 msgstr ""
 
 #. type: Plain text
@@ -265,7 +267,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_managing_a_configuration.ssi:50
-msgid "#!/bin/sh lb build noauto \"${@}\" 2>&1 | tee binary.log"
+#, no-wrap
+msgid ""
+" #!/bin/sh\n"
+" lb build noauto \"${@}\" 2>&1 | tee binary.log\n"
 msgstr ""
 
 #. type: Plain text
@@ -277,7 +282,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_managing_a_configuration.ssi:58
-msgid "$ cp /usr/share/live/build/examples/auto/* auto/"
+#, no-wrap
+msgid " $ cp /usr/share/live/build/examples/auto/* auto/\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/user_overview.ssi.po b/manual/po/ro/user_overview.ssi.po
index fb82bd8..285fe6b 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: 2010-12-17 07:53-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: 2010-10-22 07:52-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -33,12 +33,12 @@ msgstr ""
 #: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
 #: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
 #: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_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_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -55,24 +55,25 @@ msgstr ""
 #: 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-runtime.ssi:14
+#: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi: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: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -96,12 +97,12 @@ msgstr "code{"
 #: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
 #: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
 #: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -118,24 +119,25 @@ msgstr "code{"
 #: 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-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi: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: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -265,39 +267,53 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:39
-msgid "$ lb config P: Creating config tree"
+#, no-wrap
+msgid ""
+" $ lb config\n"
+" P: Creating config tree\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:44
+#, no-wrap
 msgid ""
-"$ ls -l total 8 drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto drwxr-xr-x 22 "
-"user user 4096 Sep 7 13:02 config"
+" $ ls -l\n"
+" total 8\n"
+" drwxr-xr-x  3 user user 4096 Sep  7 13:02 auto\n"
+" drwxr-xr-x 22 user user 4096 Sep  7 13:02 config\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:72
+#, no-wrap
 msgid ""
-"$ ls -l config/ total 104 -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary "
-"drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer drwxr-xr-x 2 "
-"user user 4096 Sep 7 13:02 binary_debian-installer-includes drwxr-xr-x 2 "
-"user user 4096 Sep 7 13:02 binary_grub drwxr-xr-x 2 user user 4096 Sep 7 "
-"13:02 binary_local-debs drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-"
-"hooks drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes drwxr-xr-"
-"x 2 user user 4096 Sep 7 13:02 binary_local-packageslists drwxr-xr-x 2 user "
-"user 4096 Sep 7 13:02 binary_local-udebs drwxr-xr-x 2 user user 4096 Sep 7 "
-"13:02 binary_rootfs drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux -"
-"rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap -rw-r--r-- 1 user user 1647 "
-"Sep 7 13:02 chroot drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt drwxr-"
-"xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks drwxr-xr-x 2 user user "
-"4096 Sep 7 13:02 chroot_local-includes drwxr-xr-x 2 user user 4096 Sep 7 "
-"13:02 chroot_local-packages drwxr-xr-x 2 user user 4096 Sep 7 13:02 "
-"chroot_local-packageslists drwxr-xr-x 2 user user 4096 Sep 7 13:02 "
-"chroot_local-patches drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-"
-"preseed drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources -rw-r--r-- 1 "
-"user user 2954 Sep 7 13:02 common drwxr-xr-x 2 user user 4096 Sep 7 13:02 "
-"includes -rw-r--r-- 1 user user 205 Sep 7 13:02 source drwxr-xr-x 2 user "
-"user 4096 Sep 7 13:02 templates"
+" $ ls -l config/\n"
+" total 104\n"
+" -rw-r--r-- 1 user user 4197 Sep  7 13:02 binary\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_debian-installer\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_debian-installer-includes\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_grub\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-debs\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-hooks\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-includes\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-packageslists\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-udebs\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_rootfs\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_syslinux\n"
+" -rw-r--r-- 1 user user 2051 Sep  7 13:02 bootstrap\n"
+" -rw-r--r-- 1 user user 1647 Sep  7 13:02 chroot\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_apt\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-hooks\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-includes\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-packages\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-packageslists\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-patches\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-preseed\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_sources\n"
+" -rw-r--r-- 1 user user 2954 Sep  7 13:02 common\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 includes\n"
+" -rw-r--r-- 1 user user  205 Sep  7 13:02 source\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 templates\n"
 msgstr ""
 
 #. type: Plain text
@@ -318,7 +334,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:82
-msgid "$ lb config -p gnome"
+#, no-wrap
+msgid " $ lb config -p gnome\n"
 msgstr ""
 
 #. type: Plain text
@@ -328,9 +345,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:90
-msgid ""
-"$ lb config --binary-images net --hostname live-machine --username live-"
-"user ..."
+#, no-wrap
+msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/about_manual.ssi.pot b/manual/pot/about_manual.ssi.pot
index 2d8e9df..2470c5a 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: 2010-12-09 10:51-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -305,31 +305,28 @@ msgstr ""
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
-#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
-#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
-#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
-#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
-#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
-#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/about_manual.ssi:170 en/project_bugs.ssi:58
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
-#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
-#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-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/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi: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_customization-installer.ssi:32
+#: en/user_customization-installer.ssi:43
+#: 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
@@ -339,27 +336,28 @@ msgstr ""
 #: en/user_customization-packages.ssi:199
 #: en/user_customization-packages.ssi:215
 #: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:290
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:312
-#: en/user_customization-packages.ssi:330 en/user_customization-runtime.ssi:14
+#: en/user_customization-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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:132 en/user_installation.ssi:147
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -376,31 +374,28 @@ msgstr ""
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
 #: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/other_faq.ssi:37 en/other_faq.ssi:46
-#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
-#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
-#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
-#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
-#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
-#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/about_manual.ssi:174 en/project_bugs.ssi:62
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70 en/user_customization-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/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi: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_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
@@ -409,27 +404,29 @@ msgstr ""
 #: en/user_customization-packages.ssi:191
 #: en/user_customization-packages.ssi:203
 #: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:294
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:316
-#: en/user_customization-packages.ssi:343 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:118
-#: en/user_installation.ssi:137 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -447,7 +444,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:94
-msgid "# apt-get install make po4a sisu-complete"
+#, no-wrap
+msgid " # apt-get install make po4a sisu-complete\n"
 msgstr ""
 
 #. type: Plain text
@@ -459,7 +457,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:102
-msgid "$ make build"
+#, no-wrap
+msgid " $ make build\n"
 msgstr ""
 
 #. type: Plain text
@@ -472,7 +471,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:110
-msgid "$ make build LANGUAGES=en"
+#, no-wrap
+msgid " $ make build LANGUAGES=en\n"
 msgstr ""
 
 #. type: Plain text
@@ -497,12 +497,12 @@ msgstr ""
 #: en/about_manual.ssi:127
 #, no-wrap
 msgid ""
-"$ mkdir -p ~/.ssh/identity.d\n"
-"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
-"\t-O ~/.ssh/identity.d/gitosis at live.debian.net\n"
-"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-"\t-O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
+" $ mkdir -p ~/.ssh/identity.d\n"
+" $ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
+"     -O ~/.ssh/identity.d/gitosis at live.debian.net\n"
+" $ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
+"     -O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
+" $ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
 msgstr ""
 
 #. type: Plain text
@@ -514,12 +514,12 @@ msgstr ""
 #: en/about_manual.ssi:140
 #, no-wrap
 msgid ""
-"$ cat >> ~/.ssh/config << EOF\n"
-"Host live.debian.net\n"
-"        Hostname live.debian.net\n"
-"        User gitosis\n"
-"        IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
-"EOF\n"
+" $ cat >> ~/.ssh/config << EOF\n"
+" Host live.debian.net\n"
+"     Hostname live.debian.net\n"
+"     User gitosis\n"
+"     IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
+" EOF\n"
 msgstr ""
 
 #. type: Plain text
@@ -529,7 +529,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:148
-msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
+#, no-wrap
+msgid " $ git clone gitosis at live.debian.net:/live-manual.git\n"
 msgstr ""
 
 #. type: Plain text
@@ -542,7 +543,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:156
-msgid "$ make commit"
+#, no-wrap
+msgid " $ make commit\n"
 msgstr ""
 
 #. type: Plain text
@@ -556,7 +558,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:164
-msgid "$ git commit -a -m \"Adding a section on applying patches.\""
+#, no-wrap
+msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -566,7 +569,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:172
-msgid "$ git push"
+#, no-wrap
+msgid " $ git push\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/project_bugs.ssi.pot b/manual/pot/project_bugs.ssi.pot
index ae34f2d..c7b5a88 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: 2010-12-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -58,16 +58,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -100,8 +100,8 @@ msgstr ""
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -121,17 +121,17 @@ msgstr ""
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -323,7 +323,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:60
-msgid "# lb build 2>&1 | tee build.log"
+#, no-wrap
+msgid " # lb build 2>&1 | tee build.log\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/project_coding-style.ssi.pot b/manual/pot/project_coding-style.ssi.pot
index 41d439a..e0cc3de 100644
--- a/manual/pot/project_coding-style.ssi.pot
+++ b/manual/pot/project_coding-style.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-12-17 14:37+0100\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -54,24 +54,25 @@ msgstr ""
 #: 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-runtime.ssi:14
+#: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi: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: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -99,8 +100,8 @@ msgstr ""
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -117,24 +118,25 @@ msgstr ""
 #: 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-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi: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: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -214,9 +216,9 @@ msgstr ""
 #: en/project_coding-style.ssi:32
 #, no-wrap
 msgid ""
-"if foo; then\n"
-"        bar\n"
-"fi\n"
+" if foo; then\n"
+"         bar\n"
+" fi\n"
 msgstr ""
 
 #. type: Plain text
@@ -229,10 +231,10 @@ msgstr ""
 #: en/project_coding-style.ssi:43
 #, no-wrap
 msgid ""
-"if foo\n"
-"then\n"
-"        bar\n"
-"fi\n"
+" if foo\n"
+" then\n"
+"         bar\n"
+" fi\n"
 msgstr ""
 
 #. type: Plain text
@@ -244,19 +246,19 @@ msgstr ""
 #: en/project_coding-style.ssi:55
 #, no-wrap
 msgid ""
-"foo () {\n"
-"        bar\n"
-"}\n"
+" foo () {\n"
+"         bar\n"
+" }\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:66
 #, no-wrap
 msgid ""
-"foo ()\n"
-"{\n"
-"        bar\n"
-"}\n"
+" foo ()\n"
+" {\n"
+"         bar\n"
+" }\n"
 msgstr ""
 
 #. type: Plain text
@@ -321,12 +323,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:94
-msgid "FOO=bar"
+#, no-wrap
+msgid " FOO=bar\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:102
-msgid "FOO=\"bar\""
+#, no-wrap
+msgid " FOO=\"bar\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -338,20 +342,20 @@ msgstr ""
 #: en/project_coding-style.ssi:115
 #, no-wrap
 msgid ""
-"if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
-"then\n"
-"        foobar\n"
-"fi\n"
+" if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
+" then\n"
+"         foobar\n"
+" fi\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:126
 #, no-wrap
 msgid ""
-"if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
-"then\n"
-"        foobar\n"
-"fi\n"
+" if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
+" then\n"
+"         foobar\n"
+" fi\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/project_procedures.ssi.pot b/manual/pot/project_procedures.ssi.pot
index 473a9f2..84ff6c7 100644
--- a/manual/pot/project_procedures.ssi.pot
+++ b/manual/pot/project_procedures.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-12-19 18:55-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -58,16 +58,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -100,8 +100,8 @@ msgstr ""
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -121,17 +121,17 @@ msgstr ""
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -173,7 +173,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:14
-msgid "$ ../../scripts/l10n/output-l10n-changes . -d"
+#, no-wrap
+msgid " $ ../../scripts/l10n/output-l10n-changes . -d\n"
 msgstr ""
 
 #. type: Plain text
@@ -257,11 +258,11 @@ msgstr ""
 #: en/project_procedures.ssi:52
 #, no-wrap
 msgid ""
-"$ sed \\\n"
-"  -e 's|%major%|5.0|g' \\\n"
-"  -e 's|%minor%|5.0.2|g' \\\n"
-"  -e 's|%codename%|lenny|g' \\\n"
-"  -e 's|%release_mail%|2009/msg00007.html|g'\n"
+" $ sed \\\n"
+"     -e 's|%major%|5.0|g' \\\n"
+"     -e 's|%minor%|5.0.2|g' \\\n"
+"     -e 's|%codename%|lenny|g' \\\n"
+"     -e 's|%release_mail%|2009/msg00007.html|g'\n"
 msgstr ""
 
 #. type: Plain text
@@ -273,166 +274,179 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:60
-msgid "Debian Live images for Debian GNU/Linux %major% updated"
+#, no-wrap
+msgid " Debian Live images for Debian GNU/Linux %major% updated\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:64
+#, no-wrap
 msgid ""
-"The Debian Live project is pleased to announce the availability of updated "
-"Live images for its stable distribution Debian GNU/Linux %major% (codename "
-"\"%codename%\")."
+" The Debian Live project is pleased to announce the availability of\n"
+" updated Live images for its stable distribution Debian GNU/Linux %major%\n"
+" (codename \"%codename%\").\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:66
-msgid "The images are available for download at:"
+#, no-wrap
+msgid " The images are available for download at:\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:68
 #, no-wrap
-msgid "    <http://cdimage.debian.org/cdimage/release/current-live/>\n"
+msgid "     <http://cdimage.debian.org/cdimage/release/current-live/>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:73
+#, no-wrap
 msgid ""
-"This update incorporates the changes made in the %minor% point release, "
-"which adds corrections for security problems to the stable release along "
-"with a few adjustments for serious problems. A full list of the changes may "
-"be viewed at:"
+" This update incorporates the changes made in the %minor% point release,\n"
+" which adds corrections for security problems to the stable release\n"
+" along with a few adjustments for serious problems. A full list of the\n"
+" changes may be viewed at:\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:75
 #, no-wrap
-msgid "    <http://lists.debian.org/debian-announce/%release_mail%>\n"
+msgid "     <http://lists.debian.org/debian-announce/%release_mail%>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:77
-msgid "It also includes the following Live-specific changes:"
+#, no-wrap
+msgid " It also includes the following Live-specific changes:\n"
 msgstr ""
 
-#. type: Bullet: ' * '
+#. type: Bullet: '  * '
 #: en/project_procedures.ssi:81
 msgid "[INSERT LIVE-SPECIFIC CHANGE HERE]"
 msgstr ""
 
-#. type: Bullet: ' * '
+#. type: Bullet: '  * '
 #: en/project_procedures.ssi:81
 msgid "[LARGER ISSUES MAY DESERVE THEIR OWN SECTION]"
 msgstr ""
 
 #. type: Plain text
-#: en/project_procedures.ssi:84
+#: en/project_procedures.ssi:85
 #, no-wrap
 msgid ""
-"URLs\n"
-"----\n"
+" URLs\n"
+" ----\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:87
-msgid "Download location of updated images:"
+#, no-wrap
+msgid " Download location of updated images:\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:89
 #, no-wrap
-msgid "  <http://cdimage.debian.org/cdimage/release/current-live/>\n"
+msgid "   <http://cdimage.debian.org/cdimage/release/current-live/>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:91
-msgid "Debian Live project homepage:"
+#, no-wrap
+msgid " Debian Live project homepage:\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:93
 #, no-wrap
-msgid "  <http://live.debian.net/>\n"
+msgid "   <http://live.debian.net/>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:95
-msgid "The current stable distribution:"
+#, no-wrap
+msgid " The current stable distribution:\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:97
 #, no-wrap
-msgid "  <http://ftp.debian.org/debian/dists/stable>\n"
+msgid "   <http://ftp.debian.org/debian/dists/stable>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:99
-msgid "stable distribution information (release notes, errata etc.):"
+#, no-wrap
+msgid " stable distribution information (release notes, errata etc.):\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:101
 #, no-wrap
-msgid "  <http://www.debian.org/releases/stable/>\n"
+msgid "   <http://www.debian.org/releases/stable/>\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:103
-msgid "Security announcements and information:"
+#, no-wrap
+msgid " Security announcements and information:\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:105
 #, no-wrap
-msgid "  <http://www.debian.org/security/>\n"
+msgid "   <http://www.debian.org/security/>\n"
 msgstr ""
 
 #. type: Plain text
-#: en/project_procedures.ssi:108
+#: en/project_procedures.ssi:109
 #, no-wrap
 msgid ""
-"About Debian\n"
-"-------------\n"
+" About Debian\n"
+" -------------\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:113
+#, no-wrap
 msgid ""
-"The Debian Project is an association of Free Software developers who "
-"volunteer their time and effort in order to produce the completely free "
-"operating system Debian GNU/Linux."
+" The Debian Project is an association of Free Software developers who\n"
+" volunteer their time and effort in order to produce the completely free\n"
+" operating system Debian GNU/Linux.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/project_procedures.ssi:116
+#: en/project_procedures.ssi:117
 #, no-wrap
 msgid ""
-"About Debian Live\n"
-"-----------------\n"
+" About Debian Live\n"
+" -----------------\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:122
+#, no-wrap
 msgid ""
-"Debian Live is an official sub-project of Debian which produces Debian "
-"systems that do not require a classical installer. Images are available for "
-"CD/DVD discs, USB sticks and PXE netbooting as well as a bare filesystem "
-"images for booting directly from the internet."
+" Debian Live is an official sub-project of Debian which produces Debian\n"
+" systems that do not require a classical installer. Images are available\n"
+" for CD/DVD discs, USB sticks and PXE netbooting as well as a bare\n"
+" filesystem images for booting directly from the internet.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/project_procedures.ssi:125
+#: en/project_procedures.ssi:126
 #, no-wrap
 msgid ""
-"Contact Information\n"
-"-------------------\n"
+" Contact Information\n"
+" -------------------\n"
 msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:130
+#, no-wrap
 msgid ""
-"For further information, please visit the Debian Live web pages at <http://"
-"live.debian.net/> or alternatively send mail to <debian-live at lists.debian."
-"org>."
+" For further information, please visit the Debian Live web pages at\n"
+" <http://live.debian.net/> or alternatively send mail to\n"
+" <debian-live at lists.debian.org>.\n"
 msgstr ""
diff --git a/manual/pot/user_basics.ssi.pot b/manual/pot/user_basics.ssi.pot
index 713a168..e0f1dc8 100644
--- a/manual/pot/user_basics.ssi.pot
+++ b/manual/pot/user_basics.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-12-19 10:06-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -57,17 +57,17 @@ msgstr ""
 #: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_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:188
-#: en/user_examples.ssi:204 en/user_examples.ssi:218 en/user_examples.ssi:226
-#: en/user_examples.ssi:244 en/user_examples.ssi:252 en/user_examples.ssi:265
-#: en/user_examples.ssi:280 en/user_installation.ssi:38
+#: 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
@@ -100,8 +100,8 @@ msgstr ""
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -120,18 +120,18 @@ msgstr ""
 #: 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:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_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:184 en/user_examples.ssi:200
-#: en/user_examples.ssi:208 en/user_examples.ssi:222 en/user_examples.ssi:230
-#: en/user_examples.ssi:248 en/user_examples.ssi:261 en/user_examples.ssi:276
-#: en/user_examples.ssi:294 en/user_installation.ssi:42
+#: 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
@@ -262,7 +262,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:32
-msgid "$ lb config"
+#, no-wrap
+msgid " $ lb config\n"
 msgstr ""
 
 #. type: Plain text
@@ -281,8 +282,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
-#: en/user_examples.ssi:109 en/user_examples.ssi:156 en/user_examples.ssi:206
-msgid "# lb build"
+#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#, no-wrap
+msgid " # lb build\n"
 msgstr ""
 
 #. type: Plain text
@@ -304,12 +306,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:54 en/user_basics.ssi:142
-msgid "# apt-get install qemu"
+#, no-wrap
+msgid " # apt-get install qemu\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:56
-msgid "$ qemu -cdrom binary.iso"
+#, no-wrap
+msgid " $ qemu -cdrom binary.iso\n"
 msgstr ""
 
 #. type: Plain text
@@ -324,12 +328,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:66
-msgid "# apt-get install virtualbox-ose virtualbox-ose-dkms"
+#, no-wrap
+msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:68
-msgid "$ virtualbox"
+#, no-wrap
+msgid " $ virtualbox\n"
 msgstr ""
 
 #. type: Plain text
@@ -350,7 +356,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:78
-msgid "# lb config --packages virtualbox-ose-guest-x11"
+#, no-wrap
+msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
 msgstr ""
 
 #. type: Plain text
@@ -365,12 +372,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:88
-msgid "# apt-get install wodim"
+#, no-wrap
+msgid " # apt-get install wodim\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:90
-msgid "$ wodim binary.iso"
+#, no-wrap
+msgid " $ wodim binary.iso\n"
 msgstr ""
 
 #. type: Plain text
@@ -399,8 +408,9 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:102
-msgid "$ lb clean --binary"
+#: en/user_basics.ssi:102 en/user_basics.ssi:184
+#, no-wrap
+msgid " # lb clean --binary\n"
 msgstr ""
 
 #. type: Plain text
@@ -412,7 +422,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:110
-msgid "$ lb config -b usb-hdd"
+#, no-wrap
+msgid " $ lb config -b usb-hdd\n"
 msgstr ""
 
 #. type: Plain text
@@ -435,7 +446,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:128
-msgid "$ dd if=binary.img of=${USBSTICK}"
+#, no-wrap
+msgid " $ dd if=binary.img of=${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
@@ -467,7 +479,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:144
-msgid "$ qemu -hda binary.img"
+#, no-wrap
+msgid " $ qemu -hda binary.img\n"
 msgstr ""
 
 #. type: Plain text
@@ -486,7 +499,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:154
-msgid "# gparted ${USBSTICK}"
+#, no-wrap
+msgid " # gparted ${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
@@ -498,7 +512,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:162
-msgid "# mkfs.ext4 ${USBSTICK}"
+#, no-wrap
+msgid " # mkfs.ext4 ${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
@@ -508,7 +523,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:170
-msgid "# mkfs.vfat -F 32"
+#, no-wrap
+msgid " # mkfs.vfat -F 32\n"
 msgstr ""
 
 #. type: Plain text
@@ -538,11 +554,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:184
-msgid "# lb clean --binary"
-msgstr ""
-
-#. type: Plain text
 #: en/user_basics.ssi:188
 msgid ""
 "Run the #{lb config}# command as follows to configure your image for "
@@ -551,9 +562,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:192
-msgid ""
-"$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
-"\"192.168.0.1\""
+#, no-wrap
+msgid " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -616,39 +626,46 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:220
-msgid "# /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server"
+#, no-wrap
+msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:222
-msgid "ddns-update-style none;"
+#, no-wrap
+msgid " ddns-update-style none;\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:225
+#, no-wrap
 msgid ""
-"option domain-name \"example.org\"; option domain-name-servers ns1.example."
-"org, ns2.example.org;"
+" option domain-name \"example.org\";\n"
+" option domain-name-servers ns1.example.org, ns2.example.org;\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:228
-msgid "default-lease-time 600; max-lease-time 7200;"
+#, no-wrap
+msgid ""
+" default-lease-time 600;\n"
+" max-lease-time 7200;\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:230
-msgid "log-facility local7;"
+#, no-wrap
+msgid " log-facility local7;\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:236
 #, no-wrap
 msgid ""
-"subnet 192.168.0.0 netmask 255.255.255.0 {\n"
-"  range 192.168.0.1 192.168.0.254;\n"
-"  next-server servername;\n"
-"  filename \"pxelinux.0\";\n"
+" subnet 192.168.0.0 netmask 255.255.255.0 {\n"
+"   range 192.168.0.1 192.168.0.254;\n"
+"   next-server servername;\n"
+"   filename \"pxelinux.0\";\n"
 "}\n"
 msgstr ""
 
@@ -672,7 +689,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:248
-msgid "# dpkg-reconfigure -plow tftpd-hpa"
+#, no-wrap
+msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
 msgstr ""
 
 #. type: Plain text
@@ -707,7 +725,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:264
-msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
+#, no-wrap
+msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
 msgstr ""
 
 #. type: Plain text
@@ -718,7 +737,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:272
-msgid "# exportfs -rv"
+#, no-wrap
+msgid " # exportfs -rv\n"
 msgstr ""
 
 #. type: Plain text
@@ -767,11 +787,16 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:299
+#, no-wrap
 msgid ""
-"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
-"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
-"sudo /sbin/ifconfig $1 0.0.0.0 promisc up echo \"Adding $1 to br0...\" sudo /"
-"usr/sbin/brctl addif br0 $1 sleep 2"
+" #!/bin/sh\n"
+" sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1\n"
+" echo \"Executing /etc/qemu-ifup\"\n"
+" echo \"Bringing up $1 for bridged mode...\"\n"
+" sudo /sbin/ifconfig $1 0.0.0.0 promisc up\n"
+" echo \"Adding $1 to br0...\"\n"
+" sudo /usr/sbin/brctl addif br0 $1\n"
+" sleep 2\n"
 msgstr ""
 
 #. type: Plain text
@@ -809,34 +834,50 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:321
+#, no-wrap
 msgid ""
-"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
-"\"512\" MemAllowAutoScaleDown = \"FALSE\""
+" #!/usr/bin/vmware\n"
+" config.version = \"8\"\n"
+" virtualHW.version = \"4\"\n"
+" memsize = \"512\"\n"
+" MemAllowAutoScaleDown = \"FALSE\"\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:327
+#, no-wrap
 msgid ""
-"ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
-"\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
+" ide0:0.present = \"FALSE\"\n"
+" ide1:0.present = \"FALSE\"\n"
+" floppy0.present = \"FALSE\"\n"
+" sound.present = \"FALSE\"\n"
+" tools.remindInstall = \"FALSE\"\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:330
-msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
+#, no-wrap
+msgid ""
+" ethernet0.present = \"TRUE\"\n"
+" ethernet0.addressType = \"generated\"\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:333
-msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
+#, no-wrap
+msgid ""
+" displayName = \"Test Boot PXE\"\n"
+" guestOS = \"other\"\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:338
+#, no-wrap
 msgid ""
-"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
-"83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
-"de 3f-ae 9e 07 91 1d 8d 71 3b\" ethernet0.generatedAddressOffset = \"0\""
+" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\"\n"
+" uuid.location = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
+" uuid.bios = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
+" ethernet0.generatedAddressOffset = \"0\"\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/user_customization-contents.ssi.pot b/manual/pot/user_customization-contents.ssi.pot
index 41cfc47..74550fd 100644
--- a/manual/pot/user_customization-contents.ssi.pot
+++ b/manual/pot/user_customization-contents.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-12-10 16:54-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -20,28 +20,24 @@ msgstr ""
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/other_faq.ssi:41 en/other_faq.ssi:83
-#: en/other_faq.ssi:103 en/other_faq.ssi:117 en/other_faq.ssi:137
-#: en/other_faq.ssi:151 en/other_faq.ssi:198 en/other_faq.ssi:245
-#: en/other_faq.ssi:261 en/other_faq.ssi:287 en/other_faq.ssi:299
-#: en/other_faq.ssi:314 en/other_faq.ssi:333 en/other_faq.ssi:345
-#: en/other_faq.ssi:353 en/other_faq.ssi:364 en/other_faq.ssi:374
-#: en/other_howtos.ssi:16 en/other_howtos.ssi:43 en/project_bugs.ssi:58
+#: en/about_manual.ssi:170 en/project_bugs.ssi:58
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:142
-#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
-#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
-#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
-#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
+#: en/user_basics.ssi: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_customization-installer.ssi:32
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -55,27 +51,28 @@ msgstr ""
 #: en/user_customization-packages.ssi:199
 #: en/user_customization-packages.ssi:215
 #: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:290
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:312
-#: en/user_customization-packages.ssi:330 en/user_customization-runtime.ssi:14
+#: en/user_customization-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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:132 en/user_installation.ssi:147
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi: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_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 +84,24 @@ msgstr ""
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
 #: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/other_faq.ssi:37 en/other_faq.ssi:46
-#: en/other_faq.ssi:92 en/other_faq.ssi:108 en/other_faq.ssi:141
-#: en/other_faq.ssi:155 en/other_faq.ssi:207 en/other_faq.ssi:256
-#: en/other_faq.ssi:292 en/other_faq.ssi:307 en/other_faq.ssi:319
-#: en/other_faq.ssi:337 en/other_faq.ssi:349 en/other_faq.ssi:358
-#: en/other_faq.ssi:370 en/other_faq.ssi:381 en/other_howtos.ssi:20
-#: en/other_howtos.ssi:47 en/project_bugs.ssi:62
+#: en/about_manual.ssi:174 en/project_bugs.ssi:62
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
-#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
-#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
-#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
-#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
-#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi: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_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
@@ -121,27 +114,29 @@ msgstr ""
 #: en/user_customization-packages.ssi:191
 #: en/user_customization-packages.ssi:203
 #: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:294
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:316
-#: en/user_customization-packages.ssi:343 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:118
-#: en/user_installation.ssi:137 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -244,9 +239,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:29
+#, no-wrap
 msgid ""
-"$ mkdir -p config/chroot_local-includes/var/www $ cp /path/to/my/index.html "
-"config/chroot_local-includes/var/www"
+" $ mkdir -p config/chroot_local-includes/var/www\n"
+" $ cp /path/to/my/index.html config/chroot_local-includes/var/www\n"
 msgstr ""
 
 #. type: Plain text
@@ -258,14 +254,14 @@ msgstr ""
 #: en/user_customization-contents.ssi:44
 #, no-wrap
 msgid ""
-"-- config\n"
-"   [...]\n"
-"    |-- chroot_local-includes\n"
-"    |   `-- var\n"
-"    |       `-- www\n"
-"    |           `-- index.html\n"
-"   [...]\n"
-"    `-- templates\n"
+" -- config\n"
+"    [...]\n"
+"     |-- chroot_local-includes\n"
+"     |   `-- var\n"
+"     |       `-- www\n"
+"     |           `-- index.html\n"
+"    [...]\n"
+"     `-- templates\n"
 msgstr ""
 
 #. type: Plain text
@@ -294,7 +290,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:56
-msgid "$ cp ~/video_demo.* config/binary_local-includes/"
+#, no-wrap
+msgid " $ cp ~/video_demo.* config/binary_local-includes/\n"
 msgstr ""
 
 #. type: Plain text
@@ -316,7 +313,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:68
-msgid "$ lb config --includes none"
+#, no-wrap
+msgid " $ lb config --includes none\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/user_customization-installer.ssi.pot b/manual/pot/user_customization-installer.ssi.pot
index 4e5b524..ad1dcfc 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: 2010-12-16 08:39-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -32,12 +32,12 @@ msgstr ""
 #: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
 #: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
 #: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_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_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -54,24 +54,25 @@ msgstr ""
 #: 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-runtime.ssi:14
+#: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi: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: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -95,12 +96,12 @@ msgstr ""
 #: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
 #: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
 #: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -117,24 +118,25 @@ msgstr ""
 #: 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-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi: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: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -251,19 +253,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:34
+#: en/user_customization-installer.ssi:35
+#, no-wrap
 msgid ""
-"$ lb config --architecture i386 --linux-flavours 486 --debian-installer live "
-"--packages debian-installer-launcher"
+" $ lb config --architecture i386 --linux-flavours 486 \\\n"
+"     --debian-installer live --packages debian-installer-launcher\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:39
 msgid "2~ Customizing Debian Installer by preseeding"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:40
+#: en/user_customization-installer.ssi:41
 msgid ""
 "As described in the Debian Installer Manual, Appendix B at http://www.debian."
 "org/releases/stable/i386/apb.html, \"Preseeding provides a way to set "
@@ -277,19 +280,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:44
+#: en/user_customization-installer.ssi:46
+#, no-wrap
 msgid ""
-"$ echo \"d-i debian-installer/locale string en_US\" >> config/binary_debian-"
-"installer/preseed.cfg"
+" $ echo \"d-i debian-installer/locale string en_US\" \\\n"
+"     >> config/binary_debian-installer/preseed.cfg\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:50
 msgid "2~ Customizing Debian Installer content"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:50
+#: en/user_customization-installer.ssi:52
 msgid ""
 "For experimental or debugging purposes, you might want to include locally "
 "built #{d-i}# component udeb packages. Place these in #{config/binary_local-"
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index 8af1b94..36ec449 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: 2010-12-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -58,16 +58,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -100,8 +100,8 @@ msgstr ""
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -121,17 +121,17 @@ msgstr ""
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -200,7 +200,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:16
-msgid "$ lb config --distribution sid"
+#, no-wrap
+msgid " $ lb config --distribution sid\n"
 msgstr ""
 
 #. type: Plain text
@@ -215,7 +216,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:24
-msgid "$ lb config --archive-areas \"main contrib\""
+#, no-wrap
+msgid " $ lb config --archive-areas \"main contrib\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -274,8 +276,8 @@ msgstr ""
 #: en/user_customization-packages.ssi:43
 #, no-wrap
 msgid ""
-"$ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
-"            --mirror-chroot-security http://localhost/debian-security/\n"
+" $ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
+"             --mirror-chroot-security http://localhost/debian-security/\n"
 msgstr ""
 
 #. type: Plain text
@@ -307,8 +309,8 @@ msgstr ""
 #: en/user_customization-packages.ssi:56
 #, no-wrap
 msgid ""
-"$ lb config --mirror-binary http://mirror/debian/ \\\n"
-"            --mirror-binary-security http://mirror/debian-security/\n"
+" $ lb config --mirror-binary http://mirror/debian/ \\\n"
+"             --mirror-binary-security http://mirror/debian-security/\n"
 msgstr ""
 
 #. type: Plain text
@@ -338,7 +340,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:68
-msgid "deb http://live.debian.net/ sid-snapshots main contrib non-free"
+#, no-wrap
+msgid " deb http://live.debian.net/ sid-snapshots main contrib non-free\n"
 msgstr ""
 
 #. type: Plain text
@@ -371,7 +374,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
-msgid "$ lb config --repository live.debian.net"
+#, no-wrap
+msgid " $ lb config --repository live.debian.net\n"
 msgstr ""
 
 #. type: Plain text
@@ -406,7 +410,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:96
-msgid "$ lb config --packages \"package1 package2 package3\""
+#, no-wrap
+msgid " $ lb config --packages \"package1 package2 package3\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -457,7 +462,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:114
-msgid "$ lb config --packages-lists \"gnome-core rescue\""
+#, no-wrap
+msgid " $ lb config --packages-lists \"gnome-core rescue\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -553,7 +559,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:145
-msgid "#include <gnome> iceweasel"
+#, no-wrap
+msgid ""
+" #include <gnome>\n"
+" iceweasel\n"
 msgstr ""
 
 #. type: Plain text
@@ -581,7 +590,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:159
-msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
+#, no-wrap
+msgid ""
+" #if ARCHITECTURE amd64\n"
+" ia32-libs\n"
+" #endif\n"
 msgstr ""
 
 #. type: Plain text
@@ -593,7 +606,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:169
-msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
+#, no-wrap
+msgid ""
+" #if ARCHITECTURE i386 amd64\n"
+" memtest86+\n"
+" #endif\n"
 msgstr ""
 
 #. type: Plain text
@@ -606,7 +623,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:179
-msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
+#, no-wrap
+msgid ""
+" #if ARCHIVE_AREAS contrib non-free\n"
+" vrms\n"
+" #endif\n"
 msgstr ""
 
 #. type: Plain text
@@ -616,7 +637,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:189
-msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
+#, no-wrap
+msgid ""
+" #if ARCHITECTURE amd64\n"
+" #include <gnome-full>\n"
+" #endif\n"
 msgstr ""
 
 #. type: Plain text
@@ -642,7 +667,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:201
-msgid "$ lb config --tasks \"mail-server file-server\""
+#, no-wrap
+msgid " $ lb config --tasks \"mail-server file-server\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -690,8 +716,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:217
-msgid ""
-"$ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\""
+#, no-wrap
+msgid " $ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -724,7 +750,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:229
-msgid "$ lb config --language es"
+#, no-wrap
+msgid " $ lb config --language es\n"
 msgstr ""
 
 #. type: Plain text
@@ -941,7 +968,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:293
-msgid "$ lb config --apt-http-proxy http://proxy/"
+#, no-wrap
+msgid " $ lb config --apt-http-proxy http://proxy/\n"
 msgstr ""
 
 #. type: Plain text
@@ -966,7 +994,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:305
-msgid "$ lb config --binary-indices false"
+#, no-wrap
+msgid " $ lb config --binary-indices false\n"
 msgstr ""
 
 #. type: Plain text
@@ -988,7 +1017,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:315
-msgid "$ lb config --apt-recommends false"
+#, no-wrap
+msgid " $ lb config --apt-recommends false\n"
 msgstr ""
 
 #. type: Plain text
@@ -1047,15 +1077,23 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:337
+#, no-wrap
 msgid ""
-"$ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid."
-"chroot $ cat >>config/chroot_apt/preferences <<END Package: live-* Pin: "
-"release n=sid Pin-Priority: 600"
+" $ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid.chroot\n"
+" $ cat >>config/chroot_apt/preferences <<END\n"
+" Package: live-*\n"
+" Pin: release n=sid\n"
+" Pin-Priority: 600\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:342
-msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
+#, no-wrap
+msgid ""
+" Package: *\n"
+" Pin: release n=sid\n"
+" Pin-Priority: 1\n"
+" END\n"
 msgstr ""
 
 #. type: Plain text
@@ -1071,5 +1109,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:352
-msgid "Package: gnome-keyring Pin: version * Pin-Priority: -1"
+#, no-wrap
+msgid ""
+" Package: gnome-keyring\n"
+" Pin: version *\n"
+" Pin-Priority: -1\n"
 msgstr ""
diff --git a/manual/pot/user_customization-runtime.ssi.pot b/manual/pot/user_customization-runtime.ssi.pot
index 7479ee2..0a221b5 100644
--- a/manual/pot/user_customization-runtime.ssi.pot
+++ b/manual/pot/user_customization-runtime.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-12-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -58,16 +58,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -100,8 +100,8 @@ msgstr ""
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -121,17 +121,17 @@ msgstr ""
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -188,9 +188,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:16
-msgid ""
-"debconf passwd/user-default-groups string audio cdrom dialout floppy video "
-"plugdev netdev powerdev fuse"
+#, no-wrap
+msgid " debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse\n"
 msgstr ""
 
 #. type: Plain text
@@ -228,7 +227,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:34
-msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
+#, no-wrap
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -251,9 +251,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:45
+#, no-wrap
 msgid ""
-"$ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name <name>se</"
-"name>"
+" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
+" <name>se</name>\n"
 msgstr ""
 
 #. type: Plain text
@@ -264,8 +265,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:53
-msgid ""
-"$ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\""
+#, no-wrap
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -276,14 +277,15 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:61
+#: en/user_customization-runtime.ssi:62
+#, no-wrap
 msgid ""
-"$ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); do basename $i | "
-"head -c -9; echo; done | sort | less"
+" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
+"     do basename $i | head -c -9; echo; done | sort | less\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:65
+#: en/user_customization-runtime.ssi:66
 msgid ""
 "Alternatively, you can use the #{console-setup}# package, a tool to let you "
 "configure console layout using X (XKB) definitions; you can then set your "
@@ -295,19 +297,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:69
+#: en/user_customization-runtime.ssi:71
+#, no-wrap
 msgid ""
-"$ lb config --bootappend-live \"locales=fr_FR.UTF-8 keyboard-layouts=fr "
-"keyboard-variant=bepo keyboard-model=tm2030usb\""
+" $ lb config --bootappend-live \\\n"
+"     \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:73
+#: en/user_customization-runtime.ssi:75
 msgid "2~persistence Persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:75
+#: en/user_customization-runtime.ssi:77
 msgid ""
 "A live cd paradigm is a pre-installed system which runs from read-only "
 "media, like a cdrom, where writes and modifications do not survive reboots "
@@ -315,7 +318,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:77
+#: en/user_customization-runtime.ssi:79
 msgid ""
 "A Debian Live system is a generalization of this paradigm and thus supports "
 "other media in addition to CDs; but still, in its default behaviour, it "
@@ -324,7 +327,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:79
+#: en/user_customization-runtime.ssi:81
 msgid ""
 "Persistence is a common name for different kinds of solutions for saving "
 "across reboots some, or all, of this run-time evolution of the system. To "
@@ -335,7 +338,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:81
+#: en/user_customization-runtime.ssi:83
 msgid ""
 "The data stored on this ramdisk should be saved on a writable persistent "
 "medium like a Hard Disk, a USB key, a network share or even a session of a "
@@ -345,12 +348,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:83
+#: en/user_customization-runtime.ssi:85
 msgid "3~ Full persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:87
 msgid ""
 "By 'full persistence' it is meant that instead of using a tmpfs for storing "
 "modifications to the read-only media (with the copy-on-write, COW, system) a "
@@ -362,26 +365,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:89
-msgid "# mkfs.ext2 -L live-rw /dev/sdb1"
+#: en/user_customization-runtime.ssi:91
+#, no-wrap
+msgid " # mkfs.ext2 -L live-rw /dev/sdb1\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:95
 msgid ""
 "If you already have a partition on your device, you could just change the "
 "label with one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:100
+#, no-wrap
 msgid ""
-"# tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems # dosfslabel /dev/"
-"sdb1 live-rw # for a fat filesystem"
+" # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems\n"
+" # dosfslabel /dev/sdb1 live-rw # for a fat filesystem\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:102
+#: en/user_customization-runtime.ssi:104
 msgid ""
 "But since live system users cannot always use a hard drive partition, and "
 "considering that most USB keys have poor write speeds, 'full' persistence "
@@ -391,26 +396,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:107
+#: en/user_customization-runtime.ssi:109
+#, no-wrap
 msgid ""
-"$ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file $ /"
-"sbin/mkfs.ext2 -F live-rw"
+" $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file\n"
+" $ /sbin/mkfs.ext2 -F live-rw\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:113
 msgid ""
 "Then copy the #{live-rw}# file to a writable partition and reboot with the "
 "boot parameter 'persistent'."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:113
+#: en/user_customization-runtime.ssi:115
 msgid "3~ Home automounting"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:117
 msgid ""
 "If during the boot a partition (filesystem) image file or a partition "
 "labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
@@ -419,12 +425,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:117
+#: en/user_customization-runtime.ssi:119
 msgid "3~ Snapshots"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:119
+#: en/user_customization-runtime.ssi:121
 msgid ""
 "Snapshots are collections of files and directories which are not mounted "
 "while running but which are copied from a persistent device to the system "
@@ -441,26 +447,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:121
+#: en/user_customization-runtime.ssi:123
 msgid ""
 "A /home version of snapshot exists too and its label is #{home-sn.*}#; it "
 "works the same as the main snapshot but it is only applied to /home."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:123
+#: en/user_customization-runtime.ssi:125
 msgid ""
 "Snapshots cannot currently handle file deletion but full persistence and "
 "home automounting can."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:125
+#: en/user_customization-runtime.ssi:127
 msgid "3~ Persistent SubText"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:127
+#: en/user_customization-runtime.ssi:129
 msgid ""
 "If a user would need multiple persistent storage of the same type for "
 "different locations or testing, such as #{live-rw-nonwork}# and #{live-rw-"
@@ -472,12 +478,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:129
+#: en/user_customization-runtime.ssi:131
 msgid "3~ Partial remastering"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.ssi:130
+#: en/user_customization-runtime.ssi:132
 msgid ""
 "The run-time modification of the tmpfs could be collected using live-"
 "snapshot in a squashfs and added to the cd by remastering the iso in the "
diff --git a/manual/pot/user_examples.ssi.pot b/manual/pot/user_examples.ssi.pot
index a1b54fc..1b9a83e 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: 2010-12-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,7 +42,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -63,16 +63,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -105,8 +105,8 @@ msgstr ""
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -126,17 +126,17 @@ msgstr ""
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -151,8 +151,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
-#: en/user_examples.ssi:109 en/user_examples.ssi:156 en/user_examples.ssi:208
-msgid "# lb build"
+#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#, no-wrap
+msgid " # lb build\n"
 msgstr ""
 
 #. type: Plain text
@@ -197,9 +198,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:18
+#, no-wrap
 msgid ""
-"LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\" LB_MIRROR_CHROOT=\"http://"
-"mirror/debian\" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\""
+" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
+" LB_MIRROR_CHROOT=\"http://mirror/debian\"\n"
+" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -228,7 +231,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:32
-msgid "$ mkdir tutorial1 ; cd tutorial1 ; lb config"
+#, no-wrap
+msgid " $ mkdir tutorial1 ; cd tutorial1 ; lb config\n"
 msgstr ""
 
 #. type: Plain text
@@ -246,8 +250,9 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:230
-msgid "# lb build 2>&1 | tee binary.log"
+#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:231
+#, no-wrap
+msgid " # lb build 2>&1 | tee binary.log\n"
 msgstr ""
 
 #. type: Plain text
@@ -283,8 +288,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:56
-msgid ""
-"$ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel"
+#, no-wrap
+msgid " $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel\n"
 msgstr ""
 
 #. type: Plain text
@@ -339,9 +344,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:84
+#, no-wrap
 msgid ""
-"$ mkdir -p tutorial3/auto $ cp /usr/share/live/build/examples/auto/* "
-"tutorial3/auto/ $ cd tutorial3"
+" $ mkdir -p tutorial3/auto\n"
+" $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/\n"
+" $ cd tutorial3\n"
 msgstr ""
 
 #. type: Plain text
@@ -351,19 +358,20 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:92 en/user_examples.ssi:141
-msgid "#!/bin/sh"
+#, no-wrap
+msgid " #!/bin/sh\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:99
 #, no-wrap
 msgid ""
-"lb config noauto \\\n"
-"    --architecture i386 \\\n"
-"    --linux-flavours 686 \\\n"
-"    --packages-lists lxde \\\n"
-"    --packages \"iceweasel xchat\" \\\n"
-"    \"${@}\"\n"
+" lb config noauto \\\n"
+"     --architecture i386 \\\n"
+"     --linux-flavours 686 \\\n"
+"     --packages-lists lxde \\\n"
+"     --packages \"iceweasel xchat\" \\\n"
+"     \"${@}\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -399,7 +407,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:121
-msgid "$ git init $ git add auto $ git commit -a -m \"Initial import.\""
+#, no-wrap
+msgid ""
+" $ git init\n"
+" $ git add auto\n"
+" $ git commit -a -m \"Initial import.\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -425,7 +437,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:133
-msgid "# lb clean"
+#, no-wrap
+msgid " # lb clean\n"
 msgstr ""
 
 #. type: Plain text
@@ -437,12 +450,12 @@ msgstr ""
 #: en/user_examples.ssi:148
 #, no-wrap
 msgid ""
-"lb config noauto \\\n"
-"    --architecture i386 \\\n"
-"    --linux-flavours 686 \\\n"
-"    --packages-lists lxde \\\n"
-"    --packages \"iceweasel xchat vlc\" \\\n"
-"    \"${@}\"\n"
+" lb config noauto \\\n"
+"     --architecture i386 \\\n"
+"     --linux-flavours 686 \\\n"
+"     --packages-lists lxde \\\n"
+"     --packages \"iceweasel xchat vlc\" \\\n"
+"     \"${@}\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -451,13 +464,19 @@ msgid "Build again:"
 msgstr ""
 
 #. type: Plain text
+#: en/user_examples.ssi:156
+msgid "# lb build"
+msgstr ""
+
+#. type: Plain text
 #: en/user_examples.ssi:160
 msgid "Test, and when you're satisfied, commit the next revision:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:164
-msgid "$ git commit -a -m \"Adding vlc media player.\""
+#, no-wrap
+msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -504,11 +523,11 @@ msgstr ""
 #: en/user_examples.ssi:184
 #, no-wrap
 msgid ""
-"$ mkdir vnc_kiosk_client\n"
-"$ cd vnc_kiosk_client\n"
-"$ lb config -a i386 -k 686 -p standard-x11 \\\n"
-"    --packages \"gdm3 metacity xvnc4viewer\" \\\n"
-"    --apt-recommends false\n"
+" $ mkdir vnc_kiosk_client\n"
+" $ cd vnc_kiosk_client\n"
+" $ lb config -a i386 -k 686 -p standard-x11 \\\n"
+"     --packages \"gdm3 metacity xvnc4viewer\" \\\n"
+"     --apt-recommends false\n"
 msgstr ""
 
 #. type: Plain text
@@ -521,19 +540,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:194
+#, no-wrap
 msgid ""
-"$ mkdir -p config/chroot_local-includes/etc/skel $ cat >config/chroot_local-"
-"includes/etc/skel/.xsession <<END #!/bin/sh"
+" $ mkdir -p config/chroot_local-includes/etc/skel\n"
+" $ cat >config/chroot_local-includes/etc/skel/.xsession <<END\n"
+" #!/bin/sh\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:197
-msgid "/usr/bin/metacity & /usr/bin/xvncviewer 192.168.1.2:1"
+#, no-wrap
+msgid ""
+" /usr/bin/metacity &\n"
+" /usr/bin/xvncviewer 192.168.1.2:1\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:200
-msgid "exit END"
+#, no-wrap
+msgid ""
+" exit\n"
+" END\n"
 msgstr ""
 
 #. type: Plain text
@@ -572,19 +599,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:222
+#: en/user_examples.ssi:223
+#, no-wrap
 msgid ""
-"$ lb config -k 486 -p minimal --binary-indices false --memtest none --apt-"
-"recommends false --includes none"
+" $ lb config -k 486 -p minimal --binary-indices false \\\n"
+"     --memtest none --apt-recommends false --includes none\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:226
+#: en/user_examples.ssi:227
 msgid "Now, build the image in the usual way:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:234
+#: en/user_examples.ssi:235
 msgid ""
 "On the author's system at time of writing, the above configuration produced "
 "a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
@@ -592,7 +620,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:236
+#: en/user_examples.ssi:237
 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 "
@@ -610,18 +638,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:238
+#: en/user_examples.ssi:239
 msgid "2~ A localized KDE desktop and installer"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:240
+#: en/user_examples.ssi:241
 #, no-wrap
 msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:242
+#: en/user_examples.ssi:243
 msgid ""
 "We want to make an iso-hybrid image for i386 architecture using our "
 "preferred desktop, in this case KDE, containing all of the same packages "
@@ -629,7 +657,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:244
+#: en/user_examples.ssi:245
 msgid ""
 "Our initial problem is the discovery of the names of the appropriate tasks. "
 "Currently, live-build cannot help with this. While we might get lucky and "
@@ -639,55 +667,56 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:248
-msgid "# apt-get install dctrl-tools tasksel-data"
+#: en/user_examples.ssi:249
+#, no-wrap
+msgid " # apt-get install dctrl-tools tasksel-data\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:252
+#: en/user_examples.ssi:253
 msgid "Now we can search for the appropriate tasks, first with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:261
+#: en/user_examples.ssi:262
 #, no-wrap
 msgid ""
-"$ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
-"Task: brazilian-portuguese\n"
-"Description: Brazilian Portuguese environment\n"
-" This task installs programs, data files, and\n"
-" documentation that make it easier for Brazilian Portuguese speakers\n"
-" to use Debian.\n"
+" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" Task: brazilian-portuguese\n"
+" Description: Brazilian Portuguese environment\n"
+"  This task installs programs, data files, and\n"
+"  documentation that make it easier for Brazilian Portuguese speakers\n"
+"  to use Debian.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:265
+#: en/user_examples.ssi:266
 msgid ""
 "By this command, we discover the task is called, plainly enough, brazilian-"
 "portuguese. Now to find the related tasks:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:272
+#: en/user_examples.ssi:273
 #, no-wrap
 msgid ""
-"$ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
-"Task: brazilian-portuguese-desktop\n"
-"Description: Brazilian Portuguese desktop\n"
-" This task localises the desktop in Brasilian Portuguese.\n"
+" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" Task: brazilian-portuguese-desktop\n"
+" Description: Brazilian Portuguese desktop\n"
+"  This task localises the desktop in Brasilian Portuguese.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:276
+#: en/user_examples.ssi:277
 #, no-wrap
 msgid ""
-"Task: brazilian-portuguese-kde-desktop\n"
-"Description: Brazilian Portuguese KDE desktop\n"
-" This task localises the KDE desktop in Brazilian Portuguese.\n"
+" Task: brazilian-portuguese-kde-desktop\n"
+" Description: Brazilian Portuguese KDE desktop\n"
+"  This task localises the KDE desktop in Brazilian Portuguese.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:280
+#: en/user_examples.ssi:281
 msgid ""
 "We will use the experimental #{--language}# option, as live-build happens to "
 "include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
@@ -697,12 +726,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:294
+#: en/user_examples.ssi:295
 #, no-wrap
 msgid ""
-"$ mkdir live-pt_BR-kde\n"
-"$ cd live-pt_BR-kde\n"
-"$ lb config \\\n"
+" $ mkdir live-pt_BR-kde\n"
+" $ cd live-pt_BR-kde\n"
+" $ lb config \\\n"
 "     -a i386 \\\n"
 "     -k 486 \\\n"
 "     -p kde-desktop \\\n"
@@ -714,7 +743,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:298
+#: en/user_examples.ssi:299
 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 "
diff --git a/manual/pot/user_installation.ssi.pot b/manual/pot/user_installation.ssi.pot
index daa00b3..f94256f 100644
--- a/manual/pot/user_installation.ssi.pot
+++ b/manual/pot/user_installation.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-12-19 18:21-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -37,7 +37,7 @@ msgstr ""
 #: 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:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -58,16 +58,16 @@ msgstr ""
 #: 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:67 en/user_customization-runtime.ssi:87
-#: en/user_customization-runtime.ssi:95 en/user_customization-runtime.ssi:104
+#: 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_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:228
-#: en/user_examples.ssi:246 en/user_examples.ssi:254 en/user_examples.ssi:267
-#: en/user_examples.ssi:282 en/user_installation.ssi:38
+#: 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
@@ -100,8 +100,8 @@ msgstr ""
 #: 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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -121,17 +121,17 @@ msgstr ""
 #: 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:63
-#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:91
-#: en/user_customization-runtime.ssi:100 en/user_customization-runtime.ssi:109
+#: 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_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:224 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:263 en/user_examples.ssi:278
-#: en/user_examples.ssi:296 en/user_installation.ssi:42
+#: 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
@@ -146,7 +146,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
-msgid "$ lb config --repository live.debian.net"
+#, no-wrap
+msgid " $ lb config --repository live.debian.net\n"
 msgstr ""
 
 #. type: Plain text
@@ -245,7 +246,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:40
-msgid "# apt-get install live-build"
+#, no-wrap
+msgid " # apt-get install live-build\n"
 msgstr ""
 
 #. type: Plain text
@@ -255,7 +257,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:48
-msgid "# aptitude install live-build"
+#, no-wrap
+msgid " # aptitude install live-build\n"
 msgstr ""
 
 #. type: Plain text
@@ -273,7 +276,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:58
-msgid "$ git clone git://live.debian.net/git/live-build.git"
+#, no-wrap
+msgid " $ git clone git://live.debian.net/git/live-build.git\n"
 msgstr ""
 
 #. type: Plain text
@@ -283,7 +287,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:68
-msgid "$ cd live-build $ dpkg-buildpackage -rfakeroot -b -uc -us $ cd .."
+#, no-wrap
+msgid ""
+" $ cd live-build\n"
+" $ dpkg-buildpackage -rfakeroot -b -uc -us\n"
+" $ cd ..\n"
 msgstr ""
 
 #. type: Plain text
@@ -295,7 +303,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:76
-msgid "# dpkg -i live-build_2.0.8-1_all.deb"
+#, no-wrap
+msgid " # dpkg -i live-build_2.0.8-1_all.deb\n"
 msgstr ""
 
 #. type: Plain text
@@ -305,7 +314,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:84
-msgid "# make install"
+#, no-wrap
+msgid " # make install\n"
 msgstr ""
 
 #. type: Plain text
@@ -315,7 +325,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:92
-msgid "# make uninstall"
+#, no-wrap
+msgid " # make uninstall\n"
 msgstr ""
 
 #. type: Plain text
@@ -363,9 +374,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:117
+#, no-wrap
 msgid ""
-"$ git clone git://live.debian.net/git/live-boot.git $ git clone git://live."
-"debian.net/git/live-config.git"
+" $ git clone git://live.debian.net/git/live-boot.git\n"
+" $ git clone git://live.debian.net/git/live-config.git\n"
 msgstr ""
 
 #. type: Plain text
@@ -401,9 +413,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:134
+#, no-wrap
 msgid ""
-"$ cd live-boot $ dpkg-buildpackage -b -uc -us $ cd ../live-config $ dpkg-"
-"buildpackage -b -uc -us"
+" $ cd live-boot\n"
+" $ dpkg-buildpackage -b -uc -us\n"
+" $ cd ../live-config\n"
+" $ dpkg-buildpackage -b -uc -us\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/user_managing_a_configuration.ssi.pot b/manual/pot/user_managing_a_configuration.ssi.pot
index e69dd00..c00756d 100644
--- a/manual/pot/user_managing_a_configuration.ssi.pot
+++ b/manual/pot/user_managing_a_configuration.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-12-17 07:53-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -32,12 +32,12 @@ msgstr ""
 #: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
 #: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
 #: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_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_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -54,24 +54,25 @@ msgstr ""
 #: 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-runtime.ssi:14
+#: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi: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: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -95,12 +96,12 @@ msgstr ""
 #: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
 #: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
 #: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -117,24 +118,25 @@ msgstr ""
 #: 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-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi: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: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -235,10 +237,10 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:29
 #, no-wrap
 msgid ""
-"#!/bin/sh\n"
-"lb config noauto \\\n"
-"\t--packages-lists \"standard\" \\\n"
-"\t\"${@}\"\n"
+" #!/bin/sh\n"
+" lb config noauto \\\n"
+"     --packages-lists \"standard\" \\\n"
+"     \"${@}\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -250,11 +252,11 @@ msgstr ""
 #: en/user_managing_a_configuration.ssi:41
 #, no-wrap
 msgid ""
-"#!/bin/sh\n"
-"lb clean noauto \"${@}\"\n"
-"rm -f config/binary config/bootstrap \\\n"
-"\tconfig/chroot config/common config/source\n"
-"rm -f binary.log\n"
+" #!/bin/sh\n"
+" lb clean noauto \"${@}\"\n"
+" rm -f config/binary config/bootstrap \\\n"
+"     config/chroot config/common config/source\n"
+" rm -f binary.log\n"
 msgstr ""
 
 #. type: Plain text
@@ -264,7 +266,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_managing_a_configuration.ssi:50
-msgid "#!/bin/sh lb build noauto \"${@}\" 2>&1 | tee binary.log"
+#, no-wrap
+msgid ""
+" #!/bin/sh\n"
+" lb build noauto \"${@}\" 2>&1 | tee binary.log\n"
 msgstr ""
 
 #. type: Plain text
@@ -276,7 +281,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_managing_a_configuration.ssi:58
-msgid "$ cp /usr/share/live/build/examples/auto/* auto/"
+#, no-wrap
+msgid " $ cp /usr/share/live/build/examples/auto/* auto/\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/user_overview.ssi.pot b/manual/pot/user_overview.ssi.pot
index eb7b0a8..7704b6e 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: 2010-12-17 07:53-0400\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -32,12 +32,12 @@ msgstr ""
 #: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
 #: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
 #: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_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_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:42
+#: en/user_customization-installer.ssi:43
 #: 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
@@ -54,24 +54,25 @@ msgstr ""
 #: 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-runtime.ssi:14
+#: 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:50 en/user_customization-runtime.ssi:58
-#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
-#: en/user_customization-runtime.ssi:94 en/user_customization-runtime.ssi:103
+#: en/user_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_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
 #: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
 #: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
 #: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi: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: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_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -95,12 +96,12 @@ msgstr ""
 #: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
 #: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
 #: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:245 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:308 en/user_basics.ssi:347
+#: en/user_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:36
-#: en/user_customization-installer.ssi:46
+#: en/user_customization-installer.ssi:37
+#: en/user_customization-installer.ssi:48
 #: 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
@@ -117,24 +118,25 @@ msgstr ""
 #: 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-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
-#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
-#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
-#: en/user_customization-runtime.ssi:99 en/user_customization-runtime.ssi:108
+#: en/user_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_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
 #: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
 #: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
 #: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi: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: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_managing_a_configuration.ssi:43
 #: en/user_managing_a_configuration.ssi:52
 #: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -264,39 +266,53 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:39
-msgid "$ lb config P: Creating config tree"
+#, no-wrap
+msgid ""
+" $ lb config\n"
+" P: Creating config tree\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:44
+#, no-wrap
 msgid ""
-"$ ls -l total 8 drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto drwxr-xr-x 22 "
-"user user 4096 Sep 7 13:02 config"
+" $ ls -l\n"
+" total 8\n"
+" drwxr-xr-x  3 user user 4096 Sep  7 13:02 auto\n"
+" drwxr-xr-x 22 user user 4096 Sep  7 13:02 config\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:72
+#, no-wrap
 msgid ""
-"$ ls -l config/ total 104 -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary "
-"drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer drwxr-xr-x 2 "
-"user user 4096 Sep 7 13:02 binary_debian-installer-includes drwxr-xr-x 2 "
-"user user 4096 Sep 7 13:02 binary_grub drwxr-xr-x 2 user user 4096 Sep 7 "
-"13:02 binary_local-debs drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-"
-"hooks drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes drwxr-xr-"
-"x 2 user user 4096 Sep 7 13:02 binary_local-packageslists drwxr-xr-x 2 user "
-"user 4096 Sep 7 13:02 binary_local-udebs drwxr-xr-x 2 user user 4096 Sep 7 "
-"13:02 binary_rootfs drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux -"
-"rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap -rw-r--r-- 1 user user 1647 "
-"Sep 7 13:02 chroot drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt drwxr-"
-"xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks drwxr-xr-x 2 user user "
-"4096 Sep 7 13:02 chroot_local-includes drwxr-xr-x 2 user user 4096 Sep 7 "
-"13:02 chroot_local-packages drwxr-xr-x 2 user user 4096 Sep 7 13:02 "
-"chroot_local-packageslists drwxr-xr-x 2 user user 4096 Sep 7 13:02 "
-"chroot_local-patches drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-"
-"preseed drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources -rw-r--r-- 1 "
-"user user 2954 Sep 7 13:02 common drwxr-xr-x 2 user user 4096 Sep 7 13:02 "
-"includes -rw-r--r-- 1 user user 205 Sep 7 13:02 source drwxr-xr-x 2 user "
-"user 4096 Sep 7 13:02 templates"
+" $ ls -l config/\n"
+" total 104\n"
+" -rw-r--r-- 1 user user 4197 Sep  7 13:02 binary\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_debian-installer\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_debian-installer-includes\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_grub\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-debs\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-hooks\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-includes\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-packageslists\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-udebs\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_rootfs\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_syslinux\n"
+" -rw-r--r-- 1 user user 2051 Sep  7 13:02 bootstrap\n"
+" -rw-r--r-- 1 user user 1647 Sep  7 13:02 chroot\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_apt\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-hooks\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-includes\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-packages\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-packageslists\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-patches\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-preseed\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_sources\n"
+" -rw-r--r-- 1 user user 2954 Sep  7 13:02 common\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 includes\n"
+" -rw-r--r-- 1 user user  205 Sep  7 13:02 source\n"
+" drwxr-xr-x 2 user user 4096 Sep  7 13:02 templates\n"
 msgstr ""
 
 #. type: Plain text
@@ -317,7 +333,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:82
-msgid "$ lb config -p gnome"
+#, no-wrap
+msgid " $ lb config -p gnome\n"
 msgstr ""
 
 #. type: Plain text
@@ -327,9 +344,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:90
-msgid ""
-"$ lb config --binary-images net --hostname live-machine --username live-"
-"user ..."
+#, no-wrap
+msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pt_BR/about_manual.ssi b/manual/pt_BR/about_manual.ssi
index 7bb4442..df815d0 100644
--- a/manual/pt_BR/about_manual.ssi
+++ b/manual/pt_BR/about_manual.ssi
@@ -155,7 +155,7 @@ necessários para contruir estão instalados executando:
 
 code{
 
-# apt-get install make po4a sisu-complete
+ # apt-get install make po4a sisu-complete
 
 }code
 
@@ -164,7 +164,7 @@ diretório do seu Git checkout executando:
 
 code{
 
-$ make build
+ $ make build
 
 }code
 
@@ -174,7 +174,7 @@ executing:
 
 code{
 
-$ make build LANGUAGES=en
+ $ make build LANGUAGES=en
 
 }code
 
@@ -189,12 +189,12 @@ _* Obter a chave publica de commit:
 
 code{
 
-$ mkdir -p ~/.ssh/identity.d
-$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \
-	-O ~/.ssh/identity.d/gitosis at live.debian.net
-$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \
-	-O ~/.ssh/identity.d/gitosis at live.debian.net.pub
-$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*
+ $ mkdir -p ~/.ssh/identity.d
+ $ wget http://live.debian.net/other/keys/gitosis@live.debian.net \
+     -O ~/.ssh/identity.d/gitosis at live.debian.net
+ $ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \
+     -O ~/.ssh/identity.d/gitosis at live.debian.net.pub
+ $ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*
 
 }code
 
@@ -202,12 +202,12 @@ _* Adicione a seguinte sessão na configuração do seu openssh-client:
 
 code{
 
-$ cat >> ~/.ssh/config << EOF
-Host live.debian.net
-        Hostname live.debian.net
-        User gitosis
-        IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net
-EOF
+ $ cat >> ~/.ssh/config << EOF
+ Host live.debian.net
+     Hostname live.debian.net
+     User gitosis
+     IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net
+ EOF
 
 }code
 
@@ -215,7 +215,7 @@ _* Fazer o checkout de um clone do manual por ssh:
 
 code{
 
-$ git clone gitosis at live.debian.net:/live-manual.git
+ $ git clone gitosis at live.debian.net:/live-manual.git
 
 }code
 
@@ -225,7 +225,7 @@ atualizar os arquivos de tradução.
 
 code{
 
-$ make commit
+ $ make commit
 
 }code
 
@@ -236,7 +236,7 @@ acabando com uma parada total. Normalmente iniciando com as formas
 
 code{
 
-$ git commit -a -m "Adding a section on applying patches."
+ $ git commit -a -m "Adding a section on applying patches."
 
 }code
 
@@ -244,7 +244,7 @@ _* Enviar as submissões para os servidor.
 
 code{
 
-$ git push
+ $ git push
 
 }code
 
diff --git a/manual/pt_BR/project_bugs.ssi b/manual/pt_BR/project_bugs.ssi
index e468f78..685bead 100644
--- a/manual/pt_BR/project_bugs.ssi
+++ b/manual/pt_BR/project_bugs.ssi
@@ -81,7 +81,7 @@ You can generate a log of the build process by using the tee command:
 
 code{
 
-# lb build 2>&1 | tee build.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
diff --git a/manual/pt_BR/project_coding-style.ssi b/manual/pt_BR/project_coding-style.ssi
index 696ead9..d53655c 100644
--- a/manual/pt_BR/project_coding-style.ssi
+++ b/manual/pt_BR/project_coding-style.ssi
@@ -27,9 +27,9 @@ Bad:
 
 code{
 
-if foo; then
-        bar
-fi
+ if foo; then
+         bar
+ fi
 
 }code
 
@@ -37,10 +37,10 @@ Good:
 
 code{
 
-if foo
-then
-        bar
-fi
+ if foo
+ then
+         bar
+ fi
 
 }code
 
@@ -50,9 +50,9 @@ Bad:
 
 code{
 
-foo () {
-        bar
-}
+ foo () {
+         bar
+ }
 
 }code
 
@@ -60,10 +60,10 @@ Good:
 
 code{
 
-foo ()
-{
-        bar
-}
+ foo ()
+ {
+         bar
+ }
 
 }code
 
@@ -95,7 +95,7 @@ Bad:
 
 code{
 
-FOO=bar
+ FOO=bar
 
 }code
 
@@ -103,7 +103,7 @@ Good:
 
 code{
 
-FOO="bar"
+ FOO="bar"
 
 }code
 
@@ -113,10 +113,10 @@ Bad:
 
 code{
 
-if [ -f "${FOO}"/foo/"${BAR}"/bar ]
-then
-        foobar
-fi
+ if [ -f "${FOO}"/foo/"${BAR}"/bar ]
+ then
+         foobar
+ fi
 
 }code
 
@@ -124,10 +124,10 @@ Good:
 
 code{
 
-if [ -f "${FOO}/foo/${BAR}/bar" ]
-then
-        foobar
-fi
+ if [ -f "${FOO}/foo/${BAR}/bar" ]
+ then
+         foobar
+ fi
 
 }code
 
diff --git a/manual/pt_BR/project_procedures.ssi b/manual/pt_BR/project_procedures.ssi
index c4c270d..fb4ede8 100644
--- a/manual/pt_BR/project_procedures.ssi
+++ b/manual/pt_BR/project_procedures.ssi
@@ -11,7 +11,7 @@ Before commiting releases of a udeb in d-i svn, one has to call:
 
 code{
 
-$ ../../scripts/l10n/output-l10n-changes . -d
+ $ ../../scripts/l10n/output-l10n-changes . -d
 
 }code
 
@@ -51,11 +51,11 @@ below and the following command:
 
 code{
 
-$ sed \
-  -e 's|%major%|5.0|g' \
-  -e 's|%minor%|5.0.2|g' \
-  -e 's|%codename%|lenny|g' \
-  -e 's|%release_mail%|2009/msg00007.html|g'
+ $ sed \
+     -e 's|%major%|5.0|g' \
+     -e 's|%minor%|5.0.2|g' \
+     -e 's|%codename%|lenny|g' \
+     -e 's|%release_mail%|2009/msg00007.html|g'
 
 }code
 
@@ -64,76 +64,76 @@ proof-reading.
 
 code{
 
-Debian Live images for Debian GNU/Linux %major% updated
+ Debian Live images for Debian GNU/Linux %major% updated
 
-The Debian Live project is pleased to announce the availability of updated
-Live images for its stable distribution Debian GNU/Linux %major% (codename
-"%codename%").
+ The Debian Live project is pleased to announce the availability of
+ updated Live images for its stable distribution Debian GNU/Linux %major%
+ (codename "%codename%").
 
-The images are available for download at:
+ The images are available for download at:
 
-    <http://cdimage.debian.org/cdimage/release/current-live/>
+     <http://cdimage.debian.org/cdimage/release/current-live/>
 
-This update incorporates the changes made in the %minor% point release,
-which adds corrections for security problems to the stable release along
-with a few adjustments for serious problems. A full list of the changes may
-be viewed at:
+ This update incorporates the changes made in the %minor% point release,
+ which adds corrections for security problems to the stable release
+ along with a few adjustments for serious problems. A full list of the
+ changes may be viewed at:
 
-    <http://lists.debian.org/debian-announce/%release_mail%>
+     <http://lists.debian.org/debian-announce/%release_mail%>
 
-It also includes the following Live-specific changes:
+ It also includes the following Live-specific changes:
 
- * [INSERT LIVE-SPECIFIC CHANGE HERE]
- * [INSERT LIVE-SPECIFIC CHANGE HERE]
- * [LARGER ISSUES MAY DESERVE THEIR OWN SECTION]
+  * [INSERT LIVE-SPECIFIC CHANGE HERE]
+  * [INSERT LIVE-SPECIFIC CHANGE HERE]
+  * [LARGER ISSUES MAY DESERVE THEIR OWN SECTION]
 
 
-URLs
-----
+ URLs
+ ----
 
-Download location of updated images:
+ Download location of updated images:
 
-  <http://cdimage.debian.org/cdimage/release/current-live/>
+   <http://cdimage.debian.org/cdimage/release/current-live/>
 
-Projeto Debian Live Homepage:
+ Projeto Debian Live Homepage:
 
-  <http://live.debian.net/>
+   <http://live.debian.net/>
 
-The current stable distribution:
+ The current stable distribution:
 
-  <http://ftp.debian.org/debian/dists/stable>
+   <http://ftp.debian.org/debian/dists/stable>
 
-stable distribution information (release notes, errata etc.):
+ stable distribution information (release notes, errata etc.):
 
-  <http://www.debian.org/releases/stable/>
+   <http://www.debian.org/releases/stable/>
 
-Security announcements and information:
+ Security announcements and information:
 
-  <http://www.debian.org/security/>
+   <http://www.debian.org/security/>
 
 
-About Debian
--------------
+ About Debian
+ -------------
 
-The Debian Project is an association of Free Software developers who
-volunteer their time and effort in order to produce the completely free
-operating system Debian GNU/Linux.
+ The Debian Project is an association of Free Software developers who
+ volunteer their time and effort in order to produce the completely free
+ operating system Debian GNU/Linux.
 
 
-About Debian Live
------------------
+ About Debian Live
+ -----------------
 
-Debian Live is an official sub-project of Debian which produces Debian
-systems that do not require a classical installer. Images are available for
-CD/DVD discs, USB sticks and PXE netbooting as well as a bare filesystem
-images for booting directly from the internet.
+ Debian Live is an official sub-project of Debian which produces Debian
+ systems that do not require a classical installer. Images are available
+ for CD/DVD discs, USB sticks and PXE netbooting as well as a bare
+ filesystem images for booting directly from the internet.
 
 
-Contact Information
--------------------
+ Contact Information
+ -------------------
 
-For further information, please visit the Debian Live web pages at
-<http://live.debian.net/> or alternatively send mail to
-<debian-live at lists.debian.org>.
+ For further information, please visit the Debian Live web pages at
+ <http://live.debian.net/> or alternatively send mail to
+ <debian-live at lists.debian.org>.
 
 }code
diff --git a/manual/pt_BR/user_basics.ssi b/manual/pt_BR/user_basics.ssi
index b39c457..ae7318e 100644
--- a/manual/pt_BR/user_basics.ssi
+++ b/manual/pt_BR/user_basics.ssi
@@ -65,7 +65,7 @@ hierarchy in the current directory for use by other commands:
 
 code{
 
-$ lb config
+ $ lb config
 
 }code
 
@@ -77,7 +77,7 @@ build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -90,9 +90,9 @@ Testing an ISO is simple:
 
 code{
 
-# apt-get install qemu
+ # apt-get install qemu
 
-$ qemu -cdrom binary.iso
+ $ qemu -cdrom binary.iso
 
 }code
 
@@ -102,9 +102,9 @@ In order to test the ISO with virtualbox-ose:
 
 code{
 
-# apt-get install virtualbox-ose virtualbox-ose-dkms
+ # apt-get install virtualbox-ose virtualbox-ose-dkms
 
-$ virtualbox
+ $ virtualbox
 
 }code
 
@@ -118,7 +118,7 @@ resolution is limited to 800x600.
 
 code{
 
-# lb config --packages virtualbox-ose-guest-x11
+ $ lb config --packages virtualbox-ose-guest-x11
 
 }code
 
@@ -128,9 +128,9 @@ Burning an ISO image is easy:
 
 code{
 
-# apt-get install wodim
+ # apt-get install wodim
 
-$ wodim binary.iso
+ $ wodim binary.iso
 
 }code
 
@@ -150,7 +150,7 @@ lb clean command}#lb-clean):
 
 code{
 
-$ lb clean --binary
+ # lb clean --binary
 
 }code
 
@@ -159,7 +159,7 @@ Run the #{lb config}# command with the parameters to configure the
 
 code{
 
-$ lb config -b usb-hdd
+ $ lb config -b usb-hdd
 
 }code
 
@@ -167,7 +167,7 @@ Now build the image with the #{lb build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -179,7 +179,7 @@ with a size larger than that of binary.img and type:
 
 code{
 
-$ dd if=binary.img of=${USBSTICK}
+ $ dd if=binary.img of=${USBSTICK}
 
 }code
 
@@ -197,9 +197,9 @@ type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images.
 
 code{
 
-# apt-get install qemu
+ # apt-get install qemu
 
-$ qemu -hda binary.img
+ $ qemu -hda binary.img
 
 }code
 
@@ -212,7 +212,7 @@ be used by the Debian Live system.
 
 code{
 
-# gparted ${USBSTICK}
+ # gparted ${USBSTICK}
 
 }code
 
@@ -221,7 +221,7 @@ it. One possible choice would be ext4.
 
 code{
 
-# mkfs.ext4 ${USBSTICK}
+ # mkfs.ext4 ${USBSTICK}
 
 }code
 
@@ -229,7 +229,7 @@ If you want to use this data partition with Windows, use FAT32.
 
 code{
 
-# mkfs.vfat -F 32
+ # mkfs.vfat -F 32
 
 }code
 
@@ -246,7 +246,7 @@ working directory with the #{lb clean}# command:
 
 code{
 
-# lb clean --binary
+ # lb clean --binary
 
 }code
 
@@ -255,8 +255,7 @@ netbooting:
 
 code{
 
-$ lb config -b net --net-root-path "/srv/debian-live" --net-root-server
-"192.168.0.1"
+ $ lb config -b net --net-root-path "/srv/debian-live" --net-root-server "192.168.0.1"
 
 }code
 
@@ -271,7 +270,7 @@ Now build the image with the #{lb build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -301,21 +300,22 @@ Here is an example for inspiration, written for the ISC DHCP server
 
 code{
 
-# /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server
+ # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server
 
-ddns-update-style none;
+ ddns-update-style none;
 
-option domain-name "example.org"; option domain-name-servers
-ns1.example.org, ns2.example.org;
+ option domain-name "example.org";
+ option domain-name-servers ns1.example.org, ns2.example.org;
 
-default-lease-time 600; max-lease-time 7200;
+ default-lease-time 600;
+ max-lease-time 7200;
 
-log-facility local7;
+ log-facility local7;
 
-subnet 192.168.0.0 netmask 255.255.255.0 {
-  range 192.168.0.1 192.168.0.254;
-  next-server servername;
-  filename "pxelinux.0";
+ subnet 192.168.0.0 netmask 255.255.255.0 {
+   range 192.168.0.1 192.168.0.254;
+   next-server servername;
+   filename "pxelinux.0";
 }
 
 }code
@@ -330,7 +330,7 @@ inside a root directory, usually #{/srv/tftp}#. To let it serve files inside
 
 code{
 
-# dpkg-reconfigure -plow tftpd-hpa
+ # dpkg-reconfigure -plow tftpd-hpa
 
 }code
 
@@ -349,7 +349,7 @@ the following to #{/etc/exports}#:
 
 code{
 
-/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)
+ /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)
 
 }code
 
@@ -357,7 +357,7 @@ and tell the NFS server about this new export with the following command:
 
 code{
 
-# exportfs -rv
+ # exportfs -rv
 
 }code
 
@@ -383,10 +383,14 @@ Edit #{/etc/qemu-ifup}#:
 
 code{
 
-#!/bin/sh sudo -p "Password for $0:" /sbin/ifconfig $1 172.20.0.1 echo
-"Executing /etc/qemu-ifup" echo "Bringing up $1 for bridged mode..." sudo
-/sbin/ifconfig $1 0.0.0.0 promisc up echo "Adding $1 to br0..." sudo
-/usr/sbin/brctl addif br0 $1 sleep 2
+ #!/bin/sh
+ sudo -p "Password for $0:" /sbin/ifconfig $1 172.20.0.1
+ echo "Executing /etc/qemu-ifup"
+ echo "Bringing up $1 for bridged mode..."
+ sudo /sbin/ifconfig $1 0.0.0.0 promisc up
+ echo "Adding $1 to br0..."
+ sudo /usr/sbin/brctl addif br0 $1
+ sleep 2
 
 }code
 
@@ -405,19 +409,28 @@ _* Paste this text inside:
 
 code{
 
-#!/usr/bin/vmware config.version = "8" virtualHW.version = "4" memsize =
-"512" MemAllowAutoScaleDown = "FALSE"
+ #!/usr/bin/vmware
+ config.version = "8"
+ virtualHW.version = "4"
+ memsize = "512"
+ MemAllowAutoScaleDown = "FALSE"
 
-ide0:0.present = "FALSE" ide1:0.present = "FALSE" floppy0.present = "FALSE"
-sound.present = "FALSE" tools.remindInstall = "FALSE"
+ ide0:0.present = "FALSE"
+ ide1:0.present = "FALSE"
+ floppy0.present = "FALSE"
+ sound.present = "FALSE"
+ tools.remindInstall = "FALSE"
 
-ethernet0.present = "TRUE" ethernet0.addressType = "generated"
+ ethernet0.present = "TRUE"
+ ethernet0.addressType = "generated"
 
-displayName = "Test Boot PXE" guestOS = "other"
+ displayName = "Test Boot PXE"
+ guestOS = "other"
 
-ethernet0.generatedAddress = "00:0c:29:8d:71:3b" uuid.location = "56 4d 83
-72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b" uuid.bios = "56 4d 83 72 5c c4 de
-3f-ae 9e 07 91 1d 8d 71 3b" ethernet0.generatedAddressOffset = "0"
+ ethernet0.generatedAddress = "00:0c:29:8d:71:3b"
+ uuid.location = "56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b"
+ uuid.bios = "56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b"
+ ethernet0.generatedAddressOffset = "0"
 
 }code
 
diff --git a/manual/pt_BR/user_customization-contents.ssi b/manual/pt_BR/user_customization-contents.ssi
index cc19244..3906219 100644
--- a/manual/pt_BR/user_customization-contents.ssi
+++ b/manual/pt_BR/user_customization-contents.ssi
@@ -49,8 +49,8 @@ system, use:
 
 code{
 
-$ mkdir -p config/chroot_local-includes/var/www $ cp /path/to/my/index.html
-config/chroot_local-includes/var/www
+ $ mkdir -p config/chroot_local-includes/var/www
+ $ cp /path/to/my/index.html config/chroot_local-includes/var/www
 
 }code
 
@@ -58,14 +58,14 @@ Your configuration will then have the following layout:
 
 code{
 
--- config
-   [...]
-    |-- chroot_local-includes
-    |   `-- var
-    |       `-- www
-    |           `-- index.html
-   [...]
-    `-- templates
+ -- config
+    [...]
+     |-- chroot_local-includes
+     |   `-- var
+     |       `-- www
+     |           `-- index.html
+    [...]
+     `-- templates
 
 }code
 
@@ -84,7 +84,7 @@ linked to by an HTML index page. Simply copy the material to
 
 code{
 
-$ cp ~/video_demo.* config/binary_local-includes/
+ $ cp ~/video_demo.* config/binary_local-includes/
 
 }code
 
@@ -97,7 +97,7 @@ in the default configuration on every live media. This can be disabled with:
 
 code{
 
-$ lb config --includes none
+ $ lb config --includes none
 
 }code
 
diff --git a/manual/pt_BR/user_customization-installer.ssi b/manual/pt_BR/user_customization-installer.ssi
index 8e6dd98..6ed2152 100644
--- a/manual/pt_BR/user_customization-installer.ssi
+++ b/manual/pt_BR/user_customization-installer.ssi
@@ -52,8 +52,8 @@ architecture. For example:
 
 code{
 
-$ lb config --architecture i386 --linux-flavours 486 --debian-installer live
---packages debian-installer-launcher
+ $ lb config --architecture i386 --linux-flavours 486 \
+     --debian-installer live --packages debian-installer-launcher
 
 }code
 
@@ -72,8 +72,8 @@ locale to #{en_US}#:
 
 code{
 
-$ echo "d-i debian-installer/locale string en_US" >>
-config/binary_debian-installer/preseed.cfg
+ $ echo "d-i debian-installer/locale string en_US" \
+     >> config/binary_debian-installer/preseed.cfg
 
 }code
 
diff --git a/manual/pt_BR/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
index 03c9a6e..327106f 100644
--- a/manual/pt_BR/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -34,7 +34,7 @@ specify:
 
 code{
 
-$ lb config --distribution sid
+ $ lb config --distribution sid
 
 }code
 
@@ -46,7 +46,7 @@ specified, e.g.
 
 code{
 
-$ lb config --archive-areas "main contrib"
+ $ lb config --archive-areas "main contrib"
 
 }code
 
@@ -81,8 +81,8 @@ mirror, it is sufficient to set #{--mirror-bootstrap}# and
 
 code{
 
-$ lb config --mirror-bootstrap http://localhost/debian/ \
-            --mirror-chroot-security http://localhost/debian-security/
+ $ lb config --mirror-bootstrap http://localhost/debian/ \
+             --mirror-chroot-security http://localhost/debian-security/
 
 }code
 
@@ -102,8 +102,8 @@ suitable for users on a network where "#{mirror}#" is reachable.
 
 code{
 
-$ lb config --mirror-binary http://mirror/debian/ \
-            --mirror-binary-security http://mirror/debian-security/
+ $ lb config --mirror-binary http://mirror/debian/ \
+             --mirror-binary-security http://mirror/debian-security/
 
 }code
 
@@ -123,7 +123,7 @@ packages from the debian live snapshot repository at live system build time.
 
 code{
 
-deb http://live.debian.net/ sid-snapshots main contrib non-free
+ deb http://live.debian.net/ sid-snapshots main contrib non-free
 
 }code
 
@@ -142,7 +142,7 @@ snapshots, a simple command is enough to enable it:
 
 code{
 
-$ lb config --repository live.debian.net
+ $ lb config --repository live.debian.net
 
 }code
 
@@ -164,7 +164,7 @@ When the number of packages added is small, simply specify
 
 code{
 
-$ lb config --packages "package1 package2 package3"
+ $ lb config --packages "package1 package2 package3"
 
 }code
 
@@ -194,7 +194,7 @@ with the #{--packages-lists}# option. For example:
 
 code{
 
-$ lb config --packages-lists "gnome-core rescue"
+ $ lb config --packages-lists "gnome-core rescue"
 
 }code
 
@@ -247,7 +247,8 @@ the following contents:
 
 code{
 
-#include <gnome> iceweasel
+ #include <gnome>
+ iceweasel
 
 }code
 
@@ -265,7 +266,9 @@ specified:
 
 code{
 
-#if ARCHITECTURE amd64 ia32-libs #endif
+ #if ARCHITECTURE amd64
+ ia32-libs
+ #endif
 
 }code
 
@@ -275,7 +278,9 @@ is specified:
 
 code{
 
-#if ARCHITECTURE i386 amd64 memtest86+ #endif
+ #if ARCHITECTURE i386 amd64
+ memtest86+
+ #endif
 
 }code
 
@@ -285,7 +290,9 @@ via #{--archive-areas}#:
 
 code{
 
-#if ARCHIVE_AREAS contrib non-free vrms #endif
+ #if ARCHIVE_AREAS contrib non-free
+ vrms
+ #endif
 
 }code
 
@@ -293,7 +300,9 @@ A conditional may surround an #{#include}# directive:
 
 code{
 
-#if ARCHITECTURE amd64 #include <gnome-full> #endif
+ #if ARCHITECTURE amd64
+ #include <gnome-full>
+ #endif
 
 }code
 
@@ -310,7 +319,7 @@ via the #{--tasks}# option, as in the example below.
 
 code{
 
-$ lb config --tasks "mail-server file-server"
+ $ lb config --tasks "mail-server file-server"
 
 }code
 
@@ -340,7 +349,7 @@ in your configuration. For example:
 
 code{
 
-$ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
+ $ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
 
 }code
 
@@ -362,7 +371,7 @@ different desktop flavours.
 
 code{
 
-$ lb config --language es
+ $ lb config --language es
 
 }code
 
@@ -474,7 +483,7 @@ or #{--apt-http-proxy}# options as needed, e.g.
 
 code{
 
-$ lb config --apt-http-proxy http://proxy/
+ $ lb config --apt-http-proxy http://proxy/
 
 }code
 
@@ -489,7 +498,7 @@ with:
 
 code{
 
-$ lb config --binary-indices false
+ $ lb config --binary-indices false
 
 }code
 
@@ -504,7 +513,7 @@ much, you may disable that default option of APT with:
 
 code{
 
-$ lb config --apt-recommends false
+ $ lb config --apt-recommends false
 
 }code
 
@@ -542,11 +551,16 @@ distribution, Squeeze. The following will accomplish this:
 
 code{
 
-$ echo "deb http://mirror/debian sid main" >
-config/chroot_sources/sid.chroot $ cat >>config/chroot_apt/preferences <<END
-Package: live-* Pin: release n=sid Pin-Priority: 600
+ $ echo "deb http://mirror/debian sid main" > config/chroot_sources/sid.chroot
+ $ cat >>config/chroot_apt/preferences <<END
+ Package: live-*
+ Pin: release n=sid
+ Pin-Priority: 600
 
-Package: * Pin: release n=sid Pin-Priority: 1 END
+ Package: *
+ Pin: release n=sid
+ Pin-Priority: 1
+ END
 
 }code
 
@@ -559,7 +573,9 @@ following stanza to #{config/chroot_apt/preferences}#:
 
 code{
 
-Package: gnome-keyring Pin: version * Pin-Priority: -1
+ Package: gnome-keyring
+ Pin: version *
+ Pin-Priority: -1
 
 }code
 
diff --git a/manual/pt_BR/user_customization-runtime.ssi b/manual/pt_BR/user_customization-runtime.ssi
index 35d331f..471abb4 100644
--- a/manual/pt_BR/user_customization-runtime.ssi
+++ b/manual/pt_BR/user_customization-runtime.ssi
@@ -21,8 +21,7 @@ add the live user to the #{fuse}# group, add the following to a file in the
 
 code{
 
-debconf passwd/user-default-groups string audio cdrom dialout floppy video
-plugdev netdev powerdev fuse
+ debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse
 
 }code
 
@@ -42,7 +41,7 @@ the #{--bootappend-live}# option of #{lb config}#, e.g.
 
 code{
 
-$ lb config --bootappend-live "locales=de_CH.UTF-8"
+ $ lb config --bootappend-live "locales=de_CH.UTF-8"
 
 }code
 
@@ -59,8 +58,8 @@ spoken, e.g:
 
 code{
 
-$ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
-<name>se</name>
+ $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
+ <name>se</name>
 
 }code
 
@@ -69,7 +68,7 @@ use:
 
 code{
 
-$ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
+ $ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
 
 }code
 
@@ -78,8 +77,8 @@ with the following command:
 
 code{
 
-$ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); do basename $i |
-head -c -9; echo; done | sort | less
+ $ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); \
+     do basename $i | head -c -9; echo; done | sort | less
 
 }code
 
@@ -93,8 +92,8 @@ TypeMatrix keyboard, both in console and X11, use:
 
 code{
 
-$ lb config --bootappend-live "locales=fr_FR.UTF-8 keyboard-layouts=fr
-keyboard-variant=bepo keyboard-model=tm2030usb"
+ $ lb config --bootappend-live \
+     "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
 
 }code
 
@@ -134,7 +133,7 @@ hard disk or on a usb key created with, e.g.:
 
 code{
 
-# mkfs.ext2 -L live-rw /dev/sdb1
+ # mkfs.ext2 -L live-rw /dev/sdb1
 
 }code
 
@@ -143,8 +142,8 @@ label with one of the following:
 
 code{
 
-# tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems # dosfslabel
-/dev/sdb1 live-rw # for a fat filesystem
+ # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems
+ # dosfslabel /dev/sdb1 live-rw # for a fat filesystem
 
 }code
 
@@ -156,8 +155,8 @@ a foreign OS, with something like:
 
 code{
 
-$ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file $
-/sbin/mkfs.ext2 -F live-rw
+ $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file
+ $ /sbin/mkfs.ext2 -F live-rw
 
 }code
 
diff --git a/manual/pt_BR/user_examples.ssi b/manual/pt_BR/user_examples.ssi
index ee55c5b..8d10188 100644
--- a/manual/pt_BR/user_examples.ssi
+++ b/manual/pt_BR/user_examples.ssi
@@ -24,9 +24,9 @@ preferred mirror. For example:
 
 code{
 
-LB_MIRROR_BOOTSTRAP="http://mirror/debian"
-LB_MIRROR_CHROOT="http://mirror/debian"
-LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_MIRROR_CHROOT="http://mirror/debian"
+ LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
 
 }code
 
@@ -42,7 +42,7 @@ You can't get much simpler than this:
 
 code{
 
-$ mkdir tutorial1 ; cd tutorial1 ; lb config
+ $ mkdir tutorial1 ; cd tutorial1 ; lb config
 
 }code
 
@@ -54,7 +54,7 @@ Now, as superuser, build the image, saving a log as you build with #{tee}#.
 
 code{
 
-# lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee binary.log
 
 }code
 
@@ -76,7 +76,7 @@ utility, serving as an introduction to customizing Debian Live images.
 
 code{
 
-$ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel
+ $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel
 
 }code
 
@@ -93,7 +93,7 @@ Build the image, again as superuser, keeping a log as in {Tutorial
 
 code{
 
-# lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee binary.log
 
 }code
 
@@ -114,8 +114,9 @@ in {Managing a configuration}#managing-a-configuration.
 
 code{
 
-$ mkdir -p tutorial3/auto $ cp /usr/share/live/build/examples/auto/*
-tutorial3/auto/ $ cd tutorial3
+ $ mkdir -p tutorial3/auto
+ $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/
+ $ cd tutorial3
 
 }code
 
@@ -123,14 +124,14 @@ Edit #{auto/config}# to read as follows:
 
 code{
 
-#!/bin/sh
+ #!/bin/sh
 
-lb config noauto \
-    --architecture i386 \
-    --linux-flavours 686 \
-    --packages-lists lxde \
-    --packages "iceweasel xchat" \
-    "${@}"
+ lb config noauto \
+     --architecture i386 \
+     --linux-flavours 686 \
+     --packages-lists lxde \
+     --packages "iceweasel xchat" \
+     "${@}"
 
 }code
 
@@ -145,7 +146,7 @@ Now, build the image:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -158,7 +159,9 @@ only the auto scripts we just created, and then make the first commit:
 
 code{
 
-$ git init $ git add auto $ git commit -a -m "Initial import."
+ $ git init
+ $ git add auto
+ $ git commit -a -m "Initial import."
 
 }code
 
@@ -174,7 +177,7 @@ regenerate the files from our new configuration.
 
 code{
 
-# lb clean
+ # lb clean
 
 }code
 
@@ -182,14 +185,14 @@ Now edit #{auto/config}# to add the #{vlc}# package:
 
 code{
 
-#!/bin/sh
+ #!/bin/sh
 
-lb config noauto \
-    --architecture i386 \
-    --linux-flavours 686 \
-    --packages-lists lxde \
-    --packages "iceweasel xchat vlc" \
-    "${@}"
+ lb config noauto \
+     --architecture i386 \
+     --linux-flavours 686 \
+     --packages-lists lxde \
+     --packages "iceweasel xchat vlc" \
+     "${@}"
 
 }code
 
@@ -205,7 +208,7 @@ Test, and when you're satisfied, commit the next revision:
 
 code{
 
-$ git commit -a -m "Adding vlc media player."
+ $ git commit -a -m "Adding vlc media player."
 
 }code
 
@@ -232,11 +235,11 @@ around the standard-x11 list, including #{gdm3}#, #{metacity}# and
 
 code{
 
-$ mkdir vnc_kiosk_client
-$ cd vnc_kiosk_client
-$ lb config -a i386 -k 686 -p standard-x11 \
-    --packages "gdm3 metacity xvnc4viewer" \
-    --apt-recommends false
+ $ mkdir vnc_kiosk_client
+ $ cd vnc_kiosk_client
+ $ lb config -a i386 -k 686 -p standard-x11 \
+     --packages "gdm3 metacity xvnc4viewer" \
+     --apt-recommends false
 
 }code
 
@@ -246,12 +249,15 @@ to port #{5901}# on a server at #{192.168.1.2}#:
 
 code{
 
-$ mkdir -p config/chroot_local-includes/etc/skel $ cat
->config/chroot_local-includes/etc/skel/.xsession <<END #!/bin/sh
+ $ mkdir -p config/chroot_local-includes/etc/skel
+ $ cat >config/chroot_local-includes/etc/skel/.xsession <<END
+ #!/bin/sh
 
-/usr/bin/metacity & /usr/bin/xvncviewer 192.168.1.2:1
+ /usr/bin/metacity &
+ /usr/bin/xvncviewer 192.168.1.2:1
 
-exit END
+ exit
+ END
 
 }code
 
@@ -259,7 +265,7 @@ Build the image:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -281,8 +287,8 @@ packages will most likely produce a broken live system.
 
 code{
 
-$ lb config -k 486 -p minimal --binary-indices false --memtest none
---apt-recommends false --includes none
+ $ lb config -k 486 -p minimal --binary-indices false \
+     --memtest none --apt-recommends false --includes none
 
 }code
 
@@ -290,7 +296,7 @@ Now, build the image in the usual way:
 
 code{
 
-# lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee binary.log
 
 }code
 
@@ -328,7 +334,7 @@ prepare, make sure you have both of those things:
 
 code{
 
-# apt-get install dctrl-tools tasksel-data
+ # apt-get install dctrl-tools tasksel-data
 
 }code
 
@@ -336,12 +342,12 @@ Now we can search for the appropriate tasks, first with:
 
 code{
 
-$ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description
-Task: brazilian-portuguese
-Description: Brazilian Portuguese environment
- This task installs programs, data files, and
- documentation that make it easier for Brazilian Portuguese speakers
- to use Debian.
+ $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ Task: brazilian-portuguese
+ Description: Brazilian Portuguese environment
+  This task installs programs, data files, and
+  documentation that make it easier for Brazilian Portuguese speakers
+  to use Debian.
 
 }code
 
@@ -350,14 +356,14 @@ brazilian-portuguese. Now to find the related tasks:
 
 code{
 
-$ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description
-Task: brazilian-portuguese-desktop
-Description: Brazilian Portuguese desktop
- This task localises the desktop in Brasilian Portuguese.
+ $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ Task: brazilian-portuguese-desktop
+ Description: Brazilian Portuguese desktop
+  This task localises the desktop in Brasilian Portuguese.
 
-Task: brazilian-portuguese-kde-desktop
-Description: Brazilian Portuguese KDE desktop
- This task localises the KDE desktop in Brazilian Portuguese.
+ Task: brazilian-portuguese-kde-desktop
+ Description: Brazilian Portuguese KDE desktop
+  This task localises the KDE desktop in Brazilian Portuguese.
 
 }code
 
@@ -369,9 +375,9 @@ layout. Now let's put the pieces together:
 
 code{
 
-$ mkdir live-pt_BR-kde
-$ cd live-pt_BR-kde
-$ lb config \
+ $ mkdir live-pt_BR-kde
+ $ cd live-pt_BR-kde
+ $ lb config \
      -a i386 \
      -k 486 \
      -p kde-desktop \
diff --git a/manual/pt_BR/user_installation.ssi b/manual/pt_BR/user_installation.ssi
index 7802167..2d324d3 100644
--- a/manual/pt_BR/user_installation.ssi
+++ b/manual/pt_BR/user_installation.ssi
@@ -38,7 +38,7 @@ Simply install live-build like any other package:
 
 code{
 
-# apt-get install live-build
+ # apt-get install live-build
 
 }code
 
@@ -46,7 +46,7 @@ or
 
 code{
 
-# aptitude install live-build
+ # aptitude install live-build
 
 }code
 
@@ -58,7 +58,7 @@ code, execute:
 
 code{
 
-$ git clone git://live.debian.net/git/live-build.git
+ $ git clone git://live.debian.net/git/live-build.git
 
 }code
 
@@ -66,7 +66,9 @@ You can build and install your own Debian package by executing:
 
 code{
 
-$ cd live-build $ dpkg-buildpackage -rfakeroot -b -uc -us $ cd ..
+ $ cd live-build
+ $ dpkg-buildpackage -rfakeroot -b -uc -us
+ $ cd ..
 
 }code
 
@@ -75,7 +77,7 @@ interested in, e.g.
 
 code{
 
-# dpkg -i live-build_2.0.8-1_all.deb
+ # dpkg -i live-build_2.0.8-1_all.deb
 
 }code
 
@@ -83,7 +85,7 @@ You can also install live-build directly to your system by executing:
 
 code{
 
-# make install
+ # make install
 
 }code
 
@@ -91,7 +93,7 @@ and uninstall it with:
 
 code{
 
-# make uninstall
+ # make uninstall
 
 }code
 
@@ -119,8 +121,8 @@ _* Checkout the live-boot and live-config source
 
 code{
 
-$ git clone git://live.debian.net/git/live-boot.git $ git clone
-git://live.debian.net/git/live-config.git
+ $ git clone git://live.debian.net/git/live-boot.git
+ $ git clone git://live.debian.net/git/live-config.git
 
 }code
 
@@ -142,8 +144,10 @@ system distribution, you may build directly on the build system using
 
 code{
 
-$ cd live-boot $ dpkg-buildpackage -b -uc -us $ cd ../live-config $
-dpkg-buildpackage -b -uc -us
+ $ cd live-boot
+ $ dpkg-buildpackage -b -uc -us
+ $ cd ../live-config
+ $ dpkg-buildpackage -b -uc -us
 
 }code
 
@@ -165,7 +169,7 @@ tree with #{lb config}#:
 
 code{
 
-$ lb config --repository live.debian.net
+ $ lb config --repository live.debian.net
 
 }code
 
diff --git a/manual/pt_BR/user_managing_a_configuration.ssi b/manual/pt_BR/user_managing_a_configuration.ssi
index 4270690..abab4fa 100644
--- a/manual/pt_BR/user_managing_a_configuration.ssi
+++ b/manual/pt_BR/user_managing_a_configuration.ssi
@@ -50,10 +50,10 @@ recursively. Also, don't forget to ensure the scripts are executable
 
 code{
 
-#!/bin/sh
-lb config noauto \
-	--packages-lists "standard" \
-	"${@}"
+ #!/bin/sh
+ lb config noauto \
+     --packages-lists "standard" \
+     "${@}"
 
 }code
 
@@ -61,11 +61,11 @@ lb config noauto \
 
 code{
 
-#!/bin/sh
-lb clean noauto "${@}"
-rm -f config/binary config/bootstrap \
-	config/chroot config/common config/source
-rm -f binary.log
+ #!/bin/sh
+ lb clean noauto "${@}"
+ rm -f config/binary config/bootstrap \
+     config/chroot config/common config/source
+ rm -f binary.log
 
 }code
 
@@ -73,7 +73,8 @@ rm -f binary.log
 
 code{
 
-#!/bin/sh lb build noauto "${@}" 2>&1 | tee binary.log
+ #!/bin/sh
+ lb build noauto "${@}" 2>&1 | tee binary.log
 
 }code
 
@@ -82,7 +83,7 @@ above. You may copy those as your starting point.
 
 code{
 
-$ cp /usr/share/live/build/examples/auto/* auto/
+ $ cp /usr/share/live/build/examples/auto/* auto/
 
 }code
 
diff --git a/manual/pt_BR/user_overview.ssi b/manual/pt_BR/user_overview.ssi
index d1e72c1..3d6b063 100644
--- a/manual/pt_BR/user_overview.ssi
+++ b/manual/pt_BR/user_overview.ssi
@@ -56,32 +56,41 @@ subdirectory which it populates with some default settings:
 
 code{
 
-$ lb config P: Creating config tree
-
-$ ls -l total 8 drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto drwxr-xr-x 22
-user user 4096 Sep 7 13:02 config
-
-$ ls -l config/ total 104 -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary
-drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer drwxr-xr-x 2
-user user 4096 Sep 7 13:02 binary_debian-installer-includes drwxr-xr-x 2
-user user 4096 Sep 7 13:02 binary_grub drwxr-xr-x 2 user user 4096 Sep 7
-13:02 binary_local-debs drwxr-xr-x 2 user user 4096 Sep 7 13:02
-binary_local-hooks drwxr-xr-x 2 user user 4096 Sep 7 13:02
-binary_local-includes drwxr-xr-x 2 user user 4096 Sep 7 13:02
-binary_local-packageslists drwxr-xr-x 2 user user 4096 Sep 7 13:02
-binary_local-udebs drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs
-drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux -rw-r--r-- 1 user
-user 2051 Sep 7 13:02 bootstrap -rw-r--r-- 1 user user 1647 Sep 7 13:02
-chroot drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt drwxr-xr-x 2 user
-user 4096 Sep 7 13:02 chroot_local-hooks drwxr-xr-x 2 user user 4096 Sep 7
-13:02 chroot_local-includes drwxr-xr-x 2 user user 4096 Sep 7 13:02
-chroot_local-packages drwxr-xr-x 2 user user 4096 Sep 7 13:02
-chroot_local-packageslists drwxr-xr-x 2 user user 4096 Sep 7 13:02
-chroot_local-patches drwxr-xr-x 2 user user 4096 Sep 7 13:02
-chroot_local-preseed drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources
--rw-r--r-- 1 user user 2954 Sep 7 13:02 common drwxr-xr-x 2 user user 4096
-Sep 7 13:02 includes -rw-r--r-- 1 user user 205 Sep 7 13:02 source
-drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates
+ $ lb config
+ P: Creating config tree
+
+ $ ls -l
+ total 8
+ drwxr-xr-x  3 user user 4096 Sep  7 13:02 auto
+ drwxr-xr-x 22 user user 4096 Sep  7 13:02 config
+
+ $ ls -l config/
+ total 104
+ -rw-r--r-- 1 user user 4197 Sep  7 13:02 binary
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_debian-installer
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_debian-installer-includes
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_grub
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-debs
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-hooks
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-includes
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-packageslists
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-udebs
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_rootfs
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_syslinux
+ -rw-r--r-- 1 user user 2051 Sep  7 13:02 bootstrap
+ -rw-r--r-- 1 user user 1647 Sep  7 13:02 chroot
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_apt
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-hooks
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-includes
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-packages
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-packageslists
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-patches
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-preseed
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_sources
+ -rw-r--r-- 1 user user 2954 Sep  7 13:02 common
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 includes
+ -rw-r--r-- 1 user user  205 Sep  7 13:02 source
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 templates
 
 }code
 
@@ -95,7 +104,7 @@ Normally, you will want to specify some options. For example, to include the
 
 code{
 
-$ lb config -p gnome
+ $ lb config -p gnome
 
 }code
 
@@ -103,8 +112,7 @@ It is possible to specify many options, such as:
 
 code{
 
-$ lb config --binary-images net --hostname live-machine --username live-user
-...
+ $ lb config --binary-images net --hostname live-machine --username live-user ...
 
 }code
 
diff --git a/manual/ro/about_manual.ssi b/manual/ro/about_manual.ssi
index b647d71..c439c74 100644
--- a/manual/ro/about_manual.ssi
+++ b/manual/ro/about_manual.ssi
@@ -151,7 +151,7 @@ pentru 'building' sunt instalate, prin executatea comenzii:
 
 code{
 
-# apt-get install make po4a sisu-complete
+ # apt-get install make po4a sisu-complete
 
 }code
 
@@ -160,7 +160,7 @@ al dvs, prin executatea:
 
 code{
 
-$ make build
+ $ make build
 
 }code
 
@@ -170,7 +170,7 @@ executing:
 
 code{
 
-$ make build LANGUAGES=en
+ $ make build LANGUAGES=en
 
 }code
 
@@ -184,12 +184,12 @@ _* Fetch the public commit key:
 
 code{
 
-$ mkdir -p ~/.ssh/identity.d
-$ wget http://live.debian.net/other/keys/gitosis@live.debian.net \
-	-O ~/.ssh/identity.d/gitosis at live.debian.net
-$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \
-	-O ~/.ssh/identity.d/gitosis at live.debian.net.pub
-$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*
+ $ mkdir -p ~/.ssh/identity.d
+ $ wget http://live.debian.net/other/keys/gitosis@live.debian.net \
+     -O ~/.ssh/identity.d/gitosis at live.debian.net
+ $ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \
+     -O ~/.ssh/identity.d/gitosis at live.debian.net.pub
+ $ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*
 
 }code
 
@@ -197,12 +197,12 @@ _* Adaugati urmatoarea sectiuna la openssh-client config:
 
 code{
 
-$ cat >> ~/.ssh/config << EOF
-Host live.debian.net
-        Hostname live.debian.net
-        User gitosis
-        IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net
-EOF
+ $ cat >> ~/.ssh/config << EOF
+ Host live.debian.net
+     Hostname live.debian.net
+     User gitosis
+     IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net
+ EOF
 
 }code
 
@@ -210,7 +210,7 @@ _* Checkout un clon al manualului prin ssh:
 
 code{
 
-$ git clone gitosis at live.debian.net:/live-manual.git
+ $ git clone gitosis at live.debian.net:/live-manual.git
 
 }code
 
@@ -220,7 +220,7 @@ translation files:
 
 code{
 
-$ make commit
+ $ make commit
 
 }code
 
@@ -231,7 +231,7 @@ punct si sens. Inceputul poate fii de forma
 
 code{
 
-$ git commit -a -m "Adding a section on applying patches."
+ $ git commit -a -m "Adding a section on applying patches."
 
 }code
 
@@ -239,7 +239,7 @@ _* Primite commit-ul la server:
 
 code{
 
-$ git push
+ $ git push
 
 }code
 
diff --git a/manual/ro/project_bugs.ssi b/manual/ro/project_bugs.ssi
index e468f78..685bead 100644
--- a/manual/ro/project_bugs.ssi
+++ b/manual/ro/project_bugs.ssi
@@ -81,7 +81,7 @@ You can generate a log of the build process by using the tee command:
 
 code{
 
-# lb build 2>&1 | tee build.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
diff --git a/manual/ro/project_coding-style.ssi b/manual/ro/project_coding-style.ssi
index 696ead9..d53655c 100644
--- a/manual/ro/project_coding-style.ssi
+++ b/manual/ro/project_coding-style.ssi
@@ -27,9 +27,9 @@ Bad:
 
 code{
 
-if foo; then
-        bar
-fi
+ if foo; then
+         bar
+ fi
 
 }code
 
@@ -37,10 +37,10 @@ Good:
 
 code{
 
-if foo
-then
-        bar
-fi
+ if foo
+ then
+         bar
+ fi
 
 }code
 
@@ -50,9 +50,9 @@ Bad:
 
 code{
 
-foo () {
-        bar
-}
+ foo () {
+         bar
+ }
 
 }code
 
@@ -60,10 +60,10 @@ Good:
 
 code{
 
-foo ()
-{
-        bar
-}
+ foo ()
+ {
+         bar
+ }
 
 }code
 
@@ -95,7 +95,7 @@ Bad:
 
 code{
 
-FOO=bar
+ FOO=bar
 
 }code
 
@@ -103,7 +103,7 @@ Good:
 
 code{
 
-FOO="bar"
+ FOO="bar"
 
 }code
 
@@ -113,10 +113,10 @@ Bad:
 
 code{
 
-if [ -f "${FOO}"/foo/"${BAR}"/bar ]
-then
-        foobar
-fi
+ if [ -f "${FOO}"/foo/"${BAR}"/bar ]
+ then
+         foobar
+ fi
 
 }code
 
@@ -124,10 +124,10 @@ Good:
 
 code{
 
-if [ -f "${FOO}/foo/${BAR}/bar" ]
-then
-        foobar
-fi
+ if [ -f "${FOO}/foo/${BAR}/bar" ]
+ then
+         foobar
+ fi
 
 }code
 
diff --git a/manual/ro/project_procedures.ssi b/manual/ro/project_procedures.ssi
index e43262c..49b1924 100644
--- a/manual/ro/project_procedures.ssi
+++ b/manual/ro/project_procedures.ssi
@@ -11,7 +11,7 @@ Before commiting releases of a udeb in d-i svn, one has to call:
 
 code{
 
-$ ../../scripts/l10n/output-l10n-changes . -d
+ $ ../../scripts/l10n/output-l10n-changes . -d
 
 }code
 
@@ -51,11 +51,11 @@ below and the following command:
 
 code{
 
-$ sed \
-  -e 's|%major%|5.0|g' \
-  -e 's|%minor%|5.0.2|g' \
-  -e 's|%codename%|lenny|g' \
-  -e 's|%release_mail%|2009/msg00007.html|g'
+ $ sed \
+     -e 's|%major%|5.0|g' \
+     -e 's|%minor%|5.0.2|g' \
+     -e 's|%codename%|lenny|g' \
+     -e 's|%release_mail%|2009/msg00007.html|g'
 
 }code
 
@@ -64,76 +64,76 @@ proof-reading.
 
 code{
 
-Debian Live images for Debian GNU/Linux %major% updated
+ Debian Live images for Debian GNU/Linux %major% updated
 
-The Debian Live project is pleased to announce the availability of updated
-Live images for its stable distribution Debian GNU/Linux %major% (codename
-"%codename%").
+ The Debian Live project is pleased to announce the availability of
+ updated Live images for its stable distribution Debian GNU/Linux %major%
+ (codename "%codename%").
 
-The images are available for download at:
+ The images are available for download at:
 
-    <http://cdimage.debian.org/cdimage/release/current-live/>
+     <http://cdimage.debian.org/cdimage/release/current-live/>
 
-This update incorporates the changes made in the %minor% point release,
-which adds corrections for security problems to the stable release along
-with a few adjustments for serious problems. A full list of the changes may
-be viewed at:
+ This update incorporates the changes made in the %minor% point release,
+ which adds corrections for security problems to the stable release
+ along with a few adjustments for serious problems. A full list of the
+ changes may be viewed at:
 
-    <http://lists.debian.org/debian-announce/%release_mail%>
+     <http://lists.debian.org/debian-announce/%release_mail%>
 
-It also includes the following Live-specific changes:
+ It also includes the following Live-specific changes:
 
- * [INSERT LIVE-SPECIFIC CHANGE HERE]
- * [INSERT LIVE-SPECIFIC CHANGE HERE]
- * [LARGER ISSUES MAY DESERVE THEIR OWN SECTION]
+  * [INSERT LIVE-SPECIFIC CHANGE HERE]
+  * [INSERT LIVE-SPECIFIC CHANGE HERE]
+  * [LARGER ISSUES MAY DESERVE THEIR OWN SECTION]
 
 
-URLs
-----
+ URLs
+ ----
 
-Download location of updated images:
+ Download location of updated images:
 
-  <http://cdimage.debian.org/cdimage/release/current-live/>
+   <http://cdimage.debian.org/cdimage/release/current-live/>
 
-Debian Live project homepage:
+ Despre Proiectul Debian Live:
 
-  <http://live.debian.net/>
+   <http://live.debian.net/>
 
-El reflecta starea (actuala) a distributiei:
+ El reflecta starea (actuala) a distributiei:
 
-  <http://ftp.debian.org/debian/dists/stable>
+   <http://ftp.debian.org/debian/dists/stable>
 
-stable distribution information (release notes, errata etc.):
+ stable distribution information (release notes, errata etc.):
 
-  <http://www.debian.org/releases/stable/>
+   <http://www.debian.org/releases/stable/>
 
-Security announcements and information:
+ Security announcements and information:
 
-  <http://www.debian.org/security/>
+   <http://www.debian.org/security/>
 
 
-About Debian
--------------
+ About Debian
+ -------------
 
-The Debian Project is an association of Free Software developers who
-volunteer their time and effort in order to produce the completely free
-operating system Debian GNU/Linux.
+ The Debian Project is an association of Free Software developers who
+ volunteer their time and effort in order to produce the completely free
+ operating system Debian GNU/Linux.
 
 
-About Debian Live
------------------
+ About Debian Live
+ -----------------
 
-Debian Live is an official sub-project of Debian which produces Debian
-systems that do not require a classical installer. Images are available for
-CD/DVD discs, USB sticks and PXE netbooting as well as a bare filesystem
-images for booting directly from the internet.
+ Debian Live is an official sub-project of Debian which produces Debian
+ systems that do not require a classical installer. Images are available
+ for CD/DVD discs, USB sticks and PXE netbooting as well as a bare
+ filesystem images for booting directly from the internet.
 
 
-Contact Information
--------------------
+ Contact Information
+ -------------------
 
-For further information, please visit the Debian Live web pages at
-<http://live.debian.net/> or alternatively send mail to
-<debian-live at lists.debian.org>.
+ For further information, please visit the Debian Live web pages at
+ <http://live.debian.net/> or alternatively send mail to
+ <debian-live at lists.debian.org>.
 
 }code
diff --git a/manual/ro/user_basics.ssi b/manual/ro/user_basics.ssi
index b39c457..ae7318e 100644
--- a/manual/ro/user_basics.ssi
+++ b/manual/ro/user_basics.ssi
@@ -65,7 +65,7 @@ hierarchy in the current directory for use by other commands:
 
 code{
 
-$ lb config
+ $ lb config
 
 }code
 
@@ -77,7 +77,7 @@ build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -90,9 +90,9 @@ Testing an ISO is simple:
 
 code{
 
-# apt-get install qemu
+ # apt-get install qemu
 
-$ qemu -cdrom binary.iso
+ $ qemu -cdrom binary.iso
 
 }code
 
@@ -102,9 +102,9 @@ In order to test the ISO with virtualbox-ose:
 
 code{
 
-# apt-get install virtualbox-ose virtualbox-ose-dkms
+ # apt-get install virtualbox-ose virtualbox-ose-dkms
 
-$ virtualbox
+ $ virtualbox
 
 }code
 
@@ -118,7 +118,7 @@ resolution is limited to 800x600.
 
 code{
 
-# lb config --packages virtualbox-ose-guest-x11
+ $ lb config --packages virtualbox-ose-guest-x11
 
 }code
 
@@ -128,9 +128,9 @@ Burning an ISO image is easy:
 
 code{
 
-# apt-get install wodim
+ # apt-get install wodim
 
-$ wodim binary.iso
+ $ wodim binary.iso
 
 }code
 
@@ -150,7 +150,7 @@ lb clean command}#lb-clean):
 
 code{
 
-$ lb clean --binary
+ # lb clean --binary
 
 }code
 
@@ -159,7 +159,7 @@ Run the #{lb config}# command with the parameters to configure the
 
 code{
 
-$ lb config -b usb-hdd
+ $ lb config -b usb-hdd
 
 }code
 
@@ -167,7 +167,7 @@ Now build the image with the #{lb build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -179,7 +179,7 @@ with a size larger than that of binary.img and type:
 
 code{
 
-$ dd if=binary.img of=${USBSTICK}
+ $ dd if=binary.img of=${USBSTICK}
 
 }code
 
@@ -197,9 +197,9 @@ type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images.
 
 code{
 
-# apt-get install qemu
+ # apt-get install qemu
 
-$ qemu -hda binary.img
+ $ qemu -hda binary.img
 
 }code
 
@@ -212,7 +212,7 @@ be used by the Debian Live system.
 
 code{
 
-# gparted ${USBSTICK}
+ # gparted ${USBSTICK}
 
 }code
 
@@ -221,7 +221,7 @@ it. One possible choice would be ext4.
 
 code{
 
-# mkfs.ext4 ${USBSTICK}
+ # mkfs.ext4 ${USBSTICK}
 
 }code
 
@@ -229,7 +229,7 @@ If you want to use this data partition with Windows, use FAT32.
 
 code{
 
-# mkfs.vfat -F 32
+ # mkfs.vfat -F 32
 
 }code
 
@@ -246,7 +246,7 @@ working directory with the #{lb clean}# command:
 
 code{
 
-# lb clean --binary
+ # lb clean --binary
 
 }code
 
@@ -255,8 +255,7 @@ netbooting:
 
 code{
 
-$ lb config -b net --net-root-path "/srv/debian-live" --net-root-server
-"192.168.0.1"
+ $ lb config -b net --net-root-path "/srv/debian-live" --net-root-server "192.168.0.1"
 
 }code
 
@@ -271,7 +270,7 @@ Now build the image with the #{lb build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -301,21 +300,22 @@ Here is an example for inspiration, written for the ISC DHCP server
 
 code{
 
-# /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server
+ # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server
 
-ddns-update-style none;
+ ddns-update-style none;
 
-option domain-name "example.org"; option domain-name-servers
-ns1.example.org, ns2.example.org;
+ option domain-name "example.org";
+ option domain-name-servers ns1.example.org, ns2.example.org;
 
-default-lease-time 600; max-lease-time 7200;
+ default-lease-time 600;
+ max-lease-time 7200;
 
-log-facility local7;
+ log-facility local7;
 
-subnet 192.168.0.0 netmask 255.255.255.0 {
-  range 192.168.0.1 192.168.0.254;
-  next-server servername;
-  filename "pxelinux.0";
+ subnet 192.168.0.0 netmask 255.255.255.0 {
+   range 192.168.0.1 192.168.0.254;
+   next-server servername;
+   filename "pxelinux.0";
 }
 
 }code
@@ -330,7 +330,7 @@ inside a root directory, usually #{/srv/tftp}#. To let it serve files inside
 
 code{
 
-# dpkg-reconfigure -plow tftpd-hpa
+ # dpkg-reconfigure -plow tftpd-hpa
 
 }code
 
@@ -349,7 +349,7 @@ the following to #{/etc/exports}#:
 
 code{
 
-/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)
+ /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)
 
 }code
 
@@ -357,7 +357,7 @@ and tell the NFS server about this new export with the following command:
 
 code{
 
-# exportfs -rv
+ # exportfs -rv
 
 }code
 
@@ -383,10 +383,14 @@ Edit #{/etc/qemu-ifup}#:
 
 code{
 
-#!/bin/sh sudo -p "Password for $0:" /sbin/ifconfig $1 172.20.0.1 echo
-"Executing /etc/qemu-ifup" echo "Bringing up $1 for bridged mode..." sudo
-/sbin/ifconfig $1 0.0.0.0 promisc up echo "Adding $1 to br0..." sudo
-/usr/sbin/brctl addif br0 $1 sleep 2
+ #!/bin/sh
+ sudo -p "Password for $0:" /sbin/ifconfig $1 172.20.0.1
+ echo "Executing /etc/qemu-ifup"
+ echo "Bringing up $1 for bridged mode..."
+ sudo /sbin/ifconfig $1 0.0.0.0 promisc up
+ echo "Adding $1 to br0..."
+ sudo /usr/sbin/brctl addif br0 $1
+ sleep 2
 
 }code
 
@@ -405,19 +409,28 @@ _* Paste this text inside:
 
 code{
 
-#!/usr/bin/vmware config.version = "8" virtualHW.version = "4" memsize =
-"512" MemAllowAutoScaleDown = "FALSE"
+ #!/usr/bin/vmware
+ config.version = "8"
+ virtualHW.version = "4"
+ memsize = "512"
+ MemAllowAutoScaleDown = "FALSE"
 
-ide0:0.present = "FALSE" ide1:0.present = "FALSE" floppy0.present = "FALSE"
-sound.present = "FALSE" tools.remindInstall = "FALSE"
+ ide0:0.present = "FALSE"
+ ide1:0.present = "FALSE"
+ floppy0.present = "FALSE"
+ sound.present = "FALSE"
+ tools.remindInstall = "FALSE"
 
-ethernet0.present = "TRUE" ethernet0.addressType = "generated"
+ ethernet0.present = "TRUE"
+ ethernet0.addressType = "generated"
 
-displayName = "Test Boot PXE" guestOS = "other"
+ displayName = "Test Boot PXE"
+ guestOS = "other"
 
-ethernet0.generatedAddress = "00:0c:29:8d:71:3b" uuid.location = "56 4d 83
-72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b" uuid.bios = "56 4d 83 72 5c c4 de
-3f-ae 9e 07 91 1d 8d 71 3b" ethernet0.generatedAddressOffset = "0"
+ ethernet0.generatedAddress = "00:0c:29:8d:71:3b"
+ uuid.location = "56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b"
+ uuid.bios = "56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b"
+ ethernet0.generatedAddressOffset = "0"
 
 }code
 
diff --git a/manual/ro/user_customization-contents.ssi b/manual/ro/user_customization-contents.ssi
index cc19244..3906219 100644
--- a/manual/ro/user_customization-contents.ssi
+++ b/manual/ro/user_customization-contents.ssi
@@ -49,8 +49,8 @@ system, use:
 
 code{
 
-$ mkdir -p config/chroot_local-includes/var/www $ cp /path/to/my/index.html
-config/chroot_local-includes/var/www
+ $ mkdir -p config/chroot_local-includes/var/www
+ $ cp /path/to/my/index.html config/chroot_local-includes/var/www
 
 }code
 
@@ -58,14 +58,14 @@ Your configuration will then have the following layout:
 
 code{
 
--- config
-   [...]
-    |-- chroot_local-includes
-    |   `-- var
-    |       `-- www
-    |           `-- index.html
-   [...]
-    `-- templates
+ -- config
+    [...]
+     |-- chroot_local-includes
+     |   `-- var
+     |       `-- www
+     |           `-- index.html
+    [...]
+     `-- templates
 
 }code
 
@@ -84,7 +84,7 @@ linked to by an HTML index page. Simply copy the material to
 
 code{
 
-$ cp ~/video_demo.* config/binary_local-includes/
+ $ cp ~/video_demo.* config/binary_local-includes/
 
 }code
 
@@ -97,7 +97,7 @@ in the default configuration on every live media. This can be disabled with:
 
 code{
 
-$ lb config --includes none
+ $ lb config --includes none
 
 }code
 
diff --git a/manual/ro/user_customization-installer.ssi b/manual/ro/user_customization-installer.ssi
index 8e6dd98..6ed2152 100644
--- a/manual/ro/user_customization-installer.ssi
+++ b/manual/ro/user_customization-installer.ssi
@@ -52,8 +52,8 @@ architecture. For example:
 
 code{
 
-$ lb config --architecture i386 --linux-flavours 486 --debian-installer live
---packages debian-installer-launcher
+ $ lb config --architecture i386 --linux-flavours 486 \
+     --debian-installer live --packages debian-installer-launcher
 
 }code
 
@@ -72,8 +72,8 @@ locale to #{en_US}#:
 
 code{
 
-$ echo "d-i debian-installer/locale string en_US" >>
-config/binary_debian-installer/preseed.cfg
+ $ echo "d-i debian-installer/locale string en_US" \
+     >> config/binary_debian-installer/preseed.cfg
 
 }code
 
diff --git a/manual/ro/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
index 03c9a6e..327106f 100644
--- a/manual/ro/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -34,7 +34,7 @@ specify:
 
 code{
 
-$ lb config --distribution sid
+ $ lb config --distribution sid
 
 }code
 
@@ -46,7 +46,7 @@ specified, e.g.
 
 code{
 
-$ lb config --archive-areas "main contrib"
+ $ lb config --archive-areas "main contrib"
 
 }code
 
@@ -81,8 +81,8 @@ mirror, it is sufficient to set #{--mirror-bootstrap}# and
 
 code{
 
-$ lb config --mirror-bootstrap http://localhost/debian/ \
-            --mirror-chroot-security http://localhost/debian-security/
+ $ lb config --mirror-bootstrap http://localhost/debian/ \
+             --mirror-chroot-security http://localhost/debian-security/
 
 }code
 
@@ -102,8 +102,8 @@ suitable for users on a network where "#{mirror}#" is reachable.
 
 code{
 
-$ lb config --mirror-binary http://mirror/debian/ \
-            --mirror-binary-security http://mirror/debian-security/
+ $ lb config --mirror-binary http://mirror/debian/ \
+             --mirror-binary-security http://mirror/debian-security/
 
 }code
 
@@ -123,7 +123,7 @@ packages from the debian live snapshot repository at live system build time.
 
 code{
 
-deb http://live.debian.net/ sid-snapshots main contrib non-free
+ deb http://live.debian.net/ sid-snapshots main contrib non-free
 
 }code
 
@@ -142,7 +142,7 @@ snapshots, a simple command is enough to enable it:
 
 code{
 
-$ lb config --repository live.debian.net
+ $ lb config --repository live.debian.net
 
 }code
 
@@ -164,7 +164,7 @@ When the number of packages added is small, simply specify
 
 code{
 
-$ lb config --packages "package1 package2 package3"
+ $ lb config --packages "package1 package2 package3"
 
 }code
 
@@ -194,7 +194,7 @@ with the #{--packages-lists}# option. For example:
 
 code{
 
-$ lb config --packages-lists "gnome-core rescue"
+ $ lb config --packages-lists "gnome-core rescue"
 
 }code
 
@@ -247,7 +247,8 @@ the following contents:
 
 code{
 
-#include <gnome> iceweasel
+ #include <gnome>
+ iceweasel
 
 }code
 
@@ -265,7 +266,9 @@ specified:
 
 code{
 
-#if ARCHITECTURE amd64 ia32-libs #endif
+ #if ARCHITECTURE amd64
+ ia32-libs
+ #endif
 
 }code
 
@@ -275,7 +278,9 @@ is specified:
 
 code{
 
-#if ARCHITECTURE i386 amd64 memtest86+ #endif
+ #if ARCHITECTURE i386 amd64
+ memtest86+
+ #endif
 
 }code
 
@@ -285,7 +290,9 @@ via #{--archive-areas}#:
 
 code{
 
-#if ARCHIVE_AREAS contrib non-free vrms #endif
+ #if ARCHIVE_AREAS contrib non-free
+ vrms
+ #endif
 
 }code
 
@@ -293,7 +300,9 @@ A conditional may surround an #{#include}# directive:
 
 code{
 
-#if ARCHITECTURE amd64 #include <gnome-full> #endif
+ #if ARCHITECTURE amd64
+ #include <gnome-full>
+ #endif
 
 }code
 
@@ -310,7 +319,7 @@ via the #{--tasks}# option, as in the example below.
 
 code{
 
-$ lb config --tasks "mail-server file-server"
+ $ lb config --tasks "mail-server file-server"
 
 }code
 
@@ -340,7 +349,7 @@ in your configuration. For example:
 
 code{
 
-$ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
+ $ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
 
 }code
 
@@ -362,7 +371,7 @@ different desktop flavours.
 
 code{
 
-$ lb config --language es
+ $ lb config --language es
 
 }code
 
@@ -474,7 +483,7 @@ or #{--apt-http-proxy}# options as needed, e.g.
 
 code{
 
-$ lb config --apt-http-proxy http://proxy/
+ $ lb config --apt-http-proxy http://proxy/
 
 }code
 
@@ -489,7 +498,7 @@ with:
 
 code{
 
-$ lb config --binary-indices false
+ $ lb config --binary-indices false
 
 }code
 
@@ -504,7 +513,7 @@ much, you may disable that default option of APT with:
 
 code{
 
-$ lb config --apt-recommends false
+ $ lb config --apt-recommends false
 
 }code
 
@@ -542,11 +551,16 @@ distribution, Squeeze. The following will accomplish this:
 
 code{
 
-$ echo "deb http://mirror/debian sid main" >
-config/chroot_sources/sid.chroot $ cat >>config/chroot_apt/preferences <<END
-Package: live-* Pin: release n=sid Pin-Priority: 600
+ $ echo "deb http://mirror/debian sid main" > config/chroot_sources/sid.chroot
+ $ cat >>config/chroot_apt/preferences <<END
+ Package: live-*
+ Pin: release n=sid
+ Pin-Priority: 600
 
-Package: * Pin: release n=sid Pin-Priority: 1 END
+ Package: *
+ Pin: release n=sid
+ Pin-Priority: 1
+ END
 
 }code
 
@@ -559,7 +573,9 @@ following stanza to #{config/chroot_apt/preferences}#:
 
 code{
 
-Package: gnome-keyring Pin: version * Pin-Priority: -1
+ Package: gnome-keyring
+ Pin: version *
+ Pin-Priority: -1
 
 }code
 
diff --git a/manual/ro/user_customization-runtime.ssi b/manual/ro/user_customization-runtime.ssi
index 35d331f..471abb4 100644
--- a/manual/ro/user_customization-runtime.ssi
+++ b/manual/ro/user_customization-runtime.ssi
@@ -21,8 +21,7 @@ add the live user to the #{fuse}# group, add the following to a file in the
 
 code{
 
-debconf passwd/user-default-groups string audio cdrom dialout floppy video
-plugdev netdev powerdev fuse
+ debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse
 
 }code
 
@@ -42,7 +41,7 @@ the #{--bootappend-live}# option of #{lb config}#, e.g.
 
 code{
 
-$ lb config --bootappend-live "locales=de_CH.UTF-8"
+ $ lb config --bootappend-live "locales=de_CH.UTF-8"
 
 }code
 
@@ -59,8 +58,8 @@ spoken, e.g:
 
 code{
 
-$ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
-<name>se</name>
+ $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
+ <name>se</name>
 
 }code
 
@@ -69,7 +68,7 @@ use:
 
 code{
 
-$ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
+ $ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
 
 }code
 
@@ -78,8 +77,8 @@ with the following command:
 
 code{
 
-$ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); do basename $i |
-head -c -9; echo; done | sort | less
+ $ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); \
+     do basename $i | head -c -9; echo; done | sort | less
 
 }code
 
@@ -93,8 +92,8 @@ TypeMatrix keyboard, both in console and X11, use:
 
 code{
 
-$ lb config --bootappend-live "locales=fr_FR.UTF-8 keyboard-layouts=fr
-keyboard-variant=bepo keyboard-model=tm2030usb"
+ $ lb config --bootappend-live \
+     "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
 
 }code
 
@@ -134,7 +133,7 @@ hard disk or on a usb key created with, e.g.:
 
 code{
 
-# mkfs.ext2 -L live-rw /dev/sdb1
+ # mkfs.ext2 -L live-rw /dev/sdb1
 
 }code
 
@@ -143,8 +142,8 @@ label with one of the following:
 
 code{
 
-# tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems # dosfslabel
-/dev/sdb1 live-rw # for a fat filesystem
+ # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems
+ # dosfslabel /dev/sdb1 live-rw # for a fat filesystem
 
 }code
 
@@ -156,8 +155,8 @@ a foreign OS, with something like:
 
 code{
 
-$ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file $
-/sbin/mkfs.ext2 -F live-rw
+ $ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file
+ $ /sbin/mkfs.ext2 -F live-rw
 
 }code
 
diff --git a/manual/ro/user_examples.ssi b/manual/ro/user_examples.ssi
index ee55c5b..8d10188 100644
--- a/manual/ro/user_examples.ssi
+++ b/manual/ro/user_examples.ssi
@@ -24,9 +24,9 @@ preferred mirror. For example:
 
 code{
 
-LB_MIRROR_BOOTSTRAP="http://mirror/debian"
-LB_MIRROR_CHROOT="http://mirror/debian"
-LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+ LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_MIRROR_CHROOT="http://mirror/debian"
+ LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
 
 }code
 
@@ -42,7 +42,7 @@ You can't get much simpler than this:
 
 code{
 
-$ mkdir tutorial1 ; cd tutorial1 ; lb config
+ $ mkdir tutorial1 ; cd tutorial1 ; lb config
 
 }code
 
@@ -54,7 +54,7 @@ Now, as superuser, build the image, saving a log as you build with #{tee}#.
 
 code{
 
-# lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee binary.log
 
 }code
 
@@ -76,7 +76,7 @@ utility, serving as an introduction to customizing Debian Live images.
 
 code{
 
-$ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel
+ $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel
 
 }code
 
@@ -93,7 +93,7 @@ Build the image, again as superuser, keeping a log as in {Tutorial
 
 code{
 
-# lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee binary.log
 
 }code
 
@@ -114,8 +114,9 @@ in {Managing a configuration}#managing-a-configuration.
 
 code{
 
-$ mkdir -p tutorial3/auto $ cp /usr/share/live/build/examples/auto/*
-tutorial3/auto/ $ cd tutorial3
+ $ mkdir -p tutorial3/auto
+ $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/
+ $ cd tutorial3
 
 }code
 
@@ -123,14 +124,14 @@ Edit #{auto/config}# to read as follows:
 
 code{
 
-#!/bin/sh
+ #!/bin/sh
 
-lb config noauto \
-    --architecture i386 \
-    --linux-flavours 686 \
-    --packages-lists lxde \
-    --packages "iceweasel xchat" \
-    "${@}"
+ lb config noauto \
+     --architecture i386 \
+     --linux-flavours 686 \
+     --packages-lists lxde \
+     --packages "iceweasel xchat" \
+     "${@}"
 
 }code
 
@@ -145,7 +146,7 @@ Now, build the image:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -158,7 +159,9 @@ only the auto scripts we just created, and then make the first commit:
 
 code{
 
-$ git init $ git add auto $ git commit -a -m "Initial import."
+ $ git init
+ $ git add auto
+ $ git commit -a -m "Initial import."
 
 }code
 
@@ -174,7 +177,7 @@ regenerate the files from our new configuration.
 
 code{
 
-# lb clean
+ # lb clean
 
 }code
 
@@ -182,14 +185,14 @@ Now edit #{auto/config}# to add the #{vlc}# package:
 
 code{
 
-#!/bin/sh
+ #!/bin/sh
 
-lb config noauto \
-    --architecture i386 \
-    --linux-flavours 686 \
-    --packages-lists lxde \
-    --packages "iceweasel xchat vlc" \
-    "${@}"
+ lb config noauto \
+     --architecture i386 \
+     --linux-flavours 686 \
+     --packages-lists lxde \
+     --packages "iceweasel xchat vlc" \
+     "${@}"
 
 }code
 
@@ -205,7 +208,7 @@ Test, and when you're satisfied, commit the next revision:
 
 code{
 
-$ git commit -a -m "Adding vlc media player."
+ $ git commit -a -m "Adding vlc media player."
 
 }code
 
@@ -232,11 +235,11 @@ around the standard-x11 list, including #{gdm3}#, #{metacity}# and
 
 code{
 
-$ mkdir vnc_kiosk_client
-$ cd vnc_kiosk_client
-$ lb config -a i386 -k 686 -p standard-x11 \
-    --packages "gdm3 metacity xvnc4viewer" \
-    --apt-recommends false
+ $ mkdir vnc_kiosk_client
+ $ cd vnc_kiosk_client
+ $ lb config -a i386 -k 686 -p standard-x11 \
+     --packages "gdm3 metacity xvnc4viewer" \
+     --apt-recommends false
 
 }code
 
@@ -246,12 +249,15 @@ to port #{5901}# on a server at #{192.168.1.2}#:
 
 code{
 
-$ mkdir -p config/chroot_local-includes/etc/skel $ cat
->config/chroot_local-includes/etc/skel/.xsession <<END #!/bin/sh
+ $ mkdir -p config/chroot_local-includes/etc/skel
+ $ cat >config/chroot_local-includes/etc/skel/.xsession <<END
+ #!/bin/sh
 
-/usr/bin/metacity & /usr/bin/xvncviewer 192.168.1.2:1
+ /usr/bin/metacity &
+ /usr/bin/xvncviewer 192.168.1.2:1
 
-exit END
+ exit
+ END
 
 }code
 
@@ -259,7 +265,7 @@ Build the image:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -281,8 +287,8 @@ packages will most likely produce a broken live system.
 
 code{
 
-$ lb config -k 486 -p minimal --binary-indices false --memtest none
---apt-recommends false --includes none
+ $ lb config -k 486 -p minimal --binary-indices false \
+     --memtest none --apt-recommends false --includes none
 
 }code
 
@@ -290,7 +296,7 @@ Now, build the image in the usual way:
 
 code{
 
-# lb build 2>&1 | tee binary.log
+ # lb build 2>&1 | tee binary.log
 
 }code
 
@@ -328,7 +334,7 @@ prepare, make sure you have both of those things:
 
 code{
 
-# apt-get install dctrl-tools tasksel-data
+ # apt-get install dctrl-tools tasksel-data
 
 }code
 
@@ -336,12 +342,12 @@ Now we can search for the appropriate tasks, first with:
 
 code{
 
-$ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description
-Task: brazilian-portuguese
-Description: Brazilian Portuguese environment
- This task installs programs, data files, and
- documentation that make it easier for Brazilian Portuguese speakers
- to use Debian.
+ $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ Task: brazilian-portuguese
+ Description: Brazilian Portuguese environment
+  This task installs programs, data files, and
+  documentation that make it easier for Brazilian Portuguese speakers
+  to use Debian.
 
 }code
 
@@ -350,14 +356,14 @@ brazilian-portuguese. Now to find the related tasks:
 
 code{
 
-$ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description
-Task: brazilian-portuguese-desktop
-Description: Brazilian Portuguese desktop
- This task localises the desktop in Brasilian Portuguese.
+ $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ Task: brazilian-portuguese-desktop
+ Description: Brazilian Portuguese desktop
+  This task localises the desktop in Brasilian Portuguese.
 
-Task: brazilian-portuguese-kde-desktop
-Description: Brazilian Portuguese KDE desktop
- This task localises the KDE desktop in Brazilian Portuguese.
+ Task: brazilian-portuguese-kde-desktop
+ Description: Brazilian Portuguese KDE desktop
+  This task localises the KDE desktop in Brazilian Portuguese.
 
 }code
 
@@ -369,9 +375,9 @@ layout. Now let's put the pieces together:
 
 code{
 
-$ mkdir live-pt_BR-kde
-$ cd live-pt_BR-kde
-$ lb config \
+ $ mkdir live-pt_BR-kde
+ $ cd live-pt_BR-kde
+ $ lb config \
      -a i386 \
      -k 486 \
      -p kde-desktop \
diff --git a/manual/ro/user_installation.ssi b/manual/ro/user_installation.ssi
index 7802167..2d324d3 100644
--- a/manual/ro/user_installation.ssi
+++ b/manual/ro/user_installation.ssi
@@ -38,7 +38,7 @@ Simply install live-build like any other package:
 
 code{
 
-# apt-get install live-build
+ # apt-get install live-build
 
 }code
 
@@ -46,7 +46,7 @@ or
 
 code{
 
-# aptitude install live-build
+ # aptitude install live-build
 
 }code
 
@@ -58,7 +58,7 @@ code, execute:
 
 code{
 
-$ git clone git://live.debian.net/git/live-build.git
+ $ git clone git://live.debian.net/git/live-build.git
 
 }code
 
@@ -66,7 +66,9 @@ You can build and install your own Debian package by executing:
 
 code{
 
-$ cd live-build $ dpkg-buildpackage -rfakeroot -b -uc -us $ cd ..
+ $ cd live-build
+ $ dpkg-buildpackage -rfakeroot -b -uc -us
+ $ cd ..
 
 }code
 
@@ -75,7 +77,7 @@ interested in, e.g.
 
 code{
 
-# dpkg -i live-build_2.0.8-1_all.deb
+ # dpkg -i live-build_2.0.8-1_all.deb
 
 }code
 
@@ -83,7 +85,7 @@ You can also install live-build directly to your system by executing:
 
 code{
 
-# make install
+ # make install
 
 }code
 
@@ -91,7 +93,7 @@ and uninstall it with:
 
 code{
 
-# make uninstall
+ # make uninstall
 
 }code
 
@@ -119,8 +121,8 @@ _* Checkout the live-boot and live-config source
 
 code{
 
-$ git clone git://live.debian.net/git/live-boot.git $ git clone
-git://live.debian.net/git/live-config.git
+ $ git clone git://live.debian.net/git/live-boot.git
+ $ git clone git://live.debian.net/git/live-config.git
 
 }code
 
@@ -142,8 +144,10 @@ system distribution, you may build directly on the build system using
 
 code{
 
-$ cd live-boot $ dpkg-buildpackage -b -uc -us $ cd ../live-config $
-dpkg-buildpackage -b -uc -us
+ $ cd live-boot
+ $ dpkg-buildpackage -b -uc -us
+ $ cd ../live-config
+ $ dpkg-buildpackage -b -uc -us
 
 }code
 
@@ -165,7 +169,7 @@ tree with #{lb config}#:
 
 code{
 
-$ lb config --repository live.debian.net
+ $ lb config --repository live.debian.net
 
 }code
 
diff --git a/manual/ro/user_managing_a_configuration.ssi b/manual/ro/user_managing_a_configuration.ssi
index 4270690..abab4fa 100644
--- a/manual/ro/user_managing_a_configuration.ssi
+++ b/manual/ro/user_managing_a_configuration.ssi
@@ -50,10 +50,10 @@ recursively. Also, don't forget to ensure the scripts are executable
 
 code{
 
-#!/bin/sh
-lb config noauto \
-	--packages-lists "standard" \
-	"${@}"
+ #!/bin/sh
+ lb config noauto \
+     --packages-lists "standard" \
+     "${@}"
 
 }code
 
@@ -61,11 +61,11 @@ lb config noauto \
 
 code{
 
-#!/bin/sh
-lb clean noauto "${@}"
-rm -f config/binary config/bootstrap \
-	config/chroot config/common config/source
-rm -f binary.log
+ #!/bin/sh
+ lb clean noauto "${@}"
+ rm -f config/binary config/bootstrap \
+     config/chroot config/common config/source
+ rm -f binary.log
 
 }code
 
@@ -73,7 +73,8 @@ rm -f binary.log
 
 code{
 
-#!/bin/sh lb build noauto "${@}" 2>&1 | tee binary.log
+ #!/bin/sh
+ lb build noauto "${@}" 2>&1 | tee binary.log
 
 }code
 
@@ -82,7 +83,7 @@ above. You may copy those as your starting point.
 
 code{
 
-$ cp /usr/share/live/build/examples/auto/* auto/
+ $ cp /usr/share/live/build/examples/auto/* auto/
 
 }code
 
diff --git a/manual/ro/user_overview.ssi b/manual/ro/user_overview.ssi
index d1e72c1..3d6b063 100644
--- a/manual/ro/user_overview.ssi
+++ b/manual/ro/user_overview.ssi
@@ -56,32 +56,41 @@ subdirectory which it populates with some default settings:
 
 code{
 
-$ lb config P: Creating config tree
-
-$ ls -l total 8 drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto drwxr-xr-x 22
-user user 4096 Sep 7 13:02 config
-
-$ ls -l config/ total 104 -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary
-drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer drwxr-xr-x 2
-user user 4096 Sep 7 13:02 binary_debian-installer-includes drwxr-xr-x 2
-user user 4096 Sep 7 13:02 binary_grub drwxr-xr-x 2 user user 4096 Sep 7
-13:02 binary_local-debs drwxr-xr-x 2 user user 4096 Sep 7 13:02
-binary_local-hooks drwxr-xr-x 2 user user 4096 Sep 7 13:02
-binary_local-includes drwxr-xr-x 2 user user 4096 Sep 7 13:02
-binary_local-packageslists drwxr-xr-x 2 user user 4096 Sep 7 13:02
-binary_local-udebs drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs
-drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux -rw-r--r-- 1 user
-user 2051 Sep 7 13:02 bootstrap -rw-r--r-- 1 user user 1647 Sep 7 13:02
-chroot drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt drwxr-xr-x 2 user
-user 4096 Sep 7 13:02 chroot_local-hooks drwxr-xr-x 2 user user 4096 Sep 7
-13:02 chroot_local-includes drwxr-xr-x 2 user user 4096 Sep 7 13:02
-chroot_local-packages drwxr-xr-x 2 user user 4096 Sep 7 13:02
-chroot_local-packageslists drwxr-xr-x 2 user user 4096 Sep 7 13:02
-chroot_local-patches drwxr-xr-x 2 user user 4096 Sep 7 13:02
-chroot_local-preseed drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources
--rw-r--r-- 1 user user 2954 Sep 7 13:02 common drwxr-xr-x 2 user user 4096
-Sep 7 13:02 includes -rw-r--r-- 1 user user 205 Sep 7 13:02 source
-drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates
+ $ lb config
+ P: Creating config tree
+
+ $ ls -l
+ total 8
+ drwxr-xr-x  3 user user 4096 Sep  7 13:02 auto
+ drwxr-xr-x 22 user user 4096 Sep  7 13:02 config
+
+ $ ls -l config/
+ total 104
+ -rw-r--r-- 1 user user 4197 Sep  7 13:02 binary
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_debian-installer
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_debian-installer-includes
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_grub
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-debs
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-hooks
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-includes
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-packageslists
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_local-udebs
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_rootfs
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 binary_syslinux
+ -rw-r--r-- 1 user user 2051 Sep  7 13:02 bootstrap
+ -rw-r--r-- 1 user user 1647 Sep  7 13:02 chroot
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_apt
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-hooks
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-includes
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-packages
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-packageslists
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-patches
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_local-preseed
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 chroot_sources
+ -rw-r--r-- 1 user user 2954 Sep  7 13:02 common
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 includes
+ -rw-r--r-- 1 user user  205 Sep  7 13:02 source
+ drwxr-xr-x 2 user user 4096 Sep  7 13:02 templates
 
 }code
 
@@ -95,7 +104,7 @@ Normally, you will want to specify some options. For example, to include the
 
 code{
 
-$ lb config -p gnome
+ $ lb config -p gnome
 
 }code
 
@@ -103,8 +112,7 @@ It is possible to specify many options, such as:
 
 code{
 
-$ lb config --binary-images net --hostname live-machine --username live-user
-...
+ $ lb config --binary-images net --hostname live-machine --username live-user ...
 
 }code
 

-- 
live-manual



More information about the debian-live-changes mailing list