[SCM] live-manual branch, upstream, updated. upstream/2.0_a12-1-g4aa5628

Daniel Baumann daniel at debian.org
Fri Dec 24 18:01:05 UTC 2010


The following commit has been merged in the upstream branch:
commit 4aa56288525095a493f5e42cbd5d6322c6f1870a
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Dec 24 19:00:41 2010 +0100

    Adding upstream version 2.0.1.

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 567609b..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-build/
diff --git a/Makefile b/Makefile
index 2ca79ca..e9a4fbf 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,8 @@ SHELL := sh -e
 
 LANGUAGES = en $(shell cd manual/po && ls)
 
+DEBUG = 0
+
 all: test build
 
 test:
@@ -31,6 +33,11 @@ build:
 		cd $(CURDIR)/manual/$${LANGUAGE}; \
 		sisu-epub -v live-manual.ssm; \
 		sisu-html -v live-manual.ssm; \
+		for FILE in build/$${LANGUAGE}/live-manual/*.html; \
+		do \
+			../bin/fix-sisu-html.rb $${FILE}; \
+			([ $(DEBUG) -gt 0 ] || rm -f $${FILE}~); \
+		done; \
 		sisu-odf -v live-manual.ssm; \
 		sisu-pdf -v live-manual.ssm; \
 		sisu-txt -v live-manual.ssm; \
diff --git a/VERSION b/VERSION
index 41bc97f..38f77a6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0~a12
+2.0.1
diff --git a/html/index.html b/html/index.html
index 158d574..474dc7a 100644
--- a/html/index.html
+++ b/html/index.html
@@ -7,12 +7,23 @@
 <body>
 	<h2>Debian Live Manual</h2>
 
+	<h3>Available Languages</h3>
+
 	<ul>
-		<li><a href="en"><b>English</b></a></li>
 		<li><a href="de">Deutsch (German)</a></li>
+		<li><a href="en">English</a></li>
 		<li><a href="fr">Fran&ccedil;ais (French)</a></li>
-		<li><a href="pt_BR">Portugu&ecirc;s (Portuguese)</a></li>
-		<li><a href="ro">Rom&acirc;n&acaron; (Romanian)</a></li>
+		<li><a href="it">Italiano (Italian)</a></li>
+		<li><a href="pt_BR">Portugu&ecirc;s Brasil (Brazilian Portuguese)</a></li>
+		<li><a href="ro">Rom&acirc;na (Romanian)</a></li>
+		<!-- <li><a href="ro">Rom&acirc;n&acaron; (Romanian)</a></li> -->
+	</ul>
+
+	<h3>Meta</h3>
+
+	<ul>
+		<li><a href="build.log">build.log</a></li>
+		<li><a href="manual-trace">manual-trace</a></li>
 	</ul>
 
 	<p>
diff --git a/manual/Makefile b/manual/Makefile
index ff0d6cf..356e21a 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -4,6 +4,17 @@ SHELL := sh -e
 
 LANGUAGES = $(shell cd po && ls)
 
+DEBUG=0
+PO4A_FLAGS=
+
+ifeq ($(DEBUG),1)
+    PO4A_FLAGS=-d
+endif
+
+ifeq ($(DEBUG),2)
+    PO4A_FLAGS=-d -v
+endif
+
 all: build
 
 po4a.cfg:
@@ -29,7 +40,7 @@ build: po4a.cfg
 		exit 1; \
 	fi
 
-	po4a --keep 0 --no-backups --package-name live-manual po4a.cfg
+	po4a --keep 0 --no-backups --package-name live-manual $(PO4A_FLAGS) po4a.cfg
 
 	for LANGUAGE in $(LANGUAGES); \
 	do \
diff --git a/manual/bin/fix-sisu-html.rb b/manual/bin/fix-sisu-html.rb
new file mode 100755
index 0000000..bf123ef
--- /dev/null
+++ b/manual/bin/fix-sisu-html.rb
@@ -0,0 +1,19 @@
+#! /usr/bin/env ruby
+
+require 'nokogiri'
+
+output_file=ARGV.shift
+input_file=output_file+"~"
+
+File.rename(output_file,input_file)
+File.open(output_file,"w") do |o|
+    doc=Nokogiri::HTML(open input_file)
+    # CSS3 selectors don't support regexes, so we take a shotgun approach,
+    # removing all tables with summaries (OK for current sisu output).
+    # Change to use a custom pseudo class if anything more refined is needed.
+    doc.css(%[table[summary]]).remove
+    toc=doc.css(%[h2,h4[class$="toc"]]).each do |node|
+	node.remove if node.inner_text.match(/Metadata|Manifest|SiSU/)
+    end
+    o.puts doc.to_html
+end
diff --git a/manual/de/about_manual.ssi b/manual/de/about_manual.ssi
index 3a31fc8..790efb2 100644
--- a/manual/de/about_manual.ssi
+++ b/manual/de/about_manual.ssi
@@ -23,9 +23,9 @@ the details. Therefore, we have provided three tutorials in the
 {Examples}#examples section designed to teach you image building and
 customization basics. Read {Using the examples}#using-the-examples first,
 followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web
-browser utility}#tutorial-2 and finally {Tutorial 3: A personal travelling
-companion}#tutorial-3. By the end of these tutorials, you will have a taste
-of what can be done with Debian Live. We encourage you to return to more
+browser utility}#tutorial-2 and finally {Tutorial 3: A personalized
+image}#tutorial-3. By the end of these tutorials, you will have a taste of
+what can be done with Debian Live. We encourage you to return to more
 in-depth study of the manual, perhaps next reading {The basics}#the-basics,
 skimming or skipping {Building a netboot image}#building-netboot-image, and
 finishing by reading the {Customization overview}#customization-overview and
@@ -129,8 +129,8 @@ _* Trent W. Buck
 
 This manual is intended as a community project and all proposals for
 improvements and contributions are extremely welcome. The preferred way to
-submit a contribution is to send it to the mailing list. Please see
-{Contact}#contact for more information.
+submit a contribution is to send it to the mailing list. Please see the
+section {Contact}#contact for more information.
 
 When submitting a contribution, please clearly identify its copyright holder
 and include the licensing statement. Note that to be accepted, the
@@ -138,7 +138,7 @@ contribution must be licensed under the same license as the rest of the
 document, namely, GPL version 3 or later.
 
 The sources for this manual are maintained using the Git version control
-system. You can checkout the latest copy by executing:
+system. You can check out the latest copy by executing:
 
 code{
 
@@ -152,16 +152,16 @@ installed by executing:
 
 code{
 
-# apt-get install make po4a sisu-complete
+ # apt-get install make po4a sisu-complete libnokogiri-ruby
 
 }code
 
-You may build the live-manual from the top level directory of your git
+You may build the live-manual from the top level directory of your Git
 checkout by executing:
 
 code{
 
-$ make build
+ $ make build
 
 }code
 
@@ -171,26 +171,26 @@ executing:
 
 code{
 
-$ make build LANGUAGES=en
+ $ make build LANGUAGES=en
 
 }code
 
 3~ Applying patches
 
-Directly commiting to the repository is possible by anyone. However, we ask
-you to send bigger changes to the mailing list to discuss them first. In
-order to push to the repository, the following steps are required.
+Anyone can directly commit to the repository. However, we ask you to send
+bigger changes to the mailing list to discuss them first. To push to the
+repository, you must follow this procedure:
 
 _* 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/live.debian.net
-$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \
-	-O ~/.ssh/identity.d/live.debian.net.pub
-$ chmod 0600 ~/.ssh/identity.d/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,41 +198,41 @@ _* 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
 
-_* Checkout a clone of the manual through ssh:
+_* 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
 
-_* After editing the files in manual/en/, please call the 'commit' target in
-the top level directory to sanitize the files and update the translation
-files:
+_* After editing the files in #{manual/en/}#, please call the 'commit'
+target in the top level directory to sanitize the files and update the
+translation files:
 
 code{
 
-$ make commit
+ $ make commit
 
 }code
 
-_* After sanitizing commit the changes. Write commit messages, that consist
-of full useful sentences, starting with a capital letter and ending with a
-full stop. Usually starting with the form
-'Fixing/Adding/Removing/Correcting/':
+_* After sanitizing, commit the changes. Write commit messages that consist
+of full, useful sentences in English, starting with a capital letter and
+ending with a full stop. Usually, these will start with the form
+'Fixing/Adding/Removing/Correcting/Translating', e.g.
 
 code{
 
-$ git commit -a
+ $ git commit -a -m "Adding a section on applying patches."
 
 }code
 
@@ -240,18 +240,23 @@ _* Push the commit to the server:
 
 code{
 
-$ git push
+ $ git push
 
 }code
 
 3~ Translation
 
-Submiting a translation for a new language is recommendet in two steps:
+To submit a translation for a new language, follow these three steps:
 
-_* Translate the about_manual.ssi.pot about_project.ssi.pot
+_* Translate the about_manual.ssi.pot, about_project.ssi.pot and
 index.html.in.pot files to your language with your favourite editor (such as
-poedit). Send translated files to the mailinglist. It will then be included
-and autobuild for that language enabled.
+poedit). Send translated files to the mailing list. Once we have reviewed
+your submission, we will add the new language to the manual (providing the
+po files) and will enable it in the autobuild.
+
+_* Once the new language is added, you can randomly start translating all po
+files in #{manual/po/}#.
+
+_* Don't forget you need #{make commit}# to ensure the translated manuals
+are updated from the po files, before #{git commit -a}# and #{git push}#.
 
-_* Now that the new language was added, you can randomly start translating
-all other pot files.
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index ba1ba7a..f03fd6e 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -9,7 +9,7 @@
  :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
 
 @date:
- :published: 2010-12-06
+ :published: 2010-12-24
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
@@ -27,7 +27,7 @@
 
 << about_project.ssi
 
-:B~ User ~#
+:B~ User
 
 << user_installation.ssi
 
@@ -43,17 +43,13 @@
 
 << user_customization-contents.ssi
 
-<< user_customization-internationalization.ssi
-
 << user_customization-runtime.ssi
 
 << user_customization-binary.ssi
 
 << user_customization-installer.ssi
 
-:B~ Development ~#
-
-:B~ Project ~#
+:B~ Project
 
 << project_bugs.ssi
 
@@ -61,18 +57,7 @@
 
 << project_procedures.ssi
 
-:B~ Examples ~#
+:B~ Examples
 
 << user_examples.ssi
 
-:B~ Other ~#
-
-Other material that formerly appeared in this section is out of date and/or
-has not been approved for release. It has therefore been omitted, but can
-still be found in the document source; see 'About this manual'. Any part of
-the omitted material that is still useful will be included in the release
-only after it has been reviewed.
-
-% << other_faq.ssi
-
-% << other_howtos.ssi
diff --git a/manual/de/other_faq.ssi b/manual/de/other_faq.ssi
deleted file mode 100644
index f754913..0000000
--- a/manual/de/other_faq.ssi
+++ /dev/null
@@ -1,545 +0,0 @@
-B~ Frequently asked questions (FAQ)
-
-1~ Frequently asked questions (FAQ)
-
-Q: I downloaded a prebuilt live image. How do I put it on a USB stick? A:
-See "Copying USB/HDD image to a USB stick" % FIXME: <xref
-linkend="image_copying"/>
-
-Q: How do I log my build? A: You could use script, screen or tee: #{$
-lh_build 2>&1 | tee build.log}#
-
-Q: How can I convert an already installed standard Debian partition into a
-Debian Live system? A: Save the list of installed packages and load it into
-your new Debian Live System. Copy your /etc to config/chroot_local-includes
-
-Q: What does 'losetup: could not find any free loop device' mean and how do
-I fix it? A: Loop devices are used during the build; there probably aren't
-any free if you've aborted several builds. Something like: for l in
-/dev/loop0 /dev/loop1 /dev/loop2 /dev/loop3 /dev/loop4 /dev/loop5 /dev/loop6
-/dev/loop7 ; do losetup -d $l ; done should rectify the situation (assuming
-all loop devices in use were created by lh_build; if in doubt, check the
-contents of each loop device before deleting them with losetup -d).
-
-Q: How do I launch an interactive shell during the chroot stage? A: To
-enable interactive shell: #{$ lh_config --interactive shell}# To continue
-the build process: #{# logout}# or #{# exit}# To disable interactive shell,
-set LH_INTERACTIVE to "disabled" in config/chroot.
-
-Q: What is the root /user password? A: The user password for the live user
-is 'live'. By default, there is not any root password. You can switch to
-root with ${sudo -i}# or set a password for root with #{sudo passwd}#
-
-Q: How do I change root or any user password? A: Add a chroot local hook
-script to change root or any user password each time you build an image.
-e.g. config/chroot_local-hooks/01-update_password.sh to set root password to
-"nopasswd"
-
-code{ #!/bin/sh
-
-echo "I: update password" echo "root:nopasswd" | chpasswd
-
-$ chmod +x config/chroot_local-hooks/01-update_password.sh
-
-}code
-
-Note for live user; you need to copy the
-/usr/share/initramfs-tools/scripts/live-bottom/10adduser your build folder:
-
-code{
-
-mkdir -p
-config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/
-cp /usr/share/initramfs-tools/scripts/live-bottom/10adduser
-config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/
-
-}code
-
-Note: Then edit the
-config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/10adduser
-and paste in the new user_crypted password that you make with: #{echo
-"newlivepass" | mkpasswd -s}#
-
-Or add an hook file in config/chroot_local-hooks/ with something like the
-below:
-
-code{ #!/bin/sh
-
-# Change the autogenerated user password to "debianlive"
-plain_password="debianlive" password=$(echo "${plain_password}" | mkpasswd
--s)
-
-sed -i -e 's/\(user_crypted=\)\(.*\)\( #.*\)/\1\"'${password}'\"\3/'
-/usr/share/initramfs-tools/scripts/live-bottom/10adduser
-
-update-initramfs -tu -kall }code
-
-The latter (hook model) could be more future proof than the former solution
-since it modifies just one string selectively but it requires the package
-"whois" to be installed on the target system (for mkpasswd) or that you
-generate the $password string not at build time and include it crypted in
-the above script.
-
-Q: How to disable autologin? A1: use the commandline parameter #{lh config
---bootappend-live "noautologin"}# A2: You need to set boot=noautologin
-noxautologin as described in man live-initramfs If you boot via TFTP you
-want to insert the option to pxelinux.cfg/default
-
-Q: How do I change default hostname or username? A: To change default
-hostname or username: #{$ lh_config --hostname myhostname $ lh_config
---username myusername}#
-
-Q: How do I make the final image smaller? A: Clean orphaned apps/libs:
-Install package "deborphan" and then run 'sudo deborphan -n' . Delete
-unwanted packages. Remove the apt cache. Purge unwanted locales (see
-"localepurge" package).
-
-Q: How do I customize bash-config permanently (aliases, bash-completion
-etc.)? A: Add your own .bashrc config/chroot_local-includes/etc/skel/.bashrc
-
-Q: How do I disable services permanently? (Be careful!)  A: Add a chroot
-local hook script to disable a service each time you build an image:
-e.g. config/chroot_local-hooks/01-disable_service.sh
-
-code{
-
-#!/bin/sh
-
-echo "I: disable service" update-rc.d -f service_name remove
-
-$ chmod +x config/chroot_local-hooks/01-disable_service.sh
-
-}code
-
-Q: How do I enable | disable the md5checksum at the ISO building? A:
-#{lh_config --checksums enabled|disabled}# Or change the LH_CHECKSUMS value.
-
-Q: How to disable the generation of the .tar.gz file? A: #{lh_config
---net-tarball none|gzip}# Or change the LH_NET_TARBALL value. (only
-available in snapsshot version at the moment 2008/Feb/28)
-
-Q: How do I "build a new image"? A: Run commands:
-
-code{
-
-$ sudo lh_clean --binary $ sudo lh_build
-
-}code
-
-Hint: If the configuration had changed you should leave "--binary" out. This
-will clean your chroot directory too.
-
-Q: How do I use Fluxbox ? A: Add a new lists file with the fluxbox packages
-you want.
-
-Create /home/$USERNAME/.dmrc file (default username is "user").
-
-code{
-
-$ cat .dmrc [Desktop] Session=fluxbox }code
-
-Note: .dmrc is owned by $USERNAME:$USERNAME.
-
-See also http://wiki.debian.org/Fluxbox/ A short HOWTO can be found at
-http://wiki.debian.org/MichaelAblassmeier/CustomLiveCD
-
-Q: How do I use custom repositories? A: See
-http://wiki.debian.org/DebianLive/Configuration
-
-Q: How do I customize the artwork for the live CD (grub or syslinux boot
-splash, usplash, etc.)? A: See
-http://wiki.debian.org/DebianLive/Howto/Custom_Artwork
-
-Q: How do I customize desktop environment (KDE, GNOME, XFCE, etc...) look?
-A: Start the live system in qemu:
-
-code{
-
-$ qemu -m 256 -cdrom binary.iso -boot d -redir tcp:4222:10.0.2.15:22
-
-}code
-
-Note: the -redir argument must be changed to meet your needs
-
-Q: How do I execute a custom shell script inside the chroot system after the
-chroot stage? A: Add your script in config/chroot_local-hooks.
-
-Q: How do I add a script running immediately after all other scripts when
-the live system boots? A: Add your script in
-config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/99scrip
-
-code{
-
-$ chmod +x
-config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/99script
-
-}code
-
-Note: The hook script must be executable. Do not forget to lh_clean --chroot
-after making this change before you build again.
-
-You must also use the example script
-/usr/share/live-helper/examples/hooks/update-initramfs.sh to ensure your
-script gets built into the initramfs (read the comment header for
-instructions).
-
-Q: How do I add software not in Debian ? A: See Customizing package
-installation % FIXME: <xref linkend="packages"/>
-
-Q: What is the manifest with Ubuntu used for? A: Manifest is just the
-package list, which ubuntu does $something with. Don't worry about it.
-
-Q: What is this {p} syntax with mtools{p} and parted{p}? A: That's aptitude.
-
-Q: Do I need to write the image on USB stick to test it? A: you must use
-qemu >= 0.8.
-
-Q: What is /cow? A: Copy-on-write, the 'diff' from unionfs.
-
-Q: Is /usr/share/live-helper/lists/standard-x11 like preseed or is preseed
-something else entirely? A: It is not. It is a package list, not a debconf
-preseeding.
-
-Q: What is the difference between standard and minimal? A: standard:
-packages of priority standard and higher; minimal: packages of priority
-essential and higher;
-
-Q: What can the sections be used for? Aren't they BIG? A: Someone maybe
-wants to include packages from contrib or non-free.
-
-Q: memtest86+ ... is that used? A: Yes
-
-Q: How do I build using predefined packages lists? A: e.g. to build using
-standard-x11 packages list: #{$ sudo lh_config -p standard-x11 && sudo
-lh_build}# Note: The packages lists can be found in
-/usr/share/live-helper/lists/ directory.
-
-Q: How do I rebuild without downloading all the packages again? A: All
-packages are cached in cache subdirectory. They remain until a clean purge:
-#{$ sudo lh_clean --purge}# You do not have to do anything to prevent
-packages from being re-downloaded. You need to remember to clean whichever
-stages you want to rebuild first. e.g. to rebuild from the cached bootstrap,
-chroot packages and build a new image. #{$ sudo lh_clean && sudo lh_build}#
-
-Q: How do I boot USB debian-live on systems not supporting USB boot? A: Make
-a boot CD with grub, configured to boot from a debian-live kernel copied on
-the cd structure #{$ mkdir -p iso/boot/grub && cp
-/usr/lib/grub/i386-pc/stage2_eltorito iso/boot/grub && cp chroot/boot/*
-iso/boot/}# Create iso/boot/grub/menu.lst:
-
-code{
-
-default 0 timeout 5 color cyan/blue white/blue title Debian Live root (cd)
-kernel /boot/vmlinuz boot=live initrd /boot/initrd.img
-
-}code
-
-Create the iso image #{$ mkisofs -R -b boot/grub/stage2_eltorito
--no-emul-boot \ -boot-load-size 4 -boot-info-table -o grub.iso iso}# Burn
-the image.
-
-Q: How do I boot debian-live on systems not supporting CDROM or USB boot? A:
-If you have a floppy drive, you may be able to use it, otherwise you will
-need to use loadlin/grub4dos/win32-loader. If you have a second system to
-serve up the image over the network, See
-http://wiki.debian.org/DebianLive/Howto/Creating_a_Netboot_Image
-
-Q: The X configuration does not seems to work, the resolution is too
-low. What can I do? A: Use xdebconfigurator #{$ lh_config --bootappend
-xdebconf && lh_config --packages xdebconfigurator}#
-
-Q: Apache has problems with static files A: Sendfile does not work well on
-the unionfs used by Debian Live. Add the following to apache's
-configuration: #{EnableSendfile off}#
-
-Q: How do I make hard disk partitions auto-mountable? A: Short answer: Right
-now the best is to use a script that will populate the fstab when the CD is
-booting. Such a script can be found at
-https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-includes/sbin/diskmounter.sh.
-A proper solution based on HAL will be described here in a hopefully near
-future.  A: Long Answer: Since 55_nonpolkit-mount-policy.patch in HAL,
-debian-storage-policy-fixed-drives.fdi is not available anymore and the
-previous trick that consisted to remove this file to enable automounting of
-fixed drives as a consequence is obsolete. Eventually, it will be possible
-to combine HAL and PolicyKit to enable different permissions and actions to
-achieve advanced (auto)mounting for non-root users. Until then, because the
-live scripts are only touching to the fstab to add a swap partition if
-discovered at boot time, the only way to have fixed drives mounted
-automatically is to use a script that will populate the fstab file at the
-end of the multiuser runlevel. To achieve this, you can do, for example, the
-following: download the
-https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-includes/sbin/diskmounter.sh
-script Create the chroot_local-includes/sbin directory, and move the script
-inside Make sure the script is executable (chmod +x diskmounter.sh) create
-the chroot_local-includes/etc/rc.local file and call the diskmounter from
-there (see this
-https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-includes/etc/rc.local
-When called correctly, the script detects ext2, ext3, reiserfs, xfs, FAT32,
-HFS+ and NTFS partitions and mount them read-write, except for NTFS. This
-will change soon and an option will be available to use ntfs-3g to mount
-NTFS as read-write. comments, patches and other things about this script and
-issue: http://code.goto10.org/projects/puredyne/ticket/463
-
-Q: Boot fails with panic: can't open /scripts/live A: Add latest
-live-initramfs deb package into config/chroot_local-packages directory and
-rebuild.
-
-Q: How do I configure the locale and the keyboard? A: See 10n % FIXME: <xref
-linkend="internalization"/>
-
-Q: How do I get past boot prompt without a working keyboard? A: See
-Customizing the bootup process % FIXME: <xref linkend="bootup"/> Note: Boot
-from an USB-HDD on an iMac with GRUB did not work.
-
-Q: Can I serve the root image from a web or ftp server? A: Since
-live-initramfs 1.99, it should be possible to use the fetch= argument on the
-kernel command line. You can build a netboot image as usual, and when you
-are done edit the tftpboot/pxelinux.cfg/default file. Remove the references
-to network boot (netboot, nfsroot, nfsopts), and replace with fetch= <url
-where you placed the root image>. You have to include wget in the chroot. It
-could work for other boot methods as well. However, I am not sure the live
-scripts configure the network when booting from a CD or USB disk. #{$
-lh_config --packages wget}#
-
-Q: Why doesn't quickreboot (or some other boot parameter) work? A: If you
-are building an etch image (which was the default up to 2007/09/14) you have
-a very old version of casper which does not support quickreboot and possibly
-other boot parameters as well. You could configure your sources to use
-live-backports (see /usr/share/live-helper/examples/sources/live-backports)
-and switch to live-initramfs, or better yet, build a lenny image instead,
-which is the new default. #{$ lh_config --distribution lenny $ lh_config
---initramfs live-initramfs}#
-
-Q: How do I fix "Could not find kernel image" issue with syslinux
-bootloader? A: Add a binary local hook script to fix kernel and initrd path
-each time you build an
-image. e.g. config/binary_local-hooks/01-fix_syslinux.sh
-
-code{
-
-#!/bin/sh
-
-SYSLINUXCFG=`find binary -type f -name syslinux.cfg`
-
-sed -i "s|kernel /vmlinuz|kernel vmlinuz|g" ${SYSLINUXCFG} sed -i
-"s|initrd=/initrd|initrd=initrd|g" ${SYSLINUXCFG}
-
-$ chmod +x config/binary_local-hooks/01-fix_syslinux.sh
-
-}code
-
-Q: How do I use a newer kernel with lenny? A: A build with backports.org
-kernels will fail as that repository lacks the necessary module packages
-(linux-modules-extra-2.6, aufs, etc.). Use the kernel backports
-http://unsupported.debian-maintainers.org/backports-kernel/ The quick way to
-success:
-
-code{
-
-$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6
-squashfs-modules-2.6' $ echo 'deb
-http://unsupported.debian-maintainers.org/backports-kernel/ ./' >
-config/chroot_sources/backports-kernel.chroot $ echo 'deb
-http://unsupported.debian-maintainers.org/backports-kernel/ ./' >
-config/chroot_sources/backports-kernel.binary $ wget
-http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc
--O config/chroot_sources/backports-kernel.chroot.gpg $ wget
-http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc
--O config/chroot_sources/backports-kernel.binary.gpg $ lh_build }code
-
-Q: How do I use a custom kernel? Is there a nice way of booting debian-live
-with a custom kernel (not in an apt repo)? A: Copy it into
-config/chroot_local-packages and set LH_LINUX_PACKAGES="none" or use lh
-config --linux-packages " " Don't forget to compile your kernel with an
-union filesystem (unionfs or aufs), squashfs modules, and initrd support. I
-can cause the kernel to be installed but it seems this happens later than
-grub/syslinux is configured so it's not listed and casper/ and the menu
-require munging. You need to follow the debian scheme, e.g. placing the
-files in /boot as vmlinuz-$version and initrd.img-$version etc. I personally
-wouldn't go that way which is too much of a hassle, and just use make-kpkg
-to produce custom kernel deb packages. They should integrate nicely if you
-just put them into config/chroot_local-packages and set
-LH_LINUX_PACKAGES="". Hint: to work around an error, which
-lh_binary_syslinux will throw on custom kernels if there is not an 468/686
-in the kernel-name, you need to set CONFIG_LOCALVERSION="-486" or "-686"
-within the kernel configuration (-&gt; General setup -&gt; Local version set
-to -486 or -686) corresponding to LH_LINUX_FLAVOURS="" or "686". this at
-least up till live-helper version 1.0~a40-1 see
-http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-July/001947.html
-and
-http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-November/002581.html
-
-Q: How do I create a cross arch live CD image? A: In short: You can't. Read
-on: The procedure to create a live CD is based on creating a chroot that
-contains the files that will be finally available on the live CD. The live
-CD building procedure includes chrooting into the chroot dir and so some
-operations. chrooting means that the terminal you chroot on will behave as a
-different system so your real system and the chroot environment is decoupled
-somehow. Once the live CD scripts chroots into the chroot dir they have some
-operations to do inside that environment and your real system won't be able
-to run them unless you are using the same architecture. So you only are able
-to make live CD for the arch you run on. But this doesn't prevent you run
-qemu or some other machine emulator that make this possible.
-
-Q: When is a lh_clean necessary? lh_clean is a script in /usr/bin/ A: That
-depends what you've changed between builds If, for example, you've built an
-iso image and you want a usb image, you only need to run #{lh_clean
---binary}# before you run lh_build again. If you've changed anything in the
-chroot, you'll need to cleanup both chroot and binary with #{lh_clean}#
-before continuing
-
-Q: How can i set boot= parameters? A: Set LH_BOOTAPPEND_LIVE in
-config/binary
-
-Q: How do I include different modules to load when the live system boots? A:
-Configure config/chroot_local-includes/etc/initramfs-tools/
-
-The lh_chroot_hacks helper rebuilds the live/initrd1.img using the default
-initramfs.conf "MODULES = most". You may override that by supplying your own
-initramfs.conf, or else just add your own modules, e.g.
-
-code{
-
-mkdir -p config/chroot_local-includes/etc/initramfs-tools/ echo "atl2" >>
-config/chroot_local-includes/etc/initramfs-tools/modules
-
-}code
-
-Note: Even though initramfs.conf(5) says "most adds all the framebuffer,
-acpi, file system, ide, sata, scsi and usb drivers", it actually includes
-network drivers as well. See auto_add_modules() in
-/usr/share/initramfs-tools/hook-functions for the complete list.
-
-Q: Can I have a splash screen? A: Yes you can. You will not know what is
-going on when the splash screen is active, it may fail to activate on some
-hardware or break X on other (both usplash and splashy use libdirectfb which
-does some evil voodoo and may break you graphics or input until you
-reboot). However, you can install and activate it just as you would on any
-other Debian system. To use splashy: 1. install splashy and read the README,
-the manpages are useless for setting it up. Add some parameters to your
-kernel command line, such as in your pxelinux configuration or in
-LH_BOOTAPPEND_LIVE in config/binary in debian-live configuration: #{vga=792
-splash quiet}# #{vga}# to select video mode, #{splash}# to activate splashy,
-#{quiet}# to suppress most kernel messages that you cannot see anyway but
-would scroll past before splashy manages to paint the graphics on your
-screen. You might want to add splashy to the list of packages installed in
-your image: #{echo splashy > config/chroot_local-packageslists/splashy echo
-splashy-themes >> config/chroot_local-packageslists/splashy}# and select a
-theme:
-
-code{
-
-echo '#!/bin/sh' > config/chroot_local-hooks/splashy echo splashy_config -s
-debian-moreblue '||' true >> config/chroot_local-hooks/splashy # update the
-ramdisk to include the splash screen echo update-initramfs -u -k all >>
-config/chroot_local-hooks/splashy chmod 755
-config/chroot_local-hooks/splashy
-
-}code
-
-After you rebuild your live system you should observe a bluish splash screen
-while booting. Nothing happens while initramfs is running because there is
-no splashy support in initramfs-tools. Once the init starts the progress bar
-should start to fill. If #{vga=something}# sets a mode that your screen
-cannot show or your card cannot do vesa 2.0 (and thus you get plain text
-mode and no splashy) read the splashy faq.
-
-Q: Howto use my Broadcom eXtrem 2 network card (module bnx2)? A: Add the
-firmwares to the initrd image. You need to install the non-free package
-"firmware-bnx2". Uncompress your initrd image, then copy files:
-
-code{
-
-cp /lib/firmware/bnx2x-e1-4.8.53.0.fw /lib/firmware/bnx2x-e1-5.0.21.0.fw
-/lib/firmware/bnx2x-e1h-4.8.53.0.fw /lib/firmware/bnx2x-e1h-5.0.21.0.fw
-${INITRD}/lib/firmware/ cp /lib/udev/firmware.agent ${INITRD}/lib/udev/
-
-}code
-
-Recompress your initrd image and boot: it works!
-
-Q: X is broken (the system boots, messages scroll by, and then the screen
-goes blank). What do I do? A: On my system starting X completely disables
-graphics so that I do not see anything even after X bails out and I am back
-to the console. To prevent this you can change the driver Xorg uses.
-
-If you have a working splash screen or at least graphical console you can
-use #{live xdriver=fbdev}# when booting the live system (instead of just
-enter). Another driver you might want to try is #{vesa}#. If all fails you
-might try to set xdriver to some wrong value so that Xorg fails to start and
-you can examine the system while you still see something on the
-console. #{live xdriver=none}#
-
-Q: How can I get Debian first stable versions? A: I'm developing software
-and testing it on Live-CD. Thanks for the LiveCD project. To be sure my
-development is fully compatible with the "etch" version, I need the same
-scenario when Debian GNU/Linux 4.0 was published as stable (I believe
-2007.04.08). If there was some bug on 2007.04.08 that was corrected one week
-later, I need to test software foreseeing that scenario without the bug
-solved.
-
-Q: I get "fopen: Permission denied"-warnings from apt on building/at the
-live-system A: That's a harmless bug in apt. However, if you want to get off
-this warnings in the live-system, add a file in chroot_local-hooks with
-follow row:
-
-code{
-
-chown -R man.man /var/cache/man
-
-}code
-
-Q: Why I always fail during "Retrieving Packages" stage when running
-lh_build? I have already set apt-http-proxy and so on.  A: lh_build
-retrieves packages via wget, as a result you need to enable the proxy
-settings in /etc/wgetrc before running lh_build.
-
-Q: How do I edit Xorg.conf? A: Xorg.conf is generated every time system
-boots, so it's useless to put modifed Xorg.conf in
-config/choort_local-includes/etc/X11, because it will be overwritten during
-boot. However, you can edit /usr/bin/dexconf, which generate xorg.conf
-during boot, so the result will be modified Xorg.conf. The modified dexconf
-has to be put in config/choort_local-includes/usr/bin. e.g.: you can
-configure Xorg.conf for two or more keyboards layouts with alt+shift toggle
-by editing dexconf and replacing the line:
-
-code{
-
-Option "XkbLayout" "$XKB_LAYOUT"
-
-}code
-
-with the lines:
-
-code{
-
-Option "XkbLayout" "us,il" Option "XkbOptions"
-"grp:alt_shift_toggle,grp_led:scroll"
-
-}code
-
-when "us,il" are the wanted keyboard layouts.
-
-You can force default screen resulotion (e.g. 1024*768) by adding the lines:
-
-code{
-
-SubSection "Display"
-        Modes "1024x768"
-EndSubSection
-
-}code
-
-between the lines:
-
-code{
-
-Section "Screen"
-        Identifier "Default Screen"
-        Monitor "Configured Monitor"
-EndSection"
-
-}code
-
-Q: Where are the build parameters for the prebuilt images A: See
-http://live.debian.net/README.images.
diff --git a/manual/de/other_howtos.ssi b/manual/de/other_howtos.ssi
deleted file mode 100644
index 63e84bf..0000000
--- a/manual/de/other_howtos.ssi
+++ /dev/null
@@ -1,118 +0,0 @@
-B~ Howtos
-
-1~ Howtos
-
-2~ ISO
-
-Generating a Debian Live CD is very simple. You need to have live-helper
-(package available in Debian sid and lenny), and Debootstrap (or
-cdebootstrap) from etch or newer.
-
-3~ Install live-helper
-
-#{apt-get install live-helper}#
-
-3~ Configure the current working directory with lh_config
-
-code{
-
-lh_config -b iso -a $ARCH
-
-}code
-
-where #{$ARCH}# is the intended architecture (i.e. - i386 or amd64).
-
-#{-b}# flag is used to be sure to obtain image in ISO format.
-
-3~ Build the image with lh_build:
-
-Execute lh_build as root: #{lh_build}#
-
-The command above will create the basic image, containing just the Debian
-standard system (with no X at all).
-
-If you want to have any of the Desktop environments on your livecd, #{ls
-/usr/share/live-helper/lists}# will show a number of available package Lists
-to choose from, e.g. #{lh_config -p gnome-desktop}#
-
-More examples are listed at DebianLive/Examples.
-
-See packages for help configuring a local Debian Mirror and other aspects of
-the live system.  % FIXME: <xref linkend="packages"/>
-
-3~ Test the image
-
-If you have qemu installed, you can boot the image with:
-
-code{
-
-qemu -cdrom binary.iso
-
-}code
-
-If you have also kqemu installed, you can add #{-kernel-kqemu}#
-
-2~ ISO_(multiarch)
-
-Multiple machine boot CDs can be created with the following manual
-procedure. This procedure has been successfully used to create a single CD
-which is bootable on alpha, i386, pmax, and sparc. It should be possible to
-also make the CD bootable on macppc, vax and on sun2, sun3 and sun3x.
-
-To create a CD which is bootable by multiple architectures, use the
-following steps in this order. Please note that the order is critical.
-
-Make sure you have all the required files including the various kernels and
-boot programs listed in the individual machine sections.
-
-Include a directory somewhere in the cdsources directory called mdec.pmax
-and include the pmax bootxx_cd9660 file there. For example,
-/cdsources/usr/mdec.pmax/bootxx_cd9660.
-
-Include a directory somewhere in the cdsources directory called mdec.vax and
-include the vax xxboot file there. For example,
-#{cdsources/usr/mdec.vax/xxboot.}#
-
-Include the macppc ofwboot.xcf bootloader in /cdsources.
-
-Create an i386 bootable image. #{sh mkisofs -v -v -o output.iso -b
-i386/installation/floppy/boot-big.fs \ -c boot.catalog -l -J -r -L
-/cdsources 2>&1 | tee /tmp/mkisofs.log exit}#
-
-Note: The appearance of the -v flag twice is required. If you are making a
-bootable CD for an Open Firmware 3 macppc model, make sure to include -hfs
--part in the parameters for mkisofs.
-
-Run mksunbootcd on a NetBSD/sparc machine to install sparc and sun2/sun3
-bootblocks. Alternatively, install the sysutils/mksunbootcd package on your
-favorite NetBSD machine. #{mksunbootcd output.iso boot-sun4.fs boot-sun4c.fs
-boot-sun4m.fs boot-sun3.fs}#
-
-Run the installboot(8) program targeted for NetBSD/pmax to install the pmax
-bootblocks. Note that in order to coexist with other NetBSD boot blocks, the
-pmax boot block is appended to the end of the ISO file system.
-
-#{installboot -m pmax -v -o append,sunsum output.iso
-/tmp/mdec.pmax/bootxx_cd9660}#
-
-The -o append,sunsum option appends the first stage boot block to the end of
-the ISO file system, and restores the checksum used when booting on a sun.
-
-Run the installboot(8) program targeted for NetBSD/vax to install the vax
-bootblocks. Note that in order to coexist with other NetBSD boot blocks, the
-vax boot block is appended to the end of the ISO file system.
-
-installboot -m vax -v -o append,sunsum output.iso /tmp/mdec.vax/xxboot
-
-(See the pmax entry above for an explanation of the flags).
-
-Run the installboot(8) program targeted for NetBSD/alpha to install the
-alpha bootblocks.
-
-#{installboot -m alpha -v -o append,sunsum output.iso
-/tmp/mdec.alpha/bootxx_cd9660}#
-
-Note: The alpha installboot must occur after the others, because currently
-it's the only machine dependent back-end for installboot(8) that can
-calculate the alpha checksum. (See the pmax entry above for an explanation
-of the flags).
diff --git a/manual/de/project_bugs.ssi b/manual/de/project_bugs.ssi
index cce48f8..7eaaaea 100644
--- a/manual/de/project_bugs.ssi
+++ b/manual/de/project_bugs.ssi
@@ -21,42 +21,44 @@ used and the distribution of the live system you are building.
 
 2~ Known issues
 
-Due to the nature of Debian *{testing}* and Debian *{unstable}*
-distributions being a moving target, building a live system may not always
-be possible.
+Because Debian *{testing}* and Debian *{unstable}* distributions are a
+moving target, when you specify either as the target system distribution, a
+successful build may not always be possible.
 
-If this is a problem, do not build a system based on *{testing}* or
-*{unstable}*, but go with *{stable}*. live-build does always default to the
-current *{stable}* release.
+% FIXME:
+
+If this causes too much difficulty for you, do not build a system based on
+*{testing}* or *{unstable}*, but rather, use *{stable}*. live-build does
+always default to the *{stable}* release.
 
 Currently known issues are listed under the section 'status' on our homepage
-at http://live.debian.net/
+at http://live.debian.net/.
 
-It is out of the scope of this manual to train you in correctly identifying
-and fixing problems in packages of the development distributions, however,
-there are two things you can always try: When not succeeding to build
-*{testing}*, try if *{unstable}* works. If *{unstable}* does not work
-either, revert to *{testing}* and pinning the newer version of the failing
-package from *{unstable}*.
+It is out of the scope of this manual to train you to correctly identify and
+fix problems in packages of the development distributions, however, there
+are two things you can always try: If a build fails when the target
+distribution is *{testing}*, try *{unstable}*. If *{unstable}* does not work
+either, revert to *{testing}* and pin the newer version of the failing
+package from *{unstable}* (see {APT pinning}#apt-pinning for details).
 
 2~ Rebuild from scratch
 
-To ensure that a particular bug is not caused by an unclean built system,
+To ensure that a particular bug is not caused by an uncleanly built system,
 please always rebuild the whole live system from scratch to see if the bug
 is reproducible.
 
 2~ Use up-to-date packages
 
 Using outdated packages can cause significant problems when trying to
-reproduce (and ultimately fix) your problem.
+reproduce (and ultimately fix) your problem. Make sure your build system is
+up-to-date and any packages included in your image are up-to-date as well.
 
 2~collect-information Collect information
 
-Please provide enough information with your report. At a minimum, it should
-contain the exact version of live-build version where the bug is
-encountered, and steps to reproduce it. Please use common sense and include
-other relevant information if you think that it might help in solving the
-problem.
+Please provide enough information with your report. At least include the
+exact version of live-build version where the bug is encountered and steps
+to reproduce it. Please use common sense and include other relevant
+information if you think that it might help in solving the problem.
 
 To make the most out of your bug report, we require at least the following
 information:
@@ -69,7 +71,7 @@ _* Version of live-boot on the live system
 
 _* Version of live-config on the live system
 
-_* Version of debootstrap and/or cdebootstrap on the host system
+_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system
 
 _* Architecture of the live system
 
@@ -77,26 +79,43 @@ _* Distribution of the live system
 
 _* Version of the kernel on the live system
 
-You can generate a log of the build process by using the tee command:
+You can generate a log of the build process by using the #{tee}# command. We
+recommend doing this automatically with an #{auto/build}# script; see
+{Managing a configuration}#managing-a-configuration for details).
 
 code{
 
-lb build 2>&1 | tee build.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
-For runtime log, live-boot stores a log in /var/log/live.log (or
-/var/log/live-boot.log).
+At boot time, live-boot stores a log in #{/var/log/live.log}# (or
+#{/var/log/live-boot.log}#).
 
 Additionally, to rule out other errors, it is always a good idea to tar up
-your config directory and upload it somewhere (do *{not}* send it as an
-attachment to the mailinglist), so that we can try to reproduce the errors
-you encountered.
+your #{config/}# directory and upload it somewhere (do *{not}* send it as an
+attachment to the mailing list), so that we can try to reproduce the errors
+you encountered. If this is difficult (e.g. due to size) you can use the
+output of #{lb config --dump}# which produces a summary of your config tree
+(i.e. lists files in subdirectories of #{config/}# but does not include
+them).
 
 Remember to send in any logs that were produced with English locale
 settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or
 #{LC_ALL=en_US}#.
 
+2~ Isolate the failing case if possible
+
+If possible, isolate the failing case to the smallest possible change that
+breaks. It is not always easy to do this, so if you can't manage it for your
+report, don't worry. However, if you plan your development cycle well, using
+small enough change sets per iteration, you may be able to isolate the
+problem by constructing a simpler 'base' configuration that closely matches
+your actual configuration plus just the broken change set added to it. If
+you have a hard time sorting out which of your changes broke, it may be that
+you are including too much in each change set and should develop in smaller
+increments.
+
 2~ Use the correct package to report the bug against
 
 Where does the bug appear?
@@ -121,9 +140,9 @@ can fail. If a bug appears here, check if the error is also reproducible on
 a normal system.
 
 If this is the case, this is not a bug in Debian Live, but rather in Debian
-- please report it against the failing package. Running debootstrap
-seperately from the Live system build or running lb bootstrap with
-#{--debug}# will give you more information.
+- please report it against the failing package. Running #{debootstrap}#
+separately from the Live system build or running #{lb bootstrap --debug}#
+will give you more information.
 
 Also, if you are using a local mirror and/or any of sort of proxy and you
 are experiencing a problem, please always reproduce it first by
@@ -134,10 +153,10 @@ bootstrapping from an official mirror.
 If your image does not boot, please report it to the mailing list together
 with the information requested in {Collect
 information}#collect-information. Do not forget to mention, how/when the
-image failed, in Qemu, VMWare or real hardware. If you are using a
-virtualization technology of any kind, please always run it on real hardware
-before reporting a bug. Providing a screenshot of the failure is also very
-helpful.
+image failed, in Qemu, Virtualbox, VMWare or real hardware. If you are using
+a virtualization technology of any kind, please always run it on real
+hardware before reporting a bug. Providing a screenshot of the failure is
+also very helpful.
 
 3~ At run time
 
diff --git a/manual/de/project_coding-style.ssi b/manual/de/project_coding-style.ssi
index a0e5959..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
 
@@ -71,22 +71,22 @@ foo ()
 
 _* Variables are always in capital letters.
 
-_* Variables that used in lb config always start with LH_ prefix.
+_* Variables that used in #{lb config}# always start with #{LB_}# prefix.
 
-_* Internal temporary variables in live-build should start with the _LH_
-prefix.
+_* Internal temporary variables in live-build should start with the
+#{\_LB_}# prefix.
 
-_* Local variables start with live-build __LH_ prefix.
+_* Local variables start with live-build #{\_\_LB_}# prefix.
 
 _* Variables in connection to a boot parameter in live-config start with
-LIVE_.
+#{LIVE_}#.
 
-_* All other variables in live-config start with _ prefix.
+_* All other variables in live-config start with #{_}# prefix.
 
-_* Use braces around variables; eg. write ${FOO} instead of $FOO.
+_* Use braces around variables; e.g. write #{${FOO}}# instead of #{$FOO}#.
 
-_* Always protect variables with quotes to respect potential whitespaces,
-write "${FOO}" not ${FOO}.
+_* Always protect variables with quotes to respect potential whitespaces:
+write #{"${FOO}"}# not #{${FOO}}#.
 
 _* For consistency reasons, always use quotes when assigning values to
 variables:
@@ -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,20 +124,21 @@ Good:
 
 code{
 
-if [ -f "${FOO}/foo/${BAR}/bar" ]
-then
-        foobar
-fi
+ if [ -f "${FOO}/foo/${BAR}/bar" ]
+ then
+         foobar
+ fi
 
 }code
 
 2~ Miscellaneous
 
-_* Use "|" (without the surround quotes) as a seperator in calls to sed,
-e.g. "sed -e 's|foo|bar|'" (without "").
+_* Use "#{|}#" (without the surround quotes) as a seperator in calls to sed,
+e.g. "#{sed -e 's|foo|bar|'}#" (without "").
 
-_* Don't use the test command for comparisons or tests, use "[" "]" (without
-""), e.g. "if [ -x /bin/foo ]; ..." and not "if test -x /bin/foo; ...".
+_* Don't use the #{test}# command for comparisons or tests, use "#{[}#"
+"#{]}#" (without ""); e.g. "#{if [ -x /bin/foo ]; ...}#" and not "#{if test
+-x /bin/foo; ...}#".
 
-_* Use case wherever possible over test, as it's easier to read and faster
-in execution.
+_* Use #{case}# wherever possible over #{test}#, as it's easier to read and
+faster in execution.
diff --git a/manual/de/project_procedures.ssi b/manual/de/project_procedures.ssi
index 7e3364a..55b408e 100644
--- a/manual/de/project_procedures.ssi
+++ b/manual/de/project_procedures.ssi
@@ -1,6 +1,6 @@
 B~ Procedures
 
-1~ Procedures
+1~procedures Procedures
 
 This chapter documents the procedures within the Debian Live project for
 various tasks that need cooperation with other teams in Debian.
@@ -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 b4e6373..ae7318e 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/de/user_basics.ssi
@@ -36,9 +36,7 @@ SquashFS compressed filesystem is used to minimize the Debian Live image
 size. Note that it is read-only. So, during boot the Debian Live system will
 use a RAM disk and 'union' mechanism to enable writing files within the
 running system. However, all modifications will be lost upon shutdown unless
-optional persistence is used (see persistence).
-
-% FIXME: <xref linkend="persistence"/>
+optional persistence is used (see {Persistence}#persistence).
 
 _* *{Bootloader}*: A small piece of code crafted to boot from the chosen
 media, possibly presenting a prompt or menu to allow selection of
@@ -52,7 +50,7 @@ partitions, etc.
 
 You can use live-build to build the system image from your specifications,
 set up a Linux kernel, its initrd, and a bootloader to run them, all in one
-media-dependant format (ISO9660 image, disk image, etc.)
+media-dependant format (ISO9660 image, disk image, etc.).
 
 2~ First steps: building an ISO image
 
@@ -67,19 +65,19 @@ hierarchy in the current directory for use by other commands:
 
 code{
 
-$ lb config
+ $ lb config
 
 }code
 
 By passing no parameters to #{lb config}#, we indicated that we wish to use
 the defaults (see {The lb config command}#lb-config).
 
-Now that we have a "config/" hierarchy, we may build the image with the lb
-build command:
+Now that we have a "config/" hierarchy, we may build the image with the #{lb
+build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -92,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
 
@@ -104,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
 
@@ -120,7 +118,7 @@ resolution is limited to 800x600.
 
 code{
 
-# lb config --packages virtualbox-ose-guest-x11
+ $ lb config --packages virtualbox-ose-guest-x11
 
 }code
 
@@ -130,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
 
@@ -152,7 +150,7 @@ lb clean command}#lb-clean):
 
 code{
 
-$ lb clean --binary
+ # lb clean --binary
 
 }code
 
@@ -161,15 +159,15 @@ Run the #{lb config}# command with the parameters to configure the
 
 code{
 
-$ lb config -b usb-hdd
+ $ lb config -b usb-hdd
 
 }code
 
-Now build the image with the #{lb build} command:
+Now build the image with the #{lb build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -181,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
 
@@ -193,15 +191,15 @@ better yet, #{ls -l /dev/disk/by-id}#.
 *{This will definitely overwrite any previous contents on your stick!}*
 
 Note: As discussed earlier, this same process can be used for #{iso-hybrid}#
-type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images.
+type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images.
 
 3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu
 
 code{
 
-# apt-get install qemu
+ # apt-get install qemu
 
-$ qemu -hda binary.img
+ $ qemu -hda binary.img
 
 }code
 
@@ -214,7 +212,7 @@ be used by the Debian Live system.
 
 code{
 
-# gparted ${USBSTICK}
+ # gparted ${USBSTICK}
 
 }code
 
@@ -223,7 +221,7 @@ it. One possible choice would be ext4.
 
 code{
 
-# mkfs.ext4 ${USBSTICK}
+ # mkfs.ext4 ${USBSTICK}
 
 }code
 
@@ -231,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
 
@@ -248,31 +246,31 @@ working directory with the #{lb clean}# command:
 
 code{
 
-$ lb clean --binary
+ # lb clean --binary
 
 }code
 
-Run the #{lb config}# command with the parameters to configure the "config/"
-hierarchy to create our netboot image:
+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
 
-In contrast with the ISO and USB/HDD images, netbooting does not support
-serving a filesystem image with the client, so the files must be served via
-NFS. The net-root-path and net-root-server options specify the location and
-server, respectively, of the NFS server where the filesytem image will be
-located at boot time.
+In contrast with the ISO and USB/HDD images, netbooting does not, itself,
+serve the filesystem image to the client, so the files must be served via
+NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the
+location and server, respectively, of the NFS server where the filesytem
+image will be located at boot time. Make sure these are set to suitable
+values for your network and server.
 
 Now build the image with the #{lb build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -283,12 +281,13 @@ next step is getting a higher level bootloader via the TFTP protocol. That
 could be pxelinux, GRUB, or even boot directly to an operating system like
 Linux.
 
-For example, if you unpack the generated binary-net.tar.gz archive in the
-/srv/debian-live directory, you'll find the filesystem image in
-live/filesystem.squashfs and the kernel, initrd and pxelinux bootloader in
-tftpboot/debian-live/i386.
+For example, if you unpack the generated #{binary-net.tar.gz}# archive in
+the #{/srv/debian-live}# directory, you'll find the filesystem image in
+#{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader
+in #{tftpboot/debian-live/i386}#.
 
-We must now configure three services on the server to enable netboot.
+We must now configure three services on the server to enable netboot: the
+DHCP server, the TFTP server and the NFS server.
 
 3~ DHCP server
 
@@ -297,33 +296,26 @@ to the netbooting client system, and to advertise the location of the PXE
 bootloader.
 
 Here is an example for inspiration, written for the ISC DHCP server
-#{isc-dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;
-
-% FIXME
+#{isc-dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:
 
 code{
 
-subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
-
-  # IP addresses available for guests
-  range 192.168.1.100 192.168.1.149;
+ # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server
 
-  # allow booting from the net
-  allow bootp;
+ ddns-update-style none;
 
-  # for net booting, server where the first file to be loaded (by TFTP
-  # protocol) ("filename" following definition) lies : so the TFTP
-  # server's name.
-  next-server myserver;
+ option domain-name "example.org";
+ option domain-name-servers ns1.example.org, ns2.example.org;
 
-  # net boot configuration for guests with a PXE client :
-  if substring (option vendor-class-identifier, 0, 9) = "PXEClient" {
-    # Note: all files for PXE are relatives to the TFTP server's root
+ default-lease-time 600;
+ max-lease-time 7200;
 
-    # PXE bootloader (first program to be loaded, by TFTP)
-    filename "pxelinux.0";
+ 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";
 }
 
 }code
@@ -333,12 +325,12 @@ subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
 This serves the kernel and initial ramdisk to the system at run time.
 
 You should install the tftpd-hpa package. It can serve all files contained
-inside a root directory, usually /srv/tftp. To let it serve files inside
-/srv/debian-live/tftpboot, run as root the following command:
+inside a root directory, usually #{/srv/tftp}#. To let it serve files inside
+#{/srv/debian-live/tftpboot}#, run as root the following command:
 
 code{
 
-dpkg-reconfigure -plow tftpd-hpa
+ # dpkg-reconfigure -plow tftpd-hpa
 
 }code
 
@@ -350,14 +342,14 @@ Once the guest computer has downloaded and booted a Linux kernel and loaded
 its initrd, it will try to mount the Live filesystem image through a NFS
 server.
 
-You need to install the nfs-kernel-server package.
+You need to install the #{nfs-kernel-server}# package.
 
 Then, make the filesystem image available through NFS by adding a line like
-the following to /etc/exports:
+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
 
@@ -365,15 +357,16 @@ and tell the NFS server about this new export with the following command:
 
 code{
 
-# exportfs -rv
+ # exportfs -rv
 
 }code
 
 Setting up these three services can be a little tricky. You might need some
-patience to get all of them working together. The Debian Installer Manual's
-TFTP Net Booting section at
-http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html might help as that
-process is very similar.
+patience to get all of them working together. For more information, see the
+syslinux wiki at http://syslinux.zytor.com/wiki/index.php/PXELINUX or the
+Debian Installer Manual's TFTP Net Booting section at
+http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html. They might help,
+as their processes are very similar.
 
 3~ Netboot testing HowTo
 
@@ -384,51 +377,64 @@ To make our life easier, we can use virtualization. There are two solutions.
 
 3~ Qemu
 
-_* Install qemu, bridge-utils, sudo.
+_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#.
 
-Edit /etc/qemu-ifup:
+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
 
-Get, or build a grub-floppy-netboot (in the svn).
+Get, or build a #{grub-floppy-netboot}# (in the svn).
 
-Launch qemu with "-net nic,vlan=0 -net tap,vlan=0,ifname=tun0"
+Launch #{qemu}# with "#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#"
 
 3~ VMWare Player
 
 _* Install VMWare Player ("free as in beer" edition)
 
-_* Create a PXETester directory, and create a text file called pxe.vwx
+_* Create a PXETester directory, and create a text file called #{pxe.vwx}#
 inside
 
 _* 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
 
-_* You can play with this configuration file (i.e. change memory limit to
+_* You can play with this configuration file (e.g. change memory limit to
 256)
 
 _* Double click on this file (or run VMWare player and select this file).
diff --git a/manual/de/user_customization-contents.ssi b/manual/de/user_customization-contents.ssi
index f8d01ce..3906219 100644
--- a/manual/de/user_customization-contents.ssi
+++ b/manual/de/user_customization-contents.ssi
@@ -2,42 +2,45 @@
 
 1~customizing-contents Customizing contents
 
-This chapter discusses further customization of the live system.
+This chapter discusses fine-tuning customization of the live system contents
+beyond merely choosing which packages to include. Includes allow you to add
+or replace arbitrary files in your Debian Live image, hooks allow you to
+execute arbitrary commands at different stages of the build and at boot
+time, and preseeding allows you to configure packages when they are
+installed by supplying answers to debconf questions.
 
 2~ Includes
 
-Using includes, it is possible to add (or replace) arbitrary files in your
-Debian Live image. live-build provides three mechanisms for using them:
+While ideally a Debian live system would include files entirely provided by
+unmodified Debian packages, it is sometimes convenient to provide or modify
+some content by means of files. Using includes, it is possible to add (or
+replace) arbitrary files in your Debian Live image. live-build provides
+three mechanisms for using them:
 
 _* Chroot local includes: These allow you to add or replace files to the
-chroot/Live filesystem. Please see chroot-local-includes for more
-information.
-
-% FIXME: <xref linkend="chroot-local-includes"/>
+chroot/Live filesystem. Please see {Live/chroot local
+includes}#live-chroot-local-includes for more information.
 
 _* Binary local includes: These allow you to add or replace files in the
-binary image. Please see binary-local-includes for more information.
-
-% FIXME: <xref linkend="binary-local-includes"/>
+binary image. Please see {Binary local includes}#binary-local-includes for
+more information.
 
 _* Binary includes: These allow you to add or replace Debian specific files
 in the binary image, such as the templates and tools directories. Please see
-binary-includes for more information.
-
-% FIXME: <xref linkend="binary-includes"/>
-
-Please see terms for more information about the distinction between the
-"Live" and "binary" images.
+{Binary includes}#binary-includes for more information.
 
-% FIXME: <xref linkend="terms"/>
+Please see {Terms}#terms for more information about the distinction between
+the "Live" and "binary" images.
 
-3~ Live/chroot local includes
+3~live-chroot-local-includes Live/chroot local includes
 
 Chroot local includes can be used to add or replace files in the chroot/Live
-filesystem so that they are visible when the Live system is booted. Typical
-uses for them are to populate the skeleton user directory (#{/etc/skel}#)
-used by the live system to create the live user's home directory, or adding
-configuration files where additional processing is not required.
+filesystem so that they may be used in the Live system. A typical use is to
+populate the skeleton user directory (#{/etc/skel}#) used by the Live system
+to create the live user's home directory. Another is to supply configuration
+files that can be simply added or replaced in the image without processing;
+see {Live/chroot local hooks}#live-chroot-local-hooks if processing is
+needed.
 
 To include files, simply add them to your #{config/chroot_local-includes}#
 directory. This directory corresponds to the root directory (#{/}#) of the
@@ -46,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
 
@@ -55,42 +58,59 @@ 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
 
 Chroot local includes are installed after package installation so that files
 installed by packages are overwritten.
 
-3~ Binary local includes
+3~binary-local-includes Binary local includes
 
-The same way as chroot local includes work, there exists the corresponding
-mechanism to include files in the live media itself.
+To include material such as documentation or videos on the media filesystem
+so that it is accessible immediately upon insertion of the media without
+booting the Live system, you can use binary local includes. This works in a
+similar fashion to chroot local includes. For example, suppose the files
+#{~/video_demo.*}# are demo videos of the live system described by and
+linked to by an HTML index page. Simply copy the material to
+#{config/binary_local-includes/} as follows:
 
-3~ Binary includes
+code{
+
+ $ cp ~/video_demo.* config/binary_local-includes/
+
+}code
+
+These files will now appear in the root directory of the live media.
+
+3~binary-includes Binary includes
 
 live-build has some standard files (like documentation) that gets included
 in the default configuration on every live media. This can be disabled with:
 
 code{
 
-$ lb config --includes none
+ $ lb config --includes none
 
 }code
 
+Otherwise, the material will be installed by live-build in #{/includes/}# by
+default on the media filesystem, or else you can specify an alternate path
+with #{--includes}#.
+
 2~ Hooks
 
 Hooks allow commands to be performed in the chroot and binary stages of the
 build in order to customize the image.
 
-3~ Live/chroot local hooks
+3~live-chroot-local-hooks Live/chroot local hooks
 
 To run commands in the chroot stage, create a hook script containing the
 commands in the #{config/chroot_local-hooks}# directory. The hook will run
@@ -101,6 +121,17 @@ various common chroot customization tasks provided in
 #{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
 use them in your own configuration.
 
+3~ Boot-time hooks
+
+To execute commands at boot time, you can supply live-config hooks as
+explained in the "Customization" section of its man page. Examine
+live-config's own hooks provided in #{/lib/live/config/}#, noting the
+sequence numbers. Then provide your own hook prefixed with an appropriate
+sequence number, either as a chroot local include in
+#{config/chroot_local-includes/lib/live/config/}#, or as a custom package as
+discussed in {Installing modified or third-party
+packages}#installing-modified-or-third-party-packages.
+
 3~ Binary local hooks
 
 To run commands in the binary stage, create a hook script containing the
diff --git a/manual/de/user_customization-installer.ssi b/manual/de/user_customization-installer.ssi
index fcb326a..6ed2152 100644
--- a/manual/de/user_customization-installer.ssi
+++ b/manual/de/user_customization-installer.ssi
@@ -3,52 +3,87 @@
 1~customizing-installer Customizing Debian Installer
 
 Debian Live system images can be integrated with Debian Installer. There are
-number of different "types" of installation, varying in what and how to
-install the image.
+a number of different types of installation, varying in what is included and
+how the installer operates.
 
 Please note the careful use of capital letters when referring to the "Debian
 Installer" in this section - when used like this we refer explicitly to the
 official installer for the Debian system, not anything else. It is often
 seen abbreviated to "d-i".
 
+2~ Types of Debian Installer
+
 The three main types of installer are:
 
-_* *{"Regular" Debian Installer}*: This is a normal Debian Live image with a
-seperate kernel and initrd which (when selected from the appropriate
-bootloader) launches into a standard Debian Installer instance, just as if
-you had downloaded a CD image of Debian and booted it. Images containing a
-live system and such an otherwise indepentend installer are often referet to
-as "combined images".
+*{"Regular" Debian Installer}*: This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as "combined images".
 
 On such images, Debian is installed by fetching and installing .deb packages
 using #{debootstrap}# or #{cdebootstrap}#, from the local media or some
-network-base network, resulting in a standard Debian system being installed
+network-based network, resulting in a standard Debian system being installed
 to the hard disk.
 
 This whole process can be preseeded and customized in a number of ways; see
 the relevant pages in the Debian Installer manual for more information. Once
-you have a working preseeding file, live-build can automatically place it to
+you have a working preseeding file, live-build can automatically put it in
 the image and enable it for you.
 
-_* *{"Live" Debian Installer}*: This is a Debian Live image with a seperate
-kernel and initrd which (when selected from the appropriate bootloader)
-launches into an instance of the Debian Installer.
+*{"Live" Debian Installer}*: This is a Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into an instance of the Debian Installer.
 
 Installation will proceed in an identical fashion to the "Regular"
 installation described above, but at the actual package installation stage,
-instead of using #{debootstrap}# to fetch and install packages, the "live"
-filesystem image is copied to the target. This is acchieved with a special
-udeb called live-installer. live-installer can be preseeded to be disabled,
-allowing to support normal and live installer entries in the bootloader of
-the same live media.
+instead of using #{debootstrap}# to fetch and install packages, the live
+filesystem image is copied to the target. This is achieved with a special
+udeb called live-installer.
 
 After this stage, the Debian Installer continues as normal, installing and
 configuring items such as bootloaders and local users, etc.
 
-_* *{"Desktop" Debian Installer}*: Regardless of the mode Debian Installer
-is used in, d-i can be launched from the Desktop by clicking on an
-icon. This is user friendlier in some situations. In order to make use of
-this, the debian-installer-launcher package needs to be included.
+Note: to support both normal and live installer entries in the bootloader of
+the same live media, you must disable live-installer by preseeding
+#{live-installer/enable=false}.
+
+*{"Desktop" Debian Installer}*: Regardless of the type of Debian Installer included, #{d-i}# can be launched from the Desktop by clicking on an icon. This is user friendlier in some situations. In order to make use of this, the debian-installer-launcher package needs to be included.
+
+Note that by default, live-build does not include Debian Installer images in
+the images, it needs to be specifically enabled with #{lb config}#. Also,
+please note that for the "Desktop" installer to work, the kernel of the live
+system must match the kernel #{d-i}# uses for the specified
+architecture. For example:
+
+code{
+
+ $ lb config --architecture i386 --linux-flavours 486 \
+     --debian-installer live --packages debian-installer-launcher
+
+}code
+
+2~ Customizing Debian Installer by preseeding
+
+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 answers to questions asked during the installation process,
+without having to manually enter the answers while the installation is
+running. This makes it possible to fully automate most types of installation
+and even offers some features not available during normal installations."
+This kind of customization is best accomplished with live-build by placing
+the configuration in a #{preseed.cfg}# file included in
+#{config/binary_debian-installer/}#. For example, to preseed setting the
+locale to #{en_US}#:
+
+code{
+
+ $ echo "d-i debian-installer/locale string en_US" \
+     >> config/binary_debian-installer/preseed.cfg
+
+}code
+
+2~ Customizing Debian Installer content
+
+For experimental or debugging purposes, you might want to include locally
+built #{d-i}# component udeb packages. Place these in
+#{config/binary_local-udebs/}# to include them in the image. Additional or
+replacement files and directories may be included in the installer initrd as
+well, in a similar fashion to {Live/chroot local
+includes}#live-chroot-local-includes, by placing the material in
+#{config/binary_debian-installer-includes/}#.
 
-Note that by default live-build does not include Debian Installer images in
-the images, it needs to be specifically enabled with lb config.
diff --git a/manual/de/user_customization-internationalization.ssi b/manual/de/user_customization-internationalization.ssi
deleted file mode 100644
index 0288819..0000000
--- a/manual/de/user_customization-internationalization.ssi
+++ /dev/null
@@ -1,49 +0,0 @@
-:B~ Customizing locale and language
-
-1~customizing-locale-and-language Customizing locale and language
-
-2~ Default locale and keyboard
-
-The default locale when building a Live system is "locales=en_US.UTF-8", to
-set the locale for e.g. Switzerland, you can use "locales=de_CH.UTF-8".
-
-code{
-
-$ lb config --bootappend-live "locales=de_CH.UTF-8"
-
-}code
-
-The entry for a Swiss-German keyboard would be:
-
-code{
-
-$ lb config --bootappend-live "keyboard-layouts=ch"
-
-}code
-
-Combined, the keyboard and locale configured for Switzerland would be:
-
-code{
-
-$ lb config --bootappend-live ="locales=de_CH.UTF-8 keyboard-layouts=ch"
-
-}code
-
-Note: You can find a list of options in the manpage for
-live-config. Currently, only UTF-8 locales are supported.
-
-2~ l10n Packages
-
-An experimental feature of live-build is to automatically check for each
-package for which it is know that there are -l10n packages available and
-install them. To add German packages the entry would be
-
-code{
-
-$ lb config --language "de"
-
-}code
-
-This will also change the default syslinux language if translations are
-available or local translations have been put into
-#{config/templates/syslinux/de}#.
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index b4153a1..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,17 +266,21 @@ specified:
 
 code{
 
-#if ARCHITECTURE amd64 ia32-libs #endif
+ #if ARCHITECTURE amd64
+ ia32-libs
+ #endif
 
 }code
 
-You may test for any one of a number of values, e.g. to install #{memtest86+
-}# if either #{--architecture i386}# or #{--architecture amd64}# is
-specified:
+You may test for any one of a number of values, e.g. to install
+#{memtest86+}# if either #{--architecture i386}# or #{--architecture amd64}#
+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
 
@@ -323,12 +332,11 @@ including ones not included in this list, may be examined with #{tasksel
 
 Desktop and language tasks are special cases. In the Debian Installer, if
 the medium was prepared for a particular desktop environment flavour, the
-corresponding task will be automatically installed. Thus, there are there
-are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and
-#{xfce-desktop}# tasks, none of which are offered in #{tasksel}#'s
-menu. Likewise, there are no menu entries for tasks for languages, but the
-user's language choice during the install influences the selection of
-corresponding language tasks.
+corresponding task will be automatically installed. Thus, there are
+#{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#
+tasks, none of which are offered in #{tasksel}#'s menu. Likewise, there are
+no menu entries for tasks for languages, but the user's language choice
+during the install influences the selection of corresponding language tasks.
 
 In live-build, therefore, these special cases are also given special
 consideration, but with three notable differences at the time of writing.
@@ -341,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
 
@@ -349,16 +357,31 @@ Second, live-build supports #{*-desktop}# virtual package lists for each of
 the desktop flavours mentioned above, which select the #{standard-x11}#
 predefined package list, the corresponding #{*-desktop}# task and three
 additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example,
-if you specify #{--packages gnome-desktop}#, it is equivalent to specifying
-#{--packages standard-x11 --tasks "gnome-desktop desktop standard laptop"}#.
+if you specify #{--packages-lists gnome-desktop}#, it is equivalent to
+specifying #{--packages debian-installer-launcher --packages-lists
+standard-x11 --tasks "gnome-desktop desktop standard laptop"}#.
 
 Third, if any of the tasks for these desktop flavours are selected, either
-explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build
-will preseed the corresponding desktop value for Debian Installer (if it is
-included) to ensure it follows its own rules for installing different
-desktop flavours.
+explicitly through #{--tasks}# or implicitly by #{--packages-lists}#,
+live-build will preseed the corresponding desktop value for Debian Installer
+(if it is included) to ensure it follows its own rules for installing
+different desktop flavours.
+
+*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are installed
 . For example:
+
+code{
+
+ $ lb config --language es
+
+}code
 
-2~ Installing modified or third-party packages
+Even so, it is limited in that it only supports a single language and a
+single bootloader. Therefore, for all of these reasons, the future of this
+option is under review, possibly to be replaced with something entirely
+different in the next major release of live-build.
+
+2~installing-modified-or-third-party-packages Installing modified or
+third-party packages
 
 Whilst it is against the philosophy of Debian Live, it may sometimes be
 necessary to build a Live system with modified versions of packages that are
@@ -460,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
 
@@ -475,7 +498,7 @@ with:
 
 code{
 
-$ lb config --binary-indices false
+ $ lb config --binary-indices false
 
 }code
 
@@ -490,17 +513,21 @@ much, you may disable that default option of APT with:
 
 code{
 
-$ lb config --apt-recommends false
+ $ lb config --apt-recommends false
 
 }code
 
-The tradeoff here is that recommended packages are defined as "packages that
-would be found together with this one in all but unusual installations"
-(Debian Policy Manual, §7.2). This may lead to some packages that you
-actually need being omitted, so we suggest you review the difference this
-makes to your packages list (see the #{binary.packages}# file generated by
-#{lb build}#) and re-include in your list any missing packages that you
-still want installed.
+The tradeoff here is that if you don't install recommended packages for a
+given package, that is, "packages that would be found together with this one
+in all but unusual installations" (Debian Policy Manual, §7.2), some
+packages that you actually need may be omitted. Therefore, we suggest you
+review the difference turning off recommends makes to your packages list
+(see the #{binary.packages}# file generated by #{lb build}#) and re-include
+in your list any missing packages that you still want
+installed. Alternatively, if you find you only want a small number of
+recommended packages left out, leave recommends enabled and set a negative
+APT pin priority on selected packages to prevent them from being installed,
+as explained in {APT pinning}#apt-pinning.
 
 3~ Passing options to apt or aptitude
 
@@ -524,11 +551,31 @@ 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
+
+}code
+
+Negative pin priorities will prevent a package from being installed, as in
+the case where you do not want a package that is recommended by another
+package. Suppose you are building a GNOME image but don't want the user
+prompted to store wifi passwords in the keyring, so you want to omit the
+recommended #{gnome-keyring}# package. This can be done by adding the
+following stanza to #{config/chroot_apt/preferences}#:
+
+code{
 
-Package: * Pin: release n=sid Pin-Priority: 1 END
+ Package: gnome-keyring
+ Pin: version *
+ Pin-Priority: -1
 
 }code
 
diff --git a/manual/de/user_customization-runtime.new.ssi b/manual/de/user_customization-runtime.new.ssi
deleted file mode 100644
index e2c32ec..0000000
--- a/manual/de/user_customization-runtime.new.ssi
+++ /dev/null
@@ -1,258 +0,0 @@
-:B~ Customizing run time behaviours
-
-1~customizing-run-time-behaviours Customizing run time behaviours
-
-All configuration that is done during run time is done by live-config. Here
-are some most common options of live-config that users are interested in. A
-full list of all possibilities can be found in the manpage of live-config.
-
-2~ Customizing the live user
-
-One important consideration is that the live user is created by live-boot at
-boot time, not by live-build at build time. This not only influences where
-materials relating to the live user are introduced in your build, as
-discussed in {Live/chroot local includes}#live-chroot-local-includes, but
-also any groups and permissions associated with the live user.
-
-You can specify additional groups that the live user will belong to by
-preseeding the #{passwd/user-default-groups}# debconf value. For example, to
-add the live user to the #{fuse}# group, add the following to a file in the
-#{config/chroot_local-preseed}# directory:
-
-code{
-
-debconf passwd/user-default-groups string audio cdrom dialout floppy video
-plugdev netdev powerdev fuse
-
-}code
-
-2~customizing-locale-and-language Customizing locale and language
-
-When the live system boots, language is involved in three steps:
-
-_* the locale generation
-
-_* setting the keyboard layout for the console
-
-_* setting the keyboard layout for X
-
-3~ Default locale and keyboard
-
-The default locale when building a Live system is "locales=en_US.UTF-8", to
-set the locale for e.g. Switzerland, you can use "locales=de_CH.UTF-8".
-
-code{
-
-$ lb config --bootappend-live "locales=de_CH.UTF-8"
-
-}code
-
-The entry for a Swiss-German keyboard would be:
-
-code{
-
-$ lb config --bootappend-live "keyboard-layouts=ch"
-
-}code
-
-Combined, the keyboard and locale configured for Switzerland would be:
-
-code{
-
-$ lb config --bootappend-live ="locales=de_CH.UTF-8 keyboard-layouts=ch"
-
-}code
-
-Note: You can find a list of options in the manpage for
-live-config. Currently, only UTF-8 locales are supported.
-
-3~ l10n Packages
-
-% FIXME: not a run time configuration! Belongs in packages chapter. (See
---tasks discussion.)
-
-An experimental feature of live-build is to automatically check for each
-package for which it is known that there are #{*-l10n}# packages available
-and install them. To add German packages the entry would be
-
-code{
-
-$ lb config --language "de"
-
-}code
-
-This will also change the default syslinux language if translations are
-available or local translations have been put into
-#{config/templates/syslinux/de}#.
-
-3~ Language
-
-To define the locale that should be generated, use the #{locales}# parameter
-into the #{--bootappend-live}# option of #{lb config}#, e.g.:
-
-code{
-
-lb config --bootappend-live "locales=de_CH.UTF-8"
-
-}code
-
-This parameter can also be used in kernel command line. You can specify a
-locale by a full #{language_country.encoding}# word.
-
-Both the console and X keyboard configuration depends on the #{keyb}#
-parameter of the #{--bootappend-live}# option. Valid options for X keyboard
-layouts can be found in #{/etc/X11/xkb/base.xml}# (rather limited to
-two-letters country codes). To find the value (the two characters)
-corresponding to a language try searching for the english name of the nation
-where the language is spoken, e.g:
-
-code{
-
-$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name <name>se</name>
-
-}code
-
-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"
-
-}code
-
-A list of the valid values of the keyboards for the console can be figured
-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
-
-}code
-
-Alternatively, you can use the #{console-setup}# package, a tool to let you
-configure console layout using X (XKB) definitions; you can then setup your
-keyboard layout more precisely with #{keyboard-layouts}#,
-#{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# variables;
-live-boot will use also these parameters for X configuration. For example,
-to set up a French system with a French-Dvorak layout (called Bepo) on a
-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"
-
-}code
-
-2~ Persistence
-
-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
-of the host hardware which runs it.
-
-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
-should be considered read-only and all the run-time evolutions of the system
-are lost at shutdown.
-
-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
-understand how it could work it could be handy to know that even if the
-system is booted and run from read-only media, modification to the files and
-directories are written on writable media, typically a ram disk (tmpfs) and
-ram disks' data do not survive reboots.
-
-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
-multisession (re)writable CD/DVD. All these media are supported in Debian
-Live in different ways, and all but the last one require a special boot
-parameter to be specified at boot time: #{persistent}#.
-
-3~ Full persistence
-
-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
-writable partition is used. In order to use this feature a partition with a
-clean writable supported filesystem on it labeled "live-rw" must be attached
-on the system at boot time and the system must be started with the boot
-parameter 'persistent'. This partition could be an ext2 partition on the
-hard disk or on a usb key created with, e.g.:
-
-code{
-
-# mkfs.ext2 -L live-rw /dev/sdb1
-
-}code
-
-If you already have a partition on your device, you could just change the
-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
-
-}code
-
-But since live system users cannot always use a hard drive partition, and
-considering that most USB keys have poor write speeds, 'full' persistence
-could be also used with just image files, so you could create a file
-representing a partition and put this image file even on a NTFS partition of
-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
-
-}code
-
-Then copy the #{live-rw}# file to a writable partition and reboot with the
-boot parameter 'persistent'.
-
-3~ Home automounting
-
-If during the boot a partition (filesystem) image file or a partition
-labeled #{home-rw}# is discovered, this filesystem will be directly mounted
-as #{/home}#, thus permitting persistence of files that belong to e.g. the
-default user. It can be combined with full persistence.
-
-3~ Snapshots
-
-Snapshots are collections of files and directories which are not mounted
-while running but which are copied from a persistent device to the system
-(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The
-content of a snapshot could reside on a partition or an image file (like the
-above mentioned types) labeled #{live-sn}#, but it defaults to a simple cpio
-archive named #{live-sn.cpio.gz}#. As above, at boot time, the block devices
-connected to the system are traversed to see if a partition or a file named
-like that could be found. A power interruption during run time could lead to
-data loss, hence a tool invoked #{live-snapshot --refresh}# could be called
-to sync important changes. This type of persistence, since it does not write
-continuously to the persistent media, is the most flash-based device
-friendly and the fastest of all the persistence systems.
-
-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.
-
-Snapshots cannot currently handle file deletion but full persistence and
-home automounting can.
-
-3~ Persistent SubText
-
-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-work}#, the boot parameter #{persistent-subtext}# used in
-conjuntion with the boot parameter #{persistent}# will allow for multiple
-but unique persistent media. An example would be if a user wanted to use a
-persistent partition labeled #{live-sn-subText}# they would use the boot
-parameters of: #{persistent}# #{persistent-subtext=subText}#.
-
-3~ Partial remastering
-
-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 case of cd-r or adding a session to multisession cd/dvd(rw); live-boot
-mounts all /live filesystem in order or with the module boot parameter.
diff --git a/manual/de/user_customization-runtime.ssi b/manual/de/user_customization-runtime.ssi
index 857ef66..471abb4 100644
--- a/manual/de/user_customization-runtime.ssi
+++ b/manual/de/user_customization-runtime.ssi
@@ -1,13 +1,18 @@
-B~ Customization at Runtime
+:B~ Customizing run time behaviours
 
-All configuration that is done during runtime is done by live-config. Here
+1~customizing-run-time-behaviours Customizing run time behaviours
+
+All configuration that is done during run time is done by live-config. Here
 are some most common options of live-config that users are interested in. A
 full list of all possibilities can be found in the manpage of live-config.
 
-1~ User
+2~ Customizing the live user
 
-One important consideration is that the live user is created by live-boot
-during bootup, it is not created by live-build when building the image.
+One important consideration is that the live user is created by live-boot at
+boot time, not by live-build at build time. This not only influences where
+materials relating to the live user are introduced in your build, as
+discussed in {Live/chroot local includes}#live-chroot-local-includes, but
+also any groups and permissions associated with the live user.
 
 You can specify additional groups that the live user will belong to by
 preseeding the #{passwd/user-default-groups}# debconf value. For example, to
@@ -16,12 +21,11 @@ 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
 
-1~ Language
+2~customizing-locale-and-language Customizing locale and language
 
 When the live system boots, language is involved in three steps:
 
@@ -31,28 +35,31 @@ _* setting the keyboard layout for the console
 
 _* setting the keyboard layout for X
 
-To define the locale that should be generated, use the #{locale}# parameter
-into the #{--bootappend-live}# option of #{lb config}#, e.g.:
+The default locale when building a Live system is "locales=en_US.UTF-8". To
+define the locale that should be generated, use the #{locales}# parameter in
+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
 
-This parameter can also be used in kernel command line. You can specify a
-locale by a full #{language_country.encoding}# word.
+This parameter can also be used at the kernel command line. You can specify
+a locale by a full #{language_country.encoding}# word.
 
-Both the console and X keyboard configuration depends on the #{keyb}#
-parameter of the #{--bootappend-live}# option. Valid options for X keyboard
-layouts can be found in #{/etc/X11/xkb/base.xml}# (rather limited to
-two-letters country codes). To find the value (the two characters)
-corresponding to a language try searching for the english name of the nation
-where the language is spoken, e.g:
+Both the console and X keyboard configuration depend on the
+#{keyboard-layouts}# parameter of the #{--bootappend-live}# option. Valid
+options for X keyboard layouts can be found in
+#{/usr/share/X11/xkb/rules/base.xml}# (rather limited to two-letters country
+codes). To find the value (the two characters) corresponding to a language
+try searching for the english name of the nation where the language is
+spoken, e.g:
 
 code{
 
-$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name <name>se</name>
+ $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
+ <name>se</name>
 
 }code
 
@@ -61,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
 
@@ -70,13 +77,13 @@ 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
 
 Alternatively, you can use the #{console-setup}# package, a tool to let you
-configure console layout using X (XKB) definitions; you can then setup your
+configure console layout using X (XKB) definitions; you can then set your
 keyboard layout more precisely with #{keyboard-layouts}#,
 #{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# variables;
 live-boot will use also these parameters for X configuration. For example,
@@ -85,12 +92,12 @@ 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
 
-2~ Persistence
+2~persistence Persistence
 
 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
@@ -126,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
 
@@ -135,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
 
@@ -148,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 0bb4753..8d10188 100644
--- a/manual/de/user_examples.ssi
+++ b/manual/de/user_examples.ssi
@@ -24,15 +24,15 @@ 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
 
 2~tutorial-1 Tutorial 1: A standard image
 
-*{Use case:}* Create a simple first image, learning the basics of live-build
+*{Use case:}* Create a simple first image, learning the basics of live-build.
 
 In this tutorial, we will build a default ISO hybrid Debian Live image
 containing only base packages (no Xorg) and some Debian Live support
@@ -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
 
@@ -69,14 +69,14 @@ stick}#copying-usb-hdd-image, respectively.
 
 2~tutorial-2 Tutorial 2: A web browser utility
 
-*{Use case}* Create a web browser utility image, learning how to apply customizations
+*{Use case:}* Create a web browser utility image, learning how to apply customizations.
 
 In this tutorial, we will create an image suitable for use as a web browser
 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
 
@@ -101,7 +101,7 @@ Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1.
 
 2~tutorial-3 Tutorial 3: A personalized image
 
-*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.
+*{Use case:}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.
 
 Since we will be changing our personalized image over a number of revisions,
 and we want to track those changes, trying things experimentally and
@@ -114,8 +114,9 @@ in {Managing a configuration}#managing-a-configuration.
 
 code{
 
-$ mkdir -p tutorial3/auto $ cp /usr/share/live/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
 
@@ -224,41 +227,53 @@ cases drawn from the collected experiences of users of Debian Live.
 
 2~ A VNC Kiosk Client
 
-Create an image with live-build to boot directly to a VNC server.
-
-_* Make a build directory: #{$ mkdir vncBuild}#
+*{Use case:}* Create an image with live-build to boot directly to a VNC server.
 
-_* Move to the build directory: #{$ cd vncBuild}#
+Make a build directory and create a skeletal configuration in it built
+around the standard-x11 list, including #{gdm3}#, #{metacity}# and
+#{xtightvncviewer}#, disabling recommends to make a minimal system:
 
-Example to config the build directory to include gdm metacity
-xtightvncviewer: #{$ lb config --packages "gdm3 metacity xtightvncviewer"}#
+code{
 
-Create a folder /etc/skel folder for a custom .xsession for the default
-user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#
+ $ mkdir vnc_kiosk_client
+ $ cd vnc_kiosk_client
+ $ lb config -a i386 -k 686 -p standard-x11 \
+     --packages "gdm3 metacity xvnc4viewer" \
+     --apt-recommends false
 
-Create the .xsession for the default user: #{$ touch
-config/chroot_local-includes/etc/skel/.xsession}#
+}code
 
-Edit the .xsession file to launch metacity and start xvncviewer with
-something similar to the below:
+Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for
+the default user that will launch metacity and start xvncviewer, connecting
+to port #{5901}# on a server at #{192.168.1.2}#:
 
 code{
 
-#!/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/vncviewer xxx.xxx.xxx.xxx:PORT
+ /usr/bin/metacity &
+ /usr/bin/xvncviewer 192.168.1.2:1
 
-exit
+ exit
+ END
 
 }code
 
-_* Build the image: #{# lb build}#
+Build the image:
+
+code{
+
+ # lb build
 
-_* Enjoy.
+}code
+
+Enjoy.
 
 2~ A base image for a 128M USB key
 
-*{Use case}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.
+*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.
 
 When optimizing an image to fit a certain media size, you need to understand
 the tradeoffs you are making between size and functionality. In this
@@ -272,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
 
@@ -281,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
 
@@ -303,3 +318,79 @@ remaining options shave off additional small amounts of space. It's up to
 you to decide if the functionality that is sacrificed with each optimization
 is worth the loss in functionality.
 
+2~ A localized KDE desktop and installer
+
+*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.
+
+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
+that would be installed by the standard Debian installer for KDE.
+
+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 find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can
+be used to dig it out of the task descriptions in tasksel-data, so to
+prepare, make sure you have both of those things:
+
+code{
+
+ # apt-get install dctrl-tools tasksel-data
+
+}code
+
+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.
+
+}code
+
+By this command, we discover the task is called, plainly enough,
+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.
+
+ Task: brazilian-portuguese-kde-desktop
+ Description: Brazilian Portuguese KDE desktop
+  This task localises the KDE desktop in Brazilian Portuguese.
+
+}code
+
+We will use the experimental #{--language}# option, as live-build happens to
+include #{syslinux}# templates for pt_BR (see {Desktop and language
+tasks}#desktop-and-language-tasks for details). And at boot time we will
+generate the pt_BR.UTF-8 locale and select the pt-latin1 keyboard
+layout. Now let's put the pieces together:
+
+code{
+
+ $ mkdir live-pt_BR-kde
+ $ cd live-pt_BR-kde
+ $ lb config \
+     -a i386 \
+     -k 486 \
+     -p kde-desktop \
+     --language pt_BR \
+     --tasks "brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop" \
+     --bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
+     --debian-installer live \
+     --packages debian-installer-launcher
+
+}code
+
+Note that we have included the #{debian-installer-launcher}# package to
+launch the installer from the live desktop, and have also specified the 486
+flavour kernel, as it is currently necessary to make the installer and live
+system kernels match for the launcher to work properly.
+
diff --git a/manual/de/user_installation.ssi b/manual/de/user_installation.ssi
index e59dc91..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,9 +66,18 @@ 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 ..
 
-# dpkg -i live-build*.deb
+}code
+
+Now install whichever of the freshly built #{.deb}# files you were
+interested in, e.g.
+
+code{
+
+ # dpkg -i live-build_2.0.8-1_all.deb
 
 }code
 
@@ -76,7 +85,7 @@ You can also install live-build directly to your system by executing:
 
 code{
 
-# make install
+ # make install
 
 }code
 
@@ -84,7 +93,7 @@ and uninstall it with:
 
 code{
 
-# make uninstall
+ # make uninstall
 
 }code
 
@@ -94,43 +103,37 @@ If you do not wish to build or install live-build from source, you can use
 snapshots. These are built automatically from the latest version in Git and
 are available on http://live.debian.net/debian/.
 
-2~ live-boot
+2~ live-boot and live-config
 
-*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.
+*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.
 
-% FIXME: we also need to mention live-config
+3~ From the Debian repository
 
-3~ Using a customized live-boot
+Both live-boot and live-config are available from the Debian repository as
+per {Installing live-build}#installing-live-build.
 
-% FIXME: should follow the structure for live-build above (i.e. "from
-source", not "customized" -- we should not get into customization now, but
-should reserve that discussion for later.
+3~ From source
 
-To modify the code you can follow the process below. Please ensure you are
-familiar with the terms mentioned in {Terms}#terms.
+To use the latest source from git, you can follow the process below. Please
+ensure you are familiar with the terms mentioned in {Terms}#terms.
 
-_* Checkout the live-boot source
+_* 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-boot.git
+ $ git clone git://live.debian.net/git/live-config.git
 
 }code
 
-_* Make changes to your local copy
-
-% FIXME: as indicated above, it's too early for this topic. Move to later in
-the manual.
-
-And beware that if you want to add your pre-init script in live-bottom, you
-should name it without dashes '-', e.g: call it "99new_feature" and not
-"99new-feature".
+Consult the live-boot and live-config man pages for details on customizing
+if that is your reason for building these packages from source.
 
-_* Build a live-boot .deb
+_* Build live-boot and live-config .deb files
 
 You must build either on your target distribution or in a chroot containing
 your target platform: this means if your target is Squeeze then you should
-build against Squeeze. Y
+build against Squeeze.
 
 Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to
 build #{live-boot}# for a target distribution that differs from your build
@@ -141,28 +144,33 @@ system distribution, you may build directly on the build system using
 
 code{
 
-$ cd live-boot $ dpkg-buildpackage -b -uc -us
+ $ cd live-boot
+ $ dpkg-buildpackage -b -uc -us
+ $ cd ../live-config
+ $ dpkg-buildpackage -b -uc -us
 
 }code
 
-_* Use the generated live-boot .deb
+_* Use all generated .deb files
 
-As live-boot is installed by live-build system, installing the package in
-the host system is not sufficient: you should treat the generated .deb like
-another custom package. Please see {Customizing package
-installation}#customizing-package-installation for more information. You
-should pay particular attention to {Additional
+As live-boot and live-config are installed by live-build system, installing
+the packages in the host system is not sufficient: you should treat the
+generated .deb files like any other custom packages. Please see {Customizing
+package installation}#customizing-package-installation for more
+information. You should pay particular attention to {Additional
 repositories}#additional-repositories.
 
-3~ Using live-boot snapshots
+3~ From 'snapshots'
 
-You can let live-build automatically use the latest snapshot of live-boot by
-configuring a third-party repository in your live-build configuration
-directory. Assuming you have already created a configuration tree with #{lb
-config}#:
+You can let live-build automatically use the latest snapshots of live-boot
+and live-config by configuring a third-party repository in your live-build
+configuration directory. Assuming you have already created a configuration
+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 a19f611..abab4fa 100644
--- a/manual/de/user_managing_a_configuration.ssi
+++ b/manual/de/user_managing_a_configuration.ssi
@@ -22,8 +22,9 @@ retain old values that are no longer appropriate.
 
 A second, related problem is that if you run #{lb config}# and then upgrade
 to a new version of live-build that has changed one of the variable names,
-you will discover this only by manual review of the variables in your config
-files, which you will then need to use to set the appropriate option again.
+you will discover this only by manual review of the variables in your
+#{config/*}# files, which you will then need to use to set the appropriate
+option again.
 
 All of this would be a terrible nuisance if it weren't for auto/* scripts,
 simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands
@@ -49,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
 
@@ -60,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
 
@@ -72,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
 
@@ -81,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 cf9f187..3d6b063 100644
--- a/manual/de/user_overview.ssi
+++ b/manual/de/user_overview.ssi
@@ -18,11 +18,11 @@ Many concepts are similar to those in the debhelper Debian package tools
 written by Joey Hess:
 
 _* The scripts have a central location for configuring their operation. In
-debhelper, this is the debian subdirectory of a package tree. For example,
-dh_install will look, amongst others, for a file called #{debian/install}#
-to determine which files should exist in a particular binary package. In
-much the same way, live-build stores its configuration entirely under a
-config subdirectory.
+debhelper, this is the #{debian/}# subdirectory of a package tree. For
+example, dh_install will look, amongst others, for a file called
+#{debian/install}# to determine which files should exist in a particular
+binary package. In much the same way, live-build stores its configuration
+entirely under a #{config/}# subdirectory.
 
 _* The scripts are independent - that is to say, it is always safe to run
 each command.
@@ -46,42 +46,51 @@ _* *{lb clean}*: Responsible for removing parts of a Live system build. See
 3~lb-config The #{lb config}# command
 
 As discussed in {live-build}#live-build, the scripts that make up live-build
-source their configuration from a single directory named config/. As
+source their configuration from a single directory named #{config/}#. As
 constructing this directory by hand would be time-consuming and error-prone,
 the #{lb config}# command can be used to create skeleton configuration
 folders.
 
-Issuing #{lb config}# without any arguments creates a config subdirectory
-which it populates with some default settings:
+Issuing #{lb config}# without any arguments creates a #{config/}#
+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 dd7a8e9..4cd5355 100644
--- a/manual/en/about_manual.ssi
+++ b/manual/en/about_manual.ssi
@@ -8,7 +8,7 @@ Some of the commands mentioned in the text must be executed with superuser privi
 
 2~ For the impatient
 
-While we believe that everything in this manual is important to at least some of our users, we realize it is a lot of material to cover and that you may wish to experience early success using the software before delving into the details. Therefore, we have provided three tutorials in the {Examples}#examples section designed to teach you image building and customization basics. Read {Using the examples}#using-the-examples first, followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser utility}#tutorial-2 and finally {Tutorial 3: A personal travelling companion}#tutorial-3. By the end of these tutorials, you will have a taste of what can be done with Debian Live. We encourage you to return to more in-depth study of the manual, perhaps next reading {The basics}#the-basics, skimming or skipping {Building a netboot image}#building-netboot-image, and finishing by reading the {Customization overview}#customization-overview and the chapters that follow it. B
 y this point, we hope you are thoroughly excited by what can be done with Debian Live and motivated to read the rest of the manual, cover-to-cover.
+While we believe that everything in this manual is important to at least some of our users, we realize it is a lot of material to cover and that you may wish to experience early success using the software before delving into the details. Therefore, we have provided three tutorials in the {Examples}#examples section designed to teach you image building and customization basics. Read {Using the examples}#using-the-examples first, followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser utility}#tutorial-2 and finally {Tutorial 3: A personalized image}#tutorial-3. By the end of these tutorials, you will have a taste of what can be done with Debian Live. We encourage you to return to more in-depth study of the manual, perhaps next reading {The basics}#the-basics, skimming or skipping {Building a netboot image}#building-netboot-image, and finishing by reading the {Customization overview}#customization-overview and the chapters that follow it. By this poin
 t, we hope you are thoroughly excited by what can be done with Debian Live and motivated to read the rest of the manual, cover-to-cover.
 
 2~terms Terms
 
@@ -74,11 +74,11 @@ _* Trent W. Buck
 
 2~ Contributing to this document
 
-This manual is intended as a community project and all proposals for improvements and contributions are extremely welcome. The preferred way to submit a contribution is to send it to the mailing list. Please see {Contact}#contact for more information.
+This manual is intended as a community project and all proposals for improvements and contributions are extremely welcome. The preferred way to submit a contribution is to send it to the mailing list. Please see the section {Contact}#contact for more information.
 
 When submitting a contribution, please clearly identify its copyright holder and include the licensing statement. Note that to be accepted, the contribution must be licensed under the same license as the rest of the document, namely, GPL version 3 or later.
 
-The sources for this manual are maintained using the Git version control system. You can checkout the latest copy by executing:
+The sources for this manual are maintained using the Git version control system. You can check out the latest copy by executing:
 
 code{
 
@@ -90,15 +90,15 @@ 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 libnokogiri-ruby
 
 }code
 
-You may build the live-manual from the top level directory of your git checkout by executing:
+You may build the live-manual from the top level directory of your Git checkout by executing:
 
 code{
 
-$ make build
+ $ make build
 
 }code
 
@@ -106,24 +106,24 @@ 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
 
 3~ Applying patches
 
-Directly commiting to the repository is possible by anyone. However, we ask you to send bigger changes to the mailing list to discuss them first. In order to push to the repository, the following steps are required.
+Anyone can directly commit to the repository. However, we ask you to send bigger changes to the mailing list to discuss them first. To push to the repository, you must follow this procedure:
 
 _* 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/live.debian.net
-$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \
-	-O ~/.ssh/identity.d/live.debian.net.pub
-$ chmod 0600 ~/.ssh/identity.d/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,36 +131,36 @@ _* 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
 
-_* Checkout a clone of the manual through ssh:
+_* 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
 
-_* After editing the files in manual/en/, please call the 'commit' target in the top level directory to sanitize the files and update the translation files:
+_* After editing the files in #{manual/en/}#, please call the 'commit' target in the top level directory to sanitize the files and update the translation files:
 
 code{
 
-$ make commit
+ $ make commit
 
 }code
 
-_* After sanitizing commit the changes. Write commit messages, that consist of full useful sentences, starting with a capital letter and ending with a full stop. Usually starting with the form 'Fixing/Adding/Removing/Correcting/':
+_* After sanitizing, commit the changes. Write commit messages that consist of full, useful sentences in English, starting with a capital letter and ending with a full stop. Usually, these will start with the form 'Fixing/Adding/Removing/Correcting/Translating', e.g.
 
 code{
 
-$ git commit -a
+ $ git commit -a -m "Adding a section on applying patches."
 
 }code
 
@@ -168,14 +168,17 @@ _* Push the commit to the server:
 
 code{
 
-$ git push
+ $ git push
 
 }code
 
 3~ Translation
 
-Submiting a translation for a new language is recommendet in two steps:
+To submit a translation for a new language, follow these three steps:
 
-_* Translate the about_manual.ssi.pot about_project.ssi.pot index.html.in.pot files to your language with your favourite editor (such as poedit). Send translated files to the mailinglist. It will then be included and autobuild for that language enabled.
+_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html.in.pot files to your language with your favourite editor (such as poedit). Send translated files to the mailing list. Once we have reviewed your submission, we will add the new language to the manual (providing the po files) and will enable it in the autobuild.
+
+_* Once the new language is added, you can randomly start translating all po files in #{manual/po/}#.
+
+_* Don't forget you need #{make commit}# to ensure the translated manuals are updated from the po files, before #{git commit -a}# and #{git push}#.
 
-_* Now that the new language was added, you can randomly start translating all other pot files.
diff --git a/manual/en/index.html.in b/manual/en/index.html.in
index 9f0b3a7..b6cdcb3 100644
--- a/manual/en/index.html.in
+++ b/manual/en/index.html.in
@@ -34,7 +34,7 @@
 	<h3>Source</h3>
 
 	<p>
-		The sources for this manual is available in a <a href="http://git.or.cz/">git</a> repository at live.debian.net.
+		The sources for this manual is available in a <a href="http://git.or.cz/">Git</a> repository at live.debian.net.
 	</p>
 
 	<ul>
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 6c8d274..6fa445d 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -9,7 +9,7 @@
  :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
 
 @date:
- :published: 2010-12-06
+ :published: 2010-12-24
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
@@ -27,7 +27,7 @@
 
 << about_project.ssi
 
-:B~ User ~#
+:B~ User
 
 << user_installation.ssi
 
@@ -43,17 +43,13 @@
 
 << user_customization-contents.ssi
 
-<< user_customization-internationalization.ssi
-
 << user_customization-runtime.ssi
 
 << user_customization-binary.ssi
 
 << user_customization-installer.ssi
 
-:B~ Development ~#
-
-:B~ Project ~#
+:B~ Project
 
 << project_bugs.ssi
 
@@ -61,18 +57,7 @@
 
 << project_procedures.ssi
 
-:B~ Examples ~#
+:B~ Examples
 
 << user_examples.ssi
 
-:B~ Other ~#
-
-Other material that formerly appeared in this section is out of date and/or has
-not been approved for release. It has therefore been omitted, but can still be
-found in the document source; see 'About this manual'. Any part of the omitted
-material that is still useful will be included in the release only after it has
-been reviewed.
-
-% << other_faq.ssi
-
-% << other_howtos.ssi
diff --git a/manual/en/other_faq.ssi b/manual/en/other_faq.ssi
deleted file mode 100644
index 34ed2f6..0000000
--- a/manual/en/other_faq.ssi
+++ /dev/null
@@ -1,383 +0,0 @@
-B~ Frequently asked questions (FAQ)
-
-1~ Frequently asked questions (FAQ)
-
-Q: I downloaded a prebuilt live image. How do I put it on a USB stick?
-A: See "Copying USB/HDD image to a USB stick"
-% FIXME: <xref linkend="image_copying"/>
-
-Q: How do I log my build?
-A: You could use script, screen or tee: #{$ lh_build 2>&1 | tee build.log}#
-
-Q: How can I convert an already installed standard Debian partition into a Debian Live system?
-A: Save the list of installed packages and load it into your new Debian Live System. Copy your /etc to config/chroot_local-includes
-
-Q: What does 'losetup: could not find any free loop device' mean and how do I fix it?
-A: Loop devices are used during the build; there probably aren't any free if you've aborted several builds. Something like: for l in /dev/loop0 /dev/loop1 /dev/loop2 /dev/loop3 /dev/loop4 /dev/loop5 /dev/loop6 /dev/loop7 ; do losetup -d $l ; done should rectify the situation (assuming all loop devices in use were created by lh_build; if in doubt, check the contents of each loop device before deleting them with losetup -d).
-
-Q: How do I launch an interactive shell during the chroot stage?
-A: To enable interactive shell: #{$ lh_config --interactive shell}# To continue the build process: #{# logout}# or #{# exit}# To disable interactive shell, set LH_INTERACTIVE to "disabled" in config/chroot.
-
-Q: What is the root /user password?
-A: The user password for the live user is 'live'. By default, there is not any root password. You can switch to root with ${sudo -i}# or set a password for root with #{sudo passwd}#
-
-Q: How do I change root or any user password?
-A: Add a chroot local hook script to change root or any user password each time you build an image.
-e.g. config/chroot_local-hooks/01-update_password.sh to set root password to "nopasswd"
-
-code{
-#!/bin/sh
-
-echo "I: update password"
-echo "root:nopasswd" | chpasswd
-
-$ chmod +x config/chroot_local-hooks/01-update_password.sh
-
-}code
-
-Note for live user; you need to copy the /usr/share/initramfs-tools/scripts/live-bottom/10adduser your build folder:
-
-code{
-
-mkdir -p config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/
-cp /usr/share/initramfs-tools/scripts/live-bottom/10adduser config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/
-
-}code
-
-Note: Then edit the config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/10adduser and paste in the new user_crypted password that you make with: #{echo "newlivepass" | mkpasswd -s}#
-
-Or add an hook file in config/chroot_local-hooks/ with something like the below:
-
-code{
-#!/bin/sh
-
-# Change the autogenerated user password to "debianlive"
-plain_password="debianlive"
-password=$(echo "${plain_password}" | mkpasswd -s)
-
-sed -i -e 's/\(user_crypted=\)\(.*\)\( #.*\)/\1\"'${password}'\"\3/' /usr/share/initramfs-tools/scripts/live-bottom/10adduser
-
-update-initramfs -tu -kall
-}code
-
-The latter (hook model) could be more future proof than the former solution since it modifies just one string selectively but it requires the package "whois" to be installed on the target system (for mkpasswd) or that you generate the $password string not at build time and include it crypted in the above script.
-
-Q: How to disable autologin?
-A1: use the commandline parameter #{lh config --bootappend-live "noautologin"}#
-A2: You need to set boot=noautologin noxautologin as described in man live-initramfs If you boot via TFTP you want to insert the option to pxelinux.cfg/default
-
-Q: How do I change default hostname or username?
-A: To change default hostname or username: #{$ lh_config --hostname myhostname $ lh_config --username myusername}#
-
-Q: How do I make the final image smaller?
-A: Clean orphaned apps/libs: Install package "deborphan" and then run 'sudo deborphan -n' . Delete unwanted packages. Remove the apt cache. Purge unwanted locales (see "localepurge" package).
-
-Q: How do I customize bash-config permanently (aliases, bash-completion etc.)?
-A: Add your own .bashrc config/chroot_local-includes/etc/skel/.bashrc
-
-Q: How do I disable services permanently? (Be careful!)
-A: Add a chroot local hook script to disable a service each time you build an image:
-e.g. config/chroot_local-hooks/01-disable_service.sh
-
-code{
-
-#!/bin/sh
-
-echo "I: disable service"
-update-rc.d -f service_name remove
-
-$ chmod +x config/chroot_local-hooks/01-disable_service.sh
-
-}code
-
-Q: How do I enable | disable the md5checksum at the ISO building?
-A: #{lh_config --checksums enabled|disabled}# Or change the LH_CHECKSUMS value.
-
-Q: How to disable the generation of the .tar.gz file?
-A: #{lh_config --net-tarball none|gzip}# Or change the LH_NET_TARBALL value. (only available in snapsshot version at the moment 2008/Feb/28)
-
-Q: How do I "build a new image"?
-A: Run commands:
-
-code{
-
-$ sudo lh_clean --binary
-$ sudo lh_build
-
-}code
-
-Hint: If the configuration had changed you should leave "--binary" out. This will clean your chroot directory too.
-
-Q: How do I use Fluxbox ?
-A: Add a new lists file with the fluxbox packages you want.
-
-Create /home/$USERNAME/.dmrc file (default username is "user").
-
-code{
-
-$ cat .dmrc
-[Desktop]
-Session=fluxbox
-}code
-
-Note: .dmrc is owned by $USERNAME:$USERNAME.
-
-See also http://wiki.debian.org/Fluxbox/ A short HOWTO can be found at http://wiki.debian.org/MichaelAblassmeier/CustomLiveCD
-
-Q: How do I use custom repositories?
-A: See http://wiki.debian.org/DebianLive/Configuration
-
-Q: How do I customize the artwork for the live CD (grub or syslinux boot splash, usplash, etc.)?
-A: See http://wiki.debian.org/DebianLive/Howto/Custom_Artwork
-
-Q: How do I customize desktop environment (KDE, GNOME, XFCE, etc...) look?
-A: Start the live system in qemu:
-
-code{
-
-$ qemu -m 256 -cdrom binary.iso -boot d -redir tcp:4222:10.0.2.15:22
-
-}code
-
-Note: the -redir argument must be changed to meet your needs
-
-Q: How do I execute a custom shell script inside the chroot system after the chroot stage?
-A: Add your script in config/chroot_local-hooks.
-
-Q: How do I add a script running immediately after all other scripts when the live system boots?
-A: Add your script in config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/99scrip
-
-code{
-
-$ chmod +x config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/99script
-
-}code
-
-Note: The hook script must be executable. Do not forget to lh_clean --chroot after making this change before you build again.
-
-You must also use the example script /usr/share/live-helper/examples/hooks/update-initramfs.sh to ensure your script gets built into the initramfs (read the comment header for instructions).
-
-Q: How do I add software not in Debian ?
-A: See Customizing package installation
-% FIXME: <xref linkend="packages"/>
-
-Q: What is the manifest with Ubuntu used for?
-A: Manifest is just the package list, which ubuntu does $something with. Don't worry about it.
-
-Q: What is this {p} syntax with mtools{p} and parted{p}?
-A: That's aptitude.
-
-Q: Do I need to write the image on USB stick to test it?
-A: you must use qemu >= 0.8.
-
-Q: What is /cow?
-A: Copy-on-write, the 'diff' from unionfs.
-
-Q: Is /usr/share/live-helper/lists/standard-x11 like preseed or is preseed something else entirely?
-A: It is not. It is a package list, not a debconf preseeding.
-
-Q: What is the difference between standard and minimal?
-A: standard: packages of priority standard and higher; minimal: packages of priority essential and higher;
-
-Q: What can the sections be used for? Aren't they BIG?
-A: Someone maybe wants to include packages from contrib or non-free.
-
-Q: memtest86+ ... is that used?
-A: Yes
-
-Q: How do I build using predefined packages lists?
-A: e.g. to build using standard-x11 packages list: #{$ sudo lh_config -p standard-x11 && sudo lh_build}# Note: The packages lists can be found in /usr/share/live-helper/lists/ directory.
-
-Q: How do I rebuild without downloading all the packages again?
-A: All packages are cached in cache subdirectory. They remain until a clean purge: #{$ sudo lh_clean --purge}# You do not have to do anything to prevent packages from being re-downloaded. You need to remember to clean whichever stages you want to rebuild first. e.g. to rebuild from the cached bootstrap, chroot packages and build a new image. #{$ sudo lh_clean && sudo lh_build}#
-
-Q: How do I boot USB debian-live on systems not supporting USB boot?
-A: Make a boot CD with grub, configured to boot from a debian-live kernel copied on the cd structure #{$ mkdir -p iso/boot/grub && cp /usr/lib/grub/i386-pc/stage2_eltorito iso/boot/grub && cp chroot/boot/* iso/boot/}# Create iso/boot/grub/menu.lst:
-
-code{
-
-default 0
-timeout 5
-color cyan/blue white/blue
-title Debian Live root (cd)
-kernel /boot/vmlinuz boot=live
-initrd /boot/initrd.img
-
-}code
-
-Create the iso image #{$ mkisofs -R -b boot/grub/stage2_eltorito -no-emul-boot \ -boot-load-size 4 -boot-info-table -o grub.iso iso}# Burn the image.
-
-Q: How do I boot debian-live on systems not supporting CDROM or USB boot?
-A: If you have a floppy drive, you may be able to use it, otherwise you will need to use loadlin/grub4dos/win32-loader. If you have a second system to serve up the image over the network, See http://wiki.debian.org/DebianLive/Howto/Creating_a_Netboot_Image
-
-Q: The X configuration does not seems to work, the resolution is too low. What can I do?
-A: Use xdebconfigurator #{$ lh_config --bootappend xdebconf && lh_config --packages xdebconfigurator}#
-
-Q: Apache has problems with static files
-A: Sendfile does not work well on the unionfs used by Debian Live. Add the following to apache's configuration: #{EnableSendfile off}#
-
-Q: How do I make hard disk partitions auto-mountable?
-A: Short answer: Right now the best is to use a script that will populate the fstab when the CD is booting. Such a script can be found at https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-includes/sbin/diskmounter.sh. A proper solution based on HAL will be described here in a hopefully near future.
-A: Long Answer: Since 55_nonpolkit-mount-policy.patch in HAL, debian-storage-policy-fixed-drives.fdi is not available anymore and the previous trick that consisted to remove this file to enable automounting of fixed drives as a consequence is obsolete. Eventually, it will be possible to combine HAL and PolicyKit to enable different permissions and actions to achieve advanced (auto)mounting for non-root users. Until then, because the live scripts are only touching to the fstab to add a swap partition if discovered at boot time, the only way to have fixed drives mounted automatically is to use a script that will populate the fstab file at the end of the multiuser runlevel. To achieve this, you can do, for example, the following: download the https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-includes/sbin/diskmounter.sh script Create the chroot_local-includes/sbin directory, and move the script inside Make sure the script is executable (chmod +x diskmounter.s
 h) create the chroot_local-includes/etc/rc.local file and call the diskmounter from there (see this https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-includes/etc/rc.local When called correctly, the script detects ext2, ext3, reiserfs, xfs, FAT32, HFS+ and NTFS partitions and mount them read-write, except for NTFS. This will change soon and an option will be available to use ntfs-3g to mount NTFS as read-write. comments, patches and other things about this script and issue: http://code.goto10.org/projects/puredyne/ticket/463
-
-Q: Boot fails with panic: can't open /scripts/live
-A: Add latest live-initramfs deb package into config/chroot_local-packages directory and rebuild.
-
-Q: How do I configure the locale and the keyboard?
-A: See 10n
-% FIXME: <xref linkend="internalization"/>
-
-Q: How do I get past boot prompt without a working keyboard?
-A: See Customizing the bootup process
-% FIXME: <xref linkend="bootup"/>
-Note: Boot from an USB-HDD on an iMac with GRUB did not work.
-
-Q: Can I serve the root image from a web or ftp server?
-A: Since live-initramfs 1.99, it should be possible to use the fetch= argument on the kernel command line. You can build a netboot image as usual, and when you are done edit the tftpboot/pxelinux.cfg/default file. Remove the references to network boot (netboot, nfsroot, nfsopts), and replace with fetch= <url where you placed the root image>. You have to include wget in the chroot. It could work for other boot methods as well. However, I am not sure the live scripts configure the network when booting from a CD or USB disk. #{$ lh_config --packages wget}#
-
-Q: Why doesn't quickreboot (or some other boot parameter) work?
-A: If you are building an etch image (which was the default up to 2007/09/14) you have a very old version of casper which does not support quickreboot and possibly other boot parameters as well. You could configure your sources to use live-backports (see /usr/share/live-helper/examples/sources/live-backports) and switch to live-initramfs, or better yet, build a lenny image instead, which is the new default. #{$ lh_config --distribution lenny $ lh_config --initramfs live-initramfs}#
-
-Q: How do I fix "Could not find kernel image" issue with syslinux bootloader?
-A: Add a binary local hook script to fix kernel and initrd path each time you build an image. e.g. config/binary_local-hooks/01-fix_syslinux.sh
-
-code{
-
-#!/bin/sh
-
-SYSLINUXCFG=`find binary -type f -name syslinux.cfg`
-
-sed -i "s|kernel /vmlinuz|kernel vmlinuz|g" ${SYSLINUXCFG}
-sed -i "s|initrd=/initrd|initrd=initrd|g" ${SYSLINUXCFG}
-
-$ chmod +x config/binary_local-hooks/01-fix_syslinux.sh
-
-}code
-
-Q: How do I use a newer kernel with lenny?
-A: A build with backports.org kernels will fail as that repository lacks the necessary module packages (linux-modules-extra-2.6, aufs, etc.). Use the kernel backports http://unsupported.debian-maintainers.org/backports-kernel/ The quick way to success:
-
-code{
-
-$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6 squashfs-modules-2.6' $ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.chroot
-$ echo 'deb http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-kernel.binary
-$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.chroot.gpg
-$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel.binary.gpg
-$ lh_build
-}code
-
-Q: How do I use a custom kernel? Is there a nice way of booting debian-live with a custom kernel (not in an apt repo)?
-A: Copy it into config/chroot_local-packages and set LH_LINUX_PACKAGES="none" or use lh config --linux-packages " " Don't forget to compile your kernel with an union filesystem (unionfs or aufs), squashfs modules, and initrd support. I can cause the kernel to be installed but it seems this happens later than grub/syslinux is configured so it's not listed and casper/ and the menu require munging. You need to follow the debian scheme, e.g. placing the files in /boot as vmlinuz-$version and initrd.img-$version etc. I personally wouldn't go that way which is too much of a hassle, and just use make-kpkg to produce custom kernel deb packages. They should integrate nicely if you just put them into config/chroot_local-packages and set LH_LINUX_PACKAGES="". Hint: to work around an error, which lh_binary_syslinux will throw on custom kernels if there is not an 468/686 in the kernel-name, you need to set CONFIG_LOCALVERSION="-486" or "-686" within the kernel configuration (-&gt; Genera
 l setup -&gt; Local version set to -486 or -686) corresponding to LH_LINUX_FLAVOURS="" or "686". this at least up till live-helper version 1.0~a40-1 see http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-July/001947.html and http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-November/002581.html
-
-Q: How do I create a cross arch live CD image?
-A: In short: You can't. Read on: The procedure to create a live CD is based on creating a chroot that contains the files that will be finally available on the live CD. The live CD building procedure includes chrooting into the chroot dir and so some operations. chrooting means that the terminal you chroot on will behave as a different system so your real system and the chroot environment is decoupled somehow. Once the live CD scripts chroots into the chroot dir they have some operations to do inside that environment and your real system won't be able to run them unless you are using the same architecture. So you only are able to make live CD for the arch you run on. But this doesn't prevent you run qemu or some other machine emulator that make this possible.
-
-Q: When is a lh_clean necessary? lh_clean is a script in /usr/bin/
-A: That depends what you've changed between builds If, for example, you've built an iso image and you want a usb image, you only need to run #{lh_clean --binary}# before you run lh_build again. If you've changed anything in the chroot, you'll need to cleanup both chroot and binary with #{lh_clean}# before continuing
-
-Q: How can i set boot= parameters?
-A: Set LH_BOOTAPPEND_LIVE in config/binary
-
-Q: How do I include different modules to load when the live system boots?
-A: Configure config/chroot_local-includes/etc/initramfs-tools/
-
-The lh_chroot_hacks helper rebuilds the live/initrd1.img using the default initramfs.conf "MODULES = most". You may override that by supplying your own initramfs.conf, or else just add your own modules, e.g.
-
-code{
-
-mkdir -p config/chroot_local-includes/etc/initramfs-tools/
-echo "atl2" >> config/chroot_local-includes/etc/initramfs-tools/modules
-
-}code
-
-Note: Even though initramfs.conf(5) says "most adds all the framebuffer, acpi, file system, ide, sata, scsi and usb drivers", it actually includes network drivers as well. See auto_add_modules() in /usr/share/initramfs-tools/hook-functions for the complete list.
-
-Q: Can I have a splash screen?
-A: Yes you can. You will not know what is going on when the splash screen is active, it may fail to activate on some hardware or break X on other (both usplash and splashy use libdirectfb which does some evil voodoo and may break you graphics or input until you reboot). However, you can install and activate it just as you would on any other Debian system. To use splashy: 1. install splashy and read the README, the manpages are useless for setting it up. Add some parameters to your kernel command line, such as in your pxelinux configuration or in LH_BOOTAPPEND_LIVE in config/binary in debian-live configuration: #{vga=792 splash quiet}# #{vga}# to select video mode, #{splash}# to activate splashy, #{quiet}# to suppress most kernel messages that you cannot see anyway but would scroll past before splashy manages to paint the graphics on your screen. You might want to add splashy to the list of packages installed in your image: #{echo splashy > config/chroot_local-packageslists/s
 plashy echo splashy-themes >> config/chroot_local-packageslists/splashy}# and select a theme:
-
-code{
-
-echo '#!/bin/sh' > config/chroot_local-hooks/splashy
-echo splashy_config -s debian-moreblue '||' true >> config/chroot_local-hooks/splashy
-# update the ramdisk to include the splash screen
-echo update-initramfs -u -k all >> config/chroot_local-hooks/splashy
-chmod 755 config/chroot_local-hooks/splashy
-
-}code
-
-After you rebuild your live system you should observe a bluish splash screen while booting. Nothing happens while initramfs is running because there is no splashy support in initramfs-tools. Once the init starts the progress bar should start to fill. If #{vga=something}# sets a mode that your screen cannot show or your card cannot do vesa 2.0 (and thus you get plain text mode and no splashy) read the splashy faq.
-
-Q: Howto use my Broadcom eXtrem 2 network card (module bnx2)?
-A: Add the firmwares to the initrd image. You need to install the non-free package "firmware-bnx2". Uncompress your initrd image, then copy files:
-
-code{
-
-cp /lib/firmware/bnx2x-e1-4.8.53.0.fw /lib/firmware/bnx2x-e1-5.0.21.0.fw /lib/firmware/bnx2x-e1h-4.8.53.0.fw /lib/firmware/bnx2x-e1h-5.0.21.0.fw ${INITRD}/lib/firmware/
-cp /lib/udev/firmware.agent ${INITRD}/lib/udev/
-
-}code
-
-Recompress your initrd image and boot: it works!
-
-Q: X is broken (the system boots, messages scroll by, and then the screen goes blank). What do I do? A: On my system starting X completely disables graphics so that I do not see anything even after X bails out and I am back to the console. To prevent this you can change the driver Xorg uses.
-
-If you have a working splash screen or at least graphical console you can use #{live xdriver=fbdev}# when booting the live system (instead of just enter). Another driver you might want to try is #{vesa}#. If all fails you might try to set xdriver to some wrong value so that Xorg fails to start and you can examine the system while you still see something on the console. #{live xdriver=none}#
-
-Q: How can I get Debian first stable versions?
-A: I'm developing software and testing it on Live-CD. Thanks for the LiveCD project. To be sure my development is fully compatible with the "etch" version, I need the same scenario when Debian GNU/Linux 4.0 was published as stable (I believe 2007.04.08). If there was some bug on 2007.04.08 that was corrected one week later, I need to test software foreseeing that scenario without the bug solved.
-
-Q: I get "fopen: Permission denied"-warnings from apt on building/at the live-system
-A: That's a harmless bug in apt. However, if you want to get off this warnings in the live-system, add a file in chroot_local-hooks with follow row:
-
-code{
-
-chown -R man.man /var/cache/man
-
-}code
-
-Q: Why I always fail during "Retrieving Packages" stage when running lh_build? I have already set apt-http-proxy and so on.
-A: lh_build retrieves packages via wget, as a result you need to enable the proxy settings in /etc/wgetrc before running lh_build.
-
-Q: How do I edit Xorg.conf?
-A: Xorg.conf is generated every time system boots, so it's useless to put modifed Xorg.conf in config/choort_local-includes/etc/X11, because it will be overwritten during boot. However, you can edit /usr/bin/dexconf, which generate xorg.conf during boot, so the result will be modified Xorg.conf. The modified dexconf has to be put in config/choort_local-includes/usr/bin. e.g.: you can configure Xorg.conf for two or more keyboards layouts with alt+shift toggle by editing dexconf and replacing the line:
-
-code{
-
-Option "XkbLayout" "$XKB_LAYOUT"
-
-}code
-
-with the lines:
-
-code{
-
-Option "XkbLayout" "us,il"
-Option "XkbOptions" "grp:alt_shift_toggle,grp_led:scroll"
-
-}code
-
-when "us,il" are the wanted keyboard layouts.
-
-You can force default screen resulotion (e.g. 1024*768) by adding the lines:
-
-code{
-
-SubSection "Display"
-        Modes "1024x768"
-EndSubSection
-
-}code
-
-between the lines:
-
-code{
-
-Section "Screen"
-        Identifier "Default Screen"
-        Monitor "Configured Monitor"
-EndSection"
-
-}code
-
-Q: Where are the build parameters for the prebuilt images
-A: See http://live.debian.net/README.images.
diff --git a/manual/en/other_howtos.ssi b/manual/en/other_howtos.ssi
deleted file mode 100644
index 83bd2d6..0000000
--- a/manual/en/other_howtos.ssi
+++ /dev/null
@@ -1,86 +0,0 @@
-B~ Howtos
-
-1~ Howtos
-
-2~ ISO
-
-Generating a Debian Live CD is very simple. You need to have live-helper (package available in Debian sid and lenny), and Debootstrap (or cdebootstrap) from etch or newer.
-
-3~ Install live-helper
-
-#{apt-get install live-helper}#
-
-3~ Configure the current working directory with lh_config
-
-code{
-
-lh_config -b iso -a $ARCH
-
-}code
-
-where #{$ARCH}# is the intended architecture (i.e. - i386 or amd64).
-
-#{-b}# flag is used to be sure to obtain image in ISO format.
-
-3~ Build the image with lh_build:
-
-Execute lh_build as root: #{lh_build}#
-
-The command above will create the basic image, containing just the Debian standard system (with no X at all).
-
-If you want to have any of the Desktop environments on your livecd, #{ls /usr/share/live-helper/lists}# will show a number of available package Lists to choose from, e.g. #{lh_config -p gnome-desktop}#
-
-More examples are listed at DebianLive/Examples.
-
-See packages for help configuring a local Debian Mirror and other aspects of the live system.
-% FIXME: <xref linkend="packages"/>
-
-3~ Test the image
-
-If you have qemu installed, you can boot the image with:
-
-code{
-
-qemu -cdrom binary.iso
-
-}code
-
-If you have also kqemu installed, you can add #{-kernel-kqemu}#
-
-2~ ISO_(multiarch)
-
-Multiple machine boot CDs can be created with the following manual procedure. This procedure has been successfully used to create a single CD which is bootable on alpha, i386, pmax, and sparc. It should be possible to also make the CD bootable on macppc, vax and on sun2, sun3 and sun3x.
-
-To create a CD which is bootable by multiple architectures, use the following steps in this order. Please note that the order is critical.
-
-Make sure you have all the required files including the various kernels and boot programs listed in the individual machine sections.
-
-Include a directory somewhere in the cdsources directory called mdec.pmax and include the pmax bootxx_cd9660 file there. For example, /cdsources/usr/mdec.pmax/bootxx_cd9660.
-
-Include a directory somewhere in the cdsources directory called mdec.vax and include the vax xxboot file there. For example, #{cdsources/usr/mdec.vax/xxboot.}#
-
-Include the macppc ofwboot.xcf bootloader in /cdsources.
-
-Create an i386 bootable image. #{sh mkisofs -v -v -o output.iso -b i386/installation/floppy/boot-big.fs \ -c boot.catalog -l -J -r -L /cdsources 2>&1 | tee /tmp/mkisofs.log exit}#
-
-Note: The appearance of the -v flag twice is required. If you are making a bootable CD for an Open Firmware 3 macppc model, make sure to include -hfs -part in the parameters for mkisofs.
-
-Run mksunbootcd on a NetBSD/sparc machine to install sparc and sun2/sun3 bootblocks. Alternatively, install the sysutils/mksunbootcd package on your favorite NetBSD machine. #{mksunbootcd output.iso boot-sun4.fs boot-sun4c.fs boot-sun4m.fs boot-sun3.fs}#
-
-Run the installboot(8) program targeted for NetBSD/pmax to install the pmax bootblocks. Note that in order to coexist with other NetBSD boot blocks, the pmax boot block is appended to the end of the ISO file system.
-
-#{installboot -m pmax -v -o append,sunsum output.iso /tmp/mdec.pmax/bootxx_cd9660}#
-
-The -o append,sunsum option appends the first stage boot block to the end of the ISO file system, and restores the checksum used when booting on a sun.
-
-Run the installboot(8) program targeted for NetBSD/vax to install the vax bootblocks. Note that in order to coexist with other NetBSD boot blocks, the vax boot block is appended to the end of the ISO file system.
-
-installboot -m vax -v -o append,sunsum output.iso /tmp/mdec.vax/xxboot
-
-(See the pmax entry above for an explanation of the flags).
-
-Run the installboot(8) program targeted for NetBSD/alpha to install the alpha bootblocks.
-
-#{installboot -m alpha -v -o append,sunsum output.iso /tmp/mdec.alpha/bootxx_cd9660}#
-
-Note: The alpha installboot must occur after the others, because currently it's the only machine dependent back-end for installboot(8) that can calculate the alpha checksum. (See the pmax entry above for an explanation of the flags).
diff --git a/manual/en/project_bugs.ssi b/manual/en/project_bugs.ssi
index ef681a1..e0cf633 100644
--- a/manual/en/project_bugs.ssi
+++ b/manual/en/project_bugs.ssi
@@ -14,25 +14,27 @@ _* Try to give *{as specific information as possible}* about the bug. This inclu
 
 2~ Known issues
 
-Due to the nature of Debian *{testing}* and Debian *{unstable}* distributions being a moving target, building a live system may not always be possible.
+Because Debian *{testing}* and Debian *{unstable}* distributions are a moving target, when you specify either as the target system distribution, a successful build may not always be possible.
 
-If this is a problem, do not build a system based on *{testing}* or *{unstable}*, but go with *{stable}*. live-build does always default to the current *{stable}* release.
+% FIXME:
 
-Currently known issues are listed under the section 'status' on our homepage at http://live.debian.net/
+If this causes too much difficulty for you, do not build a system based on *{testing}* or *{unstable}*, but rather, use *{stable}*. live-build does always default to the *{stable}* release.
 
-It is out of the scope of this manual to train you in correctly identifying and fixing problems in packages of the development distributions, however, there are two things you can always try: When not succeeding to build *{testing}*, try if *{unstable}* works. If *{unstable}* does not work either, revert to *{testing}* and pinning the newer version of the failing package from *{unstable}*.
+Currently known issues are listed under the section 'status' on our homepage at http://live.debian.net/.
+
+It is out of the scope of this manual to train you to correctly identify and fix problems in packages of the development distributions, however, there are two things you can always try: If a build fails when the target distribution is *{testing}*, try *{unstable}*. If *{unstable}* does not work either, revert to *{testing}* and pin the newer version of the failing package from *{unstable}* (see {APT pinning}#apt-pinning for details).
 
 2~ Rebuild from scratch
 
-To ensure that a particular bug is not caused by an unclean built system, please always rebuild the whole live system from scratch to see if the bug is reproducible.
+To ensure that a particular bug is not caused by an uncleanly built system, please always rebuild the whole live system from scratch to see if the bug is reproducible.
 
 2~ Use up-to-date packages
 
-Using outdated packages can cause significant problems when trying to reproduce (and ultimately fix) your problem.
+Using outdated packages can cause significant problems when trying to reproduce (and ultimately fix) your problem. Make sure your build system is up-to-date and any packages included in your image are up-to-date as well.
 
 2~collect-information Collect information
 
-Please provide enough information with your report. At a minimum, it should contain the exact version of live-build version where the bug is encountered, and steps to reproduce it. Please use common sense and include other relevant information if you think that it might help in solving the problem.
+Please provide enough information with your report. At least include the exact version of live-build version where the bug is encountered and steps to reproduce it. Please use common sense and include other relevant information if you think that it might help in solving the problem.
 
 To make the most out of your bug report, we require at least the following information:
 
@@ -44,7 +46,7 @@ _* Version of live-boot on the live system
 
 _* Version of live-config on the live system
 
-_* Version of debootstrap and/or cdebootstrap on the host system
+_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system
 
 _* Architecture of the live system
 
@@ -52,20 +54,24 @@ _* Distribution of the live system
 
 _* Version of the kernel on the live system
 
-You can generate a log of the build process by using the tee command:
+You can generate a log of the build process by using the #{tee}# command. We recommend doing this automatically with an #{auto/build}# script; see {Managing a configuration}#managing-a-configuration for details).
 
 code{
 
-lb build 2>&1 | tee build.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
-For runtime log, live-boot stores a log in /var/log/live.log (or /var/log/live-boot.log).
+At boot time, live-boot stores a log in #{/var/log/live.log}# (or #{/var/log/live-boot.log}#).
 
-Additionally, to rule out other errors, it is always a good idea to tar up your config directory and upload it somewhere (do *{not}* send it as an attachment to the mailinglist), so that we can try to reproduce the errors you encountered.
+Additionally, to rule out other errors, it is always a good idea to tar up your #{config/}# directory and upload it somewhere (do *{not}* send it as an attachment to the mailing list), so that we can try to reproduce the errors you encountered. If this is difficult (e.g. due to size) you can use the output of #{lb config --dump}# which produces a summary of your config tree (i.e. lists files in subdirectories of #{config/}# but does not include them).
 
 Remember to send in any logs that were produced with English locale settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or #{LC_ALL=en_US}#.
 
+2~ Isolate the failing case if possible
+
+If possible, isolate the failing case to the smallest possible change that breaks. It is not always easy to do this, so if you can't manage it for your report, don't worry. However, if you plan your development cycle well, using small enough change sets per iteration, you may be able to isolate the problem by constructing a simpler 'base' configuration that closely matches your actual configuration plus just the broken change set added to it. If you have a hard time sorting out which of your changes broke, it may be that you are including too much in each change set and should develop in smaller increments.
+
 2~ Use the correct package to report the bug against
 
 Where does the bug appear?
@@ -80,13 +86,13 @@ In both cases, this is not a bug in Debian Live, but rather in Debian itself whi
 
 live-build installs additional packages from the Debian archive and depending on the Debian distribution used and the daily archive state, it can fail. If a bug appears here, check if the error is also reproducible on a normal system.
 
-If this is the case, this is not a bug in Debian Live, but rather in Debian - please report it against the failing package. Running debootstrap seperately from the Live system build or running lb bootstrap with #{--debug}# will give you more information.
+If this is the case, this is not a bug in Debian Live, but rather in Debian - please report it against the failing package. Running #{debootstrap}# separately from the Live system build or running #{lb bootstrap --debug}# will give you more information.
 
 Also, if you are using a local mirror and/or any of sort of proxy and you are experiencing a problem, please always reproduce it first by bootstrapping from an official mirror.
 
 3~ At boot time
 
-If your image does not boot, please report it to the mailing list together with the information requested in {Collect information}#collect-information. Do not forget to mention, how/when the image failed, in Qemu, VMWare or real hardware. If you are using a virtualization technology of any kind, please always run it on real hardware before reporting a bug. Providing a screenshot of the failure is also very helpful.
+If your image does not boot, please report it to the mailing list together with the information requested in {Collect information}#collect-information. Do not forget to mention, how/when the image failed, in Qemu, Virtualbox, VMWare or real hardware. If you are using a virtualization technology of any kind, please always run it on real hardware before reporting a bug. Providing a screenshot of the failure is also very helpful.
 
 3~ At run time
 
diff --git a/manual/en/project_coding-style.ssi b/manual/en/project_coding-style.ssi
index 9ef5507..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
 
@@ -70,19 +70,19 @@ foo ()
 
 _* Variables are always in capital letters.
 
-_* Variables that used in lb config always start with LH_ prefix.
+_* Variables that used in #{lb config}# always start with #{LB_}# prefix.
 
-_* Internal temporary variables in live-build should start with the _LH_ prefix.
+_* Internal temporary variables in live-build should start with the #{\_LB_}# prefix.
 
-_* Local variables start with live-build __LH_ prefix.
+_* Local variables start with live-build #{\_\_LB_}# prefix.
 
-_* Variables in connection to a boot parameter in live-config start with LIVE_.
+_* Variables in connection to a boot parameter in live-config start with #{LIVE_}#.
 
-_* All other variables in live-config start with _ prefix.
+_* All other variables in live-config start with #{_}# prefix.
 
-_* Use braces around variables; eg. write ${FOO} instead of $FOO.
+_* Use braces around variables; e.g. write #{${FOO}}# instead of #{$FOO}#.
 
-_* Always protect variables with quotes to respect potential whitespaces, write "${FOO}" not ${FOO}.
+_* Always protect variables with quotes to respect potential whitespaces: write #{"${FOO}"}# not #{${FOO}}#.
 
 _* For consistency reasons, always use quotes when assigning values to variables:
 
@@ -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,17 +119,17 @@ Good:
 
 code{
 
-if [ -f "${FOO}/foo/${BAR}/bar" ]
-then
-        foobar
-fi
+ if [ -f "${FOO}/foo/${BAR}/bar" ]
+ then
+         foobar
+ fi
 
 }code
 
 2~ Miscellaneous
 
-_* Use "|" (without the surround quotes) as a seperator in calls to sed, e.g. "sed -e 's|foo|bar|'" (without "").
+_* Use "#{|}#" (without the surround quotes) as a seperator in calls to sed, e.g. "#{sed -e 's|foo|bar|'}#" (without "").
 
-_* Don't use the test command for comparisons or tests, use "[" "]" (without ""), e.g. "if [ -x /bin/foo ]; ..." and not "if test -x /bin/foo; ...".
+_* Don't use the #{test}# command for comparisons or tests, use "#{[}#" "#{]}#" (without ""); e.g. "#{if [ -x /bin/foo ]; ...}#" and not "#{if test -x /bin/foo; ...}#".
 
-_* Use case wherever possible over test, as it's easier to read and faster in execution.
+_* Use #{case}# wherever possible over #{test}#, as it's easier to read and faster in execution.
diff --git a/manual/en/project_procedures.ssi b/manual/en/project_procedures.ssi
index 4b137a3..16260bb 100644
--- a/manual/en/project_procedures.ssi
+++ b/manual/en/project_procedures.ssi
@@ -1,6 +1,6 @@
 B~ Procedures
 
-1~ Procedures
+1~procedures Procedures
 
 This chapter documents the procedures within the Debian Live project for various tasks that need cooperation with other teams in Debian.
 
@@ -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 abdc69e..20e0dba 100644
--- a/manual/en/user_basics.ssi
+++ b/manual/en/user_basics.ssi
@@ -14,13 +14,11 @@ _* *{Linux kernel image}*, usually named #{vmlinuz*}#
 
 _* *{Initial RAM disk image (initrd)}*: a RAM disk set up for the Linux boot, containing modules possibly needed to mount the System image and some scripts to do it.
 
-_* *{System image}*: The operating system's filesystem image. Usually, a SquashFS compressed filesystem is used to minimize the Debian Live image size. Note that it is read-only. So, during boot the Debian Live system will use a RAM disk and 'union' mechanism to enable writing files within the running system. However, all modifications will be lost upon shutdown unless optional persistence is used (see persistence).
-
-% FIXME: <xref linkend="persistence"/>
+_* *{System image}*: The operating system's filesystem image. Usually, a SquashFS compressed filesystem is used to minimize the Debian Live image size. Note that it is read-only. So, during boot the Debian Live system will use a RAM disk and 'union' mechanism to enable writing files within the running system. However, all modifications will be lost upon shutdown unless optional persistence is used (see {Persistence}#persistence).
 
 _* *{Bootloader}*: A small piece of code crafted to boot from the chosen media, possibly presenting a prompt or menu to allow selection of options/configuration. It loads the Linux kernel and its initrd to run with an associated system filesystem. Different solutions can be used, depending on the target media and format of the filesystem containing the previously mentioned components: isolinux to boot from a CD or DVD in ISO9660 format, syslinux for HDD or USB drive booting from a VFAT partition, extlinux for ext2/3/4 and btrfs partitions, pxelinux for PXE netboot, GRUB for ext2/3/4 partitions, etc.
 
-You can use live-build to build the system image from your specifications, set up a Linux kernel, its initrd, and a bootloader to run them, all in one media-dependant format (ISO9660 image, disk image, etc.)
+You can use live-build to build the system image from your specifications, set up a Linux kernel, its initrd, and a bootloader to run them, all in one media-dependant format (ISO9660 image, disk image, etc.).
 
 2~ First steps: building an ISO image
 
@@ -30,17 +28,17 @@ First, we run the #{lb config}# command which will create a "config/" hierarchy
 
 code{
 
-$ lb config
+ $ lb config
 
 }code
 
 By passing no parameters to #{lb config}#, we indicated that we wish to use the defaults (see {The lb config command}#lb-config).
 
-Now that we have a "config/" hierarchy, we may build the image with the lb build command:
+Now that we have a "config/" hierarchy, we may build the image with the #{lb build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -52,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
 
@@ -64,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
 
@@ -76,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
 
@@ -86,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
 
@@ -100,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
 
@@ -108,15 +106,15 @@ 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
 
-Now build the image with the #{lb build} command:
+Now build the image with the #{lb build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -126,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
 
@@ -134,15 +132,15 @@ where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not a p
 
 *{This will definitely overwrite any previous contents on your stick!}*
 
-Note: As discussed earlier, this same process can be used for #{iso-hybrid}# type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images.
+Note: As discussed earlier, this same process can be used for #{iso-hybrid}# type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images.
 
 3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu
 
 code{
 
-# apt-get install qemu
+ # apt-get install qemu
 
-$ qemu -hda binary.img
+ $ qemu -hda binary.img
 
 }code
 
@@ -152,7 +150,7 @@ If you want to use the remaining free space after you have installed the binary.
 
 code{
 
-# gparted ${USBSTICK}
+ # gparted ${USBSTICK}
 
 }code
 
@@ -160,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
 
@@ -168,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
 
@@ -182,65 +180,58 @@ Note: if you performed any previous examples, you will need to clean up your wor
 
 code{
 
-$ lb clean --binary
+ # lb clean --binary
 
 }code
 
-Run the #{lb config}# command with the parameters to configure the "config/" hierarchy to create our netboot image:
+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
 
-In contrast with the ISO and USB/HDD images, netbooting does not support serving a filesystem image with the client, so the files must be served via NFS. The net-root-path and net-root-server options specify the location and server, respectively, of the NFS server where the filesytem image will be located at boot time.
+In contrast with the ISO and USB/HDD images, netbooting does not, itself, serve the filesystem image to the client, so the files must be served via NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the location and server, respectively, of the NFS server where the filesytem image will be located at boot time. Make sure these are set to suitable values for your network and server.
 
 Now build the image with the #{lb build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
 In a network boot, the client runs a small piece of software which usually resides on the EPROM of the Ethernet card. This program sends a DHCP request to get an IP address and information about what to do next. Typically, the next step is getting a higher level bootloader via the TFTP protocol. That could be pxelinux, GRUB, or even boot directly to an operating system like Linux.
 
-For example, if you unpack the generated binary-net.tar.gz archive in the /srv/debian-live directory, you'll find the filesystem image in live/filesystem.squashfs and the kernel, initrd and pxelinux bootloader in tftpboot/debian-live/i386.
+For example, if you unpack the generated #{binary-net.tar.gz}# archive in the #{/srv/debian-live}# directory, you'll find the filesystem image in #{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader in #{tftpboot/debian-live/i386}#.
 
-We must now configure three services on the server to enable netboot.
+We must now configure three services on the server to enable netboot: the DHCP server, the TFTP server and the NFS server.
 
 3~ DHCP server
 
 We must configure our network's DHCP server to be sure to give an IP address to the netbooting client system, and to advertise the location of the PXE bootloader.
 
-Here is an example for inspiration, written for the ISC DHCP server #{isc-dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;
-
-% FIXME
+Here is an example for inspiration, written for the ISC DHCP server #{isc-dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:
 
 code{
 
-subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
-
-  # IP addresses available for guests
-  range 192.168.1.100 192.168.1.149;
+ # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server
 
-  # allow booting from the net
-  allow bootp;
+ ddns-update-style none;
 
-  # for net booting, server where the first file to be loaded (by TFTP
-  # protocol) ("filename" following definition) lies : so the TFTP
-  # server's name.
-  next-server myserver;
+ option domain-name "example.org";
+ option domain-name-servers ns1.example.org, ns2.example.org;
 
-  # net boot configuration for guests with a PXE client :
-  if substring (option vendor-class-identifier, 0, 9) = "PXEClient" {
-    # Note: all files for PXE are relatives to the TFTP server's root
+ default-lease-time 600;
+ max-lease-time 7200;
 
-    # PXE bootloader (first program to be loaded, by TFTP)
-    filename "pxelinux.0";
+ 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";
 }
 
 }code
@@ -249,11 +240,11 @@ subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
 
 This serves the kernel and initial ramdisk to the system at run time.
 
-You should install the tftpd-hpa package. It can serve all files contained inside a root directory, usually /srv/tftp. To let it serve files inside /srv/debian-live/tftpboot, run as root the following command:
+You should install the tftpd-hpa package. It can serve all files contained inside a root directory, usually #{/srv/tftp}#. To let it serve files inside #{/srv/debian-live/tftpboot}#, run as root the following command:
 
 code{
 
-dpkg-reconfigure -plow tftpd-hpa
+ # dpkg-reconfigure -plow tftpd-hpa
 
 }code
 
@@ -263,13 +254,13 @@ and fill in the new tftp server directory when being asked about it.
 
 Once the guest computer has downloaded and booted a Linux kernel and loaded its initrd, it will try to mount the Live filesystem image through a NFS server.
 
-You need to install the nfs-kernel-server package.
+You need to install the #{nfs-kernel-server}# package.
 
-Then, make the filesystem image available through NFS by adding a line like the following to /etc/exports:
+Then, make the filesystem image available through NFS by adding a line like 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
 
@@ -277,11 +268,11 @@ and tell the NFS server about this new export with the following command:
 
 code{
 
-# exportfs -rv
+ # exportfs -rv
 
 }code
 
-Setting up these three services can be a little tricky. You might need some patience to get all of them working together. The Debian Installer Manual's TFTP Net Booting section at http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html might help as that process is very similar.
+Setting up these three services can be a little tricky. You might need some patience to get all of them working together. For more information, see the syslinux wiki at http://syslinux.zytor.com/wiki/index.php/PXELINUX or the Debian Installer Manual's TFTP Net Booting section at http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html. They might help, as their processes are very similar.
 
 3~ Netboot testing HowTo
 
@@ -291,63 +282,63 @@ To make our life easier, we can use virtualization. There are two solutions.
 
 3~ Qemu
 
-_* Install qemu, bridge-utils, sudo.
+_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#.
 
-Edit /etc/qemu-ifup:
+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
 
-Get, or build a grub-floppy-netboot (in the svn).
+Get, or build a #{grub-floppy-netboot}# (in the svn).
 
-Launch qemu with "-net nic,vlan=0 -net tap,vlan=0,ifname=tun0"
+Launch #{qemu}# with "#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#"
 
 3~ VMWare Player
 
 _* Install VMWare Player ("free as in beer" edition)
 
-_* Create a PXETester directory, and create a text file called pxe.vwx inside
+_* Create a PXETester directory, and create a text file called #{pxe.vwx}# inside
 
 _* 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
 
-_* You can play with this configuration file (i.e. change memory limit to 256)
+_* You can play with this configuration file (e.g. change memory limit to 256)
 
 _* Double click on this file (or run VMWare player and select this file).
 
diff --git a/manual/en/user_customization-contents.ssi b/manual/en/user_customization-contents.ssi
index ccd4e9e..4c43cca 100644
--- a/manual/en/user_customization-contents.ssi
+++ b/manual/en/user_customization-contents.ssi
@@ -2,38 +2,30 @@
 
 1~customizing-contents Customizing contents
 
-This chapter discusses further customization of the live system.
+This chapter discusses fine-tuning customization of the live system contents beyond merely choosing which packages to include. Includes allow you to add or replace arbitrary files in your Debian Live image, hooks allow you to execute arbitrary commands at different stages of the build and at boot time, and preseeding allows you to configure packages when they are installed by supplying answers to debconf questions.
 
 2~ Includes
 
-Using includes, it is possible to add (or replace) arbitrary files in your Debian Live image. live-build provides three mechanisms for using them:
+While ideally a Debian live system would include files entirely provided by unmodified Debian packages, it is sometimes convenient to provide or modify some content by means of files. Using includes, it is possible to add (or replace) arbitrary files in your Debian Live image. live-build provides three mechanisms for using them:
 
-_* Chroot local includes: These allow you to add or replace files to the chroot/Live filesystem. Please see chroot-local-includes for more information.
+_* Chroot local includes: These allow you to add or replace files to the chroot/Live filesystem. Please see {Live/chroot local includes}#live-chroot-local-includes for more information.
 
-% FIXME: <xref linkend="chroot-local-includes"/>
+_* Binary local includes: These allow you to add or replace files in the binary image. Please see {Binary local includes}#binary-local-includes for more information.
 
-_* Binary local includes: These allow you to add or replace files in the binary image. Please see binary-local-includes for more information.
+_* Binary includes: These allow you to add or replace Debian specific files in the binary image, such as the templates and tools directories. Please see {Binary includes}#binary-includes for more information.
 
-% FIXME: <xref linkend="binary-local-includes"/>
+Please see {Terms}#terms for more information about the distinction between the "Live" and "binary" images.
 
-_* Binary includes: These allow you to add or replace Debian specific files in the binary image, such as the templates and tools directories. Please see binary-includes for more information.
+3~live-chroot-local-includes Live/chroot local includes
 
-% FIXME: <xref linkend="binary-includes"/>
-
-Please see terms for more information about the distinction between the "Live" and "binary" images.
-
-% FIXME: <xref linkend="terms"/>
-
-3~ Live/chroot local includes
-
-Chroot local includes can be used to add or replace files in the chroot/Live filesystem so that they are visible when the Live system is booted. Typical uses for them are to populate the skeleton user directory (#{/etc/skel}#) used by the live system to create the live user's home directory, or adding configuration files where additional processing is not required.
+Chroot local includes can be used to add or replace files in the chroot/Live filesystem so that they may be used in the Live system. A typical use is to populate the skeleton user directory (#{/etc/skel}#) used by the Live system to create the live user's home directory. Another is to supply configuration files that can be simply added or replaced in the image without processing; see {Live/chroot local hooks}#live-chroot-local-hooks if processing is needed.
 
 To include files, simply add them to your #{config/chroot_local-includes}# directory. This directory corresponds to the root directory (#{/}#) of the live system. For example, to add a file #{/var/www/index.html}# in the live system, use:
 
 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
 
@@ -41,41 +33,55 @@ 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
 
 Chroot local includes are installed after package installation so that files installed by packages are overwritten.
 
-3~ Binary local includes
+3~binary-local-includes Binary local includes
 
-The same way as chroot local includes work, there exists the corresponding mechanism to include files in the live media itself.
+To include material such as documentation or videos on the media filesystem so that it is accessible immediately upon insertion of the media without booting the Live system, you can use binary local includes. This works in a similar fashion to chroot local includes. For example, suppose the files #{~/video_demo.*}# are demo videos of the live system described by and linked to by an HTML index page. Simply copy the material to #{config/binary_local-includes/} as follows:
 
-3~ Binary includes
+code{
+
+ $ cp ~/video_demo.* config/binary_local-includes/
+
+}code
+
+These files will now appear in the root directory of the live media.
+
+3~binary-includes Binary includes
 
 live-build has some standard files (like documentation) that gets included in the default configuration on every live media. This can be disabled with:
 
 code{
 
-$ lb config --includes none
+ $ lb config --includes none
 
 }code
 
+Otherwise, the material will be installed by live-build in #{/includes/}# by default on the media filesystem, or else you can specify an alternate path with #{--includes}#.
+
 2~ Hooks
 
 Hooks allow commands to be performed in the chroot and binary stages of the build in order to customize the image.
 
-3~ Live/chroot local hooks
+3~live-chroot-local-hooks Live/chroot local hooks
 
 To run commands in the chroot stage, create a hook script containing the commands in the #{config/chroot_local-hooks}# directory. The hook will run in the chroot after the rest of your chroot configuration has been applied, so remember to ensure your configuration includes all packages and files your hook needs in order to run. See the example chroot hook scripts for various common chroot customization tasks provided in #{/usr/share/live/build/examples/hooks}# which you can copy or symlink to use them in your own configuration.
 
+3~ Boot-time hooks
+
+To execute commands at boot time, you can supply live-config hooks as explained in the "Customization" section of its man page. Examine live-config's own hooks provided in #{/lib/live/config/}#, noting the sequence numbers. Then provide your own hook prefixed with an appropriate sequence number, either as a chroot local include in #{config/chroot_local-includes/lib/live/config/}#, or as a custom package as discussed in {Installing modified or third-party packages}#installing-modified-or-third-party-packages.
+
 3~ Binary local hooks
 
 To run commands in the binary stage, create a hook script containing the commands in the #{config/binary_local-hooks}#. The hook will run after all other binary commands are run, but before binary_checksums, the very last binary commands The commands in your hook do not run in the chroot, so take care to not modify any files outside of the build tree, or you may damage your build system! See the example binary hook scripts for various common binary customization tasks provided in #{/usr/share/live/build/examples/hooks}# which you can copy or symlink to use them in your own configuration.
diff --git a/manual/en/user_customization-installer.ssi b/manual/en/user_customization-installer.ssi
index 877ced9..e6f614e 100644
--- a/manual/en/user_customization-installer.ssi
+++ b/manual/en/user_customization-installer.ssi
@@ -2,24 +2,51 @@
 
 1~customizing-installer Customizing Debian Installer
 
-Debian Live system images can be integrated with Debian Installer. There are number of different "types" of installation, varying in what and how to install the image.
+Debian Live system images can be integrated with Debian Installer. There are a number of different types of installation, varying in what is included and how the installer operates.
 
 Please note the careful use of capital letters when referring to the "Debian Installer" in this section - when used like this we refer explicitly to the official installer for the Debian system, not anything else. It is often seen abbreviated to "d-i".
 
+2~ Types of Debian Installer
+
 The three main types of installer are:
 
-_* *{"Regular" Debian Installer}*: This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise indepentend installer are often referet to as "combined images".
+*{"Regular" Debian Installer}*: This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as "combined images".
 
-On such images, Debian is installed by fetching and installing .deb packages using #{debootstrap}# or #{cdebootstrap}#, from the local media or some network-base network, resulting in a standard Debian system being installed to the hard disk.
+On such images, Debian is installed by fetching and installing .deb packages using #{debootstrap}# or #{cdebootstrap}#, from the local media or some network-based network, resulting in a standard Debian system being installed to the hard disk.
 
-This whole process can be preseeded and customized in a number of ways; see the relevant pages in the Debian Installer manual for more information. Once you have a working preseeding file, live-build can automatically place it to the image and enable it for you.
+This whole process can be preseeded and customized in a number of ways; see the relevant pages in the Debian Installer manual for more information. Once you have a working preseeding file, live-build can automatically put it in the image and enable it for you.
 
-_* *{"Live" Debian Installer}*: This is a Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into an instance of the Debian Installer.
+*{"Live" Debian Installer}*: This is a Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into an instance of the Debian Installer.
 
-Installation will proceed in an identical fashion to the "Regular" installation described above, but at the actual package installation stage, instead of using #{debootstrap}# to fetch and install packages, the "live" filesystem image is copied to the target. This is acchieved with a special udeb called live-installer. live-installer can be preseeded to be disabled, allowing to support normal and live installer entries in the bootloader of the same live media.
+Installation will proceed in an identical fashion to the "Regular" installation described above, but at the actual package installation stage, instead of using #{debootstrap}# to fetch and install packages, the live filesystem image is copied to the target. This is achieved with a special udeb called live-installer.
 
 After this stage, the Debian Installer continues as normal, installing and configuring items such as bootloaders and local users, etc.
 
-_* *{"Desktop" Debian Installer}*: Regardless of the mode Debian Installer is used in, d-i can be launched from the Desktop by clicking on an icon. This is user friendlier in some situations. In order to make use of this, the debian-installer-launcher package needs to be included.
+Note: to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}.
+
+*{"Desktop" Debian Installer}*: Regardless of the type of Debian Installer included, #{d-i}# can be launched from the Desktop by clicking on an icon. This is user friendlier in some situations. In order to make use of this, the debian-installer-launcher package needs to be included.
+
+Note that by default, live-build does not include Debian Installer images in the images, it needs to be specifically enabled with #{lb config}#. Also, please note that for the "Desktop" installer to work, the kernel of the live system must match the kernel #{d-i}# uses for the specified architecture. For example:
+
+code{
+
+ $ lb config --architecture i386 --linux-flavours 486 \
+     --debian-installer live --packages debian-installer-launcher
+
+}code
+
+2~ Customizing Debian Installer by preseeding
+
+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 answers to questions asked during the installation process, without having to manually enter the answers while the installation is running. This makes it possible to fully automate most types of installation and even offers some features not available during normal installations." This kind of customization is best accomplished with live-build by placing the configuration in a #{preseed.cfg}# file included in #{config/binary_debian-installer/}#. For example, to preseed setting the locale to #{en_US}#:
+
+code{
+
+ $ echo "d-i debian-installer/locale string en_US" \
+     >> config/binary_debian-installer/preseed.cfg
+
+}code
+
+2~ Customizing Debian Installer content
+
+For experimental or debugging purposes, you might want to include locally built #{d-i}# component udeb packages. Place these in #{config/binary_local-udebs/}# to include them in the image. Additional or replacement files and directories may be included in the installer initrd as well, in a similar fashion to {Live/chroot local includes}#live-chroot-local-includes, by placing the material in #{config/binary_debian-installer-includes/}#.
 
-Note that by default live-build does not include Debian Installer images in the images, it needs to be specifically enabled with lb config.
diff --git a/manual/en/user_customization-internationalization.ssi b/manual/en/user_customization-internationalization.ssi
deleted file mode 100644
index 7afca4b..0000000
--- a/manual/en/user_customization-internationalization.ssi
+++ /dev/null
@@ -1,43 +0,0 @@
-:B~ Customizing locale and language
-
-1~customizing-locale-and-language Customizing locale and language
-
-2~ Default locale and keyboard
-
-The default locale when building a Live system is "locales=en_US.UTF-8", to set the locale for e.g. Switzerland, you can use "locales=de_CH.UTF-8".
-
-code{
-
-$ lb config --bootappend-live "locales=de_CH.UTF-8"
-
-}code
-
-The entry for a Swiss-German keyboard would be:
-
-code{
-
-$ lb config --bootappend-live "keyboard-layouts=ch"
-
-}code
-
-Combined, the keyboard and locale configured for Switzerland would be:
-
-code{
-
-$ lb config --bootappend-live ="locales=de_CH.UTF-8 keyboard-layouts=ch"
-
-}code
-
-Note: You can find a list of options in the manpage for live-config. Currently, only UTF-8 locales are supported.
-
-2~ l10n Packages
-
-An experimental feature of live-build is to automatically check for each package for which it is know that there are -l10n packages available and install them. To add German packages the entry would be
-
-code{
-
-$ lb config --language "de"
-
-}code
-
-This will also change the default syslinux language if translations are available or local translations have been put into #{config/templates/syslinux/de}#.
diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index 0df68e2..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,19 +153,19 @@ 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
 
-You may test for any one of a number of values, e.g. to install #{memtest86+ }# if either #{--architecture i386}# or #{--architecture amd64}# is specified:
+You may test for any one of a number of values, e.g. to install #{memtest86+}# if either #{--architecture i386}# or #{--architecture amd64}# is specified:
 
 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
 
@@ -205,7 +205,7 @@ The primary tasks available in the Debian Installer can be listed with #{tasksel
 
 3~desktop-and-language-tasks Desktop and language tasks
 
-Desktop and language tasks are special cases. In the Debian Installer, if the medium was prepared for a particular desktop environment flavour, the corresponding task will be automatically installed. Thus, there are there are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}# tasks, none of which are offered in #{tasksel}#'s menu. Likewise, there are no menu entries for tasks for languages, but the user's language choice during the install influences the selection of corresponding language tasks.
+Desktop and language tasks are special cases. In the Debian Installer, if the medium was prepared for a particular desktop environment flavour, the corresponding task will be automatically installed. Thus, there are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}# tasks, none of which are offered in #{tasksel}#'s menu. Likewise, there are no menu entries for tasks for languages, but the user's language choice during the install influences the selection of corresponding language tasks.
 
 In live-build, therefore, these special cases are also given special consideration, but with three notable differences at the time of writing.
 
@@ -213,15 +213,25 @@ 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
 
-Second, live-build supports #{*-desktop}# virtual package lists for each of the desktop flavours mentioned above, which select the #{standard-x11}# predefined package list, the corresponding #{*-desktop}# task and three additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example, if you specify #{--packages gnome-desktop}#, it is equivalent to specifying #{--packages standard-x11 --tasks "gnome-desktop desktop standard laptop"}#.
+Second, live-build supports #{*-desktop}# virtual package lists for each of the desktop flavours mentioned above, which select the #{standard-x11}# predefined package list, the corresponding #{*-desktop}# task and three additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example, if you specify #{--packages-lists gnome-desktop}#, it is equivalent to specifying #{--packages debian-installer-launcher --packages-lists standard-x11 --tasks "gnome-desktop desktop standard laptop"}#.
 
-Third, if any of the tasks for these desktop flavours are selected, either explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build will preseed the corresponding desktop value for Debian Installer (if it is included) to ensure it follows its own rules for installing different desktop flavours.
+Third, if any of the tasks for these desktop flavours are selected, either explicitly through #{--tasks}# or implicitly by #{--packages-lists}#, live-build will preseed the corresponding desktop value for Debian Installer (if it is included) to ensure it follows its own rules for installing different desktop flavours.
 
-2~ Installing modified or third-party packages
+*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are installed
 . For example:
+
+code{
+
+ $ lb config --language es
+
+}code
+
+Even so, it is limited in that it only supports a single language and a single bootloader. Therefore, for all of these reasons, the future of this option is under review, possibly to be replaced with something entirely different in the next major release of live-build.
+
+2~installing-modified-or-third-party-packages Installing modified or third-party packages
 
 Whilst it is against the philosophy of Debian Live, it may sometimes be necessary to build a Live system with modified versions of packages that are in the Debian repository. This may be to modify or support additional features, languages and branding, or even to remove elements of existing packages that are undesirable. Similarly, "third-party" packages may be used to add bespoke and/or proprietary functionality.
 
@@ -279,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
 
@@ -291,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
 
@@ -301,11 +311,11 @@ 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
 
-The tradeoff here is that recommended packages are defined as "packages that would be found together with this one in all but unusual installations" (Debian Policy Manual, §7.2). This may lead to some packages that you actually need being omitted, so we suggest you review the difference this makes to your packages list (see the #{binary.packages}# file generated by #{lb build}#) and re-include in your list any missing packages that you still want installed.
+The tradeoff here is that if you don't install recommended packages for a given package, that is, "packages that would be found together with this one in all but unusual installations" (Debian Policy Manual, §7.2), some packages that you actually need may be omitted. Therefore, we suggest you review the difference turning off recommends makes to your packages list (see the #{binary.packages}# file generated by #{lb build}#) and re-include in your list any missing packages that you still want installed. Alternatively, if you find you only want a small number of recommended packages left out, leave recommends enabled and set a negative APT pin priority on selected packages to prevent them from being installed, as explained in {APT pinning}#apt-pinning.
 
 3~ Passing options to apt or aptitude
 
@@ -319,16 +329,26 @@ 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
+
+}code
+
+Negative pin priorities will prevent a package from being installed, as in the case where you do not want a package that is recommended by another package. Suppose you are building a GNOME image but don't want the user prompted to store wifi passwords in the keyring, so you want to omit the recommended #{gnome-keyring}# package. This can be done by adding the following stanza to #{config/chroot_apt/preferences}#:
+
+code{
 
-Package: *
-Pin: release n=sid
-Pin-Priority: 1
-END
+ Package: gnome-keyring
+ Pin: version *
+ Pin-Priority: -1
 
 }code
 
diff --git a/manual/en/user_customization-runtime.new.ssi b/manual/en/user_customization-runtime.new.ssi
deleted file mode 100644
index 2dd013e..0000000
--- a/manual/en/user_customization-runtime.new.ssi
+++ /dev/null
@@ -1,173 +0,0 @@
-:B~ Customizing run time behaviours
-
-1~customizing-run-time-behaviours Customizing run time behaviours
-
-All configuration that is done during run time is done by live-config. Here are some most common options of live-config that users are interested in. A full list of all possibilities can be found in the manpage of live-config.
-
-2~ Customizing the live user
-
-One important consideration is that the live user is created by live-boot at boot time, not by live-build at build time. This not only influences where materials relating to the live user are introduced in your build, as discussed in {Live/chroot local includes}#live-chroot-local-includes, but also any groups and permissions associated with the live user.
-
-You can specify additional groups that the live user will belong to by preseeding the #{passwd/user-default-groups}# debconf value. For example, to add the live user to the #{fuse}# group, add the following to a file in the #{config/chroot_local-preseed}# directory:
-
-code{
-
-debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse
-
-}code
-
-2~customizing-locale-and-language Customizing locale and language
-
-When the live system boots, language is involved in three steps:
-
-_* the locale generation
-
-_* setting the keyboard layout for the console
-
-_* setting the keyboard layout for X
-
-3~ Default locale and keyboard
-
-The default locale when building a Live system is "locales=en_US.UTF-8", to set the locale for e.g. Switzerland, you can use "locales=de_CH.UTF-8".
-
-code{
-
-$ lb config --bootappend-live "locales=de_CH.UTF-8"
-
-}code
-
-The entry for a Swiss-German keyboard would be:
-
-code{
-
-$ lb config --bootappend-live "keyboard-layouts=ch"
-
-}code
-
-Combined, the keyboard and locale configured for Switzerland would be:
-
-code{
-
-$ lb config --bootappend-live ="locales=de_CH.UTF-8 keyboard-layouts=ch"
-
-}code
-
-Note: You can find a list of options in the manpage for live-config. Currently, only UTF-8 locales are supported.
-
-3~ l10n Packages
-
-% FIXME: not a run time configuration! Belongs in packages chapter. (See --tasks discussion.)
-
-An experimental feature of live-build is to automatically check for each package for which it is known that there are #{*-l10n}# packages available and install them. To add German packages the entry would be
-
-code{
-
-$ lb config --language "de"
-
-}code
-
-This will also change the default syslinux language if translations are available or local translations have been put into #{config/templates/syslinux/de}#.
-
-3~ Language
-
-To define the locale that should be generated, use the #{locales}# parameter into the #{--bootappend-live}# option of #{lb config}#, e.g.:
-
-code{
-
-lb config --bootappend-live "locales=de_CH.UTF-8"
-
-}code
-
-This parameter can also be used in kernel command line. You can specify a locale by a full #{language_country.encoding}# word.
-
-Both the console and X keyboard configuration depends on the #{keyb}# parameter of the #{--bootappend-live}# option. Valid options for X keyboard layouts can be found in #{/etc/X11/xkb/base.xml}# (rather limited to two-letters country codes). To find the value (the two characters) corresponding to a language try searching for the english name of the nation where the language is spoken, e.g:
-
-code{
-
-$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name <name>se</name>
-
-}code
-
-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"
-
-}code
-
-A list of the valid values of the keyboards for the console can be figured 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
-
-}code
-
-Alternatively, you can use the #{console-setup}# package, a tool to let you configure console layout using X (XKB) definitions; you can then setup your keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use also these parameters for X configuration. For example, to set up a French system with a French-Dvorak layout (called Bepo) on a 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"
-
-}code
-
-2~ Persistence
-
-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 of the host hardware which runs it.
-
-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 should be considered read-only and all the run-time evolutions of the system are lost at shutdown.
-
-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 understand how it could work it could be handy to know that even if the system is booted and run from read-only media, modification to the files and directories are written on writable media, typically a ram disk (tmpfs) and ram disks' data do not survive reboots.
-
-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 multisession (re)writable CD/DVD. All these media are supported in Debian Live in different ways, and all but the last one require a special boot parameter to be specified at boot time: #{persistent}#.
-
-3~ Full persistence
-
-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 writable partition is used. In order to use this feature a partition with a clean writable supported filesystem on it labeled "live-rw" must be attached on the system at boot time and the system must be started with the boot parameter 'persistent'. This partition could be an ext2 partition on the hard disk or on a usb key created with, e.g.:
-
-code{
-
-# mkfs.ext2 -L live-rw /dev/sdb1
-
-}code
-
-If you already have a partition on your device, you could just change the 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
-
-}code
-
-But since live system users cannot always use a hard drive partition, and considering that most USB keys have poor write speeds, 'full' persistence could be also used with just image files, so you could create a file representing a partition and put this image file even on a NTFS partition of 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
-
-}code
-
-Then copy the #{live-rw}# file to a writable partition and reboot with the boot parameter 'persistent'.
-
-3~ Home automounting
-
-If during the boot a partition (filesystem) image file or a partition labeled #{home-rw}# is discovered, this filesystem will be directly mounted as #{/home}#, thus permitting persistence of files that belong to e.g. the default user. It can be combined with full persistence.
-
-3~ Snapshots
-
-Snapshots are collections of files and directories which are not mounted while running but which are copied from a persistent device to the system (tmpfs) at boot and which are resynced at reboot/shutdown of the system. The content of a snapshot could reside on a partition or an image file (like the above mentioned types) labeled #{live-sn}#, but it defaults to a simple cpio archive named #{live-sn.cpio.gz}#. As above, at boot time, the block devices connected to the system are traversed to see if a partition or a file named like that could be found. A power interruption during run time could lead to data loss, hence a tool invoked #{live-snapshot --refresh}# could be called to sync important changes. This type of persistence, since it does not write continuously to the persistent media, is the most flash-based device friendly and the fastest of all the persistence systems.
-
-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.
-
-Snapshots cannot currently handle file deletion but full persistence and home automounting can.
-
-3~ Persistent SubText
-
-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-work}#, the boot parameter #{persistent-subtext}# used in conjuntion with the boot parameter #{persistent}# will allow for multiple but unique persistent media. An example would be if a user wanted to use a persistent partition labeled #{live-sn-subText}# they would use the boot parameters of: #{persistent}# #{persistent-subtext=subText}#.
-
-3~ Partial remastering
-
-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 case of cd-r or adding a session to multisession cd/dvd(rw); live-boot mounts all /live filesystem in order or with the module boot parameter.
diff --git a/manual/en/user_customization-runtime.ssi b/manual/en/user_customization-runtime.ssi
index c7c1b30..79d6528 100644
--- a/manual/en/user_customization-runtime.ssi
+++ b/manual/en/user_customization-runtime.ssi
@@ -1,20 +1,22 @@
-B~ Customization at Runtime
+:B~ Customizing run time behaviours
 
-All configuration that is done during runtime is done by live-config. Here are some most common options of live-config that users are interested in. A full list of all possibilities can be found in the manpage of live-config.
+1~customizing-run-time-behaviours Customizing run time behaviours
 
-1~ User
+All configuration that is done during run time is done by live-config. Here are some most common options of live-config that users are interested in. A full list of all possibilities can be found in the manpage of live-config.
 
-One important consideration is that the live user is created by live-boot during bootup, it is not created by live-build when building the image.
+2~ Customizing the live user
+
+One important consideration is that the live user is created by live-boot at boot time, not by live-build at build time. This not only influences where materials relating to the live user are introduced in your build, as discussed in {Live/chroot local includes}#live-chroot-local-includes, but also any groups and permissions associated with the live user.
 
 You can specify additional groups that the live user will belong to by preseeding the #{passwd/user-default-groups}# debconf value. For example, to add the live user to the #{fuse}# group, add the following to a file in the #{config/chroot_local-preseed}# directory:
 
 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
 
-1~ Language
+2~customizing-locale-and-language Customizing locale and language
 
 When the live system boots, language is involved in three steps:
 
@@ -24,21 +26,22 @@ _* setting the keyboard layout for the console
 
 _* setting the keyboard layout for X
 
-To define the locale that should be generated, use the #{locale}# parameter into the #{--bootappend-live}# option of #{lb config}#, e.g.:
+The default locale when building a Live system is "locales=en_US.UTF-8". To define the locale that should be generated, use the #{locales}# parameter in 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
 
-This parameter can also be used in kernel command line. You can specify a locale by a full #{language_country.encoding}# word.
+This parameter can also be used at the kernel command line. You can specify a locale by a full #{language_country.encoding}# word.
 
-Both the console and X keyboard configuration depends on the #{keyb}# parameter of the #{--bootappend-live}# option. Valid options for X keyboard layouts can be found in #{/etc/X11/xkb/base.xml}# (rather limited to two-letters country codes). To find the value (the two characters) corresponding to a language try searching for the english name of the nation where the language is spoken, e.g:
+Both the console and X keyboard configuration depend on the #{keyboard-layouts}# parameter of the #{--bootappend-live}# option. Valid options for X keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base.xml}# (rather limited to two-letters country codes). To find the value (the two characters) corresponding to a language try searching for the english name of the nation where the language is spoken, e.g:
 
 code{
 
-$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name <name>se</name>
+ $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
+ <name>se</name>
 
 }code
 
@@ -46,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
 
@@ -54,19 +57,21 @@ 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
 
-Alternatively, you can use the #{console-setup}# package, a tool to let you configure console layout using X (XKB) definitions; you can then setup your keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use also these parameters for X configuration. For example, to set up a French system with a French-Dvorak layout (called Bepo) on a TypeMatrix keyboard, both in console and X11, use:
+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 keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use also these parameters for X configuration. For example, to set up a French system with a French-Dvorak layout (called Bepo) on a 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
 
-2~ Persistence
+2~persistence Persistence
 
 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 of the host hardware which runs it.
 
@@ -82,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
 
@@ -90,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
 
@@ -99,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 11222c7..faf4a65 100644
--- a/manual/en/user_examples.ssi
+++ b/manual/en/user_examples.ssi
@@ -12,15 +12,15 @@ 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
 
 2~tutorial-1 Tutorial 1: A standard image
 
-*{Use case:}* Create a simple first image, learning the basics of live-build
+*{Use case:}* Create a simple first image, learning the basics of live-build.
 
 In this tutorial, we will build a default ISO hybrid Debian Live image containing only base packages (no Xorg) and some Debian Live support packages, as a first exercise in using live-build.
 
@@ -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
 
@@ -46,13 +46,13 @@ Assuming all goes well, after a while, the current directory will contain #{bina
 
 2~tutorial-2 Tutorial 2: A web browser utility
 
-*{Use case}* Create a web browser utility image, learning how to apply customizations
+*{Use case:}* Create a web browser utility image, learning how to apply customizations.
 
 In this tutorial, we will create an image suitable for use as a web browser 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
 
@@ -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
 
@@ -70,7 +70,7 @@ Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1.
 
 2~tutorial-3 Tutorial 3: A personalized image
 
-*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.
+*{Use case:}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.
 
 Since we will be changing our personalized image over a number of revisions, and we want to track those changes, trying things experimentally and possibly reverting them if things don't work out, we will keep our configuration in the popular #{git}# version control system. We will also use the best practice of autoconfiguration via #{auto}# scripts as described in {Managing a configuration}#managing-a-configuration.
 
@@ -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/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
 
@@ -170,44 +170,56 @@ We've come to the end of our tutorial series. While many more kinds of customiza
 
 2~ A VNC Kiosk Client
 
-Create an image with live-build to boot directly to a VNC server.
-
-_* Make a build directory: #{$ mkdir vncBuild}#
+*{Use case:}* Create an image with live-build to boot directly to a VNC server.
 
-_* Move to the build directory: #{$ cd vncBuild}#
+Make a build directory and create a skeletal configuration in it built around the standard-x11 list, including #{gdm3}#, #{metacity}# and #{xtightvncviewer}#, disabling recommends to make a minimal system:
 
-Example to config the build directory to include gdm metacity xtightvncviewer: #{$ lb config --packages "gdm3 metacity xtightvncviewer"}#
+code{
 
-Create a folder /etc/skel folder for a custom .xsession for the default user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#
+ $ mkdir vnc_kiosk_client
+ $ cd vnc_kiosk_client
+ $ lb config -a i386 -k 686 -p standard-x11 \
+     --packages "gdm3 metacity xvnc4viewer" \
+     --apt-recommends false
 
-Create the .xsession for the default user: #{$ touch config/chroot_local-includes/etc/skel/.xsession}#
+}code
 
-Edit the .xsession file to launch metacity and start xvncviewer with something similar to the below:
+Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for the default user that will launch metacity and start xvncviewer, connecting to port #{5901}# on a server at #{192.168.1.2}#:
 
 code{
 
-#!/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/vncviewer xxx.xxx.xxx.xxx:PORT
+ /usr/bin/metacity &
+ /usr/bin/xvncviewer 192.168.1.2:1
 
-exit
+ exit
+ END
 
 }code
 
-_* Build the image: #{# lb build}#
+Build the image:
+
+code{
+
+ # lb build
 
-_* Enjoy.
+}code
+
+Enjoy.
 
 2~ A base image for a 128M USB key
 
-*{Use case}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.
+*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.
 
 When optimizing an image to fit a certain media size, you need to understand the tradeoffs you are making between size and functionality. In this example, we trim only so much as to make room for additional material within a 128M media size, but without doing anything to destroy integrity of the packages contained within, such as the purging of locale data via the #{localepurge}# package, or other such "intrusive" optimizations. Of particular note, you should not use #{--bootstrap-flavour minimal}# unless you really know what you're doing, as omitting priority #{important}# packages will most likely produce a broken live system.
 
 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
 
@@ -215,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
 
@@ -223,3 +235,65 @@ On the author's system at time of writing, the above configuration produced a 78
 
 The biggest space-saver here, compared to building a standard image on an #{i386}# architecture system, is to select only the #{486}# kernel flavour instead of the default #{-k "486 686"}#. Leaving off APT's indices with #{--binary-indices false}# also saves a fair amount of space, the tradeoff being that you need to #{apt-get update}# before using apt in the live system. Choosing the #{minimal}# package list leaves out the large #{locales}# package and associated utilities. Dropping recommended packages with #{--apt-recommends false}# saves some additional space, at the expense of omitting some packages you might otherwise expect to be there, such as #{firmware-linux-free}# which may be needed to support certain hardware. The remaining options shave off additional small amounts of space. It's up to you to decide if the functionality that is sacrificed with each optimization is worth the loss in functionality.
 
+2~ A localized KDE desktop and installer
+
+*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.
+
+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 that would be installed by the standard Debian installer for KDE.
+
+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 find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can be used to dig it out of the task descriptions in tasksel-data, so to prepare, make sure you have both of those things:
+
+code{
+
+ # apt-get install dctrl-tools tasksel-data
+
+}code
+
+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.
+
+}code
+
+By this command, we discover the task is called, plainly enough, 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.
+
+ Task: brazilian-portuguese-kde-desktop
+ Description: Brazilian Portuguese KDE desktop
+  This task localises the KDE desktop in Brazilian Portuguese.
+
+}code
+
+We will use the experimental #{--language}# option, as live-build happens to include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}#desktop-and-language-tasks for details). And at boot time we will generate the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's put the pieces together:
+
+code{
+
+ $ mkdir live-pt_BR-kde
+ $ cd live-pt_BR-kde
+ $ lb config \
+     -a i386 \
+     -k 486 \
+     -p kde-desktop \
+     --language pt_BR \
+     --tasks "brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop" \
+     --bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
+     --debian-installer live \
+     --packages debian-installer-launcher
+
+}code
+
+Note that we have included the #{debian-installer-launcher}# package to launch the installer from the live desktop, and have also specified the 486 flavour kernel, as it is currently necessary to make the installer and live system kernels match for the launcher to work properly.
+
diff --git a/manual/en/user_installation.ssi b/manual/en/user_installation.ssi
index 487715f..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,11 +62,17 @@ 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 ..
 
-# dpkg -i live-build*.deb
+}code
+
+Now install whichever of the freshly built #{.deb}# files you were interested in, e.g.
+
+code{
+
+ # dpkg -i live-build_2.0.8-1_all.deb
 
 }code
 
@@ -74,7 +80,7 @@ You can also install live-build directly to your system by executing:
 
 code{
 
-# make install
+ # make install
 
 }code
 
@@ -82,7 +88,7 @@ and uninstall it with:
 
 code{
 
-# make uninstall
+ # make uninstall
 
 }code
 
@@ -90,55 +96,56 @@ code{
 
 If you do not wish to build or install live-build from source, you can use snapshots. These are built automatically from the latest version in Git and are available on http://live.debian.net/debian/.
 
-2~ live-boot
+2~ live-boot and live-config
 
-*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.
+*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.
 
-% FIXME: we also need to mention live-config
+3~ From the Debian repository
 
-3~ Using a customized live-boot
+Both live-boot and live-config are available from the Debian repository as per {Installing live-build}#installing-live-build.
 
-% FIXME: should follow the structure for live-build above (i.e. "from source", not "customized" -- we should not get into customization now, but should reserve that discussion for later.
+3~ From source
 
-To modify the code you can follow the process below. Please ensure you are familiar with the terms mentioned in {Terms}#terms.
+To use the latest source from git, you can follow the process below. Please ensure you are familiar with the terms mentioned in {Terms}#terms.
 
-_* Checkout the live-boot source
+_* 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-boot.git
+ $ git clone git://live.debian.net/git/live-config.git
 
 }code
 
-_* Make changes to your local copy
-
-% FIXME: as indicated above, it's too early for this topic. Move to later in the manual.
-
-And beware that if you want to add your pre-init script in live-bottom, you should name it without dashes '-', e.g: call it "99new_feature" and not "99new-feature".
+Consult the live-boot and live-config man pages for details on customizing if that is your reason for building these packages from source.
 
-_* Build a live-boot .deb
+_* Build live-boot and live-config .deb files
 
-You must build either on your target distribution or in a chroot containing your target platform: this means if your target is Squeeze then you should build against Squeeze. Y
+You must build either on your target distribution or in a chroot containing your target platform: this means if your target is Squeeze then you should build against Squeeze.
 
 Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to build #{live-boot}# for a target distribution that differs from your build system. For example, for Squeeze live images, build #{live-boot}# in a Squeeze chroot. If your target distribution happens to match your build system distribution, you may build directly on the build system using #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
 
 code{
 
-$ cd live-boot
-$ dpkg-buildpackage -b -uc -us
+ $ cd live-boot
+ $ dpkg-buildpackage -b -uc -us
+ $ cd ../live-config
+ $ dpkg-buildpackage -b -uc -us
 
 }code
 
-_* Use the generated live-boot .deb
+_* Use all generated .deb files
 
-As live-boot is installed by live-build system, installing the package in the host system is not sufficient: you should treat the generated .deb like another custom package. Please see {Customizing package installation}#customizing-package-installation for more information. You should pay particular attention to {Additional repositories}#additional-repositories.
+As live-boot and live-config are installed by live-build system, installing the packages in the host system is not sufficient: you should treat the generated .deb files like any other custom packages. Please see {Customizing package installation}#customizing-package-installation for more information. You should pay particular attention to {Additional repositories}#additional-repositories.
 
-3~ Using live-boot snapshots
+3~ From 'snapshots'
 
-You can let live-build automatically use the latest snapshot of live-boot by configuring a third-party repository in your live-build configuration directory. Assuming you have already created a configuration tree with #{lb config}#:
+You can let live-build automatically use the latest snapshots of live-boot and live-config by configuring a third-party repository in your live-build configuration directory. Assuming you have already created a configuration tree with #{lb config}#:
 
 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 ea92bdf..016b2e5 100644
--- a/manual/en/user_managing_a_configuration.ssi
+++ b/manual/en/user_managing_a_configuration.ssi
@@ -10,7 +10,7 @@ Live configurations rarely are perfect on the first try. You'll likely need to m
 
 For example, when the distribution is first set, many 'dependent' variables are given default values that suit that distribution. However, if you later decide to change the distribution, those dependent variables continue to retain old values that are no longer appropriate.
 
-A second, related problem is that if you run #{lb config}# and then upgrade to a new version of live-build that has changed one of the variable names, you will discover this only by manual review of the variables in your config files, which you will then need to use to set the appropriate option again.
+A second, related problem is that if you run #{lb config}# and then upgrade to a new version of live-build that has changed one of the variable names, you will discover this only by manual review of the variables in your #{config/*}# files, which you will then need to use to set the appropriate option again.
 
 All of this would be a terrible nuisance if it weren't for auto/* scripts, simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands that are designed to help you manage your configuration. Simply create an auto/config script containing #{lb config}# command with all desired options, and an auto/clean that removes the files containing configuration variable values, and each time you #{lb config}# and #{lb clean}#, these files will be executed. This will ensure that your configuration is kept internally consistent from one revision to the next and from one live-build release to the next (though you will still have to take care and read the documentation when you upgrade live-build and make adjustments as needed).
 
@@ -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 5767950..520553d 100644
--- a/manual/en/user_overview.ssi
+++ b/manual/en/user_overview.ssi
@@ -12,7 +12,7 @@ The idea behind live-build is to be a framework that uses a configuration direct
 
 Many concepts are similar to those in the debhelper Debian package tools written by Joey Hess:
 
-_* The scripts have a central location for configuring their operation. In debhelper, this is the debian subdirectory of a package tree. For example, dh_install will look, amongst others, for a file called #{debian/install}# to determine which files should exist in a particular binary package. In much the same way, live-build stores its configuration entirely under a config subdirectory.
+_* The scripts have a central location for configuring their operation. In debhelper, this is the #{debian/}# subdirectory of a package tree. For example, dh_install will look, amongst others, for a file called #{debian/install}# to determine which files should exist in a particular binary package. In much the same way, live-build stores its configuration entirely under a #{config/}# subdirectory.
 
 _* The scripts are independent - that is to say, it is always safe to run each command.
 
@@ -28,47 +28,47 @@ _* *{lb clean}*: Responsible for removing parts of a Live system build. See {The
 
 3~lb-config The #{lb config}# command
 
-As discussed in {live-build}#live-build, the scripts that make up live-build source their configuration from a single directory named config/. As constructing this directory by hand would be time-consuming and error-prone, the #{lb config}# command can be used to create skeleton configuration folders.
+As discussed in {live-build}#live-build, the scripts that make up live-build source their configuration from a single directory named #{config/}#. As constructing this directory by hand would be time-consuming and error-prone, the #{lb config}# command can be used to create skeleton configuration folders.
 
-Issuing #{lb config}# without any arguments creates a config subdirectory which it populates with some default settings:
+Issuing #{lb config}# without any arguments creates a #{config/}# 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
 
@@ -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 7b8abf6..713bf53 100644
--- a/manual/fr/about_manual.ssi
+++ b/manual/fr/about_manual.ssi
@@ -24,9 +24,9 @@ the details. Therefore, we have provided three tutorials in the
 {Examples}#examples section designed to teach you image building and
 customization basics. Read {Using the examples}#using-the-examples first,
 followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web
-browser utility}#tutorial-2 and finally {Tutorial 3: A personal travelling
-companion}#tutorial-3. By the end of these tutorials, you will have a taste
-of what can be done with Debian Live. We encourage you to return to more
+browser utility}#tutorial-2 and finally {Tutorial 3: A personalized
+image}#tutorial-3. By the end of these tutorials, you will have a taste of
+what can be done with Debian Live. We encourage you to return to more
 in-depth study of the manual, perhaps next reading {The basics}#the-basics,
 skimming or skipping {Building a netboot image}#building-netboot-image, and
 finishing by reading the {Customization overview}#customization-overview and
@@ -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 libnokogiri-ruby
 
 }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,18 +227,18 @@ mettre à jour les fichiers de traduction:
 
 code{
 
-$ make commit
+ $ make commit
 
 }code
 
 _* Après nettoyage, soumettre les modifications. Veuillez écrire les
 commentaires de commit à l'aide de phrases complètes, en commençant par une
 majuscule et en terminant par un point, et en commençant par
-'Fixing/Adding/Removing/Correcting/':
+'Fixing/Adding/Removing/Correcting/Translating':
 
 code{
 
-$ git commit -a
+ $ git commit -a -m "Adding a section on applying patches."
 
 }code
 
@@ -246,18 +246,23 @@ _* Envoyez votre commit au serveur:
 
 code{
 
-$ git push
+ $ git push
 
 }code
 
 3~ Translation
 
-Submiting a translation for a new language is recommendet in two steps:
+To submit a translation for a new language, follow these three steps:
 
-_* Translate the about_manual.ssi.pot about_project.ssi.pot
+_* Translate the about_manual.ssi.pot, about_project.ssi.pot and
 index.html.in.pot files to your language with your favourite editor (such as
-poedit). Send translated files to the mailinglist. It will then be included
-and autobuild for that language enabled.
+poedit). Send translated files to the mailing list. Once we have reviewed
+your submission, we will add the new language to the manual (providing the
+po files) and will enable it in the autobuild.
+
+_* Once the new language is added, you can randomly start translating all po
+files in #{manual/po/}#.
+
+_* Don't forget you need #{make commit}# to ensure the translated manuals
+are updated from the po files, before #{git commit -a}# and #{git push}#.
 
-_* Now that the new language was added, you can randomly start translating
-all other pot files.
diff --git a/manual/fr/index.html.in b/manual/fr/index.html.in
index bdefa90..bb91dda 100644
--- a/manual/fr/index.html.in
+++ b/manual/fr/index.html.in
@@ -42,7 +42,7 @@ href="pdf/live-manual.landscape-letter.pdf">US paysage</a></li>
 
 	<p>
 		Les sources de ce manuel sont disponibles dans un répertoire <a
-href="http://git.or.cz/">git</a> sur live.debian.net.
+href="http://git.or.cz/">Git</a> sur live.debian.net.
 	</p>
 
 	<ul>
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index 3b1bd69..6fa445d 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -9,7 +9,7 @@
  :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
 
 @date:
- :published: 2010-12-06
+ :published: 2010-12-24
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
@@ -27,7 +27,7 @@
 
 << about_project.ssi
 
-:B~ User ~#
+:B~ User
 
 << user_installation.ssi
 
@@ -43,17 +43,13 @@
 
 << user_customization-contents.ssi
 
-<< user_customization-internationalization.ssi
-
 << user_customization-runtime.ssi
 
 << user_customization-binary.ssi
 
 << user_customization-installer.ssi
 
-:B~ Development ~#
-
-:B~ Project ~#
+:B~ Project
 
 << project_bugs.ssi
 
@@ -61,18 +57,7 @@
 
 << project_procedures.ssi
 
-:B~ Examples ~#
+:B~ Examples
 
 << user_examples.ssi
 
-:B~ Other ~#
-
-Other material that formerly appeared in this section is out of date and/or
-has not been approved for release. It has therefore been omitted, but can
-still be found in the document source; see 'About this manual'. Any part of
-the omitted material that is still useful will be included in the release
-only after it has been reviewed.
-
-% << other_faq.ssi
-
-% << other_howtos.ssi
diff --git a/manual/fr/other_faq.ssi b/manual/fr/other_faq.ssi
deleted file mode 100644
index f754913..0000000
--- a/manual/fr/other_faq.ssi
+++ /dev/null
@@ -1,545 +0,0 @@
-B~ Frequently asked questions (FAQ)
-
-1~ Frequently asked questions (FAQ)
-
-Q: I downloaded a prebuilt live image. How do I put it on a USB stick? A:
-See "Copying USB/HDD image to a USB stick" % FIXME: <xref
-linkend="image_copying"/>
-
-Q: How do I log my build? A: You could use script, screen or tee: #{$
-lh_build 2>&1 | tee build.log}#
-
-Q: How can I convert an already installed standard Debian partition into a
-Debian Live system? A: Save the list of installed packages and load it into
-your new Debian Live System. Copy your /etc to config/chroot_local-includes
-
-Q: What does 'losetup: could not find any free loop device' mean and how do
-I fix it? A: Loop devices are used during the build; there probably aren't
-any free if you've aborted several builds. Something like: for l in
-/dev/loop0 /dev/loop1 /dev/loop2 /dev/loop3 /dev/loop4 /dev/loop5 /dev/loop6
-/dev/loop7 ; do losetup -d $l ; done should rectify the situation (assuming
-all loop devices in use were created by lh_build; if in doubt, check the
-contents of each loop device before deleting them with losetup -d).
-
-Q: How do I launch an interactive shell during the chroot stage? A: To
-enable interactive shell: #{$ lh_config --interactive shell}# To continue
-the build process: #{# logout}# or #{# exit}# To disable interactive shell,
-set LH_INTERACTIVE to "disabled" in config/chroot.
-
-Q: What is the root /user password? A: The user password for the live user
-is 'live'. By default, there is not any root password. You can switch to
-root with ${sudo -i}# or set a password for root with #{sudo passwd}#
-
-Q: How do I change root or any user password? A: Add a chroot local hook
-script to change root or any user password each time you build an image.
-e.g. config/chroot_local-hooks/01-update_password.sh to set root password to
-"nopasswd"
-
-code{ #!/bin/sh
-
-echo "I: update password" echo "root:nopasswd" | chpasswd
-
-$ chmod +x config/chroot_local-hooks/01-update_password.sh
-
-}code
-
-Note for live user; you need to copy the
-/usr/share/initramfs-tools/scripts/live-bottom/10adduser your build folder:
-
-code{
-
-mkdir -p
-config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/
-cp /usr/share/initramfs-tools/scripts/live-bottom/10adduser
-config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/
-
-}code
-
-Note: Then edit the
-config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/10adduser
-and paste in the new user_crypted password that you make with: #{echo
-"newlivepass" | mkpasswd -s}#
-
-Or add an hook file in config/chroot_local-hooks/ with something like the
-below:
-
-code{ #!/bin/sh
-
-# Change the autogenerated user password to "debianlive"
-plain_password="debianlive" password=$(echo "${plain_password}" | mkpasswd
--s)
-
-sed -i -e 's/\(user_crypted=\)\(.*\)\( #.*\)/\1\"'${password}'\"\3/'
-/usr/share/initramfs-tools/scripts/live-bottom/10adduser
-
-update-initramfs -tu -kall }code
-
-The latter (hook model) could be more future proof than the former solution
-since it modifies just one string selectively but it requires the package
-"whois" to be installed on the target system (for mkpasswd) or that you
-generate the $password string not at build time and include it crypted in
-the above script.
-
-Q: How to disable autologin? A1: use the commandline parameter #{lh config
---bootappend-live "noautologin"}# A2: You need to set boot=noautologin
-noxautologin as described in man live-initramfs If you boot via TFTP you
-want to insert the option to pxelinux.cfg/default
-
-Q: How do I change default hostname or username? A: To change default
-hostname or username: #{$ lh_config --hostname myhostname $ lh_config
---username myusername}#
-
-Q: How do I make the final image smaller? A: Clean orphaned apps/libs:
-Install package "deborphan" and then run 'sudo deborphan -n' . Delete
-unwanted packages. Remove the apt cache. Purge unwanted locales (see
-"localepurge" package).
-
-Q: How do I customize bash-config permanently (aliases, bash-completion
-etc.)? A: Add your own .bashrc config/chroot_local-includes/etc/skel/.bashrc
-
-Q: How do I disable services permanently? (Be careful!)  A: Add a chroot
-local hook script to disable a service each time you build an image:
-e.g. config/chroot_local-hooks/01-disable_service.sh
-
-code{
-
-#!/bin/sh
-
-echo "I: disable service" update-rc.d -f service_name remove
-
-$ chmod +x config/chroot_local-hooks/01-disable_service.sh
-
-}code
-
-Q: How do I enable | disable the md5checksum at the ISO building? A:
-#{lh_config --checksums enabled|disabled}# Or change the LH_CHECKSUMS value.
-
-Q: How to disable the generation of the .tar.gz file? A: #{lh_config
---net-tarball none|gzip}# Or change the LH_NET_TARBALL value. (only
-available in snapsshot version at the moment 2008/Feb/28)
-
-Q: How do I "build a new image"? A: Run commands:
-
-code{
-
-$ sudo lh_clean --binary $ sudo lh_build
-
-}code
-
-Hint: If the configuration had changed you should leave "--binary" out. This
-will clean your chroot directory too.
-
-Q: How do I use Fluxbox ? A: Add a new lists file with the fluxbox packages
-you want.
-
-Create /home/$USERNAME/.dmrc file (default username is "user").
-
-code{
-
-$ cat .dmrc [Desktop] Session=fluxbox }code
-
-Note: .dmrc is owned by $USERNAME:$USERNAME.
-
-See also http://wiki.debian.org/Fluxbox/ A short HOWTO can be found at
-http://wiki.debian.org/MichaelAblassmeier/CustomLiveCD
-
-Q: How do I use custom repositories? A: See
-http://wiki.debian.org/DebianLive/Configuration
-
-Q: How do I customize the artwork for the live CD (grub or syslinux boot
-splash, usplash, etc.)? A: See
-http://wiki.debian.org/DebianLive/Howto/Custom_Artwork
-
-Q: How do I customize desktop environment (KDE, GNOME, XFCE, etc...) look?
-A: Start the live system in qemu:
-
-code{
-
-$ qemu -m 256 -cdrom binary.iso -boot d -redir tcp:4222:10.0.2.15:22
-
-}code
-
-Note: the -redir argument must be changed to meet your needs
-
-Q: How do I execute a custom shell script inside the chroot system after the
-chroot stage? A: Add your script in config/chroot_local-hooks.
-
-Q: How do I add a script running immediately after all other scripts when
-the live system boots? A: Add your script in
-config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/99scrip
-
-code{
-
-$ chmod +x
-config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/99script
-
-}code
-
-Note: The hook script must be executable. Do not forget to lh_clean --chroot
-after making this change before you build again.
-
-You must also use the example script
-/usr/share/live-helper/examples/hooks/update-initramfs.sh to ensure your
-script gets built into the initramfs (read the comment header for
-instructions).
-
-Q: How do I add software not in Debian ? A: See Customizing package
-installation % FIXME: <xref linkend="packages"/>
-
-Q: What is the manifest with Ubuntu used for? A: Manifest is just the
-package list, which ubuntu does $something with. Don't worry about it.
-
-Q: What is this {p} syntax with mtools{p} and parted{p}? A: That's aptitude.
-
-Q: Do I need to write the image on USB stick to test it? A: you must use
-qemu >= 0.8.
-
-Q: What is /cow? A: Copy-on-write, the 'diff' from unionfs.
-
-Q: Is /usr/share/live-helper/lists/standard-x11 like preseed or is preseed
-something else entirely? A: It is not. It is a package list, not a debconf
-preseeding.
-
-Q: What is the difference between standard and minimal? A: standard:
-packages of priority standard and higher; minimal: packages of priority
-essential and higher;
-
-Q: What can the sections be used for? Aren't they BIG? A: Someone maybe
-wants to include packages from contrib or non-free.
-
-Q: memtest86+ ... is that used? A: Yes
-
-Q: How do I build using predefined packages lists? A: e.g. to build using
-standard-x11 packages list: #{$ sudo lh_config -p standard-x11 && sudo
-lh_build}# Note: The packages lists can be found in
-/usr/share/live-helper/lists/ directory.
-
-Q: How do I rebuild without downloading all the packages again? A: All
-packages are cached in cache subdirectory. They remain until a clean purge:
-#{$ sudo lh_clean --purge}# You do not have to do anything to prevent
-packages from being re-downloaded. You need to remember to clean whichever
-stages you want to rebuild first. e.g. to rebuild from the cached bootstrap,
-chroot packages and build a new image. #{$ sudo lh_clean && sudo lh_build}#
-
-Q: How do I boot USB debian-live on systems not supporting USB boot? A: Make
-a boot CD with grub, configured to boot from a debian-live kernel copied on
-the cd structure #{$ mkdir -p iso/boot/grub && cp
-/usr/lib/grub/i386-pc/stage2_eltorito iso/boot/grub && cp chroot/boot/*
-iso/boot/}# Create iso/boot/grub/menu.lst:
-
-code{
-
-default 0 timeout 5 color cyan/blue white/blue title Debian Live root (cd)
-kernel /boot/vmlinuz boot=live initrd /boot/initrd.img
-
-}code
-
-Create the iso image #{$ mkisofs -R -b boot/grub/stage2_eltorito
--no-emul-boot \ -boot-load-size 4 -boot-info-table -o grub.iso iso}# Burn
-the image.
-
-Q: How do I boot debian-live on systems not supporting CDROM or USB boot? A:
-If you have a floppy drive, you may be able to use it, otherwise you will
-need to use loadlin/grub4dos/win32-loader. If you have a second system to
-serve up the image over the network, See
-http://wiki.debian.org/DebianLive/Howto/Creating_a_Netboot_Image
-
-Q: The X configuration does not seems to work, the resolution is too
-low. What can I do? A: Use xdebconfigurator #{$ lh_config --bootappend
-xdebconf && lh_config --packages xdebconfigurator}#
-
-Q: Apache has problems with static files A: Sendfile does not work well on
-the unionfs used by Debian Live. Add the following to apache's
-configuration: #{EnableSendfile off}#
-
-Q: How do I make hard disk partitions auto-mountable? A: Short answer: Right
-now the best is to use a script that will populate the fstab when the CD is
-booting. Such a script can be found at
-https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-includes/sbin/diskmounter.sh.
-A proper solution based on HAL will be described here in a hopefully near
-future.  A: Long Answer: Since 55_nonpolkit-mount-policy.patch in HAL,
-debian-storage-policy-fixed-drives.fdi is not available anymore and the
-previous trick that consisted to remove this file to enable automounting of
-fixed drives as a consequence is obsolete. Eventually, it will be possible
-to combine HAL and PolicyKit to enable different permissions and actions to
-achieve advanced (auto)mounting for non-root users. Until then, because the
-live scripts are only touching to the fstab to add a swap partition if
-discovered at boot time, the only way to have fixed drives mounted
-automatically is to use a script that will populate the fstab file at the
-end of the multiuser runlevel. To achieve this, you can do, for example, the
-following: download the
-https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-includes/sbin/diskmounter.sh
-script Create the chroot_local-includes/sbin directory, and move the script
-inside Make sure the script is executable (chmod +x diskmounter.sh) create
-the chroot_local-includes/etc/rc.local file and call the diskmounter from
-there (see this
-https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-includes/etc/rc.local
-When called correctly, the script detects ext2, ext3, reiserfs, xfs, FAT32,
-HFS+ and NTFS partitions and mount them read-write, except for NTFS. This
-will change soon and an option will be available to use ntfs-3g to mount
-NTFS as read-write. comments, patches and other things about this script and
-issue: http://code.goto10.org/projects/puredyne/ticket/463
-
-Q: Boot fails with panic: can't open /scripts/live A: Add latest
-live-initramfs deb package into config/chroot_local-packages directory and
-rebuild.
-
-Q: How do I configure the locale and the keyboard? A: See 10n % FIXME: <xref
-linkend="internalization"/>
-
-Q: How do I get past boot prompt without a working keyboard? A: See
-Customizing the bootup process % FIXME: <xref linkend="bootup"/> Note: Boot
-from an USB-HDD on an iMac with GRUB did not work.
-
-Q: Can I serve the root image from a web or ftp server? A: Since
-live-initramfs 1.99, it should be possible to use the fetch= argument on the
-kernel command line. You can build a netboot image as usual, and when you
-are done edit the tftpboot/pxelinux.cfg/default file. Remove the references
-to network boot (netboot, nfsroot, nfsopts), and replace with fetch= <url
-where you placed the root image>. You have to include wget in the chroot. It
-could work for other boot methods as well. However, I am not sure the live
-scripts configure the network when booting from a CD or USB disk. #{$
-lh_config --packages wget}#
-
-Q: Why doesn't quickreboot (or some other boot parameter) work? A: If you
-are building an etch image (which was the default up to 2007/09/14) you have
-a very old version of casper which does not support quickreboot and possibly
-other boot parameters as well. You could configure your sources to use
-live-backports (see /usr/share/live-helper/examples/sources/live-backports)
-and switch to live-initramfs, or better yet, build a lenny image instead,
-which is the new default. #{$ lh_config --distribution lenny $ lh_config
---initramfs live-initramfs}#
-
-Q: How do I fix "Could not find kernel image" issue with syslinux
-bootloader? A: Add a binary local hook script to fix kernel and initrd path
-each time you build an
-image. e.g. config/binary_local-hooks/01-fix_syslinux.sh
-
-code{
-
-#!/bin/sh
-
-SYSLINUXCFG=`find binary -type f -name syslinux.cfg`
-
-sed -i "s|kernel /vmlinuz|kernel vmlinuz|g" ${SYSLINUXCFG} sed -i
-"s|initrd=/initrd|initrd=initrd|g" ${SYSLINUXCFG}
-
-$ chmod +x config/binary_local-hooks/01-fix_syslinux.sh
-
-}code
-
-Q: How do I use a newer kernel with lenny? A: A build with backports.org
-kernels will fail as that repository lacks the necessary module packages
-(linux-modules-extra-2.6, aufs, etc.). Use the kernel backports
-http://unsupported.debian-maintainers.org/backports-kernel/ The quick way to
-success:
-
-code{
-
-$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6
-squashfs-modules-2.6' $ echo 'deb
-http://unsupported.debian-maintainers.org/backports-kernel/ ./' >
-config/chroot_sources/backports-kernel.chroot $ echo 'deb
-http://unsupported.debian-maintainers.org/backports-kernel/ ./' >
-config/chroot_sources/backports-kernel.binary $ wget
-http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc
--O config/chroot_sources/backports-kernel.chroot.gpg $ wget
-http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc
--O config/chroot_sources/backports-kernel.binary.gpg $ lh_build }code
-
-Q: How do I use a custom kernel? Is there a nice way of booting debian-live
-with a custom kernel (not in an apt repo)? A: Copy it into
-config/chroot_local-packages and set LH_LINUX_PACKAGES="none" or use lh
-config --linux-packages " " Don't forget to compile your kernel with an
-union filesystem (unionfs or aufs), squashfs modules, and initrd support. I
-can cause the kernel to be installed but it seems this happens later than
-grub/syslinux is configured so it's not listed and casper/ and the menu
-require munging. You need to follow the debian scheme, e.g. placing the
-files in /boot as vmlinuz-$version and initrd.img-$version etc. I personally
-wouldn't go that way which is too much of a hassle, and just use make-kpkg
-to produce custom kernel deb packages. They should integrate nicely if you
-just put them into config/chroot_local-packages and set
-LH_LINUX_PACKAGES="". Hint: to work around an error, which
-lh_binary_syslinux will throw on custom kernels if there is not an 468/686
-in the kernel-name, you need to set CONFIG_LOCALVERSION="-486" or "-686"
-within the kernel configuration (-&gt; General setup -&gt; Local version set
-to -486 or -686) corresponding to LH_LINUX_FLAVOURS="" or "686". this at
-least up till live-helper version 1.0~a40-1 see
-http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-July/001947.html
-and
-http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-November/002581.html
-
-Q: How do I create a cross arch live CD image? A: In short: You can't. Read
-on: The procedure to create a live CD is based on creating a chroot that
-contains the files that will be finally available on the live CD. The live
-CD building procedure includes chrooting into the chroot dir and so some
-operations. chrooting means that the terminal you chroot on will behave as a
-different system so your real system and the chroot environment is decoupled
-somehow. Once the live CD scripts chroots into the chroot dir they have some
-operations to do inside that environment and your real system won't be able
-to run them unless you are using the same architecture. So you only are able
-to make live CD for the arch you run on. But this doesn't prevent you run
-qemu or some other machine emulator that make this possible.
-
-Q: When is a lh_clean necessary? lh_clean is a script in /usr/bin/ A: That
-depends what you've changed between builds If, for example, you've built an
-iso image and you want a usb image, you only need to run #{lh_clean
---binary}# before you run lh_build again. If you've changed anything in the
-chroot, you'll need to cleanup both chroot and binary with #{lh_clean}#
-before continuing
-
-Q: How can i set boot= parameters? A: Set LH_BOOTAPPEND_LIVE in
-config/binary
-
-Q: How do I include different modules to load when the live system boots? A:
-Configure config/chroot_local-includes/etc/initramfs-tools/
-
-The lh_chroot_hacks helper rebuilds the live/initrd1.img using the default
-initramfs.conf "MODULES = most". You may override that by supplying your own
-initramfs.conf, or else just add your own modules, e.g.
-
-code{
-
-mkdir -p config/chroot_local-includes/etc/initramfs-tools/ echo "atl2" >>
-config/chroot_local-includes/etc/initramfs-tools/modules
-
-}code
-
-Note: Even though initramfs.conf(5) says "most adds all the framebuffer,
-acpi, file system, ide, sata, scsi and usb drivers", it actually includes
-network drivers as well. See auto_add_modules() in
-/usr/share/initramfs-tools/hook-functions for the complete list.
-
-Q: Can I have a splash screen? A: Yes you can. You will not know what is
-going on when the splash screen is active, it may fail to activate on some
-hardware or break X on other (both usplash and splashy use libdirectfb which
-does some evil voodoo and may break you graphics or input until you
-reboot). However, you can install and activate it just as you would on any
-other Debian system. To use splashy: 1. install splashy and read the README,
-the manpages are useless for setting it up. Add some parameters to your
-kernel command line, such as in your pxelinux configuration or in
-LH_BOOTAPPEND_LIVE in config/binary in debian-live configuration: #{vga=792
-splash quiet}# #{vga}# to select video mode, #{splash}# to activate splashy,
-#{quiet}# to suppress most kernel messages that you cannot see anyway but
-would scroll past before splashy manages to paint the graphics on your
-screen. You might want to add splashy to the list of packages installed in
-your image: #{echo splashy > config/chroot_local-packageslists/splashy echo
-splashy-themes >> config/chroot_local-packageslists/splashy}# and select a
-theme:
-
-code{
-
-echo '#!/bin/sh' > config/chroot_local-hooks/splashy echo splashy_config -s
-debian-moreblue '||' true >> config/chroot_local-hooks/splashy # update the
-ramdisk to include the splash screen echo update-initramfs -u -k all >>
-config/chroot_local-hooks/splashy chmod 755
-config/chroot_local-hooks/splashy
-
-}code
-
-After you rebuild your live system you should observe a bluish splash screen
-while booting. Nothing happens while initramfs is running because there is
-no splashy support in initramfs-tools. Once the init starts the progress bar
-should start to fill. If #{vga=something}# sets a mode that your screen
-cannot show or your card cannot do vesa 2.0 (and thus you get plain text
-mode and no splashy) read the splashy faq.
-
-Q: Howto use my Broadcom eXtrem 2 network card (module bnx2)? A: Add the
-firmwares to the initrd image. You need to install the non-free package
-"firmware-bnx2". Uncompress your initrd image, then copy files:
-
-code{
-
-cp /lib/firmware/bnx2x-e1-4.8.53.0.fw /lib/firmware/bnx2x-e1-5.0.21.0.fw
-/lib/firmware/bnx2x-e1h-4.8.53.0.fw /lib/firmware/bnx2x-e1h-5.0.21.0.fw
-${INITRD}/lib/firmware/ cp /lib/udev/firmware.agent ${INITRD}/lib/udev/
-
-}code
-
-Recompress your initrd image and boot: it works!
-
-Q: X is broken (the system boots, messages scroll by, and then the screen
-goes blank). What do I do? A: On my system starting X completely disables
-graphics so that I do not see anything even after X bails out and I am back
-to the console. To prevent this you can change the driver Xorg uses.
-
-If you have a working splash screen or at least graphical console you can
-use #{live xdriver=fbdev}# when booting the live system (instead of just
-enter). Another driver you might want to try is #{vesa}#. If all fails you
-might try to set xdriver to some wrong value so that Xorg fails to start and
-you can examine the system while you still see something on the
-console. #{live xdriver=none}#
-
-Q: How can I get Debian first stable versions? A: I'm developing software
-and testing it on Live-CD. Thanks for the LiveCD project. To be sure my
-development is fully compatible with the "etch" version, I need the same
-scenario when Debian GNU/Linux 4.0 was published as stable (I believe
-2007.04.08). If there was some bug on 2007.04.08 that was corrected one week
-later, I need to test software foreseeing that scenario without the bug
-solved.
-
-Q: I get "fopen: Permission denied"-warnings from apt on building/at the
-live-system A: That's a harmless bug in apt. However, if you want to get off
-this warnings in the live-system, add a file in chroot_local-hooks with
-follow row:
-
-code{
-
-chown -R man.man /var/cache/man
-
-}code
-
-Q: Why I always fail during "Retrieving Packages" stage when running
-lh_build? I have already set apt-http-proxy and so on.  A: lh_build
-retrieves packages via wget, as a result you need to enable the proxy
-settings in /etc/wgetrc before running lh_build.
-
-Q: How do I edit Xorg.conf? A: Xorg.conf is generated every time system
-boots, so it's useless to put modifed Xorg.conf in
-config/choort_local-includes/etc/X11, because it will be overwritten during
-boot. However, you can edit /usr/bin/dexconf, which generate xorg.conf
-during boot, so the result will be modified Xorg.conf. The modified dexconf
-has to be put in config/choort_local-includes/usr/bin. e.g.: you can
-configure Xorg.conf for two or more keyboards layouts with alt+shift toggle
-by editing dexconf and replacing the line:
-
-code{
-
-Option "XkbLayout" "$XKB_LAYOUT"
-
-}code
-
-with the lines:
-
-code{
-
-Option "XkbLayout" "us,il" Option "XkbOptions"
-"grp:alt_shift_toggle,grp_led:scroll"
-
-}code
-
-when "us,il" are the wanted keyboard layouts.
-
-You can force default screen resulotion (e.g. 1024*768) by adding the lines:
-
-code{
-
-SubSection "Display"
-        Modes "1024x768"
-EndSubSection
-
-}code
-
-between the lines:
-
-code{
-
-Section "Screen"
-        Identifier "Default Screen"
-        Monitor "Configured Monitor"
-EndSection"
-
-}code
-
-Q: Where are the build parameters for the prebuilt images A: See
-http://live.debian.net/README.images.
diff --git a/manual/fr/other_howtos.ssi b/manual/fr/other_howtos.ssi
deleted file mode 100644
index 63e84bf..0000000
--- a/manual/fr/other_howtos.ssi
+++ /dev/null
@@ -1,118 +0,0 @@
-B~ Howtos
-
-1~ Howtos
-
-2~ ISO
-
-Generating a Debian Live CD is very simple. You need to have live-helper
-(package available in Debian sid and lenny), and Debootstrap (or
-cdebootstrap) from etch or newer.
-
-3~ Install live-helper
-
-#{apt-get install live-helper}#
-
-3~ Configure the current working directory with lh_config
-
-code{
-
-lh_config -b iso -a $ARCH
-
-}code
-
-where #{$ARCH}# is the intended architecture (i.e. - i386 or amd64).
-
-#{-b}# flag is used to be sure to obtain image in ISO format.
-
-3~ Build the image with lh_build:
-
-Execute lh_build as root: #{lh_build}#
-
-The command above will create the basic image, containing just the Debian
-standard system (with no X at all).
-
-If you want to have any of the Desktop environments on your livecd, #{ls
-/usr/share/live-helper/lists}# will show a number of available package Lists
-to choose from, e.g. #{lh_config -p gnome-desktop}#
-
-More examples are listed at DebianLive/Examples.
-
-See packages for help configuring a local Debian Mirror and other aspects of
-the live system.  % FIXME: <xref linkend="packages"/>
-
-3~ Test the image
-
-If you have qemu installed, you can boot the image with:
-
-code{
-
-qemu -cdrom binary.iso
-
-}code
-
-If you have also kqemu installed, you can add #{-kernel-kqemu}#
-
-2~ ISO_(multiarch)
-
-Multiple machine boot CDs can be created with the following manual
-procedure. This procedure has been successfully used to create a single CD
-which is bootable on alpha, i386, pmax, and sparc. It should be possible to
-also make the CD bootable on macppc, vax and on sun2, sun3 and sun3x.
-
-To create a CD which is bootable by multiple architectures, use the
-following steps in this order. Please note that the order is critical.
-
-Make sure you have all the required files including the various kernels and
-boot programs listed in the individual machine sections.
-
-Include a directory somewhere in the cdsources directory called mdec.pmax
-and include the pmax bootxx_cd9660 file there. For example,
-/cdsources/usr/mdec.pmax/bootxx_cd9660.
-
-Include a directory somewhere in the cdsources directory called mdec.vax and
-include the vax xxboot file there. For example,
-#{cdsources/usr/mdec.vax/xxboot.}#
-
-Include the macppc ofwboot.xcf bootloader in /cdsources.
-
-Create an i386 bootable image. #{sh mkisofs -v -v -o output.iso -b
-i386/installation/floppy/boot-big.fs \ -c boot.catalog -l -J -r -L
-/cdsources 2>&1 | tee /tmp/mkisofs.log exit}#
-
-Note: The appearance of the -v flag twice is required. If you are making a
-bootable CD for an Open Firmware 3 macppc model, make sure to include -hfs
--part in the parameters for mkisofs.
-
-Run mksunbootcd on a NetBSD/sparc machine to install sparc and sun2/sun3
-bootblocks. Alternatively, install the sysutils/mksunbootcd package on your
-favorite NetBSD machine. #{mksunbootcd output.iso boot-sun4.fs boot-sun4c.fs
-boot-sun4m.fs boot-sun3.fs}#
-
-Run the installboot(8) program targeted for NetBSD/pmax to install the pmax
-bootblocks. Note that in order to coexist with other NetBSD boot blocks, the
-pmax boot block is appended to the end of the ISO file system.
-
-#{installboot -m pmax -v -o append,sunsum output.iso
-/tmp/mdec.pmax/bootxx_cd9660}#
-
-The -o append,sunsum option appends the first stage boot block to the end of
-the ISO file system, and restores the checksum used when booting on a sun.
-
-Run the installboot(8) program targeted for NetBSD/vax to install the vax
-bootblocks. Note that in order to coexist with other NetBSD boot blocks, the
-vax boot block is appended to the end of the ISO file system.
-
-installboot -m vax -v -o append,sunsum output.iso /tmp/mdec.vax/xxboot
-
-(See the pmax entry above for an explanation of the flags).
-
-Run the installboot(8) program targeted for NetBSD/alpha to install the
-alpha bootblocks.
-
-#{installboot -m alpha -v -o append,sunsum output.iso
-/tmp/mdec.alpha/bootxx_cd9660}#
-
-Note: The alpha installboot must occur after the others, because currently
-it's the only machine dependent back-end for installboot(8) that can
-calculate the alpha checksum. (See the pmax entry above for an explanation
-of the flags).
diff --git a/manual/fr/project_bugs.ssi b/manual/fr/project_bugs.ssi
index cce48f8..7eaaaea 100644
--- a/manual/fr/project_bugs.ssi
+++ b/manual/fr/project_bugs.ssi
@@ -21,42 +21,44 @@ used and the distribution of the live system you are building.
 
 2~ Known issues
 
-Due to the nature of Debian *{testing}* and Debian *{unstable}*
-distributions being a moving target, building a live system may not always
-be possible.
+Because Debian *{testing}* and Debian *{unstable}* distributions are a
+moving target, when you specify either as the target system distribution, a
+successful build may not always be possible.
 
-If this is a problem, do not build a system based on *{testing}* or
-*{unstable}*, but go with *{stable}*. live-build does always default to the
-current *{stable}* release.
+% FIXME:
+
+If this causes too much difficulty for you, do not build a system based on
+*{testing}* or *{unstable}*, but rather, use *{stable}*. live-build does
+always default to the *{stable}* release.
 
 Currently known issues are listed under the section 'status' on our homepage
-at http://live.debian.net/
+at http://live.debian.net/.
 
-It is out of the scope of this manual to train you in correctly identifying
-and fixing problems in packages of the development distributions, however,
-there are two things you can always try: When not succeeding to build
-*{testing}*, try if *{unstable}* works. If *{unstable}* does not work
-either, revert to *{testing}* and pinning the newer version of the failing
-package from *{unstable}*.
+It is out of the scope of this manual to train you to correctly identify and
+fix problems in packages of the development distributions, however, there
+are two things you can always try: If a build fails when the target
+distribution is *{testing}*, try *{unstable}*. If *{unstable}* does not work
+either, revert to *{testing}* and pin the newer version of the failing
+package from *{unstable}* (see {APT pinning}#apt-pinning for details).
 
 2~ Rebuild from scratch
 
-To ensure that a particular bug is not caused by an unclean built system,
+To ensure that a particular bug is not caused by an uncleanly built system,
 please always rebuild the whole live system from scratch to see if the bug
 is reproducible.
 
 2~ Use up-to-date packages
 
 Using outdated packages can cause significant problems when trying to
-reproduce (and ultimately fix) your problem.
+reproduce (and ultimately fix) your problem. Make sure your build system is
+up-to-date and any packages included in your image are up-to-date as well.
 
 2~collect-information Collect information
 
-Please provide enough information with your report. At a minimum, it should
-contain the exact version of live-build version where the bug is
-encountered, and steps to reproduce it. Please use common sense and include
-other relevant information if you think that it might help in solving the
-problem.
+Please provide enough information with your report. At least include the
+exact version of live-build version where the bug is encountered and steps
+to reproduce it. Please use common sense and include other relevant
+information if you think that it might help in solving the problem.
 
 To make the most out of your bug report, we require at least the following
 information:
@@ -69,7 +71,7 @@ _* Version of live-boot on the live system
 
 _* Version of live-config on the live system
 
-_* Version of debootstrap and/or cdebootstrap on the host system
+_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system
 
 _* Architecture of the live system
 
@@ -77,26 +79,43 @@ _* Distribution of the live system
 
 _* Version of the kernel on the live system
 
-You can generate a log of the build process by using the tee command:
+You can generate a log of the build process by using the #{tee}# command. We
+recommend doing this automatically with an #{auto/build}# script; see
+{Managing a configuration}#managing-a-configuration for details).
 
 code{
 
-lb build 2>&1 | tee build.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
-For runtime log, live-boot stores a log in /var/log/live.log (or
-/var/log/live-boot.log).
+At boot time, live-boot stores a log in #{/var/log/live.log}# (or
+#{/var/log/live-boot.log}#).
 
 Additionally, to rule out other errors, it is always a good idea to tar up
-your config directory and upload it somewhere (do *{not}* send it as an
-attachment to the mailinglist), so that we can try to reproduce the errors
-you encountered.
+your #{config/}# directory and upload it somewhere (do *{not}* send it as an
+attachment to the mailing list), so that we can try to reproduce the errors
+you encountered. If this is difficult (e.g. due to size) you can use the
+output of #{lb config --dump}# which produces a summary of your config tree
+(i.e. lists files in subdirectories of #{config/}# but does not include
+them).
 
 Remember to send in any logs that were produced with English locale
 settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or
 #{LC_ALL=en_US}#.
 
+2~ Isolate the failing case if possible
+
+If possible, isolate the failing case to the smallest possible change that
+breaks. It is not always easy to do this, so if you can't manage it for your
+report, don't worry. However, if you plan your development cycle well, using
+small enough change sets per iteration, you may be able to isolate the
+problem by constructing a simpler 'base' configuration that closely matches
+your actual configuration plus just the broken change set added to it. If
+you have a hard time sorting out which of your changes broke, it may be that
+you are including too much in each change set and should develop in smaller
+increments.
+
 2~ Use the correct package to report the bug against
 
 Where does the bug appear?
@@ -121,9 +140,9 @@ can fail. If a bug appears here, check if the error is also reproducible on
 a normal system.
 
 If this is the case, this is not a bug in Debian Live, but rather in Debian
-- please report it against the failing package. Running debootstrap
-seperately from the Live system build or running lb bootstrap with
-#{--debug}# will give you more information.
+- please report it against the failing package. Running #{debootstrap}#
+separately from the Live system build or running #{lb bootstrap --debug}#
+will give you more information.
 
 Also, if you are using a local mirror and/or any of sort of proxy and you
 are experiencing a problem, please always reproduce it first by
@@ -134,10 +153,10 @@ bootstrapping from an official mirror.
 If your image does not boot, please report it to the mailing list together
 with the information requested in {Collect
 information}#collect-information. Do not forget to mention, how/when the
-image failed, in Qemu, VMWare or real hardware. If you are using a
-virtualization technology of any kind, please always run it on real hardware
-before reporting a bug. Providing a screenshot of the failure is also very
-helpful.
+image failed, in Qemu, Virtualbox, VMWare or real hardware. If you are using
+a virtualization technology of any kind, please always run it on real
+hardware before reporting a bug. Providing a screenshot of the failure is
+also very helpful.
 
 3~ At run time
 
diff --git a/manual/fr/project_coding-style.ssi b/manual/fr/project_coding-style.ssi
index a0e5959..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
 
@@ -71,22 +71,22 @@ foo ()
 
 _* Variables are always in capital letters.
 
-_* Variables that used in lb config always start with LH_ prefix.
+_* Variables that used in #{lb config}# always start with #{LB_}# prefix.
 
-_* Internal temporary variables in live-build should start with the _LH_
-prefix.
+_* Internal temporary variables in live-build should start with the
+#{\_LB_}# prefix.
 
-_* Local variables start with live-build __LH_ prefix.
+_* Local variables start with live-build #{\_\_LB_}# prefix.
 
 _* Variables in connection to a boot parameter in live-config start with
-LIVE_.
+#{LIVE_}#.
 
-_* All other variables in live-config start with _ prefix.
+_* All other variables in live-config start with #{_}# prefix.
 
-_* Use braces around variables; eg. write ${FOO} instead of $FOO.
+_* Use braces around variables; e.g. write #{${FOO}}# instead of #{$FOO}#.
 
-_* Always protect variables with quotes to respect potential whitespaces,
-write "${FOO}" not ${FOO}.
+_* Always protect variables with quotes to respect potential whitespaces:
+write #{"${FOO}"}# not #{${FOO}}#.
 
 _* For consistency reasons, always use quotes when assigning values to
 variables:
@@ -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,20 +124,21 @@ Good:
 
 code{
 
-if [ -f "${FOO}/foo/${BAR}/bar" ]
-then
-        foobar
-fi
+ if [ -f "${FOO}/foo/${BAR}/bar" ]
+ then
+         foobar
+ fi
 
 }code
 
 2~ Miscellaneous
 
-_* Use "|" (without the surround quotes) as a seperator in calls to sed,
-e.g. "sed -e 's|foo|bar|'" (without "").
+_* Use "#{|}#" (without the surround quotes) as a seperator in calls to sed,
+e.g. "#{sed -e 's|foo|bar|'}#" (without "").
 
-_* Don't use the test command for comparisons or tests, use "[" "]" (without
-""), e.g. "if [ -x /bin/foo ]; ..." and not "if test -x /bin/foo; ...".
+_* Don't use the #{test}# command for comparisons or tests, use "#{[}#"
+"#{]}#" (without ""); e.g. "#{if [ -x /bin/foo ]; ...}#" and not "#{if test
+-x /bin/foo; ...}#".
 
-_* Use case wherever possible over test, as it's easier to read and faster
-in execution.
+_* Use #{case}# wherever possible over #{test}#, as it's easier to read and
+faster in execution.
diff --git a/manual/fr/project_procedures.ssi b/manual/fr/project_procedures.ssi
index 429a76f..d9a2561 100644
--- a/manual/fr/project_procedures.ssi
+++ b/manual/fr/project_procedures.ssi
@@ -1,6 +1,6 @@
 B~ Procedures
 
-1~ Procedures
+1~procedures Procedures
 
 This chapter documents the procedures within the Debian Live project for
 various tasks that need cooperation with other teams in Debian.
@@ -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 b4e6373..ae7318e 100644
--- a/manual/fr/user_basics.ssi
+++ b/manual/fr/user_basics.ssi
@@ -36,9 +36,7 @@ SquashFS compressed filesystem is used to minimize the Debian Live image
 size. Note that it is read-only. So, during boot the Debian Live system will
 use a RAM disk and 'union' mechanism to enable writing files within the
 running system. However, all modifications will be lost upon shutdown unless
-optional persistence is used (see persistence).
-
-% FIXME: <xref linkend="persistence"/>
+optional persistence is used (see {Persistence}#persistence).
 
 _* *{Bootloader}*: A small piece of code crafted to boot from the chosen
 media, possibly presenting a prompt or menu to allow selection of
@@ -52,7 +50,7 @@ partitions, etc.
 
 You can use live-build to build the system image from your specifications,
 set up a Linux kernel, its initrd, and a bootloader to run them, all in one
-media-dependant format (ISO9660 image, disk image, etc.)
+media-dependant format (ISO9660 image, disk image, etc.).
 
 2~ First steps: building an ISO image
 
@@ -67,19 +65,19 @@ hierarchy in the current directory for use by other commands:
 
 code{
 
-$ lb config
+ $ lb config
 
 }code
 
 By passing no parameters to #{lb config}#, we indicated that we wish to use
 the defaults (see {The lb config command}#lb-config).
 
-Now that we have a "config/" hierarchy, we may build the image with the lb
-build command:
+Now that we have a "config/" hierarchy, we may build the image with the #{lb
+build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -92,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
 
@@ -104,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
 
@@ -120,7 +118,7 @@ resolution is limited to 800x600.
 
 code{
 
-# lb config --packages virtualbox-ose-guest-x11
+ $ lb config --packages virtualbox-ose-guest-x11
 
 }code
 
@@ -130,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
 
@@ -152,7 +150,7 @@ lb clean command}#lb-clean):
 
 code{
 
-$ lb clean --binary
+ # lb clean --binary
 
 }code
 
@@ -161,15 +159,15 @@ Run the #{lb config}# command with the parameters to configure the
 
 code{
 
-$ lb config -b usb-hdd
+ $ lb config -b usb-hdd
 
 }code
 
-Now build the image with the #{lb build} command:
+Now build the image with the #{lb build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -181,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
 
@@ -193,15 +191,15 @@ better yet, #{ls -l /dev/disk/by-id}#.
 *{This will definitely overwrite any previous contents on your stick!}*
 
 Note: As discussed earlier, this same process can be used for #{iso-hybrid}#
-type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images.
+type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images.
 
 3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu
 
 code{
 
-# apt-get install qemu
+ # apt-get install qemu
 
-$ qemu -hda binary.img
+ $ qemu -hda binary.img
 
 }code
 
@@ -214,7 +212,7 @@ be used by the Debian Live system.
 
 code{
 
-# gparted ${USBSTICK}
+ # gparted ${USBSTICK}
 
 }code
 
@@ -223,7 +221,7 @@ it. One possible choice would be ext4.
 
 code{
 
-# mkfs.ext4 ${USBSTICK}
+ # mkfs.ext4 ${USBSTICK}
 
 }code
 
@@ -231,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
 
@@ -248,31 +246,31 @@ working directory with the #{lb clean}# command:
 
 code{
 
-$ lb clean --binary
+ # lb clean --binary
 
 }code
 
-Run the #{lb config}# command with the parameters to configure the "config/"
-hierarchy to create our netboot image:
+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
 
-In contrast with the ISO and USB/HDD images, netbooting does not support
-serving a filesystem image with the client, so the files must be served via
-NFS. The net-root-path and net-root-server options specify the location and
-server, respectively, of the NFS server where the filesytem image will be
-located at boot time.
+In contrast with the ISO and USB/HDD images, netbooting does not, itself,
+serve the filesystem image to the client, so the files must be served via
+NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the
+location and server, respectively, of the NFS server where the filesytem
+image will be located at boot time. Make sure these are set to suitable
+values for your network and server.
 
 Now build the image with the #{lb build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -283,12 +281,13 @@ next step is getting a higher level bootloader via the TFTP protocol. That
 could be pxelinux, GRUB, or even boot directly to an operating system like
 Linux.
 
-For example, if you unpack the generated binary-net.tar.gz archive in the
-/srv/debian-live directory, you'll find the filesystem image in
-live/filesystem.squashfs and the kernel, initrd and pxelinux bootloader in
-tftpboot/debian-live/i386.
+For example, if you unpack the generated #{binary-net.tar.gz}# archive in
+the #{/srv/debian-live}# directory, you'll find the filesystem image in
+#{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader
+in #{tftpboot/debian-live/i386}#.
 
-We must now configure three services on the server to enable netboot.
+We must now configure three services on the server to enable netboot: the
+DHCP server, the TFTP server and the NFS server.
 
 3~ DHCP server
 
@@ -297,33 +296,26 @@ to the netbooting client system, and to advertise the location of the PXE
 bootloader.
 
 Here is an example for inspiration, written for the ISC DHCP server
-#{isc-dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;
-
-% FIXME
+#{isc-dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:
 
 code{
 
-subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
-
-  # IP addresses available for guests
-  range 192.168.1.100 192.168.1.149;
+ # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server
 
-  # allow booting from the net
-  allow bootp;
+ ddns-update-style none;
 
-  # for net booting, server where the first file to be loaded (by TFTP
-  # protocol) ("filename" following definition) lies : so the TFTP
-  # server's name.
-  next-server myserver;
+ option domain-name "example.org";
+ option domain-name-servers ns1.example.org, ns2.example.org;
 
-  # net boot configuration for guests with a PXE client :
-  if substring (option vendor-class-identifier, 0, 9) = "PXEClient" {
-    # Note: all files for PXE are relatives to the TFTP server's root
+ default-lease-time 600;
+ max-lease-time 7200;
 
-    # PXE bootloader (first program to be loaded, by TFTP)
-    filename "pxelinux.0";
+ 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";
 }
 
 }code
@@ -333,12 +325,12 @@ subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
 This serves the kernel and initial ramdisk to the system at run time.
 
 You should install the tftpd-hpa package. It can serve all files contained
-inside a root directory, usually /srv/tftp. To let it serve files inside
-/srv/debian-live/tftpboot, run as root the following command:
+inside a root directory, usually #{/srv/tftp}#. To let it serve files inside
+#{/srv/debian-live/tftpboot}#, run as root the following command:
 
 code{
 
-dpkg-reconfigure -plow tftpd-hpa
+ # dpkg-reconfigure -plow tftpd-hpa
 
 }code
 
@@ -350,14 +342,14 @@ Once the guest computer has downloaded and booted a Linux kernel and loaded
 its initrd, it will try to mount the Live filesystem image through a NFS
 server.
 
-You need to install the nfs-kernel-server package.
+You need to install the #{nfs-kernel-server}# package.
 
 Then, make the filesystem image available through NFS by adding a line like
-the following to /etc/exports:
+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
 
@@ -365,15 +357,16 @@ and tell the NFS server about this new export with the following command:
 
 code{
 
-# exportfs -rv
+ # exportfs -rv
 
 }code
 
 Setting up these three services can be a little tricky. You might need some
-patience to get all of them working together. The Debian Installer Manual's
-TFTP Net Booting section at
-http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html might help as that
-process is very similar.
+patience to get all of them working together. For more information, see the
+syslinux wiki at http://syslinux.zytor.com/wiki/index.php/PXELINUX or the
+Debian Installer Manual's TFTP Net Booting section at
+http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html. They might help,
+as their processes are very similar.
 
 3~ Netboot testing HowTo
 
@@ -384,51 +377,64 @@ To make our life easier, we can use virtualization. There are two solutions.
 
 3~ Qemu
 
-_* Install qemu, bridge-utils, sudo.
+_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#.
 
-Edit /etc/qemu-ifup:
+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
 
-Get, or build a grub-floppy-netboot (in the svn).
+Get, or build a #{grub-floppy-netboot}# (in the svn).
 
-Launch qemu with "-net nic,vlan=0 -net tap,vlan=0,ifname=tun0"
+Launch #{qemu}# with "#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#"
 
 3~ VMWare Player
 
 _* Install VMWare Player ("free as in beer" edition)
 
-_* Create a PXETester directory, and create a text file called pxe.vwx
+_* Create a PXETester directory, and create a text file called #{pxe.vwx}#
 inside
 
 _* 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
 
-_* You can play with this configuration file (i.e. change memory limit to
+_* You can play with this configuration file (e.g. change memory limit to
 256)
 
 _* Double click on this file (or run VMWare player and select this file).
diff --git a/manual/fr/user_customization-contents.ssi b/manual/fr/user_customization-contents.ssi
index f8d01ce..3906219 100644
--- a/manual/fr/user_customization-contents.ssi
+++ b/manual/fr/user_customization-contents.ssi
@@ -2,42 +2,45 @@
 
 1~customizing-contents Customizing contents
 
-This chapter discusses further customization of the live system.
+This chapter discusses fine-tuning customization of the live system contents
+beyond merely choosing which packages to include. Includes allow you to add
+or replace arbitrary files in your Debian Live image, hooks allow you to
+execute arbitrary commands at different stages of the build and at boot
+time, and preseeding allows you to configure packages when they are
+installed by supplying answers to debconf questions.
 
 2~ Includes
 
-Using includes, it is possible to add (or replace) arbitrary files in your
-Debian Live image. live-build provides three mechanisms for using them:
+While ideally a Debian live system would include files entirely provided by
+unmodified Debian packages, it is sometimes convenient to provide or modify
+some content by means of files. Using includes, it is possible to add (or
+replace) arbitrary files in your Debian Live image. live-build provides
+three mechanisms for using them:
 
 _* Chroot local includes: These allow you to add or replace files to the
-chroot/Live filesystem. Please see chroot-local-includes for more
-information.
-
-% FIXME: <xref linkend="chroot-local-includes"/>
+chroot/Live filesystem. Please see {Live/chroot local
+includes}#live-chroot-local-includes for more information.
 
 _* Binary local includes: These allow you to add or replace files in the
-binary image. Please see binary-local-includes for more information.
-
-% FIXME: <xref linkend="binary-local-includes"/>
+binary image. Please see {Binary local includes}#binary-local-includes for
+more information.
 
 _* Binary includes: These allow you to add or replace Debian specific files
 in the binary image, such as the templates and tools directories. Please see
-binary-includes for more information.
-
-% FIXME: <xref linkend="binary-includes"/>
-
-Please see terms for more information about the distinction between the
-"Live" and "binary" images.
+{Binary includes}#binary-includes for more information.
 
-% FIXME: <xref linkend="terms"/>
+Please see {Terms}#terms for more information about the distinction between
+the "Live" and "binary" images.
 
-3~ Live/chroot local includes
+3~live-chroot-local-includes Live/chroot local includes
 
 Chroot local includes can be used to add or replace files in the chroot/Live
-filesystem so that they are visible when the Live system is booted. Typical
-uses for them are to populate the skeleton user directory (#{/etc/skel}#)
-used by the live system to create the live user's home directory, or adding
-configuration files where additional processing is not required.
+filesystem so that they may be used in the Live system. A typical use is to
+populate the skeleton user directory (#{/etc/skel}#) used by the Live system
+to create the live user's home directory. Another is to supply configuration
+files that can be simply added or replaced in the image without processing;
+see {Live/chroot local hooks}#live-chroot-local-hooks if processing is
+needed.
 
 To include files, simply add them to your #{config/chroot_local-includes}#
 directory. This directory corresponds to the root directory (#{/}#) of the
@@ -46,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
 
@@ -55,42 +58,59 @@ 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
 
 Chroot local includes are installed after package installation so that files
 installed by packages are overwritten.
 
-3~ Binary local includes
+3~binary-local-includes Binary local includes
 
-The same way as chroot local includes work, there exists the corresponding
-mechanism to include files in the live media itself.
+To include material such as documentation or videos on the media filesystem
+so that it is accessible immediately upon insertion of the media without
+booting the Live system, you can use binary local includes. This works in a
+similar fashion to chroot local includes. For example, suppose the files
+#{~/video_demo.*}# are demo videos of the live system described by and
+linked to by an HTML index page. Simply copy the material to
+#{config/binary_local-includes/} as follows:
 
-3~ Binary includes
+code{
+
+ $ cp ~/video_demo.* config/binary_local-includes/
+
+}code
+
+These files will now appear in the root directory of the live media.
+
+3~binary-includes Binary includes
 
 live-build has some standard files (like documentation) that gets included
 in the default configuration on every live media. This can be disabled with:
 
 code{
 
-$ lb config --includes none
+ $ lb config --includes none
 
 }code
 
+Otherwise, the material will be installed by live-build in #{/includes/}# by
+default on the media filesystem, or else you can specify an alternate path
+with #{--includes}#.
+
 2~ Hooks
 
 Hooks allow commands to be performed in the chroot and binary stages of the
 build in order to customize the image.
 
-3~ Live/chroot local hooks
+3~live-chroot-local-hooks Live/chroot local hooks
 
 To run commands in the chroot stage, create a hook script containing the
 commands in the #{config/chroot_local-hooks}# directory. The hook will run
@@ -101,6 +121,17 @@ various common chroot customization tasks provided in
 #{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
 use them in your own configuration.
 
+3~ Boot-time hooks
+
+To execute commands at boot time, you can supply live-config hooks as
+explained in the "Customization" section of its man page. Examine
+live-config's own hooks provided in #{/lib/live/config/}#, noting the
+sequence numbers. Then provide your own hook prefixed with an appropriate
+sequence number, either as a chroot local include in
+#{config/chroot_local-includes/lib/live/config/}#, or as a custom package as
+discussed in {Installing modified or third-party
+packages}#installing-modified-or-third-party-packages.
+
 3~ Binary local hooks
 
 To run commands in the binary stage, create a hook script containing the
diff --git a/manual/fr/user_customization-installer.ssi b/manual/fr/user_customization-installer.ssi
index fcb326a..6ed2152 100644
--- a/manual/fr/user_customization-installer.ssi
+++ b/manual/fr/user_customization-installer.ssi
@@ -3,52 +3,87 @@
 1~customizing-installer Customizing Debian Installer
 
 Debian Live system images can be integrated with Debian Installer. There are
-number of different "types" of installation, varying in what and how to
-install the image.
+a number of different types of installation, varying in what is included and
+how the installer operates.
 
 Please note the careful use of capital letters when referring to the "Debian
 Installer" in this section - when used like this we refer explicitly to the
 official installer for the Debian system, not anything else. It is often
 seen abbreviated to "d-i".
 
+2~ Types of Debian Installer
+
 The three main types of installer are:
 
-_* *{"Regular" Debian Installer}*: This is a normal Debian Live image with a
-seperate kernel and initrd which (when selected from the appropriate
-bootloader) launches into a standard Debian Installer instance, just as if
-you had downloaded a CD image of Debian and booted it. Images containing a
-live system and such an otherwise indepentend installer are often referet to
-as "combined images".
+*{"Regular" Debian Installer}*: This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as "combined images".
 
 On such images, Debian is installed by fetching and installing .deb packages
 using #{debootstrap}# or #{cdebootstrap}#, from the local media or some
-network-base network, resulting in a standard Debian system being installed
+network-based network, resulting in a standard Debian system being installed
 to the hard disk.
 
 This whole process can be preseeded and customized in a number of ways; see
 the relevant pages in the Debian Installer manual for more information. Once
-you have a working preseeding file, live-build can automatically place it to
+you have a working preseeding file, live-build can automatically put it in
 the image and enable it for you.
 
-_* *{"Live" Debian Installer}*: This is a Debian Live image with a seperate
-kernel and initrd which (when selected from the appropriate bootloader)
-launches into an instance of the Debian Installer.
+*{"Live" Debian Installer}*: This is a Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into an instance of the Debian Installer.
 
 Installation will proceed in an identical fashion to the "Regular"
 installation described above, but at the actual package installation stage,
-instead of using #{debootstrap}# to fetch and install packages, the "live"
-filesystem image is copied to the target. This is acchieved with a special
-udeb called live-installer. live-installer can be preseeded to be disabled,
-allowing to support normal and live installer entries in the bootloader of
-the same live media.
+instead of using #{debootstrap}# to fetch and install packages, the live
+filesystem image is copied to the target. This is achieved with a special
+udeb called live-installer.
 
 After this stage, the Debian Installer continues as normal, installing and
 configuring items such as bootloaders and local users, etc.
 
-_* *{"Desktop" Debian Installer}*: Regardless of the mode Debian Installer
-is used in, d-i can be launched from the Desktop by clicking on an
-icon. This is user friendlier in some situations. In order to make use of
-this, the debian-installer-launcher package needs to be included.
+Note: to support both normal and live installer entries in the bootloader of
+the same live media, you must disable live-installer by preseeding
+#{live-installer/enable=false}.
+
+*{"Desktop" Debian Installer}*: Regardless of the type of Debian Installer included, #{d-i}# can be launched from the Desktop by clicking on an icon. This is user friendlier in some situations. In order to make use of this, the debian-installer-launcher package needs to be included.
+
+Note that by default, live-build does not include Debian Installer images in
+the images, it needs to be specifically enabled with #{lb config}#. Also,
+please note that for the "Desktop" installer to work, the kernel of the live
+system must match the kernel #{d-i}# uses for the specified
+architecture. For example:
+
+code{
+
+ $ lb config --architecture i386 --linux-flavours 486 \
+     --debian-installer live --packages debian-installer-launcher
+
+}code
+
+2~ Customizing Debian Installer by preseeding
+
+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 answers to questions asked during the installation process,
+without having to manually enter the answers while the installation is
+running. This makes it possible to fully automate most types of installation
+and even offers some features not available during normal installations."
+This kind of customization is best accomplished with live-build by placing
+the configuration in a #{preseed.cfg}# file included in
+#{config/binary_debian-installer/}#. For example, to preseed setting the
+locale to #{en_US}#:
+
+code{
+
+ $ echo "d-i debian-installer/locale string en_US" \
+     >> config/binary_debian-installer/preseed.cfg
+
+}code
+
+2~ Customizing Debian Installer content
+
+For experimental or debugging purposes, you might want to include locally
+built #{d-i}# component udeb packages. Place these in
+#{config/binary_local-udebs/}# to include them in the image. Additional or
+replacement files and directories may be included in the installer initrd as
+well, in a similar fashion to {Live/chroot local
+includes}#live-chroot-local-includes, by placing the material in
+#{config/binary_debian-installer-includes/}#.
 
-Note that by default live-build does not include Debian Installer images in
-the images, it needs to be specifically enabled with lb config.
diff --git a/manual/fr/user_customization-internationalization.ssi b/manual/fr/user_customization-internationalization.ssi
deleted file mode 100644
index 0288819..0000000
--- a/manual/fr/user_customization-internationalization.ssi
+++ /dev/null
@@ -1,49 +0,0 @@
-:B~ Customizing locale and language
-
-1~customizing-locale-and-language Customizing locale and language
-
-2~ Default locale and keyboard
-
-The default locale when building a Live system is "locales=en_US.UTF-8", to
-set the locale for e.g. Switzerland, you can use "locales=de_CH.UTF-8".
-
-code{
-
-$ lb config --bootappend-live "locales=de_CH.UTF-8"
-
-}code
-
-The entry for a Swiss-German keyboard would be:
-
-code{
-
-$ lb config --bootappend-live "keyboard-layouts=ch"
-
-}code
-
-Combined, the keyboard and locale configured for Switzerland would be:
-
-code{
-
-$ lb config --bootappend-live ="locales=de_CH.UTF-8 keyboard-layouts=ch"
-
-}code
-
-Note: You can find a list of options in the manpage for
-live-config. Currently, only UTF-8 locales are supported.
-
-2~ l10n Packages
-
-An experimental feature of live-build is to automatically check for each
-package for which it is know that there are -l10n packages available and
-install them. To add German packages the entry would be
-
-code{
-
-$ lb config --language "de"
-
-}code
-
-This will also change the default syslinux language if translations are
-available or local translations have been put into
-#{config/templates/syslinux/de}#.
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index b4153a1..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,17 +266,21 @@ specified:
 
 code{
 
-#if ARCHITECTURE amd64 ia32-libs #endif
+ #if ARCHITECTURE amd64
+ ia32-libs
+ #endif
 
 }code
 
-You may test for any one of a number of values, e.g. to install #{memtest86+
-}# if either #{--architecture i386}# or #{--architecture amd64}# is
-specified:
+You may test for any one of a number of values, e.g. to install
+#{memtest86+}# if either #{--architecture i386}# or #{--architecture amd64}#
+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
 
@@ -323,12 +332,11 @@ including ones not included in this list, may be examined with #{tasksel
 
 Desktop and language tasks are special cases. In the Debian Installer, if
 the medium was prepared for a particular desktop environment flavour, the
-corresponding task will be automatically installed. Thus, there are there
-are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and
-#{xfce-desktop}# tasks, none of which are offered in #{tasksel}#'s
-menu. Likewise, there are no menu entries for tasks for languages, but the
-user's language choice during the install influences the selection of
-corresponding language tasks.
+corresponding task will be automatically installed. Thus, there are
+#{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#
+tasks, none of which are offered in #{tasksel}#'s menu. Likewise, there are
+no menu entries for tasks for languages, but the user's language choice
+during the install influences the selection of corresponding language tasks.
 
 In live-build, therefore, these special cases are also given special
 consideration, but with three notable differences at the time of writing.
@@ -341,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
 
@@ -349,16 +357,31 @@ Second, live-build supports #{*-desktop}# virtual package lists for each of
 the desktop flavours mentioned above, which select the #{standard-x11}#
 predefined package list, the corresponding #{*-desktop}# task and three
 additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example,
-if you specify #{--packages gnome-desktop}#, it is equivalent to specifying
-#{--packages standard-x11 --tasks "gnome-desktop desktop standard laptop"}#.
+if you specify #{--packages-lists gnome-desktop}#, it is equivalent to
+specifying #{--packages debian-installer-launcher --packages-lists
+standard-x11 --tasks "gnome-desktop desktop standard laptop"}#.
 
 Third, if any of the tasks for these desktop flavours are selected, either
-explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build
-will preseed the corresponding desktop value for Debian Installer (if it is
-included) to ensure it follows its own rules for installing different
-desktop flavours.
+explicitly through #{--tasks}# or implicitly by #{--packages-lists}#,
+live-build will preseed the corresponding desktop value for Debian Installer
+(if it is included) to ensure it follows its own rules for installing
+different desktop flavours.
+
+*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are installed
 . For example:
+
+code{
+
+ $ lb config --language es
+
+}code
 
-2~ Installing modified or third-party packages
+Even so, it is limited in that it only supports a single language and a
+single bootloader. Therefore, for all of these reasons, the future of this
+option is under review, possibly to be replaced with something entirely
+different in the next major release of live-build.
+
+2~installing-modified-or-third-party-packages Installing modified or
+third-party packages
 
 Whilst it is against the philosophy of Debian Live, it may sometimes be
 necessary to build a Live system with modified versions of packages that are
@@ -460,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
 
@@ -475,7 +498,7 @@ with:
 
 code{
 
-$ lb config --binary-indices false
+ $ lb config --binary-indices false
 
 }code
 
@@ -490,17 +513,21 @@ much, you may disable that default option of APT with:
 
 code{
 
-$ lb config --apt-recommends false
+ $ lb config --apt-recommends false
 
 }code
 
-The tradeoff here is that recommended packages are defined as "packages that
-would be found together with this one in all but unusual installations"
-(Debian Policy Manual, §7.2). This may lead to some packages that you
-actually need being omitted, so we suggest you review the difference this
-makes to your packages list (see the #{binary.packages}# file generated by
-#{lb build}#) and re-include in your list any missing packages that you
-still want installed.
+The tradeoff here is that if you don't install recommended packages for a
+given package, that is, "packages that would be found together with this one
+in all but unusual installations" (Debian Policy Manual, §7.2), some
+packages that you actually need may be omitted. Therefore, we suggest you
+review the difference turning off recommends makes to your packages list
+(see the #{binary.packages}# file generated by #{lb build}#) and re-include
+in your list any missing packages that you still want
+installed. Alternatively, if you find you only want a small number of
+recommended packages left out, leave recommends enabled and set a negative
+APT pin priority on selected packages to prevent them from being installed,
+as explained in {APT pinning}#apt-pinning.
 
 3~ Passing options to apt or aptitude
 
@@ -524,11 +551,31 @@ 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
+
+}code
+
+Negative pin priorities will prevent a package from being installed, as in
+the case where you do not want a package that is recommended by another
+package. Suppose you are building a GNOME image but don't want the user
+prompted to store wifi passwords in the keyring, so you want to omit the
+recommended #{gnome-keyring}# package. This can be done by adding the
+following stanza to #{config/chroot_apt/preferences}#:
+
+code{
 
-Package: * Pin: release n=sid Pin-Priority: 1 END
+ Package: gnome-keyring
+ Pin: version *
+ Pin-Priority: -1
 
 }code
 
diff --git a/manual/fr/user_customization-runtime.new.ssi b/manual/fr/user_customization-runtime.new.ssi
deleted file mode 100644
index e2c32ec..0000000
--- a/manual/fr/user_customization-runtime.new.ssi
+++ /dev/null
@@ -1,258 +0,0 @@
-:B~ Customizing run time behaviours
-
-1~customizing-run-time-behaviours Customizing run time behaviours
-
-All configuration that is done during run time is done by live-config. Here
-are some most common options of live-config that users are interested in. A
-full list of all possibilities can be found in the manpage of live-config.
-
-2~ Customizing the live user
-
-One important consideration is that the live user is created by live-boot at
-boot time, not by live-build at build time. This not only influences where
-materials relating to the live user are introduced in your build, as
-discussed in {Live/chroot local includes}#live-chroot-local-includes, but
-also any groups and permissions associated with the live user.
-
-You can specify additional groups that the live user will belong to by
-preseeding the #{passwd/user-default-groups}# debconf value. For example, to
-add the live user to the #{fuse}# group, add the following to a file in the
-#{config/chroot_local-preseed}# directory:
-
-code{
-
-debconf passwd/user-default-groups string audio cdrom dialout floppy video
-plugdev netdev powerdev fuse
-
-}code
-
-2~customizing-locale-and-language Customizing locale and language
-
-When the live system boots, language is involved in three steps:
-
-_* the locale generation
-
-_* setting the keyboard layout for the console
-
-_* setting the keyboard layout for X
-
-3~ Default locale and keyboard
-
-The default locale when building a Live system is "locales=en_US.UTF-8", to
-set the locale for e.g. Switzerland, you can use "locales=de_CH.UTF-8".
-
-code{
-
-$ lb config --bootappend-live "locales=de_CH.UTF-8"
-
-}code
-
-The entry for a Swiss-German keyboard would be:
-
-code{
-
-$ lb config --bootappend-live "keyboard-layouts=ch"
-
-}code
-
-Combined, the keyboard and locale configured for Switzerland would be:
-
-code{
-
-$ lb config --bootappend-live ="locales=de_CH.UTF-8 keyboard-layouts=ch"
-
-}code
-
-Note: You can find a list of options in the manpage for
-live-config. Currently, only UTF-8 locales are supported.
-
-3~ l10n Packages
-
-% FIXME: not a run time configuration! Belongs in packages chapter. (See
---tasks discussion.)
-
-An experimental feature of live-build is to automatically check for each
-package for which it is known that there are #{*-l10n}# packages available
-and install them. To add German packages the entry would be
-
-code{
-
-$ lb config --language "de"
-
-}code
-
-This will also change the default syslinux language if translations are
-available or local translations have been put into
-#{config/templates/syslinux/de}#.
-
-3~ Language
-
-To define the locale that should be generated, use the #{locales}# parameter
-into the #{--bootappend-live}# option of #{lb config}#, e.g.:
-
-code{
-
-lb config --bootappend-live "locales=de_CH.UTF-8"
-
-}code
-
-This parameter can also be used in kernel command line. You can specify a
-locale by a full #{language_country.encoding}# word.
-
-Both the console and X keyboard configuration depends on the #{keyb}#
-parameter of the #{--bootappend-live}# option. Valid options for X keyboard
-layouts can be found in #{/etc/X11/xkb/base.xml}# (rather limited to
-two-letters country codes). To find the value (the two characters)
-corresponding to a language try searching for the english name of the nation
-where the language is spoken, e.g:
-
-code{
-
-$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name <name>se</name>
-
-}code
-
-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"
-
-}code
-
-A list of the valid values of the keyboards for the console can be figured
-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
-
-}code
-
-Alternatively, you can use the #{console-setup}# package, a tool to let you
-configure console layout using X (XKB) definitions; you can then setup your
-keyboard layout more precisely with #{keyboard-layouts}#,
-#{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# variables;
-live-boot will use also these parameters for X configuration. For example,
-to set up a French system with a French-Dvorak layout (called Bepo) on a
-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"
-
-}code
-
-2~ Persistence
-
-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
-of the host hardware which runs it.
-
-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
-should be considered read-only and all the run-time evolutions of the system
-are lost at shutdown.
-
-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
-understand how it could work it could be handy to know that even if the
-system is booted and run from read-only media, modification to the files and
-directories are written on writable media, typically a ram disk (tmpfs) and
-ram disks' data do not survive reboots.
-
-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
-multisession (re)writable CD/DVD. All these media are supported in Debian
-Live in different ways, and all but the last one require a special boot
-parameter to be specified at boot time: #{persistent}#.
-
-3~ Full persistence
-
-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
-writable partition is used. In order to use this feature a partition with a
-clean writable supported filesystem on it labeled "live-rw" must be attached
-on the system at boot time and the system must be started with the boot
-parameter 'persistent'. This partition could be an ext2 partition on the
-hard disk or on a usb key created with, e.g.:
-
-code{
-
-# mkfs.ext2 -L live-rw /dev/sdb1
-
-}code
-
-If you already have a partition on your device, you could just change the
-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
-
-}code
-
-But since live system users cannot always use a hard drive partition, and
-considering that most USB keys have poor write speeds, 'full' persistence
-could be also used with just image files, so you could create a file
-representing a partition and put this image file even on a NTFS partition of
-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
-
-}code
-
-Then copy the #{live-rw}# file to a writable partition and reboot with the
-boot parameter 'persistent'.
-
-3~ Home automounting
-
-If during the boot a partition (filesystem) image file or a partition
-labeled #{home-rw}# is discovered, this filesystem will be directly mounted
-as #{/home}#, thus permitting persistence of files that belong to e.g. the
-default user. It can be combined with full persistence.
-
-3~ Snapshots
-
-Snapshots are collections of files and directories which are not mounted
-while running but which are copied from a persistent device to the system
-(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The
-content of a snapshot could reside on a partition or an image file (like the
-above mentioned types) labeled #{live-sn}#, but it defaults to a simple cpio
-archive named #{live-sn.cpio.gz}#. As above, at boot time, the block devices
-connected to the system are traversed to see if a partition or a file named
-like that could be found. A power interruption during run time could lead to
-data loss, hence a tool invoked #{live-snapshot --refresh}# could be called
-to sync important changes. This type of persistence, since it does not write
-continuously to the persistent media, is the most flash-based device
-friendly and the fastest of all the persistence systems.
-
-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.
-
-Snapshots cannot currently handle file deletion but full persistence and
-home automounting can.
-
-3~ Persistent SubText
-
-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-work}#, the boot parameter #{persistent-subtext}# used in
-conjuntion with the boot parameter #{persistent}# will allow for multiple
-but unique persistent media. An example would be if a user wanted to use a
-persistent partition labeled #{live-sn-subText}# they would use the boot
-parameters of: #{persistent}# #{persistent-subtext=subText}#.
-
-3~ Partial remastering
-
-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 case of cd-r or adding a session to multisession cd/dvd(rw); live-boot
-mounts all /live filesystem in order or with the module boot parameter.
diff --git a/manual/fr/user_customization-runtime.ssi b/manual/fr/user_customization-runtime.ssi
index 857ef66..471abb4 100644
--- a/manual/fr/user_customization-runtime.ssi
+++ b/manual/fr/user_customization-runtime.ssi
@@ -1,13 +1,18 @@
-B~ Customization at Runtime
+:B~ Customizing run time behaviours
 
-All configuration that is done during runtime is done by live-config. Here
+1~customizing-run-time-behaviours Customizing run time behaviours
+
+All configuration that is done during run time is done by live-config. Here
 are some most common options of live-config that users are interested in. A
 full list of all possibilities can be found in the manpage of live-config.
 
-1~ User
+2~ Customizing the live user
 
-One important consideration is that the live user is created by live-boot
-during bootup, it is not created by live-build when building the image.
+One important consideration is that the live user is created by live-boot at
+boot time, not by live-build at build time. This not only influences where
+materials relating to the live user are introduced in your build, as
+discussed in {Live/chroot local includes}#live-chroot-local-includes, but
+also any groups and permissions associated with the live user.
 
 You can specify additional groups that the live user will belong to by
 preseeding the #{passwd/user-default-groups}# debconf value. For example, to
@@ -16,12 +21,11 @@ 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
 
-1~ Language
+2~customizing-locale-and-language Customizing locale and language
 
 When the live system boots, language is involved in three steps:
 
@@ -31,28 +35,31 @@ _* setting the keyboard layout for the console
 
 _* setting the keyboard layout for X
 
-To define the locale that should be generated, use the #{locale}# parameter
-into the #{--bootappend-live}# option of #{lb config}#, e.g.:
+The default locale when building a Live system is "locales=en_US.UTF-8". To
+define the locale that should be generated, use the #{locales}# parameter in
+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
 
-This parameter can also be used in kernel command line. You can specify a
-locale by a full #{language_country.encoding}# word.
+This parameter can also be used at the kernel command line. You can specify
+a locale by a full #{language_country.encoding}# word.
 
-Both the console and X keyboard configuration depends on the #{keyb}#
-parameter of the #{--bootappend-live}# option. Valid options for X keyboard
-layouts can be found in #{/etc/X11/xkb/base.xml}# (rather limited to
-two-letters country codes). To find the value (the two characters)
-corresponding to a language try searching for the english name of the nation
-where the language is spoken, e.g:
+Both the console and X keyboard configuration depend on the
+#{keyboard-layouts}# parameter of the #{--bootappend-live}# option. Valid
+options for X keyboard layouts can be found in
+#{/usr/share/X11/xkb/rules/base.xml}# (rather limited to two-letters country
+codes). To find the value (the two characters) corresponding to a language
+try searching for the english name of the nation where the language is
+spoken, e.g:
 
 code{
 
-$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name <name>se</name>
+ $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
+ <name>se</name>
 
 }code
 
@@ -61,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
 
@@ -70,13 +77,13 @@ 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
 
 Alternatively, you can use the #{console-setup}# package, a tool to let you
-configure console layout using X (XKB) definitions; you can then setup your
+configure console layout using X (XKB) definitions; you can then set your
 keyboard layout more precisely with #{keyboard-layouts}#,
 #{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# variables;
 live-boot will use also these parameters for X configuration. For example,
@@ -85,12 +92,12 @@ 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
 
-2~ Persistence
+2~persistence Persistence
 
 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
@@ -126,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
 
@@ -135,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
 
@@ -148,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 0bb4753..8d10188 100644
--- a/manual/fr/user_examples.ssi
+++ b/manual/fr/user_examples.ssi
@@ -24,15 +24,15 @@ 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
 
 2~tutorial-1 Tutorial 1: A standard image
 
-*{Use case:}* Create a simple first image, learning the basics of live-build
+*{Use case:}* Create a simple first image, learning the basics of live-build.
 
 In this tutorial, we will build a default ISO hybrid Debian Live image
 containing only base packages (no Xorg) and some Debian Live support
@@ -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
 
@@ -69,14 +69,14 @@ stick}#copying-usb-hdd-image, respectively.
 
 2~tutorial-2 Tutorial 2: A web browser utility
 
-*{Use case}* Create a web browser utility image, learning how to apply customizations
+*{Use case:}* Create a web browser utility image, learning how to apply customizations.
 
 In this tutorial, we will create an image suitable for use as a web browser
 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
 
@@ -101,7 +101,7 @@ Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1.
 
 2~tutorial-3 Tutorial 3: A personalized image
 
-*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.
+*{Use case:}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.
 
 Since we will be changing our personalized image over a number of revisions,
 and we want to track those changes, trying things experimentally and
@@ -114,8 +114,9 @@ in {Managing a configuration}#managing-a-configuration.
 
 code{
 
-$ mkdir -p tutorial3/auto $ cp /usr/share/live/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
 
@@ -224,41 +227,53 @@ cases drawn from the collected experiences of users of Debian Live.
 
 2~ A VNC Kiosk Client
 
-Create an image with live-build to boot directly to a VNC server.
-
-_* Make a build directory: #{$ mkdir vncBuild}#
+*{Use case:}* Create an image with live-build to boot directly to a VNC server.
 
-_* Move to the build directory: #{$ cd vncBuild}#
+Make a build directory and create a skeletal configuration in it built
+around the standard-x11 list, including #{gdm3}#, #{metacity}# and
+#{xtightvncviewer}#, disabling recommends to make a minimal system:
 
-Example to config the build directory to include gdm metacity
-xtightvncviewer: #{$ lb config --packages "gdm3 metacity xtightvncviewer"}#
+code{
 
-Create a folder /etc/skel folder for a custom .xsession for the default
-user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#
+ $ mkdir vnc_kiosk_client
+ $ cd vnc_kiosk_client
+ $ lb config -a i386 -k 686 -p standard-x11 \
+     --packages "gdm3 metacity xvnc4viewer" \
+     --apt-recommends false
 
-Create the .xsession for the default user: #{$ touch
-config/chroot_local-includes/etc/skel/.xsession}#
+}code
 
-Edit the .xsession file to launch metacity and start xvncviewer with
-something similar to the below:
+Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for
+the default user that will launch metacity and start xvncviewer, connecting
+to port #{5901}# on a server at #{192.168.1.2}#:
 
 code{
 
-#!/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/vncviewer xxx.xxx.xxx.xxx:PORT
+ /usr/bin/metacity &
+ /usr/bin/xvncviewer 192.168.1.2:1
 
-exit
+ exit
+ END
 
 }code
 
-_* Build the image: #{# lb build}#
+Build the image:
+
+code{
+
+ # lb build
 
-_* Enjoy.
+}code
+
+Enjoy.
 
 2~ A base image for a 128M USB key
 
-*{Use case}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.
+*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.
 
 When optimizing an image to fit a certain media size, you need to understand
 the tradeoffs you are making between size and functionality. In this
@@ -272,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
 
@@ -281,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
 
@@ -303,3 +318,79 @@ remaining options shave off additional small amounts of space. It's up to
 you to decide if the functionality that is sacrificed with each optimization
 is worth the loss in functionality.
 
+2~ A localized KDE desktop and installer
+
+*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.
+
+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
+that would be installed by the standard Debian installer for KDE.
+
+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 find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can
+be used to dig it out of the task descriptions in tasksel-data, so to
+prepare, make sure you have both of those things:
+
+code{
+
+ # apt-get install dctrl-tools tasksel-data
+
+}code
+
+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.
+
+}code
+
+By this command, we discover the task is called, plainly enough,
+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.
+
+ Task: brazilian-portuguese-kde-desktop
+ Description: Brazilian Portuguese KDE desktop
+  This task localises the KDE desktop in Brazilian Portuguese.
+
+}code
+
+We will use the experimental #{--language}# option, as live-build happens to
+include #{syslinux}# templates for pt_BR (see {Desktop and language
+tasks}#desktop-and-language-tasks for details). And at boot time we will
+generate the pt_BR.UTF-8 locale and select the pt-latin1 keyboard
+layout. Now let's put the pieces together:
+
+code{
+
+ $ mkdir live-pt_BR-kde
+ $ cd live-pt_BR-kde
+ $ lb config \
+     -a i386 \
+     -k 486 \
+     -p kde-desktop \
+     --language pt_BR \
+     --tasks "brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop" \
+     --bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
+     --debian-installer live \
+     --packages debian-installer-launcher
+
+}code
+
+Note that we have included the #{debian-installer-launcher}# package to
+launch the installer from the live desktop, and have also specified the 486
+flavour kernel, as it is currently necessary to make the installer and live
+system kernels match for the launcher to work properly.
+
diff --git a/manual/fr/user_installation.ssi b/manual/fr/user_installation.ssi
index e59dc91..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,9 +66,18 @@ 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 ..
 
-# dpkg -i live-build*.deb
+}code
+
+Now install whichever of the freshly built #{.deb}# files you were
+interested in, e.g.
+
+code{
+
+ # dpkg -i live-build_2.0.8-1_all.deb
 
 }code
 
@@ -76,7 +85,7 @@ You can also install live-build directly to your system by executing:
 
 code{
 
-# make install
+ # make install
 
 }code
 
@@ -84,7 +93,7 @@ and uninstall it with:
 
 code{
 
-# make uninstall
+ # make uninstall
 
 }code
 
@@ -94,43 +103,37 @@ If you do not wish to build or install live-build from source, you can use
 snapshots. These are built automatically from the latest version in Git and
 are available on http://live.debian.net/debian/.
 
-2~ live-boot
+2~ live-boot and live-config
 
-*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.
+*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.
 
-% FIXME: we also need to mention live-config
+3~ From the Debian repository
 
-3~ Using a customized live-boot
+Both live-boot and live-config are available from the Debian repository as
+per {Installing live-build}#installing-live-build.
 
-% FIXME: should follow the structure for live-build above (i.e. "from
-source", not "customized" -- we should not get into customization now, but
-should reserve that discussion for later.
+3~ From source
 
-To modify the code you can follow the process below. Please ensure you are
-familiar with the terms mentioned in {Terms}#terms.
+To use the latest source from git, you can follow the process below. Please
+ensure you are familiar with the terms mentioned in {Terms}#terms.
 
-_* Checkout the live-boot source
+_* 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-boot.git
+ $ git clone git://live.debian.net/git/live-config.git
 
 }code
 
-_* Make changes to your local copy
-
-% FIXME: as indicated above, it's too early for this topic. Move to later in
-the manual.
-
-And beware that if you want to add your pre-init script in live-bottom, you
-should name it without dashes '-', e.g: call it "99new_feature" and not
-"99new-feature".
+Consult the live-boot and live-config man pages for details on customizing
+if that is your reason for building these packages from source.
 
-_* Build a live-boot .deb
+_* Build live-boot and live-config .deb files
 
 You must build either on your target distribution or in a chroot containing
 your target platform: this means if your target is Squeeze then you should
-build against Squeeze. Y
+build against Squeeze.
 
 Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to
 build #{live-boot}# for a target distribution that differs from your build
@@ -141,28 +144,33 @@ system distribution, you may build directly on the build system using
 
 code{
 
-$ cd live-boot $ dpkg-buildpackage -b -uc -us
+ $ cd live-boot
+ $ dpkg-buildpackage -b -uc -us
+ $ cd ../live-config
+ $ dpkg-buildpackage -b -uc -us
 
 }code
 
-_* Use the generated live-boot .deb
+_* Use all generated .deb files
 
-As live-boot is installed by live-build system, installing the package in
-the host system is not sufficient: you should treat the generated .deb like
-another custom package. Please see {Customizing package
-installation}#customizing-package-installation for more information. You
-should pay particular attention to {Additional
+As live-boot and live-config are installed by live-build system, installing
+the packages in the host system is not sufficient: you should treat the
+generated .deb files like any other custom packages. Please see {Customizing
+package installation}#customizing-package-installation for more
+information. You should pay particular attention to {Additional
 repositories}#additional-repositories.
 
-3~ Using live-boot snapshots
+3~ From 'snapshots'
 
-You can let live-build automatically use the latest snapshot of live-boot by
-configuring a third-party repository in your live-build configuration
-directory. Assuming you have already created a configuration tree with #{lb
-config}#:
+You can let live-build automatically use the latest snapshots of live-boot
+and live-config by configuring a third-party repository in your live-build
+configuration directory. Assuming you have already created a configuration
+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 a19f611..abab4fa 100644
--- a/manual/fr/user_managing_a_configuration.ssi
+++ b/manual/fr/user_managing_a_configuration.ssi
@@ -22,8 +22,9 @@ retain old values that are no longer appropriate.
 
 A second, related problem is that if you run #{lb config}# and then upgrade
 to a new version of live-build that has changed one of the variable names,
-you will discover this only by manual review of the variables in your config
-files, which you will then need to use to set the appropriate option again.
+you will discover this only by manual review of the variables in your
+#{config/*}# files, which you will then need to use to set the appropriate
+option again.
 
 All of this would be a terrible nuisance if it weren't for auto/* scripts,
 simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands
@@ -49,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
 
@@ -60,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
 
@@ -72,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
 
@@ -81,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 cf9f187..3d6b063 100644
--- a/manual/fr/user_overview.ssi
+++ b/manual/fr/user_overview.ssi
@@ -18,11 +18,11 @@ Many concepts are similar to those in the debhelper Debian package tools
 written by Joey Hess:
 
 _* The scripts have a central location for configuring their operation. In
-debhelper, this is the debian subdirectory of a package tree. For example,
-dh_install will look, amongst others, for a file called #{debian/install}#
-to determine which files should exist in a particular binary package. In
-much the same way, live-build stores its configuration entirely under a
-config subdirectory.
+debhelper, this is the #{debian/}# subdirectory of a package tree. For
+example, dh_install will look, amongst others, for a file called
+#{debian/install}# to determine which files should exist in a particular
+binary package. In much the same way, live-build stores its configuration
+entirely under a #{config/}# subdirectory.
 
 _* The scripts are independent - that is to say, it is always safe to run
 each command.
@@ -46,42 +46,51 @@ _* *{lb clean}*: Responsible for removing parts of a Live system build. See
 3~lb-config The #{lb config}# command
 
 As discussed in {live-build}#live-build, the scripts that make up live-build
-source their configuration from a single directory named config/. As
+source their configuration from a single directory named #{config/}#. As
 constructing this directory by hand would be time-consuming and error-prone,
 the #{lb config}# command can be used to create skeleton configuration
 folders.
 
-Issuing #{lb config}# without any arguments creates a config subdirectory
-which it populates with some default settings:
+Issuing #{lb config}# without any arguments creates a #{config/}#
+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/de/_sisu/.empty b/manual/it/_sisu/.empty
similarity index 100%
copy from manual/de/_sisu/.empty
copy to manual/it/_sisu/.empty
diff --git a/manual/de/_sisu/.empty b/manual/it/_sisu/image/.empty
similarity index 100%
copy from manual/de/_sisu/.empty
copy to manual/it/_sisu/image/.empty
diff --git a/manual/de/_sisu/sisurc.yml b/manual/it/_sisu/sisurc.yml
similarity index 100%
copy from manual/de/_sisu/sisurc.yml
copy to manual/it/_sisu/sisurc.yml
diff --git a/manual/de/_sisu/skin/doc/skin_debian-live.rb b/manual/it/_sisu/skin/doc/skin_debian-live.rb
similarity index 100%
copy from manual/de/_sisu/skin/doc/skin_debian-live.rb
copy to manual/it/_sisu/skin/doc/skin_debian-live.rb
diff --git a/manual/it/about_manual.ssi b/manual/it/about_manual.ssi
new file mode 100644
index 0000000..f086f90
--- /dev/null
+++ b/manual/it/about_manual.ssi
@@ -0,0 +1,270 @@
+:B~ A proposito di questo manuale
+
+1~ A proposito di questo manuale
+
+L'obiettivo di questo manuale è quello di servire da punto di accesso
+centralizzato per tutta la documentazione relativa al progetto Debian Live;
+non include documentazione rivolta agli utenti finali sul come usare un
+sistema Debian Live, se non quella specifica per un sistema live.
+
+Alcuni dei comandi menzionati nel testo devono essere eseguiti con i
+privilegi di super-utente che possono essere ottenuti diventando utente root
+tramite #{su}# oppure usando #{sudo}#. Per distinguere i comandi che possono
+essere eseguiti come utente normale da quelli che necessitano dei privilegi
+di super-utente, i comandi sono preceduti rispettivamente da #{$}# o
+#{#}#. Questi simboli non fanno parte del comando.
+
+2~ Per gli impazienti
+
+Sebbene crediamo che ogni cosa in questo manuale sia importante almeno per
+alcuni dei nostri utenti, ci rendiamo conto che c'è tanto materiale da
+trattare e che si potrebbe voler provare il software prima di entrare nei
+dettagli. Pertanto, abbiamo messo a disposizione nella sezione
+{Esempi}#examples tre tutorial progettati per insegnarvi le basi della
+costruzione e della personalizzazione delle immagini. Si legga innanzitutto
+{Usare gli esempi}#using-the-examples, seguito da {Tutorial 1: un'immagine
+standard}#tutorial-1, {Tutorial 2: un programma di utilità web
+browser}#tutorial-2 e, infine, {Tutorial 3: un'immagine
+personalizzata}#tutorial-3. Alla fine di queste esercitazioni, si avrà un
+assaggio di ciò che si può fare con Debian Live. Ti invitiamo ad uno studio
+più approfondito del manuale, magari leggendo in seguito {Nozioni di
+base}#the-basics, sfogliando o saltando {Creare un'immagine
+netboot}#building-netboot-image, e finendo con la lettura di {Panoramica
+sulla personalizzazione}#customization-overview e dei capitoli che lo
+seguono. A questo punto, ci auguriamo che tu sia davvero eccitato da ciò che
+si può fare con Debian Live e motivato a leggere il resto del manuale, da
+cima a fondo.
+
+2~terms Glossario
+
+_* *{Live system}*: Un sistema operativo che può partire senza installazione
+su disco rigido. I sistemi live non alterano né il sistema operativo locale
+(o i sistemi operativi locali) né i file già installati sul disco rigido del
+computer a meno che lo si faccia volontariamente. I sistemi live vengono
+solitamente avviati da supporti quali CD, DVD o penne USB; alcuni possono
+anche avviarsi via rete.
+
+_* *{Debian Live}*: Il sotto-progetto Debian che mantiene i pacchetti
+live-boot, live-build, live-config e live-manual.
+
+_* *{Debian Live system}*: Un sistema live che usa software proveniente dal
+sistema operativo Debian e che può essere lanciato da CD, DVD, supporti USB,
+via rete (tramite immagini netboot) e via internet (tramite il parametro di
+boot #{fetch=URL}#).
+
+_* *{Host system}*: L'ambiente utilizzato per creare il sistema live.
+
+_* *{Target system}*: L'ambiente usato per eseguire il sistema live.
+
+_* *{live-boot}*: Una raccolta di script usati per avviare sistemi
+live. live-boot era una parte di live-initramfs.
+
+_* *{live-build}*: Una raccolta di script usati per creare sistemi Debian
+Live personalizzati. live-build era conosciuto come live-helper, ed ancora
+prima come live-package.
+
+_* *{live-config}*: Una raccolta di script usati per configurare un sistema
+live durante il processo di inizializzazione. live-config era una parte di
+live-initramfs.
+
+_* *{live-manual}*: Questo documento è inserito nel pacchetto chiamato
+live-manual.
+
+_* *{Debian Installer (d-i)}*: Il sistema d'installazione ufficiale per la
+distribuzione Debian.
+
+_* *{Boot parameters}*: Parametri che possono essere immessi nel prompt del
+boot loader per modificare il comportamento del kernel o di live-config.
+
+_* *{chroot}*: Il programma chroot, #{chroot(8)}#, rende possibile eseguire
+diverse istanze dell'ambiente GNU/Linux su un singolo sistema
+simultaneamente senza riavviare.
+
+_* *{Binary image}*: Un file che contiene il sistema live, come binary.iso o
+binary.img.
+
+_* *{Target distribution}*: La distribuzione su cui sarà basato il sistema
+live. Può differire dalla distribuzione presente sul proprio computer.
+
+_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Nomi in codice per i
+rilasci Debian; al momento Squeeze è l'attuale *{stable}* e Wheezy l'attuale
+*{testing}*. Sid sarà sempre il sinonimo della *{unstable}*. In tutto il
+manuale si tende ad usare i nomi in codice dei rilasci, in quanto questo è
+ciò che è previsto dagli strumenti stessi.
+
+La distribuzione *{stable}* contiene l'ultima distribuzione ufficialmente
+rilasciata da Debian; la *{testing}* è il punto di raccolta per i pacchetti
+della prossima *{stable}*. Uno dei principali vantaggi nell'uso di questa
+distribuzione sta nell'avere software più recente rispetto alla
+*{stable}*. La distribuzione *{unstable}* è dove avviene lo sviluppo attivo
+di Debian; viene generalmente usata dagli sviluppatori o da coloro che amano
+l'azzardo.
+
+2~ Autori
+
+Lista degli autori (in ordine alfabetico):
+
+_* Ben Armstrong
+
+_* Brendan Sleight
+
+_* Chris Lamb
+
+_* Daniel Baumann
+
+_* Franklin Piat
+
+_* Jonas Stein
+
+_* Kai Hendry
+
+_* Marco Amadori
+
+_* Mathieu Geli
+
+_* Matthias Kirschner
+
+_* Richard Nelson
+
+_* Trent W. Buck
+
+2~ Contribuire a questo documento
+
+Questo manuale è pensato come un progetto comunitario e ogni suggerimento e
+contributo è benvenuto. Il modo migliore per apportare un contributo è di
+inviarlo alla mailing list. Per maggiori informazioni si veda la sezione
+{Contatti}#contact.
+
+Quando si sottopone un contributo, si prega di indicare chiaramente il
+detentore del copyright e di includere la licenza. Si noti che, per essere
+accettato, il contributo deve essere distribuito con la stessa licenza del
+resto del documento, ovvero la GPL versione 3 o successiva.
+
+I sorgenti di questo manuale sono mantenuti utilizzando il sistema di
+controllo Git. Si può visionare la copia più recente eseguendo:
+
+code{
+
+$ git clone git://live.debian.net/git/live-manual.git
+
+}code
+
+Prima di sottoporre un contributo, si prega di visionare l'anteprima del
+proprio lavoro. Per ottenere l'anteprima di live-manual, assicurarsi di
+avere installati i pacchetti necessari per la sua compilazione eseguendo:
+
+code{
+
+ # apt-get install make po4a sisu-complete libnokogiri-ruby
+
+}code
+
+Si può compilare il live-manual dalla directory superiore del checkout di
+Git eseguendo:
+
+code{
+
+ $ make build
+
+}code
+
+Dato che occorre del tempo per compilare il manuale in tutte le lingue
+supportate, può risultare conveniente farlo per una sola lingua, ad esempio
+eseguendo:
+
+code{
+
+ $ make build LANGUAGES=en
+
+}code
+
+3~ Applicare le patch
+
+Chiunque può eseguire il commit direttamente sul repository; tuttavia
+chiediamo di inviare le modifiche più corpose in mailing list, per poterne
+prima discuterne. Per eseguire il push sul repository, si deve seguire
+questa procedura:
+
+_* 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*
+
+}code
+
+_* Aggiungere la seguente sezione alla propria configurazione di
+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
+
+}code
+
+_* Scaricare tramite ssh un clone del manuale:
+
+code{
+
+ $ git clone gitosis at live.debian.net:/live-manual.git
+
+}code
+
+_* Dopo aver modificato i file in #{manual/en/}#, chiamare il target
+'commit' nella directory superiore per bonificare i file ed aggiornare i
+file di traduzione:
+
+code{
+
+ $ make commit
+
+}code
+
+_* Dopo la pulizia è possibile eseguire il commit delle modifiche. Si
+scrivano messaggi costituiti da frasi in inglese esaurienti ed utili,
+inizianti con una lettera maiuscola e terminanti con un punto. Solitamente
+cominceranno con la forma 'Fixing/Adding/Removing/Correcting/Translating',
+ad esempio.
+
+code{
+
+ $ git commit -a -m "Adding a section on applying patches."
+
+}code
+
+_* Inviare il commit al server:
+
+code{
+
+ $ git push
+
+}code
+
+3~ Traduzione
+
+Per inviare una traduzione per una nuova lingua, seguire questi tre passi:
+
+_* Tradurre i file about_manual.ssi.pot, about_project.ssi.pot e
+index.html.in.pot nella propria lingua con il proprio editor preferito (tipo
+poedit). Inviare i file tradotti alla mailing list. Una volta che abbiamo
+ricevuto il contributo, aggiungeremo la nuova lingua al manuale (fornendo i
+file po) e la attiveremo per la procedura di compilazione automatica.
+
+_* Una volta che la nuova lingua è stata aggiunta, si può iniziare a
+tradurre tutti i file po situati in #{manual/po/}#, nell'ordine che si
+preferisce.
+
+_* Non si dimentichi che è necessario dare un #{make commit}# per
+assicurarsi che i manuali tradotti siano aggiornati partendo dai file po,
+prima di #{git commit -a}# e #{git push}#.
+
diff --git a/manual/it/about_project.ssi b/manual/it/about_project.ssi
new file mode 100644
index 0000000..4268ded
--- /dev/null
+++ b/manual/it/about_project.ssi
@@ -0,0 +1,110 @@
+:B~ A proposito del progetto Debian Live
+
+1~ A proposito del progetto Debian Live
+
+2~ Motivazioni
+
+3~ Cosa c'è di sbagliato con gli attuali sistemi live
+
+Quando Debian Live iniziò erano disponibili svariati sistemi live basati su
+Debian che tuttora stanno facendo un buon lavoro. Dal punto di vista di
+Debian molti di essi hanno uno o più dei seguenti svantaggi:
+
+_* Sono progetti non ufficiali, sviluppati al di fuori di Debian.
+
+_* Mischiano differenti distribuzioni come ad esempio: *{testing}* e
+*{unstable}*.
+
+_* Supportano solamente i386.
+
+_* Modificano l'aspetto e il comportamento dei pacchetti snellendoli per
+risparmiare spazio.
+
+_* Includono pacchetti non ufficiali.
+
+_* Forniscono un kernel con patch addizionali che non appartengono a Debian.
+
+_* Sono grandi e lenti a causa delle loro dimensioni e non adatti per
+operazioni di salvataggio.
+
+_* Non sono disponibili in diversi formati come CD, DVD, penne USB e
+immagini netboot.
+
+3~ Perché creare il proprio sistema live?
+
+Debian è il Sistema Operativo Universale: ha un sistema live ufficiale per
+mostrare e rappresentare ufficialmente il vero, unico e solo sistema Debian
+con i seguenti principali vantaggi:
+
+_* Sarebbe un sottoprogetto ufficiale Debian.
+
+_* Riflette lo stato (attuale) di una distribuzione.
+
+_* Gira su più architetture possibili.
+
+_* È costituito solo da pacchetti Debian non modificati.
+
+_* Non contiene nessun pacchetto non ufficiale.
+
+_* Usa un kernel Debian inalterato senza patch addizionali.
+
+2~ Filosofia
+
+3~ Solamente pacchetti ufficiali inalterati
+
+Verranno usati solo pacchetti ufficiali dei repository Debian della sezione
+"main". La sezione non-free non è parte di Debian perciò non possono essere
+affatto usati per le immagini ufficiali del sistema live.
+
+Non verrà cambiato nessun pacchetto. Nel caso in cui sarà necessario
+cambiare qualcosa sarà fatto in coordinazione con il maintainer del
+pacchetto Debian.
+
+In via eccezionale i nostri pacchetti come live-boot, live-build o
+live-config possono temporaneamente essere usati dal nostro repository per
+ragioni di sviluppo (ad esempio per creare istantanee). Verranno caricati
+regolarmente in Debian.
+
+3~ Nessun pacchetto di configurazione per il sistema live
+
+In questa fase non saranno disponibili né esempi di installazione né
+configurazioni alternative. Tutti i pacchetti vengono usati con la loro
+configurazione predefinita così come accade con una regolare installazione
+di Debian.
+
+Nel caso in cui serva una configurazione predefinita differente, sarà fatto
+in coordinazione con il maintainer del pacchetto in Debian.
+
+Viene fornito un sistema per configurare i pacchetti tramite debconf nel
+#{lb config}# (use --preseed FILE) consentendo di installare pacchetti
+configurati secondo le proprie preferenze nell'immagine Debian Live
+personalizzata, ma per le immagini ufficiali verrà usata la configurazione
+predefinita. Per ulteriori informazioni si veda {Panoramica sulla
+personalizzazione}#customization-overview.
+
+Eccezione: ci sono alcuni cambiamenti essenziali per far nascere un sistema
+live (ad esempio configurare pam per permettere le password vuote). Queste
+modifiche essenziali devono essere tenute al minimo possibile e saranno
+eventualmente aggiunte ai repository Debian.
+
+2~contact Contatti
+
+_* *{Mailing list}*: Il principale contatto del progetto è la mailing list
+http://lists.debian.org/debian-live/, si possono inviare email alla lista
+direttamente a debian-live at lists.debian.org. Gli archivi sono disponibili
+presso http://lists.debian.org/debian-live/.
+
+_* *{IRC}*: Molti utenti e sviluppatori sono presenti sul canale
+#debian-live su irc.debian.org (OFTC). Quando si pone una domanda su IRC, si
+prega di essere pazienti nell'ottenere una risposta; se non si riceve
+risposta scrivere alla mailing list.
+
+_* *{BTS}*: Il Debian Bug Tracking System (BTS) contiene i dettagli dei bug
+riportati dagli utenti e dagli sviluppatori. A ciascun bug viene assegnato
+un numero, e viene mantenuto finché non è segnato come risolto. Per
+ulteriori informazioni si veda {Segnalare bug}#bugs.
+
+_* *{Wiki}*: Il wiki di Debian Live all'indirizzo
+http://wiki.debian.org/DebianLive è un posto dove raccogliere informazioni,
+discutere di tecnologie applicate e documenti sull'infrastruttura dei
+sistemi Debian Live che vanno oltre lo scopo di questo manuale.
diff --git a/manual/it/index.html.in b/manual/it/index.html.in
new file mode 100644
index 0000000..3debad0
--- /dev/null
+++ b/manual/it/index.html.in
@@ -0,0 +1,62 @@
+<html>
+
+<head>
+	<title>Progetto Debian Live</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+</head>
+
+<body>
+	<h2>Manuale Debian Live</h2>
+
+	<p>
+		<i>Questo manuale è in fase di sviluppo.</i>
+	</p>
+
+	<p>
+		Si prega di segnalare errori, omissioni, patch e suggerimenti sulla nostra
+mailing list <a
+href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>
+e leggere <a href="html/1.html#37">come contribuire</a> al manuale.
+	</p>
+
+	<h3>Formati disponibili</h3>
+
+	<ul>
+		<li><a href="epub/live-manual.epub">EPUB</a></li>
+		<li>HTML: <a href="html/index.html">multi-pagina</a>, <a
+href="html/live-manual.html">pagina unica</a></li>
+		<li><a href="odf/live-manual.odt">ODF</a></li>
+		<li>PDF: <a href="pdf/live-manual.portrait-a4.pdf">A4 verticale</a>, <a
+href="pdf/live-manual.landscape-a4.pdf">A4 orizzontale</a>, <a
+href="pdf/live-manual.portrait-letter.pdf">lettera verticale</a>, <a
+href="pdf/live-manual.landscape-letter.pdf">lettera orizzontale</a></li>
+		<li><a href="txt/live-manual.txt">Testo semplice</a></li>
+	</ul>
+
+	<p>
+		Ultima modifica: @DATE_CHANGE@<br />
+		Ultima compilazione: @DATE_BUILD@
+	</p>
+
+	<h3>Sorgente</h3>
+
+	<p>
+		I sorgenti di questo manuale sono disponibili nel repository <a
+href="http://git.or.cz/">Git</a> su live.debian.net.
+	</p>
+
+	<ul>
+		<li>Sfoglia: <a
+href="http://live.debian.net/gitweb/?p=live-manual.git"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></a></li>
+		<li>Git: <a
+href="git://live.debian.net/git/live-manual.git"><small><tt>git://live.debian.net/git/live-manual.git</tt></small></a></li>
+	</ul>
+
+	<p>
+		<a href="http://live.debian.net/">Debian Live</a> &lt;<a
+href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>&gt;
+- <a href="http://live.debian.net/legal.html">Note legali</a>
+	</p>
+</body>
+
+</html>
diff --git a/manual/it/live-manual.ssm b/manual/it/live-manual.ssm
new file mode 100644
index 0000000..6c45cac
--- /dev/null
+++ b/manual/it/live-manual.ssm
@@ -0,0 +1,63 @@
+% SiSU 2.0
+
+ at title: Manuale di Debian Live
+
+ at creator: Debian Live Project <debian-live at lists.debian.org>
+
+ at rights:
+ :copyright: Copyright (C) 2006-2010 Debian Live Project
+ :license: Questo programma è software libero: è possibile ridistribuirlo e modificarlo secondo i termini della GNU General Public License come pubblicata dalla Free Software Foundation, sia la versione 3 della licenza o (a scelta) una versione successiva.<br><br>Questo programma è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per ulteriori dettagli.<br><br>Si dovrebbe aver ricevuto una copia della GNU General Public License con questo programma. In caso contrario, vedere http://www.gnu.org/licenses/. <br><br>Sui sistemi Debian, il testo completo della GNU General Public License può essere trovato nel file /usr/share/common-licenses/GPL-3.
+
+ at date:
+ :published: 2010-12-24
+
+ at publisher: Debian Live Project <debian-live at lists.debian.org>
+
+ at make:
+ :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/
+ :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/
+ :num_top: 1
+ :skin: skin_debian-live
+
+:A~ @title
+
+:B~ A proposito
+
+<< about_manual.ssi
+
+<< about_project.ssi
+
+:B~ Utente
+
+<< user_installation.ssi
+
+<< user_basics.ssi
+
+<< user_overview.ssi
+
+<< user_managing_a_configuration.ssi
+
+<< user_customization-overview.ssi
+
+<< user_customization-packages.ssi
+
+<< user_customization-contents.ssi
+
+<< user_customization-runtime.ssi
+
+<< user_customization-binary.ssi
+
+<< user_customization-installer.ssi
+
+:B~ Progetto
+
+<< project_bugs.ssi
+
+<< project_coding-style.ssi
+
+<< project_procedures.ssi
+
+:B~ Esempi
+
+<< user_examples.ssi
+
diff --git a/manual/it/project_bugs.ssi b/manual/it/project_bugs.ssi
new file mode 100644
index 0000000..3f32eaf
--- /dev/null
+++ b/manual/it/project_bugs.ssi
@@ -0,0 +1,204 @@
+B~ Segnalare bug
+
+1~bugs Segnalare bug
+
+Debian Live è lungi dall'essere perfetta, ma con il vostro aiuto vogliamo
+avvicinarci il più possibile a questo livello. Non esitare a segnalare un
+bug: è meglio compilare un rapporto due volte che mai. Questo capitolo
+include alcune raccomandazioni su come presentare una buona segnalazione.
+
+Per gli impazienti
+
+_* Per i problemi noti verificare sempre lo stato degli aggiornamenti
+dell'immagine sulla nostra pagina iniziale http://live.debian.net/.
+
+_* Prima di inviare una segnalazione di bug provare a riprodurlo con le
+*{versione più recenti}* di live-build, live-boot e live-config.
+
+_* Si cerchi di fornire *{informazioni il più dettagliate possibile}*
+riguardo il bug. Questo comprende (almeno) la versione di live-build,
+live-boot e live-config utilizzata e la distribuzione del sistema live che
+si sta costruendo.
+
+2~ Problemi noti
+
+Giacché Debian *{testing}* e Debian *{unstable}* subiscono cambiamenti
+continui, quando si specifica l'una o l'altra come sistema di destinazione,
+può non essere sempre possibile una creazione che vada a buon fine.
+
+% FIXME:
+
+Se questo causa troppe difficoltà, non creare un sistema basato su
+*{testing}* o *{unstable}* ma usare piuttosto *{stable}*. live-build si basa
+su *{stable}* in modo predefinito.
+
+I problemi noti al momento sono elencati sotto la sezione "status" della
+nostra pagina iniziale http://live.debian.net/
+
+Questo manuale non intende insegnare come identificare e risolvere
+correttamente i problemi dei pacchetti delle distribuzioni di sviluppo,
+tuttavia ci sono un paio di cose da provare: se la creazione di *{testing}*
+non va a buon fine provare con *{unstable}*; se non funziona nemmeno
+*{unstable}* tornare a *{testing}* ed effettuare il pinning da *{unstable}*
+alla nuova versione del pacchetto corrotto (si veda {APT
+pinning}#apt-pinning per i dettagli).
+
+2~ Ricostruire da zero
+
+Per essere certi che un particolare bug non sia causato dalla creazione di
+un sistema non pulito, ricostruire sempre l'intero sistema da zero per
+vedere se il bug sia riproducibile.
+
+2~ Usare pacchetti aggiornati
+
+L'utilizzo di pacchetti datati può causare notevoli complicazioni nel
+tentativo di riprodurre (e alla fine risolvere) il problema. Assicurarsi che
+il sistema creato sia aggiornato e ogni pacchetto incluso nell'immagine lo
+sia a sua volta.
+
+2~collect-information Raccogliere informazioni
+
+Nella segnalazione si invita a fornire informazioni sufficienti. Dovrebbe
+almeno contenere l'esatta versione di live-build nella quale si è trovato il
+bug e i passi per riprodurlo. Con un po' di buon senso si può includere
+qualsiasi altro dettaglio rilevante che si ritiene utile per la risoluzione
+del problema.
+
+Affinché la segnalazione del bug sia migliore possibile, si richiedono
+almeno le seguenti informazioni:
+
+_* Architettura del sistema ospitante
+
+_* Versione di live-build sul sistema ospitante
+
+_* Versione di live-boot sul sistema ospitante
+
+_* Versione di live-config sul sistema live
+
+_* Versione di #{debootstrap}# o #{cdebootstrap}# sul sistema ospitante
+
+_* Architettura del sistema live
+
+_* Distribuzione del sistema live
+
+_* Versione del kernel sul sistema live
+
+È possibile generare un registro del processo di costruzione usando il
+comando #{tee}#. Si raccomanda di farlo automaticamente con uno script
+#{auto/build}#; (si veda {Gestire una
+configurazione}#managing-a-configuration per i dettagli).
+
+code{
+
+ # lb build 2>&1 | tee build.log
+
+}code
+
+All'avvio, live-boot conserva un registro in #{/var/log/live.log}# (or
+#{/var/log/live-boot.log}#).
+
+Inoltre, per escludere altri errori, è sempre una buona idea creare un tar
+della propria directory #{config/}# e caricarlo da qualche parte (*{non}*
+inviarlo come allegato alla mailing list), in modo che sia per noi possibile
+riprodurre gli errori incontrati. Se ciò causa problemi (ad esempio a causa
+della dimensione) si può utilizzare l'output di #{lb config --dump}# che
+produce un sommario dell'albero di configurazione (elenca i file nelle
+sottodirectory di #{config/}# ma non le include).
+
+Ricordarsi che i file di registro da inviare vanno creati con l'impostazione
+della lingua inglese, ad esempio eseguendo il comando live-build preponendo
+#{LC_ALL=C}# oppure #{LC_ALL=en_US}#.
+
+2~ Se possibile isolare il caso non andato a buon fine
+
+Se possibile, isolare il caso non andato a buon fine alla variazione più
+piccola che lo causa. Non è sempre facile da fare, perciò non preoccupatevi
+se non riuscite a gestirlo per la vostra segnalazione. Tuttavia, se si
+pianifica bene il ciclo di sviluppo adottando piccole modifiche per ogni
+iterazione, si riuscirà ad isolare il problema creando una configurazione
+semplificata che si avvicina all'attuale con l'aggiunta delle sole modifiche
+problematiche. Se si incontrano serie difficoltà nel trovare la causa,
+potrebbe essere che sono stati inseriti troppi cambiamenti in una sola volta
+e bisogna cambiare approccio.
+
+2~ Segnalare il bug del pacchetto giusto
+
+Dove appare il bug?
+
+3~ Durante la compilazione mentre esegue il bootstrap
+
+live-build avvia inizialmente un sistema Debian di base con #{debootstrap}#
+o #{cdebootstrap}#; può fallire a seconda dello strumento utilizzato e della
+distribuzione Debian che si sta avviando. Se il bug appare a questo punto
+controllare che l'errore sia relativo ad uno specifico pacchetto Debian (più
+probabile) o allo strumento di avvio stesso.
+
+In entrambi i casi non è un bug in Debian Live, ma piuttosto in Debian
+stessa che non può essere risolto direttamente. Si prega di inviare una
+segnalazione di bug riguardo l'utilità di avvio o il pacchetto che ha
+fallito.
+
+3~ Durante la compilazione mentre installa i pacchetti
+
+live-build installa pacchetti aggiuntivi dall'archivio Debian e può fallire
+a seconda della distribuzione Debian e lo stato dell'archivio giornaliero.Se
+il bug appare a questo punto, controllare che l'errore sia riproducibile su
+un sistema normale.
+
+In questo caso non è un bug in Debian Live, ma piuttosto in Debian, inviare
+una segnalazione sul pacchetto che ha fallito. Si otterranno maggiori
+informazioni eseguendo #{debootstrap}# separatamente dal sistema live o
+eseguendo #{lb bootstrap --debug}#.
+
+Se si verifica un problema utilizzando un mirror locale o un qualsiasi tipo
+di proxy è bene riprodurlo avviando da un mirror ufficiale.
+
+3~ In fase di avvio
+
+Se l'immagine non si avvia segnalarlo alla mailing list con le informazioni
+richieste in {Raccogliere informazioni}#collect-information. Non dimenticare
+di menzionare come e quando l'immagine fallisce, in Qemu, VMWare o hardware
+reale. Se si utilizza un qualsiasi sistema di virtualizzazione provare
+sempre su hardware reale prima di segnalare un bug; anche fornire
+un'istantanea dello schermo può essere molto utile.
+
+3~ In fase di esecuzione
+
+Se un pacchetto è stato installato con successo ma fallisce durante
+l'esecuzione del sistema live, si tratta probabilmente di un bug in Debian
+Live. Tuttavia,
+
+2~ Fare la ricerca
+
+Prima di riportare il bug si prega di cercare sul web il messaggio d'errore
+o il sintomo ottenuti. Poiché è altamente improbabile essere l'unica persona
+ad incontrare un certo problema, c'è sempre la possibilità che sia stato
+discusso altrove e che siano stati proposte una soluzione, una patch o
+soluzione temporanea.
+
+Si dovrebbe prestare particolare attenzione alla mailing list di Debian Live
+così come la pagina iniziale del sito, in quanto contengono informazioni più
+aggiornate. Se tale informazione esiste si includa sempre un riferimento
+nella segnalazione del bug.
+
+In aggiunta bisogna controllare l'attuale elenco dei bug riguardanti
+live-build, live-boot e live-config per vedere se sia già stato segnalato
+qualcosa di simile.
+
+2~ Dove segnalare i bug
+
+Il progetto Debian Live tiene traccia di tutti i bug sul Debian Bug Tracking
+System (BTS, sistema di tracciamento dei bug Debian), si veda
+http://bugs.debian.org/ per le informazioni su come usarlo. È anche
+possibile utilizzare il comando #{reportbug}# dall'omonimo pacchetto.
+
+In genere bisogna riportare gli errori in fase di compilazione verso il
+pacchetto live-build, quelli di avvio verso live-boot e quelli in fase di
+esecuzione a live-config. Se non siete certi di quale sia il pacchetto
+appropriato o serve maggiore aiuto prima della segnalazione, inviate un
+messaggio in mailing list e vi aiuteremo a capire.
+
+Si noti che i bug trovati nelle distribuzioni derivate da Debian (come
+Ubuntu e altre) *{non}* vanno segnalati a Debian BTS a meno che non siano
+riproducibili anche su un sistema Debian utilizzando pacchetti ufficiali
+Debian.
diff --git a/manual/it/project_coding-style.ssi b/manual/it/project_coding-style.ssi
new file mode 100644
index 0000000..798835c
--- /dev/null
+++ b/manual/it/project_coding-style.ssi
@@ -0,0 +1,148 @@
+B~ Lo stile nello scrivere codice
+
+1~ Lo stile nello scrivere codice
+
+Questo capitolo documenta lo stile usato per il codice di live-boot e gli
+altri.
+
+2~ Compatibilità
+
+_* Non usare sintassi o semantiche mirate alla shell Bash. Ad esempio, l'uso
+di costrutti array.
+
+_* Utilizzare solo il sottoinsieme POSIX - ad esempio, usare $(foo) invece
+di `foo`.
+
+_* È possibile verificare i propri script con "sh -n" e "checkbashisms".
+
+2~ Rientri
+
+_* Usare sempre i tab piuttosto che gli spazi.
+
+2~ Ritorno a capo
+
+_* Generalmente le righe sono composte da un massimo di 80 caratteri.
+
+_* Utilizzare lo "stile Linux" per le interruzioni di riga:
+
+Sbagliato:
+
+code{
+
+ if foo; then
+         bar
+ fi
+
+}code
+
+Corretto:
+
+code{
+
+ if foo
+ then
+         bar
+ fi
+
+}code
+
+_* Lo stesso vale per le funzioni:
+
+Sbagliato:
+
+code{
+
+ foo () {
+         bar
+ }
+
+}code
+
+Corretto:
+
+code{
+
+ foo ()
+ {
+         bar
+ }
+
+}code
+
+2~ Variabili
+
+_* Le variabili vanno sempre scritte in maiuscolo.
+
+_* Le variabili usate in #{lb config}# iniziano sempre con il prefisso
+#{LB_}#.
+
+_* Le variabili interne temporanee in live-build dovrebbero iniziare con il
+prefisso #{\_LB_}#.
+
+_* Le variabili locali iniziano con il prefisso live-build #{\_\_LB_}#.
+
+_* Le variabili in live-config relative ai parametri di avvio iniziano con
+#{LIVE_}#.
+
+_* Tutte le altre variabili in live-config iniziano con il prefisso #{_}#.
+
+_* Intorno alle variabili utilizzare le graffe; ad esempio scrivere
+#{${FOO}}# invece di #{$FOO}#.
+
+_* Proteggere sempre le variabili con le virgolette per rispettare
+potenziali spaziature: scrivere #{"${FOO}"}# e non #{${FOO}}#.
+
+_* Per ragioni di coerenza, usare sempre le virgolette quando si assegnano
+valori alle variabili:
+
+Sbagliato:
+
+code{
+
+ FOO=bar
+
+}code
+
+Corretto:
+
+code{
+
+ FOO="bar"
+
+}code
+
+_* Utilizzando variabili multiple, quotare l'intera espressione:
+
+Sbagliato:
+
+code{
+
+ if [ -f "${FOO}"/foo/"${BAR}"/bar ]
+ then
+         foobar
+ fi
+
+}code
+
+Corretto:
+
+code{
+
+ if [ -f "${FOO}/foo/${BAR}/bar" ]
+ then
+         foobar
+ fi
+
+}code
+
+2~ Varie
+
+_* Per le chiamate a sed utilizzare "#{|}#" (senza virgolette intorno) come
+separatore, ad esempio "#{sed -e 's|foo|bar|'}#" (senza "").
+
+_* Non utilizzare il comando #{test}# per prove o confronti, usare "#{[}#"
+"#{]}#" (senza ""); ad esempio "#{if [ -x /bin/foo ]; ...}#" e non "#{if
+test -x /bin/foo; ...}#".
+
+_* Ove possibile utilizzare #{case}# invece di #{test}#, essendo più facile
+da leggere e più veloce in esecuzione.
diff --git a/manual/it/project_procedures.ssi b/manual/it/project_procedures.ssi
new file mode 100644
index 0000000..334c2d8
--- /dev/null
+++ b/manual/it/project_procedures.ssi
@@ -0,0 +1,142 @@
+B~ Procedure
+
+1~procedures Procedure
+
+Questo capitolo documenta le procedure all'interno del progetto Debian Live
+per vari compiti che necessitano di cooperazione con altri team Debian.
+
+2~ Aggiornamenti degli udeb
+
+Prima di effettuare dei commit di un udeb nel repository svn
+dell'installatore Debian va eseguito:
+
+code{
+
+ $ ../../scripts/l10n/output-l10n-changes . -d
+
+}code
+
+2~ Rilasci importanti
+
+Rilasciare una nuova versione stabile di Debian implica che molti team
+differenti lavorino insieme; ad un certo punto si inserisce il team Live che
+prepara le immagini del sistema live. I requisiti per fare ciò sono:
+
+_* Un mirror contenente le versioni rilasciate per l'archivio debian,
+debian-security e debian-volatile al quale possa accedere il debian-live
+buildd.
+
+_* Vanno resi noti i nomi dell'immagine
+(debian-live-VERSION-ARCH-FLAVOUR.iso).
+
+_* Le liste dei pacchetti devono essere state aggiornate.
+
+_* Bisogna sincronizzare i dati dal cd Debian (udeb esclude le liste).
+
+_* Bisogna sincronizzare i file inclusi dal cd Debian (README.*, doc/*,
+ecc.).
+
+_* Le immagini vengono create e ospitate su cdimage.debian.org.
+
+2~ Rilasci minori
+
+_* Bisogna nuovamente aggiornare i mirror di debian, debian-security e
+debian-volatile.
+
+_* Le immagini vengono create e ospitate su cdimage.debian.org.
+
+_* Inviare email di annuncio.
+
+3~ Modello per l'annuncio di un rilascio minore.
+
+Si può generare un'email per l'annuncio dei rilasci minori usando il modello
+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'
+
+}code
+
+Si prega di controllare attentamente l'email prima di inviarla e passarla ad
+altri per le correzioni.
+
+code{
+
+ 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 images are available for download at:
+
+     <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:
+
+     <http://lists.debian.org/debian-announce/%release_mail%>
+
+ 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]
+
+
+ URLs
+ ----
+
+ Download location of updated images:
+
+   <http://cdimage.debian.org/cdimage/release/current-live/>
+
+ Debian Live project homepage:
+
+   <http://live.debian.net/>
+
+ The current stable distribution:
+
+   <http://ftp.debian.org/debian/dists/stable>
+
+ stable distribution information (release notes, errata etc.):
+
+   <http://www.debian.org/releases/stable/>
+
+ Security announcements and information:
+
+   <http://www.debian.org/security/>
+
+
+ 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.
+
+
+ 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.
+
+
+ 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>.
+
+}code
diff --git a/manual/it/user_basics.ssi b/manual/it/user_basics.ssi
new file mode 100644
index 0000000..0f7f6ab
--- /dev/null
+++ b/manual/it/user_basics.ssi
@@ -0,0 +1,460 @@
+:B~ Nozioni di base
+
+1~the-basics Nozioni di base
+
+Questo capitolo contiene una breve panoramica del processo di generazione e
+le istruzioni per utilizzare i tre tipi di immagine più comunemente
+utilizzati. La tipologia di immagine più versatile, #{iso-hybrid}#, può
+essere usata su una macchina virtuale, supporto ottico o dispositivo di
+archiviazione portatile USB. In alcuni casi particolari, la #{usb-hdd}#
+potrebbe essere più adatta per i dispositivi USB. Il capitolo termina con le
+istruzioni per costruire e usare un'immagine di tipo #{net}#, che è un poco
+più complessa a causa del setup richiesto sul server. Si tratta di un
+argomento leggermente avanzato per chi non ha familiarità con l'avvio da
+rete, ma è incluso qui perché, una volta che il setup è stato fatto, è un
+modo molto comodo per collaudare e distribuire immagini facendo il boot
+nella rete locale senza la seccatura di doversi occupare dei mezzi di
+divulgazione dell'immagine.
+
+2~ Che cos'è un sistema live?
+
+Per sistema live generalmente si intende un sistema operativo che può essere
+avviato da un supporto rimovibile, come un CD-ROM o una chiavetta USB,
+oppure da una rete, pronto per l'uso senza alcuna installazione su hard
+disk, con una auto-configurazione fatta durante l'esecuzione (vedere
+{Glossario}#terms).
+
+Con Debian Live, si tratta di un sistema operativo Debian GNU/Linux,
+generato per una delle architetture previste (attualmente amd64, i386,
+powerpc e sparc). È costituito dalle seguenti parti:
+
+_* *{Immagine del kernel Linux}*, comunemente chiamata #{vmlinuz*}#
+
+_* *{Initial RAM disk image (initrd)}*: un disco RAM creato per il boot di
+Linux, contenente i moduli potenzialmente necessari per montare l'immagine
+di sistema e alcuni script per farlo.
+
+_* *{Immagine di sistema}*: l'immagine del filesystem del sistema
+operativo. Normalmente è usato un filesystem compresso SquashFS, per
+minimizzare le dimensioni dell'immagine Debian Live. Si noti che è in sola
+lettura. Dunque, durante il boot il sistema Debian Live userà un disco RAM e
+il meccanismo 'unione' per attivare i file in scrittura all'interno del
+sistema in esecuzione. Ad ogni modo, tutte le modifiche verranno perse con
+lo spegnimento a meno che non si usi la persistenza opzionale (si veda
+{Persistenza}#persistence).
+
+_* *{Bootloader}*: una piccola porzione di codice predisposto per l'avvio
+dal supporto scelto, che presenta un prompt o un menu per la selezione di
+opzioni/configurazioni. Carica il kernel Linux ed il suo initrd da eseguire
+con un filesystem associato. Possono essere usate diverse soluzioni, in base
+al supporto di destinazione ed al formato del filesystem contenenti le
+componenti precedentemente citate: isolinux per il boot da CD o DVD nel
+formato ISO9660, syslinux per supporti HDD o USB che si avviano da una
+partizione VFAT, extlinux per le partizioni ext/2/3/4 e btrfs, pxelinux per
+il netboot PXE, GRUB per partizioni ext2/3/4, ecc.
+
+È possibile usare live-build per creare l'immagine di sistema secondo le
+proprie specifiche, scegliere un kernel Linux, il suo initrd ed un
+bootloader per avviarli, tutto in un unico formato che dipende dal mezzo
+(immagini ISO9660, immagine disco, ecc.)
+
+2~ Primi passi: creare un'immagine ISO
+
+La seguente sequenza di comandi di live-build creerà un'immagine ISO ibrida
+di base contenente soltanto il sistema Debian standard senza X.org. È adatta
+per essere masterizzata su CD o DVD e anche per essere copiata su una penna
+USB (come per {Copiare un'immagine USB/HDD su una penna
+USB}#copying-usb-hdd-image, specificando l'estensione ".iso" dove è indicato
+".img").
+
+In primo luogo eseguire il comando #{lb config}#, il quale creerà una
+gerarchia "config/" nella directory corrente e che verrà utilizzata da altri
+comandi:
+
+code{
+
+ $ lb config
+
+}code
+
+Non passando alcun parametro a #{lb config}#, si indica che si intende
+utilizzare le impostazione predefinite (vedere {Il comando lb
+config}#lb-config).
+
+Ora che si ha una gerarchia "config/" si può generare l'immagine con il
+comando #{lb build}#:
+
+code{
+
+ # lb build
+
+}code
+
+Questo processo può richiedere tempo, a seconda della velocità della
+connessione di rete (vedere {Il comando lb build}#lb-build).
+
+3~testing-iso-with-qemu Provare un'immagine ISO con Qemu
+
+Collaudare una ISO è semplice:
+
+code{
+
+ # apt-get install qemu
+
+ $ qemu -cdrom binary.iso
+
+}code
+
+3~testing-iso-with-virtualbox Provare un'immagine ISO con virtualbox-ose
+
+Per provare la ISO con virtualbox-ose:
+
+code{
+
+ # apt-get install virtualbox-ose virtualbox-ose-dkms
+
+ $ virtualbox
+
+}code
+
+Creare una nuova macchina virtuale, modificare le impostazione di
+archiviazione in modo da usare binary.iso come dispositivo CD/DVD, ed
+avviare la macchina.
+
+Nota: per sistemi live contenenti X.org che si vogliono provare con
+virtualbox-ose, si può voler includere il pacchetto dei driver per X.org di
+VirtualBox, virtualbox-ose-guest-x11, nella configurazione di
+live-build. Altrimenti, la risoluzione è limitata a 800x600.
+
+code{
+
+ $ lb config --packages virtualbox-ose-guest-x11
+
+}code
+
+3~burning-iso-image Masterizzare un'immagine ISO su un supporto fisico
+
+Masterizzare un'immagine ISO è semplice:
+
+code{
+
+ # apt-get install wodim
+
+ $ wodim binary.iso
+
+}code
+
+2~ Creare un'immagine USB/HDD
+
+La seguente sequenza di comandi creerà un'immagine USB/HDD di base
+contenente solo un sistema Debian standard senza X.org. È adatta per
+avviarsi da chiavette USB, dischi rigidi USB, e da svariati altri
+dispositivi di archiviazione portatili. In genere per questo scopo può
+essere usata un'immagine ISO ibrida, ma se si ha un BIOS che non supporta le
+immagini ibride, o si vuole usare lo spazio rimanente sul supporto per una
+partizione persistente, allora occorre un'immagine USB/HDD.
+
+Nota: se si è creata un'immagine ISO con gli esempi precedenti, occorre
+pulire la directory di lavoro con il comando #{lb clean}# (vedere {Il
+comando lb clean}#lb-clean):
+
+code{
+
+ # lb clean --binary
+
+}code
+
+Eseguire il comando #{lb config}# con i parametri atti a configurare la
+struttura #{config/}# per creare un'immagine di tipo USB/HDD:
+
+code{
+
+ $ lb config -b usb-hdd
+
+}code
+
+Si crei ora l'immagine con il comando #{lb build}#:
+
+code{
+
+ # lb build
+
+}code
+
+3~copying-usb-hdd-image Copiare un'immagine USB/HDD su una penna USB
+
+L'immagine binaria generata contiene una partizione VFAT e il bootloader
+syslinux, pronti per essere scritti direttamente su una penna USB. Inserire
+una chiavetta USB con una dimensione maggiore di quella di binary.img e
+digitare:
+
+code{
+
+ $ dd if=binary.img of=${USBSTICK}
+
+}code
+
+dove #{${USBSTICK}}# è il nome del device, come #{/dev/sdb}# (non una
+partizione come #{/dev/sdb1}#!); si può trovare il nome corretto del device
+guardando l'output di #{dmesg}# dopo aver inserito la chiavetta USB, o
+meglio ancora #{ls -l /dev/disk/by-id}#.
+
+*{Questo sovrascriverà definitivamente qualsiasi dato in precedenza sulla chiavetta!}*
+
+Nota: come disquisito in precedenza, questo stesso processo può essere usato
+per immagini di tipo #{iso-hybrid}# (con suffisso #{-hybrid.iso}#), ma non
+per le immagini di tipo #{iso}#.
+
+3~testing-usb-hdd-with-qemu Provare un'immagine USB/HDD con Qemu
+
+code{
+
+ # apt-get install qemu
+
+ $ qemu -hda binary.img
+
+}code
+
+3~ Usare lo spazio rimanente su una penna USB
+
+Se si vuole usare lo spazio libero che rimane dopo l'installazione di
+binary.img, si può usare uno strumento di partizionamento come #{gparted}# o
+#{parted}# per creare una nuova partizione sulla penna. La prima partizione
+verrà utilizzata dal sistema Debian Live.
+
+code{
+
+ # gparted ${USBSTICK}
+
+}code
+
+Dopo aver creato la partizione, si deve creare su di essa un filesystem. Una
+scelta possibile potrebbe essere ext4.
+
+code{
+
+ # mkfs.ext4 ${USBSTICK}
+
+}code
+
+Usare FAT32 se si vuole usare questa partizione dati con Windows.
+
+code{
+
+ # mkfs.vfat -F 32
+
+}code
+
+*{Ricorda: ogni volta che si installa un nuovo file binary.img sulla penna, tutti i dati sulla chiavetta saranno persi perché la tabella delle partizioni viene sovrascritta con i contenuti dell'immagine.}*
+
+2~building-netboot-image Creare un'immagine netboot
+
+La seguente sequenza di comandi creerà un'immagine netboot di base
+contenente il sistema Debian standard senza X.org. È adatta per il boot
+tramite rete.
+
+Nota: se qualcuno tra gli esempi precedenti è stato seguito, bisogna pulire
+la directory di lavoro con il comando #{lb clean}#:
+
+code{
+
+ # lb clean --binary
+
+}code
+
+Per configurare l'immagine per l'avvio da rete, eseguire il comando #{lb
+config}# come segue:
+
+code{
+
+ $ lb config -b net --net-root-path "/srv/debian-live" --net-root-server "192.168.0.1"
+
+}code
+
+Diversamente dalle immagini ISO e USB/HDD, il boot via rete non fornisce
+un'immagine del filesytem al client, perciò i file devono essere forniti via
+NFS. Le opzioni net-root-path e net-root-server specificano,
+rispettivamente, il percorso e il server del server NFS dove l'immagine del
+filesystem sarà situata all'avvio. Accertarsi che questi siano impostati su
+valori adeguati alla propria rete.
+
+Si crei ora l'immagine con il comando #{lb build}#:
+
+code{
+
+ # lb build
+
+}code
+
+In un avvio tramite rete, il client esegue una piccola parte di software che
+normalmente risiede sulla EPROM della scheda Ethernet. Questo programma
+invia una richiesta DHCP per ottenere un indirizzo IP e le informazioni su
+cosa fare in seguito. In genere il passo successivo è ottenere un bootloader
+di di livello superiore attraverso il protocollo TFTP. Questi potrebbe
+essere pxelinux, GRUB, o anche avviare direttamente un sistema operativo
+come Linux.
+
+Per esempio, estraendo l'archivio generato #{binary-net.tar.gz}# nella
+directory #{/srv/debian-live}#, si troverà l'immagine del filesystem in
+#{live/filesystem.squashfs}# mentre il kernel, initrd ed il bootloader
+pxelinux in #{tftpboot/debian-live/i386}#.
+
+Per abilitare l'avvio tramite rete vanno ora configurati tre servizi:i
+server DHCP, TFTP e NFS.
+
+3~ Server DHCP
+
+Si deve configurare il server DHCP della rete per essere sicuri di fornire
+un indirizzo IP al sistema client che si avvia tramite rete, e notificare la
+posizione del bootloader PXE.
+
+Ecco un esempio, scritto per un server DHCP ISC #{isc-dhcp-server}# nel file
+di configurazione #{/etc/dhcp/dhcpd.conf}#:
+
+code{
+
+ # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server
+
+ ddns-update-style none;
+
+ option domain-name "example.org";
+ option domain-name-servers ns1.example.org, ns2.example.org;
+
+ default-lease-time 600;
+ max-lease-time 7200;
+
+ 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";
+}
+
+}code
+
+3~ Server TFTP
+
+Fornisce al sistema il kernel e il ramdisk iniziale in fase di esecuzione.
+
+Si installi il pacchetto tftpd-hpa, che mette a disposizione tutti i file
+contenuti in una directory root, di solito #{/srv/tftp}#. Affinché si possa
+disporre dei file contenuti in #{/srv/debian-live/tftpboot}#, eseguire il
+seguente comando come utente root:
+
+code{
+
+ # dpkg-reconfigure -plow tftpd-hpa
+
+}code
+
+e inserire la nuova directory del server tftp quando viene richiesto.
+
+3~ Server NFS
+
+Una volta che il computer ospite ha scaricato e avviato un kernel Linux e
+caricato il suo initrd, cercherà di montare l'immagine del filesystem Live
+tramite un server NFS.
+
+Bisogna installare il pacchetto #{nfs-kernel-server}#.
+
+Quindi, rendere disponibile l'immagine del filesystem via NFS aggiungendo
+una riga come la seguente in #{/etc/exports}#:
+
+code{
+
+ /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)
+
+}code
+
+e comunicare il nuovo export al server NFS con il seguente comando:
+
+code{
+
+ # exportfs -rv
+
+}code
+
+Configurare questi tre servizi può essere un po' problematico. Serve un po'
+di pazienza per farli funzionare assieme. Per ulteriori informazioni, si
+veda il wiki syslinux http://syslinux.zytor.com/wiki/index.php/PXELINUX o il
+manuale del Debian Installer alla sezione per l'avvio TFTP da rete
+http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html. Ciò può essere
+d'aiuto, considerato che il procedimento è molto simile.
+
+3~ Come provare una netboot
+
+La creazione di immagini netboot è resa semplice dal potere di live-build,
+ma provare le immagini su una macchina reale può essere davvero dispendioso
+in termini di tempo.
+
+Per semplificarsi la vita, si può usare la virtualizzazione. Ci sono due
+soluzioni.
+
+3~ Qemu
+
+_* Installare #{qemu}#, #{bridge-utils}#, #{sudo}#.
+
+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
+
+}code
+
+Procurarsi o compilare #{grub-floppy-netboot}# (su svn).
+
+Lanciare #{qemu}# con "#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#"
+
+3~ VMWare Player
+
+_* Installare VMWare Player (edizione "free as in beer")
+
+_* Creare una directory PXETester, e crearvi all'interno un file di testo
+chiamato #{pxe.vwx}#
+
+_* Vi si copi dentro questo testo:
+
+code{
+
+ #!/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"
+
+ ethernet0.present = "TRUE"
+ ethernet0.addressType = "generated"
+
+ 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"
+
+}code
+
+_* Si può giocare con questo file di configurazione (ad esempio portando a
+256 il limite della memoria)
+
+_* Fare doppio click su questo file (o avviare il player VMWare e
+selezionare questo file).
+
+_* Se viene posta qualche strana domanda durante l'esecuzione premere il
+tasto spazio...
diff --git a/manual/it/user_customization-binary.ssi b/manual/it/user_customization-binary.ssi
new file mode 100644
index 0000000..6334879
--- /dev/null
+++ b/manual/it/user_customization-binary.ssi
@@ -0,0 +1,38 @@
+B~ Personalizzare l'immagine binaria
+
+1~ Personalizzare l'immagine binaria
+
+2~ Bootloader
+
+live-build usa syslinux come bootloader predefinito, il quale è configurato
+per restare in pausa continua sulla schermata d'avvio. Per cambiare questo
+comportamento, si passi #{--syslinux-timeout TIMEOUT}# a #{lb
+config}#. Questo valore è espresso in secondi, 0 (zero) disabilita
+completamente il tempo di attesa. Per maggiori informazioni vedere
+syslinux(1).
+
+2~ Metadati ISO
+
+Quando si crea un'immagine binaria ISO9660, si possono usare le seguenti
+opzioni per aggiungere vari metadati testuali. Questo può aiutare a
+identificare facilmente la versione o la configurazione di un'immagine senza
+avviarla.
+
+_* #{LB_ISO_APPLICATION/--iso-application NAME}#: descrive l'applicazione
+che sarà nell'immagine. La lunghezza massima per questo campo è di 128
+caratteri.
+
+* #{LB_ISO_PREPARER/--iso-preparer NAME}#: descrive il costruttore
+dell'mmagine, solitamente con alcuni dettagli per
+contattarlo. L'impostazione predefinita è la versione di live-build che si
+sta usando, il quale potrà essere utile in seguito per il debugging. La
+lunghezza massima per questo campo è di 128 caratteri.
+
+_* #{LB_ISO_PUBLISHER/--iso-publisher NAME}#: descrive l'editore
+dell'immagine, solitamente con qualche dettaglio per contattarlo. La
+lunghezza massima lunghezza per questo campo è di 128 caratteri.
+
+_* #{LB_ISO_VOLUME/--iso-volume NAME}#: specifica l'ID del volume
+dell'immagine. Questa è utilizzata come etichetta visibile all'utente su
+alcune piattaforme, come Windows e Apple Mac OS. La lunghezza massima per
+questo campo è di 128 caratteri.
diff --git a/manual/it/user_customization-contents.ssi b/manual/it/user_customization-contents.ssi
new file mode 100644
index 0000000..644f972
--- /dev/null
+++ b/manual/it/user_customization-contents.ssi
@@ -0,0 +1,157 @@
+B~ Personalizzazione dei contenuti
+
+1~customizing-contents Personalizzazione dei contenuti
+
+Questo capitolo tratta la personalizzazione dei contenuti del sistema live
+che va oltre la semplice scelta dei pacchetti da includere. Gli include
+permettono di aggiungere o sostituire file nell'immagine di Debian Live, gli
+hook permettono di eseguire comandi in fasi differenti della creazione e
+all'avvio, e la preconfigurazione permette di configurare i pacchetti quando
+vengono installati fornendo risposte alle domande di debconf.
+
+2~ Include
+
+Anche se idealmente un sistema live Debian dovrebbe includere file forniti
+interamente dal pacchetti Debian non modificati, a volte è conveniente
+fornire o modificare parte del contenuto per mezzo di file. Utilizzando gli
+include, si può aggiungere (o sostituire) file arbitrari nell'immagine di
+Debian Live. Per usarli, live-build mette a disposizione tre meccanismi:
+
+_* Include locali del chroot: permettono di aggiungere o sostituire file al
+file system chroot/Live. Vedere {Live/chroot include
+locali}#live-chroot-local-includes per maggiori informazioni.
+
+_* Include locali binari: permettono di aggiungere o sostituire file
+nell'immagine binaria. Vedere {Include locali binari}#binary-local-includes
+per maggiori informazioni
+
+_* Include binari: permettono di aggiungere o sostituire specifici file
+Debian nell'immagine binaria, come le directory dei template e dei
+tool. Vedere {Include binari}#binary-includes per maggiori informazioni.
+
+Si consulti il {Glossario}#terms per ulteriori informazioni sulla
+distinzione tra immagini "Live" e "binarie".
+
+3~live-chroot-local-includes Live/chroot include locali
+
+Gli include locali del chroot possono essere usati per aggiungere o
+sostituire file nel filesystem chroot/Live in modo che possano essere
+utilizzati nel sistema live. Un utilizzo tipico è popolare la directory
+scheletro dell'utente (#{/etc/skel}#) che il sistema impiega per creare la
+home dell'utente. Un altro è quello di fornire file di configurazione che
+possono essere semplicemente aggiunti o sostituiti nell'immagine senza
+elaborazione; si veda {Live/chroot hook locali}#live-chroot-local-hooks se è
+necessaria l'elaborazione.
+
+Per includere i file si aggiungano semplicemente alla directory
+#{config/chroot_local-includes}#. Questa corrisponde alla directory root
+(#{/}#) del sistema live. Per esempio, per aggiungere un file
+#{/var/www/index.html}# nel sistema live, si usi:
+
+code{
+
+ $ mkdir -p config/chroot_local-includes/var/www
+ $ cp /path/to/my/index.html config/chroot_local-includes/var/www
+
+}code
+
+La configurazione avrà quindi il seguente schema:
+
+code{
+
+ -- config
+    [...]
+     |-- chroot_local-includes
+     |   `-- var
+     |       `-- www
+     |           `-- index.html
+    [...]
+     `-- templates
+
+}code
+
+Gli include locali del chroot vengono installati dopo l'installazione dei
+pacchetti in modo che tali file vengano in seguito sovrascitti.
+
+3~binary-local-includes Include locali binari
+
+Si possono utilizzare include locali binari per inserire sul filesystem del
+supporto materiale come documentazione o video affinché sia immediatamente
+accessibile dopo l'inserimento dello stesso senza avviare il sistema
+live. Ciò funziona in modo simile agli include locali del chroot; supponendo
+che i file #{~/video_demo.*}# siano video dimostrativi del sistema descritti
+da e collegati a una pagina HTML indice, basta copiare il materiale in
+#{config/binary_local-includes/} come segue:
+
+code{
+
+ $ cp ~/video_demo.* config/binary_local-includes/
+
+}code
+
+Questi file appariranno nella directory principale del supporto live.
+
+3~binary-includes Include binari
+
+live-build ha alcuni file standard (come la documentazione) inclusi nella
+configurazione predefinita di ogni supporto live. Ciò può essere
+disabilitato con:
+
+code{
+
+ $ lb config --includes none
+
+}code
+
+In caso contrario il materiale verrà installato da live-build nella
+directory #{/includes/}# del filesystem in modo predefinito, oppure è
+possibile specificare un percorso alternativo con #{--includes}#.
+
+2~ Hook
+
+Gli hook permettono di eseguire comandi nel chroot e nelle fasi binarie
+della creazione al fine di personalizzare l'immagine.
+
+3~live-chroot-local-hooks Live/chroot hook locali
+
+Per eseguire comandi nella fase chroot, creare uno script hook contenente i
+comandi nella directory #{config/chroot_local-hooks}#. L'hook verrà eseguito
+nel chroot dopo che verrà applicata il resto della configurazione del
+chroot, ricordare quindi di garantire che la propria configurazione includa
+tutti i pacchetti e i file che l'hook necessita per funzionare. Vedere gli
+script d'esempio degli hook di chroot per i vari compiti di
+personalizzazione del chroot contenuti in
+#{/usr/share/live/build/examples/hooks}# da copiare o collegare nella
+propria configurazione.
+
+3~ Hook in fase di avvio
+
+Per eseguire comandi all'avvio, è possibile fornire degli hook a live-config
+come spiegato nella sezione "Customization" del suo manuale. Controllare gli
+hook di live-config in #{/lib/live/config/}# e notare i numeri sequenziali;
+fornire quindi i propri hook con una sequenza numerica appropriata, sia come
+include locali del chroot in
+#{config/chroot_local-includes/lib/live/config/}#, sia come pacchetto
+personalizzato come discusso in {Installare pacchetti modificati o di terze
+parti}#installing-modified-or-third-party-packages.
+
+3~ Hook binari locali
+
+Per eseguire comandi nella fase binaria, creare uno script hook che contenga
+i comandi in #{config/binary_local-hooks}#. L'hook verrà eseguito dopo tutti
+gli altri comandi binari, ma prima del binary_checksums, l'ultimo definitivo
+comando. I comandi nel proprio hook non vengono eseguiti nel chroot, perciò
+si faccia attenzione a non modificare nessun file al di fuori dell'albero di
+costruzione o si danneggerà il sistema! Vedere gli script d'esempio per gli
+hook binari per i vari compiti di personalizzazione dei binari in
+#{/usr/share/live/build/examples/hooks}# da copiare o collegare nella
+propria configurazione.
+
+2~ Preconfigurare le domande di Debconf
+
+I file nella directory #{config/chroot_local-preseed}# sono considerati file
+di preconfigurazione di debconf e sono installati da live-build usando
+#{debconf-set-selections}#.
+
+Per ulteriori informazioni su debconf, vedere debconf(7) nel pacchetto
+#{debconf}#.
diff --git a/manual/it/user_customization-installer.ssi b/manual/it/user_customization-installer.ssi
new file mode 100644
index 0000000..bb11268
--- /dev/null
+++ b/manual/it/user_customization-installer.ssi
@@ -0,0 +1,90 @@
+:B~ Personalizzare il Debian Installer
+
+1~customizing-installer Personalizzare il Debian Installer
+
+Le immagini del sistema Debian Live possono essere integrate nel Debian
+Installer. Ci sono differenti tipi d'installazione che variano in cosa viene
+incluso e come agisce l'installatore.
+
+In questa sezione si presti attenzione all'uso delle lettere maiuscole
+quando si fa riferimento al "Debian Installer" - quando usato ci si
+riferisce all'installatore ufficiale Debian, niente altro. Spesso è
+abbreviato come "d-i".
+
+2~ Tipologie del Debian Installer
+
+I tre principali tipi dell'installer sono:
+
+*{Debian Installer "normale"}*: questa è un'immagine Debian Live con un kernel e un initrd separati i quali (quando viene selezionato da un appropriato bootloader) lancia un'istanza standard del Debian Installer, così come quando si scarica un'immagine di Debian e la si avvia. Le immagini che contengono un sistema live e un installatore indipendenti sono spesso definite "immagini combinate".
+
+In queste immagini, Debian è installata prendendo e installando pacchetti
+.deb usando {debootstrap}# o #{cdebootstrap}# da supporti locali o dalla
+rete, risultante in un sistema Debian standard che viene installato sul
+disco rigido.
+
+L'intero processo può essere preimpostato e personalizzato in diversi modi;
+per ulteriori informazioni si vedano le corrispondenti pagine del manuale
+del Debian Installer. Una volta che si ha un file preimpostato che funzioni,
+live-build può inserirlo automaticamente nell'immagine e abilitarlo.
+
+*{Debian Installer "live"}*: Questa è un'immagine Debian Live con un kernel ed un initrd separato (quando selezionato dall'appropriato bootloader) lanciata in un'instanza del Debian Installer.
+
+L'installazione procederà nello stesso modo di un'installazione "Regolare"
+come descritto sopra, ma allo stadio attuale dell'installazione del
+pacchetto, invece di usare #{debootstrap}# per prelevare e installare i
+pacchetti, l'immagine del filesystem live viene copiata sulla
+destinazione. Questo si ottiene con uno speciale udeb chiamato
+live-installer.
+
+Dopo questa fase, il Debian Installer continua normalmente, installando e
+configurando elementi come bootloader e utenti locali, ecc.
+
+Si noti: per supportare entrambi le voci dell'installer live o normale nel
+bootloader sullo stesso media, si deve disabilitare il live-installer dalla
+preconfigurazione #{live-installer/enable=false}.
+
+*{Debian Installer "Desktop"}*: indipendentemente dal tipo del Debian Installer incluso, #{d-i}# può essere lanciato cliccando un'icona sul desktop, Questo è molto semplice in alcune situazioni. Per poterne usufruire deve essere incluso il pacchetto debian-installer-launcher.
+
+Si noti che live-build non include il Debian Installer nell'immagine in modo
+predefinito, bisogna che sia espressamente abilitato con #{lb
+config}#.Inoltre, affinché l'installatore "Desktop" funzioni, il kernel del
+sistema live deve corrispondere a quello usato dal #{d-i}# per
+l'architettura specificata. Per esempio:
+
+code{
+
+ $ lb config --architecture i386 --linux-flavours 486 \
+     --debian-installer live --packages debian-installer-launcher
+
+}code
+
+2~ Personalizzare il Debian Installer con la preconfigurazione
+
+Come descritto nell'appendice B del manuale del Debian Installer
+all'indirizzo http://www.debian.org/releases/stable/i386/apb.html, "La
+preconfigurazione fornisce un modo per impostare le risposte alle domande
+poste durante il processo d'installazione senza la necessità di inserirle
+manualmente. Ciò permette di automatizzare totalmente molti tipi di
+installazione offrendo anche alcune caratteristiche normalmente non
+disponibili." Questo tipo di personalizzazione è compiuta in modo ottimale
+con live-build mettendo la configurazione in un file #{preseed.cfg}# incluso
+in #{config/binary_debian-installer/}#. Ad esempio per preconfigurare
+l'impostazione della localizzazione su #{en_US}#:
+
+code{
+
+ $ echo "d-i debian-installer/locale string en_US" \
+     >> config/binary_debian-installer/preseed.cfg
+
+}code
+
+2~ Personalizzare il contenuto del Debian Installer
+
+Si può voler includere pacchetti udeb compilati localmente come componenti
+del #{d-i}# per scopi di sperimentazione o debug; per includerli
+nell'immagine inserirli in #{config/binary_local-udebs/}#. I file e le
+directory aggiuntivi o di rimpiazzo si possono includere nell'initrd
+dell'installatore in maniera simile agli {Include locali del
+Live/chroot}#live-chroot-local-includes, inserendo il materiale in
+#{config/binary_debian-installer-includes/}#.
+
diff --git a/manual/it/user_customization-overview.ssi b/manual/it/user_customization-overview.ssi
new file mode 100644
index 0000000..3ad66e9
--- /dev/null
+++ b/manual/it/user_customization-overview.ssi
@@ -0,0 +1,80 @@
+B~ Personalizzazione dei contenuti
+
+1~customization-overview Panoramica sulla personalizzazione
+
+Questo capitolo mostra una panoramica dei vari metodi con i quali è
+possibile personalizzare un sistema Debian Live.
+
+2~ Configurazione in fase di compilazione e di avvio
+
+La configurazione del sistema live è divisa in opzioni applicate in fase di
+compilazione e al momento dell'avvio. Le opzioni di compilazione sono
+ulteriormente divise in quelle che si verificano prima dell'avvio, applicate
+dal pacchetto live-boot, e quelle dopo l'avvio, applicate da
+live-config. Qualsiasi opzione in fase di avvio può essere modificata
+dall'utente specificandola al prompt di avvio. L'immagine può inoltre essere
+costruita con i parametri di avvio predefiniti in modo che quando tutti i
+valori predefiniti sono adatti gli utenti possano avviare direttamente il
+sistema senza specificare alcuna opzione. In particolare, l'argomento di
+#{lb --bootappend-live}# è costituito da tutte le opzioni da riga di comando
+del kernel predefinite in un sistema live, come persistenza dei dati, layout
+di tastiera o fuso orario. Per gli esempi si veda {Personalizzare
+localizzazione e lingua}#customizing-locale-and-language.
+
+Le opzioni di configurazione in fase di compilazione sono descritte nel
+manuale di #{lb config}#, mentre quelle in fase di avvio nel manuale di
+live-boot e live-config. Sebbene i pacchetti live-boot e live-config siano
+installati nel sistema live che si sta costruendo si raccomanda, per un
+comodo riferimento quando si lavora alla propria configurazione, di
+installarli anche sul sistema che lo crea. Fare ciò risulta sicuro in quanto
+nessuno degli script contenuti viene eseguito, a meno che il sistema sia
+configurato come sistema live.
+
+2~stages-of-the-build Fasi della creazione
+
+Il processo di creazione è diviso in due fasi, con varie personalizzazioni
+applicate in sequenza a ciascuna di esse. La prima consiste nell'*{avvio}*,
+questa è la fase iniziale di popolamento della directory di chroot con i
+pacchetti atti a creare un sistema Debian di base. Viene quindi seguita
+dalla fase *{chroot}* che completa la costruzione della directory chroot e
+la popola con tutti i pacchetti elencati nella configurazione insieme a
+qualsiasi altro materiale; la maggior parte della personalizzazione dei
+contenuti avviene in questa tappa. La parte finale della preparazione
+dell'immagine è la fase *{binaria}* che genera un'immagine avviabile
+utilizzando i contenuti della directory chroot per costruire il file system
+pricipale per il sistema live, includere l'installatore e ogni altro
+materiale aggiuntivo sul supporto di destinazione al di fuori del file
+system del sistema live. Una volta che l'immagine è pronta viene creato, se
+abilitato, l'archivio dei sorgenti nella fase *{sorgenti}*.
+
+All'interno di ciascuna di queste fasi c'è una sequenza particolare in cui
+vengono applicati i comandi, sono organizzati in modo da assicurare che le
+personalizzazioni siano ragionevolmente stratificate. Ad esempio, nella fase
+*{chroot}* i preseed vengono applicati prima che qualsiasi pacchetto sia
+installato, i pacchetti vengono installati prima di qualsiasi file incluso
+localmente o le patch sono applicate e gli hook eseguiti dopo che tutto il
+materiale è a posto.
+
+2~ Integrare la configurazione di lb con dei file
+
+Anche se #{lb config}# crea una configurazione scheletrica nella directory
+config/, per realizzare i propri obiettivi potrebbe essere necessario
+fornire dei file aggiuntivi nelle sottodirectory. A seconda di dove vengono
+memorizzati i file nella configurazione, possono essere copiati nel file
+system del sistema live o nel file system dell'immagine binaria, o fornire
+configurazioni per la creazione del sistema che sarebbe scomodo passare come
+opzioni da riga di comando. Si possono includere cose come elenchi
+personalizzati dei pacchetti, grafica personalizzata o script hook da
+eseguire sia al momento della compilazione che in fase di avvio;
+incrementando quindi la notevole flessibilità di debian-live con il proprio
+codice.
+
+2~ Personalizzazione dei compiti
+
+I capitoli seguenti sono costituiti dai tipi di compito personalizzato che
+gli utenti eseguono solitamente: {personalizzare l'installazione dei
+pacchetti}#customizing-package-installation, {personalizzare i
+contenuti}#customizing-contents e {personalizzare localizzazione e
+lingua}#customizing-locale-and-language coprono solo alcune delle cose che
+si potrebbero desiderare.
+
diff --git a/manual/it/user_customization-packages.ssi b/manual/it/user_customization-packages.ssi
new file mode 100644
index 0000000..6a4f6f2
--- /dev/null
+++ b/manual/it/user_customization-packages.ssi
@@ -0,0 +1,596 @@
+:B~ Personalizzare l'installazione dei pacchetti
+
+1~customizing-package-installation Personalizzare l'installazione dei
+pacchetti
+
+Probabilmente la personalizzazione basilare di un sistema Debian Live è la
+scelta dei pacchetti da includere nell'immagine. Questo capitolo vi guiderà
+tra le varie opzioni in fase di costruzione per personalizzare
+l'installazione dei pacchetti di live-build. Le ampie scelte che influenzano
+quali pacchetti siano disponibili da installare nell'immagine sono le aree
+di distribuzione e archivio. Per essere sicuri di avere una ragionevole
+velocità di scaricamento, dovreste usare un mirror a voi vicino. Si possono
+inoltre aggiungere i propri repository per pacchetti di backport,
+sperimentali o personalizzati, o aggiungere i pacchetti direttamente come
+file. È possibile definire una propria lista di pacchetti da includere,
+usarne una predefinita di live-build, usare task di #{tasksel}#, o una
+combinazione di tutti e tre. Infine una serie di opzioni fornisce un certo
+controllo su apt, o aptitude se si preferisce, in fase di compilazione
+quando i pacchetti sono installati. Ciò può tornare utile se si usa un
+proxy, se si vuole disabilitare l'installazione dei pacchetti raccomandati
+per risparmiare spazio o controllare quali versioni dei pacchetti vengono
+installate con il pinning, giusto per citare alcune possibilità.
+
+2~ Sorgenti dei pacchetti
+
+3~ Distribuzione, le aree di archivio e le modalità
+
+La distribuzione che viene scelta ha un ampio impatto su quali pacchetti
+siano disponibili per essere inclusi nell'immagine live. Specificare il nome
+in codice, il predefinito per la versione Squeeze di live-build è
+#{squeeze}#; qualsiasi attuale distribuzione mantenuta negli archivi Debian
+può essere qui specificata con il suo nome in codice. (Per ulteriori
+dettagli consultare il {Glossario}#terms). L'opzione #{--distribution}# non
+solo influenza la sorgente dei pacchetti nell'archivio, ma indica a
+#{live-build}# di comportarsi secondo la necessità per compilare ciascuna
+distribuzione supportata. Ad esempio se si vuole costruire un rilascio
+*unstable*, Sid, specificare:
+
+code{
+
+ $ lb config --distribution sid
+
+}code
+
+All'interno dell'archivio della distribuzione, le aree d'archivio sono
+divisioni importanti. In Debian queste sono #{main}#, #{contrib}# e
+#{non-free}#; soltanto #{main}# contiene il software che è parte ufficiale
+della distribuzione Debian, perciò questa è la predefinita. Possono essere
+specificati uno o più valori:
+
+code{
+
+ $ lb config --archive-areas "main contrib"
+
+}code
+
+Attraverso l'opzione #{--mode}# è disponibile un supporto sperimentale per
+alcune derivate di Debian; per impostazione predefinita, questa opzione è
+impostata su #{debian}#, anche se si sta costruendo un sistema diverso da
+Debian. Se si specifica #{--mode ubuntu}# o #{--mode emdebian}#, saranno
+gestiti i nomi della distribuzione e le aree di archivio per la derivata
+specificata e non quelli di Debian. La modalità cambia anche il
+comportamento di live-build per adattarlo alle derivate.
+
+*Nota:* I progetti per i quali sono state aggiunte tali modalità sono i principali responsabili nel supportare gli utenti di queste opzioni. Il progetto Debian Live, a sua volta, fornisce sostegno allo sviluppo solamente sulla base dell'impegno migliore, sui feedback dei progetti derivati così come non sviluppiamo o sosteniamo queste derivate.
+
+3~ Mirror delle distribuzioni
+
+L'archivio Debian è replicato attraverso una vasta rete di mirror in tutto
+il mondo cosicché chiunque in ogni nazione può selezionare il mirror più
+vicino per la migliore velocità di scaricamento. Ciascuna delle opzioni
+#{--mirror-*}# determina quale mirror della distribuzione è usato nei vari
+stadi della compilazione. Ricordando dalle {Fasi della
+creazione}#stages-of-the-build che la fase di *avvio* è quando il chroot è
+inizialmente popolato da debootstrap con un sistema minimale e quella di
+*chroot* è quando viene creato il chroot usato per costruire il file system
+del sistema live. Perciò per queste fasi vengono usati i corrispondenti
+cambi di mirror, e in seguito, nella fase *binaria* vengono usati i valori
+di #{--mirror-binary}# e #{--mirror-binary-security}# sostituendo qualsiasi
+altro mirror usato nelle fasi iniziali.
+
+3~distribution-mirrors-build-time Mirror delle distribuzioni usati in fase
+di compilazione
+
+Per impostare i mirror delle distribuzioni usati in fase di compilazione ad
+uno locale, è sufficiente impostare #{--mirror-bootstrap}# e
+#{--mirror-chroot-security}# come segue.
+
+code{
+
+ $ lb config --mirror-bootstrap http://localhost/debian/ \
+             --mirror-chroot-security http://localhost/debian-security/
+
+}code
+
+Il mirror chroot, specificato da #{--mirror-chroot}#, è impostato al valore
+di #{--mirror-bootstrap}#.
+
+3~ Mirror delle distribuzioni usate durante l'esecuzione
+
+Le opzioni #{--mirror-binary*}# determinano i mirror delle distribuzioni
+inseriti nell'immagine binaria. Questi possono essere usati per installare
+pacchetti aggiuntivi mentre il sistema live è in funzione. Le impostazioni
+predefinite impiegano #{cdn.debian.net}#, un servizio che sceglie un mirror
+geograficamente vicino basandosi sul numero IP dell'utente. Questo è una
+scelta conveniente quando non si può pronosticare quale sarà il mirror
+migliore per tutti gli utenti. Oppure si può specificare il proprio valore
+come mostrato nell'esempio qui sotto. Un'immagine compilata con questa
+configurazione sarebbe adatta solamente ad utenti di una rete dove sia
+raggiungibile il "#{mirror}#".
+
+code{
+
+ $ lb config --mirror-binary http://mirror/debian/ \
+             --mirror-binary-security http://mirror/debian-security/
+
+}code
+
+3~additional-repositories Repository addizionali
+
+Si possono aggiungere altri repository, ampliando così la scelta dei
+pacchetti al di là di quelli disponibili nella distribuzione di
+destinazione. Questi possono essere, per esempio, pacchetti di backport,
+sperimentali o personalizzati. Per configurare repository aggiuntivi, creare
+i file #{config/chroot_sources/vostro-repository.chroot}#, o
+#{config/chroot_sources/vostro-repository.binary}#. Come per le opzioni
+#{--mirror-*}#, queste controlleranno i repository usati nella fase *chroot*
+quando si compila l'immagine, e nella fase *binary*, ad esempio per usarli
+quando il sistema live è avviato.
+
+Per esempio, #{config/chroot_sources/live.chroot}# permette di installare
+pacchetti dal repository snapshot di debian live al momento della creazione
+del sistema live.
+
+code{
+
+ deb http://live.debian.net/ sid-snapshots main contrib non-free
+
+}code
+
+Se si aggiunge la stessa riga in #{config/chroot_sources/live.binary}#, il
+repository verrà aggiunto alla directory #{/etc/apt/sources.list.d/}# del
+sistema live.
+
+Se il file esiste, saranno prelevati automaticamente.
+
+Bisogna inoltre inserire la chiave GPG usata per firmare il repository nei
+file #{config/chroot_sources/vostro-repository.{binary,chroot}.gpg}#.
+
+Nota: alcuni repository di pacchetti preconfigurati sono disponibili per una
+facile selezione attraverso l'opzione #{--repository}#, per abilitare gli
+snapshot live è sufficiente un semplice comando:
+
+code{
+
+ $ lb config --repository live.debian.net
+
+}code
+
+2~choosing-packages-to-install Scegliere i pacchetti da installare
+
+Ci sono diversi modi per scegliere quali pacchetti live-build installerà
+nell'immagine, coprendo una gamma di esigenze diverse. Si possono scegliere
+i pacchetti singolarmente, con l'opzione #{--packages}# per un numero
+limitato, o da un elenco per una quantità maggiore di pacchetti. È inoltre
+possibile selezionare elenchi predefiniti più grandi o utilizzare i task di
+APT. E infine inserire i file dei pacchetti nell'albero #{config/}#, che ben
+si adatta alla alle prove di pacchetti nuovi o sperimentali prima che siano
+disponibili in un repository.
+
+3~ Scegliere pochi pacchetti
+
+Quando il numero dei pacchetti da aggiungere è esiguo è sufficiente
+specificare #{--packages}#. Per esempio:
+
+code{
+
+ $ lb config --packages "package1 package2 package3"
+
+}code
+
+Quando si specifica un pacchetto che non esiste, il comportamento di
+live-build è determinato dalla scelta delle utilità di APT. Per ulteriori
+dettagli si veda {Scegliere apt o aptitude}#choosing-apt-or-aptitude.
+
+Se si necessita di specificare un gran numero di pacchetti o si desidera
+flessibilità su quali installare, usare gli elenchi dei pacchetti come
+discusso nella prossima sezione, {Elenchi di pacchetti}#package-lists.
+
+3~package-lists Elenchi di pacchetti
+
+Gli elenchi di pacchetti sono un potente mezzo per esprimere quali pacchetti
+devono essere installati. La sintassi gestisce file inclusi e sezioni
+condizionali rendendo semplice la creazione di elenchi da altri elenchi e
+adattarli per l'uso in molteplici configurazioni. Si può usare un elenco
+predefinito fornendo una selezione modulare dei pacchetti da ciascuno dei
+principali ambienti desktop e alcuni elenchi per uso speciale, così come
+elenchi standard sui quali vi si basano altri. È inoltre possibile fornire i
+propri elenchi o usare una combinazione di entrambi.
+
+3~ Elenchi predefiniti di pacchetti
+
+Il modo più semplice per usare gli elenchi è di specificarne uno o più con
+l'opzione #{--packages-lists}#. Per esempio:
+
+code{
+
+ $ lb config --packages-lists "gnome-core rescue"
+
+}code
+
+In aggiunta a questi elenchi, live-build ne gestisce quattro virtuali:
+#{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#,
+ciascuno dei quali fornisce una selezione più estesa di pacchetti che
+corrisponde ai predefiniti dell'installatore Debian per ciascun ambiente
+desktop. Per ulteriori dettagli si veda {Task per desktop e
+lingua}#desktop-and-language-tasks.
+
+Nota: Le immagini pre-costruite di GNOME, KDE, LXDE e XFCE disponibili per
+essere scaricate da http://live.debian.net sono costruite usando i
+corrispondenti elenchi #{*-desktop}# virtuali.
+
+Il percorso predefinito per i file elenco sul sistema è
+#{/usr/share/live/build/lists/}#. Per determinare i pacchetti in un dato
+elenco, si legga il file corrispondente, prestando attenzione ai file
+inclusi e condizionali come descritto nella sezioni seguenti.
+
+3~ Elenchi locali dei pacchetti
+
+Gli elenchi si possono integrare o sostituire interamente usando quelli
+locali dei pacchetti in #{config/chroot_local-packageslists/}#.
+
+Per essere processati, questi elenchi devono avere il suffisso #{.list}#. I
+locali sovrascrivono sempre quelli forniti con live-build, questo può
+causare effetti indesiderati perciò si raccomanda di usare nomi univoci.
+
+3~ Elenchi locali di pacchetti binari
+
+Nel caso in cui si desideri includere dei pacchetti .deb alla directory
+#{pool/}# della live (senza installarli sull'immagine) bisogna usare gli
+elenchi utilizzando quelli locali dei pacchetti binari situati in
+#{config/binary_local-packageslists/}#. Tale supporto può essere utilizzato
+come immagine personalizzata di Debian per installazioni non in linea.
+
+Per essere processate le liste dei pacchetti che si trovano nella directory
+deve avere un suffisso #{.list}#.
+
+3~ Estendere un'elenco di pacchetti usando gli include
+
+Gli elenchi di pacchetti inclusi in live-build fanno un notevole uso di
+include. Far riferimento a questi nella directory
+#{/usr/share/live/build/lists/}#, in quanto portano ottimi esempi su come
+scrivere i propri.
+
+Per esempio, per creare un elenco che includa quello predefinito di
+#{gnome}# più iceweasel, creare
+#{config/chroot_local-packageslists/mygnome.list}# con i seguenti contenuti:
+
+code{
+
+ #include <gnome>
+ iceweasel
+
+}code
+
+3~ Usare condizioni all'interno degli elenchi di pacchetti
+
+Ognuna delle variabili di configurazione di live-build situate in
+#{config/*}# (senza il prefisso #{LB_}#) possono essere utilizzate per
+istruzioni condizionali nell'elenco dei pacchetti. In genere questo
+significa qualsiasi opzione di #{lb config}# in maiuscolo e con trattini
+cambiati in trattini bassi; ma in pratica è la sola ad influenzare la
+selezione dei pacchetti che abbia senso, come #{DISTRIBUTION}#,
+#{ARCHITECTURE}# o #{ARCHIVE_AREAS}#.
+
+Per esempio, per installare #{ia32-libs}# se è specificata #{--architecture
+amd64}#:
+
+code{
+
+ #if ARCHITECTURE amd64
+ ia32-libs
+ #endif
+
+}code
+
+Si può verificare per ognuna di una serie di valori, ad esempio per
+installare #{memtest86+}# specificando sia #{--architecture i386}# sia
+#{--architecture amd64}#:
+
+code{
+
+ #if ARCHITECTURE i386 amd64
+ memtest86+
+ #endif
+
+}code
+
+È possibile provare altre variabili che contengano più di un valore, ad
+esempio per installare #{vrms}# specificando sia da #{contrib}# sia da
+#{non-free}# tramite #{--archive-areas}#:
+
+code{
+
+ #if ARCHIVE_AREAS contrib non-free
+ vrms
+ #endif
+
+}code
+
+Una condizione può coinvolegere una direttiva #{#include}#:
+
+code{
+
+ #if ARCHITECTURE amd64
+ #include <gnome-full>
+ #endif
+
+}code
+
+Le condizioni nidificate non sono supportate.
+
+3~ Task
+
+L'installatore Debian offre all'utente la scelta di vari elenchi di
+pacchetti pre-selezionati, ognuno dei quali focalizzato su un particolare
+tipo di sistema, o il tipo di attività per cui utilizzarlo, come "Graphical
+desktop environment", "Mail server" o "Laptop". Questi elenchi sono chiamati
+"task" e sono gestiti da APT atraverso il campo"Task:". In live-build si
+possono specificare uno o più task per mezzo dell'opzione #{--tasks}#, come
+nell'esempio seguente.
+
+code{
+
+ $ lb config --tasks "mail-server file-server"
+
+}code
+
+I task principali disponibili nell'installatore Debian possono essere
+elencati nel sistema live con #{tasksel --list-tasks}#. I contenuti di ogni
+task, inclusi quelli non inclusi in questo elenco, possono essere esaminati
+con #{tasksel --task-packages}#.
+
+3~desktop-and-language-tasks Task per desktop e lingua
+
+I task per i desktop e la lingua sono un caso speciale. Nell'installatore
+Debian, se il supporto è stato preparato per un particolare ambiente
+desktop, il corrispondente task verrà automaticamente installato. Perciò ci
+sono i task #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# e
+#{xfce-desktop}#, nessuno dei quali è offerto nel menu di #{tasksel}#. Allo
+stesso modo, non c'è nessuna voce nel menu per i task delle lingue, ma la
+scelta della lingua dell'utente durante l'installazione influenza la
+selezione dei corrispondenti task della lingua.
+
+Perciò in live-build a questi casi particolari è anche data particolare
+considerazione, ma con tre differenze notevoli al momento in cui si scrive.
+
+Primo, non è stata fatta ancora alcuna previsione sui task della lingua,
+sebbene sia incluso un sottoinsieme di questi pacchetti specificando #{lb
+config --language}#. Se servono questi task, i quali includono cose come
+caratteri specifici per la lingua e pacchetti dei metodi di input, vanno
+specificati nella configurazione. Per esempio:
+
+code{
+
+ $ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
+
+}code
+
+Secondo, live-build gestisce gli elenchi #{*-desktop}# virtuali dei
+pacchetti per ogni tipo di desktop menzionato sopra, il quale seleziona
+l'elenco predefinito #{standard-x11}#, il corrispondente task #{*-desktop}#
+e tre task addizionali: #{desktop}#, #{standard}# e #{laptop}#. Così per
+esempio, se si specifica #{--packages-lists gnome-desktop}#, è l'equivalente
+di #{--packages debian-installer-launcher --packages-lists standard-x11
+--tasks "gnome-desktop desktop standard laptop"}#.
+
+Terzo, se viene selezionato uno qualsiasi dei task per i vari desktop, sia
+esplicitamente con #{--tasks}# o implicitamente con #{--packages-lists}#,
+live-build pre-imposterà il corrispondente valore desktop per l'installatore
+Debian (se incluso) per garantire che segua le proprie regole per installare
+i vari tipi di desktop.
+
+*{Nota:}* Esiste anche l'opzione sperimentale #{--language}# con lo scopo di sovrapporsi ai task della lingua. Se #{--language}# è specificato, per ogni lingua per la quale sia nota la presenza di pacchetti #{*-l10n}# questi verranno installati. Inoltre se uno dei modelli #{syslinux}# corrisponde alla lingua trovata, questi saranno usati al posto di quello inglese predefinito. La selezione dei pacchetti fatta con #{--language}# è un'approssimazione dei task della lingua, in quanto richiede che l'elenco dei pacchetti da includere per ogni lingua sia mantenuta all'interno di live-build, oltretutto i task della lingua sono più completi e flessibili; per quanto l'aspetto di #{syslinux}# sia comunque utile. Quindi utilizzando #{--bootloader syslinux}#, e se i modelli per la lingua specificata esistono in #{/usr/share/live/build/templates/syslinux/}# o in #{config/templates/syslinux/}#, si può considerare questa opzione, eventualmente in combinazione con i task per garantire c
 he vengano installati tutti i pacchetti interessati. Esempio:
+
+code{
+
+ $ lb config --language es
+
+}code
+
+Anche così è limitato dal fatto che gestisce una sola lingua e un solo
+bootloader. Pertanto, per tutte queste ragioni, il futuro di questa opzione
+è in revisione, potrebbe essere sostituito con qualcosa di totalmente
+diverso nel prossimo rilascio di live-build.
+
+2~installing-modified-or-third-party-packages Installare pacchetti
+modificati o di terze parti
+
+Nonostante sia contro la filosofia di Debian Live, a volte può essere
+necessario creare un sistema live con versioni modificate dei pacchetti nel
+repository Debian. Questo per modificare o gestire funzionalità aggiuntive,
+lingue e marchi, o anche rimuovere elementi non desiderati da pacchetti
+esistenti. Allo stesso modo, i pacchetti di "terze parti" possono essere
+utilizzati per aggiungere funzionalità proprietarie o su misura.
+
+Questa sezione non tratta la compilazione e il mantenimento di pacchetti
+modificati. Può comunque essere interessante leggere "How to fork privately"
+di Joachim Breitner:
+http://www.joachim-breitner.de/blog/archives/282-How-to-fork-privately.html
+La creazione di pacchetti su misura è esposta nella "Guida per il nuovo
+Maintainer" all'indirizzo http://www.debian.org/doc/maint-guide/ e altrove.
+
+Ci sono due modi per installare pacchetti personalizzati:
+
+_* #{chroot_local-packages}#
+
+_* Utilizzare repository APT personalizzati
+
+Usando #{chroot_local-packages}# è più semplice da ottenere e utile per una
+personalizzazione "una tantum" ma ha una serie di svantaggi, mentre un
+repository APT personalizzato è più laborioso da configurare.
+
+3~ Utilizzare #{chroot_local-packages}# per installare pacchetti
+personalizzati
+
+Per installare un pacchetto personalizzato copiarlo nella directory
+#{config/chroot_local-packages/}#; i pacchetti al suo interno verranno
+installati automaticamente durante la creazione del sistema live, non è
+necessario specificarli altrove.
+
+I pacchetti *{devono}* essere nominati nel modo prescritto, un metodo
+semplice per farlo è usare #{dpkg-name}#.
+
+L'utilizzo di #{chroot_local-packages}# per l'installazione di pacchetti
+personalizzati presenta degli svantaggi:
+
+_* non è possibile usare secure APT
+
+_* è necessario installare i pacchetti adeguati nella directory
+#{config/chroot_local-packages/}#.
+
+_* non si presta a salvare le configurazioni di Debian Live nel controllo di
+versione.
+
+3~ Utilizzare un repository APT per installare pacchetti personalizzati
+
+A differenza di #{chroot_local-packages}#, quando si usa un repository APT
+personalizzato è necessario assicurarsi di specificare altrove i
+pacchetti. Per i dettagli si veda {Scegliere i pacchetti da
+installare}#choosing-packages-to-install.
+
+Sebbene creare un repository APT possa sembrare uno sforzo inutile,
+l'infrastruttura può facilmente essere riutilizzata in un secondo momento
+per offrire aggiornamenti dei pacchetti modificati.
+
+3~ Pacchetti personalizzati e APT
+
+live-build utilizza APT per installare tutti i pacchetti nel sistema live in
+modo da ereditare i comportamenti di questo programma. Un esempio rilevante
+è che (considerando una configurazione predefinita) dato un pacchetto
+disponibile in due repository differenti con numeri di versione diversi, APT
+sceglie di installare quello con il numero di versione più alto.
+
+A causa di questo si può voler incrementare il numero della versione nei
+file #{debian/changelog}# dei pacchetti personalizzati per accertare che la
+propria versione avrà la precedenza sui repository Debian ufficiali. È anche
+ottenibile modificando le preferenze del APT pinning del sistema live, si
+veda {APT pinning}#apt-pinning per maggiori informazioni.
+
+2~ Configurare APT in fase di costruzione
+
+APT è configurabile tramite una serie di opzioni applicate solo in fase di
+costruzione (la configurazione di APT utilizzata nel sistema live in
+esecuzione può essere configurata nel solito modo, ovvero includendo le
+impostazioni appropriate attraverso #{config/chroot_local_includes/}#). Per
+un elenco completo, cercare nel manuale di #{lb_config}# le opzioni che
+iniziano con #{apt}#.
+
+3~choosing-apt-or-aptitude Scegliere apt o aptitude
+
+Per installare pacchetti in fase di compilazione si può optare sia per
+#{apt}# sia per #{aptitude}#, l'argomento #{--apt}# di #{lb config}#
+determina quale usare. Sceglie il metodo implementando il comportamento
+preferito per l'installazione dei pacchetti, la notevole differenza è come
+vengono gestiti quelli mancanti.
+
+_* #{apt}#: se viene specificato un pacchetto mancante, l'installazione avrà
+esito negativo; questo è l'impostazine predefinita.
+
+_* #{aptitude}#: se viene specificato un pacchetto mancante, l'installazione
+avrà successo.
+
+3~ Utilizzare un proxy con APT
+
+Una configurazione di APT spesso richiesta è di amministrare la creazione di
+un'immagine dietro un proxy, lo si può specificare con le opzioni
+#{--apt-ftp-proxy}# o #{--apt-http-proxy}# secondo necessità:
+
+code{
+
+ $ lb config --apt-http-proxy http://proxy/
+
+}code
+
+3~ Modificare APT per risparmiare spazio
+
+Si può aver bisogno di risparmiare dello spazio sul supporto dell'immagine,
+in tal caso una o entrambe delle seguenti opzioni possono essere
+d'interesse.
+
+È possibile non includere gli indici di APT con:
+
+code{
+
+ $ lb config --binary-indices false
+
+}code
+
+Questo non influenzerà le voci in /etc/apt/sources.list, determina solo se
+/var/lib/apt contiene o meno i file degli indici. Il compromesso è che APT
+necessita di quegli indici per operar enel sistema live, perciò prima di
+eseguire #{apt-cache search}# o #{apt-get install}#, per esempio, l'utente
+deve usare prima #{apt-get update}# per crearli.
+
+In caso si trovi che l'installazione dei pacchetti raccomandati appesantisca
+troppo l'immagine, si può disabilitare l'opzione predefinita di APT con:
+
+code{
+
+ $ lb config --apt-recommends false
+
+}code
+
+The tradeoff here is that if you don't install recommended packages for a
+given package, that is, "packages that would be found together with this one
+in all but unusual installations" (Debian Policy Manual, §7.2), some
+packages that you actually need may be omitted. Therefore, we suggest you
+review the difference turning off recommends makes to your packages list
+(see the #{binary.packages}# file generated by #{lb build}#) and re-include
+in your list any missing packages that you still want
+installed. Alternatively, if you find you only want a small number of
+recommended packages left out, leave recommends enabled and set a negative
+APT pin priority on selected packages to prevent them from being installed,
+as explained in {APT pinning}#apt-pinning.
+
+3~ Passare opzioni ad apt o aptitude
+
+Se non c'è un'opzione di #{lb config}# per modificare il comportamento di
+APT nel modo desiderato, si usi #{--apt-options}# o #{--aptitude-options}#
+per passare opzioni tramite il proprio strumento APT. Consultare il manuale
+di #{apt}# e #{aptitude}# per i dettagli.
+
+3~apt-pinning APT pinning
+
+Si prega di leggere prima il manuale di #{apt_preferences(5)}#. Il pinning
+può essere configurato sia in fase di costruzione sia di esecuzione; per la
+prima creare #{config/chroot_apt/preferences}#, per quest'ultima creare
+#{config/chroot_local-includes/etc/apt/preferences}#.
+
+Nell'ipotesi di creare un sistema live Squeeze e avendo la necessità di
+installare tutti i pacchetti #{live-*}# da Sid in questa fase, bisogna
+aggiungere Sid alle fonti di APT e farne il pinning affinché verranno
+installati da lì solo i pacchetti voluti e per tutti gli altri attingerà
+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
+
+ Package: *
+ Pin: release n=sid
+ Pin-Priority: 1
+ END
+
+}code
+
+Un valore negativo della priorità evita che un pacchetto venga installato,
+come nel caso in cui non se ne voglia uno raccomandato da un
+altro. Supponendo di costruire un'immagine di GNOME ma non si desidera che
+all'utente venga richiesto di salvare la password wifi nel portachiavi; in
+questo caso si vorrà omettere il pacchetto raccomandato #{gnome-keyring}#
+aggiungendo a #{config/chroot_apt/preferences}# la seguente definizione:
+
+code{
+
+ 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
new file mode 100644
index 0000000..e548351
--- /dev/null
+++ b/manual/it/user_customization-runtime.ssi
@@ -0,0 +1,220 @@
+:B~ Personalizzare i comportamenti durante l'esecuzione
+
+1~customizing-run-time-behaviours Personalizzare i comportamenti durante
+l'esecuzione
+
+Tutte le configurazioni durante l'esecuzione sono eseguite da
+live-config. Vengono qui presentate alcune delle opzioni di live-config più
+comuni alle quali gli utenti sono interessati; una lista completa può essere
+trovata nel suo manuale.
+
+2~ Personalizzare l'utente live
+
+Un'importante considerazione è che l'utente live viene creato all'avvio da
+live-boot e non da live-build durante la compilazione. Questo non solo
+influenza dove viene introdotto il materiale relativo all'utente nella
+creazione, come discusso in {Live/chroot include
+locali}#live-chroot-local-includes, ma anche ogni gruppo e permesso
+associato all'utente live.
+
+È possibile specificare gruppi aggiuntivi ai quali l'utente live apparterrà
+preconfigurando il valore #{passwd/user-default-groups}# di debconf. Ad
+esempio, per aggiungere l'utente al gruppo #{fuse}#, inserire quanto segue
+ad un file nella directory #{config/chroot_local-preseed}#:
+
+code{
+
+ debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse
+
+}code
+
+2~customizing-locale-and-language Personalizzare la localizzazione e la
+lingua
+
+Quando il sistema live si avvia, la lingua è inserita in tre fasi:
+
+_* generazione della localizzazione
+
+_* impostazione del layout di tastiera per la console
+
+impostazione del layout di tastiera per X
+
+Quando si crea un sistema live la localizzazione predefinita è
+"locales=en_US.UTF-8". Per definire quale generare, si usi il parametro
+#{locales}# nell'opzione #{--bootappend-live}# di #{lb config}#:
+
+code{
+
+ $ lb config --bootappend-live "locales=de_CH.UTF-8"
+
+}code
+
+Questo parametro può inoltre essere usato dalla riga di comando del kernel,
+specificando una localizzazione nella forma #{lingua_nazione.codifica}#.
+
+Sia la configurazione della tastiera in console sia di X dipendono dal
+parametro #{keyboard-layouts}# dell'opzione #{--bootappend-live}#. Si
+possono trovare le opzioni valide per i layout di X in
+#{/usr/share/X11/xkb/rules/base.xml}# (piuttosto che limitate alle due
+lettere del codice della nazione); per trovare il valore (i due caratteri)
+corrispondenti alla lingua, si cerchi con il nome inglese della nazione in
+cui si parla tale lingua:
+
+code{
+
+ $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
+ <name>se</name>
+
+}code
+
+Per ottenere i file di localizzazione per il layout di tastiera tedesco e
+svizzero-tedesco in X:
+
+code{
+
+ $ lb config --bootappend-live "locales=de_CH.UTF-8 keyboard-layouts=ch"
+
+}code
+
+Si può ottenere un elenco di valori validi della tastiera per la console con
+il seguente comando:
+
+code{
+
+ $ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); \
+     do basename $i | head -c -9; echo; done | sort | less
+
+}code
+
+In alternativa è possibile utilizzare il pacchetto #{console-setup}#, uno
+strumento per configurare il layout della console tramite le definizioni di
+X (XKB); si può dunque impostare il layout in modo più preciso con le
+variabili #{keyboard-layouts}#, #{keyboard-variant}#, #{keyboard-options}# e
+#{keyboard-model}#; live-boot userà questi parametri anche per X. Ad
+esempio, per impostare un layout French-Dvorak (chiamato Bepo) su un sistema
+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"
+
+}code
+
+2~persistence Persistenza
+
+Uno dei paradigmi di un cd live è un sistema preinstallato eseguito da un
+supporto in sola lettura, come un cdrom, dove le modifiche non sopravvivono
+ai riavvii dell'hardware della macchina ospitante.
+
+Un sistema Debian Live è una generalizzazione di questo paradigma e di
+conseguenza oltre ai CD gestisce altri supporti; ma comunque, nel suo
+comportamento predefinito, deve essere considerato in sola lettura e tutte i
+cambiamenti fatti durante l'esecuzione del sistema verranno persi allo
+spegnimento.
+
+Persistenza è il nome comune per differenti tipi di soluzioni per salvare
+alcune o tutte queste modifiche con i riavii. Per capire come funziona
+potrebbe essere utile sapere che sebbene il sistema venga avviato ed
+eseguito da un dispositivo in sola lettura, le modifiche a file e directory
+vengono scritte su uno scrivibile, tipicamente un ram disk (tmpfs) e i dati
+sui ram disk non sopravvivono ai riavii.
+
+I dati immagazzinati su questo ramdisk andrebbero salvati un supporto
+scrivibile persistente come un hard disk, una chiave USB, una condivisione
+di rete o anche una sessione di un CD/DVD riscrivibile multisessione. Tutti
+questi supporti sono gestiti in Debian Live in modi differenti, e tutti
+tranne l'ultimo richiedono un parametro d'avvio speciale da specificare
+all'avvio: #{persistent}#.
+
+3~ Persistenza completa
+
+Con "persistenza completa" si intende l'uso di una partizione scrivibile
+invece di un filesystem temporaneo (tmpfs) per salvare le modifiche al
+supporto in sola lettura (con il sistema COW, copy-on-write). Per utilizzare
+questa caratteristica, una partizione con un filesystem scrivibile e
+supportato ed etichettata come "live-rw" deve essere collegata al sistema in
+fase di avvio e il sistema va fatto partire con il parametro
+"persistent". Questa partizione potrebbe essere di tipo ext2 su un hard disk
+o una penna usb creata ad esempio con:
+
+code{
+
+ # mkfs.ext2 -L live-rw /dev/sdb1
+
+}code
+
+Se si possiede già una partizione sul dispositivo basta solo cambiare
+l'etichetta con una delle seguenti:
+
+code{
+
+ # tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems
+ # dosfslabel /dev/sdb1 live-rw # for a fat filesystem
+
+}code
+
+Ma siccome gli utenti dei sistemi live non hanno sempre la possibilità di
+utilizzare una partizione su disco rigido, e considerando che la maggior
+parte delle chiavi USB hanno scarse velocità di scrittura, la persistenza
+"completa" può anche essere usata con dei file immagine, è possibile creare
+un file che rappresenta una partizione e inserire questo file immagine anche
+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
+
+}code
+
+Quindi copiare il file #{live-rw}# su una partizione scrivibile e riavviare
+con il parametro d'avvio "persistent".
+
+3~ Mount automatico della home
+
+Se durante l'avvio viene trovata una partizione (filesystem) su file
+immagine o una partizione etichettata come #{home-rw}#, questa verrà montata
+direttamente come #{/home}#, permettendo quindi la persistenza dei file che
+appartengono ad esempio all'utente predefinito. Può essere unita alla
+persistenza completa.
+
+3~ Istantanee
+
+Le istantanee sono raccolte di file e directory che non vengono montate
+durante l'esecuzione ma copiate all'avvio da un dispositivo persistente al
+sistema (tmpfs) e risincronizzate al riavvio e spegnimento. Il contenuto di
+un'istantanea può risiedere su una partizione o file immagine (come i tipi
+menzionati poc'anzi) etichettati come #{live-sn}#, ma sotto forma di un
+semplice archivio cpio nominato #{live-sn.cpio.gz}#. Come sopra, all'avvio,
+i device a blocchi collegati al sistema vengono analizzati alla ricerca di
+una partizione o file così nominati. Un'interruzione di corrente durante
+l'esecuzione potrebbe portare ad una perdita di dati, per cui si può usare
+uno strumento che richiama #{live-snapshot --refresh}# per sincronizzare i
+cambiamenti importanti. Giacché non scrive continuamente sul dispositivo,
+questo tipo di persistenza è il sistema più comodo e veloce per dispositivi
+basati su memoria flash.
+
+Esiste anche un'istantanea della /home con etichetta #{home-sn.*}#; funziona
+come la principale ma viene applicata solo ad /home.
+
+Attualmente le istantanee non possono gestire la cancellazione dei file, al
+contrario della persistenza completa e il mount automatico della home. 
+
+3~ Sottotesto persistente
+
+Se un utente avesse bisogno di archiviazioni multiple dello stesso tipo per
+differenti posti o per test, come #{live-rw-casa}# e #{live-rw-lavoro}#, il
+parametro d'avvio #{persistent-subtext}# usato in congiunzione con
+#{persistent}# permetterà supporti persistenti multipli ma univoci. Un
+esempio potrebbe essere un utente che vuole usare una partizione etichettata
+come #{live-sn-sottotesto}#, userebbe: #{persistent}#
+#{persistent-subtext=sottotesto}#.
+
+3~ Rimasterizzazione parziale
+
+Le modifiche in fase di esecuzione del tmpfs possono essere incluse in uno
+squashfs usando live-snapshot e aggiunte al cd per rimasterizzare la iso nel
+caso di un cd riscrivibile o aggiunto ad una sessione di un cd/dvd(rw)
+multisessione; live-boot monta tutti i filesystem /live in ordine o con il
+modulo del parametro d'avvio.
diff --git a/manual/it/user_examples.ssi b/manual/it/user_examples.ssi
new file mode 100644
index 0000000..8d6db2b
--- /dev/null
+++ b/manual/it/user_examples.ssi
@@ -0,0 +1,412 @@
+:B~ Esempi
+
+1~examples Esempi
+
+Questo capitolo affronta alcune costruzioni di esempio per specifici casi
+d'uso con Debian Live. Se si è nuovi nella costruzione di immagini Debian
+Live, raccomandiamo di dare innanzitutto un'occhiata ai tre tutorial in
+sequenza, dato che ciascuno insegna nuove tecniche che aiuteranno nell'uso e
+nella comprensione degli esempi rimanenti.
+
+2~using-the-examples Usare gli esempi
+
+Per usare questi esempi è necessario un sistema per costruirveli sopra che
+soddisfi i requisiti elencati in {Requisiti}#requirements e avere live-build
+installato come descritto in {Installare live-build}#installing-live-build.
+
+Si noti che, per brevità, in questi esempi non specifichiamo un mirror
+locale da usare per la costruzione. Usando un mirror locale, si possono
+accelerare considerevolmente i download. Si possono specificare le opzioni
+quando si usa #{lb config}#, come descritto in {Mirror delle distribuzioni
+usati in fase di compilazione}#distribution-mirrors-build-time o, più
+convenientemente, impostare il predefinito per il proprio sistema in
+#{/etc/live/build.conf}#. Si crei semplicemente questo file e si impostino
+in esso le corrispondenti variabili #{LB_MIRROR_*}# per il mirror
+desiderato. Ad esempio:
+
+code{
+
+ LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+ LB_MIRROR_CHROOT="http://mirror/debian"
+ LB_MIRROR_CHROOT_SECURITY="http://mirror/debian-security"
+
+}code
+
+2~tutorial-1 Tutorial 1: un'immagine standard
+
+*{Caso d'uso:}* creare una prima immagine semplice, imparare i fondameni di live-build.
+
+In questo tutorial genereremo un'immagine ISO ibrida di Debian Live
+contenente solo i pacchetti base (niente Xorg) e alcuni pacchetti Debian
+Live di supporto, come primo esercizio sull'uso di live-build.
+
+Non può essere più semplice:
+
+code{
+
+ $ mkdir tutorial1 ; cd tutorial1 ; lb config
+
+}code
+
+Esaminare i contenuti della directory #{config/}#; si noterà uno scheletro
+di configurazione pronto per essere personalizzato o, in questo caso, usato
+immediatamente per costruire un'immagine predefinita.
+
+Ora, come super-utente, si generi l'immagine, salvando un log con #{tee}#.
+
+code{
+
+ # lb build 2>&1 | tee binary.log
+
+}code
+
+Presupponendo che tutto vada per il verso giusto, dopo un po' la directory
+corrente conterrà #{binary-hybrid.iso}#. Questa immagine ISO ibrida può
+essere avviata direttamente in una macchina virtuale come descritto in
+{Provare un'immagine ISO con Qemu}#testing-iso-with-qemu e {Provare
+un'immagine ISO con virtualbox-ose}#testing-iso-with-virtualbox, oppure
+masterizzata su un supporto ottico o ancora su una chiavetta USB come
+descritto rispettivamente in {Masterizzare un'immagine ISO su un supporto
+fisico}#burning-iso-image e {Copiare un'immagine USB/HDD su una penna
+USB}#copying-usb-hdd-image.
+
+2~tutorial-2 Tutorial 2: un programma di utilità web browser
+
+*{Caso d'uso:}* creazione di un'immagine browser web, imparare come applicare le personalizzazioni.
+
+In questo tutorial verrà creata un'immagine adatta all'uso come browser web,
+che serve come introduzione alla personalizzazione delle immagini Debian
+Live.
+
+code{
+
+ $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel
+
+}code
+
+La scelta di LXDE per questo esempio riflette il desiderio di fornire un
+ambiente desktop minimale, dato che il punto focale dell'immagine è il
+singolo uso che abbiamo in mente, il browser web. Potremmo anche spingerci
+oltre e fornire una configurazione predefinita per il browser web in
+#{config/chroot_local-includes/etc/iceweasel/profile/}#, o pacchetti
+addizionali di supporto per la fruizione di vari tipi di contenuti web, ma
+lasciamo questo come esercizio per il lettore.
+
+Si generi l'immagine, ancora come super-utente, conservando un log come in
+{Tutorial 1}#tutorial-1:
+
+code{
+
+ # lb build 2>&1 | tee binary.log
+
+}code
+
+Di nuovo, si verifichi che l'immagine sia a posto e la si collaudi, come in
+{Tutorial 1}#tutorial-1.
+
+2~tutorial-3 Tutorial 3: un'immagine personalizzata
+
+*{Caso d'uso:}* creare un progetto per costruire un'immagine personalizzata, contenente i pacchetti preferiti da portare con sé in una chiavetta USB ovunque si vada, da evolvere in revisioni successive allorché i bisogni o le preferenze cambino.
+
+Dal momento che la nostra immagine personalizzata cambierà con le successive
+revisioni, e che vogliamo tener traccia di questi cambiamenti, sperimentando
+ed eventualmente tornare indietro se qualcosa non funziona, conserveremo la
+nostra configurazione nel popolare sistema di controllo di versione
+#{git}#. Useremo anche le migliori pratiche di auto-configurazione tramite
+gli script #{auto}# come descritto in {Gestire una
+configurazione}#managing-a-configuration.
+
+3~ Prima revisione
+
+code{
+
+ $ mkdir -p tutorial3/auto
+ $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/
+ $ cd tutorial3
+
+}code
+
+Modificare #{auto/config}# come segue:
+
+code{
+
+ #!/bin/sh
+
+ lb config noauto \
+     --architecture i386 \
+     --linux-flavours 686 \
+     --packages-lists lxde \
+     --packages "iceweasel xchat" \
+     "${@}"
+
+}code
+
+Per prima cosa, #{--architecture i386}# assicura che sul nostro sistema
+#{amd64}# costruiamo una versione a 32-bit utilizzabile sulla maggior parte
+delle macchine. In secondo luogo, usiamo #{--linux-flavours 686}# dato che
+non prevediamo di usare questa immagine su sistemi troppo vecchi. Terzo,
+abbiamo scelto la lista di pacchetti #{lxde}# per avere un desktop
+minimale. Infine, abbiamo aggiunto due pacchetti preferiti per cominciare:
+#{iceweasel}# e #{xchat}#.
+
+Costruire quindi l'immagine:
+
+code{
+
+ # lb build
+
+}code
+
+Si noti che diversamente dai primi due tutorial, non bisogna più digitare
+#{2>&1 | tee binary.log}# dato che questo è ora incluso in #{auto/build}#.
+
+Una volta che l'immagine è stata collaudata (come in {Tutorial
+1}#tutorial-1) e che si è sicuri che funzioni correttamente, è il momento di
+inizializzare il repository #{git}#, aggiungendo solo gli script auto appena
+creati, e poi fare il primo commit:
+
+code{
+
+ $ git init
+ $ git add auto
+ $ git commit -a -m "Initial import."
+
+}code
+
+3~ Seconda revisione
+
+In questa revisione ripuliremo la prima compilazione, aggiungeremo il
+pacchetto #{vlc}# alla configurazione, dunque avverrà una ricompilazione,
+verifica e commit.
+
+Il comando #{lb clean}# ripulirà tutti i file generati dalla precedente
+compilazione eccetto la cache, che ci evita un nuovo download dei
+pacchetti. Ciò assicura che il successivo #{lb build}# eseguirà di nuovo
+tutti i passaggi per rigenerare i file dalla nuova configurazione.
+
+code{
+
+ # lb clean
+
+}code
+
+Si modifichi ora #{auto/config}# per aggiungere il pacchetto #{vlc}#:
+
+code{
+
+ #!/bin/sh
+
+ lb config noauto \
+     --architecture i386 \
+     --linux-flavours 686 \
+     --packages-lists lxde \
+     --packages "iceweasel xchat vlc" \
+     "${@}"
+
+}code
+
+Compilare nuovamente:
+
+code{
+
+# lb build
+
+}code
+
+Verificare, e quando soddisfatti, eseguire il commit della revisione
+successiva:
+
+code{
+
+ $ git commit -a -m "Adding vlc media player."
+
+}code
+
+Ovviamente sono possibili cambiamenti alla configurazione più complicati,
+magari aggiungendo file in sottodirectory di #{config/}#. Quando si esegue
+il commit di nuove revisioni, si faccia solo attenzione a non modificare
+manualmente o fare un commit dei file al livello superiore di #{config}# che
+contengono le variabili #{LB_*}#, giacché sono anche  prodotti della
+compilazione, e che sono sempre ripuliti da #{lb clean}# e ricreati con #{lb
+config}# attraverso i loro rispettivi script #{auto}#.
+
+Siamo arrivati alla fine di questa serie di tutorial. Mentre sono possibili
+molti altri tipi di personalizzazioni, anche solo usando le poche
+caratteristiche esplorate in questi semplici esempi, può essere creata una
+varietà quasi infinita di immagini. Gli esempi rimanenti in questa sezione
+coprono diversi altri casi d'uso estrapolati dalle esperienze raccolte degli
+utenti Debian Live.
+
+2~ Un client Kiosk VNC
+
+*{Caso d'uso:}* creare un'immagine con live-build per avviare direttamente un server VNC.
+
+Creare una directory con al suo interno una configurazione scheletrica
+costruita sulla base dell'elenco di standard-x11, tra cui #{gdm3}#,
+#{metacity}# e #{xtightvncviewer}#, disabilitando i raccomandati per
+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
+
+}code
+
+Creare la directory #{/etc/skel}# e inserirvi un #{.xsession}#
+personalizzato per l'utente predefinito che lancerà metacity e avvierà
+xvncviewer, connesso alla porta #{5901}# su un server all'indirizzo
+#{192.168.1.2}#:
+
+code{
+
+ $ 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
+
+ exit
+ END
+
+}code
+
+Costruire l'immagine:
+
+code{
+
+ # lb build
+
+}code
+
+Buon divertimento.
+
+2~ Un'immagine base per una chiavetta USB da 128M
+
+*{Caso d'uso:}* creare un'immagine standard rimuovendo alcuni componenti affinché stia su una chiavetta USB da 128M con lo spazio che rimane da usare come meglio si crede.
+
+Quando si cerca di ottimizzare un'immagine affinché sia contenuta in un
+supporto, è necessario capire il compromesso che si deve fare tra la
+dimensione e la funzionalità. In questo esempio, taglieremo solo quanto
+basta per far sì che il tutto stia in 128M, senza fare nient'altro che
+distrugga l'integrità dei pacchetti contenuti, come eliminare localizzazioni
+con il pacchetto #{localepurge}# o altre ottimizzazioni "intrusive". È da
+notare che non va usato #{--bootstrap-flavour minimal}# a meno che non si
+sappia cosa si sta facendo, come omettere la priorità dei pacchetti
+#{important}# che molto probabilmente produrrà un sistema live danneggiato.
+
+code{
+
+ $ lb config -k 486 -p minimal --binary-indices false \
+     --memtest none --apt-recommends false --includes none
+
+}code
+
+Costruire quindi l'immagine nel modo consueto:
+
+code{
+
+ # lb build 2>&1 | tee binary.log
+
+}code
+
+All'autore del sistema al momento di scrivere, la seguente configurazione ha
+prodotto una immagine di 78Mbyte. Comparabile favorevolmente con i 166Mbyte
+prodotta dalla configurazione predefinita nel {Tutorial 1}#tutorial-1.
+
+Ciò che salva più spazio, comparato alla costruzione di un'immagine standard
+su un sistema con architettura #{i386}#, è la selezione del solo kernel
+#{486}# invece che quello predefinito #{-k "486 686"}#. Lasciando fuori
+anche gli indici di APT con #{--binary-indices false}# si può salvare una
+certa quantità di spazio, il compromesso è usare #{apt-get update}# prima di
+usare apt nel sistema live. Scegliendo la lista #{minima}# dei pacchetti si
+esclude il grosso pacchetto #{locales}# e le utilità associate. Saltare i
+pacchetti raccomandati con #{--apt-recommends false}# salva altro spazio, a
+scapito di alcuni pacchetti che ci si aspetta di trovare, come
+#{firmware-linux-free}# che potrebbe servire a supportare un certo
+hardware. Le restanti opzioni limano altre piccole quantità di spazio. Sta a
+voi decidere se le funzionalità sacrificate con ciascuna ottimizzazione
+valgono la pena.
+
+2~ Un desktop KDE localizzato e l'installer
+
+*{Caso d'uso:}* creare un'immagine con il desktop KDE, localizzato per il Brasiliano Portoghese che includa l'installatore.
+
+Si vuole creare un'immagine iso ibrida per architettura i386 usando il
+nostro desktop preferito, in questo caso KDE, contenente tutti gli stessi
+pacchetti che verrebbero installati dall'installatore Debian standard per
+KDE.
+
+Il problema iniziale è di scoprire i nomi dei task appropriati, attualmente,
+live-build non aiuta in questo. Si può essere fortunati o arrivarci con vari
+tentativi, ma c'è uno strumento #{grep-dctrl}# il quale può essere
+utilizzato per scavare nelle descrizioni in tasksel-data, perciò assicursi
+di avere entrambi questi pacchetti:
+
+code{
+
+ # apt-get install dctrl-tools tasksel-data
+
+}code
+
+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.
+
+}code
+
+Con questo comando, si è scoperto che il task si chiama, abbastanza
+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.
+
+ Task: brazilian-portuguese-kde-desktop
+ Description: Brazilian Portuguese KDE desktop
+  This task localises the KDE desktop in Brazilian Portuguese.
+
+}code
+
+Si userà l'opzione sperimentale #{--language}#, poiché live-build contempla
+i template #{syslinux}# per pt_BR (Vedere {Task per desktop e
+lingua}#desktop-and-language-tasks per i dettagli). All'avvio verrà generata
+la lingua pt_BR.UTF-8 e selezionato pt-latin1 come layout della
+tastiera. Ora mettiamo insieme i pezzi:
+
+code{
+
+ $ mkdir live-pt_BR-kde
+ $ cd live-pt_BR-kde
+ $ lb config \
+     -a i386 \
+     -k 486 \
+     -p kde-desktop \
+     --language pt_BR \
+     --tasks "brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop" \
+     --bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
+     --debian-installer live \
+     --packages debian-installer-launcher
+
+}code
+
+Si noti che è stato incluso il pacchetto #{debian-installer-launcher}# in
+modo da poter lanciare l'installer dal desktop della live, ed è stato anche
+specificato il kernel 486, poiché è necessario che il kernel dell'installer
+e quello del sistema coincidano affinche il launcher funzioni
+appropriatamente.
+
diff --git a/manual/it/user_installation.ssi b/manual/it/user_installation.ssi
new file mode 100644
index 0000000..40631c2
--- /dev/null
+++ b/manual/it/user_installation.ssi
@@ -0,0 +1,182 @@
+:B~ Installazione
+
+1~ Installazione
+
+2~requirements Requisiti
+
+Per costruire immagini Debian Live i requisiti di sistema sono davvero
+pochi:
+
+_* Accesso come super-utente (root)
+
+_* Una versione aggiornata di live-build
+
+_* Una shell POSIX-compliant, come /{bash}/ o /{dash}/.
+
+_* /{debootstrap}/ o /{cdebootstrap}/
+
+_* Linux 2.6.x
+
+Si noti che usare Debian o una distribuzione derivata Debian non è richiesto
+- live-build funzionerà sostanzialmente su qualsiasi distribuzione che
+soddisfi i requisiti di cui sopra.
+
+2~installing-live-build Installare live-build
+
+Si può installare live-build in diversi modi:
+
+_* Dal repository Debian
+
+_* Da sorgenti
+
+_* Da istantanee
+
+Se si sta usando Debian, il metodo raccomandato è di installare live-build
+attraverso il repository Debian.
+
+3~ Dal repository Debian
+
+Installare live-build semplicemente come qualsiasi altro pacchetto:
+
+code{
+
+ # apt-get install live-build
+
+}code
+
+o
+
+code{
+
+ # aptitude install live-build
+
+}code
+
+3~ Da sorgenti
+
+live-build è sviluppato usando il sistema di controllo versione Git. Sui
+sistemi Debian è fornito dal pacchetto /{git}/. Per scaricare il codice
+aggiornato, eseguire:
+
+code{
+
+ $ git clone git://live.debian.net/git/live-build.git
+
+}code
+
+È possibile costruirsi ed installarsi il proprio pacchetto Debian eseguendo:
+
+code{
+
+ $ cd live-build
+ $ dpkg-buildpackage -rfakeroot -b -uc -us
+ $ cd ..
+
+}code
+
+Si installino ora i file #{.deb}# appena generati ai quali si è interessati,
+ad esempio:
+
+code{
+
+ # dpkg -i live-build_2.0.8-1_all.deb
+
+}code
+
+Si può anche installare live-build direttamente sul proprio sistema
+eseguendo:
+
+code{
+
+ # make install
+
+}code
+
+e disinstallarlo con:
+
+code{
+
+ # make uninstall
+
+}code
+
+3~ Da 'istantanee'
+
+Se non si desidera generare o installare live-build da sorgenti, è possibile
+usare le istantanee. Sono costruite automaticamente dall'ultima versione
+presente su Git e disponibili su http://live.debian.net/debian/.
+
+2~ live-boot e live-config
+
+*{Nota:}* non è necessario installare live-boot o live-config sul proprio sistema per creare sistemi Debian Live personalizzati. Tuttavia, farlo non nuoce.
+
+3~ Dal repository Debian
+
+Sia  live-boot che live-config sono disponibili dai repository Debian come
+per l' {installazione di live-build}#installing-live-build.
+
+3~ Da sorgenti
+
+Per utilizzare i sorgenti più recenti da Git si può seguire il procedimento
+seguente. Assicurarsi di conoscere i termini menzionati nel
+{Glossario}#terms.
+
+_* 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
+
+}code
+
+Consultare la pagine man di live-boot e live-config per i dettagli sulla
+personalizzazione se questa è il motivo per compilare questi pacchetti dai
+sorgenti.
+
+_* Costruire un .deb di live-boot e live-config
+
+Bisogna costruire o sulla propria distribuzione target, oppure in un chroot
+contenete la piattaforma target: significa che se il target è Squeeze allora
+bisogna costruire su Squeeze.
+
+Utilizzare un builder personale tipo /{pbuilder}/ o /{sbuild}/ se si deve
+costruire #{live-boot}# per una distribuzione target diversa dal proprio
+sistema di build. Ad esempio, per immagini live Squeeze, si generi
+#{live-boot}# in un chroot Squeeze. Se la distribuzione target corrisponde
+con la distribuzione del proprio sistema di build, si può costruire
+direttamente sul sistema di build usando #{dpkg-buildpackage}# (fornito dal
+pacchetto /{dpkg-dev}/):
+
+code{
+
+ $ cd live-boot
+ $ dpkg-buildpackage -b -uc -us
+ $ cd ../live-config
+ $ dpkg-buildpackage -b -uc -us
+
+}code
+
+_* Usare il .deb di live-boot generato
+
+Siccome live-boot e live-config sono installati dal sistema live-build,
+installare il pacchetto nel sistema host non è sufficiente: occorre trattare
+il .deb generato come un qualsiasi altro pacchetto su misura. Per maggiori
+informazioni si veda {Personalizzare l'installazione dei
+pacchetti}#customizing-package-installation. Si presti particolare
+attenzione a {Repository aggiuntivi}#additional-repositories.
+
+3~ Da 'istantanee'
+
+Si può lasciare che live-build usi automaticamente l'ultima istantanea di
+live-boot e live-config configurando un repository esterno nella directory
+di configurazione di live-build. Assumendo che si sia già creato un albero
+di configurazione con #{lb config}#:
+
+code{
+
+ $ 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
new file mode 100644
index 0000000..e797fe7
--- /dev/null
+++ b/manual/it/user_managing_a_configuration.ssi
@@ -0,0 +1,95 @@
+:B~ Gestire una configurazione
+
+1~managing-a-configuration Gestire una configurazione
+
+Questo capitolo spiega come gestire una configurazione per una live sin
+dalla creazione iniziale, attraverso le successive revisioni e rilasci sia
+del software live-build che della stessa immagine live.
+
+2~ Utilizzare auto per gestire i cambiamenti di configurazione
+
+Le configurazioni live raramente sono perfette da riuscire al primo
+colpo. Servono una serie di revisioni prima di essere soddisfatti. Comunque,
+possono verificarsi delle incoerenze tra una revisione ed un'altra se non si
+presta attenzione. Il problema principale è, una volta che ad una variabile
+è assegnato un valore predefinito, tale valore non sarà ricalcolato da altre
+variabili che possono cambiare in altre revisioni. 
+
+Per esempio, durante la messa a punto della prima distribuzione, molte
+variabili 'dependent' sono date dalle caratteristiche della
+distribuzione. Quindi, se in seguito si decide di cambiare distribuzione,
+quelle variabili dipendenti continueranno a mantenere i vecchi valori i
+quali non sono più appropriati 
+
+Un secondo relativo problema è che se si lancia #{lb config}# e si è
+aggiornato live-build ad una nuova versione il quale ha cambiato il nome di
+una o più variabili, si può scoprire ciò solamente con una revisione manuale
+delle variabili nei file #{config/*}#,  bisogna che vengano risistemate, di
+nuovo, le appropriate opzioni.
+
+Tutto ciò potrebbe essere un fastidio terribile se non fosse per lo script
+auto/*, una semplice alternativa ai comandi #{lb config}#, #{lb build}# e
+#{lb clean}# che sono disegnati per aiutare nella gestione della
+configurazione. Basta creare un semplice script auto/config che contenga il
+comando #{lb config}# con le opzioni desiderate, e un auot/clean che rimuova
+i file contenenti i valori variabili di configurazione, cosi ogni volta
+saranno eseguiti #{lb config}# #{lb clean}#. Questo farà si che la
+configurazione sia sempre coerente da una revisione all'altra o dal rilascio
+delle varie versioni del live-build.
+
+2~ Esempi di auto script
+
+Usare esempi di auto script come il seguente come punto di partenza per una
+nuova configurazione di live-build. Prendere nota che quando si chiama il
+comando #{lb}# che l'auto script wraps, si deve specificare il parametro
+#{noauto}# per essere sicuri che l'auto script chiamato di nuovo
+ricorsivamente. Non dimenticare, inoltre, di rendere lo script eseguibile
+(es. #{chmod 755 auto/*}#).
+
+#{auto/config}#
+
+code{
+
+ #!/bin/sh
+ lb config noauto \
+     --packages-lists "standard" \
+     "${@}"
+
+}code
+
+#{auto/clean}#
+
+code{
+
+ #!/bin/sh
+ lb clean noauto "${@}"
+ rm -f config/binary config/bootstrap \
+     config/chroot config/common config/source
+ rm -f binary.log
+
+}code
+
+#{auto/build}#
+
+code{
+
+ #!/bin/sh
+ lb build noauto "${@}" 2>&1 | tee binary.log
+
+}code
+
+Facciamo un esempio di auto script per live-build basato sull'esempio
+precedente. Si possono copiare come punto di partenza.
+
+code{
+
+ $ cp /usr/share/live/build/examples/auto/* auto/
+
+}code
+
+Modifica #{auto/config}# aggiungendo o togliendo le opzioni come meglio
+credi. Nel precedente esempio #{--packages-lists standard}# è impostato il
+valore predefinito.Cambiare questo in un valore appropriato per l'immagine (
+o cancellarlo se si desidera utilizzare un valore predefinito) e aggiungere
+eventuali opzioni aggiuntive in continuazione delle righe che seguono.
+
diff --git a/manual/it/user_overview.ssi b/manual/it/user_overview.ssi
new file mode 100644
index 0000000..76176a9
--- /dev/null
+++ b/manual/it/user_overview.ssi
@@ -0,0 +1,160 @@
+:B~ Panoramica degli strumenti
+
+1~ Panoramica degli strumenti
+
+Questo capitolo contiene una panoramica dei tre principali strumenti
+utilizzati nella creazione dei sistemi Debian Live: live-build, live-boot e
+live-config.
+
+2~live-build live-build
+
+live-build è una raccolta di script, chiamati anche "comandi", usati per
+creare sistemi Debian Live.
+
+L'idea dietro live-build è di essere un'infrastruttura che utilizza una
+directory di configurazione per automatizzare totalmente e personalizzare
+tutti gli aspetti della creazione di un'immagine live.
+
+Molti concetti sono simili a quelli negli strumenti del pacchetto Debian
+debhelper scritto da Joey Hess:
+
+_* Gli script hanno una locazione centrale per configurare le loro
+operazioni, in debhelper questa è la sottodirectory #{debian/}# dell'albero
+di un pacchetto. Ad esempio dh_install cercherà, tra gli altri, un file
+chiamato #{debian/install}# per determinare quali file dovrebbero esistere
+in un certo pacchetto binario. Allo stesso modo, live-build salva la sua
+configurazione interamente in una sottodirectory #{config/}#.
+
+_* Gli script sono indipendenti, vale a dire che è sempre sicuro eseguire
+ogni comando.
+
+Al contrario di debhelper, live-build contiene uno strumento per generare
+una directory scheletro di configurazione, #{lb config}#, che può essere
+considerato simile a utilità come #{dh-make}#. Per maggiori informazioni su
+#{lb config}# si veda {Il comando lb config}#lb-config.
+
+Il resto di questa sezione tratta i tre comandi più importanti:
+
+_* *{lb config}*: responsabile dell'inizializzazione di una directory di
+configurazione del sistema live. Si veda {Il comando lb config}#lb-config
+per maggiori informazioni.
+
+_* *{lb build}*: responsabile di iniziare la creazione di un sistema
+live. Si veda {Il comando lb}#lb-build per maggiori informazioni.
+
+_* *{lb clean}*: responsabile della rimozione di parti della creazione di un
+sistema live. Si veda {Il comando lb clean}#lb-clean per maggiori
+informazioni.
+
+3~lb-config Il comando #{lb config}#
+
+Come discusso in {live-build}#live-build, gli script che compongono
+live-build attingono la loro configurazione da una singola directory
+chiamata #{config/}#. Dal momento che crearla a mano sarebbe dispendioso in
+termini di tempo e soggetto a errori, si può usare il comando #{lb config}#
+per creare la directory scheletro di configurazione.
+
+L'esecuzione di #{lb config}# senza argomenti crea una sottodirectory di
+#{config/}# popolata con alcune impostazioni predefinite:
+
+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
+
+}code
+
+L'uso di #{lb config}# senza argomenti è adatto ad utenti che necessitano di
+un'immagine di base o che intendono fornire in seguito una configurazione
+più completa tramite auto/config (per i dettagli vedere {Gestire una
+configurazione}#managing-a-configuration).
+
+Normalmente si vorranno specificare delle opzioni, ad esempio per includere
+nella propria configurazione l'elenco del pacchetto "gnome":
+
+code{
+
+ $ lb config -p gnome
+
+}code
+
+È possibile specificare molte opzioni, come:
+
+code{
+
+ $ lb config --binary-images net --hostname live-machine --username live-user ...
+
+}code
+
+Una lista completa delle opzioni e' disponibile nel manuale di
+#{lb_config}#.
+
+3~lb-build Il comando #{lb build}#
+
+Il comando #{lb build}# legge la configurazione dalla directory #{config/}#
+ed esegue ad un livello inferiore i comandi necessari a costruire il sistema
+live.
+
+3~lb-clean Il comando #{lb clean}#
+
+Il compito del comando #{lb clean}# è di rimuovere diverse parti di una
+compilazione affinché quelle successive possano iniziare in un ambiente
+pulito.
+
+2~live-boot Il pacchetto live-boot
+
+live-boot è una raccolta di script che forniscono hook per initramfs-tools,
+utilizzato per generare un initramfs in grado di avviare sistemi live, come
+quelli creati da live-build. Questo include le ISO di Debian Live, archivi
+per l'avvio da rete e immagini per penne USB.
+
+All'avvio cercherà supporti in sola lettura che contengano una directory
+"/live" dove sia presente un filesystem root (spesso un'immagine compressa
+come squashfs). Se trovata, creerà un ambiente scrivibile usando aufs, per
+avviarsi da sistemi simili a Debian.
+
+Si possono trovare maggiori informazioni sui ramfs iniziali nel capitolo su
+initramfs del Debian Linux Kernel Handbook all'indirizzo
+http://kernel-handbook.alioth.debian.org/.
+
+2~live-config Il pacchetto live-config
+
+live-config è costituito da script eseguiti all'avvio dopo live-boot per
+configurare automaticamente il sistema live. Gestisce attività quali
+impostare l'hostname, localizzazione e fuso orario, creare l'utente live,
+inibire compiti automatizzati tramite cron ed eseguire il login automatico
+dell'utente live.
+
diff --git a/manual/po/de/about_manual.ssi.po b/manual/po/de/about_manual.ssi.po
index 3eb74bb..7076bff 100644
--- a/manual/po/de/about_manual.ssi.po
+++ b/manual/po/de/about_manual.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-05 11:16+0100\n"
+"Project-Id-Version: live-manual 2.0.0\n"
+"POT-Creation-Date: 2010-12-20 05:58-0400\n"
 "PO-Revision-Date: 2010-10-22 08:36-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -61,7 +61,7 @@ msgid ""
 "#examples section designed to teach you image building and customization "
 "basics. Read {Using the examples}#using-the-examples first, followed by "
 "{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
-"utility}#tutorial-2 and finally {Tutorial 3: A personal travelling companion}"
+"utility}#tutorial-2 and finally {Tutorial 3: A personalized image}"
 "#tutorial-3. By the end of these tutorials, you will have a taste of what "
 "can be done with Debian Live. We encourage you to return to more in-depth "
 "study of the manual, perhaps next reading {The basics}#the-basics, skimming "
@@ -281,8 +281,8 @@ msgstr ""
 msgid ""
 "This manual is intended as a community project and all proposals for "
 "improvements and contributions are extremely welcome. The preferred way to "
-"submit a contribution is to send it to the mailing list. Please see {Contact}"
-"#contact for more information."
+"submit a contribution is to send it to the mailing list. Please see the "
+"section {Contact}#contact for more information."
 msgstr ""
 
 #. type: Plain text
@@ -298,39 +298,31 @@ msgstr ""
 #: en/about_manual.ssi:82
 msgid ""
 "The sources for this manual are maintained using the Git version control "
-"system. You can checkout the latest copy by executing:"
+"system. You can check out the latest copy by executing:"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
 #: en/about_manual.ssi:146 en/about_manual.ssi: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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
+#: 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
@@ -343,38 +335,29 @@ msgstr ""
 #: en/user_customization-packages.ssi:185
 #: en/user_customization-packages.ssi:199
 #: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
 #: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:321
-#: en/user_customization-runtime.new.ssi:14
-#: en/user_customization-runtime.new.ssi:34
-#: en/user_customization-runtime.new.ssi:42
-#: en/user_customization-runtime.new.ssi:50
-#: en/user_customization-runtime.new.ssi:64
-#: en/user_customization-runtime.new.ssi:76
-#: en/user_customization-runtime.new.ssi:86
-#: en/user_customization-runtime.new.ssi:94
-#: en/user_customization-runtime.new.ssi:102
-#: en/user_customization-runtime.new.ssi:110
-#: en/user_customization-runtime.new.ssi:130
-#: en/user_customization-runtime.new.ssi:138
-#: en/user_customization-runtime.new.ssi:147
-#: en/user_customization-runtime.ssi:12 en/user_customization-runtime.ssi:30
-#: en/user_customization-runtime.ssi:40 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:56 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:92
-#: en/user_customization-runtime.ssi:101 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:141 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -391,32 +374,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/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
-#: en/user_customization-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
+#: 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
@@ -429,38 +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:285
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
 #: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:334
-#: en/user_customization-runtime.new.ssi:18
-#: en/user_customization-runtime.new.ssi:38
-#: en/user_customization-runtime.new.ssi:46
-#: en/user_customization-runtime.new.ssi:54
-#: en/user_customization-runtime.new.ssi:68
-#: en/user_customization-runtime.new.ssi:80
-#: en/user_customization-runtime.new.ssi:90
-#: en/user_customization-runtime.new.ssi:98
-#: en/user_customization-runtime.new.ssi:106
-#: en/user_customization-runtime.new.ssi:114
-#: en/user_customization-runtime.new.ssi:134
-#: en/user_customization-runtime.new.ssi:143
-#: en/user_customization-runtime.new.ssi:152
-#: en/user_customization-runtime.ssi:16 en/user_customization-runtime.ssi:34
-#: en/user_customization-runtime.ssi:44 en/user_customization-runtime.ssi:52
-#: en/user_customization-runtime.ssi:60 en/user_customization-runtime.ssi:68
-#: en/user_customization-runtime.ssi:88 en/user_customization-runtime.ssi:97
-#: en/user_customization-runtime.ssi:106 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:31
+#: 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: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
@@ -478,19 +444,21 @@ 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 libnokogiri-ruby\n"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:98
 msgid ""
-"You may build the live-manual from the top level directory of your git "
+"You may build the live-manual from the top level directory of your Git "
 "checkout by executing:"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:102
-msgid "$ make build"
+#, no-wrap
+msgid " $ make build\n"
 msgstr ""
 
 #. type: Plain text
@@ -503,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
@@ -514,9 +483,9 @@ msgstr ""
 #. type: Plain text
 #: en/about_manual.ssi:116
 msgid ""
-"Directly commiting to the repository is possible by anyone. However, we ask "
-"you to send bigger changes to the mailing list to discuss them first. In "
-"order to push to the repository, the following steps are required."
+"Anyone can directly commit to the repository. However, we ask you to send "
+"bigger changes to the mailing list to discuss them first. To push to the "
+"repository, you must follow this procedure:"
 msgstr ""
 
 #. type: Plain text
@@ -528,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/live.debian.net\n"
-"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-"\t-O ~/.ssh/identity.d/live.debian.net.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/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
@@ -545,49 +514,52 @@ 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
 #: en/about_manual.ssi:144
-msgid "_* Checkout a clone of the manual through ssh:"
+msgid "_* Check out a clone of the manual through ssh:"
 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
 #: en/about_manual.ssi:152
 msgid ""
-"_* After editing the files in manual/en/, please call the 'commit' target in "
-"the top level directory to sanitize the files and update the translation "
-"files:"
+"_* After editing the files in #{manual/en/}#, please call the 'commit' "
+"target in the top level directory to sanitize the files and update the "
+"translation files:"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:156
-msgid "$ make commit"
+#, no-wrap
+msgid " $ make commit\n"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:160
 msgid ""
-"_* After sanitizing commit the changes. Write commit messages, that consist "
-"of full useful sentences, starting with a capital letter and ending with a "
-"full stop. Usually starting with the form 'Fixing/Adding/Removing/"
-"Correcting/':"
+"_* After sanitizing, commit the changes. Write commit messages that consist "
+"of full, useful sentences in English, starting with a capital letter and "
+"ending with a full stop. Usually, these will start with the form 'Fixing/"
+"Adding/Removing/Correcting/Translating', e.g."
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:164
-msgid "$ git commit -a"
+#, no-wrap
+msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -597,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
@@ -607,21 +580,29 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:178
-msgid "Submiting a translation for a new language is recommendet in two steps:"
+msgid "To submit a translation for a new language, follow these three steps:"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:180
 msgid ""
-"_* Translate the about_manual.ssi.pot about_project.ssi.pot index.html.in."
-"pot files to your language with your favourite editor (such as poedit). Send "
-"translated files to the mailinglist. It will then be included and autobuild "
-"for that language enabled."
+"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
+"in.pot files to your language with your favourite editor (such as poedit). "
+"Send translated files to the mailing list. Once we have reviewed your "
+"submission, we will add the new language to the manual (providing the po "
+"files) and will enable it in the autobuild."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:182
+msgid ""
+"_* Once the new language is added, you can randomly start translating all po "
+"files in #{manual/po/}#."
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:181
+#: en/about_manual.ssi:184
 msgid ""
-"_* Now that the new language was added, you can randomly start translating "
-"all other pot files."
+"_* Don't forget you need #{make commit}# to ensure the translated manuals "
+"are updated from the po files, before #{git commit -a}# and #{git push}#."
 msgstr ""
diff --git a/manual/po/de/about_project.ssi.po b/manual/po/de/about_project.ssi.po
index 72dd3c1..bcc2a3d 100644
--- a/manual/po/de/about_project.ssi.po
+++ b/manual/po/de/about_project.ssi.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
+"Project-Id-Version: live-manual 2.0.0\n"
 "POT-Creation-Date: 2010-11-27 10:30-0400\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
diff --git a/manual/po/de/index.html.in.po b/manual/po/de/index.html.in.po
index 8b8d8df..ff59fb8 100644
--- a/manual/po/de/index.html.in.po
+++ b/manual/po/de/index.html.in.po
@@ -2,14 +2,15 @@
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
+# Carlo Stemberger <carlo.stemberger at gmail.com>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a3\n"
-"POT-Creation-Date: 2010-10-20 20:02+0300\n"
-"PO-Revision-Date: 2010-06-06 15:21+0300\n"
-"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
-"Language-Team: none\n"
+"Project-Id-Version: live-manual 2.0.0\n"
+"POT-Creation-Date: 2010-12-08 15:58+0100\n"
+"PO-Revision-Date: 2010-12-08 16:19+0100\n"
+"Last-Translator: Carlo Stemberger <carlo.stemberger at gmail.com>\n"
+"Language-Team: Italian <tp at lists.linux.it>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,18 +23,18 @@ msgid "Debian Live Project"
 msgstr "Debian Live Projekt"
 
 #. type: Content of: <html><body><h2>
-#: en/index.html.in:8
+#: en/index.html.in:9
 msgid "Debian Live Manual"
 msgstr "Debian Live Handbuch"
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:11
+#: en/index.html.in:12
 msgid "<i>This manual is under heavy construction.</i>"
 msgstr ""
 "<i>Dieses Handbuch ist noch nicht fertig und befindet sich im Aufbau.</i>"
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:15
+#: en/index.html.in:16
 msgid ""
 "Please report errors, omissions, patches and suggestions to our mailinglist "
 "at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
@@ -47,17 +48,17 @@ msgstr ""
 "gefunden werden."
 
 #. type: Content of: <html><body><h3>
-#: en/index.html.in:18
+#: en/index.html.in:19
 msgid "Available Formats"
 msgstr "Verfügbare Formate"
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:21
+#: en/index.html.in:22
 msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
 msgstr "<a href=\"epub/live-manual.epub\">EPUB</a>"
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:22
+#: en/index.html.in:23
 msgid ""
 "HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
 "html\">single page</a>"
@@ -66,12 +67,12 @@ msgstr ""
 "manual.html\">einzelne Seite</a>"
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:23
+#: en/index.html.in:24
 msgid "<a href=\"odf/live-manual.odt\">ODF</a>"
 msgstr "<a href=\"odf/live-manual.odt\">ODF</a>"
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:24
+#: en/index.html.in:25
 msgid ""
 "PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
 "\"pdf/live-manual.landscape-a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
@@ -84,36 +85,36 @@ msgstr ""
 "manual.landscape-letter.pdf\">Letter Querformat</a>"
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:25
+#: en/index.html.in:26
 msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
 msgstr "<a href=\"txt/live-manual.txt\">Text</a>"
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:29
+#: en/index.html.in:30
 msgid "Last changed: @DATE_CHANGE@"
 msgstr "Letzte Änderung: @DATE_CHANGE@"
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:30
+#: en/index.html.in:31
 msgid "Last built: @DATE_BUILD@"
 msgstr "Letzte Aktualisierung: @DATE_BUILD@"
 
 #. type: Content of: <html><body><h3>
-#: en/index.html.in:33
+#: en/index.html.in:34
 msgid "Source"
 msgstr "Quellen"
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:36
+#: en/index.html.in:37
 msgid ""
 "The sources for this manual is available in a <a href=\"http://git.or.cz/"
-"\">git</a> repository at live.debian.net."
+"\">Git</a> repository at live.debian.net."
 msgstr ""
 "Die Quellen dieses Handbuches sind in einem <a href=\"http://git.or.cz/"
 "\">Git</a> Repository auf live.debian.net verfügbar."
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:40
+#: en/index.html.in:41
 msgid ""
 "Browse: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
 "\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
@@ -124,7 +125,7 @@ msgstr ""
 "a>"
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:41
+#: en/index.html.in:42
 msgid ""
 "Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
 "live.debian.net/git/live-manual.git</tt></small></a>"
@@ -133,7 +134,7 @@ msgstr ""
 "live.debian.net/git/live-manual.git</tt></small></a>"
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:45
+#: en/index.html.in:46
 msgid ""
 "<a href=\"http://live.debian.net/\">Debian Live</a> &lt;<a href=\"mailto:"
 "debian-live at lists.debian.org\">debian-live at lists.debian.org</a>&gt; - <a "
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index 94bf78a..4f44084 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-06 12:26+0100\n"
+"Project-Id-Version: live-manual 2.0.0\n"
+"POT-Creation-Date: 2010-12-24 03:54+0100\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2010-12-06\n"
+" :published: 2010-12-24\n"
 msgstr ""
 
 #. type: Plain text
@@ -86,7 +86,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:31
-msgid ":B~ User ~#"
+msgid ":B~ User"
 msgstr ""
 
 #. type: Plain text
@@ -126,80 +126,45 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:47
-msgid "<< user_customization-internationalization.ssi"
+msgid "<< user_customization-runtime.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:49
-msgid "<< user_customization-runtime.ssi"
+msgid "<< user_customization-binary.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:51
-msgid "<< user_customization-binary.ssi"
+msgid "<< user_customization-installer.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:53
-msgid "<< user_customization-installer.ssi"
+msgid ":B~ Project"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:55
-msgid ":B~ Development ~#"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:57
-msgid ":B~ Project ~#"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:59
 msgid "<< project_bugs.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:61
+#: en/live-manual.ssm:57
 msgid "<< project_coding-style.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:63
+#: en/live-manual.ssm:59
 msgid "<< project_procedures.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:65
-msgid ":B~ Examples ~#"
+#: en/live-manual.ssm:61 en/user_examples.ssi:2
+msgid ":B~ Examples"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:67
+#: en/live-manual.ssm:63
 msgid "<< user_examples.ssi"
 msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:69
-msgid ":B~ Other ~#"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:75
-msgid ""
-"Other material that formerly appeared in this section is out of date and/or "
-"has not been approved for release. It has therefore been omitted, but can "
-"still be found in the document source; see 'About this manual'. Any part of "
-"the omitted material that is still useful will be included in the release "
-"only after it has been reviewed."
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:77
-msgid "% << other_faq.ssi"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:78
-msgid "% << other_howtos.ssi"
-msgstr ""
diff --git a/manual/po/de/other_faq.ssi.po b/manual/po/de/other_faq.ssi.po
deleted file mode 100644
index 3e14c24..0000000
--- a/manual/po/de/other_faq.ssi.po
+++ /dev/null
@@ -1,1008 +0,0 @@
-# German translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-10-16 14:45-0200\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. type: Plain text
-#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
-#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: 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/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
-#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
-#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
-#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
-#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:106
-#: en/user_installation.ssi:120 en/user_installation.ssi:137
-#: en/user_managing_a_configuration.ssi:24
-#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:60
-#: en/user_overview.ssi:104 en/user_overview.ssi:112
-msgid "code{"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
-#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
-#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
-#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
-#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
-#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
-#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
-#: en/user_basics.ssi:257 en/user_basics.ssi:285 en/user_basics.ssi:293
-#: en/user_basics.ssi:320 en/user_basics.ssi:359
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
-#: en/user_customization-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:110
-#: en/user_installation.ssi:125 en/user_installation.ssi:140
-#: en/user_managing_a_configuration.ssi:31
-#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
-msgid "}code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:2
-msgid "B~ Frequently asked questions (FAQ)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:4
-msgid "1~ Frequently asked questions (FAQ)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:8
-msgid ""
-"Q: I downloaded a prebuilt live image. How do I put it on a USB stick? A: "
-"See \"Copying USB/HDD image to a USB stick\" % FIXME: <xref linkend="
-"\"image_copying\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:11
-msgid ""
-"Q: How do I log my build? A: You could use script, screen or tee: #{$ "
-"lh_build 2>&1 | tee build.log}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:14
-msgid ""
-"Q: How can I convert an already installed standard Debian partition into a "
-"Debian Live system? A: Save the list of installed packages and load it into "
-"your new Debian Live System. Copy your /etc to config/chroot_local-includes"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:17
-msgid ""
-"Q: What does 'losetup: could not find any free loop device' mean and how do "
-"I fix it? A: Loop devices are used during the build; there probably aren't "
-"any free if you've aborted several builds. Something like: for l in /dev/"
-"loop0 /dev/loop1 /dev/loop2 /dev/loop3 /dev/loop4 /dev/loop5 /dev/loop6 /dev/"
-"loop7 ; do losetup -d $l ; done should rectify the situation (assuming all "
-"loop devices in use were created by lh_build; if in doubt, check the "
-"contents of each loop device before deleting them with losetup -d)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:20
-msgid ""
-"Q: How do I launch an interactive shell during the chroot stage? A: To "
-"enable interactive shell: #{$ lh_config --interactive shell}# To continue "
-"the build process: #{# logout}# or #{# exit}# To disable interactive shell, "
-"set LH_INTERACTIVE to \"disabled\" in config/chroot."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:23
-msgid ""
-"Q: What is the root /user password? A: The user password for the live user "
-"is 'live'. By default, there is not any root password. You can switch to "
-"root with ${sudo -i}# or set a password for root with #{sudo passwd}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:27
-msgid ""
-"Q: How do I change root or any user password? A: Add a chroot local hook "
-"script to change root or any user password each time you build an image.  e."
-"g. config/chroot_local-hooks/01-update_password.sh to set root password to "
-"\"nopasswd\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:30 en/other_faq.ssi:53
-msgid "code{ #!/bin/sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:33
-msgid "echo \"I: update password\" echo \"root:nopasswd\" | chpasswd"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:35
-msgid "$ chmod +x config/chroot_local-hooks/01-update_password.sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:39
-msgid ""
-"Note for live user; you need to copy the /usr/share/initramfs-tools/scripts/"
-"live-bottom/10adduser your build folder:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:44
-msgid ""
-"mkdir -p config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-"
-"bottom/ cp /usr/share/initramfs-tools/scripts/live-bottom/10adduser config/"
-"chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:48
-msgid ""
-"Note: Then edit the config/chroot_local-includes/usr/share/initramfs-tools/"
-"scripts/live-bottom/10adduser and paste in the new user_crypted password "
-"that you make with: #{echo \"newlivepass\" | mkpasswd -s}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:50
-msgid ""
-"Or add an hook file in config/chroot_local-hooks/ with something like the "
-"below:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:57
-msgid ""
-"# Change the autogenerated user password to \"debianlive\" plain_password="
-"\"debianlive\" password=$(echo \"${plain_password}\" | mkpasswd -s)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:59
-msgid ""
-"sed -i -e 's/\\(user_crypted=\\)\\(.*\\)\\( #.*\\)/\\1\\\"'${password}'\\"
-"\"\\3/' /usr/share/initramfs-tools/scripts/live-bottom/10adduser"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:62
-msgid "update-initramfs -tu -kall }code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:64
-msgid ""
-"The latter (hook model) could be more future proof than the former solution "
-"since it modifies just one string selectively but it requires the package "
-"\"whois\" to be installed on the target system (for mkpasswd) or that you "
-"generate the $password string not at build time and include it crypted in "
-"the above script."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:68
-msgid ""
-"Q: How to disable autologin? A1: use the commandline parameter #{lh config --"
-"bootappend-live \"noautologin\"}# A2: You need to set boot=noautologin "
-"noxautologin as described in man live-initramfs If you boot via TFTP you "
-"want to insert the option to pxelinux.cfg/default"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:71
-msgid ""
-"Q: How do I change default hostname or username? A: To change default "
-"hostname or username: #{$ lh_config --hostname myhostname $ lh_config --"
-"username myusername}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:74
-msgid ""
-"Q: How do I make the final image smaller? A: Clean orphaned apps/libs: "
-"Install package \"deborphan\" and then run 'sudo deborphan -n' . Delete "
-"unwanted packages. Remove the apt cache. Purge unwanted locales (see "
-"\"localepurge\" package)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:77
-msgid ""
-"Q: How do I customize bash-config permanently (aliases, bash-completion "
-"etc.)? A: Add your own .bashrc config/chroot_local-includes/etc/skel/.bashrc"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:81
-msgid ""
-"Q: How do I disable services permanently? (Be careful!)  A: Add a chroot "
-"local hook script to disable a service each time you build an image: e.g. "
-"config/chroot_local-hooks/01-disable_service.sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/other_use-cases.ssi:26
-#: en/other_use-cases.ssi:77
-msgid "#!/bin/sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:88
-msgid "echo \"I: disable service\" update-rc.d -f service_name remove"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:90
-msgid "$ chmod +x config/chroot_local-hooks/01-disable_service.sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:95
-msgid ""
-"Q: How do I enable | disable the md5checksum at the ISO building? A: #"
-"{lh_config --checksums enabled|disabled}# Or change the LH_CHECKSUMS value."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:98
-msgid ""
-"Q: How to disable the generation of the .tar.gz file? A: #{lh_config --net-"
-"tarball none|gzip}# Or change the LH_NET_TARBALL value. (only available in "
-"snapsshot version at the moment 2008/Feb/28)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:101
-msgid "Q: How do I \"build a new image\"? A: Run commands:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:106
-msgid "$ sudo lh_clean --binary $ sudo lh_build"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:110
-msgid ""
-"Hint: If the configuration had changed you should leave \"--binary\" out. "
-"This will clean your chroot directory too."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:113
-msgid ""
-"Q: How do I use Fluxbox ? A: Add a new lists file with the fluxbox packages "
-"you want."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:115
-msgid "Create /home/$USERNAME/.dmrc file (default username is \"user\")."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:122
-msgid "$ cat .dmrc [Desktop] Session=fluxbox }code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:124
-msgid "Note: .dmrc is owned by $USERNAME:$USERNAME."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:126
-msgid ""
-"See also http://wiki.debian.org/Fluxbox/ A short HOWTO can be found at "
-"http://wiki.debian.org/MichaelAblassmeier/CustomLiveCD"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:129
-msgid ""
-"Q: How do I use custom repositories? A: See http://wiki.debian.org/"
-"DebianLive/Configuration"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:132
-msgid ""
-"Q: How do I customize the artwork for the live CD (grub or syslinux boot "
-"splash, usplash, etc.)? A: See http://wiki.debian.org/DebianLive/Howto/"
-"Custom_Artwork"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:135
-msgid ""
-"Q: How do I customize desktop environment (KDE, GNOME, XFCE, etc...) look? "
-"A: Start the live system in qemu:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:139
-msgid "$ qemu -m 256 -cdrom binary.iso -boot d -redir tcp:4222:10.0.2.15:22"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:143
-msgid "Note: the -redir argument must be changed to meet your needs"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:146
-msgid ""
-"Q: How do I execute a custom shell script inside the chroot system after the "
-"chroot stage? A: Add your script in config/chroot_local-hooks."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:149
-msgid ""
-"Q: How do I add a script running immediately after all other scripts when "
-"the live system boots? A: Add your script in config/chroot_local-includes/"
-"usr/share/initramfs-tools/scripts/live-bottom/99scrip"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:153
-msgid ""
-"$ chmod +x config/chroot_local-includes/usr/share/initramfs-tools/scripts/"
-"live-bottom/99script"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:157
-msgid ""
-"Note: The hook script must be executable. Do not forget to lh_clean --chroot "
-"after making this change before you build again."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:159
-msgid ""
-"You must also use the example script /usr/share/live-helper/examples/hooks/"
-"update-initramfs.sh to ensure your script gets built into the initramfs "
-"(read the comment header for instructions)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:163
-msgid ""
-"Q: How do I add software not in Debian ? A: See Customizing package "
-"installation % FIXME: <xref linkend=\"packages\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:166
-msgid ""
-"Q: What is the manifest with Ubuntu used for? A: Manifest is just the "
-"package list, which ubuntu does $something with. Don't worry about it."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:169
-msgid ""
-"Q: What is this {p} syntax with mtools{p} and parted{p}? A: That's aptitude."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:172
-msgid ""
-"Q: Do I need to write the image on USB stick to test it? A: you must use "
-"qemu >= 0.8."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:175
-msgid "Q: What is /cow? A: Copy-on-write, the 'diff' from unionfs."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:178
-msgid ""
-"Q: Is /usr/share/live-helper/lists/standard-x11 like preseed or is preseed "
-"something else entirely? A: It is not. It is a package list, not a debconf "
-"preseeding."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:181
-msgid ""
-"Q: What is the difference between standard and minimal? A: standard: "
-"packages of priority standard and higher; minimal: packages of priority "
-"essential and higher;"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:184
-msgid ""
-"Q: What can the sections be used for? Aren't they BIG? A: Someone maybe "
-"wants to include packages from contrib or non-free."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:187
-msgid "Q: memtest86+ ... is that used? A: Yes"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:190
-msgid ""
-"Q: How do I build using predefined packages lists? A: e.g. to build using "
-"standard-x11 packages list: #{$ sudo lh_config -p standard-x11 && sudo "
-"lh_build}# Note: The packages lists can be found in /usr/share/live-helper/"
-"lists/ directory."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:193
-msgid ""
-"Q: How do I rebuild without downloading all the packages again? A: All "
-"packages are cached in cache subdirectory. They remain until a clean purge: #"
-"{$ sudo lh_clean --purge}# You do not have to do anything to prevent "
-"packages from being re-downloaded. You need to remember to clean whichever "
-"stages you want to rebuild first. e.g. to rebuild from the cached bootstrap, "
-"chroot packages and build a new image. #{$ sudo lh_clean && sudo lh_build}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:196
-msgid ""
-"Q: How do I boot USB debian-live on systems not supporting USB boot? A: Make "
-"a boot CD with grub, configured to boot from a debian-live kernel copied on "
-"the cd structure #{$ mkdir -p iso/boot/grub && cp /usr/lib/grub/i386-pc/"
-"stage2_eltorito iso/boot/grub && cp chroot/boot/* iso/boot/}# Create iso/"
-"boot/grub/menu.lst:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:205
-msgid ""
-"default 0 timeout 5 color cyan/blue white/blue title Debian Live root (cd)  "
-"kernel /boot/vmlinuz boot=live initrd /boot/initrd.img"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:209
-msgid ""
-"Create the iso image #{$ mkisofs -R -b boot/grub/stage2_eltorito -no-emul-"
-"boot \\ -boot-load-size 4 -boot-info-table -o grub.iso iso}# Burn the image."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:212
-msgid ""
-"Q: How do I boot debian-live on systems not supporting CDROM or USB boot? A: "
-"If you have a floppy drive, you may be able to use it, otherwise you will "
-"need to use loadlin/grub4dos/win32-loader. If you have a second system to "
-"serve up the image over the network, See http://wiki.debian.org/DebianLive/"
-"Howto/Creating_a_Netboot_Image"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:215
-msgid ""
-"Q: The X configuration does not seems to work, the resolution is too low. "
-"What can I do? A: Use xdebconfigurator #{$ lh_config --bootappend xdebconf "
-"&& lh_config --packages xdebconfigurator}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:218
-msgid ""
-"Q: Apache has problems with static files A: Sendfile does not work well on "
-"the unionfs used by Debian Live. Add the following to apache's "
-"configuration: #{EnableSendfile off}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:222
-msgid ""
-"Q: How do I make hard disk partitions auto-mountable? A: Short answer: Right "
-"now the best is to use a script that will populate the fstab when the CD is "
-"booting. Such a script can be found at https://devel.goto10.org/svn/puredyne/"
-"trunk/broth/stock/chroot_local-includes/sbin/diskmounter.sh. A proper "
-"solution based on HAL will be described here in a hopefully near future.  A: "
-"Long Answer: Since 55_nonpolkit-mount-policy.patch in HAL, debian-storage-"
-"policy-fixed-drives.fdi is not available anymore and the previous trick that "
-"consisted to remove this file to enable automounting of fixed drives as a "
-"consequence is obsolete. Eventually, it will be possible to combine HAL and "
-"PolicyKit to enable different permissions and actions to achieve advanced "
-"(auto)mounting for non-root users. Until then, because the live scripts are "
-"only touching to the fstab to add a swap partition if discovered at boot "
-"time, the only way to have fixed drives mounted automatically is to use a "
-"script that will populate the fstab file at the end of the multiuser "
-"runlevel. To achieve this, you can do, for example, the following: download "
-"the https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-"
-"includes/sbin/diskmounter.sh script Create the chroot_local-includes/sbin "
-"directory, and move the script inside Make sure the script is executable "
-"(chmod +x diskmounter.sh) create the chroot_local-includes/etc/rc.local file "
-"and call the diskmounter from there (see this https://devel.goto10.org/svn/"
-"puredyne/trunk/broth/stock/chroot_local-includes/etc/rc.local When called "
-"correctly, the script detects ext2, ext3, reiserfs, xfs, FAT32, HFS+ and "
-"NTFS partitions and mount them read-write, except for NTFS. This will change "
-"soon and an option will be available to use ntfs-3g to mount NTFS as read-"
-"write. comments, patches and other things about this script and issue: "
-"http://code.goto10.org/projects/puredyne/ticket/463"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:225
-msgid ""
-"Q: Boot fails with panic: can't open /scripts/live A: Add latest live-"
-"initramfs deb package into config/chroot_local-packages directory and "
-"rebuild."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:229
-msgid ""
-"Q: How do I configure the locale and the keyboard? A: See 10n % FIXME: <xref "
-"linkend=\"internalization\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:234
-msgid ""
-"Q: How do I get past boot prompt without a working keyboard? A: See "
-"Customizing the bootup process % FIXME: <xref linkend=\"bootup\"/> Note: "
-"Boot from an USB-HDD on an iMac with GRUB did not work."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:237
-msgid ""
-"Q: Can I serve the root image from a web or ftp server? A: Since live-"
-"initramfs 1.99, it should be possible to use the fetch= argument on the "
-"kernel command line. You can build a netboot image as usual, and when you "
-"are done edit the tftpboot/pxelinux.cfg/default file. Remove the references "
-"to network boot (netboot, nfsroot, nfsopts), and replace with fetch= <url "
-"where you placed the root image>. You have to include wget in the chroot. It "
-"could work for other boot methods as well. However, I am not sure the live "
-"scripts configure the network when booting from a CD or USB disk. #{$ "
-"lh_config --packages wget}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:240
-msgid ""
-"Q: Why doesn't quickreboot (or some other boot parameter) work? A: If you "
-"are building an etch image (which was the default up to 2007/09/14) you have "
-"a very old version of casper which does not support quickreboot and possibly "
-"other boot parameters as well. You could configure your sources to use live-"
-"backports (see /usr/share/live-helper/examples/sources/live-backports) and "
-"switch to live-initramfs, or better yet, build a lenny image instead, which "
-"is the new default. #{$ lh_config --distribution lenny $ lh_config --"
-"initramfs live-initramfs}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:243
-msgid ""
-"Q: How do I fix \"Could not find kernel image\" issue with syslinux "
-"bootloader? A: Add a binary local hook script to fix kernel and initrd path "
-"each time you build an image. e.g. config/binary_local-hooks/01-fix_syslinux."
-"sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:249
-msgid "SYSLINUXCFG=`find binary -type f -name syslinux.cfg`"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:252
-msgid ""
-"sed -i \"s|kernel /vmlinuz|kernel vmlinuz|g\" ${SYSLINUXCFG} sed -i \"s|"
-"initrd=/initrd|initrd=initrd|g\" ${SYSLINUXCFG}"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:254
-msgid "$ chmod +x config/binary_local-hooks/01-fix_syslinux.sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:259
-msgid ""
-"Q: How do I use a newer kernel with lenny? A: A build with backports.org "
-"kernels will fail as that repository lacks the necessary module packages "
-"(linux-modules-extra-2.6, aufs, etc.). Use the kernel backports http://"
-"unsupported.debian-maintainers.org/backports-kernel/ The quick way to "
-"success:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:268
-msgid ""
-"$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6 squashfs-"
-"modules-2.6' $ echo 'deb http://unsupported.debian-maintainers.org/backports-"
-"kernel/ ./' > config/chroot_sources/backports-kernel.chroot $ echo 'deb "
-"http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/"
-"chroot_sources/backports-kernel.binary $ wget http://unsupported.debian-"
-"maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/"
-"backports-kernel.chroot.gpg $ wget http://unsupported.debian-maintainers.org/"
-"backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel."
-"binary.gpg $ lh_build }code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:271
-msgid ""
-"Q: How do I use a custom kernel? Is there a nice way of booting debian-live "
-"with a custom kernel (not in an apt repo)? A: Copy it into config/"
-"chroot_local-packages and set LH_LINUX_PACKAGES=\"none\" or use lh config --"
-"linux-packages \" \" Don't forget to compile your kernel with an union "
-"filesystem (unionfs or aufs), squashfs modules, and initrd support. I can "
-"cause the kernel to be installed but it seems this happens later than grub/"
-"syslinux is configured so it's not listed and casper/ and the menu require "
-"munging. You need to follow the debian scheme, e.g. placing the files in /"
-"boot as vmlinuz-$version and initrd.img-$version etc. I personally wouldn't "
-"go that way which is too much of a hassle, and just use make-kpkg to produce "
-"custom kernel deb packages. They should integrate nicely if you just put "
-"them into config/chroot_local-packages and set LH_LINUX_PACKAGES=\"\". Hint: "
-"to work around an error, which lh_binary_syslinux will throw on custom "
-"kernels if there is not an 468/686 in the kernel-name, you need to set "
-"CONFIG_LOCALVERSION=\"-486\" or \"-686\" within the kernel configuration (-"
-"&gt; General setup -&gt; Local version set to -486 or -686) corresponding to "
-"LH_LINUX_FLAVOURS=\"\" or \"686\". this at least up till live-helper version "
-"1.0~a40-1 see http://lists.alioth.debian.org/pipermail/debian-live-"
-"devel/2007-July/001947.html and http://lists.alioth.debian.org/pipermail/"
-"debian-live-devel/2007-November/002581.html"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:274
-msgid ""
-"Q: How do I create a cross arch live CD image? A: In short: You can't. Read "
-"on: The procedure to create a live CD is based on creating a chroot that "
-"contains the files that will be finally available on the live CD. The live "
-"CD building procedure includes chrooting into the chroot dir and so some "
-"operations. chrooting means that the terminal you chroot on will behave as a "
-"different system so your real system and the chroot environment is decoupled "
-"somehow. Once the live CD scripts chroots into the chroot dir they have some "
-"operations to do inside that environment and your real system won't be able "
-"to run them unless you are using the same architecture. So you only are able "
-"to make live CD for the arch you run on. But this doesn't prevent you run "
-"qemu or some other machine emulator that make this possible."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:277
-msgid ""
-"Q: When is a lh_clean necessary? lh_clean is a script in /usr/bin/ A: That "
-"depends what you've changed between builds If, for example, you've built an "
-"iso image and you want a usb image, you only need to run #{lh_clean --binary}"
-"# before you run lh_build again. If you've changed anything in the chroot, "
-"you'll need to cleanup both chroot and binary with #{lh_clean}# before "
-"continuing"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:280
-msgid ""
-"Q: How can i set boot= parameters? A: Set LH_BOOTAPPEND_LIVE in config/binary"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:283
-msgid ""
-"Q: How do I include different modules to load when the live system boots? A: "
-"Configure config/chroot_local-includes/etc/initramfs-tools/"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:285
-msgid ""
-"The lh_chroot_hacks helper rebuilds the live/initrd1.img using the default "
-"initramfs.conf \"MODULES = most\". You may override that by supplying your "
-"own initramfs.conf, or else just add your own modules, e.g."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:290
-msgid ""
-"mkdir -p config/chroot_local-includes/etc/initramfs-tools/ echo \"atl2\" >> "
-"config/chroot_local-includes/etc/initramfs-tools/modules"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:294
-msgid ""
-"Note: Even though initramfs.conf(5) says \"most adds all the framebuffer, "
-"acpi, file system, ide, sata, scsi and usb drivers\", it actually includes "
-"network drivers as well. See auto_add_modules() in /usr/share/initramfs-"
-"tools/hook-functions for the complete list."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:297
-msgid ""
-"Q: Can I have a splash screen? A: Yes you can. You will not know what is "
-"going on when the splash screen is active, it may fail to activate on some "
-"hardware or break X on other (both usplash and splashy use libdirectfb which "
-"does some evil voodoo and may break you graphics or input until you reboot). "
-"However, you can install and activate it just as you would on any other "
-"Debian system. To use splashy: 1. install splashy and read the README, the "
-"manpages are useless for setting it up. Add some parameters to your kernel "
-"command line, such as in your pxelinux configuration or in "
-"LH_BOOTAPPEND_LIVE in config/binary in debian-live configuration: #{vga=792 "
-"splash quiet}# #{vga}# to select video mode, #{splash}# to activate splashy, "
-"#{quiet}# to suppress most kernel messages that you cannot see anyway but "
-"would scroll past before splashy manages to paint the graphics on your "
-"screen. You might want to add splashy to the list of packages installed in "
-"your image: #{echo splashy > config/chroot_local-packageslists/splashy echo "
-"splashy-themes >> config/chroot_local-packageslists/splashy}# and select a "
-"theme:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:305
-msgid ""
-"echo '#!/bin/sh' > config/chroot_local-hooks/splashy echo splashy_config -s "
-"debian-moreblue '||' true >> config/chroot_local-hooks/splashy # update the "
-"ramdisk to include the splash screen echo update-initramfs -u -k all >> "
-"config/chroot_local-hooks/splashy chmod 755 config/chroot_local-hooks/splashy"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:309
-msgid ""
-"After you rebuild your live system you should observe a bluish splash screen "
-"while booting. Nothing happens while initramfs is running because there is "
-"no splashy support in initramfs-tools. Once the init starts the progress bar "
-"should start to fill. If #{vga=something}# sets a mode that your screen "
-"cannot show or your card cannot do vesa 2.0 (and thus you get plain text "
-"mode and no splashy) read the splashy faq."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:312
-msgid ""
-"Q: Howto use my Broadcom eXtrem 2 network card (module bnx2)? A: Add the "
-"firmwares to the initrd image. You need to install the non-free package "
-"\"firmware-bnx2\". Uncompress your initrd image, then copy files:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:317
-msgid ""
-"cp /lib/firmware/bnx2x-e1-4.8.53.0.fw /lib/firmware/bnx2x-e1-5.0.21.0.fw /"
-"lib/firmware/bnx2x-e1h-4.8.53.0.fw /lib/firmware/bnx2x-e1h-5.0.21.0.fw "
-"${INITRD}/lib/firmware/ cp /lib/udev/firmware.agent ${INITRD}/lib/udev/"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:321
-msgid "Recompress your initrd image and boot: it works!"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:323
-msgid ""
-"Q: X is broken (the system boots, messages scroll by, and then the screen "
-"goes blank). What do I do? A: On my system starting X completely disables "
-"graphics so that I do not see anything even after X bails out and I am back "
-"to the console. To prevent this you can change the driver Xorg uses."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:325
-msgid ""
-"If you have a working splash screen or at least graphical console you can "
-"use #{live xdriver=fbdev}# when booting the live system (instead of just "
-"enter). Another driver you might want to try is #{vesa}#. If all fails you "
-"might try to set xdriver to some wrong value so that Xorg fails to start and "
-"you can examine the system while you still see something on the console. #"
-"{live xdriver=none}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:328
-msgid ""
-"Q: How can I get Debian first stable versions? A: I'm developing software "
-"and testing it on Live-CD. Thanks for the LiveCD project. To be sure my "
-"development is fully compatible with the \"etch\" version, I need the same "
-"scenario when Debian GNU/Linux 4.0 was published as stable (I believe "
-"2007.04.08). If there was some bug on 2007.04.08 that was corrected one week "
-"later, I need to test software foreseeing that scenario without the bug "
-"solved."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:331
-msgid ""
-"Q: I get \"fopen: Permission denied\"-warnings from apt on building/at the "
-"live-system A: That's a harmless bug in apt. However, if you want to get off "
-"this warnings in the live-system, add a file in chroot_local-hooks with "
-"follow row:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:335
-msgid "chown -R man.man /var/cache/man"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:340
-msgid ""
-"Q: Why I always fail during \"Retrieving Packages\" stage when running "
-"lh_build? I have already set apt-http-proxy and so on.  A: lh_build "
-"retrieves packages via wget, as a result you need to enable the proxy "
-"settings in /etc/wgetrc before running lh_build."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:343
-msgid ""
-"Q: How do I edit Xorg.conf? A: Xorg.conf is generated every time system "
-"boots, so it's useless to put modifed Xorg.conf in config/choort_local-"
-"includes/etc/X11, because it will be overwritten during boot. However, you "
-"can edit /usr/bin/dexconf, which generate xorg.conf during boot, so the "
-"result will be modified Xorg.conf. The modified dexconf has to be put in "
-"config/choort_local-includes/usr/bin. e.g.: you can configure Xorg.conf for "
-"two or more keyboards layouts with alt+shift toggle by editing dexconf and "
-"replacing the line:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:347
-msgid "Option \"XkbLayout\" \"$XKB_LAYOUT\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:351
-msgid "with the lines:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:356
-msgid ""
-"Option \"XkbLayout\" \"us,il\" Option \"XkbOptions\" \"grp:alt_shift_toggle,"
-"grp_led:scroll\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:360
-msgid "when \"us,il\" are the wanted keyboard layouts."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:362
-msgid ""
-"You can force default screen resulotion (e.g. 1024*768) by adding the lines:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:368
-#, no-wrap
-msgid ""
-"SubSection \"Display\"\n"
-"        Modes \"1024x768\"\n"
-"EndSubSection\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:372
-msgid "between the lines:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:379
-#, no-wrap
-msgid ""
-"Section \"Screen\"\n"
-"        Identifier \"Default Screen\"\n"
-"        Monitor \"Configured Monitor\"\n"
-"EndSection\"\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:383
-msgid ""
-"Q: Where are the build parameters for the prebuilt images A: See http://live."
-"debian.net/README.images."
-msgstr ""
diff --git a/manual/po/de/other_howtos.ssi.po b/manual/po/de/other_howtos.ssi.po
deleted file mode 100644
index e0facd5..0000000
--- a/manual/po/de/other_howtos.ssi.po
+++ /dev/null
@@ -1,379 +0,0 @@
-# German translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 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:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
-msgid "code{"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 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: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:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
-msgid "}code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:2
-msgid "B~ Howtos"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:4
-msgid "1~ Howtos"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:6
-msgid "2~ ISO"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:8
-msgid ""
-"Generating a Debian Live CD is very simple. You need to have live-helper "
-"(package available in Debian sid and lenny), and Debootstrap (or "
-"cdebootstrap) from etch or newer."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:10
-msgid "3~ Install live-helper"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:12
-msgid "#{apt-get install live-helper}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:14
-msgid "3~ Configure the current working directory with lh_config"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:18
-msgid "lh_config -b iso -a $ARCH"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:22
-msgid "where #{$ARCH}# is the intended architecture (i.e. - i386 or amd64)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:24
-msgid "#{-b}# flag is used to be sure to obtain image in ISO format."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:26
-msgid "3~ Build the image with lh_build:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:28
-msgid "Execute lh_build as root: #{lh_build}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:30
-msgid ""
-"The command above will create the basic image, containing just the Debian "
-"standard system (with no X at all)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:32
-msgid ""
-"If you want to have any of the Desktop environments on your livecd, #{ls /"
-"usr/share/live-helper/lists}# will show a number of available package Lists "
-"to choose from, e.g. #{lh_config -p gnome-desktop}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:34
-msgid "More examples are listed at DebianLive/Examples."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:37
-msgid ""
-"See packages for help configuring a local Debian Mirror and other aspects of "
-"the live system.  % FIXME: <xref linkend=\"packages\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:39
-msgid "3~ Test the image"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:41
-msgid "If you have qemu installed, you can boot the image with:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:45
-msgid "qemu -cdrom binary.iso"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:49
-msgid "If you have also kqemu installed, you can add #{-kernel-kqemu}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:51
-msgid "2~ ISO_(multiarch)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:53
-msgid ""
-"Multiple machine boot CDs can be created with the following manual "
-"procedure. This procedure has been successfully used to create a single CD "
-"which is bootable on alpha, i386, pmax, and sparc. It should be possible to "
-"also make the CD bootable on macppc, vax and on sun2, sun3 and sun3x."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:55
-msgid ""
-"To create a CD which is bootable by multiple architectures, use the "
-"following steps in this order. Please note that the order is critical."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:57
-msgid ""
-"Make sure you have all the required files including the various kernels and "
-"boot programs listed in the individual machine sections."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:59
-msgid ""
-"Include a directory somewhere in the cdsources directory called mdec.pmax "
-"and include the pmax bootxx_cd9660 file there. For example, /cdsources/usr/"
-"mdec.pmax/bootxx_cd9660."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:61
-msgid ""
-"Include a directory somewhere in the cdsources directory called mdec.vax and "
-"include the vax xxboot file there. For example, #{cdsources/usr/mdec.vax/"
-"xxboot.}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:63
-msgid "Include the macppc ofwboot.xcf bootloader in /cdsources."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:65
-msgid ""
-"Create an i386 bootable image. #{sh mkisofs -v -v -o output.iso -b i386/"
-"installation/floppy/boot-big.fs \\ -c boot.catalog -l -J -r -L /cdsources "
-"2>&1 | tee /tmp/mkisofs.log exit}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:67
-msgid ""
-"Note: The appearance of the -v flag twice is required. If you are making a "
-"bootable CD for an Open Firmware 3 macppc model, make sure to include -hfs -"
-"part in the parameters for mkisofs."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:69
-msgid ""
-"Run mksunbootcd on a NetBSD/sparc machine to install sparc and sun2/sun3 "
-"bootblocks. Alternatively, install the sysutils/mksunbootcd package on your "
-"favorite NetBSD machine. #{mksunbootcd output.iso boot-sun4.fs boot-sun4c.fs "
-"boot-sun4m.fs boot-sun3.fs}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:71
-msgid ""
-"Run the installboot(8) program targeted for NetBSD/pmax to install the pmax "
-"bootblocks. Note that in order to coexist with other NetBSD boot blocks, the "
-"pmax boot block is appended to the end of the ISO file system."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:73
-msgid ""
-"#{installboot -m pmax -v -o append,sunsum output.iso /tmp/mdec.pmax/"
-"bootxx_cd9660}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:75
-msgid ""
-"The -o append,sunsum option appends the first stage boot block to the end of "
-"the ISO file system, and restores the checksum used when booting on a sun."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:77
-msgid ""
-"Run the installboot(8) program targeted for NetBSD/vax to install the vax "
-"bootblocks. Note that in order to coexist with other NetBSD boot blocks, the "
-"vax boot block is appended to the end of the ISO file system."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:79
-msgid "installboot -m vax -v -o append,sunsum output.iso /tmp/mdec.vax/xxboot"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:81
-msgid "(See the pmax entry above for an explanation of the flags)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:83
-msgid ""
-"Run the installboot(8) program targeted for NetBSD/alpha to install the "
-"alpha bootblocks."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:85
-msgid ""
-"#{installboot -m alpha -v -o append,sunsum output.iso /tmp/mdec.alpha/"
-"bootxx_cd9660}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:86
-msgid ""
-"Note: The alpha installboot must occur after the others, because currently "
-"it's the only machine dependent back-end for installboot(8) that can "
-"calculate the alpha checksum. (See the pmax entry above for an explanation "
-"of the flags)."
-msgstr ""
diff --git a/manual/po/de/other_use-cases.ssi.po b/manual/po/de/other_use-cases.ssi.po
deleted file mode 100644
index e92a869..0000000
--- a/manual/po/de/other_use-cases.ssi.po
+++ /dev/null
@@ -1,379 +0,0 @@
-# German translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 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:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
-msgid "code{"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 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: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:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
-msgid "}code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/other_use-cases.ssi:26
-#: en/other_use-cases.ssi:77
-msgid "#!/bin/sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:2
-msgid "B~ Use Cases"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:4
-msgid "1~ Use Cases"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:6
-msgid "This chapter is for users to document their use cases with Debian Live."
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:8
-msgid "2~ VNC Kiosk Client"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:10
-msgid "Create an image with live-helper to boot directly to a VNC server."
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:12
-msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:14
-msgid "_* Move to the build directory: #{$ cd vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:16
-msgid ""
-"Example to config the build directory to include gdm metacity "
-"xtightvncviewer: #{$ lh config --packages \"gdm metacity xtightvncviewer\"}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:18
-msgid ""
-"Create a folder /etc/skel folder for a custom .xsession for the default "
-"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:20
-msgid ""
-"Create the .xsession for the default user: #{$ touch config/chroot_local-"
-"includes/etc/skel/.xsession}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:22
-msgid ""
-"Edit the .xsession file to launch metacity and start xvncviewer with "
-"something similar to the below:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:29
-msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:31
-msgid "exit"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:35
-msgid "_* Build the image: #{# lh build}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:37 en/other_use-cases.ssi:138
-msgid "_* Enjoy."
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:39
-msgid "2~ VMWare-Player Sessions"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:41
-msgid ""
-"Create an image with live-helper to boot directly to a specifiv VMWare "
-"session."
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:43
-msgid "_* Make a build directory: #{$ mkdir VMWare-Player}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:45
-msgid "_* Move to the build directory: #{$ cd VMWare-Player}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:47
-msgid ""
-"_* Example to config the build directory to include gdm metacity "
-"xtightvncviewer:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:67
-#, no-wrap
-msgid ""
-"$ lh config --apt apt \\\n"
-"        ---apt-recommends disabled \\\n"
-"        --archive-areas \"main\" \\\n"
-"        --binary-images iso \\\n"
-"        --binary-indices none \\\n"
-"        --syslinux-menu vesamenu \\\n"
-"        ---bootappend-live \"persistent quickreboot\" \\\n"
-"        ---bootappend-install \"-- plainroot persistent video=vesa:ywrap,mtrr vga=788 quickreboot quiet live-config\" \\\n"
-"        ---debian-installer live \\\n"
-"        ---distribution lenny \\\n"
-"        ---hostname vmare-player-firmware \\\n"
-"        ---includes none \\\n"
-"        ---linux-flavours 686 \\\n"
-"        ---packages-lists \"gnome-core\" \\\n"
-"        ---packages \"gcc gparted linux-headers-2.6-\\${LH_LINUX_FLAVOURS} live-config-staging make metacity rsync wireless-tools\" \\\n"
-"        ---repositories live.debian.net \\\n"
-"        ---win32-loader disabled\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:71
-msgid ""
-"_* Create the 01-vmware-player hook: #{$ touch config/chroot_local-hooks/01-"
-"vmware-player.sh}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:73
-msgid ""
-"Edit the 01-vmware-player hook to launch the VMWare-Player. The hook should "
-"look something like the below:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:80
-msgid ""
-"_URL=\"http://archive.debian-maintainers.org/vmware/other/vmware-player/\" "
-"_VMPLAYER_VERSION=\"VMware-Player.i386.bundle\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:83
-msgid "echo \"I: Starting script for install of VMWare Player.\" cd /root"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:86
-msgid ""
-"echo \"I: Beginning download of ${_VMPLAYER_VERSION} from ${_URL} .\" wget "
-"${_URL}${_VMPLAYER_VERSION}"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:89
-msgid ""
-"echo \"I: Starting install of VMWare Player.\" sh /root/${_VMPLAYER_VERSION}"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:92
-msgid ""
-"echo \"I: Cleaning up the VMWare Player download.\" rm /root/"
-"${_VMPLAYER_VERSION}"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:95
-msgid "#echo \"I: Starting interactive shell.\" #bash"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:99
-msgid ""
-"_* Build the image (note that during the build the VMWare-Player will prompt "
-"you to install or cancel): #{#lh build}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:101
-msgid ""
-"_* After the build you will have an image you can boot live or install as "
-"firmware. The package live-config-staging is the package that installs the "
-"ability to utilize the VMWare-Player by calling live-config.vmware-player as "
-"a boot parameter in the following form:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:105
-msgid "live-config.vmware-player=ACTION:IMAGEPATH:VMXNAME"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:109
-msgid "Notes from the 900-vmware-player file are as follows:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:135
-#, no-wrap
-msgid ""
-"# The script tests for boot parameter of\n"
-"# live-config.vmware-player=ACTION:IMAGEPATH:VMXNAME\n"
-"#\n"
-"# ACTION: The operation to perform on the workstation (none|scratch)\n"
-"# IMAGEPATH: The folder path to the VMware image you want to run.\n"
-"# VMXNAME: The name of the VMware image you want to run.\n"
-"#\n"
-"# Notes:To use this file with WMWare images you will need to have a few things\n"
-"# setup:\n"
-"#\n"
-"# 1. The VMware Player needs to be installed in the image.\n"
-"# 2. This script uses (s|h)da1 for writing image data, and is used as a scratch\n"
-"#    space. This scratch space should be a file system with linux permissions\n"
-"#    such as ext2.\n"
-"# 3. VMware image(s) should be in a mounted folder and setup as follows:\n"
-"#    - Image(s) set to snapshot mode.\n"
-"#    - For each image, the image folder needs to have a file called\n"
-"#      image-release with a variable CRELEASE. An example: CRELEASE=\"1.0.0\"\n"
-"#\n"
-"# The image-release file is used by the image maintainer and this script to tell\n"
-"# workstation(s) using a given image, to erase locally stored vmware image files\n"
-"# and setup with the newly configure image. The operation of erasing locally\n"
-"# stored vmare image files, is referred to as a scratch.\n"
-msgstr ""
diff --git a/manual/po/de/project_bugs.ssi.po b/manual/po/de/project_bugs.ssi.po
index 759d4db..dfcae8b 100644
--- a/manual/po/de/project_bugs.ssi.po
+++ b/manual/po/de/project_bugs.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-30 10:29+0100\n"
+"Project-Id-Version: live-manual 2.0.0\n"
+"POT-Creation-Date: 2010-12-23 07:37-0400\n"
 "PO-Revision-Date: 2010-10-25 23:27+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -20,65 +20,62 @@ 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_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/project_bugs.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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:24
+#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr ""
@@ -87,65 +84,62 @@ 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:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr ""
@@ -204,152 +198,165 @@ msgstr ""
 #. type: Plain text
 #: en/project_bugs.ssi:18
 msgid ""
-"Due to the nature of Debian *{testing}* and Debian *{unstable}* "
-"distributions being a moving target, building a live system may not always "
-"be possible."
+"Because Debian *{testing}* and Debian *{unstable}* distributions are a "
+"moving target, when you specify either as the target system distribution, a "
+"successful build may not always be possible."
 msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:20
-msgid ""
-"If this is a problem, do not build a system based on *{testing}* or *"
-"{unstable}*, but go with *{stable}*. live-build does always default to the "
-"current *{stable}* release."
+msgid "% FIXME:"
 msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:22
 msgid ""
-"Currently known issues are listed under the section 'status' on our homepage "
-"at http://live.debian.net/"
+"If this causes too much difficulty for you, do not build a system based on *"
+"{testing}* or *{unstable}*, but rather, use *{stable}*. live-build does "
+"always default to the *{stable}* release."
 msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:24
 msgid ""
-"It is out of the scope of this manual to train you in correctly identifying "
-"and fixing problems in packages of the development distributions, however, "
-"there are two things you can always try: When not succeeding to build *"
-"{testing}*, try if *{unstable}* works. If *{unstable}* does not work either, "
-"revert to *{testing}* and pinning the newer version of the failing package "
-"from *{unstable}*."
+"Currently known issues are listed under the section 'status' on our homepage "
+"at http://live.debian.net/."
 msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:26
-msgid "2~ Rebuild from scratch"
+msgid ""
+"It is out of the scope of this manual to train you to correctly identify and "
+"fix problems in packages of the development distributions, however, there "
+"are two things you can always try: If a build fails when the target "
+"distribution is *{testing}*, try *{unstable}*. If *{unstable}* does not work "
+"either, revert to *{testing}* and pin the newer version of the failing "
+"package from *{unstable}* (see {APT pinning}#apt-pinning for details)."
 msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:28
+msgid "2~ Rebuild from scratch"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:30
 msgid ""
-"To ensure that a particular bug is not caused by an unclean built system, "
+"To ensure that a particular bug is not caused by an uncleanly built system, "
 "please always rebuild the whole live system from scratch to see if the bug "
 "is reproducible."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:30
+#: en/project_bugs.ssi:32
 msgid "2~ Use up-to-date packages"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:32
+#: en/project_bugs.ssi:34
 msgid ""
 "Using outdated packages can cause significant problems when trying to "
-"reproduce (and ultimately fix) your problem."
+"reproduce (and ultimately fix) your problem. Make sure your build system is "
+"up-to-date and any packages included in your image are up-to-date as well."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:34
+#: en/project_bugs.ssi:36
 msgid "2~collect-information Collect information"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:36
+#: en/project_bugs.ssi:38
 msgid ""
-"Please provide enough information with your report. At a minimum, it should "
-"contain the exact version of live-build version where the bug is "
-"encountered, and steps to reproduce it. Please use common sense and include "
-"other relevant information if you think that it might help in solving the "
-"problem."
+"Please provide enough information with your report. At least include the "
+"exact version of live-build version where the bug is encountered and steps "
+"to reproduce it. Please use common sense and include other relevant "
+"information if you think that it might help in solving the problem."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:38
+#: en/project_bugs.ssi:40
 msgid ""
 "To make the most out of your bug report, we require at least the following "
 "information:"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:40
+#: en/project_bugs.ssi:42
 msgid "_* Architecture of the host system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:42
+#: en/project_bugs.ssi:44
 msgid "_* Version of live-build on the host system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:44
+#: en/project_bugs.ssi:46
 msgid "_* Version of live-boot on the live system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:46
+#: en/project_bugs.ssi:48
 msgid "_* Version of live-config on the live system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:48
-msgid "_* Version of debootstrap and/or cdebootstrap on the host system"
+#: en/project_bugs.ssi:50
+msgid ""
+"_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:50
+#: en/project_bugs.ssi:52
 msgid "_* Architecture of the live system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:52
+#: en/project_bugs.ssi:54
 msgid "_* Distribution of the live system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:54
+#: en/project_bugs.ssi:56
 msgid "_* Version of the kernel on the live system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:56
-msgid "You can generate a log of the build process by using the tee command:"
+#: en/project_bugs.ssi:58
+msgid ""
+"You can generate a log of the build process by using the #{tee}# command. We "
+"recommend doing this automatically with an #{auto/build}# script; see "
+"{Managing a configuration}#managing-a-configuration for details)."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:60
-msgid "lb build 2>&1 | tee build.log"
+#: en/project_bugs.ssi:62
+#, no-wrap
+msgid " # lb build 2>&1 | tee build.log\n"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:64
+#: en/project_bugs.ssi:66
 msgid ""
-"For runtime log, live-boot stores a log in /var/log/live.log (or /var/log/"
-"live-boot.log)."
+"At boot time, live-boot stores a log in #{/var/log/live.log}# (or #{/var/log/"
+"live-boot.log}#)."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:66
+#: en/project_bugs.ssi:68
 msgid ""
 "Additionally, to rule out other errors, it is always a good idea to tar up "
-"your config directory and upload it somewhere (do *{not}* send it as an "
-"attachment to the mailinglist), so that we can try to reproduce the errors "
-"you encountered."
+"your #{config/}# directory and upload it somewhere (do *{not}* send it as an "
+"attachment to the mailing list), so that we can try to reproduce the errors "
+"you encountered. If this is difficult (e.g. due to size) you can use the "
+"output of #{lb config --dump}# which produces a summary of your config tree "
+"(i.e. lists files in subdirectories of #{config/}# but does not include "
+"them)."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:68
+#: en/project_bugs.ssi:70
 msgid ""
 "Remember to send in any logs that were produced with English locale "
 "settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or #"
@@ -357,22 +364,41 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:70
+#: en/project_bugs.ssi:72
+msgid "2~ Isolate the failing case if possible"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:74
+msgid ""
+"If possible, isolate the failing case to the smallest possible change that "
+"breaks. It is not always easy to do this, so if you can't manage it for your "
+"report, don't worry. However, if you plan your development cycle well, using "
+"small enough change sets per iteration, you may be able to isolate the "
+"problem by constructing a simpler 'base' configuration that closely matches "
+"your actual configuration plus just the broken change set added to it. If "
+"you have a hard time sorting out which of your changes broke, it may be that "
+"you are including too much in each change set and should develop in smaller "
+"increments."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:76
 msgid "2~ Use the correct package to report the bug against"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:72
+#: en/project_bugs.ssi:78
 msgid "Where does the bug appear?"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:74
+#: en/project_bugs.ssi:80
 msgid "3~ At build time whilst bootstrapping"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:76
+#: en/project_bugs.ssi:82
 msgid ""
 "live-build first bootstraps a basic Debian system with #{debootstrap}# or #"
 "{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
@@ -382,7 +408,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:78
+#: en/project_bugs.ssi:84
 msgid ""
 "In both cases, this is not a bug in Debian Live, but rather in Debian itself "
 "which we can not fix this directly. Please report such a bug against the "
@@ -390,12 +416,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:80
+#: en/project_bugs.ssi:86
 msgid "3~ At build time whilst installing packages"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:82
+#: en/project_bugs.ssi:88
 msgid ""
 "live-build installs additional packages from the Debian archive and "
 "depending on the Debian distribution used and the daily archive state, it "
@@ -404,16 +430,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:84
+#: en/project_bugs.ssi:90
 msgid ""
 "If this is the case, this is not a bug in Debian Live, but rather in Debian "
-"- please report it against the failing package. Running debootstrap "
-"seperately from the Live system build or running lb bootstrap with #{--debug}"
-"# will give you more information."
+"- please report it against the failing package. Running #{debootstrap}# "
+"separately from the Live system build or running #{lb bootstrap --debug}# "
+"will give you more information."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:86
+#: en/project_bugs.ssi:92
 msgid ""
 "Also, if you are using a local mirror and/or any of sort of proxy and you "
 "are experiencing a problem, please always reproduce it first by "
@@ -421,40 +447,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:88
+#: en/project_bugs.ssi:94
 msgid "3~ At boot time"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:90
+#: en/project_bugs.ssi:96
 msgid ""
 "If your image does not boot, please report it to the mailing list together "
 "with the information requested in {Collect information}#collect-information. "
-"Do not forget to mention, how/when the image failed, in Qemu, VMWare or real "
-"hardware. If you are using a virtualization technology of any kind, please "
-"always run it on real hardware before reporting a bug. Providing a "
-"screenshot of the failure is also very helpful."
+"Do not forget to mention, how/when the image failed, in Qemu, Virtualbox, "
+"VMWare or real hardware. If you are using a virtualization technology of any "
+"kind, please always run it on real hardware before reporting a bug. "
+"Providing a screenshot of the failure is also very helpful."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:92
+#: en/project_bugs.ssi:98
 msgid "3~ At run time"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:94
+#: en/project_bugs.ssi:100
 msgid ""
 "If a package was successfully installed, but fails while actually running "
 "the Live system, this is probably a bug in Debian Live. However,"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:96
+#: en/project_bugs.ssi:102
 msgid "2~ Do the research"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:98
+#: en/project_bugs.ssi:104
 msgid ""
 "Before filing the bug, please search the web for the particular error "
 "message or symptom you are getting. As it is highly unlikely that you are "
@@ -464,7 +490,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:100
+#: en/project_bugs.ssi:106
 msgid ""
 "You should pay particular attention to the Debian Live mailing list, as well "
 "as the homepage, as these are likely to contain the most up-to-date "
@@ -473,7 +499,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:102
+#: en/project_bugs.ssi:108
 msgid ""
 "In addition, you should check the current bug lists for live-build, live-"
 "boot, and live-config to see whether something similar has been reported "
@@ -481,12 +507,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:104
+#: en/project_bugs.ssi:110
 msgid "2~ Where to report bugs"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:106
+#: en/project_bugs.ssi:112
 msgid ""
 "The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
 "System (BTS). For information on how to use the system, please see http://"
@@ -495,7 +521,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:108
+#: en/project_bugs.ssi:114
 msgid ""
 "In general, you should report build time errors against the live-build "
 "package, boot time errors against live-boot, and run time errors against "
@@ -505,7 +531,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:109
+#: en/project_bugs.ssi:115
 msgid ""
 "Please note that bugs found in distributions derived from Debian (such as "
 "Ubuntu and others) should *{not}* be reported to the Debian BTS unless they "
diff --git a/manual/po/de/project_coding-style.ssi.po b/manual/po/de/project_coding-style.ssi.po
index e2c4ec8..4a0bdfc 100644
--- a/manual/po/de/project_coding-style.ssi.po
+++ b/manual/po/de/project_coding-style.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-30 11:05+0100\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -20,64 +20,62 @@ 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_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:24
+#: 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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr ""
@@ -86,64 +84,62 @@ 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:173 en/other_customization-bootup.ssi:35
-#: en/other_customization-bootup.ssi:48 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: 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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr ""
@@ -220,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
@@ -235,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
@@ -250,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
@@ -277,43 +273,45 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:74
-msgid "_* Variables that used in lb config always start with LH_ prefix."
+msgid ""
+"_* Variables that used in #{lb config}# always start with #{LB_}# prefix."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:76
 msgid ""
-"_* Internal temporary variables in live-build should start with the _LH_ "
-"prefix."
+"_* Internal temporary variables in live-build should start with the #{\\_LB_}"
+"# prefix."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:78
-msgid "_* Local variables start with live-build __LH_ prefix."
+msgid "_* Local variables start with live-build #{\\_\\_LB_}# prefix."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:80
 msgid ""
-"_* Variables in connection to a boot parameter in live-config start with "
-"LIVE_."
+"_* Variables in connection to a boot parameter in live-config start with #"
+"{LIVE_}#."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:82
-msgid "_* All other variables in live-config start with _ prefix."
+msgid "_* All other variables in live-config start with #{_}# prefix."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:84
-msgid "_* Use braces around variables; eg. write ${FOO} instead of $FOO."
+msgid ""
+"_* Use braces around variables; e.g. write #{${FOO}}# instead of #{$FOO}#."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:86
 msgid ""
-"_* Always protect variables with quotes to respect potential whitespaces, "
-"write \"${FOO}\" not ${FOO}."
+"_* Always protect variables with quotes to respect potential whitespaces: "
+"write #{\"${FOO}\"}# not #{${FOO}}#."
 msgstr ""
 
 #. type: Plain text
@@ -325,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
@@ -342,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
@@ -366,21 +366,21 @@ msgstr ""
 #. type: Plain text
 #: en/project_coding-style.ssi:132
 msgid ""
-"_* Use \"|\" (without the surround quotes) as a seperator in calls to sed, e."
-"g. \"sed -e 's|foo|bar|'\" (without \"\")."
+"_* Use \"#{|}#\" (without the surround quotes) as a seperator in calls to "
+"sed, e.g. \"#{sed -e 's|foo|bar|'}#\" (without \"\")."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:134
 msgid ""
-"_* Don't use the test command for comparisons or tests, use \"[\" "
-"\"]\" (without \"\"), e.g. \"if [ -x /bin/foo ]; ...\" and not \"if test -x /"
-"bin/foo; ...\"."
+"_* Don't use the #{test}# command for comparisons or tests, use \"#{[}#\" \"#"
+"{]}#\" (without \"\"); e.g. \"#{if [ -x /bin/foo ]; ...}#\" and not \"#{if "
+"test -x /bin/foo; ...}#\"."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:135
 msgid ""
-"_* Use case wherever possible over test, as it's easier to read and faster "
-"in execution."
+"_* Use #{case}# wherever possible over #{test}#, as it's easier to read and "
+"faster in execution."
 msgstr ""
diff --git a/manual/po/de/project_procedures.ssi.po b/manual/po/de/project_procedures.ssi.po
index b1bf1e6..e2f43bc 100644
--- a/manual/po/de/project_procedures.ssi.po
+++ b/manual/po/de/project_procedures.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-30 10:35+0100\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -20,65 +20,62 @@ 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_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:24
+#: 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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr ""
@@ -87,65 +84,62 @@ 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:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: 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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr ""
@@ -157,7 +151,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:4
-msgid "1~ Procedures"
+msgid "1~procedures Procedures"
 msgstr ""
 
 #. type: Plain text
@@ -179,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
@@ -263,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
@@ -279,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 db4f8ce..ff2836f 100644
--- a/manual/po/de/user_basics.ssi.po
+++ b/manual/po/de/user_basics.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-28 07:16-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -18,132 +18,128 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: 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/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: 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/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
-#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
-#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
-#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
-#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
-#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
+#: 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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
-#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
-#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
-#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
-#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
-#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr ""
@@ -217,16 +213,11 @@ msgid ""
 "size. Note that it is read-only. So, during boot the Debian Live system will "
 "use a RAM disk and 'union' mechanism to enable writing files within the "
 "running system. However, all modifications will be lost upon shutdown unless "
-"optional persistence is used (see persistence)."
+"optional persistence is used (see {Persistence}#persistence)."
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:20
-msgid "% FIXME: <xref linkend=\"persistence\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:22
 msgid ""
 "_* *{Bootloader}*: A small piece of code crafted to boot from the chosen "
 "media, possibly presenting a prompt or menu to allow selection of options/"
@@ -240,20 +231,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
 msgid ""
 "You can use live-build to build the system image from your specifications, "
 "set up a Linux kernel, its initrd, and a bootloader to run them, all in one "
-"media-dependant format (ISO9660 image, disk image, etc.)"
+"media-dependant format (ISO9660 image, disk image, etc.)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
 msgid "2~ First steps: building an ISO image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
 msgid ""
 "The following sequence of live-build commands will create a basic ISO hybrid "
 "image containing just the Debian standard system without X.org. It is "
@@ -263,93 +254,99 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
 msgid ""
 "First, we run the #{lb config}# command which will create a \"config/\" "
 "hierarchy in the current directory for use by other commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:34
-msgid "$ lb config"
+#: en/user_basics.ssi:32
+#, no-wrap
+msgid " $ lb config\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:38
+#: en/user_basics.ssi:36
 msgid ""
 "By passing no parameters to #{lb config}#, we indicated that we wish to use "
 "the defaults (see {The lb config command}#lb-config)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:40
+#: en/user_basics.ssi:38
 msgid ""
-"Now that we have a \"config/\" hierarchy, we may build the image with the lb "
-"build command:"
+"Now that we have a \"config/\" hierarchy, we may build the image with the #"
+"{lb build}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
-#: en/user_examples.ssi:106 en/user_examples.ssi:153
-msgid "# lb build"
+#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#, no-wrap
+msgid " # lb build\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:48
+#: en/user_basics.ssi:46
 msgid ""
 "This process can take a while, depending on the speed of your network "
 "connection (see {The lb build command}#lb-build)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:50
+#: en/user_basics.ssi:48
 msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:52
+#: en/user_basics.ssi:50
 msgid "Testing an ISO is simple:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:56 en/user_basics.ssi:144
-msgid "# apt-get install qemu"
+#: en/user_basics.ssi:54 en/user_basics.ssi:142
+#, no-wrap
+msgid " # apt-get install qemu\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:58
-msgid "$ qemu -cdrom binary.iso"
+#: en/user_basics.ssi:56
+#, no-wrap
+msgid " $ qemu -cdrom binary.iso\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:62
+#: en/user_basics.ssi:60
 msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:64
+#: en/user_basics.ssi:62
 msgid "In order to test the ISO with virtualbox-ose:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:68
-msgid "# apt-get install virtualbox-ose virtualbox-ose-dkms"
+#: en/user_basics.ssi:66
+#, no-wrap
+msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:70
-msgid "$ virtualbox"
+#: en/user_basics.ssi:68
+#, no-wrap
+msgid " $ virtualbox\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:74
+#: en/user_basics.ssi:72
 msgid ""
 "Create a new virtual machine, change the storage settings to use binary.iso "
 "as the CD/DVD device, and start the machine."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:76
+#: en/user_basics.ssi:74
 msgid ""
 "Note: For live systems containing X.org that you want to test with "
 "virtualbox-ose, you may wish to include the VirtualBox X.org driver package, "
@@ -358,37 +355,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:80
-msgid "# lb config --packages virtualbox-ose-guest-x11"
+#: en/user_basics.ssi:78
+#, no-wrap
+msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:84
+#: en/user_basics.ssi:82
 msgid "3~burning-iso-image Burning an ISO image to a physical medium"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:86
+#: en/user_basics.ssi:84
 msgid "Burning an ISO image is easy:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:90
-msgid "# apt-get install wodim"
+#: en/user_basics.ssi:88
+#, no-wrap
+msgid " # apt-get install wodim\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:92
-msgid "$ wodim binary.iso"
+#: en/user_basics.ssi:90
+#, no-wrap
+msgid " $ wodim binary.iso\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:94
 msgid "2~ Building a USB/HDD image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:98
+#: en/user_basics.ssi:96
 msgid ""
 "The following sequence of commands will create a basic USB/HDD image "
 "containing just the Debian standard system without X.org. It is suitable for "
@@ -400,7 +400,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:100
+#: en/user_basics.ssi:98
 msgid ""
 "Note: if you created an ISO image with the previous example, you will need "
 "to clean up your working directory with the #{lb clean}# command (see {The "
@@ -408,34 +408,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:104 en/user_basics.ssi:186
-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
-#: en/user_basics.ssi:108
+#: en/user_basics.ssi:106
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the #{config/}"
 "# hierarchy to create a USB/HDD image type:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:112
-msgid "$ lb config -b usb-hdd"
+#: en/user_basics.ssi:110
+#, no-wrap
+msgid " $ lb config -b usb-hdd\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:116
-msgid "Now build the image with the #{lb build} command:"
+#: en/user_basics.ssi:114 en/user_basics.ssi:198
+msgid "Now build the image with the #{lb build}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:124
+#: en/user_basics.ssi:122
 msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:126
+#: en/user_basics.ssi:124
 msgid ""
 "The generated binary image contains a VFAT partition and the syslinux "
 "bootloader, ready to be directly written on a USB stick. Plug in a USB stick "
@@ -443,12 +445,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:130
-msgid "$ dd if=binary.img of=${USBSTICK}"
+#: en/user_basics.ssi:128
+#, no-wrap
+msgid " $ dd if=binary.img of=${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:134
+#: en/user_basics.ssi:132
 msgid ""
 "where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
 "a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -457,35 +460,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:136
+#: en/user_basics.ssi:134
 #, no-wrap
 msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:136
 msgid ""
 "Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
-"type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images."
+"type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:140
+#: en/user_basics.ssi:138
 msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:146
-msgid "$ qemu -hda binary.img"
+#: en/user_basics.ssi:144
+#, no-wrap
+msgid " $ qemu -hda binary.img\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:148
 msgid "3~ Using the space left on a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:152
+#: en/user_basics.ssi:150
 msgid ""
 "If you want to use the remaining free space after you have installed the "
 "binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -494,45 +498,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:156
-msgid "# gparted ${USBSTICK}"
+#: en/user_basics.ssi:154
+#, no-wrap
+msgid " # gparted ${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:160
+#: en/user_basics.ssi:158
 msgid ""
 "After the creation of the partition, you have to create a filesystem on it. "
 "One possible choice would be ext4."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:164
-msgid "# mkfs.ext4 ${USBSTICK}"
+#: en/user_basics.ssi:162
+#, no-wrap
+msgid " # mkfs.ext4 ${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:168
+#: en/user_basics.ssi:166
 msgid "If you want to use this data partition with Windows, use FAT32."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:172
-msgid "# mkfs.vfat -F 32"
+#: en/user_basics.ssi:170
+#, no-wrap
+msgid " # mkfs.vfat -F 32\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:176
+#: en/user_basics.ssi:174
 #, no-wrap
 msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:176
 msgid "2~building-netboot-image Building a netboot image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:178
 msgid ""
 "The following sequence of commands will create a basic netboot image "
 "containing the Debian standard system without X.org. It is suitable for "
@@ -540,43 +547,38 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:182
+#: en/user_basics.ssi:180
 msgid ""
 "Note: if you performed any previous examples, you will need to clean up your "
 "working directory with the #{lb clean}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:190
+#: en/user_basics.ssi:188
 msgid ""
-"Run the #{lb config}# command with the parameters to configure the \"config/"
-"\" hierarchy to create our netboot image:"
+"Run the #{lb config}# command as follows to configure your image for "
+"netbooting:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:194
-msgid ""
-"$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
-"\"192.168.0.1\""
+#: en/user_basics.ssi:192
+#, 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
-#: en/user_basics.ssi:198
+#: en/user_basics.ssi:196
 msgid ""
-"In contrast with the ISO and USB/HDD images, netbooting does not support "
-"serving a filesystem image with the client, so the files must be served via "
-"NFS. The net-root-path and net-root-server options specify the location and "
-"server, respectively, of the NFS server where the filesytem image will be "
-"located at boot time."
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:200
-msgid "Now build the image with the #{lb build}# command:"
+"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
+"serve the filesystem image to the client, so the files must be served via "
+"NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the "
+"location and server, respectively, of the NFS server where the filesytem "
+"image will be located at boot time. Make sure these are set to suitable "
+"values for your network and server."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:206
 msgid ""
 "In a network boot, the client runs a small piece of software which usually "
 "resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -587,26 +589,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:208
 msgid ""
-"For example, if you unpack the generated binary-net.tar.gz archive in the /"
-"srv/debian-live directory, you'll find the filesystem image in live/"
-"filesystem.squashfs and the kernel, initrd and pxelinux bootloader in "
-"tftpboot/debian-live/i386."
+"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
+"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
+"in #{tftpboot/debian-live/i386}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:212
-msgid "We must now configure three services on the server to enable netboot."
+#: en/user_basics.ssi:210
+msgid ""
+"We must now configure three services on the server to enable netboot: the "
+"DHCP server, the TFTP server and the NFS server."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:212
 msgid "3~ DHCP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:214
 msgid ""
 "We must configure our network's DHCP server to be sure to give an IP address "
 "to the netbooting client system, and to advertise the location of the PXE "
@@ -614,109 +618,93 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:216
 msgid ""
 "Here is an example for inspiration, written for the ISC DHCP server #{isc-"
-"dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
+"dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:220
-msgid "% FIXME"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:224
 #, no-wrap
-msgid "subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
+msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:227
+#: en/user_basics.ssi:222
 #, no-wrap
-msgid ""
-"  # IP addresses available for guests\n"
-"  range 192.168.1.100 192.168.1.149;\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:230
-#, no-wrap
-msgid ""
-"  # allow booting from the net\n"
-"  allow bootp;\n"
+msgid " ddns-update-style none;\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:235
+#: en/user_basics.ssi:225
 #, no-wrap
 msgid ""
-"  # for net booting, server where the first file to be loaded (by TFTP\n"
-"  # protocol) (\"filename\" following definition) lies: so the TFTP\n"
-"  # server's name.\n"
-"  next-server myserver;\n"
+" 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:239
+#: en/user_basics.ssi:228
 #, no-wrap
 msgid ""
-"  # net boot configuration for guests with a PXE client:\n"
-"  if substring (option vendor-class-identifier, 0, 9) = \"PXEClient\" {\n"
-"    # Note: all files for PXE are relatives to the TFTP server's root\n"
+" default-lease-time 600;\n"
+" max-lease-time 7200;\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:242
+#: en/user_basics.ssi:230
 #, no-wrap
-msgid ""
-"    # PXE bootloader (first program to be loaded, by TFTP)\n"
-"    filename \"pxelinux.0\";\n"
+msgid " log-facility local7;\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:236
 #, no-wrap
 msgid ""
-"  }\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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:240
 msgid "3~ TFTP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:242
 msgid "This serves the kernel and initial ramdisk to the system at run time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:253
+#: en/user_basics.ssi:244
 msgid ""
 "You should install the tftpd-hpa package. It can serve all files contained "
-"inside a root directory, usually /srv/tftp. To let it serve files inside /"
-"srv/debian-live/tftpboot, run as root the following command:"
+"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
+"#{/srv/debian-live/tftpboot}#, run as root the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:257
-msgid "dpkg-reconfigure -plow tftpd-hpa"
+#: en/user_basics.ssi:248
+#, no-wrap
+msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:252
 msgid "and fill in the new tftp server directory when being asked about it."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:254
 msgid "3~ NFS server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:256
 msgid ""
 "Once the guest computer has downloaded and booted a Linux kernel and loaded "
 "its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -724,161 +712,188 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:267
-msgid "You need to install the nfs-kernel-server package."
+#: en/user_basics.ssi:258
+msgid "You need to install the #{nfs-kernel-server}# package."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:260
 msgid ""
 "Then, make the filesystem image available through NFS by adding a line like "
-"the following to /etc/exports:"
+"the following to #{/etc/exports}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:273
-msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
+#: en/user_basics.ssi:264
+#, no-wrap
+msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:277
+#: en/user_basics.ssi:268
 msgid ""
 "and tell the NFS server about this new export with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:281
-msgid "# exportfs -rv"
+#: en/user_basics.ssi:272
+#, no-wrap
+msgid " # exportfs -rv\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:276
 msgid ""
 "Setting up these three services can be a little tricky. You might need some "
-"patience to get all of them working together. The Debian Installer Manual's "
-"TFTP Net Booting section at http://d-i.alioth.debian.org/manual/en.i386/"
-"ch04s05.html might help as that process is very similar."
+"patience to get all of them working together. For more information, see the "
+"syslinux wiki at http://syslinux.zytor.com/wiki/index.php/PXELINUX or the "
+"Debian Installer Manual's TFTP Net Booting section at http://d-i.alioth."
+"debian.org/manual/en.i386/ch04s05.html. They might help, as their processes "
+"are very similar."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:278
 msgid "3~ Netboot testing HowTo"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:280
 msgid ""
 "Netboot image creation is made easy with live-build magic, but testing the "
 "images on physical machines can be really time consuming."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:282
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:284
 msgid "3~ Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:295
-msgid "_* Install qemu, bridge-utils, sudo."
+#: en/user_basics.ssi:286
+msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:297
-msgid "Edit /etc/qemu-ifup:"
+#: en/user_basics.ssi:288
+msgid "Edit #{/etc/qemu-ifup}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:308
+#: 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
-#: en/user_basics.ssi:312
-msgid "Get, or build a grub-floppy-netboot (in the svn)."
+#: en/user_basics.ssi:303
+msgid "Get, or build a #{grub-floppy-netboot}# (in the svn)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:314
-msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
+#: en/user_basics.ssi:305
+msgid ""
+"Launch #{qemu}# with \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:307
 msgid "3~ VMWare Player"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:309
 msgid "_* Install VMWare Player (\"free as in beer\" edition)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:311
 msgid ""
-"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
+"_* Create a PXETester directory, and create a text file called #{pxe.vwx}# "
+"inside"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:313
 msgid "_* Paste this text inside:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:330
+#: 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:336
+#: 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:339
-msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
+#: en/user_basics.ssi:330
+#, no-wrap
+msgid ""
+" ethernet0.present = \"TRUE\"\n"
+" ethernet0.addressType = \"generated\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:342
-msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
+#: en/user_basics.ssi:333
+#, no-wrap
+msgid ""
+" displayName = \"Test Boot PXE\"\n"
+" guestOS = \"other\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:347
+#: 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
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:342
 msgid ""
-"_* You can play with this configuration file (i.e. change memory limit to "
+"_* You can play with this configuration file (e.g. change memory limit to "
 "256)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:353
+#: en/user_basics.ssi:344
 msgid ""
 "_* Double click on this file (or run VMWare player and select this file)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:354
+#: en/user_basics.ssi:345
 msgid "_* When running just press space if that strange question comes up..."
 msgstr ""
diff --git a/manual/po/de/user_customization-binary.ssi.po b/manual/po/de/user_customization-binary.ssi.po
index 231e96b..02e8547 100644
--- a/manual/po/de/user_customization-binary.ssi.po
+++ b/manual/po/de/user_customization-binary.ssi.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
+"Project-Id-Version: live-manual 2.0.0\n"
 "POT-Creation-Date: 2010-11-30 11:20+0100\n"
 "PO-Revision-Date: 2010-11-30 11:20+0100\n"
 "Last-Translator: Automatically generated\n"
diff --git a/manual/po/de/user_customization-contents.ssi.po b/manual/po/de/user_customization-contents.ssi.po
index f0fd782..36aa0fc 100644
--- a/manual/po/de/user_customization-contents.ssi.po
+++ b/manual/po/de/user_customization-contents.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -18,124 +18,128 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: 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/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: 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/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
-#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
+#: 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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
-#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr ""
@@ -152,7 +156,13 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:6
-msgid "This chapter discusses further customization of the live system."
+msgid ""
+"This chapter discusses fine-tuning customization of the live system contents "
+"beyond merely choosing which packages to include. Includes allow you to add "
+"or replace arbitrary files in your Debian Live image, hooks allow you to "
+"execute arbitrary commands at different stages of the build and at boot "
+"time, and preseeding allows you to configure packages when they are "
+"installed by supplying answers to debconf questions."
 msgstr ""
 
 #. type: Plain text
@@ -163,77 +173,63 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-contents.ssi:10
 msgid ""
-"Using includes, it is possible to add (or replace) arbitrary files in your "
-"Debian Live image. live-build provides three mechanisms for using them:"
+"While ideally a Debian live system would include files entirely provided by "
+"unmodified Debian packages, it is sometimes convenient to provide or modify "
+"some content by means of files. Using includes, it is possible to add (or "
+"replace) arbitrary files in your Debian Live image. live-build provides "
+"three mechanisms for using them:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:12
 msgid ""
 "_* Chroot local includes: These allow you to add or replace files to the "
-"chroot/Live filesystem. Please see chroot-local-includes for more "
-"information."
+"chroot/Live filesystem. Please see {Live/chroot local includes}#live-chroot-"
+"local-includes for more information."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:14
-msgid "% FIXME: <xref linkend=\"chroot-local-includes\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:16
 msgid ""
 "_* Binary local includes: These allow you to add or replace files in the "
-"binary image. Please see binary-local-includes for more information."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:18
-msgid "% FIXME: <xref linkend=\"binary-local-includes\"/>"
+"binary image. Please see {Binary local includes}#binary-local-includes for "
+"more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:20
+#: en/user_customization-contents.ssi:16
 msgid ""
 "_* Binary includes: These allow you to add or replace Debian specific files "
 "in the binary image, such as the templates and tools directories. Please see "
-"binary-includes for more information."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:22
-msgid "% FIXME: <xref linkend=\"binary-includes\"/>"
+"{Binary includes}#binary-includes for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:18
 msgid ""
-"Please see terms for more information about the distinction between the "
-"\"Live\" and \"binary\" images."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:26
-msgid "% FIXME: <xref linkend=\"terms\"/>"
+"Please see {Terms}#terms for more information about the distinction between "
+"the \"Live\" and \"binary\" images."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:28
-msgid "3~ Live/chroot local includes"
+#: en/user_customization-contents.ssi:20
+msgid "3~live-chroot-local-includes Live/chroot local includes"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:30
+#: en/user_customization-contents.ssi:22
 msgid ""
 "Chroot local includes can be used to add or replace files in the chroot/Live "
-"filesystem so that they are visible when the Live system is booted. Typical "
-"uses for them are to populate the skeleton user directory (#{/etc/skel}#) "
-"used by the live system to create the live user's home directory, or adding "
-"configuration files where additional processing is not required."
+"filesystem so that they may be used in the Live system. A typical use is to "
+"populate the skeleton user directory (#{/etc/skel}#) used by the Live system "
+"to create the live user's home directory. Another is to supply configuration "
+"files that can be simply added or replaced in the image without processing; "
+"see {Live/chroot local hooks}#live-chroot-local-hooks if processing is "
+"needed."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:32
+#: en/user_customization-contents.ssi:24
 msgid ""
 "To include files, simply add them to your #{config/chroot_local-includes}# "
 "directory. This directory corresponds to the root directory (#{/}#) of the "
@@ -242,53 +238,70 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:37
+#: 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
-#: en/user_customization-contents.ssi:41
+#: en/user_customization-contents.ssi:33
 msgid "Your configuration will then have the following layout:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:52
+#: 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
-#: en/user_customization-contents.ssi:56
+#: en/user_customization-contents.ssi:48
 msgid ""
 "Chroot local includes are installed after package installation so that files "
 "installed by packages are overwritten."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:58
-msgid "3~ Binary local includes"
+#: en/user_customization-contents.ssi:50
+msgid "3~binary-local-includes Binary local includes"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:60
+#: en/user_customization-contents.ssi:52
 msgid ""
-"The same way as chroot local includes work, there exists the corresponding "
-"mechanism to include files in the live media itself."
+"To include material such as documentation or videos on the media filesystem "
+"so that it is accessible immediately upon insertion of the media without "
+"booting the Live system, you can use binary local includes. This works in a "
+"similar fashion to chroot local includes. For example, suppose the files #{~/"
+"video_demo.*}# are demo videos of the live system described by and linked to "
+"by an HTML index page. Simply copy the material to #{config/binary_local-"
+"includes/} as follows:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:56
+#, no-wrap
+msgid " $ cp ~/video_demo.* config/binary_local-includes/\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:60
+msgid "These files will now appear in the root directory of the live media."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:62
-msgid "3~ Binary includes"
+msgid "3~binary-includes Binary includes"
 msgstr ""
 
 #. type: Plain text
@@ -300,28 +313,37 @@ 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
 #: en/user_customization-contents.ssi:72
-msgid "2~ Hooks"
+msgid ""
+"Otherwise, the material will be installed by live-build in #{/includes/}# by "
+"default on the media filesystem, or else you can specify an alternate path "
+"with #{--includes}#."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:74
+msgid "2~ Hooks"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:76
 msgid ""
 "Hooks allow commands to be performed in the chroot and binary stages of the "
 "build in order to customize the image."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:76
-msgid "3~ Live/chroot local hooks"
+#: en/user_customization-contents.ssi:78
+msgid "3~live-chroot-local-hooks Live/chroot local hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:78
+#: en/user_customization-contents.ssi:80
 msgid ""
 "To run commands in the chroot stage, create a hook script containing the "
 "commands in the #{config/chroot_local-hooks}# directory. The hook will run "
@@ -334,12 +356,30 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:80
+#: en/user_customization-contents.ssi:82
+msgid "3~ Boot-time hooks"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:84
+msgid ""
+"To execute commands at boot time, you can supply live-config hooks as "
+"explained in the \"Customization\" section of its man page. Examine live-"
+"config's own hooks provided in #{/lib/live/config/}#, noting the sequence "
+"numbers. Then provide your own hook prefixed with an appropriate sequence "
+"number, either as a chroot local include in #{config/chroot_local-includes/"
+"lib/live/config/}#, or as a custom package as discussed in {Installing "
+"modified or third-party packages}#installing-modified-or-third-party-"
+"packages."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:86
 msgid "3~ Binary local hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:82
+#: en/user_customization-contents.ssi:88
 msgid ""
 "To run commands in the binary stage, create a hook script containing the "
 "commands in the #{config/binary_local-hooks}#. The hook will run after all "
@@ -352,12 +392,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:84
+#: en/user_customization-contents.ssi:90
 msgid "2~ Preseeding Debconf questions"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:86
+#: en/user_customization-contents.ssi:92
 msgid ""
 "Files in the #{config/chroot_local-preseed}# directory are considered to be "
 "debconf preseed files and are installed by live-build using #{debconf-set-"
@@ -365,7 +405,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:87
+#: en/user_customization-contents.ssi:93
 msgid ""
 "For more information about debconf, please see debconf(7) in the #{debconf}# "
 "package."
diff --git a/manual/po/de/user_customization-installer.ssi.po b/manual/po/de/user_customization-installer.ssi.po
index 1ede214..2de4c0e 100644
--- a/manual/po/de/user_customization-installer.ssi.po
+++ b/manual/po/de/user_customization-installer.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-30 10:53+0100\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -17,6 +17,134 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
+msgid "code{"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: 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: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
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
+msgid "}code"
+msgstr ""
+
+#. type: Plain text
 #: en/user_customization-installer.ssi:2
 msgid ":B~ Customizing Debian Installer"
 msgstr ""
@@ -30,8 +158,8 @@ msgstr ""
 #: en/user_customization-installer.ssi:6
 msgid ""
 "Debian Live system images can be integrated with Debian Installer. There are "
-"number of different \"types\" of installation, varying in what and how to "
-"install the image."
+"a number of different types of installation, varying in what is included and "
+"how the installer operates."
 msgstr ""
 
 #. type: Plain text
@@ -45,77 +173,132 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:10
-msgid "The three main types of installer are:"
+msgid "2~ Types of Debian Installer"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:12
-msgid ""
-"_* *{\"Regular\" Debian Installer}*: This is a normal Debian Live image with "
-"a seperate kernel and initrd which (when selected from the appropriate "
-"bootloader) launches into a standard Debian Installer instance, just as if "
-"you had downloaded a CD image of Debian and booted it. Images containing a "
-"live system and such an otherwise indepentend installer are often referet to "
-"as \"combined images\"."
+msgid "The three main types of installer are:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:14
+#, no-wrap
+msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as \"combined images\".\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:16
 msgid ""
 "On such images, Debian is installed by fetching and installing .deb packages "
 "using #{debootstrap}# or #{cdebootstrap}#, from the local media or some "
-"network-base network, resulting in a standard Debian system being installed "
+"network-based network, resulting in a standard Debian system being installed "
 "to the hard disk."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:16
+#: en/user_customization-installer.ssi:18
 msgid ""
 "This whole process can be preseeded and customized in a number of ways; see "
 "the relevant pages in the Debian Installer manual for more information. Once "
-"you have a working preseeding file, live-build can automatically place it to "
+"you have a working preseeding file, live-build can automatically put it in "
 "the image and enable it for you."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:18
-msgid ""
-"_* *{\"Live\" Debian Installer}*: This is a Debian Live image with a "
-"seperate kernel and initrd which (when selected from the appropriate "
-"bootloader) launches into an instance of the Debian Installer."
+#: en/user_customization-installer.ssi:20
+#, no-wrap
+msgid "*{\"Live\" Debian Installer}*: This is a Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into an instance of the Debian Installer.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:20
+#: en/user_customization-installer.ssi:22
 msgid ""
 "Installation will proceed in an identical fashion to the \"Regular\" "
 "installation described above, but at the actual package installation stage, "
-"instead of using #{debootstrap}# to fetch and install packages, the \"live\" "
-"filesystem image is copied to the target. This is acchieved with a special "
-"udeb called live-installer. live-installer can be preseeded to be disabled, "
-"allowing to support normal and live installer entries in the bootloader of "
-"the same live media."
+"instead of using #{debootstrap}# to fetch and install packages, the live "
+"filesystem image is copied to the target. This is achieved with a special "
+"udeb called live-installer."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:22
+#: en/user_customization-installer.ssi:24
 msgid ""
 "After this stage, the Debian Installer continues as normal, installing and "
 "configuring items such as bootloaders and local users, etc."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:24
+#: en/user_customization-installer.ssi:26
+msgid ""
+"Note: to support both normal and live installer entries in the bootloader of "
+"the same live media, you must disable live-installer by preseeding #{live-"
+"installer/enable=false}."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:28
+#, no-wrap
+msgid "*{\"Desktop\" Debian Installer}*: Regardless of the type of Debian Installer included, #{d-i}# can be launched from the Desktop by clicking on an icon. This is user friendlier in some situations. In order to make use of this, the debian-installer-launcher package needs to be included.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:30
+msgid ""
+"Note that by default, live-build does not include Debian Installer images in "
+"the images, it needs to be specifically enabled with #{lb config}#. Also, "
+"please note that for the \"Desktop\" installer to work, the kernel of the "
+"live system must match the kernel #{d-i}# uses for the specified "
+"architecture. For example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:35
+#, no-wrap
+msgid ""
+" $ 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:39
+msgid "2~ Customizing Debian Installer by preseeding"
+msgstr ""
+
+#. type: Plain text
+#: 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 "
+"answers to questions asked during the installation process, without having "
+"to manually enter the answers while the installation is running. This makes "
+"it possible to fully automate most types of installation and even offers "
+"some features not available during normal installations.\" This kind of "
+"customization is best accomplished with live-build by placing the "
+"configuration in a #{preseed.cfg}# file included in #{config/binary_debian-"
+"installer/}#. For example, to preseed setting the locale to #{en_US}#:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:46
+#, no-wrap
 msgid ""
-"_* *{\"Desktop\" Debian Installer}*: Regardless of the mode Debian Installer "
-"is used in, d-i can be launched from the Desktop by clicking on an icon. "
-"This is user friendlier in some situations. In order to make use of this, "
-"the debian-installer-launcher package needs to be included."
+" $ 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:50
+msgid "2~ Customizing Debian Installer content"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:25
+#: en/user_customization-installer.ssi:52
 msgid ""
-"Note that by default live-build does not include Debian Installer images in "
-"the images, it needs to be specifically enabled with lb config."
+"For experimental or debugging purposes, you might want to include locally "
+"built #{d-i}# component udeb packages. Place these in #{config/binary_local-"
+"udebs/}# to include them in the image. Additional or replacement files and "
+"directories may be included in the installer initrd as well, in a similar "
+"fashion to {Live/chroot local includes}#live-chroot-local-includes, by "
+"placing the material in #{config/binary_debian-installer-includes/}#."
 msgstr ""
diff --git a/manual/po/de/user_customization-internationalization.ssi.po b/manual/po/de/user_customization-internationalization.ssi.po
deleted file mode 100644
index 83af05a..0000000
--- a/manual/po/de/user_customization-internationalization.ssi.po
+++ /dev/null
@@ -1,222 +0,0 @@
-# German translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
-"PO-Revision-Date: 2010-10-03 21:43+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: 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/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
-#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
-#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
-msgid "code{"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
-#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
-#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
-msgid "}code"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:2
-msgid ":B~ Customizing locale and language"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:4
-msgid "1~customizing-locale-and-language Customizing locale and language"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:6
-msgid "2~ Default locale and keyboard"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:8
-msgid ""
-"The default locale when building a Live system is \"locales=en_US.UTF-8\", "
-"to set the locale for e.g. Switzerland, you can use \"locales=de_CH.UTF-8\"."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:12
-msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:16
-msgid "The entry for a Swiss-German keyboard would be:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:20
-msgid "$ lb config --bootappend-live \"keyboard-layouts=ch\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:24
-msgid "Combined, the keyboard and locale configured for Switzerland would be:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:28
-msgid ""
-"$ lb config --bootappend-live =\"locales=de_CH.UTF-8 keyboard-layouts=ch\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:32
-msgid ""
-"Note: You can find a list of options in the manpage for live-config. "
-"Currently, only UTF-8 locales are supported."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:34
-msgid "2~ l10n Packages"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:36
-msgid ""
-"An experimental feature of live-build is to automatically check for each "
-"package for which it is know that there are -l10n packages available and "
-"install them. To add German packages the entry would be"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:40
-msgid "$ lb config --language \"de\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:43
-msgid ""
-"This will also change the default syslinux language if translations are "
-"available or local translations have been put into #{config/templates/"
-"syslinux/de}#."
-msgstr ""
diff --git a/manual/po/de/user_customization-overview.ssi.po b/manual/po/de/user_customization-overview.ssi.po
index 937fe85..ed0ae1d 100644
--- a/manual/po/de/user_customization-overview.ssi.po
+++ b/manual/po/de/user_customization-overview.ssi.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
+"Project-Id-Version: live-manual 2.0.0\n"
 "POT-Creation-Date: 2010-11-27 09:40-0400\n"
 "PO-Revision-Date: 2010-10-22 07:52-0200\n"
 "Last-Translator: Automatically generated\n"
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index 465b9af..d3f95b0 100644
--- a/manual/po/de/user_customization-packages.ssi.po
+++ b/manual/po/de/user_customization-packages.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-01 21:10-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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,32 +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/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
+#: 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
@@ -58,25 +50,29 @@ msgstr ""
 #: en/user_customization-packages.ssi:185
 #: en/user_customization-packages.ssi:199
 #: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
 #: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:321 en/user_customization-runtime.ssi:12
-#: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
-#: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
-#: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
-#: en/user_customization-runtime.ssi:92 en/user_customization-runtime.ssi:101
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
 #: en/user_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_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:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:108
-#: en/user_installation.ssi:126 en/user_installation.ssi:141
-#: en/user_managing_a_configuration.ssi:24
+#: 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,32 +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:173 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
+#: 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
@@ -126,25 +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:285
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
 #: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:334 en/user_customization-runtime.ssi:16
-#: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: 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_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:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:112
-#: en/user_installation.ssi:131 en/user_installation.ssi:144
-#: en/user_managing_a_configuration.ssi:31
+#: 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
@@ -208,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
@@ -223,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
@@ -282,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
@@ -315,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
@@ -346,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
@@ -378,8 +373,9 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:82
-msgid "$ lb config --repository live.debian.net"
+#: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
+#, no-wrap
+msgid " $ lb config --repository live.debian.net\n"
 msgstr ""
 
 #. type: Plain text
@@ -414,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
@@ -465,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
@@ -561,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
@@ -589,20 +590,27 @@ 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
 #: en/user_customization-packages.ssi:163
 msgid ""
-"You may test for any one of a number of values, e.g. to install #"
-"{memtest86+ }# if either #{--architecture i386}# or #{--architecture amd64}# "
-"is specified:"
+"You may test for any one of a number of values, e.g. to install #{memtest86+}"
+"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
 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
@@ -615,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
@@ -625,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
@@ -651,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
@@ -673,11 +690,11 @@ msgstr ""
 msgid ""
 "Desktop and language tasks are special cases. In the Debian Installer, if "
 "the medium was prepared for a particular desktop environment flavour, the "
-"corresponding task will be automatically installed. Thus, there are there "
-"are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}"
-"# tasks, none of which are offered in #{tasksel}#'s menu. Likewise, there "
-"are no menu entries for tasks for languages, but the user's language choice "
-"during the install influences the selection of corresponding language tasks."
+"corresponding task will be automatically installed. Thus, there are #{gnome-"
+"desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}# tasks, "
+"none of which are offered in #{tasksel}#'s menu. Likewise, there are no menu "
+"entries for tasks for languages, but the user's language choice during the "
+"install influences the selection of corresponding language tasks."
 msgstr ""
 
 #. type: Plain text
@@ -699,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
@@ -710,27 +727,51 @@ msgid ""
 "the desktop flavours mentioned above, which select the #{standard-x11}# "
 "predefined package list, the corresponding #{*-desktop}# task and three "
 "additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example, "
-"if you specify #{--packages gnome-desktop}#, it is equivalent to specifying #"
-"{--packages standard-x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
+"if you specify #{--packages-lists gnome-desktop}#, it is equivalent to "
+"specifying #{--packages debian-installer-launcher --packages-lists standard-"
+"x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:223
 msgid ""
 "Third, if any of the tasks for these desktop flavours are selected, either "
-"explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build "
-"will preseed the corresponding desktop value for Debian Installer (if it is "
-"included) to ensure it follows its own rules for installing different "
+"explicitly through #{--tasks}# or implicitly by #{--packages-lists}#, live-"
+"build will preseed the corresponding desktop value for Debian Installer (if "
+"it is included) to ensure it follows its own rules for installing different "
 "desktop flavours."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:225
-msgid "2~ Installing modified or third-party packages"
+#, no-wrap
+msgid "*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are in
 stalled. For example:\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:229
+#, no-wrap
+msgid " $ lb config --language es\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:233
+msgid ""
+"Even so, it is limited in that it only supports a single language and a "
+"single bootloader. Therefore, for all of these reasons, the future of this "
+"option is under review, possibly to be replaced with something entirely "
+"different in the next major release of live-build."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:235
+msgid ""
+"2~installing-modified-or-third-party-packages Installing modified or third-"
+"party packages"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:237
 msgid ""
 "Whilst it is against the philosophy of Debian Live, it may sometimes be "
 "necessary to build a Live system with modified versions of packages that are "
@@ -741,7 +782,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:239
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -752,22 +793,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:241
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:243
 msgid "_* #{chroot_local-packages}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:245
 msgid "_* Using a custom APT repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:247
 msgid ""
 "Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
 "off\" customizations but has a number of drawbacks, whilst using a custom "
@@ -775,12 +816,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:249
 msgid "3~ Using #{chroot_local-packages}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:251
 msgid ""
 "To install a custom package, simply copy it to the #{config/chroot_local-"
 "packages/}# directory. Packages that are inside this directory will be "
@@ -789,45 +830,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:253
 msgid ""
 "Packages *{must}* be named in the prescribed way. One simple way to do this "
 "is to use #{dpkg-name}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:255
 msgid ""
 "Using #{chroot_local-packages}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:257
 msgid "_* It is not possible to use secure APT."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:259
 msgid ""
 "_* You must install all appropriate packages in the #{config/chroot_local-"
 "packages/}# directory."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:261
 msgid ""
 "_* It does not lend itself to storing Debian Live configurations in revision "
 "control."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:263
 msgid "3~ Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:265
 msgid ""
 "Unlike using #{chroot_local-packages}#, when using a custom APT repository "
 "you must ensure that you specify the packages elsewhere. See {Choosing "
@@ -835,7 +876,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:267
 msgid ""
 "Whilst it may seem unnecessary effort to create an APT repository to install "
 "custom packages, the infrastructure can be easily re-used at a later date to "
@@ -843,12 +884,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:269
 msgid "3~ Custom packages and APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:271
 msgid ""
 "live-build uses APT to install all packages into the live system so will "
 "therefore inherit behaviours from this program. One relevant example is that "
@@ -858,7 +899,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:273
 msgid ""
 "Because of this, you may wish to increment the version number in your custom "
 "packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -868,12 +909,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:275
 msgid "2~ Configuring APT at build time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:277
 msgid ""
 "You can configure APT through a number of options applied only at build "
 "time. (APT configuration used in the running live system may be configured "
@@ -884,12 +925,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:279
 msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:281
 msgid ""
 "You can elect to use either #{apt}# or #{aptitude}# when installing packages "
 "at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -899,26 +940,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283
 msgid ""
 "_* #{apt}#: With this method, if a missing package is specified, the package "
 "installation will fail. This is the default setting."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:285
 msgid ""
 "_* #{aptitude}#: With this method, if a missing package is specified, the "
 "package installation will succeed."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287
 msgid "3~ Using a proxy with APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:279
+#: en/user_customization-packages.ssi:289
 msgid ""
 "One commonly required APT configuration is to deal with building an image "
 "behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -926,17 +967,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:283
-msgid "lb config --apt-http-proxy http://proxy/"
+#: en/user_customization-packages.ssi:293
+#, no-wrap
+msgid " $ lb config --apt-http-proxy http://proxy/\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:287
+#: en/user_customization-packages.ssi:297
 msgid "3~ Tweaking APT to save space"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:299
 msgid ""
 "You may find yourself needing to save some space on the image media, in "
 "which case one or the other or both of the following options may be of "
@@ -944,19 +986,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:301
 msgid ""
 "If you don't want to include APT indices in the image, you can omit those "
 "with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:295
-msgid "$ lb config --binary-indices false"
+#: en/user_customization-packages.ssi:305
+#, no-wrap
+msgid " $ lb config --binary-indices false\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:299
+#: en/user_customization-packages.ssi:309
 msgid ""
 "This will not influence the entries in /etc/apt/sources.list, but merely "
 "whether /var/lib/apt contains the indices files or not. The tradeoff is that "
@@ -966,36 +1009,41 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:301
+#: en/user_customization-packages.ssi:311
 msgid ""
 "If you find the installation of recommended packages bloats your image too "
 "much, you may disable that default option of APT with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:305
-msgid "$ lb config --apt-recommends false"
+#: en/user_customization-packages.ssi:315
+#, no-wrap
+msgid " $ lb config --apt-recommends false\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:319
 msgid ""
-"The tradeoff here is that recommended packages are defined as \"packages "
-"that would be found together with this one in all but unusual installations"
-"\" (Debian Policy Manual, 7.2). This may lead to some packages that you "
-"actually need being omitted, so we suggest you review the difference this "
-"makes to your packages list (see the #{binary.packages}# file generated by #"
-"{lb build}#) and re-include in your list any missing packages that you still "
-"want installed."
+"The tradeoff here is that if you don't install recommended packages for a "
+"given package, that is, \"packages that would be found together with this "
+"one in all but unusual installations\" (Debian Policy Manual, 7.2), some "
+"packages that you actually need may be omitted. Therefore, we suggest you "
+"review the difference turning off recommends makes to your packages list "
+"(see the #{binary.packages}# file generated by #{lb build}#) and re-include "
+"in your list any missing packages that you still want installed. "
+"Alternatively, if you find you only want a small number of recommended "
+"packages left out, leave recommends enabled and set a negative APT pin "
+"priority on selected packages to prevent them from being installed, as "
+"explained in {APT pinning}#apt-pinning."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:321
 msgid "3~ Passing options to apt or aptitude"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:323
 msgid ""
 "If there is not an #{lb config}# option to alter APT's behaviour in the way "
 "you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -1004,12 +1052,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:315
+#: en/user_customization-packages.ssi:325
 msgid "3~apt-pinning APT pinning"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:327
 msgid ""
 "For background, please first read the #{apt_preferences(5)}# man page. APT "
 "pinning can be configured either for build time, or else for run time. For "
@@ -1018,7 +1066,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:329
 msgid ""
 "Let's say you are building a Squeeze live system but need all #{live-*}# "
 "packages to be installed from Sid at build time. You need to add Sid to your "
@@ -1028,14 +1076,42 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:327
+#: 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:332
-msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
+#: en/user_customization-packages.ssi:342
+#, 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
+msgid ""
+"Negative pin priorities will prevent a package from being installed, as in "
+"the case where you do not want a package that is recommended by another "
+"package. Suppose you are building a GNOME image but don't want the user "
+"prompted to store wifi passwords in the keyring, so you want to omit the "
+"recommended #{gnome-keyring}# package. This can be done by adding the "
+"following stanza to #{config/chroot_apt/preferences}#:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:352
+#, no-wrap
+msgid ""
+" Package: gnome-keyring\n"
+" Pin: version *\n"
+" Pin-Priority: -1\n"
 msgstr ""
diff --git a/manual/po/de/user_customization-runtime.new.ssi.po b/manual/po/de/user_customization-runtime.new.ssi.po
deleted file mode 100644
index d774a54..0000000
--- a/manual/po/de/user_customization-runtime.new.ssi.po
+++ /dev/null
@@ -1,647 +0,0 @@
-# German translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-02 20:07-0400\n"
-"PO-Revision-Date: 2010-12-02 20:07-0400\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/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/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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:293
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:321
-#: en/user_customization-runtime.new.ssi:14
-#: en/user_customization-runtime.new.ssi:34
-#: en/user_customization-runtime.new.ssi:42
-#: en/user_customization-runtime.new.ssi:50
-#: en/user_customization-runtime.new.ssi:64
-#: en/user_customization-runtime.new.ssi:76
-#: en/user_customization-runtime.new.ssi:86
-#: en/user_customization-runtime.new.ssi:94
-#: en/user_customization-runtime.new.ssi:102
-#: en/user_customization-runtime.new.ssi:110
-#: en/user_customization-runtime.new.ssi:130
-#: en/user_customization-runtime.new.ssi:138
-#: en/user_customization-runtime.new.ssi:147
-#: en/user_customization-runtime.ssi:12 en/user_customization-runtime.ssi:30
-#: en/user_customization-runtime.ssi:40 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:56 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:92
-#: en/user_customization-runtime.ssi:101 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:141 en/user_managing_a_configuration.ssi:24
-#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47
-#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
-msgid "code{"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:173 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/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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:297
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:334
-#: en/user_customization-runtime.new.ssi:18
-#: en/user_customization-runtime.new.ssi:38
-#: en/user_customization-runtime.new.ssi:46
-#: en/user_customization-runtime.new.ssi:54
-#: en/user_customization-runtime.new.ssi:68
-#: en/user_customization-runtime.new.ssi:80
-#: en/user_customization-runtime.new.ssi:90
-#: en/user_customization-runtime.new.ssi:98
-#: en/user_customization-runtime.new.ssi:106
-#: en/user_customization-runtime.new.ssi:114
-#: en/user_customization-runtime.new.ssi:134
-#: en/user_customization-runtime.new.ssi:143
-#: en/user_customization-runtime.new.ssi:152
-#: en/user_customization-runtime.ssi:16 en/user_customization-runtime.ssi:34
-#: en/user_customization-runtime.ssi:44 en/user_customization-runtime.ssi:52
-#: en/user_customization-runtime.ssi:60 en/user_customization-runtime.ssi:68
-#: en/user_customization-runtime.ssi:88 en/user_customization-runtime.ssi:97
-#: en/user_customization-runtime.ssi:106 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:31
-#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
-msgid "}code"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:8
-#: en/user_customization-runtime.new.ssi:32
-msgid ""
-"The default locale when building a Live system is \"locales=en_US.UTF-8\", "
-"to set the locale for e.g. Switzerland, you can use \"locales=de_CH.UTF-8\"."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:12
-#: en/user_customization-runtime.new.ssi:36
-msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:16
-#: en/user_customization-runtime.new.ssi:40
-msgid "The entry for a Swiss-German keyboard would be:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:20
-#: en/user_customization-runtime.new.ssi:44
-msgid "$ lb config --bootappend-live \"keyboard-layouts=ch\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:24
-#: en/user_customization-runtime.new.ssi:48
-msgid "Combined, the keyboard and locale configured for Switzerland would be:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:28
-#: en/user_customization-runtime.new.ssi:52
-msgid ""
-"$ lb config --bootappend-live =\"locales=de_CH.UTF-8 keyboard-layouts=ch\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:32
-#: en/user_customization-runtime.new.ssi:56
-msgid ""
-"Note: You can find a list of options in the manpage for live-config. "
-"Currently, only UTF-8 locales are supported."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:40
-#: en/user_customization-runtime.new.ssi:66
-msgid "$ lb config --language \"de\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:43
-#: en/user_customization-runtime.new.ssi:70
-msgid ""
-"This will also change the default syslinux language if translations are "
-"available or local translations have been put into #{config/templates/"
-"syslinux/de}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:2
-msgid ":B~ Customizing run time behaviours"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:4
-msgid "1~customizing-run-time-behaviours Customizing run time behaviours"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:6
-msgid ""
-"All configuration that is done during run time is done by live-config. Here "
-"are some most common options of live-config that users are interested in. A "
-"full list of all possibilities can be found in the manpage of live-config."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:8
-msgid "2~ Customizing the live user"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:10
-msgid ""
-"One important consideration is that the live user is created by live-boot at "
-"boot time, not by live-build at build time. This not only influences where "
-"materials relating to the live user are introduced in your build, as "
-"discussed in {Live/chroot local includes}#live-chroot-local-includes, but "
-"also any groups and permissions associated with the live user."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:12
-#: en/user_customization-runtime.ssi:10
-msgid ""
-"You can specify additional groups that the live user will belong to by "
-"preseeding the #{passwd/user-default-groups}# debconf value. For example, to "
-"add the live user to the #{fuse}# group, add the following to a file in the #"
-"{config/chroot_local-preseed}# directory:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:16
-#: en/user_customization-runtime.ssi:14
-msgid ""
-"debconf passwd/user-default-groups string audio cdrom dialout floppy video "
-"plugdev netdev powerdev fuse"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:20
-msgid "2~customizing-locale-and-language Customizing locale and language"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:22
-#: en/user_customization-runtime.ssi:20
-msgid "When the live system boots, language is involved in three steps:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:24
-#: en/user_customization-runtime.ssi:22
-msgid "_* the locale generation"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:26
-#: en/user_customization-runtime.ssi:24
-msgid "_* setting the keyboard layout for the console"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:28
-#: en/user_customization-runtime.ssi:26
-msgid "_* setting the keyboard layout for X"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:30
-msgid "3~ Default locale and keyboard"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:58
-msgid "3~ l10n Packages"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:60
-msgid ""
-"% FIXME: not a run time configuration! Belongs in packages chapter. (See --"
-"tasks discussion.)"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:62
-msgid ""
-"An experimental feature of live-build is to automatically check for each "
-"package for which it is known that there are #{*-l10n}# packages available "
-"and install them. To add German packages the entry would be"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:72
-msgid "3~ Language"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:74
-msgid ""
-"To define the locale that should be generated, use the #{locales}# parameter "
-"into the #{--bootappend-live}# option of #{lb config}#, e.g.:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:78
-#: en/user_customization-runtime.ssi:32
-msgid "lb config --bootappend-live \"locales=de_CH.UTF-8\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:82
-#: en/user_customization-runtime.ssi:36
-msgid ""
-"This parameter can also be used in kernel command line. You can specify a "
-"locale by a full #{language_country.encoding}# word."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:84
-#: en/user_customization-runtime.ssi:38
-msgid ""
-"Both the console and X keyboard configuration depends on the #{keyb}# "
-"parameter of the #{--bootappend-live}# option. Valid options for X keyboard "
-"layouts can be found in #{/etc/X11/xkb/base.xml}# (rather limited to two-"
-"letters country codes). To find the value (the two characters) corresponding "
-"to a language try searching for the english name of the nation where the "
-"language is spoken, e.g:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:88
-#: en/user_customization-runtime.ssi:42
-msgid "$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name <name>se</name>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:92
-#: en/user_customization-runtime.ssi:46
-msgid ""
-"To get the locale files for German and Swiss German keyboard layout in X use:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:96
-#: en/user_customization-runtime.ssi:50
-msgid "lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:100
-#: en/user_customization-runtime.ssi:54
-msgid ""
-"A list of the valid values of the keyboards for the console can be figured "
-"with the following command:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:104
-#: en/user_customization-runtime.ssi:58
-msgid ""
-"for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); do basename $i | "
-"head -c -9; echo; done | sort | less"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:108
-#: en/user_customization-runtime.ssi:62
-msgid ""
-"Alternatively, you can use the #{console-setup}# package, a tool to let you "
-"configure console layout using X (XKB) definitions; you can then setup your "
-"keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}"
-"#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use "
-"also these parameters for X configuration. For example, to set up a French "
-"system with a French-Dvorak layout (called Bepo) on a TypeMatrix keyboard, "
-"both in console and X11, use:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:112
-#: en/user_customization-runtime.ssi:66
-msgid ""
-"lb config --bootappend-live \"locales=fr_FR.UTF-8 keyboard-layouts=fr "
-"keyboard-variant=bepo keyboard-model=tm2030usb\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:116
-#: en/user_customization-runtime.ssi:70
-msgid "2~ Persistence"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:118
-#: en/user_customization-runtime.ssi:72
-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 "
-"of the host hardware which runs it."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:120
-#: en/user_customization-runtime.ssi:74
-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 "
-"should be considered read-only and all the run-time evolutions of the system "
-"are lost at shutdown."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:122
-#: en/user_customization-runtime.ssi:76
-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 "
-"understand how it could work it could be handy to know that even if the "
-"system is booted and run from read-only media, modification to the files and "
-"directories are written on writable media, typically a ram disk (tmpfs) and "
-"ram disks' data do not survive reboots."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:124
-#: en/user_customization-runtime.ssi:78
-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 "
-"multisession (re)writable CD/DVD. All these media are supported in Debian "
-"Live in different ways, and all but the last one require a special boot "
-"parameter to be specified at boot time: #{persistent}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:126
-#: en/user_customization-runtime.ssi:80
-msgid "3~ Full persistence"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:128
-#: en/user_customization-runtime.ssi:82
-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 "
-"writable partition is used. In order to use this feature a partition with a "
-"clean writable supported filesystem on it labeled \"live-rw\" must be "
-"attached on the system at boot time and the system must be started with the "
-"boot parameter 'persistent'. This partition could be an ext2 partition on "
-"the hard disk or on a usb key created with, e.g.:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:132
-#: en/user_customization-runtime.ssi:86
-msgid "# mkfs.ext2 -L live-rw /dev/sdb1"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:136
-#: en/user_customization-runtime.ssi:90
-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.new.ssi:141
-#: en/user_customization-runtime.ssi:95
-msgid ""
-"# tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems # dosfslabel /dev/"
-"sdb1 live-rw # for a fat filesystem"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:145
-#: en/user_customization-runtime.ssi:99
-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 "
-"could be also used with just image files, so you could create a file "
-"representing a partition and put this image file even on a NTFS partition of "
-"a foreign OS, with something like:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:150
-#: en/user_customization-runtime.ssi:104
-msgid ""
-"$ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file $ /"
-"sbin/mkfs.ext2 -F live-rw"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:154
-#: en/user_customization-runtime.ssi:108
-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.new.ssi:156
-#: en/user_customization-runtime.ssi:110
-msgid "3~ Home automounting"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:158
-#: en/user_customization-runtime.ssi:112
-msgid ""
-"If during the boot a partition (filesystem) image file or a partition "
-"labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
-"as #{/home}#, thus permitting persistence of files that belong to e.g. the "
-"default user. It can be combined with full persistence."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:160
-#: en/user_customization-runtime.ssi:114
-msgid "3~ Snapshots"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:162
-#: en/user_customization-runtime.ssi:116
-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 "
-"(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The "
-"content of a snapshot could reside on a partition or an image file (like the "
-"above mentioned types) labeled #{live-sn}#, but it defaults to a simple cpio "
-"archive named #{live-sn.cpio.gz}#. As above, at boot time, the block devices "
-"connected to the system are traversed to see if a partition or a file named "
-"like that could be found. A power interruption during run time could lead to "
-"data loss, hence a tool invoked #{live-snapshot --refresh}# could be called "
-"to sync important changes. This type of persistence, since it does not write "
-"continuously to the persistent media, is the most flash-based device "
-"friendly and the fastest of all the persistence systems."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:164
-#: en/user_customization-runtime.ssi:118
-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.new.ssi:166
-#: en/user_customization-runtime.ssi:120
-msgid ""
-"Snapshots cannot currently handle file deletion but full persistence and "
-"home automounting can."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:168
-#: en/user_customization-runtime.ssi:122
-msgid "3~ Persistent SubText"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:170
-#: en/user_customization-runtime.ssi:124
-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-"
-"work}#, the boot parameter #{persistent-subtext}# used in conjuntion with "
-"the boot parameter #{persistent}# will allow for multiple but unique "
-"persistent media. An example would be if a user wanted to use a persistent "
-"partition labeled #{live-sn-subText}# they would use the boot parameters of: "
-"#{persistent}# #{persistent-subtext=subText}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:172
-#: en/user_customization-runtime.ssi:126
-msgid "3~ Partial remastering"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:173
-#: en/user_customization-runtime.ssi:127
-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 "
-"case of cd-r or adding a session to multisession cd/dvd(rw); live-boot "
-"mounts all /live filesystem in order or with the module boot parameter."
-msgstr ""
diff --git a/manual/po/de/user_customization-runtime.ssi.po b/manual/po/de/user_customization-runtime.ssi.po
index c9f768a..88ff610 100644
--- a/manual/po/de/user_customization-runtime.ssi.po
+++ b/manual/po/de/user_customization-runtime.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-02 20:07-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -20,32 +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/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
+#: 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
@@ -58,38 +50,29 @@ msgstr ""
 #: en/user_customization-packages.ssi:185
 #: en/user_customization-packages.ssi:199
 #: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
 #: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:321
-#: en/user_customization-runtime.new.ssi:14
-#: en/user_customization-runtime.new.ssi:34
-#: en/user_customization-runtime.new.ssi:42
-#: en/user_customization-runtime.new.ssi:50
-#: en/user_customization-runtime.new.ssi:64
-#: en/user_customization-runtime.new.ssi:76
-#: en/user_customization-runtime.new.ssi:86
-#: en/user_customization-runtime.new.ssi:94
-#: en/user_customization-runtime.new.ssi:102
-#: en/user_customization-runtime.new.ssi:110
-#: en/user_customization-runtime.new.ssi:130
-#: en/user_customization-runtime.new.ssi:138
-#: en/user_customization-runtime.new.ssi:147
-#: en/user_customization-runtime.ssi:12 en/user_customization-runtime.ssi:30
-#: en/user_customization-runtime.ssi:40 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:56 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:92
-#: en/user_customization-runtime.ssi:101 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:141 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_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,32 +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:173 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
+#: 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
@@ -139,38 +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:285
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
 #: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:334
-#: en/user_customization-runtime.new.ssi:18
-#: en/user_customization-runtime.new.ssi:38
-#: en/user_customization-runtime.new.ssi:46
-#: en/user_customization-runtime.new.ssi:54
-#: en/user_customization-runtime.new.ssi:68
-#: en/user_customization-runtime.new.ssi:80
-#: en/user_customization-runtime.new.ssi:90
-#: en/user_customization-runtime.new.ssi:98
-#: en/user_customization-runtime.new.ssi:106
-#: en/user_customization-runtime.new.ssi:114
-#: en/user_customization-runtime.new.ssi:134
-#: en/user_customization-runtime.new.ssi:143
-#: en/user_customization-runtime.new.ssi:152
-#: en/user_customization-runtime.ssi:16 en/user_customization-runtime.ssi:34
-#: en/user_customization-runtime.ssi:44 en/user_customization-runtime.ssi:52
-#: en/user_customization-runtime.ssi:60 en/user_customization-runtime.ssi:68
-#: en/user_customization-runtime.ssi:88 en/user_customization-runtime.ssi:97
-#: en/user_customization-runtime.ssi:106 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:31
+#: 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: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
@@ -179,9 +145,41 @@ msgid "}code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:12
+#: en/user_customization-runtime.ssi:2
+msgid ":B~ Customizing run time behaviours"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:4
+msgid "1~customizing-run-time-behaviours Customizing run time behaviours"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:6
+msgid ""
+"All configuration that is done during run time is done by live-config. Here "
+"are some most common options of live-config that users are interested in. A "
+"full list of all possibilities can be found in the manpage of live-config."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:8
+msgid "2~ Customizing the live user"
+msgstr ""
+
+#. type: Plain text
 #: en/user_customization-runtime.ssi:10
 msgid ""
+"One important consideration is that the live user is created by live-boot at "
+"boot time, not by live-build at build time. This not only influences where "
+"materials relating to the live user are introduced in your build, as "
+"discussed in {Live/chroot local includes}#live-chroot-local-includes, but "
+"also any groups and permissions associated with the live user."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:12
+msgid ""
 "You can specify additional groups that the live user will belong to by "
 "preseeding the #{passwd/user-default-groups}# debconf value. For example, to "
 "add the live user to the #{fuse}# group, add the following to a file in the #"
@@ -189,104 +187,108 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:16
-#: en/user_customization-runtime.ssi:14
-msgid ""
-"debconf passwd/user-default-groups string audio cdrom dialout floppy video "
-"plugdev netdev powerdev fuse"
+#: en/user_customization-runtime.ssi:16
+#, no-wrap
+msgid " debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:22
 #: en/user_customization-runtime.ssi:20
-msgid "When the live system boots, language is involved in three steps:"
+msgid "2~customizing-locale-and-language Customizing locale and language"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:24
 #: en/user_customization-runtime.ssi:22
-msgid "_* the locale generation"
+msgid "When the live system boots, language is involved in three steps:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:26
 #: en/user_customization-runtime.ssi:24
-msgid "_* setting the keyboard layout for the console"
+msgid "_* the locale generation"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:28
 #: en/user_customization-runtime.ssi:26
-msgid "_* setting the keyboard layout for X"
+msgid "_* setting the keyboard layout for the console"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:78
-#: en/user_customization-runtime.ssi:32
-msgid "lb config --bootappend-live \"locales=de_CH.UTF-8\""
+#: en/user_customization-runtime.ssi:28
+msgid "_* setting the keyboard layout for X"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:82
-#: en/user_customization-runtime.ssi:36
+#: en/user_customization-runtime.ssi:30
 msgid ""
-"This parameter can also be used in kernel command line. You can specify a "
-"locale by a full #{language_country.encoding}# word."
+"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
+"To define the locale that should be generated, use the #{locales}# parameter "
+"in the #{--bootappend-live}# option of #{lb config}#, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:34
+#, no-wrap
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:84
 #: en/user_customization-runtime.ssi:38
 msgid ""
-"Both the console and X keyboard configuration depends on the #{keyb}# "
-"parameter of the #{--bootappend-live}# option. Valid options for X keyboard "
-"layouts can be found in #{/etc/X11/xkb/base.xml}# (rather limited to two-"
-"letters country codes). To find the value (the two characters) corresponding "
-"to a language try searching for the english name of the nation where the "
-"language is spoken, e.g:"
+"This parameter can also be used at the kernel command line. You can specify "
+"a locale by a full #{language_country.encoding}# word."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:88
-#: en/user_customization-runtime.ssi:42
-msgid "$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name <name>se</name>"
+#: en/user_customization-runtime.ssi:40
+msgid ""
+"Both the console and X keyboard configuration depend on the #{keyboard-"
+"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
+"keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base.xml}# "
+"(rather limited to two-letters country codes). To find the value (the two "
+"characters) corresponding to a language try searching for the english name "
+"of the nation where the language is spoken, e.g:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:92
-#: en/user_customization-runtime.ssi:46
+#: en/user_customization-runtime.ssi:45
+#, no-wrap
+msgid ""
+" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
+" <name>se</name>\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:49
 msgid ""
 "To get the locale files for German and Swiss German keyboard layout in X use:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:96
-#: en/user_customization-runtime.ssi:50
-msgid "lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\""
+#: en/user_customization-runtime.ssi:53
+#, no-wrap
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:100
-#: en/user_customization-runtime.ssi:54
+#: en/user_customization-runtime.ssi:57
 msgid ""
 "A list of the valid values of the keyboards for the console can be figured "
 "with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:104
-#: en/user_customization-runtime.ssi:58
+#: 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.new.ssi:108
-#: en/user_customization-runtime.ssi:62
+#: 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 setup your "
+"configure console layout using X (XKB) definitions; you can then set your "
 "keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}"
 "#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use "
 "also these parameters for X configuration. For example, to set up a French "
@@ -295,22 +297,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:112
-#: en/user_customization-runtime.ssi:66
+#: 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.new.ssi:116
-#: en/user_customization-runtime.ssi:70
-msgid "2~ Persistence"
+#: en/user_customization-runtime.ssi:75
+msgid "2~persistence Persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:118
-#: en/user_customization-runtime.ssi:72
+#: 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 "
@@ -318,8 +318,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:120
-#: en/user_customization-runtime.ssi:74
+#: 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 "
@@ -328,8 +327,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:122
-#: en/user_customization-runtime.ssi:76
+#: 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 "
@@ -340,8 +338,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:124
-#: en/user_customization-runtime.ssi:78
+#: 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 "
@@ -351,14 +348,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:126
-#: en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:85
 msgid "3~ Full persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:128
-#: en/user_customization-runtime.ssi:82
+#: 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 "
@@ -370,30 +365,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:132
-#: en/user_customization-runtime.ssi:86
-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.new.ssi:136
-#: en/user_customization-runtime.ssi:90
+#: 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.new.ssi:141
-#: en/user_customization-runtime.ssi:95
+#: 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.new.ssi:145
-#: en/user_customization-runtime.ssi:99
+#: 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 "
@@ -403,30 +396,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:150
-#: en/user_customization-runtime.ssi:104
+#: 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.new.ssi:154
-#: en/user_customization-runtime.ssi:108
+#: 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.new.ssi:156
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:115
 msgid "3~ Home automounting"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:158
-#: en/user_customization-runtime.ssi:112
+#: 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 "
@@ -435,14 +425,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:160
-#: en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:119
 msgid "3~ Snapshots"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:162
-#: en/user_customization-runtime.ssi:116
+#: 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 "
@@ -459,30 +447,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:164
-#: en/user_customization-runtime.ssi:118
+#: 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.new.ssi:166
-#: en/user_customization-runtime.ssi:120
+#: 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.new.ssi:168
-#: en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:127
 msgid "3~ Persistent SubText"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:170
-#: en/user_customization-runtime.ssi:124
+#: 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-"
@@ -494,54 +478,15 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:172
-#: en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:131
 msgid "3~ Partial remastering"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:173
-#: en/user_customization-runtime.ssi:127
+#: 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 "
 "case of cd-r or adding a session to multisession cd/dvd(rw); live-boot "
 "mounts all /live filesystem in order or with the module boot parameter."
 msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:2
-msgid "B~ Customization at Runtime"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:4
-msgid ""
-"All configuration that is done during runtime is done by live-config. Here "
-"are some most common options of live-config that users are interested in. A "
-"full list of all possibilities can be found in the manpage of live-config."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:6
-msgid "1~ User"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:8
-msgid ""
-"One important consideration is that the live user is created by live-boot "
-"during bootup, it is not created by live-build when building the image."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:18
-msgid "1~ Language"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:28
-msgid ""
-"To define the locale that should be generated, use the #{locale}# parameter "
-"into the #{--bootappend-live}# option of #{lb config}#, e.g.:"
-msgstr ""
diff --git a/manual/po/de/user_examples.ssi.po b/manual/po/de/user_examples.ssi.po
index 42e37c0..d9b0aa9 100644
--- a/manual/po/de/user_examples.ssi.po
+++ b/manual/po/de/user_examples.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-28 07:51-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -17,68 +17,70 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
+#: en/live-manual.ssm:61 en/user_examples.ssi:2
+msgid ":B~ Examples"
+msgstr ""
+
+#. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:108 en/about_manual.ssi: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_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/project_bugs.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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
+#: 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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr ""
@@ -87,84 +89,71 @@ 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:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: 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: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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:92
-#: en/user_examples.ssi:141 en/user_examples.ssi:190
-msgid "#!/bin/sh"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
-#: en/user_examples.ssi:109 en/user_examples.ssi:156
-msgid "# lb build"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:2
-msgid ":B~ Examples"
+#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#, no-wrap
+msgid " # lb build\n"
 msgstr ""
 
 #. type: Plain text
@@ -209,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
@@ -222,7 +213,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:24
 #, no-wrap
-msgid "*{Use case:}* Create a simple first image, learning the basics of live-build\n"
+msgid "*{Use case:}* Create a simple first image, learning the basics of live-build.\n"
 msgstr ""
 
 #. type: Plain text
@@ -240,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
@@ -258,8 +250,9 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:42
-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,7 +276,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:50
 #, no-wrap
-msgid "*{Use case}* Create a web browser utility image, learning how to apply customizations\n"
+msgid "*{Use case:}* Create a web browser utility image, learning how to apply customizations.\n"
 msgstr ""
 
 #. type: Plain text
@@ -295,7 +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
@@ -317,11 +311,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:66 en/user_examples.ssi:219
-msgid "# lb build 2>&1 | tee binary.log"
-msgstr ""
-
-#. type: Plain text
 #: en/user_examples.ssi:70
 msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
 msgstr ""
@@ -334,7 +323,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:74
 #, no-wrap
-msgid "*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
+msgid "*{Use case:}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
 msgstr ""
 
 #. type: Plain text
@@ -355,9 +344,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:84
+#, no-wrap
 msgid ""
-"$ mkdir -p tutorial3/auto $ cp /usr/share/live/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
@@ -366,15 +357,21 @@ msgid "Edit #{auto/config}# to read as follows:"
 msgstr ""
 
 #. type: Plain text
+#: en/user_examples.ssi:92 en/user_examples.ssi:141
+#, 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
@@ -410,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
@@ -436,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
@@ -448,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
@@ -462,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
@@ -499,80 +507,85 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:174
-msgid "Create an image with live-build to boot directly to a VNC server."
+#, no-wrap
+msgid "*{Use case:}* Create an image with live-build to boot directly to a VNC server.\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:176
-msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:178
-msgid "_* Move to the build directory: #{$ cd vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:180
 msgid ""
-"Example to config the build directory to include gdm metacity "
-"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
+"Make a build directory and create a skeletal configuration in it built "
+"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
+"{xtightvncviewer}#, disabling recommends to make a minimal system:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:182
+#: en/user_examples.ssi:184
+#, no-wrap
 msgid ""
-"Create a folder /etc/skel folder for a custom .xsession for the default "
-"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
+" $ 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
-#: en/user_examples.ssi:184
+#: en/user_examples.ssi:188
 msgid ""
-"Create the .xsession for the default user: #{$ touch config/chroot_local-"
-"includes/etc/skel/.xsession}#"
+"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
+"the default user that will launch metacity and start xvncviewer, connecting "
+"to port #{5901}# on a server at #{192.168.1.2}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:186
+#: en/user_examples.ssi:194
+#, no-wrap
 msgid ""
-"Edit the .xsession file to launch metacity and start xvncviewer with "
-"something similar to the below:"
+" $ 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:193
-msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
+#: en/user_examples.ssi:197
+#, no-wrap
+msgid ""
+" /usr/bin/metacity &\n"
+" /usr/bin/xvncviewer 192.168.1.2:1\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:195
-msgid "exit"
+#: en/user_examples.ssi:200
+#, no-wrap
+msgid ""
+" exit\n"
+" END\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:199
-msgid "_* Build the image: #{# lb build}#"
+#: en/user_examples.ssi:204
+msgid "Build the image:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:201
-msgid "_* Enjoy."
+#: en/user_examples.ssi:212
+msgid "Enjoy."
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:203
+#: en/user_examples.ssi:214
 msgid "2~ A base image for a 128M USB key"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:205
+#: en/user_examples.ssi:216
 #, no-wrap
-msgid "*{Use case}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
+msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:207
+#: en/user_examples.ssi:218
 msgid ""
 "When optimizing an image to fit a certain media size, you need to understand "
 "the tradeoffs you are making between size and functionality. In this "
@@ -586,19 +599,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:211
+#: 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:215
+#: en/user_examples.ssi:227
 msgid "Now, build the image in the usual way:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:223
+#: 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 "
@@ -606,7 +620,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:225
+#: 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 "
@@ -622,3 +636,117 @@ msgid ""
 "you to decide if the functionality that is sacrificed with each optimization "
 "is worth the loss in functionality."
 msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:239
+msgid "2~ A localized KDE desktop and installer"
+msgstr ""
+
+#. type: Plain text
+#: 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: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 "
+"that would be installed by the standard Debian installer for KDE."
+msgstr ""
+
+#. type: Plain text
+#: 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 "
+"find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can be "
+"used to dig it out of the task descriptions in tasksel-data, so to prepare, "
+"make sure you have both of those things:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:249
+#, no-wrap
+msgid " # apt-get install dctrl-tools tasksel-data\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:253
+msgid "Now we can search for the appropriate tasks, first with:"
+msgstr ""
+
+#. type: Plain text
+#: 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"
+msgstr ""
+
+#. type: Plain text
+#: 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: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"
+msgstr ""
+
+#. type: Plain text
+#: 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"
+msgstr ""
+
+#. type: Plain text
+#: 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}"
+"#desktop-and-language-tasks for details). And at boot time we will generate "
+"the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's "
+"put the pieces together:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:295
+#, no-wrap
+msgid ""
+" $ 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"
+msgstr ""
+
+#. type: Plain text
+#: 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 "
+"flavour kernel, as it is currently necessary to make the installer and live "
+"system kernels match for the launcher to work properly."
+msgstr ""
diff --git a/manual/po/de/user_installation.ssi.po b/manual/po/de/user_installation.ssi.po
index fb12176..3a895fd 100644
--- a/manual/po/de/user_installation.ssi.po
+++ b/manual/po/de/user_installation.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-01 06:49-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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,61 +20,59 @@ 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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:259
-#: en/user_customization-packages.ssi:271
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:299 en/user_customization-runtime.ssi:12
-#: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
-#: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
-#: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
-#: en/user_customization-runtime.ssi:92 en/user_customization-runtime.ssi:101
+#: 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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
 #: en/user_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_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:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:108
-#: en/user_installation.ssi:126 en/user_installation.ssi:141
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -86,61 +84,59 @@ 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:173 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: 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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:263
-#: en/user_customization-packages.ssi:275
-#: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:312 en/user_customization-runtime.ssi:16
-#: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
 #: en/user_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_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:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:112
-#: en/user_installation.ssi:131 en/user_installation.ssi:144
-#: en/user_managing_a_configuration.ssi:31
+#: 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
@@ -149,6 +145,12 @@ msgid "}code"
 msgstr ""
 
 #. type: Plain text
+#: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
+#, no-wrap
+msgid " $ lb config --repository live.debian.net\n"
+msgstr ""
+
+#. type: Plain text
 #: en/user_installation.ssi:2
 msgid ":B~ Installation"
 msgstr ""
@@ -233,7 +235,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:34
+#: en/user_installation.ssi:34 en/user_installation.ssi:104
 msgid "3~ From the Debian repository"
 msgstr ""
 
@@ -244,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
@@ -254,11 +257,12 @@ 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
-#: en/user_installation.ssi:52
+#: en/user_installation.ssi:52 en/user_installation.ssi:108
 msgid "3~ From source"
 msgstr ""
 
@@ -272,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
@@ -282,41 +287,55 @@ 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
-#: en/user_installation.ssi:70
-msgid "# dpkg -i live-build*.deb"
+#: en/user_installation.ssi:72
+msgid ""
+"Now install whichever of the freshly built #{.deb}# files you were "
+"interested in, e.g."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:74
+#: en/user_installation.ssi:76
+#, no-wrap
+msgid " # dpkg -i live-build_2.0.8-1_all.deb\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:80
 msgid "You can also install live-build directly to your system by executing:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:78
-msgid "# make install"
+#: en/user_installation.ssi:84
+#, no-wrap
+msgid " # make install\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:82
+#: en/user_installation.ssi:88
 msgid "and uninstall it with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:86
-msgid "# make uninstall"
+#: en/user_installation.ssi:92
+#, no-wrap
+msgid " # make uninstall\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:90
+#: en/user_installation.ssi:96 en/user_installation.ssi:142
 msgid "3~ From 'snapshots'"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:92
+#: en/user_installation.ssi:98
 msgid ""
 "If you do not wish to build or install live-build from source, you can use "
 "snapshots. These are built automatically from the latest version in Git and "
@@ -324,86 +343,65 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:94
-msgid "2~ live-boot"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:96
-#, no-wrap
-msgid "*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:98
-msgid "% FIXME: we also need to mention live-config"
-msgstr ""
-
-#. type: Plain text
 #: en/user_installation.ssi:100
-msgid "3~ Using a customized live-boot"
+msgid "2~ live-boot and live-config"
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:102
-msgid ""
-"% FIXME: should follow the structure for live-build above (i.e. \"from source"
-"\", not \"customized\" -- we should not get into customization now, but "
-"should reserve that discussion for later."
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:104
-msgid ""
-"To modify the code you can follow the process below. Please ensure you are "
-"familiar with the terms mentioned in {Terms}#terms."
+#, no-wrap
+msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:106
-msgid "_* Checkout the live-boot source"
+msgid ""
+"Both live-boot and live-config are available from the Debian repository as "
+"per {Installing live-build}#installing-live-build."
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:110
-msgid "$ git clone git://live.debian.net/git/live-boot.git"
+msgid ""
+"To use the latest source from git, you can follow the process below. Please "
+"ensure you are familiar with the terms mentioned in {Terms}#terms."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:114
-msgid "_* Make changes to your local copy"
+#: en/user_installation.ssi:112
+msgid "_* Checkout the live-boot and live-config source"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:116
+#: en/user_installation.ssi:117
+#, no-wrap
 msgid ""
-"% FIXME: as indicated above, it's too early for this topic. Move to later in "
-"the manual."
+" $ 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
-#: en/user_installation.ssi:118
+#: en/user_installation.ssi:121
 msgid ""
-"And beware that if you want to add your pre-init script in live-bottom, you "
-"should name it without dashes '-', e.g: call it \"99new_feature\" and not "
-"\"99new-feature\"."
+"Consult the live-boot and live-config man pages for details on customizing "
+"if that is your reason for building these packages from source."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:120
-msgid "_* Build a live-boot .deb"
+#: en/user_installation.ssi:123
+msgid "_* Build live-boot and live-config .deb files"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:122
+#: en/user_installation.ssi:125
 msgid ""
 "You must build either on your target distribution or in a chroot containing "
 "your target platform: this means if your target is Squeeze then you should "
-"build against Squeeze. Y"
+"build against Squeeze."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:124
+#: en/user_installation.ssi:127
 msgid ""
 "Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
 "build #{live-boot}# for a target distribution that differs from your build "
@@ -414,40 +412,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:129
-msgid "$ cd live-boot $ dpkg-buildpackage -b -uc -us"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:133
-msgid "_* Use the generated live-boot .deb"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:135
+#: en/user_installation.ssi:134
+#, no-wrap
 msgid ""
-"As live-boot is installed by live-build system, installing the package in "
-"the host system is not sufficient: you should treat the generated .deb like "
-"another custom package. Please see {Customizing package installation}"
-"#customizing-package-installation for more information. You should pay "
-"particular attention to {Additional repositories}#additional-repositories."
+" $ cd live-boot\n"
+" $ dpkg-buildpackage -b -uc -us\n"
+" $ cd ../live-config\n"
+" $ dpkg-buildpackage -b -uc -us\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:137
-msgid "3~ Using live-boot snapshots"
+#: en/user_installation.ssi:138
+msgid "_* Use all generated .deb files"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:139
+#: en/user_installation.ssi:140
 msgid ""
-"You can let live-build automatically use the latest snapshot of live-boot by "
-"configuring a third-party repository in your live-build configuration "
-"directory. Assuming you have already created a configuration tree with #{lb "
-"config}#:"
+"As live-boot and live-config are installed by live-build system, installing "
+"the packages in the host system is not sufficient: you should treat the "
+"generated .deb files like any other custom packages. Please see {Customizing "
+"package installation}#customizing-package-installation for more information. "
+"You should pay particular attention to {Additional repositories}#additional-"
+"repositories."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:143
-msgid "lb config --repository live.debian.net"
+#: en/user_installation.ssi:144
+msgid ""
+"You can let live-build automatically use the latest snapshots of live-boot "
+"and live-config by configuring a third-party repository in your live-build "
+"configuration directory. Assuming you have already created a configuration "
+"tree with #{lb config}#:"
 msgstr ""
diff --git a/manual/po/de/user_managing_a_configuration.ssi.po b/manual/po/de/user_managing_a_configuration.ssi.po
index 5a7ebd0..450ef6d 100644
--- a/manual/po/de/user_managing_a_configuration.ssi.po
+++ b/manual/po/de/user_managing_a_configuration.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-01 05:55-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -20,60 +20,59 @@ 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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_customization-runtime.ssi:12
-#: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
-#: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
-#: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
-#: en/user_customization-runtime.ssi:92 en/user_customization-runtime.ssi:101
+#: 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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
 #: en/user_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_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:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:108
-#: en/user_installation.ssi:126 en/user_installation.ssi:144
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -85,60 +84,59 @@ 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:173 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: 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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_customization-runtime.ssi:16
-#: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
 #: en/user_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_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:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:112
-#: en/user_installation.ssi:131 en/user_installation.ssi:147
-#: en/user_managing_a_configuration.ssi:31
+#: 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
@@ -194,8 +192,9 @@ msgstr ""
 msgid ""
 "A second, related problem is that if you run #{lb config}# and then upgrade "
 "to a new version of live-build that has changed one of the variable names, "
-"you will discover this only by manual review of the variables in your config "
-"files, which you will then need to use to set the appropriate option again."
+"you will discover this only by manual review of the variables in your #"
+"{config/*}# files, which you will then need to use to set the appropriate "
+"option again."
 msgstr ""
 
 #. type: Plain text
@@ -238,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
@@ -253,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
@@ -267,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
@@ -279,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 0872a2f..5b697a8 100644
--- a/manual/po/de/user_overview.ssi.po
+++ b/manual/po/de/user_overview.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-10-28 16:34-0200\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -17,122 +17,129 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: 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/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.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:140
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/project_bugs.ssi: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: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: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_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
+#: 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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: 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_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 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: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_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
-#: en/user_customization-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: 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_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr ""
@@ -185,11 +192,11 @@ msgstr ""
 #: en/user_overview.ssi:16
 msgid ""
 "_* The scripts have a central location for configuring their operation. In "
-"debhelper, this is the debian subdirectory of a package tree. For example, "
-"dh_install will look, amongst others, for a file called #{debian/install}# "
-"to determine which files should exist in a particular binary package. In "
-"much the same way, live-build stores its configuration entirely under a "
-"config subdirectory."
+"debhelper, this is the #{debian/}# subdirectory of a package tree. For "
+"example, dh_install will look, amongst others, for a file called #{debian/"
+"install}# to determine which files should exist in a particular binary "
+"package. In much the same way, live-build stores its configuration entirely "
+"under a #{config/}# subdirectory."
 msgstr ""
 
 #. type: Plain text
@@ -244,7 +251,7 @@ msgstr ""
 #: en/user_overview.ssi:32
 msgid ""
 "As discussed in {live-build}#live-build, the scripts that make up live-build "
-"source their configuration from a single directory named config/. As "
+"source their configuration from a single directory named #{config/}#. As "
 "constructing this directory by hand would be time-consuming and error-prone, "
 "the #{lb config}# command can be used to create skeleton configuration "
 "folders."
@@ -253,45 +260,59 @@ msgstr ""
 #. type: Plain text
 #: en/user_overview.ssi:34
 msgid ""
-"Issuing #{lb config}# without any arguments creates a config subdirectory "
-"which it populates with some default settings:"
+"Issuing #{lb config}# without any arguments creates a #{config/}# "
+"subdirectory which it populates with some default settings:"
 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
@@ -312,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
@@ -322,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 5eedc84..6fd783b 100644
--- a/manual/po/fr/about_manual.ssi.po
+++ b/manual/po/fr/about_manual.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a8\n"
-"POT-Creation-Date: 2010-12-05 11:16+0100\n"
+"Project-Id-Version: live-manual 2.0.0\n"
+"POT-Creation-Date: 2010-12-20 05:58-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"
@@ -72,7 +72,7 @@ msgid ""
 "#examples section designed to teach you image building and customization "
 "basics. Read {Using the examples}#using-the-examples first, followed by "
 "{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
-"utility}#tutorial-2 and finally {Tutorial 3: A personal travelling companion}"
+"utility}#tutorial-2 and finally {Tutorial 3: A personalized image}"
 "#tutorial-3. By the end of these tutorials, you will have a taste of what "
 "can be done with Debian Live. We encourage you to return to more in-depth "
 "study of the manual, perhaps next reading {The basics}#the-basics, skimming "
@@ -336,8 +336,8 @@ msgstr "2~ Contribuer à ce document"
 msgid ""
 "This manual is intended as a community project and all proposals for "
 "improvements and contributions are extremely welcome. The preferred way to "
-"submit a contribution is to send it to the mailing list. Please see {Contact}"
-"#contact for more information."
+"submit a contribution is to send it to the mailing list. Please see the "
+"section {Contact}#contact for more information."
 msgstr ""
 "Ce manuel est conçu comme un projet communautaire et toutes les propositions "
 "d'améliorations et de contributions sont les bienvenues. La meilleure façon "
@@ -361,7 +361,7 @@ msgstr ""
 #: en/about_manual.ssi:82
 msgid ""
 "The sources for this manual are maintained using the Git version control "
-"system. You can checkout the latest copy by executing:"
+"system. You can check out the latest copy by executing:"
 msgstr ""
 "Les sources de ce manuel sont maintenues à l'aide du logiciel de gestion de "
 "versions Git. Vous pouvez obtenir la dernière copie en exécutant:"
@@ -370,32 +370,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/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
+#: 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
@@ -408,38 +400,29 @@ msgstr ""
 #: en/user_customization-packages.ssi:185
 #: en/user_customization-packages.ssi:199
 #: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
 #: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:321
-#: en/user_customization-runtime.new.ssi:14
-#: en/user_customization-runtime.new.ssi:34
-#: en/user_customization-runtime.new.ssi:42
-#: en/user_customization-runtime.new.ssi:50
-#: en/user_customization-runtime.new.ssi:64
-#: en/user_customization-runtime.new.ssi:76
-#: en/user_customization-runtime.new.ssi:86
-#: en/user_customization-runtime.new.ssi:94
-#: en/user_customization-runtime.new.ssi:102
-#: en/user_customization-runtime.new.ssi:110
-#: en/user_customization-runtime.new.ssi:130
-#: en/user_customization-runtime.new.ssi:138
-#: en/user_customization-runtime.new.ssi:147
-#: en/user_customization-runtime.ssi:12 en/user_customization-runtime.ssi:30
-#: en/user_customization-runtime.ssi:40 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:56 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:92
-#: en/user_customization-runtime.ssi:101 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:141 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -456,32 +439,24 @@ 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
+#: 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
@@ -494,38 +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:285
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
 #: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:334
-#: en/user_customization-runtime.new.ssi:18
-#: en/user_customization-runtime.new.ssi:38
-#: en/user_customization-runtime.new.ssi:46
-#: en/user_customization-runtime.new.ssi:54
-#: en/user_customization-runtime.new.ssi:68
-#: en/user_customization-runtime.new.ssi:80
-#: en/user_customization-runtime.new.ssi:90
-#: en/user_customization-runtime.new.ssi:98
-#: en/user_customization-runtime.new.ssi:106
-#: en/user_customization-runtime.new.ssi:114
-#: en/user_customization-runtime.new.ssi:134
-#: en/user_customization-runtime.new.ssi:143
-#: en/user_customization-runtime.new.ssi:152
-#: en/user_customization-runtime.ssi:16 en/user_customization-runtime.ssi:34
-#: en/user_customization-runtime.ssi:44 en/user_customization-runtime.ssi:52
-#: en/user_customization-runtime.ssi:60 en/user_customization-runtime.ssi:68
-#: en/user_customization-runtime.ssi:88 en/user_customization-runtime.ssi:97
-#: en/user_customization-runtime.ssi:106 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:31
+#: 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: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
@@ -546,13 +512,14 @@ 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 libnokogiri-ruby\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:98
 msgid ""
-"You may build the live-manual from the top level directory of your git "
+"You may build the live-manual from the top level directory of your Git "
 "checkout by executing:"
 msgstr ""
 "Vous pouvez compiler live-manual depuis le répertoire racine de votre "
@@ -560,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
@@ -573,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
@@ -584,9 +553,9 @@ msgstr "3~ Appliquer des patches"
 #. type: Plain text
 #: en/about_manual.ssi:116
 msgid ""
-"Directly commiting to the repository is possible by anyone. However, we ask "
-"you to send bigger changes to the mailing list to discuss them first. In "
-"order to push to the repository, the following steps are required."
+"Anyone can directly commit to the repository. However, we ask you to send "
+"bigger changes to the mailing list to discuss them first. To push to the "
+"repository, you must follow this procedure:"
 msgstr ""
 "Les contributions directes au répertoire sont possibles pour tout le monde. "
 "Cependant, nous vous demandons d'envoyer les changements conséquents sur la "
@@ -602,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/live.debian.net\n"
-"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-"\t-O ~/.ssh/identity.d/live.debian.net.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/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
@@ -625,36 +588,31 @@ 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
-msgid "_* Checkout a clone of the manual through ssh:"
+msgid "_* Check out a clone of the manual through ssh:"
 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
 msgid ""
-"_* After editing the files in manual/en/, please call the 'commit' target in "
-"the top level directory to sanitize the files and update the translation "
-"files:"
+"_* After editing the files in #{manual/en/}#, please call the 'commit' "
+"target in the top level directory to sanitize the files and update the "
+"translation files:"
 msgstr ""
 "_* Après édition des fichiers dans manual/en/, veuillez appeler 'commit' "
 "dans le dossier racine du répertoire afin de de nettoyer les fichier et de "
@@ -662,26 +620,28 @@ 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
 msgid ""
-"_* After sanitizing commit the changes. Write commit messages, that consist "
-"of full useful sentences, starting with a capital letter and ending with a "
-"full stop. Usually starting with the form 'Fixing/Adding/Removing/"
-"Correcting/':"
+"_* After sanitizing, commit the changes. Write commit messages that consist "
+"of full, useful sentences in English, starting with a capital letter and "
+"ending with a full stop. Usually, these will start with the form 'Fixing/"
+"Adding/Removing/Correcting/Translating', e.g."
 msgstr ""
 "_* Après nettoyage, soumettre les modifications. Veuillez écrire les "
 "commentaires de commit à l'aide de phrases complètes, en commençant par une "
 "majuscule et en terminant par un point, et en commençant par 'Fixing/Adding/"
-"Removing/Correcting/':"
+"Removing/Correcting/Translating':"
 
 #. type: Plain text
 #: en/about_manual.ssi:164
-msgid "$ git commit -a"
-msgstr "$ git commit -a"
+#, no-wrap
+msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:168
@@ -690,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
@@ -700,21 +661,29 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:178
-msgid "Submiting a translation for a new language is recommendet in two steps:"
+msgid "To submit a translation for a new language, follow these three steps:"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:180
 msgid ""
-"_* Translate the about_manual.ssi.pot about_project.ssi.pot index.html.in."
-"pot files to your language with your favourite editor (such as poedit). Send "
-"translated files to the mailinglist. It will then be included and autobuild "
-"for that language enabled."
+"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
+"in.pot files to your language with your favourite editor (such as poedit). "
+"Send translated files to the mailing list. Once we have reviewed your "
+"submission, we will add the new language to the manual (providing the po "
+"files) and will enable it in the autobuild."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:182
+msgid ""
+"_* Once the new language is added, you can randomly start translating all po "
+"files in #{manual/po/}#."
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:181
+#: en/about_manual.ssi:184
 msgid ""
-"_* Now that the new language was added, you can randomly start translating "
-"all other pot files."
+"_* Don't forget you need #{make commit}# to ensure the translated manuals "
+"are updated from the po files, before #{git commit -a}# and #{git push}#."
 msgstr ""
diff --git a/manual/po/fr/about_project.ssi.po b/manual/po/fr/about_project.ssi.po
index ffe353f..c47dfc7 100644
--- a/manual/po/fr/about_project.ssi.po
+++ b/manual/po/fr/about_project.ssi.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
+"Project-Id-Version: live-manual 2.0.0\n"
 "POT-Creation-Date: 2010-11-27 10:30-0400\n"
 "PO-Revision-Date: 2010-10-16 11:30-0200\n"
 "Last-Translator: Automatically generated\n"
diff --git a/manual/po/fr/index.html.in.po b/manual/po/fr/index.html.in.po
index 05508ed..0846dc8 100644
--- a/manual/po/fr/index.html.in.po
+++ b/manual/po/fr/index.html.in.po
@@ -1,19 +1,20 @@
 # French translations for live-manual package
 # 2010 Christophe Siraut <chris at tobald.eu.org>
 # This file is distributed under the same license as the live-config package.
+# Carlo Stemberger <carlo.stemberger at gmail.com>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a8\n"
-"POT-Creation-Date: 2010-10-20 20:02+0300\n"
-"PO-Revision-Date: 2010-10-21 19:05+0100\n"
-"Last-Translator: Christophe Siraut <chris at tobald.eu.org>\n"
-"Language-Team: none\n"
+"Project-Id-Version: live-manual 2.0.0\n"
+"POT-Creation-Date: 2010-12-08 15:58+0100\n"
+"PO-Revision-Date: 2010-12-08 16:13+0100\n"
+"Last-Translator: Carlo Stemberger <carlo.stemberger at gmail.com>\n"
+"Language-Team: Italian <tp at lists.linux.it>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=2: plural=(n !=1)\n"
 
 #. type: Content of: <html><head><title>
 #: en/index.html.in:4
@@ -21,17 +22,17 @@ msgid "Debian Live Project"
 msgstr "Projet Debian Live"
 
 #. type: Content of: <html><body><h2>
-#: en/index.html.in:8
+#: en/index.html.in:9
 msgid "Debian Live Manual"
 msgstr "Manuel Debian Live"
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:11
+#: en/index.html.in:12
 msgid "<i>This manual is under heavy construction.</i>"
 msgstr "<i>Ce manuel est en cours d'élaboration.</i>"
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:15
+#: en/index.html.in:16
 msgid ""
 "Please report errors, omissions, patches and suggestions to our mailinglist "
 "at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
@@ -44,17 +45,17 @@ msgstr ""
 "html#37\">comment contribuer</a> au manuel."
 
 #. type: Content of: <html><body><h3>
-#: en/index.html.in:18
+#: en/index.html.in:19
 msgid "Available Formats"
 msgstr "Formats disponibles"
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:21
+#: en/index.html.in:22
 msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
 msgstr "<a href=\"epub/live-manual.epub\">EPUB</a>"
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:22
+#: en/index.html.in:23
 msgid ""
 "HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
 "html\">single page</a>"
@@ -63,12 +64,12 @@ msgstr ""
 "manual.html\">page unique</a>"
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:23
+#: en/index.html.in:24
 msgid "<a href=\"odf/live-manual.odt\">ODF</a>"
 msgstr "<a href=\"odf/live-manual.odt\">ODF</a>"
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:24
+#: en/index.html.in:25
 msgid ""
 "PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
 "\"pdf/live-manual.landscape-a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
@@ -81,36 +82,36 @@ msgstr ""
 "landscape-letter.pdf\">US paysage</a>"
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:25
+#: en/index.html.in:26
 msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
 msgstr "<a href=\"txt/live-manual.txt\">Texte brut</a>"
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:29
+#: en/index.html.in:30
 msgid "Last changed: @DATE_CHANGE@"
 msgstr "Dernière modification: @DATE_CHANGE@"
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:30
+#: en/index.html.in:31
 msgid "Last built: @DATE_BUILD@"
 msgstr "Dernière compilation: @DATE_BUILD@"
 
 #. type: Content of: <html><body><h3>
-#: en/index.html.in:33
+#: en/index.html.in:34
 msgid "Source"
 msgstr "Source"
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:36
+#: en/index.html.in:37
 msgid ""
 "The sources for this manual is available in a <a href=\"http://git.or.cz/"
-"\">git</a> repository at live.debian.net."
+"\">Git</a> repository at live.debian.net."
 msgstr ""
 "Les sources de ce manuel sont disponibles dans un répertoire <a href="
-"\"http://git.or.cz/\">git</a> sur live.debian.net."
+"\"http://git.or.cz/\">Git</a> sur live.debian.net."
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:40
+#: en/index.html.in:41
 msgid ""
 "Browse: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
 "\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
@@ -121,7 +122,7 @@ msgstr ""
 "a>"
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:41
+#: en/index.html.in:42
 msgid ""
 "Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
 "live.debian.net/git/live-manual.git</tt></small></a>"
@@ -130,7 +131,7 @@ msgstr ""
 "live.debian.net/git/live-manual.git</tt></small></a>"
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:45
+#: en/index.html.in:46
 msgid ""
 "<a href=\"http://live.debian.net/\">Debian Live</a> &lt;<a href=\"mailto:"
 "debian-live at lists.debian.org\">debian-live at lists.debian.org</a>&gt; - <a "
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index 9c8d0a9..dff8fe4 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-06 12:26+0100\n"
+"Project-Id-Version: live-manual 2.0.0\n"
+"POT-Creation-Date: 2010-12-24 03:54+0100\n"
 "PO-Revision-Date: 2010-10-21 07:06-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2010-12-06\n"
+" :published: 2010-12-24\n"
 msgstr ""
 
 #. type: Plain text
@@ -86,7 +86,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:31
-msgid ":B~ User ~#"
+msgid ":B~ User"
 msgstr ""
 
 #. type: Plain text
@@ -126,80 +126,45 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:47
-msgid "<< user_customization-internationalization.ssi"
+msgid "<< user_customization-runtime.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:49
-msgid "<< user_customization-runtime.ssi"
+msgid "<< user_customization-binary.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:51
-msgid "<< user_customization-binary.ssi"
+msgid "<< user_customization-installer.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:53
-msgid "<< user_customization-installer.ssi"
+msgid ":B~ Project"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:55
-msgid ":B~ Development ~#"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:57
-msgid ":B~ Project ~#"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:59
 msgid "<< project_bugs.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:61
+#: en/live-manual.ssm:57
 msgid "<< project_coding-style.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:63
+#: en/live-manual.ssm:59
 msgid "<< project_procedures.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:65
-msgid ":B~ Examples ~#"
+#: en/live-manual.ssm:61 en/user_examples.ssi:2
+msgid ":B~ Examples"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:67
+#: en/live-manual.ssm:63
 msgid "<< user_examples.ssi"
 msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:69
-msgid ":B~ Other ~#"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:75
-msgid ""
-"Other material that formerly appeared in this section is out of date and/or "
-"has not been approved for release. It has therefore been omitted, but can "
-"still be found in the document source; see 'About this manual'. Any part of "
-"the omitted material that is still useful will be included in the release "
-"only after it has been reviewed."
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:77
-msgid "% << other_faq.ssi"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:78
-msgid "% << other_howtos.ssi"
-msgstr ""
diff --git a/manual/po/fr/other_faq.ssi.po b/manual/po/fr/other_faq.ssi.po
deleted file mode 100644
index 098869d..0000000
--- a/manual/po/fr/other_faq.ssi.po
+++ /dev/null
@@ -1,1008 +0,0 @@
-# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-10-16 14:45-0200\n"
-"PO-Revision-Date: 2010-10-16 14:45-0200\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. type: Plain text
-#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
-#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: 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/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
-#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
-#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
-#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
-#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:106
-#: en/user_installation.ssi:120 en/user_installation.ssi:137
-#: en/user_managing_a_configuration.ssi:24
-#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:60
-#: en/user_overview.ssi:104 en/user_overview.ssi:112
-msgid "code{"
-msgstr "code{"
-
-#. type: Plain text
-#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
-#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
-#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
-#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
-#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
-#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
-#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
-#: en/user_basics.ssi:257 en/user_basics.ssi:285 en/user_basics.ssi:293
-#: en/user_basics.ssi:320 en/user_basics.ssi:359
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
-#: en/user_customization-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:110
-#: en/user_installation.ssi:125 en/user_installation.ssi:140
-#: en/user_managing_a_configuration.ssi:31
-#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
-msgid "}code"
-msgstr "}code"
-
-#. type: Plain text
-#: en/other_faq.ssi:2
-msgid "B~ Frequently asked questions (FAQ)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:4
-msgid "1~ Frequently asked questions (FAQ)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:8
-msgid ""
-"Q: I downloaded a prebuilt live image. How do I put it on a USB stick? A: "
-"See \"Copying USB/HDD image to a USB stick\" % FIXME: <xref linkend="
-"\"image_copying\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:11
-msgid ""
-"Q: How do I log my build? A: You could use script, screen or tee: #{$ "
-"lh_build 2>&1 | tee build.log}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:14
-msgid ""
-"Q: How can I convert an already installed standard Debian partition into a "
-"Debian Live system? A: Save the list of installed packages and load it into "
-"your new Debian Live System. Copy your /etc to config/chroot_local-includes"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:17
-msgid ""
-"Q: What does 'losetup: could not find any free loop device' mean and how do "
-"I fix it? A: Loop devices are used during the build; there probably aren't "
-"any free if you've aborted several builds. Something like: for l in /dev/"
-"loop0 /dev/loop1 /dev/loop2 /dev/loop3 /dev/loop4 /dev/loop5 /dev/loop6 /dev/"
-"loop7 ; do losetup -d $l ; done should rectify the situation (assuming all "
-"loop devices in use were created by lh_build; if in doubt, check the "
-"contents of each loop device before deleting them with losetup -d)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:20
-msgid ""
-"Q: How do I launch an interactive shell during the chroot stage? A: To "
-"enable interactive shell: #{$ lh_config --interactive shell}# To continue "
-"the build process: #{# logout}# or #{# exit}# To disable interactive shell, "
-"set LH_INTERACTIVE to \"disabled\" in config/chroot."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:23
-msgid ""
-"Q: What is the root /user password? A: The user password for the live user "
-"is 'live'. By default, there is not any root password. You can switch to "
-"root with ${sudo -i}# or set a password for root with #{sudo passwd}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:27
-msgid ""
-"Q: How do I change root or any user password? A: Add a chroot local hook "
-"script to change root or any user password each time you build an image.  e."
-"g. config/chroot_local-hooks/01-update_password.sh to set root password to "
-"\"nopasswd\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:30 en/other_faq.ssi:53
-msgid "code{ #!/bin/sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:33
-msgid "echo \"I: update password\" echo \"root:nopasswd\" | chpasswd"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:35
-msgid "$ chmod +x config/chroot_local-hooks/01-update_password.sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:39
-msgid ""
-"Note for live user; you need to copy the /usr/share/initramfs-tools/scripts/"
-"live-bottom/10adduser your build folder:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:44
-msgid ""
-"mkdir -p config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-"
-"bottom/ cp /usr/share/initramfs-tools/scripts/live-bottom/10adduser config/"
-"chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:48
-msgid ""
-"Note: Then edit the config/chroot_local-includes/usr/share/initramfs-tools/"
-"scripts/live-bottom/10adduser and paste in the new user_crypted password "
-"that you make with: #{echo \"newlivepass\" | mkpasswd -s}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:50
-msgid ""
-"Or add an hook file in config/chroot_local-hooks/ with something like the "
-"below:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:57
-msgid ""
-"# Change the autogenerated user password to \"debianlive\" plain_password="
-"\"debianlive\" password=$(echo \"${plain_password}\" | mkpasswd -s)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:59
-msgid ""
-"sed -i -e 's/\\(user_crypted=\\)\\(.*\\)\\( #.*\\)/\\1\\\"'${password}'\\"
-"\"\\3/' /usr/share/initramfs-tools/scripts/live-bottom/10adduser"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:62
-msgid "update-initramfs -tu -kall }code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:64
-msgid ""
-"The latter (hook model) could be more future proof than the former solution "
-"since it modifies just one string selectively but it requires the package "
-"\"whois\" to be installed on the target system (for mkpasswd) or that you "
-"generate the $password string not at build time and include it crypted in "
-"the above script."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:68
-msgid ""
-"Q: How to disable autologin? A1: use the commandline parameter #{lh config --"
-"bootappend-live \"noautologin\"}# A2: You need to set boot=noautologin "
-"noxautologin as described in man live-initramfs If you boot via TFTP you "
-"want to insert the option to pxelinux.cfg/default"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:71
-msgid ""
-"Q: How do I change default hostname or username? A: To change default "
-"hostname or username: #{$ lh_config --hostname myhostname $ lh_config --"
-"username myusername}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:74
-msgid ""
-"Q: How do I make the final image smaller? A: Clean orphaned apps/libs: "
-"Install package \"deborphan\" and then run 'sudo deborphan -n' . Delete "
-"unwanted packages. Remove the apt cache. Purge unwanted locales (see "
-"\"localepurge\" package)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:77
-msgid ""
-"Q: How do I customize bash-config permanently (aliases, bash-completion "
-"etc.)? A: Add your own .bashrc config/chroot_local-includes/etc/skel/.bashrc"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:81
-msgid ""
-"Q: How do I disable services permanently? (Be careful!)  A: Add a chroot "
-"local hook script to disable a service each time you build an image: e.g. "
-"config/chroot_local-hooks/01-disable_service.sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/other_use-cases.ssi:26
-#: en/other_use-cases.ssi:77
-msgid "#!/bin/sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:88
-msgid "echo \"I: disable service\" update-rc.d -f service_name remove"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:90
-msgid "$ chmod +x config/chroot_local-hooks/01-disable_service.sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:95
-msgid ""
-"Q: How do I enable | disable the md5checksum at the ISO building? A: #"
-"{lh_config --checksums enabled|disabled}# Or change the LH_CHECKSUMS value."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:98
-msgid ""
-"Q: How to disable the generation of the .tar.gz file? A: #{lh_config --net-"
-"tarball none|gzip}# Or change the LH_NET_TARBALL value. (only available in "
-"snapsshot version at the moment 2008/Feb/28)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:101
-msgid "Q: How do I \"build a new image\"? A: Run commands:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:106
-msgid "$ sudo lh_clean --binary $ sudo lh_build"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:110
-msgid ""
-"Hint: If the configuration had changed you should leave \"--binary\" out. "
-"This will clean your chroot directory too."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:113
-msgid ""
-"Q: How do I use Fluxbox ? A: Add a new lists file with the fluxbox packages "
-"you want."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:115
-msgid "Create /home/$USERNAME/.dmrc file (default username is \"user\")."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:122
-msgid "$ cat .dmrc [Desktop] Session=fluxbox }code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:124
-msgid "Note: .dmrc is owned by $USERNAME:$USERNAME."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:126
-msgid ""
-"See also http://wiki.debian.org/Fluxbox/ A short HOWTO can be found at "
-"http://wiki.debian.org/MichaelAblassmeier/CustomLiveCD"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:129
-msgid ""
-"Q: How do I use custom repositories? A: See http://wiki.debian.org/"
-"DebianLive/Configuration"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:132
-msgid ""
-"Q: How do I customize the artwork for the live CD (grub or syslinux boot "
-"splash, usplash, etc.)? A: See http://wiki.debian.org/DebianLive/Howto/"
-"Custom_Artwork"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:135
-msgid ""
-"Q: How do I customize desktop environment (KDE, GNOME, XFCE, etc...) look? "
-"A: Start the live system in qemu:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:139
-msgid "$ qemu -m 256 -cdrom binary.iso -boot d -redir tcp:4222:10.0.2.15:22"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:143
-msgid "Note: the -redir argument must be changed to meet your needs"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:146
-msgid ""
-"Q: How do I execute a custom shell script inside the chroot system after the "
-"chroot stage? A: Add your script in config/chroot_local-hooks."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:149
-msgid ""
-"Q: How do I add a script running immediately after all other scripts when "
-"the live system boots? A: Add your script in config/chroot_local-includes/"
-"usr/share/initramfs-tools/scripts/live-bottom/99scrip"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:153
-msgid ""
-"$ chmod +x config/chroot_local-includes/usr/share/initramfs-tools/scripts/"
-"live-bottom/99script"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:157
-msgid ""
-"Note: The hook script must be executable. Do not forget to lh_clean --chroot "
-"after making this change before you build again."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:159
-msgid ""
-"You must also use the example script /usr/share/live-helper/examples/hooks/"
-"update-initramfs.sh to ensure your script gets built into the initramfs "
-"(read the comment header for instructions)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:163
-msgid ""
-"Q: How do I add software not in Debian ? A: See Customizing package "
-"installation % FIXME: <xref linkend=\"packages\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:166
-msgid ""
-"Q: What is the manifest with Ubuntu used for? A: Manifest is just the "
-"package list, which ubuntu does $something with. Don't worry about it."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:169
-msgid ""
-"Q: What is this {p} syntax with mtools{p} and parted{p}? A: That's aptitude."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:172
-msgid ""
-"Q: Do I need to write the image on USB stick to test it? A: you must use "
-"qemu >= 0.8."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:175
-msgid "Q: What is /cow? A: Copy-on-write, the 'diff' from unionfs."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:178
-msgid ""
-"Q: Is /usr/share/live-helper/lists/standard-x11 like preseed or is preseed "
-"something else entirely? A: It is not. It is a package list, not a debconf "
-"preseeding."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:181
-msgid ""
-"Q: What is the difference between standard and minimal? A: standard: "
-"packages of priority standard and higher; minimal: packages of priority "
-"essential and higher;"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:184
-msgid ""
-"Q: What can the sections be used for? Aren't they BIG? A: Someone maybe "
-"wants to include packages from contrib or non-free."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:187
-msgid "Q: memtest86+ ... is that used? A: Yes"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:190
-msgid ""
-"Q: How do I build using predefined packages lists? A: e.g. to build using "
-"standard-x11 packages list: #{$ sudo lh_config -p standard-x11 && sudo "
-"lh_build}# Note: The packages lists can be found in /usr/share/live-helper/"
-"lists/ directory."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:193
-msgid ""
-"Q: How do I rebuild without downloading all the packages again? A: All "
-"packages are cached in cache subdirectory. They remain until a clean purge: #"
-"{$ sudo lh_clean --purge}# You do not have to do anything to prevent "
-"packages from being re-downloaded. You need to remember to clean whichever "
-"stages you want to rebuild first. e.g. to rebuild from the cached bootstrap, "
-"chroot packages and build a new image. #{$ sudo lh_clean && sudo lh_build}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:196
-msgid ""
-"Q: How do I boot USB debian-live on systems not supporting USB boot? A: Make "
-"a boot CD with grub, configured to boot from a debian-live kernel copied on "
-"the cd structure #{$ mkdir -p iso/boot/grub && cp /usr/lib/grub/i386-pc/"
-"stage2_eltorito iso/boot/grub && cp chroot/boot/* iso/boot/}# Create iso/"
-"boot/grub/menu.lst:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:205
-msgid ""
-"default 0 timeout 5 color cyan/blue white/blue title Debian Live root (cd)  "
-"kernel /boot/vmlinuz boot=live initrd /boot/initrd.img"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:209
-msgid ""
-"Create the iso image #{$ mkisofs -R -b boot/grub/stage2_eltorito -no-emul-"
-"boot \\ -boot-load-size 4 -boot-info-table -o grub.iso iso}# Burn the image."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:212
-msgid ""
-"Q: How do I boot debian-live on systems not supporting CDROM or USB boot? A: "
-"If you have a floppy drive, you may be able to use it, otherwise you will "
-"need to use loadlin/grub4dos/win32-loader. If you have a second system to "
-"serve up the image over the network, See http://wiki.debian.org/DebianLive/"
-"Howto/Creating_a_Netboot_Image"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:215
-msgid ""
-"Q: The X configuration does not seems to work, the resolution is too low. "
-"What can I do? A: Use xdebconfigurator #{$ lh_config --bootappend xdebconf "
-"&& lh_config --packages xdebconfigurator}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:218
-msgid ""
-"Q: Apache has problems with static files A: Sendfile does not work well on "
-"the unionfs used by Debian Live. Add the following to apache's "
-"configuration: #{EnableSendfile off}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:222
-msgid ""
-"Q: How do I make hard disk partitions auto-mountable? A: Short answer: Right "
-"now the best is to use a script that will populate the fstab when the CD is "
-"booting. Such a script can be found at https://devel.goto10.org/svn/puredyne/"
-"trunk/broth/stock/chroot_local-includes/sbin/diskmounter.sh. A proper "
-"solution based on HAL will be described here in a hopefully near future.  A: "
-"Long Answer: Since 55_nonpolkit-mount-policy.patch in HAL, debian-storage-"
-"policy-fixed-drives.fdi is not available anymore and the previous trick that "
-"consisted to remove this file to enable automounting of fixed drives as a "
-"consequence is obsolete. Eventually, it will be possible to combine HAL and "
-"PolicyKit to enable different permissions and actions to achieve advanced "
-"(auto)mounting for non-root users. Until then, because the live scripts are "
-"only touching to the fstab to add a swap partition if discovered at boot "
-"time, the only way to have fixed drives mounted automatically is to use a "
-"script that will populate the fstab file at the end of the multiuser "
-"runlevel. To achieve this, you can do, for example, the following: download "
-"the https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-"
-"includes/sbin/diskmounter.sh script Create the chroot_local-includes/sbin "
-"directory, and move the script inside Make sure the script is executable "
-"(chmod +x diskmounter.sh) create the chroot_local-includes/etc/rc.local file "
-"and call the diskmounter from there (see this https://devel.goto10.org/svn/"
-"puredyne/trunk/broth/stock/chroot_local-includes/etc/rc.local When called "
-"correctly, the script detects ext2, ext3, reiserfs, xfs, FAT32, HFS+ and "
-"NTFS partitions and mount them read-write, except for NTFS. This will change "
-"soon and an option will be available to use ntfs-3g to mount NTFS as read-"
-"write. comments, patches and other things about this script and issue: "
-"http://code.goto10.org/projects/puredyne/ticket/463"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:225
-msgid ""
-"Q: Boot fails with panic: can't open /scripts/live A: Add latest live-"
-"initramfs deb package into config/chroot_local-packages directory and "
-"rebuild."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:229
-msgid ""
-"Q: How do I configure the locale and the keyboard? A: See 10n % FIXME: <xref "
-"linkend=\"internalization\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:234
-msgid ""
-"Q: How do I get past boot prompt without a working keyboard? A: See "
-"Customizing the bootup process % FIXME: <xref linkend=\"bootup\"/> Note: "
-"Boot from an USB-HDD on an iMac with GRUB did not work."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:237
-msgid ""
-"Q: Can I serve the root image from a web or ftp server? A: Since live-"
-"initramfs 1.99, it should be possible to use the fetch= argument on the "
-"kernel command line. You can build a netboot image as usual, and when you "
-"are done edit the tftpboot/pxelinux.cfg/default file. Remove the references "
-"to network boot (netboot, nfsroot, nfsopts), and replace with fetch= <url "
-"where you placed the root image>. You have to include wget in the chroot. It "
-"could work for other boot methods as well. However, I am not sure the live "
-"scripts configure the network when booting from a CD or USB disk. #{$ "
-"lh_config --packages wget}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:240
-msgid ""
-"Q: Why doesn't quickreboot (or some other boot parameter) work? A: If you "
-"are building an etch image (which was the default up to 2007/09/14) you have "
-"a very old version of casper which does not support quickreboot and possibly "
-"other boot parameters as well. You could configure your sources to use live-"
-"backports (see /usr/share/live-helper/examples/sources/live-backports) and "
-"switch to live-initramfs, or better yet, build a lenny image instead, which "
-"is the new default. #{$ lh_config --distribution lenny $ lh_config --"
-"initramfs live-initramfs}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:243
-msgid ""
-"Q: How do I fix \"Could not find kernel image\" issue with syslinux "
-"bootloader? A: Add a binary local hook script to fix kernel and initrd path "
-"each time you build an image. e.g. config/binary_local-hooks/01-fix_syslinux."
-"sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:249
-msgid "SYSLINUXCFG=`find binary -type f -name syslinux.cfg`"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:252
-msgid ""
-"sed -i \"s|kernel /vmlinuz|kernel vmlinuz|g\" ${SYSLINUXCFG} sed -i \"s|"
-"initrd=/initrd|initrd=initrd|g\" ${SYSLINUXCFG}"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:254
-msgid "$ chmod +x config/binary_local-hooks/01-fix_syslinux.sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:259
-msgid ""
-"Q: How do I use a newer kernel with lenny? A: A build with backports.org "
-"kernels will fail as that repository lacks the necessary module packages "
-"(linux-modules-extra-2.6, aufs, etc.). Use the kernel backports http://"
-"unsupported.debian-maintainers.org/backports-kernel/ The quick way to "
-"success:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:268
-msgid ""
-"$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6 squashfs-"
-"modules-2.6' $ echo 'deb http://unsupported.debian-maintainers.org/backports-"
-"kernel/ ./' > config/chroot_sources/backports-kernel.chroot $ echo 'deb "
-"http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/"
-"chroot_sources/backports-kernel.binary $ wget http://unsupported.debian-"
-"maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/"
-"backports-kernel.chroot.gpg $ wget http://unsupported.debian-maintainers.org/"
-"backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel."
-"binary.gpg $ lh_build }code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:271
-msgid ""
-"Q: How do I use a custom kernel? Is there a nice way of booting debian-live "
-"with a custom kernel (not in an apt repo)? A: Copy it into config/"
-"chroot_local-packages and set LH_LINUX_PACKAGES=\"none\" or use lh config --"
-"linux-packages \" \" Don't forget to compile your kernel with an union "
-"filesystem (unionfs or aufs), squashfs modules, and initrd support. I can "
-"cause the kernel to be installed but it seems this happens later than grub/"
-"syslinux is configured so it's not listed and casper/ and the menu require "
-"munging. You need to follow the debian scheme, e.g. placing the files in /"
-"boot as vmlinuz-$version and initrd.img-$version etc. I personally wouldn't "
-"go that way which is too much of a hassle, and just use make-kpkg to produce "
-"custom kernel deb packages. They should integrate nicely if you just put "
-"them into config/chroot_local-packages and set LH_LINUX_PACKAGES=\"\". Hint: "
-"to work around an error, which lh_binary_syslinux will throw on custom "
-"kernels if there is not an 468/686 in the kernel-name, you need to set "
-"CONFIG_LOCALVERSION=\"-486\" or \"-686\" within the kernel configuration (-"
-"&gt; General setup -&gt; Local version set to -486 or -686) corresponding to "
-"LH_LINUX_FLAVOURS=\"\" or \"686\". this at least up till live-helper version "
-"1.0~a40-1 see http://lists.alioth.debian.org/pipermail/debian-live-"
-"devel/2007-July/001947.html and http://lists.alioth.debian.org/pipermail/"
-"debian-live-devel/2007-November/002581.html"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:274
-msgid ""
-"Q: How do I create a cross arch live CD image? A: In short: You can't. Read "
-"on: The procedure to create a live CD is based on creating a chroot that "
-"contains the files that will be finally available on the live CD. The live "
-"CD building procedure includes chrooting into the chroot dir and so some "
-"operations. chrooting means that the terminal you chroot on will behave as a "
-"different system so your real system and the chroot environment is decoupled "
-"somehow. Once the live CD scripts chroots into the chroot dir they have some "
-"operations to do inside that environment and your real system won't be able "
-"to run them unless you are using the same architecture. So you only are able "
-"to make live CD for the arch you run on. But this doesn't prevent you run "
-"qemu or some other machine emulator that make this possible."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:277
-msgid ""
-"Q: When is a lh_clean necessary? lh_clean is a script in /usr/bin/ A: That "
-"depends what you've changed between builds If, for example, you've built an "
-"iso image and you want a usb image, you only need to run #{lh_clean --binary}"
-"# before you run lh_build again. If you've changed anything in the chroot, "
-"you'll need to cleanup both chroot and binary with #{lh_clean}# before "
-"continuing"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:280
-msgid ""
-"Q: How can i set boot= parameters? A: Set LH_BOOTAPPEND_LIVE in config/binary"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:283
-msgid ""
-"Q: How do I include different modules to load when the live system boots? A: "
-"Configure config/chroot_local-includes/etc/initramfs-tools/"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:285
-msgid ""
-"The lh_chroot_hacks helper rebuilds the live/initrd1.img using the default "
-"initramfs.conf \"MODULES = most\". You may override that by supplying your "
-"own initramfs.conf, or else just add your own modules, e.g."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:290
-msgid ""
-"mkdir -p config/chroot_local-includes/etc/initramfs-tools/ echo \"atl2\" >> "
-"config/chroot_local-includes/etc/initramfs-tools/modules"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:294
-msgid ""
-"Note: Even though initramfs.conf(5) says \"most adds all the framebuffer, "
-"acpi, file system, ide, sata, scsi and usb drivers\", it actually includes "
-"network drivers as well. See auto_add_modules() in /usr/share/initramfs-"
-"tools/hook-functions for the complete list."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:297
-msgid ""
-"Q: Can I have a splash screen? A: Yes you can. You will not know what is "
-"going on when the splash screen is active, it may fail to activate on some "
-"hardware or break X on other (both usplash and splashy use libdirectfb which "
-"does some evil voodoo and may break you graphics or input until you reboot). "
-"However, you can install and activate it just as you would on any other "
-"Debian system. To use splashy: 1. install splashy and read the README, the "
-"manpages are useless for setting it up. Add some parameters to your kernel "
-"command line, such as in your pxelinux configuration or in "
-"LH_BOOTAPPEND_LIVE in config/binary in debian-live configuration: #{vga=792 "
-"splash quiet}# #{vga}# to select video mode, #{splash}# to activate splashy, "
-"#{quiet}# to suppress most kernel messages that you cannot see anyway but "
-"would scroll past before splashy manages to paint the graphics on your "
-"screen. You might want to add splashy to the list of packages installed in "
-"your image: #{echo splashy > config/chroot_local-packageslists/splashy echo "
-"splashy-themes >> config/chroot_local-packageslists/splashy}# and select a "
-"theme:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:305
-msgid ""
-"echo '#!/bin/sh' > config/chroot_local-hooks/splashy echo splashy_config -s "
-"debian-moreblue '||' true >> config/chroot_local-hooks/splashy # update the "
-"ramdisk to include the splash screen echo update-initramfs -u -k all >> "
-"config/chroot_local-hooks/splashy chmod 755 config/chroot_local-hooks/splashy"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:309
-msgid ""
-"After you rebuild your live system you should observe a bluish splash screen "
-"while booting. Nothing happens while initramfs is running because there is "
-"no splashy support in initramfs-tools. Once the init starts the progress bar "
-"should start to fill. If #{vga=something}# sets a mode that your screen "
-"cannot show or your card cannot do vesa 2.0 (and thus you get plain text "
-"mode and no splashy) read the splashy faq."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:312
-msgid ""
-"Q: Howto use my Broadcom eXtrem 2 network card (module bnx2)? A: Add the "
-"firmwares to the initrd image. You need to install the non-free package "
-"\"firmware-bnx2\". Uncompress your initrd image, then copy files:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:317
-msgid ""
-"cp /lib/firmware/bnx2x-e1-4.8.53.0.fw /lib/firmware/bnx2x-e1-5.0.21.0.fw /"
-"lib/firmware/bnx2x-e1h-4.8.53.0.fw /lib/firmware/bnx2x-e1h-5.0.21.0.fw "
-"${INITRD}/lib/firmware/ cp /lib/udev/firmware.agent ${INITRD}/lib/udev/"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:321
-msgid "Recompress your initrd image and boot: it works!"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:323
-msgid ""
-"Q: X is broken (the system boots, messages scroll by, and then the screen "
-"goes blank). What do I do? A: On my system starting X completely disables "
-"graphics so that I do not see anything even after X bails out and I am back "
-"to the console. To prevent this you can change the driver Xorg uses."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:325
-msgid ""
-"If you have a working splash screen or at least graphical console you can "
-"use #{live xdriver=fbdev}# when booting the live system (instead of just "
-"enter). Another driver you might want to try is #{vesa}#. If all fails you "
-"might try to set xdriver to some wrong value so that Xorg fails to start and "
-"you can examine the system while you still see something on the console. #"
-"{live xdriver=none}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:328
-msgid ""
-"Q: How can I get Debian first stable versions? A: I'm developing software "
-"and testing it on Live-CD. Thanks for the LiveCD project. To be sure my "
-"development is fully compatible with the \"etch\" version, I need the same "
-"scenario when Debian GNU/Linux 4.0 was published as stable (I believe "
-"2007.04.08). If there was some bug on 2007.04.08 that was corrected one week "
-"later, I need to test software foreseeing that scenario without the bug "
-"solved."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:331
-msgid ""
-"Q: I get \"fopen: Permission denied\"-warnings from apt on building/at the "
-"live-system A: That's a harmless bug in apt. However, if you want to get off "
-"this warnings in the live-system, add a file in chroot_local-hooks with "
-"follow row:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:335
-msgid "chown -R man.man /var/cache/man"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:340
-msgid ""
-"Q: Why I always fail during \"Retrieving Packages\" stage when running "
-"lh_build? I have already set apt-http-proxy and so on.  A: lh_build "
-"retrieves packages via wget, as a result you need to enable the proxy "
-"settings in /etc/wgetrc before running lh_build."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:343
-msgid ""
-"Q: How do I edit Xorg.conf? A: Xorg.conf is generated every time system "
-"boots, so it's useless to put modifed Xorg.conf in config/choort_local-"
-"includes/etc/X11, because it will be overwritten during boot. However, you "
-"can edit /usr/bin/dexconf, which generate xorg.conf during boot, so the "
-"result will be modified Xorg.conf. The modified dexconf has to be put in "
-"config/choort_local-includes/usr/bin. e.g.: you can configure Xorg.conf for "
-"two or more keyboards layouts with alt+shift toggle by editing dexconf and "
-"replacing the line:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:347
-msgid "Option \"XkbLayout\" \"$XKB_LAYOUT\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:351
-msgid "with the lines:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:356
-msgid ""
-"Option \"XkbLayout\" \"us,il\" Option \"XkbOptions\" \"grp:alt_shift_toggle,"
-"grp_led:scroll\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:360
-msgid "when \"us,il\" are the wanted keyboard layouts."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:362
-msgid ""
-"You can force default screen resulotion (e.g. 1024*768) by adding the lines:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:368
-#, no-wrap
-msgid ""
-"SubSection \"Display\"\n"
-"        Modes \"1024x768\"\n"
-"EndSubSection\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:372
-msgid "between the lines:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:379
-#, no-wrap
-msgid ""
-"Section \"Screen\"\n"
-"        Identifier \"Default Screen\"\n"
-"        Monitor \"Configured Monitor\"\n"
-"EndSection\"\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:383
-msgid ""
-"Q: Where are the build parameters for the prebuilt images A: See http://live."
-"debian.net/README.images."
-msgstr ""
diff --git a/manual/po/fr/other_howtos.ssi.po b/manual/po/fr/other_howtos.ssi.po
deleted file mode 100644
index 55bb9ab..0000000
--- a/manual/po/fr/other_howtos.ssi.po
+++ /dev/null
@@ -1,379 +0,0 @@
-# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 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:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
-msgid "code{"
-msgstr "code{"
-
-#. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 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: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:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
-msgid "}code"
-msgstr "}code"
-
-#. type: Plain text
-#: en/other_howtos.ssi:2
-msgid "B~ Howtos"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:4
-msgid "1~ Howtos"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:6
-msgid "2~ ISO"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:8
-msgid ""
-"Generating a Debian Live CD is very simple. You need to have live-helper "
-"(package available in Debian sid and lenny), and Debootstrap (or "
-"cdebootstrap) from etch or newer."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:10
-msgid "3~ Install live-helper"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:12
-msgid "#{apt-get install live-helper}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:14
-msgid "3~ Configure the current working directory with lh_config"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:18
-msgid "lh_config -b iso -a $ARCH"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:22
-msgid "where #{$ARCH}# is the intended architecture (i.e. - i386 or amd64)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:24
-msgid "#{-b}# flag is used to be sure to obtain image in ISO format."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:26
-msgid "3~ Build the image with lh_build:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:28
-msgid "Execute lh_build as root: #{lh_build}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:30
-msgid ""
-"The command above will create the basic image, containing just the Debian "
-"standard system (with no X at all)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:32
-msgid ""
-"If you want to have any of the Desktop environments on your livecd, #{ls /"
-"usr/share/live-helper/lists}# will show a number of available package Lists "
-"to choose from, e.g. #{lh_config -p gnome-desktop}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:34
-msgid "More examples are listed at DebianLive/Examples."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:37
-msgid ""
-"See packages for help configuring a local Debian Mirror and other aspects of "
-"the live system.  % FIXME: <xref linkend=\"packages\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:39
-msgid "3~ Test the image"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:41
-msgid "If you have qemu installed, you can boot the image with:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:45
-msgid "qemu -cdrom binary.iso"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:49
-msgid "If you have also kqemu installed, you can add #{-kernel-kqemu}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:51
-msgid "2~ ISO_(multiarch)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:53
-msgid ""
-"Multiple machine boot CDs can be created with the following manual "
-"procedure. This procedure has been successfully used to create a single CD "
-"which is bootable on alpha, i386, pmax, and sparc. It should be possible to "
-"also make the CD bootable on macppc, vax and on sun2, sun3 and sun3x."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:55
-msgid ""
-"To create a CD which is bootable by multiple architectures, use the "
-"following steps in this order. Please note that the order is critical."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:57
-msgid ""
-"Make sure you have all the required files including the various kernels and "
-"boot programs listed in the individual machine sections."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:59
-msgid ""
-"Include a directory somewhere in the cdsources directory called mdec.pmax "
-"and include the pmax bootxx_cd9660 file there. For example, /cdsources/usr/"
-"mdec.pmax/bootxx_cd9660."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:61
-msgid ""
-"Include a directory somewhere in the cdsources directory called mdec.vax and "
-"include the vax xxboot file there. For example, #{cdsources/usr/mdec.vax/"
-"xxboot.}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:63
-msgid "Include the macppc ofwboot.xcf bootloader in /cdsources."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:65
-msgid ""
-"Create an i386 bootable image. #{sh mkisofs -v -v -o output.iso -b i386/"
-"installation/floppy/boot-big.fs \\ -c boot.catalog -l -J -r -L /cdsources "
-"2>&1 | tee /tmp/mkisofs.log exit}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:67
-msgid ""
-"Note: The appearance of the -v flag twice is required. If you are making a "
-"bootable CD for an Open Firmware 3 macppc model, make sure to include -hfs -"
-"part in the parameters for mkisofs."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:69
-msgid ""
-"Run mksunbootcd on a NetBSD/sparc machine to install sparc and sun2/sun3 "
-"bootblocks. Alternatively, install the sysutils/mksunbootcd package on your "
-"favorite NetBSD machine. #{mksunbootcd output.iso boot-sun4.fs boot-sun4c.fs "
-"boot-sun4m.fs boot-sun3.fs}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:71
-msgid ""
-"Run the installboot(8) program targeted for NetBSD/pmax to install the pmax "
-"bootblocks. Note that in order to coexist with other NetBSD boot blocks, the "
-"pmax boot block is appended to the end of the ISO file system."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:73
-msgid ""
-"#{installboot -m pmax -v -o append,sunsum output.iso /tmp/mdec.pmax/"
-"bootxx_cd9660}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:75
-msgid ""
-"The -o append,sunsum option appends the first stage boot block to the end of "
-"the ISO file system, and restores the checksum used when booting on a sun."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:77
-msgid ""
-"Run the installboot(8) program targeted for NetBSD/vax to install the vax "
-"bootblocks. Note that in order to coexist with other NetBSD boot blocks, the "
-"vax boot block is appended to the end of the ISO file system."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:79
-msgid "installboot -m vax -v -o append,sunsum output.iso /tmp/mdec.vax/xxboot"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:81
-msgid "(See the pmax entry above for an explanation of the flags)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:83
-msgid ""
-"Run the installboot(8) program targeted for NetBSD/alpha to install the "
-"alpha bootblocks."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:85
-msgid ""
-"#{installboot -m alpha -v -o append,sunsum output.iso /tmp/mdec.alpha/"
-"bootxx_cd9660}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:86
-msgid ""
-"Note: The alpha installboot must occur after the others, because currently "
-"it's the only machine dependent back-end for installboot(8) that can "
-"calculate the alpha checksum. (See the pmax entry above for an explanation "
-"of the flags)."
-msgstr ""
diff --git a/manual/po/fr/other_use-cases.ssi.po b/manual/po/fr/other_use-cases.ssi.po
deleted file mode 100644
index 7fb1186..0000000
--- a/manual/po/fr/other_use-cases.ssi.po
+++ /dev/null
@@ -1,379 +0,0 @@
-# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 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:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
-msgid "code{"
-msgstr "code{"
-
-#. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 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: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:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
-msgid "}code"
-msgstr "}code"
-
-#. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/other_use-cases.ssi:26
-#: en/other_use-cases.ssi:77
-msgid "#!/bin/sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:2
-msgid "B~ Use Cases"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:4
-msgid "1~ Use Cases"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:6
-msgid "This chapter is for users to document their use cases with Debian Live."
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:8
-msgid "2~ VNC Kiosk Client"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:10
-msgid "Create an image with live-helper to boot directly to a VNC server."
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:12
-msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:14
-msgid "_* Move to the build directory: #{$ cd vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:16
-msgid ""
-"Example to config the build directory to include gdm metacity "
-"xtightvncviewer: #{$ lh config --packages \"gdm metacity xtightvncviewer\"}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:18
-msgid ""
-"Create a folder /etc/skel folder for a custom .xsession for the default "
-"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:20
-msgid ""
-"Create the .xsession for the default user: #{$ touch config/chroot_local-"
-"includes/etc/skel/.xsession}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:22
-msgid ""
-"Edit the .xsession file to launch metacity and start xvncviewer with "
-"something similar to the below:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:29
-msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:31
-msgid "exit"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:35
-msgid "_* Build the image: #{# lh build}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:37 en/other_use-cases.ssi:138
-msgid "_* Enjoy."
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:39
-msgid "2~ VMWare-Player Sessions"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:41
-msgid ""
-"Create an image with live-helper to boot directly to a specifiv VMWare "
-"session."
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:43
-msgid "_* Make a build directory: #{$ mkdir VMWare-Player}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:45
-msgid "_* Move to the build directory: #{$ cd VMWare-Player}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:47
-msgid ""
-"_* Example to config the build directory to include gdm metacity "
-"xtightvncviewer:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:67
-#, no-wrap
-msgid ""
-"$ lh config --apt apt \\\n"
-"        ---apt-recommends disabled \\\n"
-"        --archive-areas \"main\" \\\n"
-"        --binary-images iso \\\n"
-"        --binary-indices none \\\n"
-"        --syslinux-menu vesamenu \\\n"
-"        ---bootappend-live \"persistent quickreboot\" \\\n"
-"        ---bootappend-install \"-- plainroot persistent video=vesa:ywrap,mtrr vga=788 quickreboot quiet live-config\" \\\n"
-"        ---debian-installer live \\\n"
-"        ---distribution lenny \\\n"
-"        ---hostname vmare-player-firmware \\\n"
-"        ---includes none \\\n"
-"        ---linux-flavours 686 \\\n"
-"        ---packages-lists \"gnome-core\" \\\n"
-"        ---packages \"gcc gparted linux-headers-2.6-\\${LH_LINUX_FLAVOURS} live-config-staging make metacity rsync wireless-tools\" \\\n"
-"        ---repositories live.debian.net \\\n"
-"        ---win32-loader disabled\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:71
-msgid ""
-"_* Create the 01-vmware-player hook: #{$ touch config/chroot_local-hooks/01-"
-"vmware-player.sh}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:73
-msgid ""
-"Edit the 01-vmware-player hook to launch the VMWare-Player. The hook should "
-"look something like the below:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:80
-msgid ""
-"_URL=\"http://archive.debian-maintainers.org/vmware/other/vmware-player/\" "
-"_VMPLAYER_VERSION=\"VMware-Player.i386.bundle\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:83
-msgid "echo \"I: Starting script for install of VMWare Player.\" cd /root"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:86
-msgid ""
-"echo \"I: Beginning download of ${_VMPLAYER_VERSION} from ${_URL} .\" wget "
-"${_URL}${_VMPLAYER_VERSION}"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:89
-msgid ""
-"echo \"I: Starting install of VMWare Player.\" sh /root/${_VMPLAYER_VERSION}"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:92
-msgid ""
-"echo \"I: Cleaning up the VMWare Player download.\" rm /root/"
-"${_VMPLAYER_VERSION}"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:95
-msgid "#echo \"I: Starting interactive shell.\" #bash"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:99
-msgid ""
-"_* Build the image (note that during the build the VMWare-Player will prompt "
-"you to install or cancel): #{#lh build}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:101
-msgid ""
-"_* After the build you will have an image you can boot live or install as "
-"firmware. The package live-config-staging is the package that installs the "
-"ability to utilize the VMWare-Player by calling live-config.vmware-player as "
-"a boot parameter in the following form:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:105
-msgid "live-config.vmware-player=ACTION:IMAGEPATH:VMXNAME"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:109
-msgid "Notes from the 900-vmware-player file are as follows:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:135
-#, no-wrap
-msgid ""
-"# The script tests for boot parameter of\n"
-"# live-config.vmware-player=ACTION:IMAGEPATH:VMXNAME\n"
-"#\n"
-"# ACTION: The operation to perform on the workstation (none|scratch)\n"
-"# IMAGEPATH: The folder path to the VMware image you want to run.\n"
-"# VMXNAME: The name of the VMware image you want to run.\n"
-"#\n"
-"# Notes:To use this file with WMWare images you will need to have a few things\n"
-"# setup:\n"
-"#\n"
-"# 1. The VMware Player needs to be installed in the image.\n"
-"# 2. This script uses (s|h)da1 for writing image data, and is used as a scratch\n"
-"#    space. This scratch space should be a file system with linux permissions\n"
-"#    such as ext2.\n"
-"# 3. VMware image(s) should be in a mounted folder and setup as follows:\n"
-"#    - Image(s) set to snapshot mode.\n"
-"#    - For each image, the image folder needs to have a file called\n"
-"#      image-release with a variable CRELEASE. An example: CRELEASE=\"1.0.0\"\n"
-"#\n"
-"# The image-release file is used by the image maintainer and this script to tell\n"
-"# workstation(s) using a given image, to erase locally stored vmware image files\n"
-"# and setup with the newly configure image. The operation of erasing locally\n"
-"# stored vmare image files, is referred to as a scratch.\n"
-msgstr ""
diff --git a/manual/po/fr/project_bugs.ssi.po b/manual/po/fr/project_bugs.ssi.po
index 37e0672..38444ce 100644
--- a/manual/po/fr/project_bugs.ssi.po
+++ b/manual/po/fr/project_bugs.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-30 10:29+0100\n"
+"Project-Id-Version: live-manual 2.0.0\n"
+"POT-Creation-Date: 2010-12-23 07:37-0400\n"
 "PO-Revision-Date: 2010-10-25 23:27+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -20,65 +20,62 @@ 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_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/project_bugs.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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:24
+#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr "code{"
@@ -87,65 +84,62 @@ 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:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr "}code"
@@ -204,152 +198,165 @@ msgstr ""
 #. type: Plain text
 #: en/project_bugs.ssi:18
 msgid ""
-"Due to the nature of Debian *{testing}* and Debian *{unstable}* "
-"distributions being a moving target, building a live system may not always "
-"be possible."
+"Because Debian *{testing}* and Debian *{unstable}* distributions are a "
+"moving target, when you specify either as the target system distribution, a "
+"successful build may not always be possible."
 msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:20
-msgid ""
-"If this is a problem, do not build a system based on *{testing}* or *"
-"{unstable}*, but go with *{stable}*. live-build does always default to the "
-"current *{stable}* release."
+msgid "% FIXME:"
 msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:22
 msgid ""
-"Currently known issues are listed under the section 'status' on our homepage "
-"at http://live.debian.net/"
+"If this causes too much difficulty for you, do not build a system based on *"
+"{testing}* or *{unstable}*, but rather, use *{stable}*. live-build does "
+"always default to the *{stable}* release."
 msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:24
 msgid ""
-"It is out of the scope of this manual to train you in correctly identifying "
-"and fixing problems in packages of the development distributions, however, "
-"there are two things you can always try: When not succeeding to build *"
-"{testing}*, try if *{unstable}* works. If *{unstable}* does not work either, "
-"revert to *{testing}* and pinning the newer version of the failing package "
-"from *{unstable}*."
+"Currently known issues are listed under the section 'status' on our homepage "
+"at http://live.debian.net/."
 msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:26
-msgid "2~ Rebuild from scratch"
+msgid ""
+"It is out of the scope of this manual to train you to correctly identify and "
+"fix problems in packages of the development distributions, however, there "
+"are two things you can always try: If a build fails when the target "
+"distribution is *{testing}*, try *{unstable}*. If *{unstable}* does not work "
+"either, revert to *{testing}* and pin the newer version of the failing "
+"package from *{unstable}* (see {APT pinning}#apt-pinning for details)."
 msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:28
+msgid "2~ Rebuild from scratch"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:30
 msgid ""
-"To ensure that a particular bug is not caused by an unclean built system, "
+"To ensure that a particular bug is not caused by an uncleanly built system, "
 "please always rebuild the whole live system from scratch to see if the bug "
 "is reproducible."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:30
+#: en/project_bugs.ssi:32
 msgid "2~ Use up-to-date packages"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:32
+#: en/project_bugs.ssi:34
 msgid ""
 "Using outdated packages can cause significant problems when trying to "
-"reproduce (and ultimately fix) your problem."
+"reproduce (and ultimately fix) your problem. Make sure your build system is "
+"up-to-date and any packages included in your image are up-to-date as well."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:34
+#: en/project_bugs.ssi:36
 msgid "2~collect-information Collect information"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:36
+#: en/project_bugs.ssi:38
 msgid ""
-"Please provide enough information with your report. At a minimum, it should "
-"contain the exact version of live-build version where the bug is "
-"encountered, and steps to reproduce it. Please use common sense and include "
-"other relevant information if you think that it might help in solving the "
-"problem."
+"Please provide enough information with your report. At least include the "
+"exact version of live-build version where the bug is encountered and steps "
+"to reproduce it. Please use common sense and include other relevant "
+"information if you think that it might help in solving the problem."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:38
+#: en/project_bugs.ssi:40
 msgid ""
 "To make the most out of your bug report, we require at least the following "
 "information:"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:40
+#: en/project_bugs.ssi:42
 msgid "_* Architecture of the host system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:42
+#: en/project_bugs.ssi:44
 msgid "_* Version of live-build on the host system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:44
+#: en/project_bugs.ssi:46
 msgid "_* Version of live-boot on the live system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:46
+#: en/project_bugs.ssi:48
 msgid "_* Version of live-config on the live system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:48
-msgid "_* Version of debootstrap and/or cdebootstrap on the host system"
+#: en/project_bugs.ssi:50
+msgid ""
+"_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:50
+#: en/project_bugs.ssi:52
 msgid "_* Architecture of the live system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:52
+#: en/project_bugs.ssi:54
 msgid "_* Distribution of the live system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:54
+#: en/project_bugs.ssi:56
 msgid "_* Version of the kernel on the live system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:56
-msgid "You can generate a log of the build process by using the tee command:"
+#: en/project_bugs.ssi:58
+msgid ""
+"You can generate a log of the build process by using the #{tee}# command. We "
+"recommend doing this automatically with an #{auto/build}# script; see "
+"{Managing a configuration}#managing-a-configuration for details)."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:60
-msgid "lb build 2>&1 | tee build.log"
+#: en/project_bugs.ssi:62
+#, no-wrap
+msgid " # lb build 2>&1 | tee build.log\n"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:64
+#: en/project_bugs.ssi:66
 msgid ""
-"For runtime log, live-boot stores a log in /var/log/live.log (or /var/log/"
-"live-boot.log)."
+"At boot time, live-boot stores a log in #{/var/log/live.log}# (or #{/var/log/"
+"live-boot.log}#)."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:66
+#: en/project_bugs.ssi:68
 msgid ""
 "Additionally, to rule out other errors, it is always a good idea to tar up "
-"your config directory and upload it somewhere (do *{not}* send it as an "
-"attachment to the mailinglist), so that we can try to reproduce the errors "
-"you encountered."
+"your #{config/}# directory and upload it somewhere (do *{not}* send it as an "
+"attachment to the mailing list), so that we can try to reproduce the errors "
+"you encountered. If this is difficult (e.g. due to size) you can use the "
+"output of #{lb config --dump}# which produces a summary of your config tree "
+"(i.e. lists files in subdirectories of #{config/}# but does not include "
+"them)."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:68
+#: en/project_bugs.ssi:70
 msgid ""
 "Remember to send in any logs that were produced with English locale "
 "settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or #"
@@ -357,22 +364,41 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:70
+#: en/project_bugs.ssi:72
+msgid "2~ Isolate the failing case if possible"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:74
+msgid ""
+"If possible, isolate the failing case to the smallest possible change that "
+"breaks. It is not always easy to do this, so if you can't manage it for your "
+"report, don't worry. However, if you plan your development cycle well, using "
+"small enough change sets per iteration, you may be able to isolate the "
+"problem by constructing a simpler 'base' configuration that closely matches "
+"your actual configuration plus just the broken change set added to it. If "
+"you have a hard time sorting out which of your changes broke, it may be that "
+"you are including too much in each change set and should develop in smaller "
+"increments."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:76
 msgid "2~ Use the correct package to report the bug against"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:72
+#: en/project_bugs.ssi:78
 msgid "Where does the bug appear?"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:74
+#: en/project_bugs.ssi:80
 msgid "3~ At build time whilst bootstrapping"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:76
+#: en/project_bugs.ssi:82
 msgid ""
 "live-build first bootstraps a basic Debian system with #{debootstrap}# or #"
 "{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
@@ -382,7 +408,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:78
+#: en/project_bugs.ssi:84
 msgid ""
 "In both cases, this is not a bug in Debian Live, but rather in Debian itself "
 "which we can not fix this directly. Please report such a bug against the "
@@ -390,12 +416,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:80
+#: en/project_bugs.ssi:86
 msgid "3~ At build time whilst installing packages"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:82
+#: en/project_bugs.ssi:88
 msgid ""
 "live-build installs additional packages from the Debian archive and "
 "depending on the Debian distribution used and the daily archive state, it "
@@ -404,16 +430,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:84
+#: en/project_bugs.ssi:90
 msgid ""
 "If this is the case, this is not a bug in Debian Live, but rather in Debian "
-"- please report it against the failing package. Running debootstrap "
-"seperately from the Live system build or running lb bootstrap with #{--debug}"
-"# will give you more information."
+"- please report it against the failing package. Running #{debootstrap}# "
+"separately from the Live system build or running #{lb bootstrap --debug}# "
+"will give you more information."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:86
+#: en/project_bugs.ssi:92
 msgid ""
 "Also, if you are using a local mirror and/or any of sort of proxy and you "
 "are experiencing a problem, please always reproduce it first by "
@@ -421,40 +447,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:88
+#: en/project_bugs.ssi:94
 msgid "3~ At boot time"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:90
+#: en/project_bugs.ssi:96
 msgid ""
 "If your image does not boot, please report it to the mailing list together "
 "with the information requested in {Collect information}#collect-information. "
-"Do not forget to mention, how/when the image failed, in Qemu, VMWare or real "
-"hardware. If you are using a virtualization technology of any kind, please "
-"always run it on real hardware before reporting a bug. Providing a "
-"screenshot of the failure is also very helpful."
+"Do not forget to mention, how/when the image failed, in Qemu, Virtualbox, "
+"VMWare or real hardware. If you are using a virtualization technology of any "
+"kind, please always run it on real hardware before reporting a bug. "
+"Providing a screenshot of the failure is also very helpful."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:92
+#: en/project_bugs.ssi:98
 msgid "3~ At run time"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:94
+#: en/project_bugs.ssi:100
 msgid ""
 "If a package was successfully installed, but fails while actually running "
 "the Live system, this is probably a bug in Debian Live. However,"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:96
+#: en/project_bugs.ssi:102
 msgid "2~ Do the research"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:98
+#: en/project_bugs.ssi:104
 msgid ""
 "Before filing the bug, please search the web for the particular error "
 "message or symptom you are getting. As it is highly unlikely that you are "
@@ -464,7 +490,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:100
+#: en/project_bugs.ssi:106
 msgid ""
 "You should pay particular attention to the Debian Live mailing list, as well "
 "as the homepage, as these are likely to contain the most up-to-date "
@@ -473,7 +499,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:102
+#: en/project_bugs.ssi:108
 msgid ""
 "In addition, you should check the current bug lists for live-build, live-"
 "boot, and live-config to see whether something similar has been reported "
@@ -481,12 +507,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:104
+#: en/project_bugs.ssi:110
 msgid "2~ Where to report bugs"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:106
+#: en/project_bugs.ssi:112
 msgid ""
 "The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
 "System (BTS). For information on how to use the system, please see http://"
@@ -495,7 +521,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:108
+#: en/project_bugs.ssi:114
 msgid ""
 "In general, you should report build time errors against the live-build "
 "package, boot time errors against live-boot, and run time errors against "
@@ -505,7 +531,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:109
+#: en/project_bugs.ssi:115
 msgid ""
 "Please note that bugs found in distributions derived from Debian (such as "
 "Ubuntu and others) should *{not}* be reported to the Debian BTS unless they "
diff --git a/manual/po/fr/project_coding-style.ssi.po b/manual/po/fr/project_coding-style.ssi.po
index be8a205..f079589 100644
--- a/manual/po/fr/project_coding-style.ssi.po
+++ b/manual/po/fr/project_coding-style.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-30 11:05+0100\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -20,64 +20,62 @@ 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_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:24
+#: 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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr "code{"
@@ -86,64 +84,62 @@ 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:173 en/other_customization-bootup.ssi:35
-#: en/other_customization-bootup.ssi:48 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: 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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr "}code"
@@ -220,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
@@ -235,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
@@ -250,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
@@ -277,43 +273,45 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:74
-msgid "_* Variables that used in lb config always start with LH_ prefix."
+msgid ""
+"_* Variables that used in #{lb config}# always start with #{LB_}# prefix."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:76
 msgid ""
-"_* Internal temporary variables in live-build should start with the _LH_ "
-"prefix."
+"_* Internal temporary variables in live-build should start with the #{\\_LB_}"
+"# prefix."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:78
-msgid "_* Local variables start with live-build __LH_ prefix."
+msgid "_* Local variables start with live-build #{\\_\\_LB_}# prefix."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:80
 msgid ""
-"_* Variables in connection to a boot parameter in live-config start with "
-"LIVE_."
+"_* Variables in connection to a boot parameter in live-config start with #"
+"{LIVE_}#."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:82
-msgid "_* All other variables in live-config start with _ prefix."
+msgid "_* All other variables in live-config start with #{_}# prefix."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:84
-msgid "_* Use braces around variables; eg. write ${FOO} instead of $FOO."
+msgid ""
+"_* Use braces around variables; e.g. write #{${FOO}}# instead of #{$FOO}#."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:86
 msgid ""
-"_* Always protect variables with quotes to respect potential whitespaces, "
-"write \"${FOO}\" not ${FOO}."
+"_* Always protect variables with quotes to respect potential whitespaces: "
+"write #{\"${FOO}\"}# not #{${FOO}}#."
 msgstr ""
 
 #. type: Plain text
@@ -325,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
@@ -342,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
@@ -366,21 +366,21 @@ msgstr ""
 #. type: Plain text
 #: en/project_coding-style.ssi:132
 msgid ""
-"_* Use \"|\" (without the surround quotes) as a seperator in calls to sed, e."
-"g. \"sed -e 's|foo|bar|'\" (without \"\")."
+"_* Use \"#{|}#\" (without the surround quotes) as a seperator in calls to "
+"sed, e.g. \"#{sed -e 's|foo|bar|'}#\" (without \"\")."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:134
 msgid ""
-"_* Don't use the test command for comparisons or tests, use \"[\" "
-"\"]\" (without \"\"), e.g. \"if [ -x /bin/foo ]; ...\" and not \"if test -x /"
-"bin/foo; ...\"."
+"_* Don't use the #{test}# command for comparisons or tests, use \"#{[}#\" \"#"
+"{]}#\" (without \"\"); e.g. \"#{if [ -x /bin/foo ]; ...}#\" and not \"#{if "
+"test -x /bin/foo; ...}#\"."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:135
 msgid ""
-"_* Use case wherever possible over test, as it's easier to read and faster "
-"in execution."
+"_* Use #{case}# wherever possible over #{test}#, as it's easier to read and "
+"faster in execution."
 msgstr ""
diff --git a/manual/po/fr/project_procedures.ssi.po b/manual/po/fr/project_procedures.ssi.po
index a7f22c6..b2c6cb0 100644
--- a/manual/po/fr/project_procedures.ssi.po
+++ b/manual/po/fr/project_procedures.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-30 10:35+0100\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -20,65 +20,62 @@ 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_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:24
+#: 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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr "code{"
@@ -87,65 +84,62 @@ 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:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: 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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr "}code"
@@ -157,7 +151,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:4
-msgid "1~ Procedures"
+msgid "1~procedures Procedures"
 msgstr ""
 
 #. type: Plain text
@@ -179,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
@@ -263,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
@@ -279,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 0aba383..8d2c1fb 100644
--- a/manual/po/fr/user_basics.ssi.po
+++ b/manual/po/fr/user_basics.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-28 07:16-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -18,132 +18,128 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: 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/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: 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/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
-#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
-#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
-#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
-#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
-#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
+#: 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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
-#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
-#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
-#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
-#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
-#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr "}code"
@@ -217,16 +213,11 @@ msgid ""
 "size. Note that it is read-only. So, during boot the Debian Live system will "
 "use a RAM disk and 'union' mechanism to enable writing files within the "
 "running system. However, all modifications will be lost upon shutdown unless "
-"optional persistence is used (see persistence)."
+"optional persistence is used (see {Persistence}#persistence)."
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:20
-msgid "% FIXME: <xref linkend=\"persistence\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:22
 msgid ""
 "_* *{Bootloader}*: A small piece of code crafted to boot from the chosen "
 "media, possibly presenting a prompt or menu to allow selection of options/"
@@ -240,20 +231,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
 msgid ""
 "You can use live-build to build the system image from your specifications, "
 "set up a Linux kernel, its initrd, and a bootloader to run them, all in one "
-"media-dependant format (ISO9660 image, disk image, etc.)"
+"media-dependant format (ISO9660 image, disk image, etc.)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
 msgid "2~ First steps: building an ISO image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
 msgid ""
 "The following sequence of live-build commands will create a basic ISO hybrid "
 "image containing just the Debian standard system without X.org. It is "
@@ -263,93 +254,99 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
 msgid ""
 "First, we run the #{lb config}# command which will create a \"config/\" "
 "hierarchy in the current directory for use by other commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:34
-msgid "$ lb config"
+#: en/user_basics.ssi:32
+#, no-wrap
+msgid " $ lb config\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:38
+#: en/user_basics.ssi:36
 msgid ""
 "By passing no parameters to #{lb config}#, we indicated that we wish to use "
 "the defaults (see {The lb config command}#lb-config)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:40
+#: en/user_basics.ssi:38
 msgid ""
-"Now that we have a \"config/\" hierarchy, we may build the image with the lb "
-"build command:"
+"Now that we have a \"config/\" hierarchy, we may build the image with the #"
+"{lb build}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
-#: en/user_examples.ssi:106 en/user_examples.ssi:153
-msgid "# lb build"
+#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#, no-wrap
+msgid " # lb build\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:48
+#: en/user_basics.ssi:46
 msgid ""
 "This process can take a while, depending on the speed of your network "
 "connection (see {The lb build command}#lb-build)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:50
+#: en/user_basics.ssi:48
 msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:52
+#: en/user_basics.ssi:50
 msgid "Testing an ISO is simple:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:56 en/user_basics.ssi:144
-msgid "# apt-get install qemu"
+#: en/user_basics.ssi:54 en/user_basics.ssi:142
+#, no-wrap
+msgid " # apt-get install qemu\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:58
-msgid "$ qemu -cdrom binary.iso"
+#: en/user_basics.ssi:56
+#, no-wrap
+msgid " $ qemu -cdrom binary.iso\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:62
+#: en/user_basics.ssi:60
 msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:64
+#: en/user_basics.ssi:62
 msgid "In order to test the ISO with virtualbox-ose:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:68
-msgid "# apt-get install virtualbox-ose virtualbox-ose-dkms"
+#: en/user_basics.ssi:66
+#, no-wrap
+msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:70
-msgid "$ virtualbox"
+#: en/user_basics.ssi:68
+#, no-wrap
+msgid " $ virtualbox\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:74
+#: en/user_basics.ssi:72
 msgid ""
 "Create a new virtual machine, change the storage settings to use binary.iso "
 "as the CD/DVD device, and start the machine."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:76
+#: en/user_basics.ssi:74
 msgid ""
 "Note: For live systems containing X.org that you want to test with "
 "virtualbox-ose, you may wish to include the VirtualBox X.org driver package, "
@@ -358,37 +355,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:80
-msgid "# lb config --packages virtualbox-ose-guest-x11"
+#: en/user_basics.ssi:78
+#, no-wrap
+msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:84
+#: en/user_basics.ssi:82
 msgid "3~burning-iso-image Burning an ISO image to a physical medium"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:86
+#: en/user_basics.ssi:84
 msgid "Burning an ISO image is easy:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:90
-msgid "# apt-get install wodim"
+#: en/user_basics.ssi:88
+#, no-wrap
+msgid " # apt-get install wodim\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:92
-msgid "$ wodim binary.iso"
+#: en/user_basics.ssi:90
+#, no-wrap
+msgid " $ wodim binary.iso\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:94
 msgid "2~ Building a USB/HDD image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:98
+#: en/user_basics.ssi:96
 msgid ""
 "The following sequence of commands will create a basic USB/HDD image "
 "containing just the Debian standard system without X.org. It is suitable for "
@@ -400,7 +400,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:100
+#: en/user_basics.ssi:98
 msgid ""
 "Note: if you created an ISO image with the previous example, you will need "
 "to clean up your working directory with the #{lb clean}# command (see {The "
@@ -408,34 +408,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:104 en/user_basics.ssi:186
-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
-#: en/user_basics.ssi:108
+#: en/user_basics.ssi:106
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the #{config/}"
 "# hierarchy to create a USB/HDD image type:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:112
-msgid "$ lb config -b usb-hdd"
+#: en/user_basics.ssi:110
+#, no-wrap
+msgid " $ lb config -b usb-hdd\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:116
-msgid "Now build the image with the #{lb build} command:"
+#: en/user_basics.ssi:114 en/user_basics.ssi:198
+msgid "Now build the image with the #{lb build}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:124
+#: en/user_basics.ssi:122
 msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:126
+#: en/user_basics.ssi:124
 msgid ""
 "The generated binary image contains a VFAT partition and the syslinux "
 "bootloader, ready to be directly written on a USB stick. Plug in a USB stick "
@@ -443,12 +445,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:130
-msgid "$ dd if=binary.img of=${USBSTICK}"
+#: en/user_basics.ssi:128
+#, no-wrap
+msgid " $ dd if=binary.img of=${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:134
+#: en/user_basics.ssi:132
 msgid ""
 "where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
 "a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -457,35 +460,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:136
+#: en/user_basics.ssi:134
 #, no-wrap
 msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:136
 msgid ""
 "Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
-"type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images."
+"type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:140
+#: en/user_basics.ssi:138
 msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:146
-msgid "$ qemu -hda binary.img"
+#: en/user_basics.ssi:144
+#, no-wrap
+msgid " $ qemu -hda binary.img\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:148
 msgid "3~ Using the space left on a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:152
+#: en/user_basics.ssi:150
 msgid ""
 "If you want to use the remaining free space after you have installed the "
 "binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -494,45 +498,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:156
-msgid "# gparted ${USBSTICK}"
+#: en/user_basics.ssi:154
+#, no-wrap
+msgid " # gparted ${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:160
+#: en/user_basics.ssi:158
 msgid ""
 "After the creation of the partition, you have to create a filesystem on it. "
 "One possible choice would be ext4."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:164
-msgid "# mkfs.ext4 ${USBSTICK}"
+#: en/user_basics.ssi:162
+#, no-wrap
+msgid " # mkfs.ext4 ${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:168
+#: en/user_basics.ssi:166
 msgid "If you want to use this data partition with Windows, use FAT32."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:172
-msgid "# mkfs.vfat -F 32"
+#: en/user_basics.ssi:170
+#, no-wrap
+msgid " # mkfs.vfat -F 32\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:176
+#: en/user_basics.ssi:174
 #, no-wrap
 msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:176
 msgid "2~building-netboot-image Building a netboot image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:178
 msgid ""
 "The following sequence of commands will create a basic netboot image "
 "containing the Debian standard system without X.org. It is suitable for "
@@ -540,43 +547,38 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:182
+#: en/user_basics.ssi:180
 msgid ""
 "Note: if you performed any previous examples, you will need to clean up your "
 "working directory with the #{lb clean}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:190
+#: en/user_basics.ssi:188
 msgid ""
-"Run the #{lb config}# command with the parameters to configure the \"config/"
-"\" hierarchy to create our netboot image:"
+"Run the #{lb config}# command as follows to configure your image for "
+"netbooting:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:194
-msgid ""
-"$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
-"\"192.168.0.1\""
+#: en/user_basics.ssi:192
+#, 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
-#: en/user_basics.ssi:198
+#: en/user_basics.ssi:196
 msgid ""
-"In contrast with the ISO and USB/HDD images, netbooting does not support "
-"serving a filesystem image with the client, so the files must be served via "
-"NFS. The net-root-path and net-root-server options specify the location and "
-"server, respectively, of the NFS server where the filesytem image will be "
-"located at boot time."
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:200
-msgid "Now build the image with the #{lb build}# command:"
+"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
+"serve the filesystem image to the client, so the files must be served via "
+"NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the "
+"location and server, respectively, of the NFS server where the filesytem "
+"image will be located at boot time. Make sure these are set to suitable "
+"values for your network and server."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:206
 msgid ""
 "In a network boot, the client runs a small piece of software which usually "
 "resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -587,26 +589,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:208
 msgid ""
-"For example, if you unpack the generated binary-net.tar.gz archive in the /"
-"srv/debian-live directory, you'll find the filesystem image in live/"
-"filesystem.squashfs and the kernel, initrd and pxelinux bootloader in "
-"tftpboot/debian-live/i386."
+"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
+"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
+"in #{tftpboot/debian-live/i386}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:212
-msgid "We must now configure three services on the server to enable netboot."
+#: en/user_basics.ssi:210
+msgid ""
+"We must now configure three services on the server to enable netboot: the "
+"DHCP server, the TFTP server and the NFS server."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:212
 msgid "3~ DHCP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:214
 msgid ""
 "We must configure our network's DHCP server to be sure to give an IP address "
 "to the netbooting client system, and to advertise the location of the PXE "
@@ -614,109 +618,93 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:216
 msgid ""
 "Here is an example for inspiration, written for the ISC DHCP server #{isc-"
-"dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
+"dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:220
-msgid "% FIXME"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:224
 #, no-wrap
-msgid "subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
+msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:227
+#: en/user_basics.ssi:222
 #, no-wrap
-msgid ""
-"  # IP addresses available for guests\n"
-"  range 192.168.1.100 192.168.1.149;\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:230
-#, no-wrap
-msgid ""
-"  # allow booting from the net\n"
-"  allow bootp;\n"
+msgid " ddns-update-style none;\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:235
+#: en/user_basics.ssi:225
 #, no-wrap
 msgid ""
-"  # for net booting, server where the first file to be loaded (by TFTP\n"
-"  # protocol) (\"filename\" following definition) lies: so the TFTP\n"
-"  # server's name.\n"
-"  next-server myserver;\n"
+" 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:239
+#: en/user_basics.ssi:228
 #, no-wrap
 msgid ""
-"  # net boot configuration for guests with a PXE client:\n"
-"  if substring (option vendor-class-identifier, 0, 9) = \"PXEClient\" {\n"
-"    # Note: all files for PXE are relatives to the TFTP server's root\n"
+" default-lease-time 600;\n"
+" max-lease-time 7200;\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:242
+#: en/user_basics.ssi:230
 #, no-wrap
-msgid ""
-"    # PXE bootloader (first program to be loaded, by TFTP)\n"
-"    filename \"pxelinux.0\";\n"
+msgid " log-facility local7;\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:236
 #, no-wrap
 msgid ""
-"  }\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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:240
 msgid "3~ TFTP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:242
 msgid "This serves the kernel and initial ramdisk to the system at run time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:253
+#: en/user_basics.ssi:244
 msgid ""
 "You should install the tftpd-hpa package. It can serve all files contained "
-"inside a root directory, usually /srv/tftp. To let it serve files inside /"
-"srv/debian-live/tftpboot, run as root the following command:"
+"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
+"#{/srv/debian-live/tftpboot}#, run as root the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:257
-msgid "dpkg-reconfigure -plow tftpd-hpa"
+#: en/user_basics.ssi:248
+#, no-wrap
+msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:252
 msgid "and fill in the new tftp server directory when being asked about it."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:254
 msgid "3~ NFS server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:256
 msgid ""
 "Once the guest computer has downloaded and booted a Linux kernel and loaded "
 "its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -724,161 +712,188 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:267
-msgid "You need to install the nfs-kernel-server package."
+#: en/user_basics.ssi:258
+msgid "You need to install the #{nfs-kernel-server}# package."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:260
 msgid ""
 "Then, make the filesystem image available through NFS by adding a line like "
-"the following to /etc/exports:"
+"the following to #{/etc/exports}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:273
-msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
+#: en/user_basics.ssi:264
+#, no-wrap
+msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:277
+#: en/user_basics.ssi:268
 msgid ""
 "and tell the NFS server about this new export with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:281
-msgid "# exportfs -rv"
+#: en/user_basics.ssi:272
+#, no-wrap
+msgid " # exportfs -rv\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:276
 msgid ""
 "Setting up these three services can be a little tricky. You might need some "
-"patience to get all of them working together. The Debian Installer Manual's "
-"TFTP Net Booting section at http://d-i.alioth.debian.org/manual/en.i386/"
-"ch04s05.html might help as that process is very similar."
+"patience to get all of them working together. For more information, see the "
+"syslinux wiki at http://syslinux.zytor.com/wiki/index.php/PXELINUX or the "
+"Debian Installer Manual's TFTP Net Booting section at http://d-i.alioth."
+"debian.org/manual/en.i386/ch04s05.html. They might help, as their processes "
+"are very similar."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:278
 msgid "3~ Netboot testing HowTo"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:280
 msgid ""
 "Netboot image creation is made easy with live-build magic, but testing the "
 "images on physical machines can be really time consuming."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:282
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:284
 msgid "3~ Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:295
-msgid "_* Install qemu, bridge-utils, sudo."
+#: en/user_basics.ssi:286
+msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:297
-msgid "Edit /etc/qemu-ifup:"
+#: en/user_basics.ssi:288
+msgid "Edit #{/etc/qemu-ifup}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:308
+#: 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
-#: en/user_basics.ssi:312
-msgid "Get, or build a grub-floppy-netboot (in the svn)."
+#: en/user_basics.ssi:303
+msgid "Get, or build a #{grub-floppy-netboot}# (in the svn)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:314
-msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
+#: en/user_basics.ssi:305
+msgid ""
+"Launch #{qemu}# with \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:307
 msgid "3~ VMWare Player"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:309
 msgid "_* Install VMWare Player (\"free as in beer\" edition)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:311
 msgid ""
-"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
+"_* Create a PXETester directory, and create a text file called #{pxe.vwx}# "
+"inside"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:313
 msgid "_* Paste this text inside:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:330
+#: 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:336
+#: 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:339
-msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
+#: en/user_basics.ssi:330
+#, no-wrap
+msgid ""
+" ethernet0.present = \"TRUE\"\n"
+" ethernet0.addressType = \"generated\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:342
-msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
+#: en/user_basics.ssi:333
+#, no-wrap
+msgid ""
+" displayName = \"Test Boot PXE\"\n"
+" guestOS = \"other\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:347
+#: 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
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:342
 msgid ""
-"_* You can play with this configuration file (i.e. change memory limit to "
+"_* You can play with this configuration file (e.g. change memory limit to "
 "256)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:353
+#: en/user_basics.ssi:344
 msgid ""
 "_* Double click on this file (or run VMWare player and select this file)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:354
+#: en/user_basics.ssi:345
 msgid "_* When running just press space if that strange question comes up..."
 msgstr ""
diff --git a/manual/po/fr/user_customization-binary.ssi.po b/manual/po/fr/user_customization-binary.ssi.po
index 5fb308e..9b9cf4c 100644
--- a/manual/po/fr/user_customization-binary.ssi.po
+++ b/manual/po/fr/user_customization-binary.ssi.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
+"Project-Id-Version: live-manual 2.0.0\n"
 "POT-Creation-Date: 2010-11-30 11:20+0100\n"
 "PO-Revision-Date: 2010-11-30 11:20+0100\n"
 "Last-Translator: Automatically generated\n"
diff --git a/manual/po/fr/user_customization-contents.ssi.po b/manual/po/fr/user_customization-contents.ssi.po
index 1ec28fe..5e84b7a 100644
--- a/manual/po/fr/user_customization-contents.ssi.po
+++ b/manual/po/fr/user_customization-contents.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -18,124 +18,128 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: 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/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: 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/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
-#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
+#: 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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
-#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr "}code"
@@ -152,7 +156,13 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:6
-msgid "This chapter discusses further customization of the live system."
+msgid ""
+"This chapter discusses fine-tuning customization of the live system contents "
+"beyond merely choosing which packages to include. Includes allow you to add "
+"or replace arbitrary files in your Debian Live image, hooks allow you to "
+"execute arbitrary commands at different stages of the build and at boot "
+"time, and preseeding allows you to configure packages when they are "
+"installed by supplying answers to debconf questions."
 msgstr ""
 
 #. type: Plain text
@@ -163,77 +173,63 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-contents.ssi:10
 msgid ""
-"Using includes, it is possible to add (or replace) arbitrary files in your "
-"Debian Live image. live-build provides three mechanisms for using them:"
+"While ideally a Debian live system would include files entirely provided by "
+"unmodified Debian packages, it is sometimes convenient to provide or modify "
+"some content by means of files. Using includes, it is possible to add (or "
+"replace) arbitrary files in your Debian Live image. live-build provides "
+"three mechanisms for using them:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:12
 msgid ""
 "_* Chroot local includes: These allow you to add or replace files to the "
-"chroot/Live filesystem. Please see chroot-local-includes for more "
-"information."
+"chroot/Live filesystem. Please see {Live/chroot local includes}#live-chroot-"
+"local-includes for more information."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:14
-msgid "% FIXME: <xref linkend=\"chroot-local-includes\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:16
 msgid ""
 "_* Binary local includes: These allow you to add or replace files in the "
-"binary image. Please see binary-local-includes for more information."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:18
-msgid "% FIXME: <xref linkend=\"binary-local-includes\"/>"
+"binary image. Please see {Binary local includes}#binary-local-includes for "
+"more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:20
+#: en/user_customization-contents.ssi:16
 msgid ""
 "_* Binary includes: These allow you to add or replace Debian specific files "
 "in the binary image, such as the templates and tools directories. Please see "
-"binary-includes for more information."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:22
-msgid "% FIXME: <xref linkend=\"binary-includes\"/>"
+"{Binary includes}#binary-includes for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:18
 msgid ""
-"Please see terms for more information about the distinction between the "
-"\"Live\" and \"binary\" images."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:26
-msgid "% FIXME: <xref linkend=\"terms\"/>"
+"Please see {Terms}#terms for more information about the distinction between "
+"the \"Live\" and \"binary\" images."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:28
-msgid "3~ Live/chroot local includes"
+#: en/user_customization-contents.ssi:20
+msgid "3~live-chroot-local-includes Live/chroot local includes"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:30
+#: en/user_customization-contents.ssi:22
 msgid ""
 "Chroot local includes can be used to add or replace files in the chroot/Live "
-"filesystem so that they are visible when the Live system is booted. Typical "
-"uses for them are to populate the skeleton user directory (#{/etc/skel}#) "
-"used by the live system to create the live user's home directory, or adding "
-"configuration files where additional processing is not required."
+"filesystem so that they may be used in the Live system. A typical use is to "
+"populate the skeleton user directory (#{/etc/skel}#) used by the Live system "
+"to create the live user's home directory. Another is to supply configuration "
+"files that can be simply added or replaced in the image without processing; "
+"see {Live/chroot local hooks}#live-chroot-local-hooks if processing is "
+"needed."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:32
+#: en/user_customization-contents.ssi:24
 msgid ""
 "To include files, simply add them to your #{config/chroot_local-includes}# "
 "directory. This directory corresponds to the root directory (#{/}#) of the "
@@ -242,53 +238,70 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:37
+#: 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
-#: en/user_customization-contents.ssi:41
+#: en/user_customization-contents.ssi:33
 msgid "Your configuration will then have the following layout:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:52
+#: 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
-#: en/user_customization-contents.ssi:56
+#: en/user_customization-contents.ssi:48
 msgid ""
 "Chroot local includes are installed after package installation so that files "
 "installed by packages are overwritten."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:58
-msgid "3~ Binary local includes"
+#: en/user_customization-contents.ssi:50
+msgid "3~binary-local-includes Binary local includes"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:60
+#: en/user_customization-contents.ssi:52
 msgid ""
-"The same way as chroot local includes work, there exists the corresponding "
-"mechanism to include files in the live media itself."
+"To include material such as documentation or videos on the media filesystem "
+"so that it is accessible immediately upon insertion of the media without "
+"booting the Live system, you can use binary local includes. This works in a "
+"similar fashion to chroot local includes. For example, suppose the files #{~/"
+"video_demo.*}# are demo videos of the live system described by and linked to "
+"by an HTML index page. Simply copy the material to #{config/binary_local-"
+"includes/} as follows:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:56
+#, no-wrap
+msgid " $ cp ~/video_demo.* config/binary_local-includes/\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:60
+msgid "These files will now appear in the root directory of the live media."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:62
-msgid "3~ Binary includes"
+msgid "3~binary-includes Binary includes"
 msgstr ""
 
 #. type: Plain text
@@ -300,28 +313,37 @@ 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
 #: en/user_customization-contents.ssi:72
-msgid "2~ Hooks"
+msgid ""
+"Otherwise, the material will be installed by live-build in #{/includes/}# by "
+"default on the media filesystem, or else you can specify an alternate path "
+"with #{--includes}#."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:74
+msgid "2~ Hooks"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:76
 msgid ""
 "Hooks allow commands to be performed in the chroot and binary stages of the "
 "build in order to customize the image."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:76
-msgid "3~ Live/chroot local hooks"
+#: en/user_customization-contents.ssi:78
+msgid "3~live-chroot-local-hooks Live/chroot local hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:78
+#: en/user_customization-contents.ssi:80
 msgid ""
 "To run commands in the chroot stage, create a hook script containing the "
 "commands in the #{config/chroot_local-hooks}# directory. The hook will run "
@@ -334,12 +356,30 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:80
+#: en/user_customization-contents.ssi:82
+msgid "3~ Boot-time hooks"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:84
+msgid ""
+"To execute commands at boot time, you can supply live-config hooks as "
+"explained in the \"Customization\" section of its man page. Examine live-"
+"config's own hooks provided in #{/lib/live/config/}#, noting the sequence "
+"numbers. Then provide your own hook prefixed with an appropriate sequence "
+"number, either as a chroot local include in #{config/chroot_local-includes/"
+"lib/live/config/}#, or as a custom package as discussed in {Installing "
+"modified or third-party packages}#installing-modified-or-third-party-"
+"packages."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:86
 msgid "3~ Binary local hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:82
+#: en/user_customization-contents.ssi:88
 msgid ""
 "To run commands in the binary stage, create a hook script containing the "
 "commands in the #{config/binary_local-hooks}#. The hook will run after all "
@@ -352,12 +392,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:84
+#: en/user_customization-contents.ssi:90
 msgid "2~ Preseeding Debconf questions"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:86
+#: en/user_customization-contents.ssi:92
 msgid ""
 "Files in the #{config/chroot_local-preseed}# directory are considered to be "
 "debconf preseed files and are installed by live-build using #{debconf-set-"
@@ -365,7 +405,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:87
+#: en/user_customization-contents.ssi:93
 msgid ""
 "For more information about debconf, please see debconf(7) in the #{debconf}# "
 "package."
diff --git a/manual/po/fr/user_customization-installer.ssi.po b/manual/po/fr/user_customization-installer.ssi.po
index 674dfb9..8ec8e50 100644
--- a/manual/po/fr/user_customization-installer.ssi.po
+++ b/manual/po/fr/user_customization-installer.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-30 10:53+0100\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -17,6 +17,134 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
 #: en/user_customization-installer.ssi:2
 msgid ":B~ Customizing Debian Installer"
 msgstr ""
@@ -30,8 +158,8 @@ msgstr ""
 #: en/user_customization-installer.ssi:6
 msgid ""
 "Debian Live system images can be integrated with Debian Installer. There are "
-"number of different \"types\" of installation, varying in what and how to "
-"install the image."
+"a number of different types of installation, varying in what is included and "
+"how the installer operates."
 msgstr ""
 
 #. type: Plain text
@@ -45,77 +173,132 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:10
-msgid "The three main types of installer are:"
+msgid "2~ Types of Debian Installer"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:12
-msgid ""
-"_* *{\"Regular\" Debian Installer}*: This is a normal Debian Live image with "
-"a seperate kernel and initrd which (when selected from the appropriate "
-"bootloader) launches into a standard Debian Installer instance, just as if "
-"you had downloaded a CD image of Debian and booted it. Images containing a "
-"live system and such an otherwise indepentend installer are often referet to "
-"as \"combined images\"."
+msgid "The three main types of installer are:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:14
+#, no-wrap
+msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as \"combined images\".\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:16
 msgid ""
 "On such images, Debian is installed by fetching and installing .deb packages "
 "using #{debootstrap}# or #{cdebootstrap}#, from the local media or some "
-"network-base network, resulting in a standard Debian system being installed "
+"network-based network, resulting in a standard Debian system being installed "
 "to the hard disk."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:16
+#: en/user_customization-installer.ssi:18
 msgid ""
 "This whole process can be preseeded and customized in a number of ways; see "
 "the relevant pages in the Debian Installer manual for more information. Once "
-"you have a working preseeding file, live-build can automatically place it to "
+"you have a working preseeding file, live-build can automatically put it in "
 "the image and enable it for you."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:18
-msgid ""
-"_* *{\"Live\" Debian Installer}*: This is a Debian Live image with a "
-"seperate kernel and initrd which (when selected from the appropriate "
-"bootloader) launches into an instance of the Debian Installer."
+#: en/user_customization-installer.ssi:20
+#, no-wrap
+msgid "*{\"Live\" Debian Installer}*: This is a Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into an instance of the Debian Installer.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:20
+#: en/user_customization-installer.ssi:22
 msgid ""
 "Installation will proceed in an identical fashion to the \"Regular\" "
 "installation described above, but at the actual package installation stage, "
-"instead of using #{debootstrap}# to fetch and install packages, the \"live\" "
-"filesystem image is copied to the target. This is acchieved with a special "
-"udeb called live-installer. live-installer can be preseeded to be disabled, "
-"allowing to support normal and live installer entries in the bootloader of "
-"the same live media."
+"instead of using #{debootstrap}# to fetch and install packages, the live "
+"filesystem image is copied to the target. This is achieved with a special "
+"udeb called live-installer."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:22
+#: en/user_customization-installer.ssi:24
 msgid ""
 "After this stage, the Debian Installer continues as normal, installing and "
 "configuring items such as bootloaders and local users, etc."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:24
+#: en/user_customization-installer.ssi:26
+msgid ""
+"Note: to support both normal and live installer entries in the bootloader of "
+"the same live media, you must disable live-installer by preseeding #{live-"
+"installer/enable=false}."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:28
+#, no-wrap
+msgid "*{\"Desktop\" Debian Installer}*: Regardless of the type of Debian Installer included, #{d-i}# can be launched from the Desktop by clicking on an icon. This is user friendlier in some situations. In order to make use of this, the debian-installer-launcher package needs to be included.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:30
+msgid ""
+"Note that by default, live-build does not include Debian Installer images in "
+"the images, it needs to be specifically enabled with #{lb config}#. Also, "
+"please note that for the \"Desktop\" installer to work, the kernel of the "
+"live system must match the kernel #{d-i}# uses for the specified "
+"architecture. For example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:35
+#, no-wrap
 msgid ""
-"_* *{\"Desktop\" Debian Installer}*: Regardless of the mode Debian Installer "
-"is used in, d-i can be launched from the Desktop by clicking on an icon. "
-"This is user friendlier in some situations. In order to make use of this, "
-"the debian-installer-launcher package needs to be included."
+" $ 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:39
+msgid "2~ Customizing Debian Installer by preseeding"
+msgstr ""
+
+#. type: Plain text
+#: 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 "
+"answers to questions asked during the installation process, without having "
+"to manually enter the answers while the installation is running. This makes "
+"it possible to fully automate most types of installation and even offers "
+"some features not available during normal installations.\" This kind of "
+"customization is best accomplished with live-build by placing the "
+"configuration in a #{preseed.cfg}# file included in #{config/binary_debian-"
+"installer/}#. For example, to preseed setting the locale to #{en_US}#:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:46
+#, no-wrap
+msgid ""
+" $ 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:50
+msgid "2~ Customizing Debian Installer content"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:25
+#: en/user_customization-installer.ssi:52
 msgid ""
-"Note that by default live-build does not include Debian Installer images in "
-"the images, it needs to be specifically enabled with lb config."
+"For experimental or debugging purposes, you might want to include locally "
+"built #{d-i}# component udeb packages. Place these in #{config/binary_local-"
+"udebs/}# to include them in the image. Additional or replacement files and "
+"directories may be included in the installer initrd as well, in a similar "
+"fashion to {Live/chroot local includes}#live-chroot-local-includes, by "
+"placing the material in #{config/binary_debian-installer-includes/}#."
 msgstr ""
diff --git a/manual/po/fr/user_customization-internationalization.ssi.po b/manual/po/fr/user_customization-internationalization.ssi.po
deleted file mode 100644
index 36a8414..0000000
--- a/manual/po/fr/user_customization-internationalization.ssi.po
+++ /dev/null
@@ -1,222 +0,0 @@
-# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
-"PO-Revision-Date: 2010-10-16 15:48-0200\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: 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/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
-#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
-#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
-msgid "code{"
-msgstr "code{"
-
-#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
-#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
-#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
-msgid "}code"
-msgstr "}code"
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:2
-msgid ":B~ Customizing locale and language"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:4
-msgid "1~customizing-locale-and-language Customizing locale and language"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:6
-msgid "2~ Default locale and keyboard"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:8
-msgid ""
-"The default locale when building a Live system is \"locales=en_US.UTF-8\", "
-"to set the locale for e.g. Switzerland, you can use \"locales=de_CH.UTF-8\"."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:12
-msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:16
-msgid "The entry for a Swiss-German keyboard would be:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:20
-msgid "$ lb config --bootappend-live \"keyboard-layouts=ch\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:24
-msgid "Combined, the keyboard and locale configured for Switzerland would be:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:28
-msgid ""
-"$ lb config --bootappend-live =\"locales=de_CH.UTF-8 keyboard-layouts=ch\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:32
-msgid ""
-"Note: You can find a list of options in the manpage for live-config. "
-"Currently, only UTF-8 locales are supported."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:34
-msgid "2~ l10n Packages"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:36
-msgid ""
-"An experimental feature of live-build is to automatically check for each "
-"package for which it is know that there are -l10n packages available and "
-"install them. To add German packages the entry would be"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:40
-msgid "$ lb config --language \"de\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:43
-msgid ""
-"This will also change the default syslinux language if translations are "
-"available or local translations have been put into #{config/templates/"
-"syslinux/de}#."
-msgstr ""
diff --git a/manual/po/fr/user_customization-overview.ssi.po b/manual/po/fr/user_customization-overview.ssi.po
index 35fc97e..0887cfa 100644
--- a/manual/po/fr/user_customization-overview.ssi.po
+++ b/manual/po/fr/user_customization-overview.ssi.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
+"Project-Id-Version: live-manual 2.0.0\n"
 "POT-Creation-Date: 2010-11-27 09:40-0400\n"
 "PO-Revision-Date: 2010-10-22 07:52-0200\n"
 "Last-Translator: Automatically generated\n"
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index 3357af7..ee164c7 100644
--- a/manual/po/fr/user_customization-packages.ssi.po
+++ b/manual/po/fr/user_customization-packages.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-01 21:10-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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,32 +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/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
+#: 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
@@ -58,25 +50,29 @@ msgstr ""
 #: en/user_customization-packages.ssi:185
 #: en/user_customization-packages.ssi:199
 #: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
 #: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:321 en/user_customization-runtime.ssi:12
-#: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
-#: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
-#: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
-#: en/user_customization-runtime.ssi:92 en/user_customization-runtime.ssi:101
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
 #: en/user_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_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:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:108
-#: en/user_installation.ssi:126 en/user_installation.ssi:141
-#: en/user_managing_a_configuration.ssi:24
+#: 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,32 +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:173 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
+#: 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
@@ -126,25 +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:285
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
 #: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:334 en/user_customization-runtime.ssi:16
-#: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: 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_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:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:112
-#: en/user_installation.ssi:131 en/user_installation.ssi:144
-#: en/user_managing_a_configuration.ssi:31
+#: 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
@@ -208,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
@@ -223,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
@@ -282,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
@@ -315,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
@@ -346,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
@@ -378,8 +373,9 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:82
-msgid "$ lb config --repository live.debian.net"
+#: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
+#, no-wrap
+msgid " $ lb config --repository live.debian.net\n"
 msgstr ""
 
 #. type: Plain text
@@ -414,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
@@ -465,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
@@ -561,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
@@ -589,20 +590,27 @@ 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
 #: en/user_customization-packages.ssi:163
 msgid ""
-"You may test for any one of a number of values, e.g. to install #"
-"{memtest86+ }# if either #{--architecture i386}# or #{--architecture amd64}# "
-"is specified:"
+"You may test for any one of a number of values, e.g. to install #{memtest86+}"
+"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
 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
@@ -615,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
@@ -625,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
@@ -651,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
@@ -673,11 +690,11 @@ msgstr ""
 msgid ""
 "Desktop and language tasks are special cases. In the Debian Installer, if "
 "the medium was prepared for a particular desktop environment flavour, the "
-"corresponding task will be automatically installed. Thus, there are there "
-"are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}"
-"# tasks, none of which are offered in #{tasksel}#'s menu. Likewise, there "
-"are no menu entries for tasks for languages, but the user's language choice "
-"during the install influences the selection of corresponding language tasks."
+"corresponding task will be automatically installed. Thus, there are #{gnome-"
+"desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}# tasks, "
+"none of which are offered in #{tasksel}#'s menu. Likewise, there are no menu "
+"entries for tasks for languages, but the user's language choice during the "
+"install influences the selection of corresponding language tasks."
 msgstr ""
 
 #. type: Plain text
@@ -699,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
@@ -710,27 +727,51 @@ msgid ""
 "the desktop flavours mentioned above, which select the #{standard-x11}# "
 "predefined package list, the corresponding #{*-desktop}# task and three "
 "additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example, "
-"if you specify #{--packages gnome-desktop}#, it is equivalent to specifying #"
-"{--packages standard-x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
+"if you specify #{--packages-lists gnome-desktop}#, it is equivalent to "
+"specifying #{--packages debian-installer-launcher --packages-lists standard-"
+"x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:223
 msgid ""
 "Third, if any of the tasks for these desktop flavours are selected, either "
-"explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build "
-"will preseed the corresponding desktop value for Debian Installer (if it is "
-"included) to ensure it follows its own rules for installing different "
+"explicitly through #{--tasks}# or implicitly by #{--packages-lists}#, live-"
+"build will preseed the corresponding desktop value for Debian Installer (if "
+"it is included) to ensure it follows its own rules for installing different "
 "desktop flavours."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:225
-msgid "2~ Installing modified or third-party packages"
+#, no-wrap
+msgid "*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are in
 stalled. For example:\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:229
+#, no-wrap
+msgid " $ lb config --language es\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:233
+msgid ""
+"Even so, it is limited in that it only supports a single language and a "
+"single bootloader. Therefore, for all of these reasons, the future of this "
+"option is under review, possibly to be replaced with something entirely "
+"different in the next major release of live-build."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:235
+msgid ""
+"2~installing-modified-or-third-party-packages Installing modified or third-"
+"party packages"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:237
 msgid ""
 "Whilst it is against the philosophy of Debian Live, it may sometimes be "
 "necessary to build a Live system with modified versions of packages that are "
@@ -741,7 +782,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:239
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -752,22 +793,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:241
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:243
 msgid "_* #{chroot_local-packages}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:245
 msgid "_* Using a custom APT repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:247
 msgid ""
 "Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
 "off\" customizations but has a number of drawbacks, whilst using a custom "
@@ -775,12 +816,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:249
 msgid "3~ Using #{chroot_local-packages}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:251
 msgid ""
 "To install a custom package, simply copy it to the #{config/chroot_local-"
 "packages/}# directory. Packages that are inside this directory will be "
@@ -789,45 +830,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:253
 msgid ""
 "Packages *{must}* be named in the prescribed way. One simple way to do this "
 "is to use #{dpkg-name}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:255
 msgid ""
 "Using #{chroot_local-packages}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:257
 msgid "_* It is not possible to use secure APT."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:259
 msgid ""
 "_* You must install all appropriate packages in the #{config/chroot_local-"
 "packages/}# directory."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:261
 msgid ""
 "_* It does not lend itself to storing Debian Live configurations in revision "
 "control."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:263
 msgid "3~ Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:265
 msgid ""
 "Unlike using #{chroot_local-packages}#, when using a custom APT repository "
 "you must ensure that you specify the packages elsewhere. See {Choosing "
@@ -835,7 +876,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:267
 msgid ""
 "Whilst it may seem unnecessary effort to create an APT repository to install "
 "custom packages, the infrastructure can be easily re-used at a later date to "
@@ -843,12 +884,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:269
 msgid "3~ Custom packages and APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:271
 msgid ""
 "live-build uses APT to install all packages into the live system so will "
 "therefore inherit behaviours from this program. One relevant example is that "
@@ -858,7 +899,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:273
 msgid ""
 "Because of this, you may wish to increment the version number in your custom "
 "packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -868,12 +909,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:275
 msgid "2~ Configuring APT at build time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:277
 msgid ""
 "You can configure APT through a number of options applied only at build "
 "time. (APT configuration used in the running live system may be configured "
@@ -884,12 +925,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:279
 msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:281
 msgid ""
 "You can elect to use either #{apt}# or #{aptitude}# when installing packages "
 "at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -899,26 +940,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283
 msgid ""
 "_* #{apt}#: With this method, if a missing package is specified, the package "
 "installation will fail. This is the default setting."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:285
 msgid ""
 "_* #{aptitude}#: With this method, if a missing package is specified, the "
 "package installation will succeed."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287
 msgid "3~ Using a proxy with APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:279
+#: en/user_customization-packages.ssi:289
 msgid ""
 "One commonly required APT configuration is to deal with building an image "
 "behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -926,17 +967,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:283
-msgid "lb config --apt-http-proxy http://proxy/"
+#: en/user_customization-packages.ssi:293
+#, no-wrap
+msgid " $ lb config --apt-http-proxy http://proxy/\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:287
+#: en/user_customization-packages.ssi:297
 msgid "3~ Tweaking APT to save space"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:299
 msgid ""
 "You may find yourself needing to save some space on the image media, in "
 "which case one or the other or both of the following options may be of "
@@ -944,19 +986,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:301
 msgid ""
 "If you don't want to include APT indices in the image, you can omit those "
 "with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:295
-msgid "$ lb config --binary-indices false"
+#: en/user_customization-packages.ssi:305
+#, no-wrap
+msgid " $ lb config --binary-indices false\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:299
+#: en/user_customization-packages.ssi:309
 msgid ""
 "This will not influence the entries in /etc/apt/sources.list, but merely "
 "whether /var/lib/apt contains the indices files or not. The tradeoff is that "
@@ -966,36 +1009,41 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:301
+#: en/user_customization-packages.ssi:311
 msgid ""
 "If you find the installation of recommended packages bloats your image too "
 "much, you may disable that default option of APT with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:305
-msgid "$ lb config --apt-recommends false"
+#: en/user_customization-packages.ssi:315
+#, no-wrap
+msgid " $ lb config --apt-recommends false\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:319
 msgid ""
-"The tradeoff here is that recommended packages are defined as \"packages "
-"that would be found together with this one in all but unusual installations"
-"\" (Debian Policy Manual, 7.2). This may lead to some packages that you "
-"actually need being omitted, so we suggest you review the difference this "
-"makes to your packages list (see the #{binary.packages}# file generated by #"
-"{lb build}#) and re-include in your list any missing packages that you still "
-"want installed."
+"The tradeoff here is that if you don't install recommended packages for a "
+"given package, that is, \"packages that would be found together with this "
+"one in all but unusual installations\" (Debian Policy Manual, 7.2), some "
+"packages that you actually need may be omitted. Therefore, we suggest you "
+"review the difference turning off recommends makes to your packages list "
+"(see the #{binary.packages}# file generated by #{lb build}#) and re-include "
+"in your list any missing packages that you still want installed. "
+"Alternatively, if you find you only want a small number of recommended "
+"packages left out, leave recommends enabled and set a negative APT pin "
+"priority on selected packages to prevent them from being installed, as "
+"explained in {APT pinning}#apt-pinning."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:321
 msgid "3~ Passing options to apt or aptitude"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:323
 msgid ""
 "If there is not an #{lb config}# option to alter APT's behaviour in the way "
 "you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -1004,12 +1052,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:315
+#: en/user_customization-packages.ssi:325
 msgid "3~apt-pinning APT pinning"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:327
 msgid ""
 "For background, please first read the #{apt_preferences(5)}# man page. APT "
 "pinning can be configured either for build time, or else for run time. For "
@@ -1018,7 +1066,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:329
 msgid ""
 "Let's say you are building a Squeeze live system but need all #{live-*}# "
 "packages to be installed from Sid at build time. You need to add Sid to your "
@@ -1028,14 +1076,42 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:327
+#: 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:332
-msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
+#: en/user_customization-packages.ssi:342
+#, 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
+msgid ""
+"Negative pin priorities will prevent a package from being installed, as in "
+"the case where you do not want a package that is recommended by another "
+"package. Suppose you are building a GNOME image but don't want the user "
+"prompted to store wifi passwords in the keyring, so you want to omit the "
+"recommended #{gnome-keyring}# package. This can be done by adding the "
+"following stanza to #{config/chroot_apt/preferences}#:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:352
+#, no-wrap
+msgid ""
+" Package: gnome-keyring\n"
+" Pin: version *\n"
+" Pin-Priority: -1\n"
 msgstr ""
diff --git a/manual/po/fr/user_customization-runtime.new.ssi.po b/manual/po/fr/user_customization-runtime.new.ssi.po
deleted file mode 100644
index 562fea4..0000000
--- a/manual/po/fr/user_customization-runtime.new.ssi.po
+++ /dev/null
@@ -1,647 +0,0 @@
-# French translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-02 20:07-0400\n"
-"PO-Revision-Date: 2010-12-02 20:07-0400\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/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/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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:293
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:321
-#: en/user_customization-runtime.new.ssi:14
-#: en/user_customization-runtime.new.ssi:34
-#: en/user_customization-runtime.new.ssi:42
-#: en/user_customization-runtime.new.ssi:50
-#: en/user_customization-runtime.new.ssi:64
-#: en/user_customization-runtime.new.ssi:76
-#: en/user_customization-runtime.new.ssi:86
-#: en/user_customization-runtime.new.ssi:94
-#: en/user_customization-runtime.new.ssi:102
-#: en/user_customization-runtime.new.ssi:110
-#: en/user_customization-runtime.new.ssi:130
-#: en/user_customization-runtime.new.ssi:138
-#: en/user_customization-runtime.new.ssi:147
-#: en/user_customization-runtime.ssi:12 en/user_customization-runtime.ssi:30
-#: en/user_customization-runtime.ssi:40 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:56 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:92
-#: en/user_customization-runtime.ssi:101 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:141 en/user_managing_a_configuration.ssi:24
-#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47
-#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
-msgid "code{"
-msgstr "code{"
-
-#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:173 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/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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:297
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:334
-#: en/user_customization-runtime.new.ssi:18
-#: en/user_customization-runtime.new.ssi:38
-#: en/user_customization-runtime.new.ssi:46
-#: en/user_customization-runtime.new.ssi:54
-#: en/user_customization-runtime.new.ssi:68
-#: en/user_customization-runtime.new.ssi:80
-#: en/user_customization-runtime.new.ssi:90
-#: en/user_customization-runtime.new.ssi:98
-#: en/user_customization-runtime.new.ssi:106
-#: en/user_customization-runtime.new.ssi:114
-#: en/user_customization-runtime.new.ssi:134
-#: en/user_customization-runtime.new.ssi:143
-#: en/user_customization-runtime.new.ssi:152
-#: en/user_customization-runtime.ssi:16 en/user_customization-runtime.ssi:34
-#: en/user_customization-runtime.ssi:44 en/user_customization-runtime.ssi:52
-#: en/user_customization-runtime.ssi:60 en/user_customization-runtime.ssi:68
-#: en/user_customization-runtime.ssi:88 en/user_customization-runtime.ssi:97
-#: en/user_customization-runtime.ssi:106 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:31
-#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
-msgid "}code"
-msgstr "}code"
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:8
-#: en/user_customization-runtime.new.ssi:32
-msgid ""
-"The default locale when building a Live system is \"locales=en_US.UTF-8\", "
-"to set the locale for e.g. Switzerland, you can use \"locales=de_CH.UTF-8\"."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:12
-#: en/user_customization-runtime.new.ssi:36
-msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:16
-#: en/user_customization-runtime.new.ssi:40
-msgid "The entry for a Swiss-German keyboard would be:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:20
-#: en/user_customization-runtime.new.ssi:44
-msgid "$ lb config --bootappend-live \"keyboard-layouts=ch\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:24
-#: en/user_customization-runtime.new.ssi:48
-msgid "Combined, the keyboard and locale configured for Switzerland would be:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:28
-#: en/user_customization-runtime.new.ssi:52
-msgid ""
-"$ lb config --bootappend-live =\"locales=de_CH.UTF-8 keyboard-layouts=ch\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:32
-#: en/user_customization-runtime.new.ssi:56
-msgid ""
-"Note: You can find a list of options in the manpage for live-config. "
-"Currently, only UTF-8 locales are supported."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:40
-#: en/user_customization-runtime.new.ssi:66
-msgid "$ lb config --language \"de\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:43
-#: en/user_customization-runtime.new.ssi:70
-msgid ""
-"This will also change the default syslinux language if translations are "
-"available or local translations have been put into #{config/templates/"
-"syslinux/de}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:2
-msgid ":B~ Customizing run time behaviours"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:4
-msgid "1~customizing-run-time-behaviours Customizing run time behaviours"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:6
-msgid ""
-"All configuration that is done during run time is done by live-config. Here "
-"are some most common options of live-config that users are interested in. A "
-"full list of all possibilities can be found in the manpage of live-config."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:8
-msgid "2~ Customizing the live user"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:10
-msgid ""
-"One important consideration is that the live user is created by live-boot at "
-"boot time, not by live-build at build time. This not only influences where "
-"materials relating to the live user are introduced in your build, as "
-"discussed in {Live/chroot local includes}#live-chroot-local-includes, but "
-"also any groups and permissions associated with the live user."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:12
-#: en/user_customization-runtime.ssi:10
-msgid ""
-"You can specify additional groups that the live user will belong to by "
-"preseeding the #{passwd/user-default-groups}# debconf value. For example, to "
-"add the live user to the #{fuse}# group, add the following to a file in the #"
-"{config/chroot_local-preseed}# directory:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:16
-#: en/user_customization-runtime.ssi:14
-msgid ""
-"debconf passwd/user-default-groups string audio cdrom dialout floppy video "
-"plugdev netdev powerdev fuse"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:20
-msgid "2~customizing-locale-and-language Customizing locale and language"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:22
-#: en/user_customization-runtime.ssi:20
-msgid "When the live system boots, language is involved in three steps:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:24
-#: en/user_customization-runtime.ssi:22
-msgid "_* the locale generation"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:26
-#: en/user_customization-runtime.ssi:24
-msgid "_* setting the keyboard layout for the console"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:28
-#: en/user_customization-runtime.ssi:26
-msgid "_* setting the keyboard layout for X"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:30
-msgid "3~ Default locale and keyboard"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:58
-msgid "3~ l10n Packages"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:60
-msgid ""
-"% FIXME: not a run time configuration! Belongs in packages chapter. (See --"
-"tasks discussion.)"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:62
-msgid ""
-"An experimental feature of live-build is to automatically check for each "
-"package for which it is known that there are #{*-l10n}# packages available "
-"and install them. To add German packages the entry would be"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:72
-msgid "3~ Language"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:74
-msgid ""
-"To define the locale that should be generated, use the #{locales}# parameter "
-"into the #{--bootappend-live}# option of #{lb config}#, e.g.:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:78
-#: en/user_customization-runtime.ssi:32
-msgid "lb config --bootappend-live \"locales=de_CH.UTF-8\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:82
-#: en/user_customization-runtime.ssi:36
-msgid ""
-"This parameter can also be used in kernel command line. You can specify a "
-"locale by a full #{language_country.encoding}# word."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:84
-#: en/user_customization-runtime.ssi:38
-msgid ""
-"Both the console and X keyboard configuration depends on the #{keyb}# "
-"parameter of the #{--bootappend-live}# option. Valid options for X keyboard "
-"layouts can be found in #{/etc/X11/xkb/base.xml}# (rather limited to two-"
-"letters country codes). To find the value (the two characters) corresponding "
-"to a language try searching for the english name of the nation where the "
-"language is spoken, e.g:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:88
-#: en/user_customization-runtime.ssi:42
-msgid "$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name <name>se</name>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:92
-#: en/user_customization-runtime.ssi:46
-msgid ""
-"To get the locale files for German and Swiss German keyboard layout in X use:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:96
-#: en/user_customization-runtime.ssi:50
-msgid "lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:100
-#: en/user_customization-runtime.ssi:54
-msgid ""
-"A list of the valid values of the keyboards for the console can be figured "
-"with the following command:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:104
-#: en/user_customization-runtime.ssi:58
-msgid ""
-"for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); do basename $i | "
-"head -c -9; echo; done | sort | less"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:108
-#: en/user_customization-runtime.ssi:62
-msgid ""
-"Alternatively, you can use the #{console-setup}# package, a tool to let you "
-"configure console layout using X (XKB) definitions; you can then setup your "
-"keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}"
-"#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use "
-"also these parameters for X configuration. For example, to set up a French "
-"system with a French-Dvorak layout (called Bepo) on a TypeMatrix keyboard, "
-"both in console and X11, use:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:112
-#: en/user_customization-runtime.ssi:66
-msgid ""
-"lb config --bootappend-live \"locales=fr_FR.UTF-8 keyboard-layouts=fr "
-"keyboard-variant=bepo keyboard-model=tm2030usb\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:116
-#: en/user_customization-runtime.ssi:70
-msgid "2~ Persistence"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:118
-#: en/user_customization-runtime.ssi:72
-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 "
-"of the host hardware which runs it."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:120
-#: en/user_customization-runtime.ssi:74
-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 "
-"should be considered read-only and all the run-time evolutions of the system "
-"are lost at shutdown."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:122
-#: en/user_customization-runtime.ssi:76
-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 "
-"understand how it could work it could be handy to know that even if the "
-"system is booted and run from read-only media, modification to the files and "
-"directories are written on writable media, typically a ram disk (tmpfs) and "
-"ram disks' data do not survive reboots."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:124
-#: en/user_customization-runtime.ssi:78
-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 "
-"multisession (re)writable CD/DVD. All these media are supported in Debian "
-"Live in different ways, and all but the last one require a special boot "
-"parameter to be specified at boot time: #{persistent}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:126
-#: en/user_customization-runtime.ssi:80
-msgid "3~ Full persistence"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:128
-#: en/user_customization-runtime.ssi:82
-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 "
-"writable partition is used. In order to use this feature a partition with a "
-"clean writable supported filesystem on it labeled \"live-rw\" must be "
-"attached on the system at boot time and the system must be started with the "
-"boot parameter 'persistent'. This partition could be an ext2 partition on "
-"the hard disk or on a usb key created with, e.g.:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:132
-#: en/user_customization-runtime.ssi:86
-msgid "# mkfs.ext2 -L live-rw /dev/sdb1"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:136
-#: en/user_customization-runtime.ssi:90
-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.new.ssi:141
-#: en/user_customization-runtime.ssi:95
-msgid ""
-"# tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems # dosfslabel /dev/"
-"sdb1 live-rw # for a fat filesystem"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:145
-#: en/user_customization-runtime.ssi:99
-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 "
-"could be also used with just image files, so you could create a file "
-"representing a partition and put this image file even on a NTFS partition of "
-"a foreign OS, with something like:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:150
-#: en/user_customization-runtime.ssi:104
-msgid ""
-"$ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file $ /"
-"sbin/mkfs.ext2 -F live-rw"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:154
-#: en/user_customization-runtime.ssi:108
-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.new.ssi:156
-#: en/user_customization-runtime.ssi:110
-msgid "3~ Home automounting"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:158
-#: en/user_customization-runtime.ssi:112
-msgid ""
-"If during the boot a partition (filesystem) image file or a partition "
-"labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
-"as #{/home}#, thus permitting persistence of files that belong to e.g. the "
-"default user. It can be combined with full persistence."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:160
-#: en/user_customization-runtime.ssi:114
-msgid "3~ Snapshots"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:162
-#: en/user_customization-runtime.ssi:116
-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 "
-"(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The "
-"content of a snapshot could reside on a partition or an image file (like the "
-"above mentioned types) labeled #{live-sn}#, but it defaults to a simple cpio "
-"archive named #{live-sn.cpio.gz}#. As above, at boot time, the block devices "
-"connected to the system are traversed to see if a partition or a file named "
-"like that could be found. A power interruption during run time could lead to "
-"data loss, hence a tool invoked #{live-snapshot --refresh}# could be called "
-"to sync important changes. This type of persistence, since it does not write "
-"continuously to the persistent media, is the most flash-based device "
-"friendly and the fastest of all the persistence systems."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:164
-#: en/user_customization-runtime.ssi:118
-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.new.ssi:166
-#: en/user_customization-runtime.ssi:120
-msgid ""
-"Snapshots cannot currently handle file deletion but full persistence and "
-"home automounting can."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:168
-#: en/user_customization-runtime.ssi:122
-msgid "3~ Persistent SubText"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:170
-#: en/user_customization-runtime.ssi:124
-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-"
-"work}#, the boot parameter #{persistent-subtext}# used in conjuntion with "
-"the boot parameter #{persistent}# will allow for multiple but unique "
-"persistent media. An example would be if a user wanted to use a persistent "
-"partition labeled #{live-sn-subText}# they would use the boot parameters of: "
-"#{persistent}# #{persistent-subtext=subText}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:172
-#: en/user_customization-runtime.ssi:126
-msgid "3~ Partial remastering"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:173
-#: en/user_customization-runtime.ssi:127
-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 "
-"case of cd-r or adding a session to multisession cd/dvd(rw); live-boot "
-"mounts all /live filesystem in order or with the module boot parameter."
-msgstr ""
diff --git a/manual/po/fr/user_customization-runtime.ssi.po b/manual/po/fr/user_customization-runtime.ssi.po
index ff7bc5f..0e4050b 100644
--- a/manual/po/fr/user_customization-runtime.ssi.po
+++ b/manual/po/fr/user_customization-runtime.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-02 20:07-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -20,32 +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/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
+#: 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
@@ -58,38 +50,29 @@ msgstr ""
 #: en/user_customization-packages.ssi:185
 #: en/user_customization-packages.ssi:199
 #: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
 #: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:321
-#: en/user_customization-runtime.new.ssi:14
-#: en/user_customization-runtime.new.ssi:34
-#: en/user_customization-runtime.new.ssi:42
-#: en/user_customization-runtime.new.ssi:50
-#: en/user_customization-runtime.new.ssi:64
-#: en/user_customization-runtime.new.ssi:76
-#: en/user_customization-runtime.new.ssi:86
-#: en/user_customization-runtime.new.ssi:94
-#: en/user_customization-runtime.new.ssi:102
-#: en/user_customization-runtime.new.ssi:110
-#: en/user_customization-runtime.new.ssi:130
-#: en/user_customization-runtime.new.ssi:138
-#: en/user_customization-runtime.new.ssi:147
-#: en/user_customization-runtime.ssi:12 en/user_customization-runtime.ssi:30
-#: en/user_customization-runtime.ssi:40 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:56 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:92
-#: en/user_customization-runtime.ssi:101 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:141 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_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,32 +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:173 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
+#: 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
@@ -139,38 +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:285
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
 #: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:334
-#: en/user_customization-runtime.new.ssi:18
-#: en/user_customization-runtime.new.ssi:38
-#: en/user_customization-runtime.new.ssi:46
-#: en/user_customization-runtime.new.ssi:54
-#: en/user_customization-runtime.new.ssi:68
-#: en/user_customization-runtime.new.ssi:80
-#: en/user_customization-runtime.new.ssi:90
-#: en/user_customization-runtime.new.ssi:98
-#: en/user_customization-runtime.new.ssi:106
-#: en/user_customization-runtime.new.ssi:114
-#: en/user_customization-runtime.new.ssi:134
-#: en/user_customization-runtime.new.ssi:143
-#: en/user_customization-runtime.new.ssi:152
-#: en/user_customization-runtime.ssi:16 en/user_customization-runtime.ssi:34
-#: en/user_customization-runtime.ssi:44 en/user_customization-runtime.ssi:52
-#: en/user_customization-runtime.ssi:60 en/user_customization-runtime.ssi:68
-#: en/user_customization-runtime.ssi:88 en/user_customization-runtime.ssi:97
-#: en/user_customization-runtime.ssi:106 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:31
+#: 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: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
@@ -179,9 +145,41 @@ msgid "}code"
 msgstr "}code"
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:12
+#: en/user_customization-runtime.ssi:2
+msgid ":B~ Customizing run time behaviours"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:4
+msgid "1~customizing-run-time-behaviours Customizing run time behaviours"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:6
+msgid ""
+"All configuration that is done during run time is done by live-config. Here "
+"are some most common options of live-config that users are interested in. A "
+"full list of all possibilities can be found in the manpage of live-config."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:8
+msgid "2~ Customizing the live user"
+msgstr ""
+
+#. type: Plain text
 #: en/user_customization-runtime.ssi:10
 msgid ""
+"One important consideration is that the live user is created by live-boot at "
+"boot time, not by live-build at build time. This not only influences where "
+"materials relating to the live user are introduced in your build, as "
+"discussed in {Live/chroot local includes}#live-chroot-local-includes, but "
+"also any groups and permissions associated with the live user."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:12
+msgid ""
 "You can specify additional groups that the live user will belong to by "
 "preseeding the #{passwd/user-default-groups}# debconf value. For example, to "
 "add the live user to the #{fuse}# group, add the following to a file in the #"
@@ -189,104 +187,108 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:16
-#: en/user_customization-runtime.ssi:14
-msgid ""
-"debconf passwd/user-default-groups string audio cdrom dialout floppy video "
-"plugdev netdev powerdev fuse"
+#: en/user_customization-runtime.ssi:16
+#, no-wrap
+msgid " debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:22
 #: en/user_customization-runtime.ssi:20
-msgid "When the live system boots, language is involved in three steps:"
+msgid "2~customizing-locale-and-language Customizing locale and language"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:24
 #: en/user_customization-runtime.ssi:22
-msgid "_* the locale generation"
+msgid "When the live system boots, language is involved in three steps:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:26
 #: en/user_customization-runtime.ssi:24
-msgid "_* setting the keyboard layout for the console"
+msgid "_* the locale generation"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:28
 #: en/user_customization-runtime.ssi:26
-msgid "_* setting the keyboard layout for X"
+msgid "_* setting the keyboard layout for the console"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:78
-#: en/user_customization-runtime.ssi:32
-msgid "lb config --bootappend-live \"locales=de_CH.UTF-8\""
+#: en/user_customization-runtime.ssi:28
+msgid "_* setting the keyboard layout for X"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:82
-#: en/user_customization-runtime.ssi:36
+#: en/user_customization-runtime.ssi:30
 msgid ""
-"This parameter can also be used in kernel command line. You can specify a "
-"locale by a full #{language_country.encoding}# word."
+"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
+"To define the locale that should be generated, use the #{locales}# parameter "
+"in the #{--bootappend-live}# option of #{lb config}#, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:34
+#, no-wrap
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:84
 #: en/user_customization-runtime.ssi:38
 msgid ""
-"Both the console and X keyboard configuration depends on the #{keyb}# "
-"parameter of the #{--bootappend-live}# option. Valid options for X keyboard "
-"layouts can be found in #{/etc/X11/xkb/base.xml}# (rather limited to two-"
-"letters country codes). To find the value (the two characters) corresponding "
-"to a language try searching for the english name of the nation where the "
-"language is spoken, e.g:"
+"This parameter can also be used at the kernel command line. You can specify "
+"a locale by a full #{language_country.encoding}# word."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:88
-#: en/user_customization-runtime.ssi:42
-msgid "$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name <name>se</name>"
+#: en/user_customization-runtime.ssi:40
+msgid ""
+"Both the console and X keyboard configuration depend on the #{keyboard-"
+"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
+"keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base.xml}# "
+"(rather limited to two-letters country codes). To find the value (the two "
+"characters) corresponding to a language try searching for the english name "
+"of the nation where the language is spoken, e.g:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:92
-#: en/user_customization-runtime.ssi:46
+#: en/user_customization-runtime.ssi:45
+#, no-wrap
+msgid ""
+" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
+" <name>se</name>\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:49
 msgid ""
 "To get the locale files for German and Swiss German keyboard layout in X use:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:96
-#: en/user_customization-runtime.ssi:50
-msgid "lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\""
+#: en/user_customization-runtime.ssi:53
+#, no-wrap
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:100
-#: en/user_customization-runtime.ssi:54
+#: en/user_customization-runtime.ssi:57
 msgid ""
 "A list of the valid values of the keyboards for the console can be figured "
 "with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:104
-#: en/user_customization-runtime.ssi:58
+#: 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.new.ssi:108
-#: en/user_customization-runtime.ssi:62
+#: 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 setup your "
+"configure console layout using X (XKB) definitions; you can then set your "
 "keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}"
 "#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use "
 "also these parameters for X configuration. For example, to set up a French "
@@ -295,22 +297,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:112
-#: en/user_customization-runtime.ssi:66
+#: 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.new.ssi:116
-#: en/user_customization-runtime.ssi:70
-msgid "2~ Persistence"
+#: en/user_customization-runtime.ssi:75
+msgid "2~persistence Persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:118
-#: en/user_customization-runtime.ssi:72
+#: 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 "
@@ -318,8 +318,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:120
-#: en/user_customization-runtime.ssi:74
+#: 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 "
@@ -328,8 +327,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:122
-#: en/user_customization-runtime.ssi:76
+#: 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 "
@@ -340,8 +338,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:124
-#: en/user_customization-runtime.ssi:78
+#: 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 "
@@ -351,14 +348,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:126
-#: en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:85
 msgid "3~ Full persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:128
-#: en/user_customization-runtime.ssi:82
+#: 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 "
@@ -370,30 +365,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:132
-#: en/user_customization-runtime.ssi:86
-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.new.ssi:136
-#: en/user_customization-runtime.ssi:90
+#: 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.new.ssi:141
-#: en/user_customization-runtime.ssi:95
+#: 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.new.ssi:145
-#: en/user_customization-runtime.ssi:99
+#: 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 "
@@ -403,30 +396,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:150
-#: en/user_customization-runtime.ssi:104
+#: 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.new.ssi:154
-#: en/user_customization-runtime.ssi:108
+#: 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.new.ssi:156
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:115
 msgid "3~ Home automounting"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:158
-#: en/user_customization-runtime.ssi:112
+#: 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 "
@@ -435,14 +425,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:160
-#: en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:119
 msgid "3~ Snapshots"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:162
-#: en/user_customization-runtime.ssi:116
+#: 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 "
@@ -459,30 +447,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:164
-#: en/user_customization-runtime.ssi:118
+#: 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.new.ssi:166
-#: en/user_customization-runtime.ssi:120
+#: 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.new.ssi:168
-#: en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:127
 msgid "3~ Persistent SubText"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:170
-#: en/user_customization-runtime.ssi:124
+#: 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-"
@@ -494,54 +478,15 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:172
-#: en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:131
 msgid "3~ Partial remastering"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:173
-#: en/user_customization-runtime.ssi:127
+#: 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 "
 "case of cd-r or adding a session to multisession cd/dvd(rw); live-boot "
 "mounts all /live filesystem in order or with the module boot parameter."
 msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:2
-msgid "B~ Customization at Runtime"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:4
-msgid ""
-"All configuration that is done during runtime is done by live-config. Here "
-"are some most common options of live-config that users are interested in. A "
-"full list of all possibilities can be found in the manpage of live-config."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:6
-msgid "1~ User"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:8
-msgid ""
-"One important consideration is that the live user is created by live-boot "
-"during bootup, it is not created by live-build when building the image."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:18
-msgid "1~ Language"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:28
-msgid ""
-"To define the locale that should be generated, use the #{locale}# parameter "
-"into the #{--bootappend-live}# option of #{lb config}#, e.g.:"
-msgstr ""
diff --git a/manual/po/fr/user_examples.ssi.po b/manual/po/fr/user_examples.ssi.po
index 9f0bb61..8f2ea47 100644
--- a/manual/po/fr/user_examples.ssi.po
+++ b/manual/po/fr/user_examples.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-28 07:51-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -17,68 +17,70 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
+#: en/live-manual.ssm:61 en/user_examples.ssi:2
+msgid ":B~ Examples"
+msgstr ""
+
+#. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:108 en/about_manual.ssi: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_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/project_bugs.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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
+#: 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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr "code{"
@@ -87,84 +89,71 @@ 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:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: 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: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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr "}code"
 
 #. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:92
-#: en/user_examples.ssi:141 en/user_examples.ssi:190
-msgid "#!/bin/sh"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
-#: en/user_examples.ssi:109 en/user_examples.ssi:156
-msgid "# lb build"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:2
-msgid ":B~ Examples"
+#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#, no-wrap
+msgid " # lb build\n"
 msgstr ""
 
 #. type: Plain text
@@ -209,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
@@ -222,7 +213,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:24
 #, no-wrap
-msgid "*{Use case:}* Create a simple first image, learning the basics of live-build\n"
+msgid "*{Use case:}* Create a simple first image, learning the basics of live-build.\n"
 msgstr ""
 
 #. type: Plain text
@@ -240,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
@@ -258,8 +250,9 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:42
-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,7 +276,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:50
 #, no-wrap
-msgid "*{Use case}* Create a web browser utility image, learning how to apply customizations\n"
+msgid "*{Use case:}* Create a web browser utility image, learning how to apply customizations.\n"
 msgstr ""
 
 #. type: Plain text
@@ -295,7 +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
@@ -317,11 +311,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:66 en/user_examples.ssi:219
-msgid "# lb build 2>&1 | tee binary.log"
-msgstr ""
-
-#. type: Plain text
 #: en/user_examples.ssi:70
 msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
 msgstr ""
@@ -334,7 +323,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:74
 #, no-wrap
-msgid "*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
+msgid "*{Use case:}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
 msgstr ""
 
 #. type: Plain text
@@ -355,9 +344,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:84
+#, no-wrap
 msgid ""
-"$ mkdir -p tutorial3/auto $ cp /usr/share/live/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
@@ -366,15 +357,21 @@ msgid "Edit #{auto/config}# to read as follows:"
 msgstr ""
 
 #. type: Plain text
+#: en/user_examples.ssi:92 en/user_examples.ssi:141
+#, 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
@@ -410,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
@@ -436,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
@@ -448,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
@@ -462,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
@@ -499,80 +507,85 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:174
-msgid "Create an image with live-build to boot directly to a VNC server."
+#, no-wrap
+msgid "*{Use case:}* Create an image with live-build to boot directly to a VNC server.\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:176
-msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:178
-msgid "_* Move to the build directory: #{$ cd vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:180
 msgid ""
-"Example to config the build directory to include gdm metacity "
-"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
+"Make a build directory and create a skeletal configuration in it built "
+"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
+"{xtightvncviewer}#, disabling recommends to make a minimal system:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:182
+#: en/user_examples.ssi:184
+#, no-wrap
 msgid ""
-"Create a folder /etc/skel folder for a custom .xsession for the default "
-"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
+" $ 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
-#: en/user_examples.ssi:184
+#: en/user_examples.ssi:188
 msgid ""
-"Create the .xsession for the default user: #{$ touch config/chroot_local-"
-"includes/etc/skel/.xsession}#"
+"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
+"the default user that will launch metacity and start xvncviewer, connecting "
+"to port #{5901}# on a server at #{192.168.1.2}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:186
+#: en/user_examples.ssi:194
+#, no-wrap
 msgid ""
-"Edit the .xsession file to launch metacity and start xvncviewer with "
-"something similar to the below:"
+" $ 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:193
-msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
+#: en/user_examples.ssi:197
+#, no-wrap
+msgid ""
+" /usr/bin/metacity &\n"
+" /usr/bin/xvncviewer 192.168.1.2:1\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:195
-msgid "exit"
+#: en/user_examples.ssi:200
+#, no-wrap
+msgid ""
+" exit\n"
+" END\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:199
-msgid "_* Build the image: #{# lb build}#"
+#: en/user_examples.ssi:204
+msgid "Build the image:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:201
-msgid "_* Enjoy."
+#: en/user_examples.ssi:212
+msgid "Enjoy."
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:203
+#: en/user_examples.ssi:214
 msgid "2~ A base image for a 128M USB key"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:205
+#: en/user_examples.ssi:216
 #, no-wrap
-msgid "*{Use case}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
+msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:207
+#: en/user_examples.ssi:218
 msgid ""
 "When optimizing an image to fit a certain media size, you need to understand "
 "the tradeoffs you are making between size and functionality. In this "
@@ -586,19 +599,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:211
+#: 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:215
+#: en/user_examples.ssi:227
 msgid "Now, build the image in the usual way:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:223
+#: 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 "
@@ -606,7 +620,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:225
+#: 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 "
@@ -622,3 +636,117 @@ msgid ""
 "you to decide if the functionality that is sacrificed with each optimization "
 "is worth the loss in functionality."
 msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:239
+msgid "2~ A localized KDE desktop and installer"
+msgstr ""
+
+#. type: Plain text
+#: 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: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 "
+"that would be installed by the standard Debian installer for KDE."
+msgstr ""
+
+#. type: Plain text
+#: 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 "
+"find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can be "
+"used to dig it out of the task descriptions in tasksel-data, so to prepare, "
+"make sure you have both of those things:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:249
+#, no-wrap
+msgid " # apt-get install dctrl-tools tasksel-data\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:253
+msgid "Now we can search for the appropriate tasks, first with:"
+msgstr ""
+
+#. type: Plain text
+#: 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"
+msgstr ""
+
+#. type: Plain text
+#: 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: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"
+msgstr ""
+
+#. type: Plain text
+#: 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"
+msgstr ""
+
+#. type: Plain text
+#: 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}"
+"#desktop-and-language-tasks for details). And at boot time we will generate "
+"the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's "
+"put the pieces together:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:295
+#, no-wrap
+msgid ""
+" $ 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"
+msgstr ""
+
+#. type: Plain text
+#: 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 "
+"flavour kernel, as it is currently necessary to make the installer and live "
+"system kernels match for the launcher to work properly."
+msgstr ""
diff --git a/manual/po/fr/user_installation.ssi.po b/manual/po/fr/user_installation.ssi.po
index 44548ee..1f8e21d 100644
--- a/manual/po/fr/user_installation.ssi.po
+++ b/manual/po/fr/user_installation.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-01 06:49-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -20,61 +20,59 @@ 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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:259
-#: en/user_customization-packages.ssi:271
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:299 en/user_customization-runtime.ssi:12
-#: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
-#: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
-#: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
-#: en/user_customization-runtime.ssi:92 en/user_customization-runtime.ssi:101
+#: 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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
 #: en/user_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_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:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:108
-#: en/user_installation.ssi:126 en/user_installation.ssi:141
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -86,61 +84,59 @@ 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:173 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: 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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:263
-#: en/user_customization-packages.ssi:275
-#: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:312 en/user_customization-runtime.ssi:16
-#: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
 #: en/user_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_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:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:112
-#: en/user_installation.ssi:131 en/user_installation.ssi:144
-#: en/user_managing_a_configuration.ssi:31
+#: 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
@@ -149,6 +145,12 @@ msgid "}code"
 msgstr "}code"
 
 #. type: Plain text
+#: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
+#, no-wrap
+msgid " $ lb config --repository live.debian.net\n"
+msgstr ""
+
+#. type: Plain text
 #: en/user_installation.ssi:2
 msgid ":B~ Installation"
 msgstr ""
@@ -233,7 +235,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:34
+#: en/user_installation.ssi:34 en/user_installation.ssi:104
 msgid "3~ From the Debian repository"
 msgstr ""
 
@@ -244,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
@@ -254,11 +257,12 @@ 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
-#: en/user_installation.ssi:52
+#: en/user_installation.ssi:52 en/user_installation.ssi:108
 msgid "3~ From source"
 msgstr ""
 
@@ -272,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
@@ -282,41 +287,55 @@ 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
-#: en/user_installation.ssi:70
-msgid "# dpkg -i live-build*.deb"
+#: en/user_installation.ssi:72
+msgid ""
+"Now install whichever of the freshly built #{.deb}# files you were "
+"interested in, e.g."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:74
+#: en/user_installation.ssi:76
+#, no-wrap
+msgid " # dpkg -i live-build_2.0.8-1_all.deb\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:80
 msgid "You can also install live-build directly to your system by executing:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:78
-msgid "# make install"
+#: en/user_installation.ssi:84
+#, no-wrap
+msgid " # make install\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:82
+#: en/user_installation.ssi:88
 msgid "and uninstall it with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:86
-msgid "# make uninstall"
+#: en/user_installation.ssi:92
+#, no-wrap
+msgid " # make uninstall\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:90
+#: en/user_installation.ssi:96 en/user_installation.ssi:142
 msgid "3~ From 'snapshots'"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:92
+#: en/user_installation.ssi:98
 msgid ""
 "If you do not wish to build or install live-build from source, you can use "
 "snapshots. These are built automatically from the latest version in Git and "
@@ -324,86 +343,65 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:94
-msgid "2~ live-boot"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:96
-#, no-wrap
-msgid "*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:98
-msgid "% FIXME: we also need to mention live-config"
-msgstr ""
-
-#. type: Plain text
 #: en/user_installation.ssi:100
-msgid "3~ Using a customized live-boot"
+msgid "2~ live-boot and live-config"
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:102
-msgid ""
-"% FIXME: should follow the structure for live-build above (i.e. \"from source"
-"\", not \"customized\" -- we should not get into customization now, but "
-"should reserve that discussion for later."
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:104
-msgid ""
-"To modify the code you can follow the process below. Please ensure you are "
-"familiar with the terms mentioned in {Terms}#terms."
+#, no-wrap
+msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:106
-msgid "_* Checkout the live-boot source"
+msgid ""
+"Both live-boot and live-config are available from the Debian repository as "
+"per {Installing live-build}#installing-live-build."
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:110
-msgid "$ git clone git://live.debian.net/git/live-boot.git"
+msgid ""
+"To use the latest source from git, you can follow the process below. Please "
+"ensure you are familiar with the terms mentioned in {Terms}#terms."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:114
-msgid "_* Make changes to your local copy"
+#: en/user_installation.ssi:112
+msgid "_* Checkout the live-boot and live-config source"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:116
+#: en/user_installation.ssi:117
+#, no-wrap
 msgid ""
-"% FIXME: as indicated above, it's too early for this topic. Move to later in "
-"the manual."
+" $ 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
-#: en/user_installation.ssi:118
+#: en/user_installation.ssi:121
 msgid ""
-"And beware that if you want to add your pre-init script in live-bottom, you "
-"should name it without dashes '-', e.g: call it \"99new_feature\" and not "
-"\"99new-feature\"."
+"Consult the live-boot and live-config man pages for details on customizing "
+"if that is your reason for building these packages from source."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:120
-msgid "_* Build a live-boot .deb"
+#: en/user_installation.ssi:123
+msgid "_* Build live-boot and live-config .deb files"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:122
+#: en/user_installation.ssi:125
 msgid ""
 "You must build either on your target distribution or in a chroot containing "
 "your target platform: this means if your target is Squeeze then you should "
-"build against Squeeze. Y"
+"build against Squeeze."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:124
+#: en/user_installation.ssi:127
 msgid ""
 "Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
 "build #{live-boot}# for a target distribution that differs from your build "
@@ -414,40 +412,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:129
-msgid "$ cd live-boot $ dpkg-buildpackage -b -uc -us"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:133
-msgid "_* Use the generated live-boot .deb"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:135
+#: en/user_installation.ssi:134
+#, no-wrap
 msgid ""
-"As live-boot is installed by live-build system, installing the package in "
-"the host system is not sufficient: you should treat the generated .deb like "
-"another custom package. Please see {Customizing package installation}"
-"#customizing-package-installation for more information. You should pay "
-"particular attention to {Additional repositories}#additional-repositories."
+" $ cd live-boot\n"
+" $ dpkg-buildpackage -b -uc -us\n"
+" $ cd ../live-config\n"
+" $ dpkg-buildpackage -b -uc -us\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:137
-msgid "3~ Using live-boot snapshots"
+#: en/user_installation.ssi:138
+msgid "_* Use all generated .deb files"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:139
+#: en/user_installation.ssi:140
 msgid ""
-"You can let live-build automatically use the latest snapshot of live-boot by "
-"configuring a third-party repository in your live-build configuration "
-"directory. Assuming you have already created a configuration tree with #{lb "
-"config}#:"
+"As live-boot and live-config are installed by live-build system, installing "
+"the packages in the host system is not sufficient: you should treat the "
+"generated .deb files like any other custom packages. Please see {Customizing "
+"package installation}#customizing-package-installation for more information. "
+"You should pay particular attention to {Additional repositories}#additional-"
+"repositories."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:143
-msgid "lb config --repository live.debian.net"
+#: en/user_installation.ssi:144
+msgid ""
+"You can let live-build automatically use the latest snapshots of live-boot "
+"and live-config by configuring a third-party repository in your live-build "
+"configuration directory. Assuming you have already created a configuration "
+"tree with #{lb config}#:"
 msgstr ""
diff --git a/manual/po/fr/user_managing_a_configuration.ssi.po b/manual/po/fr/user_managing_a_configuration.ssi.po
index 404d53e..c272cb7 100644
--- a/manual/po/fr/user_managing_a_configuration.ssi.po
+++ b/manual/po/fr/user_managing_a_configuration.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-01 05:55-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -20,60 +20,59 @@ 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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_customization-runtime.ssi:12
-#: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
-#: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
-#: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
-#: en/user_customization-runtime.ssi:92 en/user_customization-runtime.ssi:101
+#: 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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
 #: en/user_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_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:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:108
-#: en/user_installation.ssi:126 en/user_installation.ssi:144
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -85,60 +84,59 @@ 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:173 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: 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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_customization-runtime.ssi:16
-#: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
 #: en/user_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_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:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:112
-#: en/user_installation.ssi:131 en/user_installation.ssi:147
-#: en/user_managing_a_configuration.ssi:31
+#: 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
@@ -194,8 +192,9 @@ msgstr ""
 msgid ""
 "A second, related problem is that if you run #{lb config}# and then upgrade "
 "to a new version of live-build that has changed one of the variable names, "
-"you will discover this only by manual review of the variables in your config "
-"files, which you will then need to use to set the appropriate option again."
+"you will discover this only by manual review of the variables in your #"
+"{config/*}# files, which you will then need to use to set the appropriate "
+"option again."
 msgstr ""
 
 #. type: Plain text
@@ -238,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
@@ -253,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
@@ -267,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
@@ -279,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 ed9a748..a16ff73 100644
--- a/manual/po/fr/user_overview.ssi.po
+++ b/manual/po/fr/user_overview.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-10-28 16:34-0200\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -17,122 +17,129 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: 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/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.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:140
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/project_bugs.ssi: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: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: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_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
+#: 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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: 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_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 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: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_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
-#: en/user_customization-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: 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_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr "}code"
@@ -185,11 +192,11 @@ msgstr ""
 #: en/user_overview.ssi:16
 msgid ""
 "_* The scripts have a central location for configuring their operation. In "
-"debhelper, this is the debian subdirectory of a package tree. For example, "
-"dh_install will look, amongst others, for a file called #{debian/install}# "
-"to determine which files should exist in a particular binary package. In "
-"much the same way, live-build stores its configuration entirely under a "
-"config subdirectory."
+"debhelper, this is the #{debian/}# subdirectory of a package tree. For "
+"example, dh_install will look, amongst others, for a file called #{debian/"
+"install}# to determine which files should exist in a particular binary "
+"package. In much the same way, live-build stores its configuration entirely "
+"under a #{config/}# subdirectory."
 msgstr ""
 
 #. type: Plain text
@@ -244,7 +251,7 @@ msgstr ""
 #: en/user_overview.ssi:32
 msgid ""
 "As discussed in {live-build}#live-build, the scripts that make up live-build "
-"source their configuration from a single directory named config/. As "
+"source their configuration from a single directory named #{config/}#. As "
 "constructing this directory by hand would be time-consuming and error-prone, "
 "the #{lb config}# command can be used to create skeleton configuration "
 "folders."
@@ -253,45 +260,59 @@ msgstr ""
 #. type: Plain text
 #: en/user_overview.ssi:34
 msgid ""
-"Issuing #{lb config}# without any arguments creates a config subdirectory "
-"which it populates with some default settings:"
+"Issuing #{lb config}# without any arguments creates a #{config/}# "
+"subdirectory which it populates with some default settings:"
 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
@@ -312,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
@@ -322,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
new file mode 100644
index 0000000..7f4ad9d
--- /dev/null
+++ b/manual/po/it/about_manual.ssi.po
@@ -0,0 +1,724 @@
+# Italian translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+# Carlo Stemberger <carlo.stemberger at gmail.com>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual 2.0.0\n"
+"POT-Creation-Date: 2010-12-20 05:58-0400\n"
+"PO-Revision-Date: 2010-12-11 02:34+0100\n"
+"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
+"Language-Team: Italian <tp at lists.linux.it>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:2
+msgid ":B~ About this manual"
+msgstr ":B~ A proposito di questo manuale"
+
+#. type: Plain text
+#: en/about_manual.ssi:4
+msgid "1~ About this manual"
+msgstr "1~ A proposito di questo manuale"
+
+#. type: Plain text
+#: en/about_manual.ssi:6
+msgid ""
+"The main goal of this manual is to serve as a single access point to all "
+"documentation related to the Debian Live project. It does not include end-"
+"user documentation for using a Debian Live system as far as things are live "
+"specific."
+msgstr ""
+"L'obiettivo di questo manuale è quello di servire da punto di accesso "
+"centralizzato per tutta la documentazione relativa al progetto Debian Live; "
+"non include documentazione rivolta agli utenti finali sul come usare un "
+"sistema Debian Live, se non quella specifica per un sistema live."
+
+#. type: Plain text
+#: en/about_manual.ssi:8
+msgid ""
+"Some of the commands mentioned in the text must be executed with superuser "
+"privileges which can be obtained by becoming the root user via #{su}# or by "
+"using #{sudo}#. To distinguish between commands which may be executed by an "
+"unprivileged user and those requiring superuser privileges, commands are "
+"prepended by #{$}# or #{#}# respectively. This symbol is not a part of the "
+"command."
+msgstr ""
+"Alcuni dei comandi menzionati nel testo devono essere eseguiti con i "
+"privilegi di super-utente che possono essere ottenuti diventando utente root "
+"tramite #{su}# oppure usando #{sudo}#. Per distinguere i comandi che possono "
+"essere eseguiti come utente normale da quelli che necessitano dei privilegi "
+"di super-utente, i comandi sono preceduti rispettivamente da #{$}# o #{#}#. "
+"Questi simboli non fanno parte del comando."
+
+#. type: Plain text
+#: en/about_manual.ssi:10
+msgid "2~ For the impatient"
+msgstr "2~ Per gli impazienti"
+
+#. type: Plain text
+#: en/about_manual.ssi:12
+msgid ""
+"While we believe that everything in this manual is important to at least "
+"some of our users, we realize it is a lot of material to cover and that you "
+"may wish to experience early success using the software before delving into "
+"the details. Therefore, we have provided three tutorials in the {Examples}"
+"#examples section designed to teach you image building and customization "
+"basics. Read {Using the examples}#using-the-examples first, followed by "
+"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
+"utility}#tutorial-2 and finally {Tutorial 3: A personalized image}"
+"#tutorial-3. By the end of these tutorials, you will have a taste of what "
+"can be done with Debian Live. We encourage you to return to more in-depth "
+"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
+"or skipping {Building a netboot image}#building-netboot-image, and finishing "
+"by reading the {Customization overview}#customization-overview and the "
+"chapters that follow it. By this point, we hope you are thoroughly excited "
+"by what can be done with Debian Live and motivated to read the rest of the "
+"manual, cover-to-cover."
+msgstr ""
+"Sebbene crediamo che ogni cosa in questo manuale sia importante almeno per "
+"alcuni dei nostri utenti, ci rendiamo conto che c'è tanto materiale da "
+"trattare e che si potrebbe voler provare il software prima di entrare nei "
+"dettagli. Pertanto, abbiamo messo a disposizione nella sezione {Esempi}"
+"#examples tre tutorial progettati per insegnarvi le basi della costruzione e "
+"della personalizzazione delle immagini. Si legga innanzitutto {Usare gli "
+"esempi}#using-the-examples, seguito da {Tutorial 1: un'immagine standard}"
+"#tutorial-1, {Tutorial 2: un programma di utilità web browser}#tutorial-2 e, "
+"infine, {Tutorial 3: un'immagine personalizzata}#tutorial-3. Alla fine di "
+"queste esercitazioni, si avrà un assaggio di ciò che si può fare con Debian "
+"Live. Ti invitiamo ad uno studio più approfondito del manuale, magari "
+"leggendo in seguito {Nozioni di base}#the-basics, sfogliando o saltando "
+"{Creare un'immagine netboot}#building-netboot-image, e finendo con la "
+"lettura di {Panoramica sulla personalizzazione}#customization-overview e dei "
+"capitoli che lo seguono. A questo punto, ci auguriamo che tu sia davvero "
+"eccitato da ciò che si può fare con Debian Live e motivato a leggere il "
+"resto del manuale, da cima a fondo."
+
+#. type: Plain text
+#: en/about_manual.ssi:14
+msgid "2~terms Terms"
+msgstr "2~terms Glossario"
+
+#. type: Plain text
+#: en/about_manual.ssi:16
+msgid ""
+"_* *{Live system}*: An operating system that can boot without installation "
+"to a hard drive. Live systems do not alter local operating system(s) or file"
+"(s) already installed on the computer hard drive unless instructed to do so. "
+"Live systems are typically booted from media such as CDs, DVDs or USB "
+"sticks. Some may also boot over the network."
+msgstr ""
+"_* *{Live system}*: Un sistema operativo che può partire senza installazione "
+"su disco rigido. I sistemi live non alterano né il sistema operativo locale "
+"(o i sistemi operativi locali) né i file già installati sul disco rigido del "
+"computer a meno che lo si faccia volontariamente. I sistemi live vengono "
+"solitamente avviati da supporti quali CD, DVD o penne USB; alcuni possono "
+"anche avviarsi via rete."
+
+#. type: Plain text
+#: en/about_manual.ssi:18
+msgid ""
+"_* *{Debian Live}*: The Debian sub-project which maintains the live-boot, "
+"live-build, live-config, and live-manual packages."
+msgstr ""
+"_* *{Debian Live}*: Il sotto-progetto Debian che mantiene i pacchetti live-"
+"boot, live-build, live-config e live-manual."
+
+#. type: Plain text
+#: en/about_manual.ssi:20
+msgid ""
+"_* *{Debian Live system}*: A live system that uses software from the Debian "
+"operating system that may be booted from CDs, DVDs, USB sticks, over the "
+"network (via netboot images), and over the Internet (via boot parameter #"
+"{fetch=URL}#)."
+msgstr ""
+"_* *{Debian Live system}*: Un sistema live che usa software proveniente dal "
+"sistema operativo Debian e che può essere lanciato da CD, DVD, supporti USB, "
+"via rete (tramite immagini netboot) e via internet (tramite il parametro di "
+"boot #{fetch=URL}#)."
+
+#. type: Plain text
+#: en/about_manual.ssi:22
+msgid "_* *{Host system}*: The environment used to create the live system."
+msgstr "_* *{Host system}*: L'ambiente utilizzato per creare il sistema live."
+
+#. type: Plain text
+#: en/about_manual.ssi:24
+msgid "_* *{Target system}*: The environment used to run the live system."
+msgstr "_* *{Target system}*: L'ambiente usato per eseguire il sistema live."
+
+#. type: Plain text
+#: en/about_manual.ssi:26
+msgid ""
+"_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
+"boot was formerly a part of live-initramfs."
+msgstr ""
+"_* *{live-boot}*: Una raccolta di script usati per avviare sistemi live. "
+"live-boot era una parte di live-initramfs."
+
+#. type: Plain text
+#: en/about_manual.ssi:28
+msgid ""
+"_* *{live-build}*: A collection of scripts used to build customized Debian "
+"Live systems. live-build was formerly known as live-helper, and even earlier "
+"known as live-package."
+msgstr ""
+"_* *{live-build}*: Una raccolta di script usati per creare sistemi Debian "
+"Live personalizzati. live-build era conosciuto come live-helper, ed ancora "
+"prima come live-package."
+
+#. type: Plain text
+#: en/about_manual.ssi:30
+msgid ""
+"_* *{live-config}*: A collection of scripts used to configure a live system "
+"during the boot process. live-config was formerly a part of live-initramfs."
+msgstr ""
+"_* *{live-config}*: Una raccolta di script usati per configurare un sistema "
+"live durante il processo di inizializzazione. live-config era una parte di "
+"live-initramfs."
+
+#. type: Plain text
+#: en/about_manual.ssi:32
+msgid ""
+"_* *{live-manual}*: This document is maintained in a package called live-"
+"manual."
+msgstr ""
+"_* *{live-manual}*: Questo documento è inserito nel pacchetto chiamato live-"
+"manual."
+
+#. type: Plain text
+#: en/about_manual.ssi:34
+msgid ""
+"_* *{Debian Installer (d-i)}*: The official installation system for the "
+"Debian distribution."
+msgstr ""
+"_* *{Debian Installer (d-i)}*: Il sistema d'installazione ufficiale per la "
+"distribuzione Debian."
+
+#. type: Plain text
+#: en/about_manual.ssi:36
+msgid ""
+"_* *{Boot parameters}*: Parameters that can be entered at the bootloader "
+"prompt to influence the kernel or live-config."
+msgstr ""
+"_* *{Boot parameters}*: Parametri che possono essere immessi nel prompt del "
+"boot loader per modificare il comportamento del kernel o di live-config."
+
+#. type: Plain text
+#: en/about_manual.ssi:38
+msgid ""
+"_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
+"different instances of the GNU/Linux environment on a single system "
+"simultaneously without rebooting."
+msgstr ""
+"_* *{chroot}*: Il programma chroot, #{chroot(8)}#, rende possibile eseguire "
+"diverse istanze dell'ambiente GNU/Linux su un singolo sistema "
+"simultaneamente senza riavviare."
+
+#. type: Plain text
+#: en/about_manual.ssi:40
+msgid ""
+"_* *{Binary image}*: A file containing the live system, such as binary.iso "
+"or binary.img."
+msgstr ""
+"_* *{Binary image}*: Un file che contiene il sistema live, come binary.iso o "
+"binary.img."
+
+#. type: Plain text
+#: en/about_manual.ssi:42
+msgid ""
+"_* *{Target distribution}*: The distribution upon which your live system "
+"will be based. This can differ from the distribution of your host system."
+msgstr ""
+"_* *{Target distribution}*: La distribuzione su cui sarà basato il sistema "
+"live. Può differire dalla distribuzione presente sul proprio computer."
+
+#. type: Plain text
+#: en/about_manual.ssi:44
+msgid ""
+"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Debian codenames for "
+"releases. At the time of writing, Squeeze is the current *{stable}* release "
+"and Wheezy is the current *{testing}* release. Sid will always be a synonym "
+"for the *{unstable}* release. Throughout the manual, we tend to use "
+"codenames for the releases, as that is what is supported by the tools "
+"themselves."
+msgstr ""
+"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Nomi in codice per i "
+"rilasci Debian; al momento Squeeze è l'attuale *{stable}* e Wheezy l'attuale "
+"*{testing}*. Sid sarà sempre il sinonimo della *{unstable}*. In tutto il "
+"manuale si tende ad usare i nomi in codice dei rilasci, in quanto questo è "
+"ciò che è previsto dagli strumenti stessi."
+
+#. type: Plain text
+#: en/about_manual.ssi:46
+msgid ""
+"The *{stable}* distribution contains the latest officially released "
+"distribution of Debian. The *{testing}* distribution is the staging area for "
+"the next *{stable}* release. A major advantage of using this distribution is "
+"that it has more recent versions of software relative to the *{stable}* "
+"release. The *{unstable}* distribution is where active development of Debian "
+"occurs. Generally, this distribution is run by developers and those who like "
+"to live on the edge."
+msgstr ""
+"La distribuzione *{stable}* contiene l'ultima distribuzione ufficialmente "
+"rilasciata da Debian; la *{testing}* è il punto di raccolta per i pacchetti "
+"della prossima *{stable}*. Uno dei principali vantaggi nell'uso di questa "
+"distribuzione sta nell'avere software più recente rispetto alla *{stable}*. "
+"La distribuzione *{unstable}* è dove avviene lo sviluppo attivo di Debian; "
+"viene generalmente usata dagli sviluppatori o da coloro che amano l'azzardo."
+
+#. type: Plain text
+#: en/about_manual.ssi:48
+msgid "2~ Authors"
+msgstr "2~ Autori"
+
+#. type: Plain text
+#: en/about_manual.ssi:50
+msgid "A list of authors (in alphabetical order):"
+msgstr "Lista degli autori (in ordine alfabetico):"
+
+#. type: Plain text
+#: en/about_manual.ssi:52
+msgid "_* Ben Armstrong"
+msgstr "_* Ben Armstrong"
+
+#. type: Plain text
+#: en/about_manual.ssi:54
+msgid "_* Brendan Sleight"
+msgstr "_* Brendan Sleight"
+
+#. type: Plain text
+#: en/about_manual.ssi:56
+msgid "_* Chris Lamb"
+msgstr "_* Chris Lamb"
+
+#. type: Plain text
+#: en/about_manual.ssi:58
+msgid "_* Daniel Baumann"
+msgstr "_* Daniel Baumann"
+
+#. type: Plain text
+#: en/about_manual.ssi:60
+msgid "_* Franklin Piat"
+msgstr "_* Franklin Piat"
+
+#. type: Plain text
+#: en/about_manual.ssi:62
+msgid "_* Jonas Stein"
+msgstr "_* Jonas Stein"
+
+#. type: Plain text
+#: en/about_manual.ssi:64
+msgid "_* Kai Hendry"
+msgstr "_* Kai Hendry"
+
+#. type: Plain text
+#: en/about_manual.ssi:66
+msgid "_* Marco Amadori"
+msgstr "_* Marco Amadori"
+
+#. type: Plain text
+#: en/about_manual.ssi:68
+msgid "_* Mathieu Geli"
+msgstr "_* Mathieu Geli"
+
+#. type: Plain text
+#: en/about_manual.ssi:70
+msgid "_* Matthias Kirschner"
+msgstr "_* Matthias Kirschner"
+
+#. type: Plain text
+#: en/about_manual.ssi:72
+msgid "_* Richard Nelson"
+msgstr "_* Richard Nelson"
+
+#. type: Plain text
+#: en/about_manual.ssi:74
+msgid "_* Trent W. Buck"
+msgstr "_* Trent W. Buck"
+
+#. type: Plain text
+#: en/about_manual.ssi:76
+msgid "2~ Contributing to this document"
+msgstr "2~ Contribuire a questo documento"
+
+#. type: Plain text
+#: en/about_manual.ssi:78
+msgid ""
+"This manual is intended as a community project and all proposals for "
+"improvements and contributions are extremely welcome. The preferred way to "
+"submit a contribution is to send it to the mailing list. Please see the "
+"section {Contact}#contact for more information."
+msgstr ""
+"Questo manuale è pensato come un progetto comunitario e ogni suggerimento e "
+"contributo è benvenuto. Il modo migliore per apportare un contributo è di "
+"inviarlo alla mailing list. Per maggiori informazioni si veda la sezione "
+"{Contatti}#contact."
+
+#. type: Plain text
+#: en/about_manual.ssi:80
+msgid ""
+"When submitting a contribution, please clearly identify its copyright holder "
+"and include the licensing statement. Note that to be accepted, the "
+"contribution must be licensed under the same license as the rest of the "
+"document, namely, GPL version 3 or later."
+msgstr ""
+"Quando si sottopone un contributo, si prega di indicare chiaramente il "
+"detentore del copyright e di includere la licenza. Si noti che, per essere "
+"accettato, il contributo deve essere distribuito con la stessa licenza del "
+"resto del documento, ovvero la GPL versione 3 o successiva."
+
+#. type: Plain text
+#: en/about_manual.ssi:82
+msgid ""
+"The sources for this manual are maintained using the Git version control "
+"system. You can check out the latest copy by executing:"
+msgstr ""
+"I sorgenti di questo manuale sono mantenuti utilizzando il sistema di "
+"controllo Git. Si può visionare la copia più recente eseguendo:"
+
+#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:86
+msgid "$ git clone git://live.debian.net/git/live-manual.git"
+msgstr "$ git clone git://live.debian.net/git/live-manual.git"
+
+#. type: Plain text
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/about_manual.ssi:90
+msgid ""
+"Prior to submission of your contribution, please preview your work. To "
+"preview the live-manual, ensure the packages needed for building are "
+"installed by executing:"
+msgstr ""
+"Prima di sottoporre un contributo, si prega di visionare l'anteprima del "
+"proprio lavoro. Per ottenere l'anteprima di live-manual, assicurarsi di "
+"avere installati i pacchetti necessari per la sua compilazione eseguendo:"
+
+#. type: Plain text
+#: en/about_manual.ssi:94
+#, no-wrap
+msgid " # apt-get install make po4a sisu-complete libnokogiri-ruby\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:98
+msgid ""
+"You may build the live-manual from the top level directory of your Git "
+"checkout by executing:"
+msgstr ""
+"Si può compilare il live-manual dalla directory superiore del checkout di "
+"Git eseguendo:"
+
+#. type: Plain text
+#: en/about_manual.ssi:102
+#, no-wrap
+msgid " $ make build\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:106
+msgid ""
+"Since it takes a while to build the manual in all supported languages, you "
+"may find it convenient when proofing to build for only one language, e.g. by "
+"executing:"
+msgstr ""
+"Dato che occorre del tempo per compilare il manuale in tutte le lingue "
+"supportate, può risultare conveniente farlo per una sola lingua, ad esempio "
+"eseguendo:"
+
+#. type: Plain text
+#: en/about_manual.ssi:110
+#, no-wrap
+msgid " $ make build LANGUAGES=en\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:114
+msgid "3~ Applying patches"
+msgstr "3~ Applicare le patch"
+
+#. type: Plain text
+#: en/about_manual.ssi:116
+msgid ""
+"Anyone can directly commit to the repository. However, we ask you to send "
+"bigger changes to the mailing list to discuss them first. To push to the "
+"repository, you must follow this procedure:"
+msgstr ""
+"Chiunque può eseguire il commit direttamente sul repository; tuttavia "
+"chiediamo di inviare le modifiche più corpose in mailing list, per poterne "
+"prima discuterne. Per eseguire il push sul repository, si deve seguire "
+"questa procedura:"
+
+#. type: Plain text
+#: en/about_manual.ssi:118
+msgid "_* Fetch the public commit key:"
+msgstr "_* Prelevare la chiave pubblica:"
+
+#. type: Plain text
+#: 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"
+"     -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
+#: en/about_manual.ssi:131
+msgid "_* Add the following section to your openssh-client config:"
+msgstr ""
+"_* Aggiungere la seguente sezione alla propria configurazione di openssh-"
+"client:"
+
+#. type: Plain text
+#: 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"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:144
+msgid "_* Check out a clone of the manual through ssh:"
+msgstr "_* Scaricare tramite ssh un clone del manuale:"
+
+#. type: Plain text
+#: en/about_manual.ssi:148
+#, no-wrap
+msgid " $ git clone gitosis at live.debian.net:/live-manual.git\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:152
+msgid ""
+"_* After editing the files in #{manual/en/}#, please call the 'commit' "
+"target in the top level directory to sanitize the files and update the "
+"translation files:"
+msgstr ""
+"_* Dopo aver modificato i file in #{manual/en/}#, chiamare il target "
+"'commit' nella directory superiore per bonificare i file ed aggiornare i "
+"file di traduzione:"
+
+#. type: Plain text
+#: en/about_manual.ssi:156
+#, no-wrap
+msgid " $ make commit\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:160
+msgid ""
+"_* After sanitizing, commit the changes. Write commit messages that consist "
+"of full, useful sentences in English, starting with a capital letter and "
+"ending with a full stop. Usually, these will start with the form 'Fixing/"
+"Adding/Removing/Correcting/Translating', e.g."
+msgstr ""
+"_* Dopo la pulizia è possibile eseguire il commit delle modifiche. Si "
+"scrivano messaggi costituiti da frasi in inglese esaurienti ed utili, "
+"inizianti con una lettera maiuscola e terminanti con un punto. Solitamente "
+"cominceranno con la forma 'Fixing/Adding/Removing/Correcting/Translating', "
+"ad esempio."
+
+#. type: Plain text
+#: en/about_manual.ssi:164
+#, no-wrap
+msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:168
+msgid "_* Push the commit to the server:"
+msgstr "_* Inviare il commit al server:"
+
+#. type: Plain text
+#: en/about_manual.ssi:172
+#, no-wrap
+msgid " $ git push\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:176
+msgid "3~ Translation"
+msgstr "3~ Traduzione"
+
+#. type: Plain text
+#: en/about_manual.ssi:178
+msgid "To submit a translation for a new language, follow these three steps:"
+msgstr ""
+"Per inviare una traduzione per una nuova lingua, seguire questi tre passi:"
+
+#. type: Plain text
+#: en/about_manual.ssi:180
+msgid ""
+"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
+"in.pot files to your language with your favourite editor (such as poedit). "
+"Send translated files to the mailing list. Once we have reviewed your "
+"submission, we will add the new language to the manual (providing the po "
+"files) and will enable it in the autobuild."
+msgstr ""
+"_* Tradurre i file about_manual.ssi.pot, about_project.ssi.pot e index.html."
+"in.pot nella propria lingua con il proprio editor preferito (tipo poedit). "
+"Inviare i file tradotti alla mailing list. Una volta che abbiamo ricevuto il "
+"contributo, aggiungeremo la nuova lingua al manuale (fornendo i file po) e "
+"la attiveremo per la procedura di compilazione automatica."
+
+#. type: Plain text
+#: en/about_manual.ssi:182
+msgid ""
+"_* Once the new language is added, you can randomly start translating all po "
+"files in #{manual/po/}#."
+msgstr ""
+"_* Una volta che la nuova lingua è stata aggiunta, si può iniziare a "
+"tradurre tutti i file po situati in #{manual/po/}#, nell'ordine che si "
+"preferisce."
+
+#. type: Plain text
+#: en/about_manual.ssi:184
+msgid ""
+"_* Don't forget you need #{make commit}# to ensure the translated manuals "
+"are updated from the po files, before #{git commit -a}# and #{git push}#."
+msgstr ""
+"_* Non si dimentichi che è necessario dare un #{make commit}# per "
+"assicurarsi che i manuali tradotti siano aggiornati partendo dai file po, "
+"prima di #{git commit -a}# e #{git push}#."
diff --git a/manual/po/ro/about_project.ssi.po b/manual/po/it/about_project.ssi.po
similarity index 56%
copy from manual/po/ro/about_project.ssi.po
copy to manual/po/it/about_project.ssi.po
index b1976b9..e22ddf2 100644
--- a/manual/po/ro/about_project.ssi.po
+++ b/manual/po/it/about_project.ssi.po
@@ -1,32 +1,40 @@
-# Romanian translations for live-manual package
-# 2010 Eugen Paiuc <linux51 at bluewin.ch>
+# Italian translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.0~a8\n"
+"Project-Id-Version: live-manual 2.0.0\n"
 "POT-Creation-Date: 2010-11-27 10:30-0400\n"
-"Last-Translator: Eugen Paiuc <linux51 at bluewin.ch>\n"
+"PO-Revision-Date: 2010-12-06 13:56+0100\n"
+"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
+"Language-Team: Italian <tp at lists.linux.it>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2: plural=(n !=1)\n"
 
 #. type: Plain text
 #: en/about_project.ssi:2
 msgid ":B~ About the Debian Live Project"
-msgstr ":B~ Despre Proiectul Debian Live"
+msgstr ":B~ A proposito del progetto Debian Live"
 
 #. type: Plain text
 #: en/about_project.ssi:4
 msgid "1~ About the Debian Live Project"
-msgstr "1~ Despre Proiectul Debian Live"
+msgstr "1~ A proposito del progetto Debian Live"
 
 #. type: Plain text
 #: en/about_project.ssi:6
 msgid "2~ Motivation"
-msgstr "2~ Motivatie"
+msgstr "2~ Motivazioni"
 
 #. type: Plain text
 #: en/about_project.ssi:8
 msgid "3~ What is wrong with current live systems"
-msgstr "3~ Ce nu e bine cu sistemele live actuale"
+msgstr "3~ Cosa c'è di sbagliato con gli attuali sistemi live"
 
 #. type: Plain text
 #: en/about_project.ssi:10
@@ -35,25 +43,26 @@ msgid ""
 "systems available and they are doing a great job. From the Debian "
 "perspective most of them have one or more of the following disadvantages:"
 msgstr ""
-"La momentul de inceput al proiectului Debian Live existau deja cateva "
-"sisteme Debian live si ele au depus o munca interesanta. Din perspectiva "
-"Debian marea majoritate a acestor sisteme au urmatoarele dezavantaje:"
+"Quando Debian Live iniziò erano disponibili svariati sistemi live basati su "
+"Debian che tuttora stanno facendo un buon lavoro. Dal punto di vista di "
+"Debian molti di essi hanno uno o più dei seguenti svantaggi:"
 
 #. type: Plain text
 #: en/about_project.ssi:12
 msgid "_* They are unofficial projects, developed outside of Debian."
-msgstr "_* Sunt proiecte neoficiale, dezvoltate in afara proiectului Debian."
+msgstr "_* Sono progetti non ufficiali, sviluppati al di fuori di Debian."
 
 #. type: Plain text
 #: en/about_project.ssi:14
 msgid "_* They mix different distributions, e.g. *{testing}* and *{unstable}*."
 msgstr ""
-"_* Ele amalgameaza diferite distributii, ca *{testing}* si *{unstable}*."
+"_* Mischiano differenti distribuzioni come ad esempio: *{testing}* e *"
+"{unstable}*."
 
 #. type: Plain text
 #: en/about_project.ssi:16
 msgid "_* They support i386 only."
-msgstr "_* Ele suporta doar arhitectura i386."
+msgstr "_* Supportano solamente i386."
 
 #. type: Plain text
 #: en/about_project.ssi:18
@@ -61,13 +70,13 @@ msgid ""
 "_* They modify the behaviour and/or appearance of packages by stripping them "
 "down to save space."
 msgstr ""
-"_* Ele au modificat comportamentul si /sau aspectul programelor pentru a "
-"castuga spatiu."
+"_* Modificano l'aspetto e il comportamento dei pacchetti snellendoli per "
+"risparmiare spazio."
 
 #. type: Plain text
 #: en/about_project.ssi:20
 msgid "_* They include unofficial packages."
-msgstr "_* Ele includ programe neoficiale."
+msgstr "_* Includono pacchetti non ufficiali."
 
 #. type: Plain text
 #: en/about_project.ssi:22
@@ -75,8 +84,7 @@ msgid ""
 "_* They ship custom kernels with additional patches that are not part of "
 "Debian."
 msgstr ""
-"_* Ele folosesc kernele modificate care contin patch-uri ce nu fac parte din "
-"Debian."
+"_* Forniscono un kernel con patch addizionali che non appartengono a Debian."
 
 #. type: Plain text
 #: en/about_project.ssi:24
@@ -84,8 +92,8 @@ msgid ""
 "_* They are large and slow due to their sheer size and thus not suitable for "
 "rescue issues."
 msgstr ""
-"_* Ele sunt greoaie si lente datorete marimii lor si deci inapropiate pentru "
-"situatii de salvare/rescue."
+"_* Sono grandi e lenti a causa delle loro dimensioni e non adatti per "
+"operazioni di salvataggio."
 
 #. type: Plain text
 #: en/about_project.ssi:26
@@ -93,13 +101,13 @@ msgid ""
 "_* They are not available in different flavours, e.g. CDs, DVDs, USB-stick "
 "and netboot images."
 msgstr ""
-"_* Ele nu sunt disponibile in diferite sosuri ca CDs, DVDs, USB-stick si "
-"netboot images."
+"_* Non sono disponibili in diversi formati come CD, DVD, penne USB e "
+"immagini netboot."
 
 #. type: Plain text
 #: en/about_project.ssi:28
 msgid "3~ Why create our own live system?"
-msgstr "3~ De ce e nevoie de propriul nostru sistem live ?"
+msgstr "3~ Perché creare il proprio sistema live?"
 
 #. type: Plain text
 #: en/about_project.ssi:30
@@ -108,49 +116,49 @@ msgid ""
 "for showing around and to officially represent the true, one and only Debian "
 "system with the following main advantages:"
 msgstr ""
-"Debian este 'the Universal Operating System/Sistemul de Operare Universal' : "
-"Debian are un sistem live oficial pentru a se arata in jur si a reprezenta "
-"oficial adevarul, doar sistemul Debian are principalele avantaje:"
+"Debian è il Sistema Operativo Universale: ha un sistema live ufficiale per "
+"mostrare e rappresentare ufficialmente il vero, unico e solo sistema Debian "
+"con i seguenti principali vantaggi:"
 
 #. type: Plain text
 #: en/about_project.ssi:32
 msgid "_* It would be an official Debian subproject."
-msgstr "_* Acesta va fi un subpriect Debian oficial."
+msgstr "_* Sarebbe un sottoprogetto ufficiale Debian."
 
 #. type: Plain text
 #: en/about_project.ssi:34
 msgid "_* It reflects the (current) state of one distribution."
-msgstr "_* El reflecta starea (actuala) a distributiei."
+msgstr "_* Riflette lo stato (attuale) di una distribuzione."
 
 #. type: Plain text
 #: en/about_project.ssi:36
 msgid "_* It runs on as many architectures as possible."
-msgstr "_* Se poate utiliza pe maximum de arhitecturi posibile."
+msgstr "_* Gira su più architetture possibili."
 
 #. type: Plain text
 #: en/about_project.ssi:38
 msgid "_* It consists of unchanged Debian packages only."
-msgstr "_* Contine doar programe Debian."
+msgstr "_* È costituito solo da pacchetti Debian non modificati."
 
 #. type: Plain text
 #: en/about_project.ssi:40
 msgid "_* It does not contain any unofficial packages."
-msgstr "_* Nu contine programe neoficiale."
+msgstr "_* Non contiene nessun pacchetto non ufficiale."
 
 #. type: Plain text
 #: en/about_project.ssi:42
 msgid "_* It uses an unaltered Debian kernel with no additional patches."
-msgstr "_* Foloseste un kernel Debian nealterat, fara patch-uri aditionale."
+msgstr "_* Usa un kernel Debian inalterato senza patch addizionali."
 
 #. type: Plain text
 #: en/about_project.ssi:44
 msgid "2~ Philosophy"
-msgstr "2~ Filozofia"
+msgstr "2~ Filosofia"
 
 #. type: Plain text
 #: en/about_project.ssi:46
 msgid "3~ Only unchanged, official packages"
-msgstr "3~ Doar programe oficiale, fara schimbari."
+msgstr "3~ Solamente pacchetti ufficiali inalterati"
 
 #. type: Plain text
 #: en/about_project.ssi:48
@@ -159,9 +167,9 @@ msgid ""
 "\" section. The non-free section is not part of Debian and therefore cannot "
 "be used at all for official live system images."
 msgstr ""
-"Vor fi folosite doar programe oficiale din depozitele Debian sectiunea \"main"
-"\". Sectiunea non-free nu e parte din Debian si deci nu poate fi folosita in "
-"nici un fel la construirea imaginilor live oficiale."
+"Verranno usati solo pacchetti ufficiali dei repository Debian della sezione "
+"\"main\". La sezione non-free non è parte di Debian perciò non possono "
+"essere affatto usati per le immagini ufficiali del sistema live."
 
 #. type: Plain text
 #: en/about_project.ssi:50
@@ -169,9 +177,9 @@ msgid ""
 "We will not change any packages. Whenever we need to change something, we "
 "will do that in coordination with its package maintainer in Debian."
 msgstr ""
-"Nu vor fi facute nici o schimbare in programe. Daca este nevoie de acest "
-"lucru, schimbarile vor fi facute in coordonare cu responsabilul de program "
-"din Debian."
+"Non verrà cambiato nessun pacchetto. Nel caso in cui sarà necessario "
+"cambiare qualcosa sarà fatto in coordinazione con il maintainer del "
+"pacchetto Debian."
 
 #. type: Plain text
 #: en/about_project.ssi:52
@@ -181,15 +189,15 @@ msgid ""
 "reasons (e.g. to create development snapshots). They will be uploaded to "
 "Debian on a regular basis."
 msgstr ""
-"Ca o exceptie, programele specifice ca live-boot, live-build sau live-config "
-"pot fi folosite temporar din depozitele proprii live, pentru nevoi de "
-"dezvoltare. (de exemplu pentru creerea de development snapshots). Acestea "
-"vor fi upload-ate in Debian la date cuvenite."
+"In via eccezionale i nostri pacchetti come live-boot, live-build o live-"
+"config possono temporaneamente essere usati dal nostro repository per "
+"ragioni di sviluppo (ad esempio per creare istantanee). Verranno caricati "
+"regolarmente in Debian."
 
 #. type: Plain text
 #: en/about_project.ssi:54
 msgid "3~ No package configuration of the live system"
-msgstr "3~ Nu vor fi programe de configurare pentru sistemul live."
+msgstr "3~ Nessun pacchetto di configurazione per il sistema live"
 
 #. type: Plain text
 #: en/about_project.ssi:56
@@ -198,9 +206,10 @@ msgid ""
 "configurations. All packages are used in their default configuration as they "
 "are after a regular installation of Debian."
 msgstr ""
-"In aceasta faza nu vor fi propuse sau instalate example sau configuratii "
-"alternative. Toate programele sunt folosite cu configuratia default 'de "
-"baza', la fel ca in instalatia normaladin Debian."
+"In questa fase non saranno disponibili né esempi di installazione né "
+"configurazioni alternative. Tutti i pacchetti vengono usati con la loro "
+"configurazione predefinita così come accade con una regolare installazione "
+"di Debian."
 
 #. type: Plain text
 #: en/about_project.ssi:58
@@ -208,8 +217,8 @@ msgid ""
 "Whenever we need a different default configuration, we will do that in "
 "coordination with its package maintainer in Debian."
 msgstr ""
-"In caz de nevoie a unei configuratii diferite, aceasta schimbare va fii "
-"facuta in coordonare cu responsabilui de program din Debian."
+"Nel caso in cui serva una configurazione predefinita differente, sarà fatto "
+"in coordinazione con il maintainer del pacchetto in Debian."
 
 #. type: Plain text
 #: en/about_project.ssi:60
@@ -220,12 +229,12 @@ msgid ""
 "default configuration will be used. For more information, please see "
 "{Customization overview}#customization-overview."
 msgstr ""
-"Cu toate acestea un sistem de configurare a programelor este permisa "
-"folosind debconf in #{lb config}# (use --preseed FILE), ce permite o "
-"particularizare a configurari programelor in sistemul live facur de dvs., "
-"insa imaginile oficiale live doar configurari de baza vot fi folosite. "
-"Pentru mai multe informatii, urmariti {Customization overview}#customization-"
-"overview."
+"Viene fornito un sistema per configurare i pacchetti tramite debconf nel #"
+"{lb config}# (use --preseed FILE) consentendo di installare pacchetti "
+"configurati secondo le proprie preferenze nell'immagine Debian Live "
+"personalizzata, ma per le immagini ufficiali verrà usata la configurazione "
+"predefinita. Per ulteriori informazioni si veda {Panoramica sulla "
+"personalizzazione}#customization-overview."
 
 #. type: Plain text
 #: en/about_project.ssi:62
@@ -235,15 +244,15 @@ msgid ""
 "changes have to be kept as minimal as possible and should be merged within "
 "the Debian repository if possible."
 msgstr ""
-"Exceptie: Sunt desigur necesare cateva necesare sa aducem 'la viata' un "
-"sistem live ( de exemplu: configuratea pam care sa permita empty passwords). "
-"Dar aceste schimbari esentiale trebuie minimizate la maximum si pastrate in "
-"concordanta cu depozitul Debian."
+"Eccezione: ci sono alcuni cambiamenti essenziali per far nascere un sistema "
+"live (ad esempio configurare pam per permettere le password vuote). Queste "
+"modifiche essenziali devono essere tenute al minimo possibile e saranno "
+"eventualmente aggiunte ai repository Debian."
 
 #. type: Plain text
 #: en/about_project.ssi:64
 msgid "2~contact Contact"
-msgstr "2~contact Contact"
+msgstr "2~contact Contatti"
 
 #. type: Plain text
 #: en/about_project.ssi:66
@@ -253,10 +262,10 @@ msgid ""
 "addressing your mail to debian-live at lists.debian.org. The list archives are "
 "available at http://lists.debian.org/debian-live/."
 msgstr ""
-"_* *{Mailing list}*: Principalul mod de contact din proiect este mailing "
-"list la http://lists.debian.org/debian-live/.Va pute-ti adresa in direct "
-"prin mail la debian-live at lists.debian.org. Arhiva listei o gasi-ti la http://"
-"lists.debian.org/debian-live/."
+"_* *{Mailing list}*: Il principale contatto del progetto è la mailing list "
+"http://lists.debian.org/debian-live/, si possono inviare email alla lista "
+"direttamente a debian-live at lists.debian.org. Gli archivi sono disponibili "
+"presso http://lists.debian.org/debian-live/."
 
 #. type: Plain text
 #: en/about_project.ssi:68
@@ -266,10 +275,10 @@ msgid ""
 "patient for an answer. If no answer is forthcoming, please email the mailing "
 "list."
 msgstr ""
-"_* *{IRC}*: Un numar de utilizatori si dezvoltatori sunt prezenti in canalul "
-"#debian-live pe n irc.debian.org (OFTC). Daca aveti o intrebare pentru IRC , "
-"fiti cu multa rabdare in asteptarea raspunsului. In caz de lipsa a unui "
-"raspuns , folositi mailing list."
+"_* *{IRC}*: Molti utenti e sviluppatori sono presenti sul canale #debian-"
+"live su irc.debian.org (OFTC). Quando si pone una domanda su IRC, si prega "
+"di essere pazienti nell'ottenere una risposta; se non si riceve risposta "
+"scrivere alla mailing list."
 
 #. type: Plain text
 #: en/about_project.ssi:70
@@ -279,10 +288,10 @@ msgid ""
 "file until it is marked as having been dealt with. For more information, "
 "please see {Reporting bugs}#bugs."
 msgstr ""
-"_* *{BTS}*: BTS adica Debian Bug Tracking System , contine detalii asupra "
-"rapoartelor de bug facute de utilizatorisau dezvoltatori. Fiecare bug are un "
-"numar, si este mentinut deschis pana la rezolvare. Alte informatii gasiti la "
-"{Reporting bugs}#bugs."
+"_* *{BTS}*: Il Debian Bug Tracking System (BTS) contiene i dettagli dei bug "
+"riportati dagli utenti e dagli sviluppatori. A ciascun bug viene assegnato "
+"un numero, e viene mantenuto finché non è segnato come risolto. Per "
+"ulteriori informazioni si veda {Segnalare bug}#bugs."
 
 #. type: Plain text
 #: en/about_project.ssi:71
@@ -291,7 +300,7 @@ msgid ""
 "place to gather information, discuss applied technologies, and document "
 "frameworks of Debian Live systems that go beyond the scope of this document."
 msgstr ""
-"_* *{Wiki}*: Debian Live are un wiki la http://wiki.debian.org/DebianLive , "
-"si este locul unde pot fi gasite diferite informatii, se discuta modul de "
-"aplicare de tehnologii, sau sunt documentate alte lucrari legate de debian "
-"live si care pot depasi cadrul acestui document."
+"_* *{Wiki}*: Il wiki di Debian Live all'indirizzo http://wiki.debian.org/"
+"DebianLive è un posto dove raccogliere informazioni, discutere di tecnologie "
+"applicate e documenti sull'infrastruttura dei sistemi Debian Live che vanno "
+"oltre lo scopo di questo manuale."
diff --git a/manual/po/de/index.html.in.po b/manual/po/it/index.html.in.po
similarity index 64%
copy from manual/po/de/index.html.in.po
copy to manual/po/it/index.html.in.po
index 8b8d8df..2816652 100644
--- a/manual/po/de/index.html.in.po
+++ b/manual/po/it/index.html.in.po
@@ -1,16 +1,17 @@
-# German translations for live-manual package
+# Italian translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
+# Carlo Stemberger <carlo.stemberger at gmail.com>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a3\n"
-"POT-Creation-Date: 2010-10-20 20:02+0300\n"
-"PO-Revision-Date: 2010-06-06 15:21+0300\n"
-"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
-"Language-Team: none\n"
-"Language: de\n"
+"Project-Id-Version: live-manual 2.0.0\n"
+"POT-Creation-Date: 2010-12-08 15:58+0100\n"
+"PO-Revision-Date: 2010-12-08 17:00+0100\n"
+"Last-Translator: Carlo Stemberger <carlo.stemberger at gmail.com>\n"
+"Language-Team: Italian <tp at lists.linux.it>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,112 +20,110 @@ msgstr ""
 #. type: Content of: <html><head><title>
 #: en/index.html.in:4
 msgid "Debian Live Project"
-msgstr "Debian Live Projekt"
+msgstr "Progetto Debian Live"
 
 #. type: Content of: <html><body><h2>
-#: en/index.html.in:8
+#: en/index.html.in:9
 msgid "Debian Live Manual"
-msgstr "Debian Live Handbuch"
+msgstr "Manuale Debian Live"
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:11
+#: en/index.html.in:12
 msgid "<i>This manual is under heavy construction.</i>"
-msgstr ""
-"<i>Dieses Handbuch ist noch nicht fertig und befindet sich im Aufbau.</i>"
+msgstr "<i>Questo manuale è in fase di sviluppo.</i>"
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:15
+#: en/index.html.in:16
 msgid ""
 "Please report errors, omissions, patches and suggestions to our mailinglist "
 "at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
 "org</a> and read about <a href=\"html/1.html#37\">how to contribute</a> to "
 "the manual."
 msgstr ""
-"Fehler, Vergessenes, Patches und Vorschläge können an unsere Mailing Liste "
-"unter <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists."
-"debian.org</a> (englischspraching) gemeldet werden. Informationen wie man <a "
-"href=\"html/1.html#37\">zum Handbuch beitragen</a> kann, können im Handbuch "
-"gefunden werden."
+"Si prega di segnalare errori, omissioni, patch e suggerimenti sulla nostra "
+"mailing list <a href=\"mailto:debian-live at lists.debian.org\">debian-"
+"live at lists.debian.org</a> e leggere <a href=\"html/1.html#37\">come "
+"contribuire</a> al manuale."
 
 #. type: Content of: <html><body><h3>
-#: en/index.html.in:18
+#: en/index.html.in:19
 msgid "Available Formats"
-msgstr "Verfügbare Formate"
+msgstr "Formati disponibili"
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:21
+#: en/index.html.in:22
 msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
 msgstr "<a href=\"epub/live-manual.epub\">EPUB</a>"
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:22
+#: en/index.html.in:23
 msgid ""
 "HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
 "html\">single page</a>"
 msgstr ""
-"HTML: <a href=\"html/index.html\">mehrere Seiten</a>, <a href=\"html/live-"
-"manual.html\">einzelne Seite</a>"
+"HTML: <a href=\"html/index.html\">multi-pagina</a>, <a href=\"html/live-"
+"manual.html\">pagina unica</a>"
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:23
+#: en/index.html.in:24
 msgid "<a href=\"odf/live-manual.odt\">ODF</a>"
 msgstr "<a href=\"odf/live-manual.odt\">ODF</a>"
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:24
+#: en/index.html.in:25
 msgid ""
 "PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
 "\"pdf/live-manual.landscape-a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
 "manual.portrait-letter.pdf\">letter portrait</a>, <a href=\"pdf/live-manual."
 "landscape-letter.pdf\">letter landscape</a>"
 msgstr ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 Hochformat</a>, <a href="
-"\"pdf/live-manual.landscape-a4.pdf\">A4 Querformat</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.pdf\">Letter Hochformat</a>, <a href=\"pdf/live-"
-"manual.landscape-letter.pdf\">Letter Querformat</a>"
+"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 verticale</a>, <a href="
+"\"pdf/live-manual.landscape-a4.pdf\">A4 orizzontale</a>, <a href=\"pdf/live-"
+"manual.portrait-letter.pdf\">lettera verticale</a>, <a href=\"pdf/live-"
+"manual.landscape-letter.pdf\">lettera orizzontale</a>"
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:25
+#: en/index.html.in:26
 msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
-msgstr "<a href=\"txt/live-manual.txt\">Text</a>"
+msgstr "<a href=\"txt/live-manual.txt\">Testo semplice</a>"
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:29
+#: en/index.html.in:30
 msgid "Last changed: @DATE_CHANGE@"
-msgstr "Letzte Änderung: @DATE_CHANGE@"
+msgstr "Ultima modifica: @DATE_CHANGE@"
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:30
+#: en/index.html.in:31
 msgid "Last built: @DATE_BUILD@"
-msgstr "Letzte Aktualisierung: @DATE_BUILD@"
+msgstr "Ultima compilazione: @DATE_BUILD@"
 
 #. type: Content of: <html><body><h3>
-#: en/index.html.in:33
+#: en/index.html.in:34
 msgid "Source"
-msgstr "Quellen"
+msgstr "Sorgente"
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:36
+#: en/index.html.in:37
 msgid ""
 "The sources for this manual is available in a <a href=\"http://git.or.cz/"
-"\">git</a> repository at live.debian.net."
+"\">Git</a> repository at live.debian.net."
 msgstr ""
-"Die Quellen dieses Handbuches sind in einem <a href=\"http://git.or.cz/"
-"\">Git</a> Repository auf live.debian.net verfügbar."
+"I sorgenti di questo manuale sono disponibili nel repository <a href="
+"\"http://git.or.cz/\">Git</a> su live.debian.net."
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:40
+#: en/index.html.in:41
 msgid ""
 "Browse: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
 "\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
 "a>"
 msgstr ""
-"Browse: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
+"Sfoglia: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
 "\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
 "a>"
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:41
+#: en/index.html.in:42
 msgid ""
 "Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
 "live.debian.net/git/live-manual.git</tt></small></a>"
@@ -133,7 +132,7 @@ msgstr ""
 "live.debian.net/git/live-manual.git</tt></small></a>"
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:45
+#: en/index.html.in:46
 msgid ""
 "<a href=\"http://live.debian.net/\">Debian Live</a> &lt;<a href=\"mailto:"
 "debian-live at lists.debian.org\">debian-live at lists.debian.org</a>&gt; - <a "
@@ -141,4 +140,4 @@ msgid ""
 msgstr ""
 "<a href=\"http://live.debian.net/\">Debian Live</a> &lt;<a href=\"mailto:"
 "debian-live at lists.debian.org\">debian-live at lists.debian.org</a>&gt; - <a "
-"href=\"http://live.debian.net/legal.html\">Rechtliche Hinweise</a>"
+"href=\"http://live.debian.net/legal.html\">Note legali</a>"
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/it/live-manual.ssm.po
similarity index 57%
copy from manual/po/ro/live-manual.ssm.po
copy to manual/po/it/live-manual.ssm.po
index 7a064ae..2720129 100644
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/it/live-manual.ssm.po
@@ -1,36 +1,35 @@
-# Romanian translations for live-manual package
+# Italian translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
+# lillo sciascia <lillosciascia at gmail.com>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-06 12:26+0100\n"
-"PO-Revision-Date: 2010-10-23 00:04+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: ro\n"
+"Project-Id-Version: live-manual 2.0.0\n"
+"POT-Creation-Date: 2010-12-24 03:54+0100\n"
+"PO-Revision-Date: 2010-12-18 14:34+0100\n"
+"Last-Translator: lillo sciascia <lillosciascia at gmail.com>\n"
+"Language-Team: Italian <tp at lists.linux.it>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
-"20)) ? 1 : 2;\n"
+"Plural-Forms: nplurals=2: plural=(n !=1)\n"
 
 #. type: Plain text
 #: en/live-manual.ssm:2
 msgid "% SiSU 2.0"
-msgstr ""
+msgstr "% SiSU 2.0"
 
 #. type: Plain text
 #: en/live-manual.ssm:4
 msgid "@title: Debian Live Manual"
-msgstr ""
+msgstr "@title: Manuale di Debian Live"
 
 #. type: Plain text
 #: en/live-manual.ssm:6
 msgid "@creator: Debian Live Project <debian-live at lists.debian.org>"
-msgstr ""
+msgstr "@creator: Debian Live Project <debian-live at lists.debian.org>"
 
 #. type: Plain text
 #: en/live-manual.ssm:10
@@ -40,19 +39,24 @@ msgid ""
 " :copyright: Copyright (C) 2006-2010 Debian Live Project\n"
 " :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.\n"
 msgstr ""
+"@rights:\n"
+" :copyright: Copyright (C) 2006-2010 Debian Live Project\n"
+" :license: Questo programma è software libero: è possibile ridistribuirlo e modificarlo secondo i termini della GNU General Public License come pubblicata dalla Free Software Foundation, sia la versione 3 della licenza o (a scelta) una versione successiva.<br><br>Questo programma è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per ulteriori dettagli.<br><br>Si dovrebbe aver ricevuto una copia della GNU General Public License con questo programma. In caso contrario, vedere http://www.gnu.org/licenses/. <br><br>Sui sistemi Debian, il testo completo della GNU General Public License può essere trovato nel file /usr/share/common-licenses/GPL-3.\n"
 
 #. type: Plain text
 #: en/live-manual.ssm:13
 #, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2010-12-06\n"
+" :published: 2010-12-24\n"
 msgstr ""
+"@date:\n"
+" :published: 2010-12-24\n"
 
 #. type: Plain text
 #: en/live-manual.ssm:15
 msgid "@publisher: Debian Live Project <debian-live at lists.debian.org>"
-msgstr ""
+msgstr "@publisher: Debian Live Project <debian-live at lists.debian.org>"
 
 #. type: Plain text
 #: en/live-manual.ssm:21
@@ -64,143 +68,113 @@ msgid ""
 " :num_top: 1\n"
 " :skin: skin_debian-live\n"
 msgstr ""
+"@make:\n"
+" :bold: /Squeeze|squeeze|Wheezy|wheezy|Sid|sid/\n"
+" :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/\n"
+" :num_top: 1\n"
+" :skin: skin_debian-live\n"
 
 #. type: Plain text
 #: en/live-manual.ssm:23
 msgid ":A~ @title"
-msgstr ""
+msgstr ":A~ @title"
 
 #. type: Plain text
 #: en/live-manual.ssm:25
 msgid ":B~ About"
-msgstr ""
+msgstr ":B~ A proposito"
 
 #. type: Plain text
 #: en/live-manual.ssm:27
 msgid "<< about_manual.ssi"
-msgstr ""
+msgstr "<< about_manual.ssi"
 
 #. type: Plain text
 #: en/live-manual.ssm:29
 msgid "<< about_project.ssi"
-msgstr ""
+msgstr "<< about_project.ssi"
 
 #. type: Plain text
 #: en/live-manual.ssm:31
-msgid ":B~ User ~#"
-msgstr ""
+msgid ":B~ User"
+msgstr ":B~ Utente"
 
 #. type: Plain text
 #: en/live-manual.ssm:33
 msgid "<< user_installation.ssi"
-msgstr ""
+msgstr "<< user_installation.ssi"
 
 #. type: Plain text
 #: en/live-manual.ssm:35
 msgid "<< user_basics.ssi"
-msgstr ""
+msgstr "<< user_basics.ssi"
 
 #. type: Plain text
 #: en/live-manual.ssm:37
 msgid "<< user_overview.ssi"
-msgstr ""
+msgstr "<< user_overview.ssi"
 
 #. type: Plain text
 #: en/live-manual.ssm:39
 msgid "<< user_managing_a_configuration.ssi"
-msgstr ""
+msgstr "<< user_managing_a_configuration.ssi"
 
 #. type: Plain text
 #: en/live-manual.ssm:41
 msgid "<< user_customization-overview.ssi"
-msgstr ""
+msgstr "<< user_customization-overview.ssi"
 
 #. type: Plain text
 #: en/live-manual.ssm:43
 msgid "<< user_customization-packages.ssi"
-msgstr ""
+msgstr "<< user_customization-packages.ssi"
 
 #. type: Plain text
 #: en/live-manual.ssm:45
 msgid "<< user_customization-contents.ssi"
-msgstr ""
+msgstr "<< user_customization-contents.ssi"
 
 #. type: Plain text
 #: en/live-manual.ssm:47
-msgid "<< user_customization-internationalization.ssi"
-msgstr ""
+msgid "<< user_customization-runtime.ssi"
+msgstr "<< user_customization-runtime.ssi"
 
 #. type: Plain text
 #: en/live-manual.ssm:49
-msgid "<< user_customization-runtime.ssi"
-msgstr ""
+msgid "<< user_customization-binary.ssi"
+msgstr "<< user_customization-binary.ssi"
 
 #. type: Plain text
 #: en/live-manual.ssm:51
-msgid "<< user_customization-binary.ssi"
-msgstr ""
+msgid "<< user_customization-installer.ssi"
+msgstr "<< user_customization-installer.ssi"
 
 #. type: Plain text
 #: en/live-manual.ssm:53
-msgid "<< user_customization-installer.ssi"
-msgstr ""
+msgid ":B~ Project"
+msgstr ":B~ Progetto"
 
 #. type: Plain text
 #: en/live-manual.ssm:55
-msgid ":B~ Development ~#"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:57
-msgid ":B~ Project ~#"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:59
 msgid "<< project_bugs.ssi"
-msgstr ""
+msgstr "<< project_bugs.ssi"
 
 #. type: Plain text
-#: en/live-manual.ssm:61
+#: en/live-manual.ssm:57
 msgid "<< project_coding-style.ssi"
-msgstr ""
+msgstr "<< project_coding-style.ssi"
 
 #. type: Plain text
-#: en/live-manual.ssm:63
+#: en/live-manual.ssm:59
 msgid "<< project_procedures.ssi"
-msgstr ""
+msgstr "<< project_procedures.ssi"
 
 #. type: Plain text
-#: en/live-manual.ssm:65
-msgid ":B~ Examples ~#"
-msgstr ""
+#: en/live-manual.ssm:61 en/user_examples.ssi:2
+msgid ":B~ Examples"
+msgstr ":B~ Esempi"
 
 #. type: Plain text
-#: en/live-manual.ssm:67
+#: en/live-manual.ssm:63
 msgid "<< user_examples.ssi"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:69
-msgid ":B~ Other ~#"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:75
-msgid ""
-"Other material that formerly appeared in this section is out of date and/or "
-"has not been approved for release. It has therefore been omitted, but can "
-"still be found in the document source; see 'About this manual'. Any part of "
-"the omitted material that is still useful will be included in the release "
-"only after it has been reviewed."
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:77
-msgid "% << other_faq.ssi"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:78
-msgid "% << other_howtos.ssi"
-msgstr ""
+msgstr "<< user_examples.ssi"
diff --git a/manual/po/it/project_bugs.ssi.po b/manual/po/it/project_bugs.ssi.po
new file mode 100644
index 0000000..ebd446d
--- /dev/null
+++ b/manual/po/it/project_bugs.ssi.po
@@ -0,0 +1,660 @@
+# Italian translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+# skizzhg <skizzhg at gmx.com>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual 2.0.0\n"
+"POT-Creation-Date: 2010-12-23 07:37-0400\n"
+"PO-Revision-Date: 2010-12-24 03:11+0100\n"
+"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
+"Language-Team: Italian <tp at lists.linux.it>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/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
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/project_bugs.ssi:2
+msgid "B~ Reporting bugs"
+msgstr "B~ Segnalare bug"
+
+#. type: Plain text
+#: en/project_bugs.ssi:4
+msgid "1~bugs Reporting bugs"
+msgstr "1~bugs Segnalare bug"
+
+#. type: Plain text
+#: en/project_bugs.ssi:6
+msgid ""
+"Debian Live is far from being perfect, but we want to make it as close as "
+"possible to perfect - with your help. Do not hesitate to report a bug: it is "
+"better to fill a report twice than never. However, this chapter includes "
+"recommendations how to file good bug reports."
+msgstr ""
+"Debian Live è lungi dall'essere perfetta, ma con il vostro aiuto vogliamo "
+"avvicinarci il più possibile a questo livello. Non esitare a segnalare un "
+"bug: è meglio compilare un rapporto due volte che mai. Questo capitolo "
+"include alcune raccomandazioni su come presentare una buona segnalazione."
+
+#. type: Plain text
+#: en/project_bugs.ssi:8
+msgid "For the impatient:"
+msgstr "Per gli impazienti"
+
+#. type: Plain text
+#: en/project_bugs.ssi:10
+msgid ""
+"_* Always check first the image status updates on our homepage at http://"
+"live.debian.net/ for known issues."
+msgstr ""
+"_* Per i problemi noti verificare sempre lo stato degli aggiornamenti "
+"dell'immagine sulla nostra pagina iniziale http://live.debian.net/."
+
+#. type: Plain text
+#: en/project_bugs.ssi:12
+msgid ""
+"_* Always try to reproduce the bug with the *{most recent versions}* of live-"
+"build, live-boot, and live-config before submitting a bug report."
+msgstr ""
+"_* Prima di inviare una segnalazione di bug provare a riprodurlo con le *"
+"{versione più recenti}* di live-build, live-boot e live-config."
+
+#. type: Plain text
+#: en/project_bugs.ssi:14
+msgid ""
+"_* Try to give *{as specific information as possible}* about the bug. This "
+"includes (at least) the version of live-build, live-boot, and live-config "
+"used and the distribution of the live system you are building."
+msgstr ""
+"_* Si cerchi di fornire *{informazioni il più dettagliate possibile}* "
+"riguardo il bug. Questo comprende (almeno) la versione di live-build, live-"
+"boot e live-config utilizzata e la distribuzione del sistema live che si sta "
+"costruendo."
+
+#. type: Plain text
+#: en/project_bugs.ssi:16
+msgid "2~ Known issues"
+msgstr "2~ Problemi noti"
+
+#. type: Plain text
+#: en/project_bugs.ssi:18
+msgid ""
+"Because Debian *{testing}* and Debian *{unstable}* distributions are a "
+"moving target, when you specify either as the target system distribution, a "
+"successful build may not always be possible."
+msgstr ""
+"Giacché Debian *{testing}* e Debian *{unstable}* subiscono cambiamenti "
+"continui, quando si specifica l'una o l'altra come sistema di destinazione, "
+"può non essere sempre possibile una creazione che vada a buon fine."
+
+#. type: Plain text
+#: en/project_bugs.ssi:20
+msgid "% FIXME:"
+msgstr "% FIXME:"
+
+#. type: Plain text
+#: en/project_bugs.ssi:22
+msgid ""
+"If this causes too much difficulty for you, do not build a system based on *"
+"{testing}* or *{unstable}*, but rather, use *{stable}*. live-build does "
+"always default to the *{stable}* release."
+msgstr ""
+"Se questo causa troppe difficoltà, non creare un sistema basato su *{testing}"
+"* o *{unstable}* ma usare piuttosto *{stable}*. live-build si basa su *"
+"{stable}* in modo predefinito."
+
+#. type: Plain text
+#: en/project_bugs.ssi:24
+msgid ""
+"Currently known issues are listed under the section 'status' on our homepage "
+"at http://live.debian.net/."
+msgstr ""
+"I problemi noti al momento sono elencati sotto la sezione \"status\" della "
+"nostra pagina iniziale http://live.debian.net/"
+
+#. type: Plain text
+#: en/project_bugs.ssi:26
+msgid ""
+"It is out of the scope of this manual to train you to correctly identify and "
+"fix problems in packages of the development distributions, however, there "
+"are two things you can always try: If a build fails when the target "
+"distribution is *{testing}*, try *{unstable}*. If *{unstable}* does not work "
+"either, revert to *{testing}* and pin the newer version of the failing "
+"package from *{unstable}* (see {APT pinning}#apt-pinning for details)."
+msgstr ""
+"Questo manuale non intende insegnare come identificare e risolvere "
+"correttamente i problemi dei pacchetti delle distribuzioni di sviluppo, "
+"tuttavia ci sono un paio di cose da provare: se la creazione di *{testing}* "
+"non va a buon fine provare con *{unstable}*; se non funziona nemmeno *"
+"{unstable}* tornare a *{testing}* ed effettuare il pinning da *{unstable}* "
+"alla nuova versione del pacchetto corrotto (si veda {APT pinning}#apt-"
+"pinning per i dettagli)."
+
+#. type: Plain text
+#: en/project_bugs.ssi:28
+msgid "2~ Rebuild from scratch"
+msgstr "2~ Ricostruire da zero"
+
+#. type: Plain text
+#: en/project_bugs.ssi:30
+msgid ""
+"To ensure that a particular bug is not caused by an uncleanly built system, "
+"please always rebuild the whole live system from scratch to see if the bug "
+"is reproducible."
+msgstr ""
+"Per essere certi che un particolare bug non sia causato dalla creazione di "
+"un sistema non pulito, ricostruire sempre l'intero sistema da zero per "
+"vedere se il bug sia riproducibile."
+
+#. type: Plain text
+#: en/project_bugs.ssi:32
+msgid "2~ Use up-to-date packages"
+msgstr "2~ Usare pacchetti aggiornati"
+
+#. type: Plain text
+#: en/project_bugs.ssi:34
+msgid ""
+"Using outdated packages can cause significant problems when trying to "
+"reproduce (and ultimately fix) your problem. Make sure your build system is "
+"up-to-date and any packages included in your image are up-to-date as well."
+msgstr ""
+"L'utilizzo di pacchetti datati può causare notevoli complicazioni nel "
+"tentativo di riprodurre (e alla fine risolvere) il problema. Assicurarsi che "
+"il sistema creato sia aggiornato e ogni pacchetto incluso nell'immagine lo "
+"sia a sua volta."
+
+#. type: Plain text
+#: en/project_bugs.ssi:36
+msgid "2~collect-information Collect information"
+msgstr "2~collect-information Raccogliere informazioni"
+
+#. type: Plain text
+#: en/project_bugs.ssi:38
+msgid ""
+"Please provide enough information with your report. At least include the "
+"exact version of live-build version where the bug is encountered and steps "
+"to reproduce it. Please use common sense and include other relevant "
+"information if you think that it might help in solving the problem."
+msgstr ""
+"Nella segnalazione si invita a fornire informazioni sufficienti. Dovrebbe "
+"almeno contenere l'esatta versione di live-build nella quale si è trovato il "
+"bug e i passi per riprodurlo. Con un po' di buon senso si può includere "
+"qualsiasi altro dettaglio rilevante che si ritiene utile per la risoluzione "
+"del problema."
+
+#. type: Plain text
+#: en/project_bugs.ssi:40
+msgid ""
+"To make the most out of your bug report, we require at least the following "
+"information:"
+msgstr ""
+"Affinché la segnalazione del bug sia migliore possibile, si richiedono "
+"almeno le seguenti informazioni:"
+
+#. type: Plain text
+#: en/project_bugs.ssi:42
+msgid "_* Architecture of the host system"
+msgstr "_* Architettura del sistema ospitante"
+
+#. type: Plain text
+#: en/project_bugs.ssi:44
+msgid "_* Version of live-build on the host system"
+msgstr "_* Versione di live-build sul sistema ospitante"
+
+#. type: Plain text
+#: en/project_bugs.ssi:46
+msgid "_* Version of live-boot on the live system"
+msgstr "_* Versione di live-boot sul sistema ospitante"
+
+#. type: Plain text
+#: en/project_bugs.ssi:48
+msgid "_* Version of live-config on the live system"
+msgstr "_* Versione di live-config sul sistema live"
+
+#. type: Plain text
+#: en/project_bugs.ssi:50
+msgid ""
+"_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system"
+msgstr ""
+"_* Versione di #{debootstrap}# o #{cdebootstrap}# sul sistema ospitante"
+
+#. type: Plain text
+#: en/project_bugs.ssi:52
+msgid "_* Architecture of the live system"
+msgstr "_* Architettura del sistema live"
+
+#. type: Plain text
+#: en/project_bugs.ssi:54
+msgid "_* Distribution of the live system"
+msgstr "_* Distribuzione del sistema live"
+
+#. type: Plain text
+#: en/project_bugs.ssi:56
+msgid "_* Version of the kernel on the live system"
+msgstr "_* Versione del kernel sul sistema live"
+
+#. type: Plain text
+#: en/project_bugs.ssi:58
+msgid ""
+"You can generate a log of the build process by using the #{tee}# command. We "
+"recommend doing this automatically with an #{auto/build}# script; see "
+"{Managing a configuration}#managing-a-configuration for details)."
+msgstr ""
+"È possibile generare un registro del processo di costruzione usando il "
+"comando #{tee}#. Si raccomanda di farlo automaticamente con uno script #"
+"{auto/build}#; (si veda {Gestire una configurazione}#managing-a-"
+"configuration per i dettagli)."
+
+#. type: Plain text
+#: en/project_bugs.ssi:62
+#, no-wrap
+msgid " # lb build 2>&1 | tee build.log\n"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:66
+msgid ""
+"At boot time, live-boot stores a log in #{/var/log/live.log}# (or #{/var/log/"
+"live-boot.log}#)."
+msgstr ""
+"All'avvio, live-boot conserva un registro in #{/var/log/live.log}# (or #{/"
+"var/log/live-boot.log}#)."
+
+#. type: Plain text
+#: en/project_bugs.ssi:68
+msgid ""
+"Additionally, to rule out other errors, it is always a good idea to tar up "
+"your #{config/}# directory and upload it somewhere (do *{not}* send it as an "
+"attachment to the mailing list), so that we can try to reproduce the errors "
+"you encountered. If this is difficult (e.g. due to size) you can use the "
+"output of #{lb config --dump}# which produces a summary of your config tree "
+"(i.e. lists files in subdirectories of #{config/}# but does not include "
+"them)."
+msgstr ""
+"Inoltre, per escludere altri errori, è sempre una buona idea creare un tar "
+"della propria directory #{config/}# e caricarlo da qualche parte (*{non}* "
+"inviarlo come allegato alla mailing list), in modo che sia per noi possibile "
+"riprodurre gli errori incontrati. Se ciò causa problemi (ad esempio a causa "
+"della dimensione) si può utilizzare l'output di #{lb config --dump}# che "
+"produce un sommario dell'albero di configurazione (elenca i file nelle "
+"sottodirectory di #{config/}# ma non le include)."
+
+#. type: Plain text
+#: en/project_bugs.ssi:70
+msgid ""
+"Remember to send in any logs that were produced with English locale "
+"settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or #"
+"{LC_ALL=en_US}#."
+msgstr ""
+"Ricordarsi che i file di registro da inviare vanno creati con l'impostazione "
+"della lingua inglese, ad esempio eseguendo il comando live-build preponendo #"
+"{LC_ALL=C}# oppure #{LC_ALL=en_US}#."
+
+#. type: Plain text
+#: en/project_bugs.ssi:72
+msgid "2~ Isolate the failing case if possible"
+msgstr "2~ Se possibile isolare il caso non andato a buon fine"
+
+#. type: Plain text
+#: en/project_bugs.ssi:74
+msgid ""
+"If possible, isolate the failing case to the smallest possible change that "
+"breaks. It is not always easy to do this, so if you can't manage it for your "
+"report, don't worry. However, if you plan your development cycle well, using "
+"small enough change sets per iteration, you may be able to isolate the "
+"problem by constructing a simpler 'base' configuration that closely matches "
+"your actual configuration plus just the broken change set added to it. If "
+"you have a hard time sorting out which of your changes broke, it may be that "
+"you are including too much in each change set and should develop in smaller "
+"increments."
+msgstr ""
+"Se possibile, isolare il caso non andato a buon fine alla variazione più "
+"piccola che lo causa. Non è sempre facile da fare, perciò non preoccupatevi "
+"se non riuscite a gestirlo per la vostra segnalazione. Tuttavia, se si "
+"pianifica bene il ciclo di sviluppo adottando piccole modifiche per ogni "
+"iterazione, si riuscirà ad isolare il problema creando una configurazione "
+"semplificata che si avvicina all'attuale con l'aggiunta delle sole modifiche "
+"problematiche. Se si incontrano serie difficoltà nel trovare la causa, "
+"potrebbe essere che sono stati inseriti troppi cambiamenti in una sola volta "
+"e bisogna cambiare approccio."
+
+#. type: Plain text
+#: en/project_bugs.ssi:76
+msgid "2~ Use the correct package to report the bug against"
+msgstr "2~ Segnalare il bug del pacchetto giusto"
+
+#. type: Plain text
+#: en/project_bugs.ssi:78
+msgid "Where does the bug appear?"
+msgstr "Dove appare il bug?"
+
+#. type: Plain text
+#: en/project_bugs.ssi:80
+msgid "3~ At build time whilst bootstrapping"
+msgstr "3~ Durante la compilazione mentre esegue il bootstrap"
+
+#. type: Plain text
+#: en/project_bugs.ssi:82
+msgid ""
+"live-build first bootstraps a basic Debian system with #{debootstrap}# or #"
+"{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
+"distribution it is bootstrapping, it may fail. If a bug appears here, check "
+"if the error is related to a specific Debian package (most likely), or if it "
+"is related to bootstrapping tool itself."
+msgstr ""
+"live-build avvia inizialmente un sistema Debian di base con #{debootstrap}# "
+"o #{cdebootstrap}#; può fallire a seconda dello strumento utilizzato e della "
+"distribuzione Debian che si sta avviando. Se il bug appare a questo punto "
+"controllare che l'errore sia relativo ad uno specifico pacchetto Debian (più "
+"probabile) o allo strumento di avvio stesso."
+
+#. type: Plain text
+#: en/project_bugs.ssi:84
+msgid ""
+"In both cases, this is not a bug in Debian Live, but rather in Debian itself "
+"which we can not fix this directly. Please report such a bug against the "
+"bootstrapping tool or the failing package."
+msgstr ""
+"In entrambi i casi non è un bug in Debian Live, ma piuttosto in Debian "
+"stessa che non può essere risolto direttamente. Si prega di inviare una "
+"segnalazione di bug riguardo l'utilità di avvio o il pacchetto che ha "
+"fallito."
+
+#. type: Plain text
+#: en/project_bugs.ssi:86
+msgid "3~ At build time whilst installing packages"
+msgstr "3~ Durante la compilazione mentre installa i pacchetti"
+
+#. type: Plain text
+#: en/project_bugs.ssi:88
+msgid ""
+"live-build installs additional packages from the Debian archive and "
+"depending on the Debian distribution used and the daily archive state, it "
+"can fail. If a bug appears here, check if the error is also reproducible on "
+"a normal system."
+msgstr ""
+"live-build installa pacchetti aggiuntivi dall'archivio Debian e può fallire "
+"a seconda della distribuzione Debian e lo stato dell'archivio giornaliero.Se "
+"il bug appare a questo punto, controllare che l'errore sia riproducibile su "
+"un sistema normale."
+
+#. type: Plain text
+#: en/project_bugs.ssi:90
+msgid ""
+"If this is the case, this is not a bug in Debian Live, but rather in Debian "
+"- please report it against the failing package. Running #{debootstrap}# "
+"separately from the Live system build or running #{lb bootstrap --debug}# "
+"will give you more information."
+msgstr ""
+"In questo caso non è un bug in Debian Live, ma piuttosto in Debian, inviare "
+"una segnalazione sul pacchetto che ha fallito. Si otterranno maggiori "
+"informazioni eseguendo #{debootstrap}# separatamente dal sistema live o "
+"eseguendo #{lb bootstrap --debug}#."
+
+#. type: Plain text
+#: en/project_bugs.ssi:92
+msgid ""
+"Also, if you are using a local mirror and/or any of sort of proxy and you "
+"are experiencing a problem, please always reproduce it first by "
+"bootstrapping from an official mirror."
+msgstr ""
+"Se si verifica un problema utilizzando un mirror locale o un qualsiasi tipo "
+"di proxy è bene riprodurlo avviando da un mirror ufficiale."
+
+#. type: Plain text
+#: en/project_bugs.ssi:94
+msgid "3~ At boot time"
+msgstr "3~ In fase di avvio"
+
+#. type: Plain text
+#: en/project_bugs.ssi:96
+msgid ""
+"If your image does not boot, please report it to the mailing list together "
+"with the information requested in {Collect information}#collect-information. "
+"Do not forget to mention, how/when the image failed, in Qemu, Virtualbox, "
+"VMWare or real hardware. If you are using a virtualization technology of any "
+"kind, please always run it on real hardware before reporting a bug. "
+"Providing a screenshot of the failure is also very helpful."
+msgstr ""
+"Se l'immagine non si avvia segnalarlo alla mailing list con le informazioni "
+"richieste in {Raccogliere informazioni}#collect-information. Non dimenticare "
+"di menzionare come e quando l'immagine fallisce, in Qemu, VMWare o hardware "
+"reale. Se si utilizza un qualsiasi sistema di virtualizzazione provare "
+"sempre su hardware reale prima di segnalare un bug; anche fornire "
+"un'istantanea dello schermo può essere molto utile."
+
+#. type: Plain text
+#: en/project_bugs.ssi:98
+msgid "3~ At run time"
+msgstr "3~ In fase di esecuzione"
+
+#. type: Plain text
+#: en/project_bugs.ssi:100
+msgid ""
+"If a package was successfully installed, but fails while actually running "
+"the Live system, this is probably a bug in Debian Live. However,"
+msgstr ""
+"Se un pacchetto è stato installato con successo ma fallisce durante "
+"l'esecuzione del sistema live, si tratta probabilmente di un bug in Debian "
+"Live. Tuttavia,"
+
+#. type: Plain text
+#: en/project_bugs.ssi:102
+msgid "2~ Do the research"
+msgstr "2~ Fare la ricerca"
+
+#. type: Plain text
+#: en/project_bugs.ssi:104
+msgid ""
+"Before filing the bug, please search the web for the particular error "
+"message or symptom you are getting. As it is highly unlikely that you are "
+"the only person experiencing a particular problem, there is always a chance "
+"that it has been discussed elsewhere, and a possible solution, patch, or "
+"workaround has been proposed."
+msgstr ""
+"Prima di riportare il bug si prega di cercare sul web il messaggio d'errore "
+"o il sintomo ottenuti. Poiché è altamente improbabile essere l'unica persona "
+"ad incontrare un certo problema, c'è sempre la possibilità che sia stato "
+"discusso altrove e che siano stati proposte una soluzione, una patch o "
+"soluzione temporanea."
+
+#. type: Plain text
+#: en/project_bugs.ssi:106
+msgid ""
+"You should pay particular attention to the Debian Live mailing list, as well "
+"as the homepage, as these are likely to contain the most up-to-date "
+"information. If such information exists, always include the references to it "
+"in your bug report."
+msgstr ""
+"Si dovrebbe prestare particolare attenzione alla mailing list di Debian Live "
+"così come la pagina iniziale del sito, in quanto contengono informazioni più "
+"aggiornate. Se tale informazione esiste si includa sempre un riferimento "
+"nella segnalazione del bug."
+
+#. type: Plain text
+#: en/project_bugs.ssi:108
+msgid ""
+"In addition, you should check the current bug lists for live-build, live-"
+"boot, and live-config to see whether something similar has been reported "
+"already."
+msgstr ""
+"In aggiunta bisogna controllare l'attuale elenco dei bug riguardanti live-"
+"build, live-boot e live-config per vedere se sia già stato segnalato "
+"qualcosa di simile."
+
+#. type: Plain text
+#: en/project_bugs.ssi:110
+msgid "2~ Where to report bugs"
+msgstr "2~ Dove segnalare i bug"
+
+#. type: Plain text
+#: en/project_bugs.ssi:112
+msgid ""
+"The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
+"System (BTS). For information on how to use the system, please see http://"
+"bugs.debian.org/. You can also submit the bugs by using the #{reportbug}# "
+"command from the package with the same name."
+msgstr ""
+"Il progetto Debian Live tiene traccia di tutti i bug sul Debian Bug Tracking "
+"System (BTS, sistema di tracciamento dei bug Debian), si veda http://bugs."
+"debian.org/ per le informazioni su come usarlo. È anche possibile utilizzare "
+"il comando #{reportbug}# dall'omonimo pacchetto."
+
+#. type: Plain text
+#: en/project_bugs.ssi:114
+msgid ""
+"In general, you should report build time errors against the live-build "
+"package, boot time errors against live-boot, and run time errors against "
+"live-config. If you are unsure of which package is appropriate or need more "
+"help before submitting a bug report, please send a message to the mailing "
+"list and we will help you to figure it out."
+msgstr ""
+"In genere bisogna riportare gli errori in fase di compilazione verso il "
+"pacchetto live-build, quelli di avvio verso live-boot e quelli in fase di "
+"esecuzione a live-config. Se non siete certi di quale sia il pacchetto "
+"appropriato o serve maggiore aiuto prima della segnalazione, inviate un "
+"messaggio in mailing list e vi aiuteremo a capire."
+
+#. type: Plain text
+#: en/project_bugs.ssi:115
+msgid ""
+"Please note that bugs found in distributions derived from Debian (such as "
+"Ubuntu and others) should *{not}* be reported to the Debian BTS unless they "
+"can be also reproduced on a Debian system using official Debian packages."
+msgstr ""
+"Si noti che i bug trovati nelle distribuzioni derivate da Debian (come "
+"Ubuntu e altre) *{non}* vanno segnalati a Debian BTS a meno che non siano "
+"riproducibili anche su un sistema Debian utilizzando pacchetti ufficiali "
+"Debian."
diff --git a/manual/po/it/project_coding-style.ssi.po b/manual/po/it/project_coding-style.ssi.po
new file mode 100644
index 0000000..af766e6
--- /dev/null
+++ b/manual/po/it/project_coding-style.ssi.po
@@ -0,0 +1,416 @@
+# Italian translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+# skizzhg <skizzhg at gmx.com>
+# Carlo Stemberger <carlo.stemberger at gmail.com>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual 2.0.0\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"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/project_coding-style.ssi:2
+msgid "B~ Coding Style"
+msgstr "B~ Lo stile nello scrivere codice"
+
+#. type: Plain text
+#: en/project_coding-style.ssi:4
+msgid "1~ Coding Style"
+msgstr "1~ Lo stile nello scrivere codice"
+
+#. type: Plain text
+#: en/project_coding-style.ssi:6
+msgid "This chapter documents the coding style used in live-boot and others."
+msgstr ""
+"Questo capitolo documenta lo stile usato per il codice di live-boot e gli "
+"altri."
+
+#. type: Plain text
+#: en/project_coding-style.ssi:8
+msgid "2~ Compatibility"
+msgstr "2~ Compatibilità"
+
+#. type: Plain text
+#: en/project_coding-style.ssi:10
+msgid ""
+"_* Don't use syntax or semantics that are unique to the Bash shell. For "
+"example, the use of array constructs."
+msgstr ""
+"_* Non usare sintassi o semantiche mirate alla shell Bash. Ad esempio, l'uso "
+"di costrutti array."
+
+#. type: Plain text
+#: en/project_coding-style.ssi:12
+msgid "_* Only use the POSIX subset - for example, use $(foo) over `foo`."
+msgstr ""
+"_* Utilizzare solo il sottoinsieme POSIX - ad esempio, usare $(foo) invece "
+"di `foo`."
+
+#. type: Plain text
+#: en/project_coding-style.ssi:14
+msgid "_* You can check your scripts with 'sh -n' and 'checkbashisms'."
+msgstr ""
+"_* È possibile verificare i propri script con \"sh -n\" e \"checkbashisms\"."
+
+#. type: Plain text
+#: en/project_coding-style.ssi:16
+msgid "2~ Indenting"
+msgstr "2~ Rientri"
+
+#. type: Plain text
+#: en/project_coding-style.ssi:18
+msgid "_* Always use tabs over spaces."
+msgstr "_* Usare sempre i tab piuttosto che gli spazi."
+
+#. type: Plain text
+#: en/project_coding-style.ssi:20
+msgid "2~ Wrapping"
+msgstr "2~ Ritorno a capo"
+
+#. type: Plain text
+#: en/project_coding-style.ssi:22
+msgid "_* Generally, lines are 80 chars at maximum."
+msgstr "_* Generalmente le righe sono composte da un massimo di 80 caratteri."
+
+#. type: Plain text
+#: en/project_coding-style.ssi:24
+msgid "_* Use the \"Linux style\" of line breaks:"
+msgstr "_* Utilizzare lo \"stile Linux\" per le interruzioni di riga:"
+
+#. type: Plain text
+#: en/project_coding-style.ssi:26 en/project_coding-style.ssi:49
+#: en/project_coding-style.ssi:90 en/project_coding-style.ssi:108
+msgid "Bad:"
+msgstr "Sbagliato:"
+
+#. type: Plain text
+#: en/project_coding-style.ssi:32
+#, no-wrap
+msgid ""
+" if foo; then\n"
+"         bar\n"
+" fi\n"
+msgstr ""
+
+#. type: Plain text
+#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:59
+#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:119
+msgid "Good:"
+msgstr "Corretto:"
+
+#. type: Plain text
+#: en/project_coding-style.ssi:43
+#, no-wrap
+msgid ""
+" if foo\n"
+" then\n"
+"         bar\n"
+" fi\n"
+msgstr ""
+
+#. type: Plain text
+#: en/project_coding-style.ssi:47
+msgid "_* The same holds for functions:"
+msgstr "_* Lo stesso vale per le funzioni:"
+
+#. type: Plain text
+#: en/project_coding-style.ssi:55
+#, no-wrap
+msgid ""
+" foo () {\n"
+"         bar\n"
+" }\n"
+msgstr ""
+
+#. type: Plain text
+#: en/project_coding-style.ssi:66
+#, no-wrap
+msgid ""
+" foo ()\n"
+" {\n"
+"         bar\n"
+" }\n"
+msgstr ""
+
+#. type: Plain text
+#: en/project_coding-style.ssi:70
+msgid "2~ Variables"
+msgstr "2~ Variabili"
+
+#. type: Plain text
+#: en/project_coding-style.ssi:72
+msgid "_* Variables are always in capital letters."
+msgstr "_* Le variabili vanno sempre scritte in maiuscolo."
+
+#. type: Plain text
+#: en/project_coding-style.ssi:74
+msgid ""
+"_* Variables that used in #{lb config}# always start with #{LB_}# prefix."
+msgstr ""
+"_* Le variabili usate in #{lb config}# iniziano sempre con il prefisso #{LB_}"
+"#."
+
+#. type: Plain text
+#: en/project_coding-style.ssi:76
+msgid ""
+"_* Internal temporary variables in live-build should start with the #{\\_LB_}"
+"# prefix."
+msgstr ""
+"_* Le variabili interne temporanee in live-build dovrebbero iniziare con il "
+"prefisso #{\\_LB_}#."
+
+#. type: Plain text
+#: en/project_coding-style.ssi:78
+msgid "_* Local variables start with live-build #{\\_\\_LB_}# prefix."
+msgstr ""
+"_* Le variabili locali iniziano con il prefisso live-build #{\\_\\_LB_}#."
+
+#. type: Plain text
+#: en/project_coding-style.ssi:80
+msgid ""
+"_* Variables in connection to a boot parameter in live-config start with #"
+"{LIVE_}#."
+msgstr ""
+"_* Le variabili in live-config relative ai parametri di avvio iniziano con #"
+"{LIVE_}#."
+
+#. type: Plain text
+#: en/project_coding-style.ssi:82
+msgid "_* All other variables in live-config start with #{_}# prefix."
+msgstr ""
+"_* Tutte le altre variabili in live-config iniziano con il prefisso #{_}#."
+
+#. type: Plain text
+#: en/project_coding-style.ssi:84
+msgid ""
+"_* Use braces around variables; e.g. write #{${FOO}}# instead of #{$FOO}#."
+msgstr ""
+"_* Intorno alle variabili utilizzare le graffe; ad esempio scrivere #{${FOO}}"
+"# invece di #{$FOO}#."
+
+#. type: Plain text
+#: en/project_coding-style.ssi:86
+msgid ""
+"_* Always protect variables with quotes to respect potential whitespaces: "
+"write #{\"${FOO}\"}# not #{${FOO}}#."
+msgstr ""
+"_* Proteggere sempre le variabili con le virgolette per rispettare "
+"potenziali spaziature: scrivere #{\"${FOO}\"}# e non #{${FOO}}#."
+
+#. type: Plain text
+#: en/project_coding-style.ssi:88
+msgid ""
+"_* For consistency reasons, always use quotes when assigning values to "
+"variables:"
+msgstr ""
+"_* Per ragioni di coerenza, usare sempre le virgolette quando si assegnano "
+"valori alle variabili:"
+
+#. type: Plain text
+#: en/project_coding-style.ssi:94
+#, no-wrap
+msgid " FOO=bar\n"
+msgstr ""
+
+#. type: Plain text
+#: en/project_coding-style.ssi:102
+#, no-wrap
+msgid " FOO=\"bar\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/project_coding-style.ssi:106
+msgid "_* If multiple variables are used, quote the full expression:"
+msgstr "_* Utilizzando variabili multiple, quotare l'intera espressione:"
+
+#. type: Plain text
+#: en/project_coding-style.ssi:115
+#, no-wrap
+msgid ""
+" 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"
+msgstr ""
+
+#. type: Plain text
+#: en/project_coding-style.ssi:130
+msgid "2~ Miscellaneous"
+msgstr "2~ Varie"
+
+#. type: Plain text
+#: en/project_coding-style.ssi:132
+msgid ""
+"_* Use \"#{|}#\" (without the surround quotes) as a seperator in calls to "
+"sed, e.g. \"#{sed -e 's|foo|bar|'}#\" (without \"\")."
+msgstr ""
+"_* Per le chiamate a sed utilizzare \"#{|}#\" (senza virgolette intorno) "
+"come separatore, ad esempio \"#{sed -e 's|foo|bar|'}#\" (senza \"\")."
+
+#. type: Plain text
+#: en/project_coding-style.ssi:134
+msgid ""
+"_* Don't use the #{test}# command for comparisons or tests, use \"#{[}#\" \"#"
+"{]}#\" (without \"\"); e.g. \"#{if [ -x /bin/foo ]; ...}#\" and not \"#{if "
+"test -x /bin/foo; ...}#\"."
+msgstr ""
+"_* Non utilizzare il comando #{test}# per prove o confronti, usare \"#{[}#\" "
+"\"#{]}#\" (senza \"\"); ad esempio \"#{if [ -x /bin/foo ]; ...}#\" e non \"#"
+"{if test -x /bin/foo; ...}#\"."
+
+#. type: Plain text
+#: en/project_coding-style.ssi:135
+msgid ""
+"_* Use #{case}# wherever possible over #{test}#, as it's easier to read and "
+"faster in execution."
+msgstr ""
+"_* Ove possibile utilizzare #{case}# invece di #{test}#, essendo più facile "
+"da leggere e più veloce in esecuzione."
diff --git a/manual/po/it/project_procedures.ssi.po b/manual/po/it/project_procedures.ssi.po
new file mode 100644
index 0000000..744f5b8
--- /dev/null
+++ b/manual/po/it/project_procedures.ssi.po
@@ -0,0 +1,473 @@
+# Italian translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+# skizzhg <skizzhg at gmx.com>
+# lillo sciascia <lillosciascia at gmail.com>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual 2.0.0\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"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2: plural=(n !=1)\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/project_procedures.ssi:2
+msgid "B~ Procedures"
+msgstr "B~ Procedure"
+
+#. type: Plain text
+#: en/project_procedures.ssi:4
+msgid "1~procedures Procedures"
+msgstr "1~procedures Procedure"
+
+#. type: Plain text
+#: en/project_procedures.ssi:6
+msgid ""
+"This chapter documents the procedures within the Debian Live project for "
+"various tasks that need cooperation with other teams in Debian."
+msgstr ""
+"Questo capitolo documenta le procedure all'interno del progetto Debian Live "
+"per vari compiti che necessitano di cooperazione con altri team Debian."
+
+#. type: Plain text
+#: en/project_procedures.ssi:8
+msgid "2~ Udeb Uploads"
+msgstr "2~ Aggiornamenti degli udeb"
+
+#. type: Plain text
+#: en/project_procedures.ssi:10
+msgid "Before commiting releases of a udeb in d-i svn, one has to call:"
+msgstr ""
+"Prima di effettuare dei commit di un udeb nel repository svn "
+"dell'installatore Debian va eseguito:"
+
+#. type: Plain text
+#: en/project_procedures.ssi:14
+#, no-wrap
+msgid " $ ../../scripts/l10n/output-l10n-changes . -d\n"
+msgstr ""
+
+#. type: Plain text
+#: en/project_procedures.ssi:18
+msgid "2~ Major Releases"
+msgstr "2~ Rilasci importanti"
+
+#. type: Plain text
+#: en/project_procedures.ssi:20
+msgid ""
+"Releasing a new stable major version of Debian includes a lot of different "
+"teams working together to make it happen. At some point, the Live team comes "
+"in and builds live system images. The requirements to do this are:"
+msgstr ""
+"Rilasciare una nuova versione stabile di Debian implica che molti team "
+"differenti lavorino insieme; ad un certo punto si inserisce il team Live che "
+"prepara le immagini del sistema live. I requisiti per fare ciò sono:"
+
+#. type: Plain text
+#: en/project_procedures.ssi:22
+msgid ""
+"_* A mirror containing the released versions for the debian, debian-security "
+"and debian-volatile archive which the debian-live buildd can access."
+msgstr ""
+"_* Un mirror contenente le versioni rilasciate per l'archivio debian, debian-"
+"security e debian-volatile al quale possa accedere il debian-live buildd."
+
+#. type: Plain text
+#: en/project_procedures.ssi:24
+msgid ""
+"_* The names of the image need to be known (e.g. debian-live-VERSION-ARCH-"
+"FLAVOUR.iso)."
+msgstr ""
+"_* Vanno resi noti i nomi dell'immagine (debian-live-VERSION-ARCH-FLAVOUR."
+"iso)."
+
+#. type: Plain text
+#: en/project_procedures.ssi:26
+msgid "_* The packagelists need to have been updated."
+msgstr "_* Le liste dei pacchetti devono essere state aggiornate."
+
+#. type: Plain text
+#: en/project_procedures.ssi:28
+msgid "_* The data from debian-cd needs to be synced (udeb exclude lists)."
+msgstr "_* Bisogna sincronizzare i dati dal cd Debian (udeb esclude le liste)."
+
+#. type: Plain text
+#: en/project_procedures.ssi:30
+msgid ""
+"_* The includes from debian-cd needs to be synced (README.*, doc/*, etc.)."
+msgstr ""
+"_* Bisogna sincronizzare i file inclusi dal cd Debian (README.*, doc/*, "
+"ecc.)."
+
+#. type: Plain text
+#: en/project_procedures.ssi:32 en/project_procedures.ssi:38
+msgid "_* Images are built and mirrored on cdimage.debian.org."
+msgstr "_* Le immagini vengono create e ospitate su cdimage.debian.org."
+
+#. type: Plain text
+#: en/project_procedures.ssi:34
+msgid "2~ Point Releases"
+msgstr "2~ Rilasci minori"
+
+#. type: Plain text
+#: en/project_procedures.ssi:36
+msgid ""
+"_* Again, we need updated mirror of debian, debian-security and debian-"
+"volatile."
+msgstr ""
+"_* Bisogna nuovamente aggiornare i mirror di debian, debian-security e "
+"debian-volatile."
+
+#. type: Plain text
+#: en/project_procedures.ssi:40
+msgid "_* Send announcement mail."
+msgstr "_* Inviare email di annuncio."
+
+#. type: Plain text
+#: en/project_procedures.ssi:42
+msgid "3~ Point release announcement template"
+msgstr "3~ Modello per l'annuncio di un rilascio minore."
+
+#. type: Plain text
+#: en/project_procedures.ssi:44
+msgid ""
+"An annoucement mail for point releases can be generated using the template "
+"below and the following command:"
+msgstr ""
+"Si può generare un'email per l'annuncio dei rilasci minori usando il modello "
+"sottostante e il seguente comando:"
+
+#. type: Plain text
+#: 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"
+msgstr ""
+
+#. type: Plain text
+#: en/project_procedures.ssi:56
+msgid ""
+"Please check the mail carefully before sending and pass it to others for "
+"proof-reading."
+msgstr ""
+"Si prega di controllare attentamente l'email prima di inviarla e passarla ad "
+"altri per le correzioni."
+
+#. type: Plain text
+#: en/project_procedures.ssi:60
+#, 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\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
+#, 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 ""
+
+#. type: Plain text
+#: en/project_procedures.ssi:73
+#, no-wrap
+msgid ""
+" 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"
+msgstr ""
+
+#. type: Plain text
+#: en/project_procedures.ssi:77
+#, no-wrap
+msgid " It also includes the following Live-specific changes:\n"
+msgstr ""
+
+#. type: Bullet: '  * '
+#: en/project_procedures.ssi:81
+msgid "[INSERT LIVE-SPECIFIC CHANGE HERE]"
+msgstr "[INSERT LIVE-SPECIFIC CHANGE HERE]"
+
+#. 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:85
+#, no-wrap
+msgid ""
+" URLs\n"
+" ----\n"
+msgstr ""
+
+#. type: Plain text
+#: en/project_procedures.ssi:87
+#, 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 ""
+
+#. type: Plain text
+#: en/project_procedures.ssi:91
+#, 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 ""
+
+#. type: Plain text
+#: en/project_procedures.ssi:95
+#, 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 ""
+
+#. type: Plain text
+#: en/project_procedures.ssi:99
+#, 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 ""
+
+#. type: Plain text
+#: en/project_procedures.ssi:103
+#, 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 ""
+
+#. type: Plain text
+#: en/project_procedures.ssi:109
+#, no-wrap
+msgid ""
+" 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\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:117
+#, no-wrap
+msgid ""
+" 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\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:126
+#, no-wrap
+msgid ""
+" 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\n"
+" <http://live.debian.net/> or alternatively send mail to\n"
+" <debian-live at lists.debian.org>.\n"
+msgstr ""
diff --git a/manual/po/it/user_basics.ssi.po b/manual/po/it/user_basics.ssi.po
new file mode 100644
index 0000000..67768b6
--- /dev/null
+++ b/manual/po/it/user_basics.ssi.po
@@ -0,0 +1,1059 @@
+# Italian translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+# Carlo Stemberger <carlo.stemberger at gmail.com>, 2010.
+# lillo sciascia <lillosciascia at gmail.com>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual 2.0.0\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"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2: plural=(n !=1)\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/user_basics.ssi:2
+msgid ":B~ The basics"
+msgstr ":B~ Nozioni di base"
+
+#. type: Plain text
+#: en/user_basics.ssi:4
+msgid "1~the-basics The basics"
+msgstr "1~the-basics Nozioni di base"
+
+#. type: Plain text
+#: en/user_basics.ssi:6
+msgid ""
+"This chapter contains a brief overview of the build process and instructions "
+"for using the three most commonly used image types. The most versatile image "
+"type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB "
+"portable storage device. In certain special cases, #{usb-hdd}# may be more "
+"suitable for USB devices. The chapter finishes with instructions for "
+"building and using a #{net}# type image, which is a bit more involved due to "
+"the setup required on the server. This is a slightly advanced topic for "
+"anyone who is not familiar already with netbooting, but is included here "
+"because once the setup is done, it is a very convenient way to test and "
+"deploy images for booting on the local network without the hassle of dealing "
+"with image media."
+msgstr ""
+"Questo capitolo contiene una breve panoramica del processo di generazione e "
+"le istruzioni per utilizzare i tre tipi di immagine più comunemente "
+"utilizzati. La tipologia di immagine più versatile, #{iso-hybrid}#, può "
+"essere usata su una macchina virtuale, supporto ottico o dispositivo di "
+"archiviazione portatile USB. In alcuni casi particolari, la #{usb-hdd}# "
+"potrebbe essere più adatta per i dispositivi USB. Il capitolo termina con le "
+"istruzioni per costruire e usare un'immagine di tipo #{net}#, che è un poco "
+"più complessa a causa del setup richiesto sul server. Si tratta di un "
+"argomento leggermente avanzato per chi non ha familiarità con l'avvio da "
+"rete, ma è incluso qui perché, una volta che il setup è stato fatto, è un "
+"modo molto comodo per collaudare e distribuire immagini facendo il boot "
+"nella rete locale senza la seccatura di doversi occupare dei mezzi di "
+"divulgazione dell'immagine."
+
+#. type: Plain text
+#: en/user_basics.ssi:8
+msgid "2~ What is a live system?"
+msgstr "2~ Che cos'è un sistema live?"
+
+#. type: Plain text
+#: en/user_basics.ssi:10
+msgid ""
+"A live system usually means an operating system booted on a computer from a "
+"removable medium, such as a CD-ROM or USB stick, or from a network, ready to "
+"use without any installation on the usual drive(s), with auto-configuration "
+"done at run time (see {Terms}#terms)."
+msgstr ""
+"Per sistema live generalmente si intende un sistema operativo che può essere "
+"avviato da un supporto rimovibile, come un CD-ROM o una chiavetta USB, "
+"oppure da una rete, pronto per l'uso senza alcuna installazione su hard "
+"disk, con una auto-configurazione fatta durante l'esecuzione (vedere "
+"{Glossario}#terms)."
+
+#. type: Plain text
+#: en/user_basics.ssi:12
+msgid ""
+"With Debian Live, it's a Debian GNU/Linux operating system, built for one of "
+"the supported architectures (currently amd64, i386, powerpc and sparc). It "
+"is made from the following parts:"
+msgstr ""
+"Con Debian Live, si tratta di un sistema operativo Debian GNU/Linux, "
+"generato per una delle architetture previste (attualmente amd64, i386, "
+"powerpc e sparc). È costituito dalle seguenti parti:"
+
+#. type: Plain text
+#: en/user_basics.ssi:14
+msgid "_* *{Linux kernel image}*, usually named #{vmlinuz*}#"
+msgstr "_* *{Immagine del kernel Linux}*, comunemente chiamata #{vmlinuz*}#"
+
+#. type: Plain text
+#: en/user_basics.ssi:16
+msgid ""
+"_* *{Initial RAM disk image (initrd)}*: a RAM disk set up for the Linux "
+"boot, containing modules possibly needed to mount the System image and some "
+"scripts to do it."
+msgstr ""
+"_* *{Initial RAM disk image (initrd)}*: un disco RAM creato per il boot di "
+"Linux, contenente i moduli potenzialmente necessari per montare l'immagine "
+"di sistema e alcuni script per farlo."
+
+#. type: Plain text
+#: en/user_basics.ssi:18
+msgid ""
+"_* *{System image}*: The operating system's filesystem image. Usually, a "
+"SquashFS compressed filesystem is used to minimize the Debian Live image "
+"size. Note that it is read-only. So, during boot the Debian Live system will "
+"use a RAM disk and 'union' mechanism to enable writing files within the "
+"running system. However, all modifications will be lost upon shutdown unless "
+"optional persistence is used (see {Persistence}#persistence)."
+msgstr ""
+"_* *{Immagine di sistema}*: l'immagine del filesystem del sistema operativo. "
+"Normalmente è usato un filesystem compresso SquashFS, per minimizzare le "
+"dimensioni dell'immagine Debian Live. Si noti che è in sola lettura. Dunque, "
+"durante il boot il sistema Debian Live userà un disco RAM e il meccanismo "
+"'unione' per attivare i file in scrittura all'interno del sistema in "
+"esecuzione. Ad ogni modo, tutte le modifiche verranno perse con lo "
+"spegnimento a meno che non si usi la persistenza opzionale (si veda "
+"{Persistenza}#persistence)."
+
+#. type: Plain text
+#: en/user_basics.ssi:20
+msgid ""
+"_* *{Bootloader}*: A small piece of code crafted to boot from the chosen "
+"media, possibly presenting a prompt or menu to allow selection of options/"
+"configuration. It loads the Linux kernel and its initrd to run with an "
+"associated system filesystem. Different solutions can be used, depending on "
+"the target media and format of the filesystem containing the previously "
+"mentioned components: isolinux to boot from a CD or DVD in ISO9660 format, "
+"syslinux for HDD or USB drive booting from a VFAT partition, extlinux for "
+"ext2/3/4 and btrfs partitions, pxelinux for PXE netboot, GRUB for ext2/3/4 "
+"partitions, etc."
+msgstr ""
+"_* *{Bootloader}*: una piccola porzione di codice predisposto per l'avvio "
+"dal supporto scelto, che presenta un prompt o un menu per la selezione di "
+"opzioni/configurazioni. Carica il kernel Linux ed il suo initrd da eseguire "
+"con un filesystem associato. Possono essere usate diverse soluzioni, in base "
+"al supporto di destinazione ed al formato del filesystem contenenti le "
+"componenti precedentemente citate: isolinux per il boot da CD o DVD nel "
+"formato ISO9660, syslinux per supporti HDD o USB che si avviano da una "
+"partizione VFAT, extlinux per le partizioni ext/2/3/4 e btrfs, pxelinux per "
+"il netboot PXE, GRUB per partizioni ext2/3/4, ecc."
+
+#. type: Plain text
+#: en/user_basics.ssi:22
+msgid ""
+"You can use live-build to build the system image from your specifications, "
+"set up a Linux kernel, its initrd, and a bootloader to run them, all in one "
+"media-dependant format (ISO9660 image, disk image, etc.)."
+msgstr ""
+"È possibile usare live-build per creare l'immagine di sistema secondo le "
+"proprie specifiche, scegliere un kernel Linux, il suo initrd ed un "
+"bootloader per avviarli, tutto in un unico formato che dipende dal mezzo "
+"(immagini ISO9660, immagine disco, ecc.)"
+
+#. type: Plain text
+#: en/user_basics.ssi:24
+msgid "2~ First steps: building an ISO image"
+msgstr "2~ Primi passi: creare un'immagine ISO"
+
+#. type: Plain text
+#: en/user_basics.ssi:26
+msgid ""
+"The following sequence of live-build commands will create a basic ISO hybrid "
+"image containing just the Debian standard system without X.org. It is "
+"suitable for burning to CD or DVD media, and also to copy onto a USB stick "
+"(as per {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
+"specifying \".iso\" extension where \".img\" is indicated)."
+msgstr ""
+"La seguente sequenza di comandi di live-build creerà un'immagine ISO ibrida "
+"di base contenente soltanto il sistema Debian standard senza X.org. È adatta "
+"per essere masterizzata su CD o DVD e anche per essere copiata su una penna "
+"USB (come per {Copiare un'immagine USB/HDD su una penna USB}#copying-usb-hdd-"
+"image, specificando l'estensione \".iso\" dove è indicato \".img\")."
+
+#. type: Plain text
+#: en/user_basics.ssi:28
+msgid ""
+"First, we run the #{lb config}# command which will create a \"config/\" "
+"hierarchy in the current directory for use by other commands:"
+msgstr ""
+"In primo luogo eseguire il comando #{lb config}#, il quale creerà una "
+"gerarchia \"config/\" nella directory corrente e che verrà utilizzata da "
+"altri comandi:"
+
+#. type: Plain text
+#: en/user_basics.ssi:32
+#, no-wrap
+msgid " $ lb config\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:36
+msgid ""
+"By passing no parameters to #{lb config}#, we indicated that we wish to use "
+"the defaults (see {The lb config command}#lb-config)."
+msgstr ""
+"Non passando alcun parametro a #{lb config}#, si indica che si intende "
+"utilizzare le impostazione predefinite (vedere {Il comando lb config}#lb-"
+"config)."
+
+#. type: Plain text
+#: en/user_basics.ssi:38
+msgid ""
+"Now that we have a \"config/\" hierarchy, we may build the image with the #"
+"{lb build}# command:"
+msgstr ""
+"Ora che si ha una gerarchia \"config/\" si può generare l'immagine con il "
+"comando #{lb build}#:"
+
+#. 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:208
+#, no-wrap
+msgid " # lb build\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:46
+msgid ""
+"This process can take a while, depending on the speed of your network "
+"connection (see {The lb build command}#lb-build)."
+msgstr ""
+"Questo processo può richiedere tempo, a seconda della velocità della "
+"connessione di rete (vedere {Il comando lb build}#lb-build)."
+
+#. type: Plain text
+#: en/user_basics.ssi:48
+msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
+msgstr "3~testing-iso-with-qemu Provare un'immagine ISO con Qemu"
+
+#. type: Plain text
+#: en/user_basics.ssi:50
+msgid "Testing an ISO is simple:"
+msgstr "Collaudare una ISO è semplice:"
+
+#. type: Plain text
+#: en/user_basics.ssi:54 en/user_basics.ssi:142
+#, no-wrap
+msgid " # apt-get install qemu\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:56
+#, no-wrap
+msgid " $ qemu -cdrom binary.iso\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:60
+msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
+msgstr ""
+"3~testing-iso-with-virtualbox Provare un'immagine ISO con virtualbox-ose"
+
+#. type: Plain text
+#: en/user_basics.ssi:62
+msgid "In order to test the ISO with virtualbox-ose:"
+msgstr "Per provare la ISO con virtualbox-ose:"
+
+#. type: Plain text
+#: en/user_basics.ssi:66
+#, no-wrap
+msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:68
+#, no-wrap
+msgid " $ virtualbox\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:72
+msgid ""
+"Create a new virtual machine, change the storage settings to use binary.iso "
+"as the CD/DVD device, and start the machine."
+msgstr ""
+"Creare una nuova macchina virtuale, modificare le impostazione di "
+"archiviazione in modo da usare binary.iso come dispositivo CD/DVD, ed "
+"avviare la macchina."
+
+#. type: Plain text
+#: en/user_basics.ssi:74
+msgid ""
+"Note: For live systems containing X.org that you want to test with "
+"virtualbox-ose, you may wish to include the VirtualBox X.org driver package, "
+"virtualbox-ose-guest-x11, in your live-build configuration. Otherwise, the "
+"resolution is limited to 800x600."
+msgstr ""
+"Nota: per sistemi live contenenti X.org che si vogliono provare con "
+"virtualbox-ose, si può voler includere il pacchetto dei driver per X.org di "
+"VirtualBox, virtualbox-ose-guest-x11, nella configurazione di live-build. "
+"Altrimenti, la risoluzione è limitata a 800x600."
+
+#. type: Plain text
+#: en/user_basics.ssi:78
+#, no-wrap
+msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:82
+msgid "3~burning-iso-image Burning an ISO image to a physical medium"
+msgstr "3~burning-iso-image Masterizzare un'immagine ISO su un supporto fisico"
+
+#. type: Plain text
+#: en/user_basics.ssi:84
+msgid "Burning an ISO image is easy:"
+msgstr "Masterizzare un'immagine ISO è semplice:"
+
+#. type: Plain text
+#: en/user_basics.ssi:88
+#, no-wrap
+msgid " # apt-get install wodim\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:90
+#, no-wrap
+msgid " $ wodim binary.iso\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:94
+msgid "2~ Building a USB/HDD image"
+msgstr "2~ Creare un'immagine USB/HDD"
+
+#. type: Plain text
+#: en/user_basics.ssi:96
+msgid ""
+"The following sequence of commands will create a basic USB/HDD image "
+"containing just the Debian standard system without X.org. It is suitable for "
+"booting from USB sticks, USB hard drives, and various other portable storage "
+"devices. Normally, an ISO hybrid image can be used for this purpose instead, "
+"but if you have a BIOS which does not handle hybrid images properly, or want "
+"to use the remaining space on the media for a persistence partition, you "
+"need a USB/HDD image."
+msgstr ""
+"La seguente sequenza di comandi creerà un'immagine USB/HDD di base "
+"contenente solo un sistema Debian standard senza X.org. È adatta per "
+"avviarsi da chiavette USB, dischi rigidi USB, e da svariati altri "
+"dispositivi di archiviazione portatili. In genere per questo scopo può "
+"essere usata un'immagine ISO ibrida, ma se si ha un BIOS che non supporta le "
+"immagini ibride, o si vuole usare lo spazio rimanente sul supporto per una "
+"partizione persistente, allora occorre un'immagine USB/HDD."
+
+#. type: Plain text
+#: en/user_basics.ssi:98
+msgid ""
+"Note: if you created an ISO image with the previous example, you will need "
+"to clean up your working directory with the #{lb clean}# command (see {The "
+"lb clean command}#lb-clean):"
+msgstr ""
+"Nota: se si è creata un'immagine ISO con gli esempi precedenti, occorre "
+"pulire la directory di lavoro con il comando #{lb clean}# (vedere {Il "
+"comando lb clean}#lb-clean):"
+
+#. type: Plain text
+#: en/user_basics.ssi:102 en/user_basics.ssi:184
+#, no-wrap
+msgid " # lb clean --binary\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:106
+msgid ""
+"Run the #{lb config}# command with the parameters to configure the #{config/}"
+"# hierarchy to create a USB/HDD image type:"
+msgstr ""
+"Eseguire il comando #{lb config}# con i parametri atti a configurare la "
+"struttura #{config/}# per creare un'immagine di tipo USB/HDD:"
+
+#. type: Plain text
+#: en/user_basics.ssi:110
+#, no-wrap
+msgid " $ lb config -b usb-hdd\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:114 en/user_basics.ssi:198
+msgid "Now build the image with the #{lb build}# command:"
+msgstr "Si crei ora l'immagine con il comando #{lb build}#:"
+
+#. type: Plain text
+#: en/user_basics.ssi:122
+msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
+msgstr "3~copying-usb-hdd-image Copiare un'immagine USB/HDD su una penna USB"
+
+#. type: Plain text
+#: en/user_basics.ssi:124
+msgid ""
+"The generated binary image contains a VFAT partition and the syslinux "
+"bootloader, ready to be directly written on a USB stick. Plug in a USB stick "
+"with a size larger than that of binary.img and type:"
+msgstr ""
+"L'immagine binaria generata contiene una partizione VFAT e il bootloader "
+"syslinux, pronti per essere scritti direttamente su una penna USB. Inserire "
+"una chiavetta USB con una dimensione maggiore di quella di binary.img e "
+"digitare:"
+
+#. type: Plain text
+#: en/user_basics.ssi:128
+#, no-wrap
+msgid " $ dd if=binary.img of=${USBSTICK}\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:132
+msgid ""
+"where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
+"a partition like #{/dev/sdb1}#!); you can find the right device name by "
+"looking in #{dmesg}#'s output after plugging in the stick, for example, or "
+"better yet, #{ls -l /dev/disk/by-id}#."
+msgstr ""
+"dove #{${USBSTICK}}# è il nome del device, come #{/dev/sdb}# (non una "
+"partizione come #{/dev/sdb1}#!); si può trovare il nome corretto del device "
+"guardando l'output di #{dmesg}# dopo aver inserito la chiavetta USB, o "
+"meglio ancora #{ls -l /dev/disk/by-id}#."
+
+#. type: Plain text
+#: en/user_basics.ssi:134
+#, no-wrap
+msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
+msgstr "*{Questo sovrascriverà definitivamente qualsiasi dato in precedenza sulla chiavetta!}*\n"
+
+#. type: Plain text
+#: en/user_basics.ssi:136
+msgid ""
+"Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
+"type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images."
+msgstr ""
+"Nota: come disquisito in precedenza, questo stesso processo può essere usato "
+"per immagini di tipo #{iso-hybrid}# (con suffisso #{-hybrid.iso}#), ma non "
+"per le immagini di tipo #{iso}#."
+
+#. type: Plain text
+#: en/user_basics.ssi:138
+msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
+msgstr "3~testing-usb-hdd-with-qemu Provare un'immagine USB/HDD con Qemu"
+
+#. type: Plain text
+#: en/user_basics.ssi:144
+#, no-wrap
+msgid " $ qemu -hda binary.img\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:148
+msgid "3~ Using the space left on a USB stick"
+msgstr "3~ Usare lo spazio rimanente su una penna USB"
+
+#. type: Plain text
+#: en/user_basics.ssi:150
+msgid ""
+"If you want to use the remaining free space after you have installed the "
+"binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
+"# to create a new partition on the stick. The first partition will be used "
+"by the Debian Live system."
+msgstr ""
+"Se si vuole usare lo spazio libero che rimane dopo l'installazione di binary."
+"img, si può usare uno strumento di partizionamento come #{gparted}# o #"
+"{parted}# per creare una nuova partizione sulla penna. La prima partizione "
+"verrà utilizzata dal sistema Debian Live."
+
+#. type: Plain text
+#: en/user_basics.ssi:154
+#, no-wrap
+msgid " # gparted ${USBSTICK}\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:158
+msgid ""
+"After the creation of the partition, you have to create a filesystem on it. "
+"One possible choice would be ext4."
+msgstr ""
+"Dopo aver creato la partizione, si deve creare su di essa un filesystem. Una "
+"scelta possibile potrebbe essere ext4."
+
+#. type: Plain text
+#: en/user_basics.ssi:162
+#, no-wrap
+msgid " # mkfs.ext4 ${USBSTICK}\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:166
+msgid "If you want to use this data partition with Windows, use FAT32."
+msgstr "Usare FAT32 se si vuole usare questa partizione dati con Windows."
+
+#. type: Plain text
+#: en/user_basics.ssi:170
+#, no-wrap
+msgid " # mkfs.vfat -F 32\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:174
+#, no-wrap
+msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
+msgstr "*{Ricorda: ogni volta che si installa un nuovo file binary.img sulla penna, tutti i dati sulla chiavetta saranno persi perché la tabella delle partizioni viene sovrascritta con i contenuti dell'immagine.}*\n"
+
+#. type: Plain text
+#: en/user_basics.ssi:176
+msgid "2~building-netboot-image Building a netboot image"
+msgstr "2~building-netboot-image Creare un'immagine netboot"
+
+#. type: Plain text
+#: en/user_basics.ssi:178
+msgid ""
+"The following sequence of commands will create a basic netboot image "
+"containing the Debian standard system without X.org. It is suitable for "
+"booting over the network."
+msgstr ""
+"La seguente sequenza di comandi creerà un'immagine netboot di base "
+"contenente il sistema Debian standard senza X.org. È adatta per il boot "
+"tramite rete."
+
+#. type: Plain text
+#: en/user_basics.ssi:180
+msgid ""
+"Note: if you performed any previous examples, you will need to clean up your "
+"working directory with the #{lb clean}# command:"
+msgstr ""
+"Nota: se qualcuno tra gli esempi precedenti è stato seguito, bisogna pulire "
+"la directory di lavoro con il comando #{lb clean}#:"
+
+#. type: Plain text
+#: en/user_basics.ssi:188
+msgid ""
+"Run the #{lb config}# command as follows to configure your image for "
+"netbooting:"
+msgstr ""
+"Per configurare l'immagine per l'avvio da rete, eseguire il comando #{lb "
+"config}# come segue:"
+
+#. type: Plain text
+#: en/user_basics.ssi:192
+#, 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
+#: en/user_basics.ssi:196
+msgid ""
+"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
+"serve the filesystem image to the client, so the files must be served via "
+"NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the "
+"location and server, respectively, of the NFS server where the filesytem "
+"image will be located at boot time. Make sure these are set to suitable "
+"values for your network and server."
+msgstr ""
+"Diversamente dalle immagini ISO e USB/HDD, il boot via rete non fornisce "
+"un'immagine del filesytem al client, perciò i file devono essere forniti via "
+"NFS. Le opzioni net-root-path e net-root-server specificano, "
+"rispettivamente, il percorso e il server del server NFS dove l'immagine del "
+"filesystem sarà situata all'avvio. Accertarsi che questi siano impostati su "
+"valori adeguati alla propria rete."
+
+#. type: Plain text
+#: en/user_basics.ssi:206
+msgid ""
+"In a network boot, the client runs a small piece of software which usually "
+"resides on the EPROM of the Ethernet card. This program sends a DHCP request "
+"to get an IP address and information about what to do next. Typically, the "
+"next step is getting a higher level bootloader via the TFTP protocol. That "
+"could be pxelinux, GRUB, or even boot directly to an operating system like "
+"Linux."
+msgstr ""
+"In un avvio tramite rete, il client esegue una piccola parte di software che "
+"normalmente risiede sulla EPROM della scheda Ethernet. Questo programma "
+"invia una richiesta DHCP per ottenere un indirizzo IP e le informazioni su "
+"cosa fare in seguito. In genere il passo successivo è ottenere un bootloader "
+"di di livello superiore attraverso il protocollo TFTP. Questi potrebbe "
+"essere pxelinux, GRUB, o anche avviare direttamente un sistema operativo "
+"come Linux."
+
+#. type: Plain text
+#: en/user_basics.ssi:208
+msgid ""
+"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
+"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
+"in #{tftpboot/debian-live/i386}#."
+msgstr ""
+"Per esempio, estraendo l'archivio generato #{binary-net.tar.gz}# nella "
+"directory #{/srv/debian-live}#, si troverà l'immagine del filesystem in #"
+"{live/filesystem.squashfs}# mentre il kernel, initrd ed il bootloader "
+"pxelinux in #{tftpboot/debian-live/i386}#."
+
+#. type: Plain text
+#: en/user_basics.ssi:210
+msgid ""
+"We must now configure three services on the server to enable netboot: the "
+"DHCP server, the TFTP server and the NFS server."
+msgstr ""
+"Per abilitare l'avvio tramite rete vanno ora configurati tre servizi:i "
+"server DHCP, TFTP e NFS."
+
+#. type: Plain text
+#: en/user_basics.ssi:212
+msgid "3~ DHCP server"
+msgstr "3~ Server DHCP"
+
+#. type: Plain text
+#: en/user_basics.ssi:214
+msgid ""
+"We must configure our network's DHCP server to be sure to give an IP address "
+"to the netbooting client system, and to advertise the location of the PXE "
+"bootloader."
+msgstr ""
+"Si deve configurare il server DHCP della rete per essere sicuri di fornire "
+"un indirizzo IP al sistema client che si avvia tramite rete, e notificare la "
+"posizione del bootloader PXE."
+
+#. type: Plain text
+#: en/user_basics.ssi:216
+msgid ""
+"Here is an example for inspiration, written for the ISC DHCP server #{isc-"
+"dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:"
+msgstr ""
+"Ecco un esempio, scritto per un server DHCP ISC #{isc-dhcp-server}# nel file "
+"di configurazione #{/etc/dhcp/dhcpd.conf}#:"
+
+#. type: Plain text
+#: en/user_basics.ssi:220
+#, no-wrap
+msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:222
+#, 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\";\n"
+" option domain-name-servers ns1.example.org, ns2.example.org;\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:228
+#, no-wrap
+msgid ""
+" default-lease-time 600;\n"
+" max-lease-time 7200;\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:230
+#, 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"
+"}\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:240
+msgid "3~ TFTP server"
+msgstr "3~ Server TFTP"
+
+#. type: Plain text
+#: en/user_basics.ssi:242
+msgid "This serves the kernel and initial ramdisk to the system at run time."
+msgstr ""
+"Fornisce al sistema il kernel e il ramdisk iniziale in fase di esecuzione."
+
+#. type: Plain text
+#: en/user_basics.ssi:244
+msgid ""
+"You should install the tftpd-hpa package. It can serve all files contained "
+"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
+"#{/srv/debian-live/tftpboot}#, run as root the following command:"
+msgstr ""
+"Si installi il pacchetto tftpd-hpa, che mette a disposizione tutti i file "
+"contenuti in una directory root, di solito #{/srv/tftp}#. Affinché si possa "
+"disporre dei file contenuti in #{/srv/debian-live/tftpboot}#, eseguire il "
+"seguente comando come utente root:"
+
+#. type: Plain text
+#: en/user_basics.ssi:248
+#, no-wrap
+msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:252
+msgid "and fill in the new tftp server directory when being asked about it."
+msgstr "e inserire la nuova directory del server tftp quando viene richiesto."
+
+#. type: Plain text
+#: en/user_basics.ssi:254
+msgid "3~ NFS server"
+msgstr "3~ Server NFS"
+
+#. type: Plain text
+#: en/user_basics.ssi:256
+msgid ""
+"Once the guest computer has downloaded and booted a Linux kernel and loaded "
+"its initrd, it will try to mount the Live filesystem image through a NFS "
+"server."
+msgstr ""
+"Una volta che il computer ospite ha scaricato e avviato un kernel Linux e "
+"caricato il suo initrd, cercherà di montare l'immagine del filesystem Live "
+"tramite un server NFS."
+
+#. type: Plain text
+#: en/user_basics.ssi:258
+msgid "You need to install the #{nfs-kernel-server}# package."
+msgstr "Bisogna installare il pacchetto #{nfs-kernel-server}#."
+
+#. type: Plain text
+#: en/user_basics.ssi:260
+msgid ""
+"Then, make the filesystem image available through NFS by adding a line like "
+"the following to #{/etc/exports}#:"
+msgstr ""
+"Quindi, rendere disponibile l'immagine del filesystem via NFS aggiungendo "
+"una riga come la seguente in #{/etc/exports}#:"
+
+#. type: Plain text
+#: en/user_basics.ssi:264
+#, no-wrap
+msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:268
+msgid ""
+"and tell the NFS server about this new export with the following command:"
+msgstr "e comunicare il nuovo export al server NFS con il seguente comando:"
+
+#. type: Plain text
+#: en/user_basics.ssi:272
+#, no-wrap
+msgid " # exportfs -rv\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:276
+msgid ""
+"Setting up these three services can be a little tricky. You might need some "
+"patience to get all of them working together. For more information, see the "
+"syslinux wiki at http://syslinux.zytor.com/wiki/index.php/PXELINUX or the "
+"Debian Installer Manual's TFTP Net Booting section at http://d-i.alioth."
+"debian.org/manual/en.i386/ch04s05.html. They might help, as their processes "
+"are very similar."
+msgstr ""
+"Configurare questi tre servizi può essere un po' problematico. Serve un po' "
+"di pazienza per farli funzionare assieme. Per ulteriori informazioni, si "
+"veda il wiki syslinux http://syslinux.zytor.com/wiki/index.php/PXELINUX o il "
+"manuale del Debian Installer alla sezione per l'avvio TFTP da rete  http://d-"
+"i.alioth.debian.org/manual/en.i386/ch04s05.html. Ciò può essere d'aiuto, "
+"considerato che il procedimento è molto simile."
+
+#. type: Plain text
+#: en/user_basics.ssi:278
+msgid "3~ Netboot testing HowTo"
+msgstr "3~ Come provare una netboot"
+
+#. type: Plain text
+#: en/user_basics.ssi:280
+msgid ""
+"Netboot image creation is made easy with live-build magic, but testing the "
+"images on physical machines can be really time consuming."
+msgstr ""
+"La creazione di immagini netboot è resa semplice dal potere di live-build, "
+"ma provare le immagini su una macchina reale può essere davvero dispendioso "
+"in termini di tempo."
+
+#. type: Plain text
+#: en/user_basics.ssi:282
+msgid ""
+"To make our life easier, we can use virtualization. There are two solutions."
+msgstr ""
+"Per semplificarsi la vita, si può usare la virtualizzazione. Ci sono due "
+"soluzioni."
+
+#. type: Plain text
+#: en/user_basics.ssi:284
+msgid "3~ Qemu"
+msgstr "3~ Qemu"
+
+#. type: Plain text
+#: en/user_basics.ssi:286
+msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
+msgstr "_* Installare #{qemu}#, #{bridge-utils}#, #{sudo}#."
+
+#. type: Plain text
+#: en/user_basics.ssi:288
+msgid "Edit #{/etc/qemu-ifup}#:"
+msgstr "Modificare #{/etc/qemu-ifup}#:"
+
+#. type: Plain text
+#: en/user_basics.ssi:299
+#, no-wrap
+msgid ""
+" #!/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
+#: en/user_basics.ssi:303
+msgid "Get, or build a #{grub-floppy-netboot}# (in the svn)."
+msgstr "Procurarsi o compilare #{grub-floppy-netboot}# (su svn)."
+
+#. type: Plain text
+#: en/user_basics.ssi:305
+msgid ""
+"Launch #{qemu}# with \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
+msgstr ""
+"Lanciare #{qemu}# con \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
+
+#. type: Plain text
+#: en/user_basics.ssi:307
+msgid "3~ VMWare Player"
+msgstr "3~ VMWare Player"
+
+#. type: Plain text
+#: en/user_basics.ssi:309
+msgid "_* Install VMWare Player (\"free as in beer\" edition)"
+msgstr "_* Installare VMWare Player (edizione \"free as in beer\")"
+
+#. type: Plain text
+#: en/user_basics.ssi:311
+msgid ""
+"_* Create a PXETester directory, and create a text file called #{pxe.vwx}# "
+"inside"
+msgstr ""
+"_* Creare una directory PXETester, e crearvi all'interno un file di testo "
+"chiamato #{pxe.vwx}#"
+
+#. type: Plain text
+#: en/user_basics.ssi:313
+msgid "_* Paste this text inside:"
+msgstr "_* Vi si copi dentro questo testo:"
+
+#. type: Plain text
+#: en/user_basics.ssi:321
+#, no-wrap
+msgid ""
+" #!/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\"\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
+#, no-wrap
+msgid ""
+" ethernet0.present = \"TRUE\"\n"
+" ethernet0.addressType = \"generated\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:333
+#, 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\"\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
+#: en/user_basics.ssi:342
+msgid ""
+"_* You can play with this configuration file (e.g. change memory limit to "
+"256)"
+msgstr ""
+"_* Si può giocare con questo file di configurazione (ad esempio portando a "
+"256 il limite della memoria)"
+
+#. type: Plain text
+#: en/user_basics.ssi:344
+msgid ""
+"_* Double click on this file (or run VMWare player and select this file)."
+msgstr ""
+"_* Fare doppio click su questo file (o avviare il player VMWare e "
+"selezionare questo file)."
+
+#. type: Plain text
+#: en/user_basics.ssi:345
+msgid "_* When running just press space if that strange question comes up..."
+msgstr ""
+"_* Se viene posta qualche strana domanda durante l'esecuzione premere il "
+"tasto spazio..."
diff --git a/manual/po/it/user_customization-binary.ssi.po b/manual/po/it/user_customization-binary.ssi.po
new file mode 100644
index 0000000..a74a642
--- /dev/null
+++ b/manual/po/it/user_customization-binary.ssi.po
@@ -0,0 +1,114 @@
+# Italian translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+# lillo sciascia <lillosciascia at gmail.com>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual 2.0.0\n"
+"POT-Creation-Date: 2010-11-30 11:20+0100\n"
+"PO-Revision-Date: 2010-12-12 10:04+0100\n"
+"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
+"Language-Team: Italian <tp at lists.linux.it>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2: plural=(n !=1)\n"
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:2
+msgid "B~ Customizing the binary image"
+msgstr "B~ Personalizzare l'immagine binaria"
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:4
+msgid "1~ Customizing the binary image"
+msgstr "1~ Personalizzare l'immagine binaria"
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:6
+msgid "2~ Bootloader"
+msgstr "2~ Bootloader"
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:8
+msgid ""
+"live-build uses syslinux as bootloader by default, which is by default "
+"configured to pause indefinitely at its splash screen. To adjust this, you "
+"can pass #{--syslinux-timeout TIMEOUT}# to #{lb config}#. The value is "
+"specified in units of seconds. A timeout of 0 (zero) disables the timeout "
+"completely. For more information please see syslinux(1)."
+msgstr ""
+"live-build usa syslinux come bootloader predefinito, il quale è configurato "
+"per restare in pausa continua sulla schermata d'avvio. Per cambiare questo "
+"comportamento, si passi #{--syslinux-timeout TIMEOUT}# a #{lb config}#. "
+"Questo valore è espresso in secondi, 0 (zero) disabilita completamente il "
+"tempo di attesa. Per maggiori informazioni vedere syslinux(1)."
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:10
+msgid "2~ ISO metadata"
+msgstr "2~ Metadati ISO"
+
+# da rivedere l'ultimo periodo
+#. type: Plain text
+#: en/user_customization-binary.ssi:12
+msgid ""
+"When creating an ISO9660 binary image, you can use the following options to "
+"add various textual metadata for your image. This can help you easily "
+"identify the version or configuration of an image without booting it."
+msgstr ""
+"Quando si crea un'immagine binaria ISO9660, si possono usare le seguenti "
+"opzioni per aggiungere vari metadati testuali. Questo può aiutare a "
+"identificare facilmente la versione o la configurazione di un'immagine senza "
+"avviarla."
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:14
+msgid ""
+"_* #{LB_ISO_APPLICATION/--iso-application NAME}#: This should describe the "
+"application that will be on the image. The maximum length for this field is "
+"128 characters."
+msgstr ""
+"_* #{LB_ISO_APPLICATION/--iso-application NAME}#: descrive l'applicazione "
+"che sarà nell'immagine. La lunghezza massima per questo campo è di 128 "
+"caratteri."
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:16
+msgid ""
+"_* #{LB_ISO_PREPARER/--iso-preparer NAME}#: This should describe the "
+"preparer of the image, usually with some contact details. The default for "
+"this option is the live-build version you are using, which may help with "
+"debugging later. The maximum length for this field is 128 characters."
+msgstr ""
+"* #{LB_ISO_PREPARER/--iso-preparer NAME}#: descrive il costruttore "
+"dell'mmagine, solitamente con alcuni dettagli per contattarlo. "
+"L'impostazione predefinita è la versione di live-build che si sta usando, il "
+"quale potrà essere utile in seguito per il debugging. La lunghezza massima "
+"per questo campo è di 128 caratteri."
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:18
+msgid ""
+"_* #{LB_ISO_PUBLISHER/--iso-publisher NAME}#: This should describe the "
+"publisher of the image, usually with some contact details. The maximum "
+"length for this field is 128 characters."
+msgstr ""
+"_* #{LB_ISO_PUBLISHER/--iso-publisher NAME}#: descrive l'editore "
+"dell'immagine, solitamente con qualche dettaglio per contattarlo. La "
+"lunghezza massima lunghezza per questo campo è di 128 caratteri."
+
+#. type: Plain text
+#: en/user_customization-binary.ssi:19
+msgid ""
+"_* #{LB_ISO_VOLUME/--iso-volume NAME}#: This should specify the volume ID of "
+"the image. This is used as a user-visible label on some platforms such as "
+"Windows and Apple Mac OS. The maximum length for this field is 32 characters."
+msgstr ""
+"_* #{LB_ISO_VOLUME/--iso-volume NAME}#: specifica l'ID del volume "
+"dell'immagine. Questa è utilizzata come etichetta visibile all'utente su "
+"alcune piattaforme, come Windows e Apple Mac OS. La lunghezza massima per "
+"questo campo è di 128 caratteri."
diff --git a/manual/po/it/user_customization-contents.ssi.po b/manual/po/it/user_customization-contents.ssi.po
new file mode 100644
index 0000000..69085c2
--- /dev/null
+++ b/manual/po/it/user_customization-contents.ssi.po
@@ -0,0 +1,494 @@
+# Italian translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+# lillo sciascia <lillosciascia at gmail.com>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual 2.0.0\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"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2: plural=(n !=1)\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
+msgid ":B~ Customizing contents"
+msgstr "B~ Personalizzazione dei contenuti"
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:4
+msgid "1~customizing-contents Customizing contents"
+msgstr "1~customizing-contents Personalizzazione dei contenuti"
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:6
+msgid ""
+"This chapter discusses fine-tuning customization of the live system contents "
+"beyond merely choosing which packages to include. Includes allow you to add "
+"or replace arbitrary files in your Debian Live image, hooks allow you to "
+"execute arbitrary commands at different stages of the build and at boot "
+"time, and preseeding allows you to configure packages when they are "
+"installed by supplying answers to debconf questions."
+msgstr ""
+"Questo capitolo tratta la personalizzazione dei contenuti del sistema live "
+"che va oltre la semplice scelta dei pacchetti da includere. Gli include "
+"permettono di aggiungere o sostituire file nell'immagine di Debian Live, gli "
+"hook permettono di eseguire comandi in fasi differenti della creazione e "
+"all'avvio, e la preconfigurazione permette di configurare i pacchetti quando "
+"vengono installati fornendo risposte alle domande di debconf."
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:8
+msgid "2~ Includes"
+msgstr "2~ Include"
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:10
+msgid ""
+"While ideally a Debian live system would include files entirely provided by "
+"unmodified Debian packages, it is sometimes convenient to provide or modify "
+"some content by means of files. Using includes, it is possible to add (or "
+"replace) arbitrary files in your Debian Live image. live-build provides "
+"three mechanisms for using them:"
+msgstr ""
+"Anche se idealmente un sistema live Debian dovrebbe includere file forniti "
+"interamente dal pacchetti Debian non modificati, a volte è conveniente "
+"fornire o modificare parte del contenuto per mezzo di file. Utilizzando gli "
+"include, si può aggiungere (o sostituire) file arbitrari nell'immagine di "
+"Debian Live. Per usarli, live-build mette a disposizione tre meccanismi:"
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:12
+msgid ""
+"_* Chroot local includes: These allow you to add or replace files to the "
+"chroot/Live filesystem. Please see {Live/chroot local includes}#live-chroot-"
+"local-includes for more information."
+msgstr ""
+"_* Include locali del chroot: permettono di aggiungere o sostituire file al "
+"file system chroot/Live. Vedere {Live/chroot include locali}#live-chroot-"
+"local-includes per maggiori informazioni."
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:14
+msgid ""
+"_* Binary local includes: These allow you to add or replace files in the "
+"binary image. Please see {Binary local includes}#binary-local-includes for "
+"more information."
+msgstr ""
+"_* Include locali binari: permettono di aggiungere o sostituire file "
+"nell'immagine binaria. Vedere {Include locali binari}#binary-local-includes "
+"per maggiori informazioni"
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:16
+msgid ""
+"_* Binary includes: These allow you to add or replace Debian specific files "
+"in the binary image, such as the templates and tools directories. Please see "
+"{Binary includes}#binary-includes for more information."
+msgstr ""
+"_* Include binari: permettono di aggiungere o sostituire specifici file "
+"Debian nell'immagine binaria, come le directory dei template e dei tool. "
+"Vedere {Include binari}#binary-includes per maggiori informazioni."
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:18
+msgid ""
+"Please see {Terms}#terms for more information about the distinction between "
+"the \"Live\" and \"binary\" images."
+msgstr ""
+"Si consulti il {Glossario}#terms per ulteriori informazioni sulla "
+"distinzione tra immagini \"Live\" e \"binarie\"."
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:20
+msgid "3~live-chroot-local-includes Live/chroot local includes"
+msgstr "3~live-chroot-local-includes Live/chroot include locali"
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:22
+msgid ""
+"Chroot local includes can be used to add or replace files in the chroot/Live "
+"filesystem so that they may be used in the Live system. A typical use is to "
+"populate the skeleton user directory (#{/etc/skel}#) used by the Live system "
+"to create the live user's home directory. Another is to supply configuration "
+"files that can be simply added or replaced in the image without processing; "
+"see {Live/chroot local hooks}#live-chroot-local-hooks if processing is "
+"needed."
+msgstr ""
+"Gli include locali del chroot possono essere usati per aggiungere o "
+"sostituire file nel filesystem chroot/Live in modo che possano essere "
+"utilizzati nel sistema live. Un utilizzo tipico è popolare la directory "
+"scheletro dell'utente (#{/etc/skel}#) che il sistema impiega per creare la "
+"home dell'utente. Un altro è quello di fornire file di configurazione che "
+"possono essere semplicemente aggiunti o sostituiti nell'immagine senza "
+"elaborazione; si veda {Live/chroot hook locali}#live-chroot-local-hooks se è "
+"necessaria l'elaborazione."
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:24
+msgid ""
+"To include files, simply add them to your #{config/chroot_local-includes}# "
+"directory. This directory corresponds to the root directory (#{/}#) of the "
+"live system. For example, to add a file #{/var/www/index.html}# in the live "
+"system, use:"
+msgstr ""
+"Per includere i file si aggiungano semplicemente alla directory #{config/"
+"chroot_local-includes}#. Questa corrisponde alla directory root (#{/}#) del "
+"sistema live. Per esempio, per aggiungere un file #{/var/www/index.html}# "
+"nel sistema live, si usi:"
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:29
+#, no-wrap
+msgid ""
+" $ 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
+#: en/user_customization-contents.ssi:33
+msgid "Your configuration will then have the following layout:"
+msgstr "La configurazione avrà quindi il seguente schema:"
+
+#. type: Plain text
+#: 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"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:48
+msgid ""
+"Chroot local includes are installed after package installation so that files "
+"installed by packages are overwritten."
+msgstr ""
+"Gli include locali del chroot vengono installati dopo l'installazione dei "
+"pacchetti in modo che tali file vengano in seguito sovrascitti."
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:50
+msgid "3~binary-local-includes Binary local includes"
+msgstr "3~binary-local-includes Include locali binari"
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:52
+msgid ""
+"To include material such as documentation or videos on the media filesystem "
+"so that it is accessible immediately upon insertion of the media without "
+"booting the Live system, you can use binary local includes. This works in a "
+"similar fashion to chroot local includes. For example, suppose the files #{~/"
+"video_demo.*}# are demo videos of the live system described by and linked to "
+"by an HTML index page. Simply copy the material to #{config/binary_local-"
+"includes/} as follows:"
+msgstr ""
+"Si possono utilizzare include locali binari per inserire sul filesystem del "
+"supporto materiale come documentazione o video affinché sia immediatamente "
+"accessibile dopo l'inserimento dello stesso senza avviare il sistema live. "
+"Ciò funziona in modo simile agli include locali del chroot; supponendo che i "
+"file #{~/video_demo.*}# siano video dimostrativi del sistema descritti da e "
+"collegati a una pagina HTML indice, basta copiare il materiale in #{config/"
+"binary_local-includes/} come segue:"
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:56
+#, no-wrap
+msgid " $ cp ~/video_demo.* config/binary_local-includes/\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:60
+msgid "These files will now appear in the root directory of the live media."
+msgstr "Questi file appariranno nella directory principale del supporto live."
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:62
+msgid "3~binary-includes Binary includes"
+msgstr "3~binary-includes Include binari"
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:64
+msgid ""
+"live-build has some standard files (like documentation) that gets included "
+"in the default configuration on every live media. This can be disabled with:"
+msgstr ""
+"live-build ha alcuni file standard (come la documentazione) inclusi nella "
+"configurazione predefinita di ogni supporto live. Ciò può essere "
+"disabilitato con:"
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:68
+#, no-wrap
+msgid " $ lb config --includes none\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:72
+msgid ""
+"Otherwise, the material will be installed by live-build in #{/includes/}# by "
+"default on the media filesystem, or else you can specify an alternate path "
+"with #{--includes}#."
+msgstr ""
+"In caso contrario il materiale verrà installato da live-build nella "
+"directory #{/includes/}# del filesystem in modo predefinito, oppure è "
+"possibile specificare un percorso alternativo con #{--includes}#."
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:74
+msgid "2~ Hooks"
+msgstr "2~ Hook"
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:76
+msgid ""
+"Hooks allow commands to be performed in the chroot and binary stages of the "
+"build in order to customize the image."
+msgstr ""
+"Gli hook permettono di eseguire comandi nel chroot e nelle fasi binarie "
+"della creazione al fine di personalizzare l'immagine."
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:78
+msgid "3~live-chroot-local-hooks Live/chroot local hooks"
+msgstr "3~live-chroot-local-hooks Live/chroot hook locali"
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:80
+msgid ""
+"To run commands in the chroot stage, create a hook script containing the "
+"commands in the #{config/chroot_local-hooks}# directory. The hook will run "
+"in the chroot after the rest of your chroot configuration has been applied, "
+"so remember to ensure your configuration includes all packages and files "
+"your hook needs in order to run. See the example chroot hook scripts for "
+"various common chroot customization tasks provided in #{/usr/share/live/"
+"build/examples/hooks}# which you can copy or symlink to use them in your own "
+"configuration."
+msgstr ""
+"Per eseguire comandi nella fase chroot, creare uno script hook contenente i "
+"comandi nella directory #{config/chroot_local-hooks}#. L'hook verrà eseguito "
+"nel chroot dopo che verrà applicata il resto della configurazione del "
+"chroot, ricordare quindi di garantire che la propria configurazione includa "
+"tutti i pacchetti e i file che l'hook necessita per funzionare. Vedere gli "
+"script d'esempio degli hook di chroot per i vari compiti di "
+"personalizzazione del chroot contenuti in #{/usr/share/live/build/examples/"
+"hooks}# da copiare o collegare nella propria configurazione."
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:82
+msgid "3~ Boot-time hooks"
+msgstr "3~ Hook in fase di avvio"
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:84
+msgid ""
+"To execute commands at boot time, you can supply live-config hooks as "
+"explained in the \"Customization\" section of its man page. Examine live-"
+"config's own hooks provided in #{/lib/live/config/}#, noting the sequence "
+"numbers. Then provide your own hook prefixed with an appropriate sequence "
+"number, either as a chroot local include in #{config/chroot_local-includes/"
+"lib/live/config/}#, or as a custom package as discussed in {Installing "
+"modified or third-party packages}#installing-modified-or-third-party-"
+"packages."
+msgstr ""
+"Per eseguire comandi all'avvio, è possibile fornire degli hook a live-config "
+"come spiegato nella sezione \"Customization\" del suo manuale. Controllare "
+"gli hook di live-config in #{/lib/live/config/}# e notare i numeri "
+"sequenziali; fornire quindi i propri hook con una sequenza numerica "
+"appropriata, sia come include locali del chroot in #{config/chroot_local-"
+"includes/lib/live/config/}#, sia come pacchetto personalizzato come discusso "
+"in {Installare pacchetti modificati o di terze parti}#installing-modified-or-"
+"third-party-packages."
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:86
+msgid "3~ Binary local hooks"
+msgstr "3~ Hook binari locali"
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:88
+msgid ""
+"To run commands in the binary stage, create a hook script containing the "
+"commands in the #{config/binary_local-hooks}#. The hook will run after all "
+"other binary commands are run, but before binary_checksums, the very last "
+"binary commands The commands in your hook do not run in the chroot, so take "
+"care to not modify any files outside of the build tree, or you may damage "
+"your build system! See the example binary hook scripts for various common "
+"binary customization tasks provided in #{/usr/share/live/build/examples/"
+"hooks}# which you can copy or symlink to use them in your own configuration."
+msgstr ""
+"Per eseguire comandi nella fase binaria, creare uno script hook che contenga "
+"i comandi in #{config/binary_local-hooks}#. L'hook verrà eseguito dopo tutti "
+"gli altri comandi binari, ma prima del binary_checksums, l'ultimo definitivo "
+"comando. I comandi nel proprio hook non vengono eseguiti nel chroot, perciò "
+"si faccia attenzione a non modificare nessun file al di fuori dell'albero di "
+"costruzione o si danneggerà il sistema! Vedere gli script d'esempio per gli "
+"hook binari per i vari compiti di personalizzazione dei binari in #{/usr/"
+"share/live/build/examples/hooks}# da copiare o collegare nella propria "
+"configurazione."
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:90
+msgid "2~ Preseeding Debconf questions"
+msgstr "2~ Preconfigurare le domande di Debconf"
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:92
+msgid ""
+"Files in the #{config/chroot_local-preseed}# directory are considered to be "
+"debconf preseed files and are installed by live-build using #{debconf-set-"
+"selections}#."
+msgstr ""
+"I file nella directory #{config/chroot_local-preseed}# sono considerati file "
+"di preconfigurazione di debconf e sono installati da live-build usando #"
+"{debconf-set-selections}#."
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:93
+msgid ""
+"For more information about debconf, please see debconf(7) in the #{debconf}# "
+"package."
+msgstr ""
+"Per ulteriori informazioni su debconf, vedere debconf(7) nel pacchetto #"
+"{debconf}#."
diff --git a/manual/po/it/user_customization-installer.ssi.po b/manual/po/it/user_customization-installer.ssi.po
new file mode 100644
index 0000000..595b61c
--- /dev/null
+++ b/manual/po/it/user_customization-installer.ssi.po
@@ -0,0 +1,352 @@
+# Italian translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+# lillo sciascia <lillosciascia at gmail.com>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual 2.0.0\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"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2: plural=(n !=1)\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:2
+msgid ":B~ Customizing Debian Installer"
+msgstr ":B~ Personalizzare il Debian Installer"
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:4
+msgid "1~customizing-installer Customizing Debian Installer"
+msgstr "1~customizing-installer Personalizzare il Debian Installer"
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:6
+msgid ""
+"Debian Live system images can be integrated with Debian Installer. There are "
+"a number of different types of installation, varying in what is included and "
+"how the installer operates."
+msgstr ""
+"Le immagini del sistema Debian Live possono essere integrate nel Debian "
+"Installer. Ci sono differenti tipi d'installazione che variano in cosa viene "
+"incluso e come agisce l'installatore."
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:8
+msgid ""
+"Please note the careful use of capital letters when referring to the "
+"\"Debian Installer\" in this section - when used like this we refer "
+"explicitly to the official installer for the Debian system, not anything "
+"else. It is often seen abbreviated to \"d-i\"."
+msgstr ""
+"In questa sezione si presti attenzione all'uso delle lettere maiuscole "
+"quando si fa riferimento al \"Debian Installer\" - quando usato ci si "
+"riferisce all'installatore ufficiale Debian, niente altro. Spesso è "
+"abbreviato come \"d-i\"."
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:10
+msgid "2~ Types of Debian Installer"
+msgstr "2~ Tipologie del Debian Installer"
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:12
+msgid "The three main types of installer are:"
+msgstr "I tre principali tipi dell'installer sono:"
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:14
+#, no-wrap
+msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as \"combined images\".\n"
+msgstr "*{Debian Installer \"normale\"}*: questa è un'immagine Debian Live con un kernel e un initrd separati i quali (quando viene selezionato da un appropriato bootloader) lancia un'istanza standard del Debian Installer, così come quando si scarica un'immagine di Debian e la si avvia. Le immagini che contengono un sistema live e un installatore indipendenti sono spesso definite \"immagini combinate\".\n"
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:16
+msgid ""
+"On such images, Debian is installed by fetching and installing .deb packages "
+"using #{debootstrap}# or #{cdebootstrap}#, from the local media or some "
+"network-based network, resulting in a standard Debian system being installed "
+"to the hard disk."
+msgstr ""
+"In queste immagini, Debian è installata prendendo e installando pacchetti ."
+"deb usando {debootstrap}# o #{cdebootstrap}# da supporti locali o dalla "
+"rete, risultante in un sistema Debian standard che viene installato sul "
+"disco rigido."
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:18
+msgid ""
+"This whole process can be preseeded and customized in a number of ways; see "
+"the relevant pages in the Debian Installer manual for more information. Once "
+"you have a working preseeding file, live-build can automatically put it in "
+"the image and enable it for you."
+msgstr ""
+"L'intero processo può essere preimpostato e personalizzato in diversi modi; "
+"per ulteriori informazioni si vedano le corrispondenti pagine del manuale "
+"del Debian Installer. Una volta che si ha un file preimpostato che funzioni, "
+"live-build può inserirlo automaticamente nell'immagine e abilitarlo."
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:20
+#, no-wrap
+msgid "*{\"Live\" Debian Installer}*: This is a Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into an instance of the Debian Installer.\n"
+msgstr "*{Debian Installer \"live\"}*: Questa è un'immagine Debian Live con un kernel ed un initrd separato (quando selezionato dall'appropriato bootloader) lanciata in un'instanza del Debian Installer.\n"
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:22
+msgid ""
+"Installation will proceed in an identical fashion to the \"Regular\" "
+"installation described above, but at the actual package installation stage, "
+"instead of using #{debootstrap}# to fetch and install packages, the live "
+"filesystem image is copied to the target. This is achieved with a special "
+"udeb called live-installer."
+msgstr ""
+"L'installazione procederà nello stesso modo di un'installazione \"Regolare\" "
+"come descritto sopra, ma allo stadio attuale dell'installazione del "
+"pacchetto, invece di usare #{debootstrap}# per prelevare e installare i "
+"pacchetti, l'immagine del filesystem live viene copiata sulla destinazione. "
+"Questo si ottiene con uno speciale udeb chiamato live-installer."
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:24
+msgid ""
+"After this stage, the Debian Installer continues as normal, installing and "
+"configuring items such as bootloaders and local users, etc."
+msgstr ""
+"Dopo questa fase, il Debian Installer continua normalmente, installando e "
+"configurando elementi come bootloader e utenti locali, ecc."
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:26
+msgid ""
+"Note: to support both normal and live installer entries in the bootloader of "
+"the same live media, you must disable live-installer by preseeding #{live-"
+"installer/enable=false}."
+msgstr ""
+"Si noti: per supportare entrambi le voci dell'installer live o normale nel "
+"bootloader sullo stesso media, si deve disabilitare il live-installer dalla "
+"preconfigurazione #{live-installer/enable=false}."
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:28
+#, no-wrap
+msgid "*{\"Desktop\" Debian Installer}*: Regardless of the type of Debian Installer included, #{d-i}# can be launched from the Desktop by clicking on an icon. This is user friendlier in some situations. In order to make use of this, the debian-installer-launcher package needs to be included.\n"
+msgstr "*{Debian Installer \"Desktop\"}*: indipendentemente dal tipo del Debian Installer incluso, #{d-i}# può essere lanciato cliccando un'icona sul desktop, Questo è molto semplice in alcune situazioni. Per poterne usufruire deve essere incluso il pacchetto debian-installer-launcher.\n"
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:30
+msgid ""
+"Note that by default, live-build does not include Debian Installer images in "
+"the images, it needs to be specifically enabled with #{lb config}#. Also, "
+"please note that for the \"Desktop\" installer to work, the kernel of the "
+"live system must match the kernel #{d-i}# uses for the specified "
+"architecture. For example:"
+msgstr ""
+"Si noti che live-build non include il Debian Installer nell'immagine in modo "
+"predefinito, bisogna che sia espressamente abilitato con #{lb config}#."
+"Inoltre, affinché l'installatore \"Desktop\" funzioni, il kernel del sistema "
+"live deve corrispondere a quello usato dal #{d-i}# per l'architettura "
+"specificata. Per esempio:"
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:35
+#, no-wrap
+msgid ""
+" $ 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: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: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 "
+"answers to questions asked during the installation process, without having "
+"to manually enter the answers while the installation is running. This makes "
+"it possible to fully automate most types of installation and even offers "
+"some features not available during normal installations.\" This kind of "
+"customization is best accomplished with live-build by placing the "
+"configuration in a #{preseed.cfg}# file included in #{config/binary_debian-"
+"installer/}#. For example, to preseed setting the locale to #{en_US}#:"
+msgstr ""
+"Come descritto nell'appendice B del manuale del Debian Installer "
+"all'indirizzo http://www.debian.org/releases/stable/i386/apb.html, \"La "
+"preconfigurazione fornisce un modo per impostare le risposte alle domande "
+"poste durante il processo d'installazione senza la necessità di inserirle "
+"manualmente. Ciò permette di automatizzare totalmente molti tipi di "
+"installazione offrendo anche alcune caratteristiche normalmente non "
+"disponibili.\" Questo tipo di personalizzazione è compiuta in modo ottimale "
+"con live-build mettendo la configurazione in un file #{preseed.cfg}# incluso "
+"in #{config/binary_debian-installer/}#. Ad esempio per preconfigurare "
+"l'impostazione della localizzazione su #{en_US}#:"
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:46
+#, no-wrap
+msgid ""
+" $ 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:50
+msgid "2~ Customizing Debian Installer content"
+msgstr "2~ Personalizzare il contenuto del Debian Installer"
+
+#. type: Plain text
+#: 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-"
+"udebs/}# to include them in the image. Additional or replacement files and "
+"directories may be included in the installer initrd as well, in a similar "
+"fashion to {Live/chroot local includes}#live-chroot-local-includes, by "
+"placing the material in #{config/binary_debian-installer-includes/}#."
+msgstr ""
+"Si può voler includere pacchetti udeb compilati localmente come componenti "
+"del #{d-i}# per scopi di sperimentazione o debug; per includerli "
+"nell'immagine inserirli in #{config/binary_local-udebs/}#. I file e le "
+"directory aggiuntivi o di rimpiazzo si possono includere nell'initrd "
+"dell'installatore in maniera simile agli {Include locali del Live/chroot}"
+"#live-chroot-local-includes, inserendo il materiale in #{config/"
+"binary_debian-installer-includes/}#."
diff --git a/manual/po/it/user_customization-overview.ssi.po b/manual/po/it/user_customization-overview.ssi.po
new file mode 100644
index 0000000..9874a98
--- /dev/null
+++ b/manual/po/it/user_customization-overview.ssi.po
@@ -0,0 +1,200 @@
+# Italian translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+# skizzhg <skizzhg at gmx.com>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual 2.0.0\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
+"PO-Revision-Date: 2010-12-11 23:35-0400\n"
+"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
+"Language-Team: Italian <tp at lists.linux.it>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
+msgid ":B~ Customizing contents"
+msgstr "B~ Personalizzazione dei contenuti"
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:4
+msgid "1~customization-overview Customization overview"
+msgstr "1~customization-overview Panoramica sulla personalizzazione"
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:6
+msgid ""
+"This chapter gives an overview of the various ways in which you may "
+"customize a Debian Live system."
+msgstr ""
+"Questo capitolo mostra una panoramica dei vari metodi con i quali è "
+"possibile personalizzare un sistema Debian Live."
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:8
+msgid "2~ Build time vs. boot time configuration"
+msgstr "2~ Configurazione in fase di compilazione e di avvio"
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:10
+msgid ""
+"Live system configuration options are divided into build-time options which "
+"are options that are applied at build time and boot-time options which are "
+"applied at boot time. Boot-time options are further divided into those "
+"occurring early in the boot, applied by the live-boot package, and those "
+"that happen later in the boot, applied by live-config. Any boot-time option "
+"may be modified by the user by specifying it at the boot prompt. The image "
+"may also be built with default boot parameters so users can normally just "
+"boot directly to the live system without specifying any options when all of "
+"the defaults are suitable. In particular, the argument to #{lb --bootappend-"
+"live}# consists of any default kernel command line options for the Live "
+"system, such as persistence, keyboard layouts, or timezone. See {Customizing "
+"locale and language}#customizing-locale-and-language, for example."
+msgstr ""
+"La configurazione del sistema live è divisa in opzioni applicate in fase di "
+"compilazione e al momento dell'avvio. Le opzioni di compilazione sono "
+"ulteriormente divise in quelle che si verificano prima dell'avvio, applicate "
+"dal pacchetto live-boot, e quelle dopo l'avvio, applicate da live-config. "
+"Qualsiasi opzione in fase di avvio può essere modificata dall'utente "
+"specificandola al prompt di avvio. L'immagine può inoltre essere costruita "
+"con i parametri di avvio predefiniti in modo che quando tutti i valori "
+"predefiniti sono adatti gli utenti possano avviare direttamente il sistema "
+"senza specificare alcuna opzione. In particolare, l'argomento di #{lb --"
+"bootappend-live}# è costituito da tutte le opzioni da riga di comando del "
+"kernel predefinite in un sistema live, come persistenza dei dati, layout di "
+"tastiera o fuso orario. Per gli esempi si veda {Personalizzare "
+"localizzazione e lingua}#customizing-locale-and-language."
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:12
+msgid ""
+"Build-time configuration options are described in the #{lb config}# man "
+"page. Boot-time options are described in the man pages for live-boot and "
+"live-config. Although the live-boot and live-config packages are installed "
+"within the live system you are building, it is recommended that you also "
+"install them on your build system for easy reference when you are working on "
+"your configuration. It is safe to do so, as none of the scripts contained "
+"within them are executed unless the system is configured as a live system."
+msgstr ""
+"Le opzioni di configurazione in fase di compilazione sono descritte nel "
+"manuale di #{lb config}#, mentre quelle in fase di avvio nel manuale di live-"
+"boot e live-config. Sebbene i pacchetti live-boot e live-config siano "
+"installati nel sistema live che si sta costruendo si raccomanda, per un "
+"comodo riferimento quando si lavora alla propria configurazione, di "
+"installarli anche sul sistema che lo crea. Fare ciò risulta sicuro in quanto "
+"nessuno degli script contenuti viene eseguito, a meno che il sistema sia "
+"configurato come sistema live."
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:14
+msgid "2~stages-of-the-build Stages of the build"
+msgstr "2~stages-of-the-build Fasi della creazione"
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:16
+msgid ""
+"The build process is divided into stages, with various customizations "
+"applied in sequence in each. The first stage to run is the *{bootstrap}* "
+"stage. This is the initial phase of populating the chroot directory with "
+"packages to make a barebones Debian system. This is followed by the *{chroot}"
+"* stage, which completes the construction of chroot directory, populating it "
+"with all of the packages listed in the configuration, along with any other "
+"materials. Most customization of content occurs in this stage. The final "
+"stage of preparing the live image is the *{binary}* stage, which builds a "
+"bootable image, using the contents of the chroot directory to construct the "
+"root filesystem for the Live system, and including the installer and any "
+"other additional material on the target media outside of the Live system's "
+"filesystem. After the live image is built, if enabled, the source tarball is "
+"built in the *{source}* stage."
+msgstr ""
+"Il processo di creazione è diviso in due fasi, con varie personalizzazioni "
+"applicate in sequenza a ciascuna di esse. La prima consiste nell'*{avvio}*, "
+"questa è la fase iniziale di popolamento della directory di chroot con i "
+"pacchetti atti a creare un sistema Debian di base. Viene quindi seguita "
+"dalla fase *{chroot}* che completa la costruzione della directory chroot e "
+"la popola con tutti i pacchetti elencati nella configurazione insieme a "
+"qualsiasi altro materiale; la maggior parte della personalizzazione dei "
+"contenuti avviene in questa tappa. La parte finale della preparazione "
+"dell'immagine è la fase *{binaria}* che genera un'immagine avviabile "
+"utilizzando i contenuti della directory chroot per costruire il file system "
+"pricipale per il sistema live, includere l'installatore e ogni altro "
+"materiale aggiuntivo sul supporto di destinazione al di fuori del file "
+"system del sistema live. Una volta che l'immagine è pronta viene creato, se "
+"abilitato, l'archivio dei sorgenti nella fase *{sorgenti}*."
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:18
+msgid ""
+"Within each of these stages, there is a particular sequence in which "
+"commands are applied. These are arranged in such a way as to ensure "
+"customizations can be layered in a reasonable fashion. For example, within "
+"the *{chroot}* stage, preseeds are applied before any packages are "
+"installed, packages are installed before any locally included files or "
+"patches are applied, and hooks are run later, after all of the materials are "
+"in place."
+msgstr ""
+"All'interno di ciascuna di queste fasi c'è una sequenza particolare in cui "
+"vengono applicati i comandi, sono organizzati in modo da assicurare che le "
+"personalizzazioni siano ragionevolmente stratificate. Ad esempio, nella fase "
+"*{chroot}* i preseed vengono applicati prima che qualsiasi pacchetto sia "
+"installato, i pacchetti vengono installati prima di qualsiasi file incluso "
+"localmente o le patch sono applicate e gli hook eseguiti dopo che tutto il "
+"materiale è a posto."
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:20
+msgid "2~ Supplement lb config with files"
+msgstr "2~ Integrare la configurazione di lb con dei file"
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:22
+msgid ""
+"Although #{lb config}# does create a skeletal configuration in the config/ "
+"directory, to accomplish your goals, you may need to provide additional "
+"files in subdirectories of config/. Depending on where the files are stored "
+"in the configuration, they may be copied into the live system's filesystem "
+"or into the binary image filesystem, or may provide build-time "
+"configurations of the system that would be cumbersome to pass as command-"
+"line options. You may include things such as custom lists of packages, "
+"custom artwork, or hook scripts to run either at build time or at boot time, "
+"boosting the already considerable flexibility of debian-live with code of "
+"your own."
+msgstr ""
+"Anche se #{lb config}# crea una configurazione scheletrica nella directory "
+"config/, per realizzare i propri obiettivi potrebbe essere necessario "
+"fornire dei file aggiuntivi nelle sottodirectory. A seconda di dove vengono "
+"memorizzati i file nella configurazione, possono essere copiati nel file "
+"system del sistema live o nel file system dell'immagine binaria, o fornire "
+"configurazioni per la creazione del sistema che sarebbe scomodo passare come "
+"opzioni da riga di comando. Si possono includere cose come elenchi "
+"personalizzati dei pacchetti, grafica personalizzata o script hook da "
+"eseguire sia al momento della compilazione che in fase di avvio; "
+"incrementando quindi la notevole flessibilità di debian-live con il proprio "
+"codice."
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:24
+msgid "2~ Customization tasks"
+msgstr "2~ Personalizzazione dei compiti"
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:26
+msgid ""
+"The following chapters are organized by the kinds of customization task "
+"users typically perform: {Customizing package installation}#customizing-"
+"package-installation, {Customizing contents}#customizing-contents and "
+"{Customizing locale and language}#customizing-locale-and-language cover just "
+"a few of the things you might want to do."
+msgstr ""
+"I capitoli seguenti sono costituiti dai tipi di compito personalizzato che "
+"gli utenti eseguono solitamente: {personalizzare l'installazione dei "
+"pacchetti}#customizing-package-installation, {personalizzare i contenuti}"
+"#customizing-contents e {personalizzare localizzazione e lingua}#customizing-"
+"locale-and-language coprono solo alcune delle cose che si potrebbero "
+"desiderare."
diff --git a/manual/po/it/user_customization-packages.ssi.po b/manual/po/it/user_customization-packages.ssi.po
new file mode 100644
index 0000000..f0b8021
--- /dev/null
+++ b/manual/po/it/user_customization-packages.ssi.po
@@ -0,0 +1,1440 @@
+# Italian translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+# lillo sciascia <lillosciascia at gmail.com>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual 2.0~a12\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
+"PO-Revision-Date: 2010-12-17 22:07+0100\n"
+"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
+"Language-Team: Italian <tp at lists.linux.it>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2: plural=(n !=1)\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:2
+msgid ":B~ Customizing package installation"
+msgstr ":B~ Personalizzare l'installazione dei pacchetti"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:4
+msgid "1~customizing-package-installation Customizing package installation"
+msgstr ""
+"1~customizing-package-installation Personalizzare l'installazione dei "
+"pacchetti"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:6
+msgid ""
+"Perhaps the most basic customization of a Debian live system is the "
+"selection of packages to be included in the image. This chapter guides you "
+"through the various build-time options to customize live-build's "
+"installation of packages. The broadest choices influencing which packages "
+"are available to install in the image are the distribution and archive "
+"areas. To ensure decent download speeds, you should choose a nearby "
+"distribution mirror. You can also add your own repositories for backports, "
+"experimental or custom packages, or include packages directly as files. You "
+"can define your own lists of packages to include, use live-build's "
+"predefined lists, use #{tasksel}# tasks, or a combination of all three. "
+"Finally, a number of options give some control over apt, or if you prefer, "
+"aptitude, at build time when packages are installed. You may find these "
+"handy if you use a proxy, want to disable installation of recommended "
+"packages to save space, or need to control which versions of packages are "
+"installed via APT pinning, to name a few possibilities."
+msgstr ""
+"Probabilmente la personalizzazione basilare di un sistema Debian Live è la "
+"scelta dei pacchetti da includere nell'immagine. Questo capitolo vi guiderà "
+"tra le varie opzioni in fase di costruzione per personalizzare "
+"l'installazione dei pacchetti di live-build. Le ampie scelte che influenzano "
+"quali pacchetti siano disponibili da installare nell'immagine sono le aree "
+"di distribuzione e archivio. Per essere sicuri di avere una ragionevole "
+"velocità di scaricamento, dovreste usare un mirror a voi vicino. Si possono "
+"inoltre aggiungere i propri repository per pacchetti di backport, "
+"sperimentali o personalizzati, o aggiungere i pacchetti direttamente come "
+"file. È possibile definire una propria lista di pacchetti da includere, "
+"usarne una predefinita di live-build, usare task di #{tasksel}#, o una "
+"combinazione di tutti e tre. Infine una serie di opzioni fornisce un certo "
+"controllo su apt, o aptitude se si preferisce, in fase di compilazione "
+"quando i pacchetti sono installati. Ciò può tornare utile se si usa un "
+"proxy, se si vuole disabilitare l'installazione dei pacchetti raccomandati "
+"per risparmiare spazio o controllare quali versioni dei pacchetti vengono "
+"installate con il pinning, giusto per citare alcune possibilità."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:8
+msgid "2~ Package sources"
+msgstr "2~ Sorgenti dei pacchetti"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:10
+msgid "3~ Distribution, archive areas and mode"
+msgstr "3~ Distribuzione, le aree di archivio e le modalità"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:12
+msgid ""
+"The distribution you choose has the broadest impact on which packages are "
+"available to include in your live image. Specify the codename, which "
+"defaults to #{squeeze}# for the Squeeze version of live-build. Any current "
+"distribution carried in the Debian archive may be specified by its codename "
+"here. (See {Terms}#terms for more details.) The #{--distribution}# option "
+"not only influences the source of packages within the archive, but also "
+"instructs #{live-build}# to behave as needed to build each supported "
+"distribution. For example, to build against the *unstable* release, Sid, "
+"specify:"
+msgstr ""
+"La distribuzione che viene scelta ha un ampio impatto su quali pacchetti "
+"siano disponibili per essere inclusi nell'immagine live. Specificare il nome "
+"in codice, il predefinito per la versione Squeeze di live-build è #{squeeze}"
+"#; qualsiasi attuale distribuzione mantenuta negli archivi Debian può essere "
+"qui specificata con il suo nome in codice. (Per ulteriori dettagli "
+"consultare il {Glossario}#terms). L'opzione #{--distribution}# non solo "
+"influenza la sorgente dei pacchetti nell'archivio, ma indica a #{live-build}"
+"# di comportarsi secondo la necessità per compilare ciascuna distribuzione "
+"supportata. Ad esempio se si vuole costruire un rilascio *unstable*, Sid, "
+"specificare:"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:16
+#, no-wrap
+msgid " $ lb config --distribution sid\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:20
+msgid ""
+"Within the distribution archive, archive areas are major divisions of the "
+"archive. In Debian, these are #{main}#, #{contrib}# and #{non-free}#. Only #"
+"{main}# contains software that is official a part of the Debian "
+"distribution, hence that is the default. One or more values may be "
+"specified, e.g."
+msgstr ""
+"All'interno dell'archivio della distribuzione, le aree d'archivio sono "
+"divisioni importanti. In Debian queste sono #{main}#, #{contrib}# e #{non-"
+"free}#; soltanto #{main}# contiene il software che è parte ufficiale della "
+"distribuzione Debian, perciò questa è la predefinita. Possono essere "
+"specificati uno o più valori:"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:24
+#, no-wrap
+msgid " $ lb config --archive-areas \"main contrib\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:28
+msgid ""
+"Experimental support is available for some Debian derivatives through a #{--"
+"mode}# option. By default, this option is set to #{debian}#, even if you are "
+"building on a non-Debian system. If you specify #{--mode ubuntu}# or #{--"
+"mode emdebian}#, the distribution names and archive areas for the specified "
+"derivative are supported instead of the ones for Debian. The mode also "
+"modifies live-build behaviour to suit the derivatives."
+msgstr ""
+"Attraverso l'opzione #{--mode}# è disponibile un supporto sperimentale per "
+"alcune derivate di Debian; per impostazione predefinita, questa opzione è "
+"impostata su #{debian}#, anche se si sta costruendo un sistema diverso da "
+"Debian. Se si specifica #{--mode ubuntu}# o #{--mode emdebian}#, saranno "
+"gestiti i nomi della distribuzione e le aree di archivio per la derivata "
+"specificata e non quelli di Debian. La modalità cambia anche il "
+"comportamento di live-build per adattarlo alle derivate."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:30
+#, no-wrap
+msgid "*Note:* The projects for whom these modes were added are primarily responsible for supporting users of these options. The Debian live project, in turn, provides development support on a best-effort basis only, based on feedback from the derivative projects as we do not develop or support these derivatives ourselves.\n"
+msgstr "*Nota:* I progetti per i quali sono state aggiunte tali modalità sono i principali responsabili nel supportare gli utenti di queste opzioni. Il progetto Debian Live, a sua volta, fornisce sostegno allo sviluppo solamente sulla base dell'impegno migliore, sui feedback dei progetti derivati così come non sviluppiamo o sosteniamo queste derivate.\n"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:32
+msgid "3~ Distribution mirrors"
+msgstr "3~ Mirror delle distribuzioni"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:34
+msgid ""
+"The Debian archive is replicated across a large network of mirrors around "
+"the world so that people in each region can choose a nearby mirror for best "
+"download speed. Each of the #{--mirror-*}# options governs which "
+"distribution mirror is used at various stages of the build. Recall from "
+"{Stages of the build}#stages-of-the-build that the *bootstrap* stage is when "
+"the chroot is initially populated by debootstrap with a minimal system, and "
+"the *chroot* stage is when the chroot used to construct the live system's "
+"filesystem is built. Thus, the corresponding mirror switches are used for "
+"those stages, and later, in the *binary* stage, the #{--mirror-binary}# and #"
+"{--mirror-binary-security}# values are used, superceding any mirrors used in "
+"an earlier stage."
+msgstr ""
+"L'archivio Debian è replicato attraverso una vasta rete di mirror in tutto "
+"il mondo cosicché chiunque in ogni nazione può selezionare il mirror più "
+"vicino per la migliore velocità di scaricamento. Ciascuna delle opzioni #{--"
+"mirror-*}# determina quale mirror della distribuzione è usato nei vari stadi "
+"della compilazione. Ricordando dalle {Fasi della creazione}#stages-of-the-"
+"build che la fase di *avvio* è quando il chroot è inizialmente popolato da "
+"debootstrap con un sistema minimale e quella di *chroot* è quando viene "
+"creato il chroot usato per costruire il file system del sistema live. Perciò "
+"per queste fasi vengono usati i corrispondenti cambi di mirror, e in "
+"seguito, nella fase *binaria* vengono usati i valori di #{--mirror-binary}# "
+"e #{--mirror-binary-security}# sostituendo qualsiasi altro mirror usato "
+"nelle fasi iniziali."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:36
+msgid ""
+"3~distribution-mirrors-build-time Distribution mirrors used at build time"
+msgstr ""
+"3~distribution-mirrors-build-time Mirror delle distribuzioni usati in fase "
+"di compilazione"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:38
+msgid ""
+"To set the distribution mirrors used at build time to point at a local "
+"mirror, it is sufficient to set #{--mirror-bootstrap}# and #{--mirror-chroot-"
+"security}# as follows."
+msgstr ""
+"Per impostare i mirror delle distribuzioni usati in fase di compilazione ad "
+"uno locale, è sufficiente impostare #{--mirror-bootstrap}# e #{--mirror-"
+"chroot-security}# come segue."
+
+#. type: Plain text
+#: 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"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:47
+msgid ""
+"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
+"mirror-bootstrap}# value."
+msgstr ""
+"Il mirror chroot, specificato da #{--mirror-chroot}#, è impostato al valore "
+"di #{--mirror-bootstrap}#."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:49
+msgid "3~ Distribution mirrors used at run time"
+msgstr "3~ Mirror delle distribuzioni usate durante l'esecuzione"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:51
+msgid ""
+"The #{--mirror-binary*}# options govern the distribution mirrors placed in "
+"the binary image. These may be used to install additional packages while "
+"running the live system. The defaults employ #{cdn.debian.net}#, a service "
+"that chooses a geographically close mirror based on the user's IP number. "
+"This is a suitable choice when you cannot predict which mirror will be best "
+"for all of your users. Or you may specify your own values as shown in the "
+"example below. An image built from this configuration would only be suitable "
+"for users on a network where \"#{mirror}#\" is reachable."
+msgstr ""
+"Le opzioni #{--mirror-binary*}# determinano i mirror delle distribuzioni "
+"inseriti nell'immagine binaria. Questi possono essere usati per installare "
+"pacchetti aggiuntivi mentre il sistema live è in funzione. Le impostazioni "
+"predefinite impiegano #{cdn.debian.net}#, un servizio che sceglie un mirror "
+"geograficamente vicino basandosi sul numero IP dell'utente. Questo è una "
+"scelta conveniente quando non si può pronosticare quale sarà il mirror "
+"migliore per tutti gli utenti. Oppure si può specificare il proprio valore "
+"come mostrato nell'esempio qui sotto. Un'immagine compilata con questa "
+"configurazione sarebbe adatta solamente ad utenti di una rete dove sia "
+"raggiungibile il \"#{mirror}#\"."
+
+#. type: Plain text
+#: 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"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:60
+msgid "3~additional-repositories Additional repositories"
+msgstr "3~additional-repositories Repository addizionali"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:62
+msgid ""
+"You may add more repositories, broadening your package choices beyond what "
+"is available in your target distribution. These may be, for example, for "
+"backports, experimental or custom packages. To configure additional "
+"repositories, create #{config/chroot_sources/your-repository.chroot}#, and/"
+"or #{config/chroot_sources/your-repository.binary}# files. As with the #{--"
+"mirror-*}# options, these govern the repositories used in the *chroot* stage "
+"when building the image, and in the *binary* stage, i.e. for use when "
+"running the live system."
+msgstr ""
+"Si possono aggiungere altri repository, ampliando così la scelta dei "
+"pacchetti al di là di quelli disponibili nella distribuzione di "
+"destinazione. Questi possono essere, per esempio, pacchetti di backport, "
+"sperimentali o personalizzati. Per configurare repository aggiuntivi, creare "
+"i file #{config/chroot_sources/vostro-repository.chroot}#, o #{config/"
+"chroot_sources/vostro-repository.binary}#. Come per le opzioni #{--mirror-*}"
+"#, queste controlleranno i repository usati nella fase *chroot* quando si "
+"compila l'immagine, e nella fase *binary*, ad esempio per usarli quando il "
+"sistema live è avviato."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:64
+msgid ""
+"For example, #{config/chroot_sources/live.chroot}# allows you to install "
+"packages from the debian live snapshot repository at live system build time."
+msgstr ""
+"Per esempio, #{config/chroot_sources/live.chroot}# permette di installare "
+"pacchetti dal repository snapshot di debian live al momento della creazione "
+"del sistema live."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:68
+#, 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
+msgid ""
+"If you add the same line to #{config/chroot_sources/live.binary}#, the "
+"repository will be added to your live system's #{/etc/apt/sources.list.d/}# "
+"directory."
+msgstr ""
+"Se si aggiunge la stessa riga in #{config/chroot_sources/live.binary}#, il "
+"repository verrà aggiunto alla directory #{/etc/apt/sources.list.d/}# del "
+"sistema live."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:74
+msgid "If such files exist, they will be picked up automatically."
+msgstr "Se il file esiste, saranno prelevati automaticamente."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:76
+msgid ""
+"You should also put the GPG key used to sign the repository into #{config/"
+"chroot_sources/your-repository.{binary,chroot}.gpg}# files."
+msgstr ""
+"Bisogna inoltre inserire la chiave GPG usata per firmare il repository nei "
+"file #{config/chroot_sources/vostro-repository.{binary,chroot}.gpg}#."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:78
+msgid ""
+"Note: some preconfigured package repositories are available for easy "
+"selection through the #{--repository}# option, e.g. for enabling live "
+"snapshots, a simple command is enough to enable it:"
+msgstr ""
+"Nota: alcuni repository di pacchetti preconfigurati sono disponibili per una "
+"facile selezione attraverso l'opzione #{--repository}#, per abilitare gli "
+"snapshot live è sufficiente un semplice comando:"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
+#, no-wrap
+msgid " $ lb config --repository live.debian.net\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:86
+msgid "2~choosing-packages-to-install Choosing packages to install"
+msgstr "2~choosing-packages-to-install Scegliere i pacchetti da installare"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:88
+msgid ""
+"There are a number of ways to choose which packages live-build will install "
+"in your image, covering a variety of different needs. You can simply name "
+"individual packages to install, either with the #{--packages}# option for a "
+"few packages, or in a package list of your own for larger numbers. You can "
+"also choose larger predefined lists of packages, or use APT tasks. And "
+"finally, you may place package files in your #{config/}# tree, which is well "
+"suited to testing of new or experimental packages before they are available "
+"from a repository."
+msgstr ""
+"Ci sono diversi modi per scegliere quali pacchetti live-build installerà "
+"nell'immagine, coprendo una gamma di esigenze diverse. Si possono scegliere "
+"i pacchetti singolarmente, con l'opzione #{--packages}# per un numero "
+"limitato, o da un elenco per una quantità maggiore di pacchetti. È inoltre "
+"possibile selezionare elenchi predefiniti più grandi o utilizzare i task di "
+"APT. E infine inserire i file dei pacchetti nell'albero #{config/}#, che ben "
+"si adatta alla alle prove di pacchetti nuovi o sperimentali prima che siano "
+"disponibili in un repository."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:90
+msgid "3~ Choosing a few packages"
+msgstr "3~ Scegliere pochi pacchetti"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:92
+msgid ""
+"When the number of packages added is small, simply specify #{--packages}#. "
+"For example:"
+msgstr ""
+"Quando il numero dei pacchetti da aggiungere è esiguo è sufficiente "
+"specificare #{--packages}#. Per esempio:"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:96
+#, no-wrap
+msgid " $ lb config --packages \"package1 package2 package3\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:100
+msgid ""
+"The behaviour of live-build when specifying a package that does not exist is "
+"determined by your choice of APT utility. See {Choosing apt or aptitude}"
+"#choosing-apt-or-aptitude for more details."
+msgstr ""
+"Quando si specifica un pacchetto che non esiste, il comportamento di live-"
+"build è determinato dalla scelta delle utilità di APT. Per ulteriori "
+"dettagli si veda {Scegliere apt o aptitude}#choosing-apt-or-aptitude."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:102
+msgid ""
+"If you need to specify a large number of packages to be installed or you "
+"need flexibility regarding which packages to install, use package lists as "
+"discussed in the following section, {Package lists}#package-lists."
+msgstr ""
+"Se si necessita di specificare un gran numero di pacchetti o si desidera "
+"flessibilità su quali installare, usare gli elenchi dei pacchetti come "
+"discusso nella prossima sezione, {Elenchi di pacchetti}#package-lists."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:104
+msgid "3~package-lists Package lists"
+msgstr "3~package-lists Elenchi di pacchetti"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:106
+msgid ""
+"Package lists are a powerful way of expressing which packages should be "
+"installed. The list syntax supports included files and conditional sections "
+"which makes it easy to build lists from other lists and adapt them for use "
+"in multiple configurations. You can use predefined package lists, providing "
+"in a modular fashion package selections from each of the major desktop "
+"environments and some special purpose lists, as well as standard lists the "
+"others are based upon. You can also provide your own package lists, or use a "
+"combination of both."
+msgstr ""
+"Gli elenchi di pacchetti sono un potente mezzo per esprimere quali pacchetti "
+"devono essere installati. La sintassi gestisce file inclusi e sezioni "
+"condizionali rendendo semplice la creazione di elenchi da altri elenchi e "
+"adattarli per l'uso in molteplici configurazioni. Si può usare un elenco "
+"predefinito fornendo una selezione modulare dei pacchetti da ciascuno dei "
+"principali ambienti desktop e alcuni elenchi per uso speciale, così come "
+"elenchi standard sui quali vi si basano altri. È inoltre possibile fornire i "
+"propri elenchi o usare una combinazione di entrambi."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:108
+msgid "3~ Predefined package lists"
+msgstr "3~ Elenchi predefiniti di pacchetti"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:110
+msgid ""
+"The simplest way to use lists is to specify one or more predefined lists "
+"with the #{--packages-lists}# option. For example:"
+msgstr ""
+"Il modo più semplice per usare gli elenchi è di specificarne uno o più con "
+"l'opzione #{--packages-lists}#. Per esempio:"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:114
+#, no-wrap
+msgid " $ lb config --packages-lists \"gnome-core rescue\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:118
+msgid ""
+"In addition to these lists, live-build supports four virtual package lists: #"
+"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
+"each of which provide a more extensive selection of packages that "
+"corresponds with Debian Installer defaults for these desktop environments. "
+"See {Desktop and language tasks}#desktop-and-language-tasks for more details."
+msgstr ""
+"In aggiunta a questi elenchi, live-build ne gestisce quattro virtuali: #"
+"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
+"ciascuno dei quali fornisce una selezione più estesa di pacchetti che "
+"corrisponde ai predefiniti dell'installatore Debian per ciascun ambiente "
+"desktop. Per ulteriori dettagli si veda {Task per desktop e lingua}#desktop-"
+"and-language-tasks."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:120
+msgid ""
+"Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download "
+"at http://live.debian.net are built using the corresponding virtual #{*-"
+"desktop}# lists."
+msgstr ""
+"Nota: Le immagini pre-costruite di GNOME, KDE, LXDE e XFCE disponibili per "
+"essere scaricate da http://live.debian.net sono costruite usando i "
+"corrispondenti elenchi #{*-desktop}# virtuali."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:122
+msgid ""
+"The default location for the list files on your system is #{/usr/share/live/"
+"build/lists/}#. To determine the packages in a given list, read the "
+"corresponding file, paying attention to included files and conditionals as "
+"described in the following sections."
+msgstr ""
+"Il percorso predefinito per i file elenco sul sistema è #{/usr/share/live/"
+"build/lists/}#. Per determinare i pacchetti in un dato elenco, si legga il "
+"file corrispondente, prestando attenzione ai file inclusi e condizionali "
+"come descritto nella sezioni seguenti."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:124
+msgid "3~ Local package lists"
+msgstr "3~ Elenchi locali dei pacchetti"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:126
+msgid ""
+"You may supplement or replace entirely the supplied lists using local "
+"package lists stored in #{config/chroot_local-packageslists/}#."
+msgstr ""
+"Gli elenchi si possono integrare o sostituire interamente usando quelli "
+"locali dei pacchetti in #{config/chroot_local-packageslists/}#."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:128
+msgid ""
+"Package lists that exist in this directory need to have a #{.list}# suffix "
+"in order to be processed. Local package lists always override package lists "
+"distributed with live-build. This can cause undesired effects, we therefore "
+"recommend to use unique names for local package lists."
+msgstr ""
+"Per essere processati, questi elenchi devono avere il suffisso #{.list}#. I "
+"locali sovrascrivono sempre quelli forniti con live-build, questo può "
+"causare effetti indesiderati perciò si raccomanda di usare nomi univoci."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:130
+msgid "3~ Local binary package lists"
+msgstr "3~ Elenchi locali di pacchetti binari"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:132
+msgid ""
+"In case you want to include some required .deb packages to live media's #"
+"{pool/}# (without installing them onto the live image) you may need to use "
+"lists using binary local package lists stored in #{config/binary_local-"
+"packageslists/}#. Such media can be used as a customized Debian install "
+"image for offline installations."
+msgstr ""
+"Nel caso in cui si desideri includere dei pacchetti .deb alla directory #"
+"{pool/}# della live (senza installarli sull'immagine) bisogna usare gli "
+"elenchi utilizzando quelli locali dei pacchetti binari situati in #{config/"
+"binary_local-packageslists/}#. Tale supporto può essere utilizzato come "
+"immagine personalizzata di Debian per installazioni non in linea."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:134
+msgid ""
+"Package lists that exist in this directory need to have a #{.list}# suffix "
+"in order to be processed."
+msgstr ""
+"Per essere processate le liste dei pacchetti che si trovano nella directory "
+"deve avere un suffisso #{.list}#."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:136
+msgid "3~ Extending a provided package list using includes"
+msgstr "3~ Estendere un'elenco di pacchetti usando gli include"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:138
+msgid ""
+"The package lists that are included with live-build make extensive use of "
+"includes. Refer to these in the #{/usr/share/live/build/lists/}# directory, "
+"as they serve as good examples of how to write your own lists."
+msgstr ""
+"Gli elenchi di pacchetti inclusi in live-build fanno un notevole uso di "
+"include. Far riferimento a questi nella directory #{/usr/share/live/build/"
+"lists/}#, in quanto portano ottimi esempi su come scrivere i propri."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:140
+msgid ""
+"For example, to make a list that includes the predefined #{gnome}# list plus "
+"iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with "
+"the following contents:"
+msgstr ""
+"Per esempio, per creare un elenco che includa quello predefinito di #{gnome}"
+"# più iceweasel, creare #{config/chroot_local-packageslists/mygnome.list}# "
+"con i seguenti contenuti:"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:145
+#, no-wrap
+msgid ""
+" #include <gnome>\n"
+" iceweasel\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:149
+msgid "3~ Using conditionals inside package lists"
+msgstr "3~ Usare condizioni all'interno degli elenchi di pacchetti"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:151
+msgid ""
+"Any of the live-build configuration variables stored in #{config/*}# (minus "
+"the #{LB_}# prefix) may be used in conditional statements in package lists. "
+"Generally, this means any #{lb config}# option uppercased and with dashes "
+"changed to underscores. But in practice, it is only the ones that influence "
+"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURE}"
+"# or #{ARCHIVE_AREAS}#."
+msgstr ""
+"Ognuna delle variabili di configurazione di live-build situate in #{config/*}"
+"# (senza il prefisso #{LB_}#) possono essere utilizzate per istruzioni "
+"condizionali nell'elenco dei pacchetti. In genere questo significa qualsiasi "
+"opzione di #{lb config}# in maiuscolo e con trattini cambiati in trattini "
+"bassi; ma in pratica è la sola ad influenzare la selezione dei pacchetti che "
+"abbia senso, come #{DISTRIBUTION}#, #{ARCHITECTURE}# o #{ARCHIVE_AREAS}#."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:153
+msgid ""
+"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+"specified:"
+msgstr ""
+"Per esempio, per installare #{ia32-libs}# se è specificata #{--architecture "
+"amd64}#:"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:159
+#, no-wrap
+msgid ""
+" #if ARCHITECTURE amd64\n"
+" ia32-libs\n"
+" #endif\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:163
+msgid ""
+"You may test for any one of a number of values, e.g. to install #{memtest86+}"
+"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
+msgstr ""
+"Si può verificare per ognuna di una serie di valori, ad esempio per "
+"installare #{memtest86+}# specificando sia #{--architecture i386}# sia #{--"
+"architecture amd64}#:"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:169
+#, no-wrap
+msgid ""
+" #if ARCHITECTURE i386 amd64\n"
+" memtest86+\n"
+" #endif\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:173
+msgid ""
+"You may also test against variables that may contain more than one value, e."
+"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
+"via #{--archive-areas}#:"
+msgstr ""
+"È possibile provare altre variabili che contengano più di un valore, ad "
+"esempio per installare #{vrms}# specificando sia da #{contrib}# sia da #{non-"
+"free}# tramite #{--archive-areas}#:"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:179
+#, no-wrap
+msgid ""
+" #if ARCHIVE_AREAS contrib non-free\n"
+" vrms\n"
+" #endif\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:183
+msgid "A conditional may surround an #{#include}# directive:"
+msgstr "Una condizione può coinvolegere una direttiva #{#include}#:"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:189
+#, no-wrap
+msgid ""
+" #if ARCHITECTURE amd64\n"
+" #include <gnome-full>\n"
+" #endif\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:193
+msgid "The nesting of conditionals is not supported."
+msgstr "Le condizioni nidificate non sono supportate."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:195
+msgid "3~ Tasks"
+msgstr "3~ Task"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:197
+msgid ""
+"The Debian Installer offers the user choices of a number of preselected "
+"lists of packages, each one focused on a particular kind of system, or task "
+"a system may be used for, such as \"Graphical desktop environment\", \"Mail "
+"server\" or \"Laptop\". These lists are called \"tasks\" and are supported "
+"by APT through the \"Task:\" field. You can specify one or more tasks in "
+"live-build via the #{--tasks}# option, as in the example below."
+msgstr ""
+"L'installatore Debian offre all'utente la scelta di vari elenchi di "
+"pacchetti pre-selezionati, ognuno dei quali focalizzato su un particolare "
+"tipo di sistema, o il tipo di attività per cui utilizzarlo, come \"Graphical "
+"desktop environment\", \"Mail server\" o \"Laptop\". Questi elenchi sono "
+"chiamati \"task\" e sono gestiti da APT atraverso il campo\"Task:\". In live-"
+"build si possono specificare uno o più task per mezzo dell'opzione #{--tasks}"
+"#, come nell'esempio seguente."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:201
+#, no-wrap
+msgid " $ lb config --tasks \"mail-server file-server\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:205
+msgid ""
+"The primary tasks available in the Debian Installer can be listed with #"
+"{tasksel --list-tasks}# in the live system. The contents of any task, "
+"including ones not included in this list, may be examined with #{tasksel --"
+"task-packages}#."
+msgstr ""
+"I task principali disponibili nell'installatore Debian possono essere "
+"elencati nel sistema live con #{tasksel --list-tasks}#. I contenuti di ogni "
+"task, inclusi quelli non inclusi in questo elenco, possono essere esaminati "
+"con #{tasksel --task-packages}#."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:207
+msgid "3~desktop-and-language-tasks Desktop and language tasks"
+msgstr "3~desktop-and-language-tasks Task per desktop e lingua"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:209
+msgid ""
+"Desktop and language tasks are special cases. In the Debian Installer, if "
+"the medium was prepared for a particular desktop environment flavour, the "
+"corresponding task will be automatically installed. Thus, there are #{gnome-"
+"desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}# tasks, "
+"none of which are offered in #{tasksel}#'s menu. Likewise, there are no menu "
+"entries for tasks for languages, but the user's language choice during the "
+"install influences the selection of corresponding language tasks."
+msgstr ""
+"I task per i desktop e la lingua sono un caso speciale. Nell'installatore "
+"Debian, se il supporto è stato preparato per un particolare ambiente "
+"desktop, il corrispondente task verrà automaticamente installato. Perciò ci "
+"sono i task #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# e #{xfce-"
+"desktop}#, nessuno dei quali è offerto nel menu di #{tasksel}#. Allo stesso "
+"modo, non c'è nessuna voce nel menu per i task delle lingue, ma la scelta "
+"della lingua dell'utente durante l'installazione influenza la selezione dei "
+"corrispondenti task della lingua."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:211
+msgid ""
+"In live-build, therefore, these special cases are also given special "
+"consideration, but with three notable differences at the time of writing."
+msgstr ""
+"Perciò in live-build a questi casi particolari è anche data particolare "
+"considerazione, ma con tre differenze notevoli al momento in cui si scrive."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:213
+msgid ""
+"First, there is no provision made yet automatically for language tasks, "
+"although a subset of those packages are included if you specify #{lb config "
+"--language}#. If you need those tasks, which include such things as language-"
+"specific fonts and input-method packages, you need to specify them in your "
+"configuration. For example:"
+msgstr ""
+"Primo, non è stata fatta ancora alcuna previsione sui task della lingua, "
+"sebbene sia incluso un sottoinsieme di questi pacchetti specificando #{lb "
+"config --language}#. Se servono questi task, i quali includono cose come "
+"caratteri specifici per la lingua e pacchetti dei metodi di input, vanno "
+"specificati nella configurazione. Per esempio:"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:217
+#, no-wrap
+msgid " $ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:221
+msgid ""
+"Second, live-build supports #{*-desktop}# virtual package lists for each of "
+"the desktop flavours mentioned above, which select the #{standard-x11}# "
+"predefined package list, the corresponding #{*-desktop}# task and three "
+"additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example, "
+"if you specify #{--packages-lists gnome-desktop}#, it is equivalent to "
+"specifying #{--packages debian-installer-launcher --packages-lists standard-"
+"x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
+msgstr ""
+"Secondo, live-build gestisce gli elenchi #{*-desktop}# virtuali dei "
+"pacchetti per ogni tipo di desktop menzionato sopra, il quale seleziona "
+"l'elenco predefinito #{standard-x11}#, il corrispondente task #{*-desktop}# "
+"e tre task addizionali: #{desktop}#, #{standard}# e #{laptop}#. Così per "
+"esempio, se si specifica #{--packages-lists gnome-desktop}#, è l'equivalente "
+"di #{--packages debian-installer-launcher --packages-lists standard-x11 --"
+"tasks \"gnome-desktop desktop standard laptop\"}#."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:223
+msgid ""
+"Third, if any of the tasks for these desktop flavours are selected, either "
+"explicitly through #{--tasks}# or implicitly by #{--packages-lists}#, live-"
+"build will preseed the corresponding desktop value for Debian Installer (if "
+"it is included) to ensure it follows its own rules for installing different "
+"desktop flavours."
+msgstr ""
+"Terzo, se viene selezionato uno qualsiasi dei task per i vari desktop, sia "
+"esplicitamente con #{--tasks}# o implicitamente con #{--packages-lists}#, "
+"live-build pre-imposterà il corrispondente valore desktop per l'installatore "
+"Debian (se incluso) per garantire che segua le proprie regole per installare "
+"i vari tipi di desktop."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:225
+#, no-wrap
+msgid "*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are in
 stalled. For example:\n"
+msgstr "*{Nota:}* Esiste anche l'opzione sperimentale #{--language}# con lo scopo di sovrapporsi ai task della lingua. Se #{--language}# è specificato, per ogni lingua per la quale sia nota la presenza di pacchetti #{*-l10n}# questi verranno installati. Inoltre se uno dei modelli #{syslinux}# corrisponde alla lingua trovata, questi saranno usati al posto di quello inglese predefinito. La selezione dei pacchetti fatta con #{--language}# è un'approssimazione dei task della lingua, in quanto richiede che l'elenco dei pacchetti da includere per ogni lingua sia mantenuta all'interno di live-build, oltretutto i task della lingua sono più completi e flessibili; per quanto l'aspetto di #{syslinux}# sia comunque utile. Quindi utilizzando #{--bootloader syslinux}#, e se i modelli per la lingua specificata esistono in #{/usr/share/live/build/templates/syslinux/}# o in #{config/templates/syslinux/}#, si può considerare questa opzione, eventualmente in combinazione con i task per gar
 antire che vengano installati tutti i pacchetti interessati. Esempio:\n"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:229
+#, no-wrap
+msgid " $ lb config --language es\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:233
+msgid ""
+"Even so, it is limited in that it only supports a single language and a "
+"single bootloader. Therefore, for all of these reasons, the future of this "
+"option is under review, possibly to be replaced with something entirely "
+"different in the next major release of live-build."
+msgstr ""
+"Anche così è limitato dal fatto che gestisce una sola lingua e un solo "
+"bootloader. Pertanto, per tutte queste ragioni, il futuro di questa opzione "
+"è in revisione, potrebbe essere sostituito con qualcosa di totalmente "
+"diverso nel prossimo rilascio di live-build."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:235
+msgid ""
+"2~installing-modified-or-third-party-packages Installing modified or third-"
+"party packages"
+msgstr ""
+"2~installing-modified-or-third-party-packages Installare pacchetti "
+"modificati o di terze parti"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:237
+msgid ""
+"Whilst it is against the philosophy of Debian Live, it may sometimes be "
+"necessary to build a Live system with modified versions of packages that are "
+"in the Debian repository. This may be to modify or support additional "
+"features, languages and branding, or even to remove elements of existing "
+"packages that are undesirable. Similarly, \"third-party\" packages may be "
+"used to add bespoke and/or proprietary functionality."
+msgstr ""
+"Nonostante sia contro la filosofia di Debian Live, a volte può essere "
+"necessario creare un sistema live con versioni modificate dei pacchetti nel "
+"repository Debian. Questo per modificare o gestire funzionalità aggiuntive, "
+"lingue e marchi, o anche rimuovere elementi non desiderati da pacchetti "
+"esistenti. Allo stesso modo, i pacchetti di \"terze parti\" possono essere "
+"utilizzati per aggiungere funzionalità proprietarie o su misura."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:239
+msgid ""
+"This section does not cover advice regarding building or maintaining "
+"modified packages. Joachim Breitner's 'How to fork privately' method from "
+"http://www.joachim-breitner.de/blog/archives/282-How-to-fork-privately.html "
+"may be of interest, however. The creation of bespoke packages is covered in "
+"the Debian New Maintainers' Guide at http://www.debian.org/doc/maint-guide/ "
+"and elsewhere."
+msgstr ""
+"Questa sezione non tratta la compilazione e il mantenimento di pacchetti "
+"modificati. Può comunque essere interessante leggere \"How to fork privately"
+"\" di Joachim Breitner: http://www.joachim-breitner.de/blog/archives/282-How-"
+"to-fork-privately.html La creazione di pacchetti su misura è esposta nella "
+"\"Guida per il nuovo Maintainer\" all'indirizzo http://www.debian.org/doc/"
+"maint-guide/ e altrove."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:241
+msgid "There are two ways of installing modified custom packages:"
+msgstr "Ci sono due modi per installare pacchetti personalizzati:"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:243
+msgid "_* #{chroot_local-packages}#"
+msgstr "_* #{chroot_local-packages}#"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:245
+msgid "_* Using a custom APT repository"
+msgstr "_* Utilizzare repository APT personalizzati"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:247
+msgid ""
+"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
+"off\" customizations but has a number of drawbacks, whilst using a custom "
+"APT repository is more time-consuming to set up."
+msgstr ""
+"Usando #{chroot_local-packages}# è più semplice da ottenere e utile per una "
+"personalizzazione \"una tantum\" ma ha una serie di svantaggi, mentre un "
+"repository APT personalizzato è più laborioso da configurare."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:249
+msgid "3~ Using #{chroot_local-packages}# to install custom packages"
+msgstr ""
+"3~ Utilizzare #{chroot_local-packages}# per installare pacchetti "
+"personalizzati"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:251
+msgid ""
+"To install a custom package, simply copy it to the #{config/chroot_local-"
+"packages/}# directory. Packages that are inside this directory will be "
+"automatically installed into the live system during build - you do not need "
+"to specify them elsewhere."
+msgstr ""
+"Per installare un pacchetto personalizzato copiarlo nella directory #{config/"
+"chroot_local-packages/}#; i pacchetti al suo interno verranno installati "
+"automaticamente durante la creazione del sistema live, non è necessario "
+"specificarli altrove."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:253
+msgid ""
+"Packages *{must}* be named in the prescribed way. One simple way to do this "
+"is to use #{dpkg-name}#."
+msgstr ""
+"I pacchetti *{devono}* essere nominati nel modo prescritto, un metodo "
+"semplice per farlo è usare #{dpkg-name}#."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:255
+msgid ""
+"Using #{chroot_local-packages}# for installation of custom packages has "
+"disadvantages:"
+msgstr ""
+"L'utilizzo di #{chroot_local-packages}# per l'installazione di pacchetti "
+"personalizzati presenta degli svantaggi:"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:257
+msgid "_* It is not possible to use secure APT."
+msgstr "_* non è possibile usare secure APT"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:259
+msgid ""
+"_* You must install all appropriate packages in the #{config/chroot_local-"
+"packages/}# directory."
+msgstr ""
+"_* è necessario installare i pacchetti adeguati nella directory #{config/"
+"chroot_local-packages/}#."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:261
+msgid ""
+"_* It does not lend itself to storing Debian Live configurations in revision "
+"control."
+msgstr ""
+"_* non si presta a salvare le configurazioni di Debian Live nel controllo di "
+"versione."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:263
+msgid "3~ Using an APT repository to install custom packages"
+msgstr ""
+"3~ Utilizzare un repository APT per installare pacchetti personalizzati"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:265
+msgid ""
+"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
+"you must ensure that you specify the packages elsewhere. See {Choosing "
+"packages to install}#choosing-packages-to-install for details."
+msgstr ""
+"A differenza di #{chroot_local-packages}#, quando si usa un repository APT "
+"personalizzato è necessario assicurarsi di specificare altrove i pacchetti. "
+"Per i dettagli si veda {Scegliere i pacchetti da installare}#choosing-"
+"packages-to-install."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:267
+msgid ""
+"Whilst it may seem unnecessary effort to create an APT repository to install "
+"custom packages, the infrastructure can be easily re-used at a later date to "
+"offer updates of the modified packages."
+msgstr ""
+"Sebbene creare un repository APT possa sembrare uno sforzo inutile, "
+"l'infrastruttura può facilmente essere riutilizzata in un secondo momento "
+"per offrire aggiornamenti dei pacchetti modificati."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:269
+msgid "3~ Custom packages and APT"
+msgstr "3~ Pacchetti personalizzati e APT"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:271
+msgid ""
+"live-build uses APT to install all packages into the live system so will "
+"therefore inherit behaviours from this program. One relevant example is that "
+"(assuming a default configuration) given a package available in two "
+"different repositories with different version numbers, APT will elect to "
+"install the package with the higher version number."
+msgstr ""
+"live-build utilizza APT per installare tutti i pacchetti nel sistema live in "
+"modo da ereditare i comportamenti di questo programma. Un esempio rilevante "
+"è che (considerando una configurazione predefinita) dato un pacchetto "
+"disponibile in due repository differenti con numeri di versione diversi, APT "
+"sceglie di installare quello con il numero di versione più alto."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:273
+msgid ""
+"Because of this, you may wish to increment the version number in your custom "
+"packages' #{debian/changelog}# files to ensure that your modified version is "
+"installed over one in the official Debian repositories. This may also be "
+"achieved by altering the live system's APT pinning preferences - see {APT "
+"pinning}#apt-pinning for more information."
+msgstr ""
+"A causa di questo si può voler incrementare il numero della versione nei "
+"file #{debian/changelog}# dei pacchetti personalizzati per accertare che la "
+"propria versione avrà la precedenza sui repository Debian ufficiali. È anche "
+"ottenibile modificando le preferenze del APT pinning del sistema live, si "
+"veda {APT pinning}#apt-pinning per maggiori informazioni."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:275
+msgid "2~ Configuring APT at build time"
+msgstr "2~ Configurare APT in fase di costruzione"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:277
+msgid ""
+"You can configure APT through a number of options applied only at build "
+"time. (APT configuration used in the running live system may be configured "
+"in the normal way for live system contents, that is, by including the "
+"appropriate configurations through #{config/chroot_local_includes/}#.) For a "
+"complete list, look for options starting with #{apt}# in the #{lb_config}# "
+"man page."
+msgstr ""
+"APT è configurabile tramite una serie di opzioni applicate solo in fase di "
+"costruzione (la configurazione di APT utilizzata nel sistema live in "
+"esecuzione può essere configurata nel solito modo, ovvero includendo le "
+"impostazioni appropriate attraverso #{config/chroot_local_includes/}#). Per "
+"un elenco completo, cercare nel manuale di #{lb_config}# le opzioni che "
+"iniziano con #{apt}#."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:279
+msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
+msgstr "3~choosing-apt-or-aptitude Scegliere apt o aptitude"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:281
+msgid ""
+"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
+"at build time. Which utility is used is governed by the #{--apt}# argument "
+"to #{lb config}#. Choose the method implementing the preferred behaviour for "
+"package installation, the notable difference being how missing packages are "
+"handled."
+msgstr ""
+"Per installare pacchetti in fase di compilazione si può optare sia per #{apt}"
+"# sia per #{aptitude}#, l'argomento #{--apt}# di #{lb config}# determina "
+"quale usare. Sceglie il metodo implementando il comportamento preferito per "
+"l'installazione dei pacchetti, la notevole differenza è come vengono gestiti "
+"quelli mancanti."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:283
+msgid ""
+"_* #{apt}#: With this method, if a missing package is specified, the package "
+"installation will fail. This is the default setting."
+msgstr ""
+"_* #{apt}#: se viene specificato un pacchetto mancante, l'installazione avrà "
+"esito negativo; questo è l'impostazine predefinita."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:285
+msgid ""
+"_* #{aptitude}#: With this method, if a missing package is specified, the "
+"package installation will succeed."
+msgstr ""
+"_* #{aptitude}#: se viene specificato un pacchetto mancante, l'installazione "
+"avrà successo."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:287
+msgid "3~ Using a proxy with APT"
+msgstr "3~ Utilizzare un proxy con APT"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:289
+msgid ""
+"One commonly required APT configuration is to deal with building an image "
+"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
+"or #{--apt-http-proxy}# options as needed, e.g."
+msgstr ""
+"Una configurazione di APT spesso richiesta è di amministrare la creazione di "
+"un'immagine dietro un proxy, lo si può specificare con le opzioni #{--apt-"
+"ftp-proxy}# o #{--apt-http-proxy}# secondo necessità:"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:293
+#, no-wrap
+msgid " $ lb config --apt-http-proxy http://proxy/\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:297
+msgid "3~ Tweaking APT to save space"
+msgstr "3~ Modificare APT per risparmiare spazio"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:299
+msgid ""
+"You may find yourself needing to save some space on the image media, in "
+"which case one or the other or both of the following options may be of "
+"interest."
+msgstr ""
+"Si può aver bisogno di risparmiare dello spazio sul supporto dell'immagine, "
+"in tal caso una o entrambe delle seguenti opzioni possono essere d'interesse."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:301
+msgid ""
+"If you don't want to include APT indices in the image, you can omit those "
+"with:"
+msgstr "È possibile non includere gli indici di APT con:"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:305
+#, no-wrap
+msgid " $ lb config --binary-indices false\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:309
+msgid ""
+"This will not influence the entries in /etc/apt/sources.list, but merely "
+"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
+"APT needs those indices in order to operate in the live system, so before "
+"performing #{apt-cache search}# or #{apt-get install}#, for instance, the "
+"user must #{apt-get update}# first to create those indices."
+msgstr ""
+"Questo non influenzerà le voci in /etc/apt/sources.list, determina solo se /"
+"var/lib/apt contiene o meno i file degli indici. Il compromesso è che APT "
+"necessita di quegli indici per operar enel sistema live, perciò prima di "
+"eseguire #{apt-cache search}# o #{apt-get install}#, per esempio, l'utente "
+"deve usare prima #{apt-get update}# per crearli."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:311
+msgid ""
+"If you find the installation of recommended packages bloats your image too "
+"much, you may disable that default option of APT with:"
+msgstr ""
+"In caso si trovi che l'installazione dei pacchetti raccomandati appesantisca "
+"troppo l'immagine, si può disabilitare l'opzione predefinita di APT con:"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:315
+#, no-wrap
+msgid " $ lb config --apt-recommends false\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:319
+#, fuzzy
+#| msgid ""
+#| "The tradeoff here is that if you don't install recommended packages for a "
+#| "given package, that is, \"packages that would be found together with this "
+#| "one in all but unusual installations\" (Debian Policy Manual, 7.2), some "
+#| "packages that you actually need may be omitted. Therefore, we suggest you "
+#| "review the difference turning off recommends makes to your packages list "
+#| "(see the #{binary.packages}# file generated by #{lb build}#) and re-"
+#| "include in your list any missing packages that you still want installed. "
+#| "Alternatively, if you find you only want a small number of recommended "
+#| "packages left out, leave recommends enabled and set a negative APT pin "
+#| "priority on selected packages to prevent them from being installed, as "
+#| "explained in {APT pinning}#apt-pinning."
+msgid ""
+"The tradeoff here is that if you don't install recommended packages for a "
+"given package, that is, \"packages that would be found together with this "
+"one in all but unusual installations\" (Debian Policy Manual, 7.2), some "
+"packages that you actually need may be omitted. Therefore, we suggest you "
+"review the difference turning off recommends makes to your packages list "
+"(see the #{binary.packages}# file generated by #{lb build}#) and re-include "
+"in your list any missing packages that you still want installed. "
+"Alternatively, if you find you only want a small number of recommended "
+"packages left out, leave recommends enabled and set a negative APT pin "
+"priority on selected packages to prevent them from being installed, as "
+"explained in {APT pinning}#apt-pinning."
+msgstr ""
+"Qui il compromesso è dato dal fatto che se non si installano i raccomandati "
+"per un certo pacchetto, \"pacchetti che si trovano assieme a questo eccetto "
+"in installazioni non usuali\" (Debian Policy Manual, 7.2), saranno omessi "
+"alcuni di quelli realmente necessari. Si suggerisce pertanto di verificare "
+"la differenza ottenuta nel proprio elenco di pacchetti disabilitando i "
+"raccomandati (vedere il file #{binary.packages}# generato da #{lb build}#) e "
+"includere nuovamente in esso quelli omessi che si desiderano installare.In "
+"alternativa, se si desidera lasciare un modesto numero di raccomandati, "
+"lasciarli abilitati e impostare ad APT un pin di priorità negativo sui "
+"pacchetti selezionati affinché non vengano installati, come spiegato in {APT "
+"pinning}#apt-pinning."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:321
+msgid "3~ Passing options to apt or aptitude"
+msgstr "3~ Passare opzioni ad apt o aptitude"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:323
+msgid ""
+"If there is not an #{lb config}# option to alter APT's behaviour in the way "
+"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
+"options through to your configured APT tool. See the man pages for #{apt}# "
+"and #{aptitude}# for details."
+msgstr ""
+"Se non c'è un'opzione di #{lb config}# per modificare il comportamento di "
+"APT nel modo desiderato, si usi #{--apt-options}# o #{--aptitude-options}# "
+"per passare opzioni tramite il proprio strumento APT. Consultare il manuale "
+"di #{apt}# e #{aptitude}# per i dettagli."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:325
+msgid "3~apt-pinning APT pinning"
+msgstr "3~apt-pinning APT pinning"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:327
+msgid ""
+"For background, please first read the #{apt_preferences(5)}# man page. APT "
+"pinning can be configured either for build time, or else for run time. For "
+"the former, create #{config/chroot_apt/preferences}#. For the latter, create "
+"#{config/chroot_local-includes/etc/apt/preferences}#."
+msgstr ""
+"Si prega di leggere prima il manuale di #{apt_preferences(5)}#. Il pinning "
+"può essere configurato sia in fase di costruzione sia di esecuzione; per la "
+"prima creare #{config/chroot_apt/preferences}#, per quest'ultima creare #"
+"{config/chroot_local-includes/etc/apt/preferences}#."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:329
+msgid ""
+"Let's say you are building a Squeeze live system but need all #{live-*}# "
+"packages to be installed from Sid at build time. You need to add Sid to your "
+"APT sources and pin it so that only the packages you want are installed from "
+"it at build time and all others are taken from the target system "
+"distribution, Squeeze. The following will accomplish this:"
+msgstr ""
+"Nell'ipotesi di creare un sistema live Squeeze e avendo la necessità di "
+"installare tutti i pacchetti #{live-*}# da Sid in questa fase, bisogna "
+"aggiungere Sid alle fonti di APT e farne il pinning affinché verranno "
+"installati da lì solo i pacchetti voluti e per tutti gli altri attingerà "
+"dalla distribuzione principale, Squeeze. Quanto segue servirà allo scopo:"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:337
+#, no-wrap
+msgid ""
+" $ 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
+#, 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
+msgid ""
+"Negative pin priorities will prevent a package from being installed, as in "
+"the case where you do not want a package that is recommended by another "
+"package. Suppose you are building a GNOME image but don't want the user "
+"prompted to store wifi passwords in the keyring, so you want to omit the "
+"recommended #{gnome-keyring}# package. This can be done by adding the "
+"following stanza to #{config/chroot_apt/preferences}#:"
+msgstr ""
+"Un valore negativo della priorità evita che un pacchetto venga installato, "
+"come nel caso in cui non se ne voglia uno raccomandato da un altro. "
+"Supponendo di costruire un'immagine di GNOME ma non si desidera che "
+"all'utente venga richiesto di salvare la password wifi nel portachiavi; in "
+"questo caso si vorrà omettere il pacchetto raccomandato #{gnome-keyring}# "
+"aggiungendo a #{config/chroot_apt/preferences}# la seguente definizione:"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:352
+#, 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
new file mode 100644
index 0000000..06e434c
--- /dev/null
+++ b/manual/po/it/user_customization-runtime.ssi.po
@@ -0,0 +1,605 @@
+# Italian translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual 2.0.0\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"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:2
+msgid ":B~ Customizing run time behaviours"
+msgstr ":B~ Personalizzare i comportamenti durante l'esecuzione"
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:4
+msgid "1~customizing-run-time-behaviours Customizing run time behaviours"
+msgstr ""
+"1~customizing-run-time-behaviours Personalizzare i comportamenti durante "
+"l'esecuzione"
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:6
+msgid ""
+"All configuration that is done during run time is done by live-config. Here "
+"are some most common options of live-config that users are interested in. A "
+"full list of all possibilities can be found in the manpage of live-config."
+msgstr ""
+"Tutte le configurazioni durante l'esecuzione sono eseguite da live-config. "
+"Vengono qui presentate alcune delle opzioni di live-config più comuni alle "
+"quali gli utenti sono interessati; una lista completa può essere trovata nel "
+"suo manuale."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:8
+msgid "2~ Customizing the live user"
+msgstr "2~ Personalizzare l'utente live"
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:10
+msgid ""
+"One important consideration is that the live user is created by live-boot at "
+"boot time, not by live-build at build time. This not only influences where "
+"materials relating to the live user are introduced in your build, as "
+"discussed in {Live/chroot local includes}#live-chroot-local-includes, but "
+"also any groups and permissions associated with the live user."
+msgstr ""
+"Un'importante considerazione è che l'utente live viene creato all'avvio da "
+"live-boot e non da live-build durante la compilazione. Questo non solo "
+"influenza dove viene introdotto il materiale relativo all'utente nella "
+"creazione, come discusso in {Live/chroot include locali}#live-chroot-local-"
+"includes, ma anche ogni gruppo e permesso associato all'utente live."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:12
+msgid ""
+"You can specify additional groups that the live user will belong to by "
+"preseeding the #{passwd/user-default-groups}# debconf value. For example, to "
+"add the live user to the #{fuse}# group, add the following to a file in the #"
+"{config/chroot_local-preseed}# directory:"
+msgstr ""
+"È possibile specificare gruppi aggiuntivi ai quali l'utente live apparterrà "
+"preconfigurando il valore #{passwd/user-default-groups}# di debconf. Ad "
+"esempio, per aggiungere l'utente al gruppo #{fuse}#, inserire quanto segue "
+"ad un file nella directory #{config/chroot_local-preseed}#:"
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:16
+#, no-wrap
+msgid " debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:20
+msgid "2~customizing-locale-and-language Customizing locale and language"
+msgstr ""
+"2~customizing-locale-and-language Personalizzare la localizzazione e la "
+"lingua"
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:22
+msgid "When the live system boots, language is involved in three steps:"
+msgstr "Quando il sistema live si avvia, la lingua è inserita in tre fasi:"
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:24
+msgid "_* the locale generation"
+msgstr "_* generazione della localizzazione"
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:26
+msgid "_* setting the keyboard layout for the console"
+msgstr "_* impostazione del layout di tastiera per la console"
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:28
+msgid "_* setting the keyboard layout for X"
+msgstr "impostazione del layout di tastiera per X"
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:30
+msgid ""
+"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
+"To define the locale that should be generated, use the #{locales}# parameter "
+"in the #{--bootappend-live}# option of #{lb config}#, e.g."
+msgstr ""
+"Quando si crea un sistema live la localizzazione predefinita è "
+"\"locales=en_US.UTF-8\". Per definire quale generare, si usi il parametro #"
+"{locales}# nell'opzione #{--bootappend-live}# di #{lb config}#:"
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:34
+#, no-wrap
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:38
+msgid ""
+"This parameter can also be used at the kernel command line. You can specify "
+"a locale by a full #{language_country.encoding}# word."
+msgstr ""
+"Questo parametro può inoltre essere usato dalla riga di comando del kernel, "
+"specificando una localizzazione nella forma #{lingua_nazione.codifica}#."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:40
+msgid ""
+"Both the console and X keyboard configuration depend on the #{keyboard-"
+"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
+"keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base.xml}# "
+"(rather limited to two-letters country codes). To find the value (the two "
+"characters) corresponding to a language try searching for the english name "
+"of the nation where the language is spoken, e.g:"
+msgstr ""
+"Sia la configurazione della tastiera in console sia di X dipendono dal "
+"parametro #{keyboard-layouts}# dell'opzione #{--bootappend-live}#. Si "
+"possono trovare le opzioni valide per i layout di X in #{/usr/share/X11/xkb/"
+"rules/base.xml}# (piuttosto che limitate alle due lettere del codice della "
+"nazione); per trovare il valore (i due caratteri) corrispondenti alla "
+"lingua, si cerchi con il nome inglese della nazione in cui si parla tale "
+"lingua:"
+
+#. 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\n"
+" <name>se</name>\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:49
+msgid ""
+"To get the locale files for German and Swiss German keyboard layout in X use:"
+msgstr ""
+"Per ottenere i file di localizzazione per il layout di tastiera tedesco e "
+"svizzero-tedesco in X:"
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:53
+#, no-wrap
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:57
+msgid ""
+"A list of the valid values of the keyboards for the console can be figured "
+"with the following command:"
+msgstr ""
+"Si può ottenere un elenco di valori validi della tastiera per la console con "
+"il seguente comando:"
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:62
+#, no-wrap
+msgid ""
+" $ 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: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 "
+"keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}"
+"#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use "
+"also these parameters for X configuration. For example, to set up a French "
+"system with a French-Dvorak layout (called Bepo) on a TypeMatrix keyboard, "
+"both in console and X11, use:"
+msgstr ""
+"In alternativa è possibile utilizzare il pacchetto #{console-setup}#, uno "
+"strumento per configurare il layout della console tramite le definizioni di "
+"X (XKB); si può dunque impostare il layout in modo più preciso con le "
+"variabili #{keyboard-layouts}#, #{keyboard-variant}#, #{keyboard-options}# e "
+"#{keyboard-model}#; live-boot userà questi parametri anche per X. Ad "
+"esempio, per impostare un layout French-Dvorak (chiamato Bepo) su un sistema "
+"francese con una tastiera TypeMatrix, sia in console sia in X11:"
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:71
+#, no-wrap
+msgid ""
+" $ 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:75
+msgid "2~persistence Persistence"
+msgstr "2~persistence Persistenza"
+
+#. type: Plain text
+#: 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 "
+"of the host hardware which runs it."
+msgstr ""
+"Uno dei paradigmi di un cd live è un sistema preinstallato eseguito da un "
+"supporto in sola lettura, come un cdrom, dove le modifiche non sopravvivono "
+"ai riavvii dell'hardware della macchina ospitante."
+
+#. type: Plain text
+#: 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 "
+"should be considered read-only and all the run-time evolutions of the system "
+"are lost at shutdown."
+msgstr ""
+"Un sistema Debian Live è una generalizzazione di questo paradigma e di "
+"conseguenza oltre ai CD gestisce altri supporti; ma comunque, nel suo "
+"comportamento predefinito, deve essere considerato in sola lettura e tutte i "
+"cambiamenti fatti durante l'esecuzione del sistema verranno persi allo "
+"spegnimento."
+
+#. type: Plain text
+#: 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 "
+"understand how it could work it could be handy to know that even if the "
+"system is booted and run from read-only media, modification to the files and "
+"directories are written on writable media, typically a ram disk (tmpfs) and "
+"ram disks' data do not survive reboots."
+msgstr ""
+"Persistenza è il nome comune per differenti tipi di soluzioni per salvare "
+"alcune o tutte queste modifiche con i riavii. Per capire come funziona "
+"potrebbe essere utile sapere che sebbene il sistema venga avviato ed "
+"eseguito da un dispositivo in sola lettura, le modifiche a file e directory "
+"vengono scritte su uno scrivibile, tipicamente un ram disk (tmpfs) e i dati "
+"sui ram disk non sopravvivono ai riavii."
+
+#. type: Plain text
+#: 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 "
+"multisession (re)writable CD/DVD. All these media are supported in Debian "
+"Live in different ways, and all but the last one require a special boot "
+"parameter to be specified at boot time: #{persistent}#."
+msgstr ""
+"I dati immagazzinati su questo ramdisk andrebbero salvati un supporto "
+"scrivibile persistente come un hard disk, una chiave USB, una condivisione "
+"di rete o anche una sessione di un CD/DVD riscrivibile multisessione. Tutti "
+"questi supporti sono gestiti in Debian Live in modi differenti, e tutti "
+"tranne l'ultimo richiedono un parametro d'avvio speciale da specificare "
+"all'avvio: #{persistent}#."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:85
+msgid "3~ Full persistence"
+msgstr "3~ Persistenza completa"
+
+#. type: Plain text
+#: 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 "
+"writable partition is used. In order to use this feature a partition with a "
+"clean writable supported filesystem on it labeled \"live-rw\" must be "
+"attached on the system at boot time and the system must be started with the "
+"boot parameter 'persistent'. This partition could be an ext2 partition on "
+"the hard disk or on a usb key created with, e.g.:"
+msgstr ""
+"Con \"persistenza completa\" si intende l'uso di una partizione scrivibile "
+"invece di un filesystem temporaneo (tmpfs) per salvare le modifiche al "
+"supporto in sola lettura (con il sistema COW, copy-on-write). Per utilizzare "
+"questa caratteristica, una partizione con un filesystem scrivibile e "
+"supportato ed etichettata come \"live-rw\" deve essere collegata al sistema "
+"in fase di avvio e il sistema va fatto partire con il parametro \"persistent"
+"\". Questa partizione potrebbe essere di tipo ext2 su un hard disk o una "
+"penna usb creata ad esempio con:"
+
+#. type: Plain text
+#: 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:95
+msgid ""
+"If you already have a partition on your device, you could just change the "
+"label with one of the following:"
+msgstr ""
+"Se si possiede già una partizione sul dispositivo basta solo cambiare "
+"l'etichetta con una delle seguenti:"
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:100
+#, no-wrap
+msgid ""
+" # 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: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 "
+"could be also used with just image files, so you could create a file "
+"representing a partition and put this image file even on a NTFS partition of "
+"a foreign OS, with something like:"
+msgstr ""
+"Ma siccome gli utenti dei sistemi live non hanno sempre la possibilità di "
+"utilizzare una partizione su disco rigido, e considerando che la maggior "
+"parte delle chiavi USB hanno scarse velocità di scrittura, la persistenza "
+"\"completa\" può anche essere usata con dei file immagine, è possibile "
+"creare un file che rappresenta una partizione e inserire questo file "
+"immagine anche su una partizione NTFS di un sistema operativo estraneo, "
+"qualcosa come:"
+
+#. type: Plain text
+#: 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\n"
+" $ /sbin/mkfs.ext2 -F live-rw\n"
+msgstr ""
+
+#. type: Plain text
+#: 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 ""
+"Quindi copiare il file #{live-rw}# su una partizione scrivibile e riavviare "
+"con il parametro d'avvio \"persistent\"."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:115
+msgid "3~ Home automounting"
+msgstr "3~ Mount automatico della home"
+
+#. type: Plain text
+#: 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 "
+"as #{/home}#, thus permitting persistence of files that belong to e.g. the "
+"default user. It can be combined with full persistence."
+msgstr ""
+"Se durante l'avvio viene trovata una partizione (filesystem) su file "
+"immagine o una partizione etichettata come #{home-rw}#, questa verrà montata "
+"direttamente come #{/home}#, permettendo quindi la persistenza dei file che "
+"appartengono ad esempio all'utente predefinito. Può essere unita alla "
+"persistenza completa."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:119
+msgid "3~ Snapshots"
+msgstr "3~ Istantanee"
+
+#. type: Plain text
+#: 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 "
+"(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The "
+"content of a snapshot could reside on a partition or an image file (like the "
+"above mentioned types) labeled #{live-sn}#, but it defaults to a simple cpio "
+"archive named #{live-sn.cpio.gz}#. As above, at boot time, the block devices "
+"connected to the system are traversed to see if a partition or a file named "
+"like that could be found. A power interruption during run time could lead to "
+"data loss, hence a tool invoked #{live-snapshot --refresh}# could be called "
+"to sync important changes. This type of persistence, since it does not write "
+"continuously to the persistent media, is the most flash-based device "
+"friendly and the fastest of all the persistence systems."
+msgstr ""
+"Le istantanee sono raccolte di file e directory che non vengono montate "
+"durante l'esecuzione ma copiate all'avvio da un dispositivo persistente al "
+"sistema (tmpfs) e risincronizzate al riavvio e spegnimento. Il contenuto di "
+"un'istantanea può risiedere su una partizione o file immagine (come i tipi "
+"menzionati poc'anzi) etichettati come #{live-sn}#, ma sotto forma di un "
+"semplice archivio cpio nominato #{live-sn.cpio.gz}#. Come sopra, all'avvio, "
+"i device a blocchi collegati al sistema vengono analizzati alla ricerca di "
+"una partizione o file così nominati. Un'interruzione di corrente durante "
+"l'esecuzione potrebbe portare ad una perdita di dati, per cui si può usare "
+"uno strumento che richiama #{live-snapshot --refresh}# per sincronizzare i "
+"cambiamenti importanti. Giacché non scrive continuamente sul dispositivo, "
+"questo tipo di persistenza è il sistema più comodo e veloce per dispositivi "
+"basati su memoria flash."
+
+#. type: Plain text
+#: 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 ""
+"Esiste anche un'istantanea della /home con etichetta #{home-sn.*}#; funziona "
+"come la principale ma viene applicata solo ad /home."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:125
+msgid ""
+"Snapshots cannot currently handle file deletion but full persistence and "
+"home automounting can."
+msgstr ""
+"Attualmente le istantanee non possono gestire la cancellazione dei file, al "
+"contrario della persistenza completa e il mount automatico della home. "
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:127
+msgid "3~ Persistent SubText"
+msgstr "3~ Sottotesto persistente"
+
+#. type: Plain text
+#: 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-"
+"work}#, the boot parameter #{persistent-subtext}# used in conjuntion with "
+"the boot parameter #{persistent}# will allow for multiple but unique "
+"persistent media. An example would be if a user wanted to use a persistent "
+"partition labeled #{live-sn-subText}# they would use the boot parameters of: "
+"#{persistent}# #{persistent-subtext=subText}#."
+msgstr ""
+"Se un utente avesse bisogno di archiviazioni multiple dello stesso tipo per "
+"differenti posti o per test, come #{live-rw-casa}# e #{live-rw-lavoro}#, il "
+"parametro d'avvio #{persistent-subtext}# usato in congiunzione con #"
+"{persistent}# permetterà supporti persistenti multipli ma univoci. Un "
+"esempio potrebbe essere un utente che vuole usare una partizione etichettata "
+"come #{live-sn-sottotesto}#, userebbe: #{persistent}# #{persistent-"
+"subtext=sottotesto}#."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:131
+msgid "3~ Partial remastering"
+msgstr "3~ Rimasterizzazione parziale"
+
+#. type: Plain text
+#: 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 "
+"case of cd-r or adding a session to multisession cd/dvd(rw); live-boot "
+"mounts all /live filesystem in order or with the module boot parameter."
+msgstr ""
+"Le modifiche in fase di esecuzione del tmpfs possono essere incluse in uno "
+"squashfs usando live-snapshot e aggiunte al cd per rimasterizzare la iso nel "
+"caso di un cd riscrivibile o aggiunto ad una sessione di un cd/dvd(rw) "
+"multisessione; live-boot monta tutti i filesystem /live in ordine o con il "
+"modulo del parametro d'avvio."
diff --git a/manual/po/it/user_examples.ssi.po b/manual/po/it/user_examples.ssi.po
new file mode 100644
index 0000000..eed26bb
--- /dev/null
+++ b/manual/po/it/user_examples.ssi.po
@@ -0,0 +1,896 @@
+# Italian translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+# Carlo Stemberger <carlo.stemberger at gmail.com>, 2010.
+# lillo sciascia <lillosciascia at gmail.com>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual 2.0.0\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"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2: plural=(n !=1)\n"
+
+#. type: Plain text
+#: en/live-manual.ssm:61 en/user_examples.ssi:2
+msgid ":B~ Examples"
+msgstr ":B~ Esempi"
+
+#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
+msgid "}code"
+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:208
+#, no-wrap
+msgid " # lb build\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:4
+msgid "1~examples Examples"
+msgstr "1~examples Esempi"
+
+#. type: Plain text
+#: en/user_examples.ssi:6
+msgid ""
+"This chapter covers example builds for specific use cases with Debian Live. "
+"If you are new to building your own Debian Live images, we recommend you "
+"first look at the three tutorials in sequence, as each one teaches new "
+"techniques that will help you use and understand the remaining examples."
+msgstr ""
+"Questo capitolo affronta alcune costruzioni di esempio per specifici casi "
+"d'uso con Debian Live. Se si è nuovi nella costruzione di immagini Debian "
+"Live, raccomandiamo di dare innanzitutto un'occhiata ai tre tutorial in "
+"sequenza, dato che ciascuno insegna nuove tecniche che aiuteranno nell'uso e "
+"nella comprensione degli esempi rimanenti."
+
+#. type: Plain text
+#: en/user_examples.ssi:8
+msgid "2~using-the-examples Using the examples"
+msgstr "2~using-the-examples Usare gli esempi"
+
+#. type: Plain text
+#: en/user_examples.ssi:10
+msgid ""
+"To use these examples you need a system to build them on that meets the "
+"requirements listed in {Requirements}#requirements and has live-build "
+"installed as described in {Installing live-build}#installing-live-build."
+msgstr ""
+"Per usare questi esempi è necessario un sistema per costruirveli sopra che "
+"soddisfi i requisiti elencati in {Requisiti}#requirements e avere live-build "
+"installato come descritto in {Installare live-build}#installing-live-build."
+
+#. type: Plain text
+#: en/user_examples.ssi:12
+msgid ""
+"Note that, for the sake of brevity, in these examples we do not specify a "
+"local mirror to use for the build. You can speed up downloads considerably "
+"if you use a local mirror. You may specify the options when you use #{lb "
+"config}#, as described in {Distribution mirrors used at build time}"
+"#distribution-mirrors-build-time, or for more convenience, set the default "
+"for your build system in #{/etc/live/build.conf}#. Simply create this file "
+"and in it, set the corresponding #{LB_MIRROR_*}# variables to your preferred "
+"mirror. For example:"
+msgstr ""
+"Si noti che, per brevità, in questi esempi non specifichiamo un mirror "
+"locale da usare per la costruzione. Usando un mirror locale, si possono "
+"accelerare considerevolmente i download. Si possono specificare le opzioni "
+"quando si usa #{lb config}#, come descritto in {Mirror delle distribuzioni "
+"usati in fase di compilazione}#distribution-mirrors-build-time o, più "
+"convenientemente, impostare il predefinito per il proprio sistema in #{/etc/"
+"live/build.conf}#. Si crei semplicemente questo file e si impostino in esso "
+"le corrispondenti variabili #{LB_MIRROR_*}# per il mirror desiderato. Ad "
+"esempio:"
+
+#. type: Plain text
+#: en/user_examples.ssi:18
+#, no-wrap
+msgid ""
+" 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
+#: en/user_examples.ssi:22
+msgid "2~tutorial-1 Tutorial 1: A standard image"
+msgstr "2~tutorial-1 Tutorial 1: un'immagine standard"
+
+#. type: Plain text
+#: en/user_examples.ssi:24
+#, no-wrap
+msgid "*{Use case:}* Create a simple first image, learning the basics of live-build.\n"
+msgstr "*{Caso d'uso:}* creare una prima immagine semplice, imparare i fondameni di live-build.\n"
+
+#. type: Plain text
+#: en/user_examples.ssi:26
+msgid ""
+"In this tutorial, we will build a default ISO hybrid Debian Live image "
+"containing only base packages (no Xorg) and some Debian Live support "
+"packages, as a first exercise in using live-build."
+msgstr ""
+"In questo tutorial genereremo un'immagine ISO ibrida di Debian Live "
+"contenente solo i pacchetti base (niente Xorg) e alcuni pacchetti Debian "
+"Live di supporto, come primo esercizio sull'uso di live-build."
+
+#. type: Plain text
+#: en/user_examples.ssi:28
+msgid "You can't get much simpler than this:"
+msgstr "Non può essere più semplice:"
+
+#. type: Plain text
+#: en/user_examples.ssi:32
+#, no-wrap
+msgid " $ mkdir tutorial1 ; cd tutorial1 ; lb config\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:36
+msgid ""
+"Examine the contents of the #{config/}# directory if you wish. You will see "
+"stored here a skeletal configuration, ready to customize or, in this case, "
+"use immediately to build a default image."
+msgstr ""
+"Esaminare i contenuti della directory #{config/}#; si noterà uno scheletro "
+"di configurazione pronto per essere personalizzato o, in questo caso, usato "
+"immediatamente per costruire un'immagine predefinita."
+
+#. type: Plain text
+#: en/user_examples.ssi:38
+msgid ""
+"Now, as superuser, build the image, saving a log as you build with #{tee}#."
+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:231
+#, no-wrap
+msgid " # lb build 2>&1 | tee binary.log\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:46
+msgid ""
+"Assuming all goes well, after a while, the current directory will contain #"
+"{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
+"virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-"
+"with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
+"virtualbox, or else imaged onto optical media or a USB flash device as "
+"described in {Burning an ISO image to a physical medium}#burning-iso-image "
+"and {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
+"respectively."
+msgstr ""
+"Presupponendo che tutto vada per il verso giusto, dopo un po' la directory "
+"corrente conterrà #{binary-hybrid.iso}#. Questa immagine ISO ibrida può "
+"essere avviata direttamente in una macchina virtuale come descritto in "
+"{Provare un'immagine ISO con Qemu}#testing-iso-with-qemu e {Provare "
+"un'immagine ISO con virtualbox-ose}#testing-iso-with-virtualbox, oppure "
+"masterizzata su un supporto ottico o ancora su una chiavetta USB come "
+"descritto rispettivamente in {Masterizzare un'immagine ISO su un supporto "
+"fisico}#burning-iso-image e {Copiare un'immagine USB/HDD su una penna USB}"
+"#copying-usb-hdd-image."
+
+#. type: Plain text
+#: en/user_examples.ssi:48
+msgid "2~tutorial-2 Tutorial 2: A web browser utility"
+msgstr "2~tutorial-2 Tutorial 2: un programma di utilità web browser"
+
+#. type: Plain text
+#: en/user_examples.ssi:50
+#, no-wrap
+msgid "*{Use case:}* Create a web browser utility image, learning how to apply customizations.\n"
+msgstr "*{Caso d'uso:}* creazione di un'immagine browser web, imparare come applicare le personalizzazioni.\n"
+
+#. type: Plain text
+#: en/user_examples.ssi:52
+msgid ""
+"In this tutorial, we will create an image suitable for use as a web browser "
+"utility, serving as an introduction to customizing Debian Live images."
+msgstr ""
+"In questo tutorial verrà creata un'immagine adatta all'uso come browser web, "
+"che serve come introduzione alla personalizzazione delle immagini Debian "
+"Live."
+
+#. type: Plain text
+#: en/user_examples.ssi:56
+#, no-wrap
+msgid " $ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:60
+msgid ""
+"Our choice of LXDE for this example reflects our desire to provide a minimal "
+"desktop environment, since the focus of the image is the single use we have "
+"in mind, the web browser. We could go even further and provide a default "
+"configuration for the web browser in #{config/chroot_local-includes/etc/"
+"iceweasel/profile/}#, or additional support packages for viewing various "
+"kinds of web content, but we leave this as an exercise for the reader."
+msgstr ""
+"La scelta di LXDE per questo esempio riflette il desiderio di fornire un "
+"ambiente desktop minimale, dato che il punto focale dell'immagine è il "
+"singolo uso che abbiamo in mente, il browser web. Potremmo anche spingerci "
+"oltre e fornire una configurazione predefinita per il browser web in #"
+"{config/chroot_local-includes/etc/iceweasel/profile/}#, o pacchetti "
+"addizionali di supporto per la fruizione di vari tipi di contenuti web, ma "
+"lasciamo questo come esercizio per il lettore."
+
+#. type: Plain text
+#: en/user_examples.ssi:62
+msgid ""
+"Build the image, again as superuser, keeping a log as in {Tutorial 1}"
+"#tutorial-1:"
+msgstr ""
+"Si generi l'immagine, ancora come super-utente, conservando un log come in "
+"{Tutorial 1}#tutorial-1:"
+
+#. type: Plain text
+#: en/user_examples.ssi:70
+msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
+msgstr ""
+"Di nuovo, si verifichi che l'immagine sia a posto e la si collaudi, come in "
+"{Tutorial 1}#tutorial-1."
+
+#. type: Plain text
+#: en/user_examples.ssi:72
+msgid "2~tutorial-3 Tutorial 3: A personalized image"
+msgstr "2~tutorial-3 Tutorial 3: un'immagine personalizzata"
+
+#. type: Plain text
+#: en/user_examples.ssi:74
+#, no-wrap
+msgid "*{Use case:}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
+msgstr "*{Caso d'uso:}* creare un progetto per costruire un'immagine personalizzata, contenente i pacchetti preferiti da portare con sé in una chiavetta USB ovunque si vada, da evolvere in revisioni successive allorché i bisogni o le preferenze cambino.\n"
+
+#. type: Plain text
+#: en/user_examples.ssi:76
+msgid ""
+"Since we will be changing our personalized image over a number of revisions, "
+"and we want to track those changes, trying things experimentally and "
+"possibly reverting them if things don't work out, we will keep our "
+"configuration in the popular #{git}# version control system. We will also "
+"use the best practice of autoconfiguration via #{auto}# scripts as described "
+"in {Managing a configuration}#managing-a-configuration."
+msgstr ""
+"Dal momento che la nostra immagine personalizzata cambierà con le successive "
+"revisioni, e che vogliamo tener traccia di questi cambiamenti, sperimentando "
+"ed eventualmente tornare indietro se qualcosa non funziona, conserveremo la "
+"nostra configurazione nel popolare sistema di controllo di versione #{git}#. "
+"Useremo anche le migliori pratiche di auto-configurazione tramite gli script "
+"#{auto}# come descritto in {Gestire una configurazione}#managing-a-"
+"configuration."
+
+#. type: Plain text
+#: en/user_examples.ssi:78
+msgid "3~ First revision"
+msgstr "3~ Prima revisione"
+
+#. type: Plain text
+#: en/user_examples.ssi:84
+#, no-wrap
+msgid ""
+" $ mkdir -p tutorial3/auto\n"
+" $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/\n"
+" $ cd tutorial3\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:88
+msgid "Edit #{auto/config}# to read as follows:"
+msgstr "Modificare #{auto/config}# come segue:"
+
+#. type: Plain text
+#: en/user_examples.ssi:92 en/user_examples.ssi:141
+#, 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"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:103
+msgid ""
+"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
+"we build a 32-bit version suitable for use on most machines. Second, we use #"
+"{--linux-flavours 686}# because we don't anticipate using this image on much "
+"older systems. Third, we've chosen the #{lxde}# package list to give us a "
+"minimal desktop. And finally, we have added two initial favourite packages: #"
+"{iceweasel}# and #{xchat}#."
+msgstr ""
+"Per prima cosa, #{--architecture i386}# assicura che sul nostro sistema #"
+"{amd64}# costruiamo una versione a 32-bit utilizzabile sulla maggior parte "
+"delle macchine. In secondo luogo, usiamo #{--linux-flavours 686}# dato che "
+"non prevediamo di usare questa immagine su sistemi troppo vecchi. Terzo, "
+"abbiamo scelto la lista di pacchetti #{lxde}# per avere un desktop minimale. "
+"Infine, abbiamo aggiunto due pacchetti preferiti per cominciare: #{iceweasel}"
+"# e #{xchat}#."
+
+#. type: Plain text
+#: en/user_examples.ssi:105
+msgid "Now, build the image:"
+msgstr "Costruire quindi l'immagine:"
+
+#. type: Plain text
+#: en/user_examples.ssi:113
+msgid ""
+"Note that unlike in the first two tutorials, we no longer have to type #"
+"{2>&1 | tee binary.log}# as that is now included in #{auto/build}#."
+msgstr ""
+"Si noti che diversamente dai primi due tutorial, non bisogna più digitare #"
+"{2>&1 | tee binary.log}# dato che questo è ora incluso in #{auto/build}#."
+
+#. type: Plain text
+#: en/user_examples.ssi:115
+msgid ""
+"Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are "
+"satisfied it works, it's time to initialize our #{git}# repository, adding "
+"only the auto scripts we just created, and then make the first commit:"
+msgstr ""
+"Una volta che l'immagine è stata collaudata (come in {Tutorial 1}"
+"#tutorial-1) e che si è sicuri che funzioni correttamente, è il momento di "
+"inizializzare il repository #{git}#, aggiungendo solo gli script auto appena "
+"creati, e poi fare il primo commit:"
+
+#. type: Plain text
+#: en/user_examples.ssi:121
+#, 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
+msgid "3~ Second revision"
+msgstr "3~ Seconda revisione"
+
+#. type: Plain text
+#: en/user_examples.ssi:127
+msgid ""
+"In this revision, we're going to clean up from the first build, add the #"
+"{vlc}# package to our configuration, rebuild, test and commit."
+msgstr ""
+"In questa revisione ripuliremo la prima compilazione, aggiungeremo il "
+"pacchetto #{vlc}# alla configurazione, dunque avverrà una ricompilazione, "
+"verifica e commit."
+
+#. type: Plain text
+#: en/user_examples.ssi:129
+msgid ""
+"The #{lb clean}# command will clean up all generated files from the previous "
+"build except for the cache, which saves having to re-download packages. This "
+"ensures that the subsequent #{lb build}# will re-run all stages to "
+"regenerate the files from our new configuration."
+msgstr ""
+"Il comando #{lb clean}# ripulirà tutti i file generati dalla precedente "
+"compilazione eccetto la cache, che ci evita un nuovo download dei pacchetti. "
+"Ciò assicura che il successivo #{lb build}# eseguirà di nuovo tutti i "
+"passaggi per rigenerare i file dalla nuova configurazione."
+
+#. type: Plain text
+#: en/user_examples.ssi:133
+#, no-wrap
+msgid " # lb clean\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:137
+msgid "Now edit #{auto/config}# to add the #{vlc}# package:"
+msgstr "Si modifichi ora #{auto/config}# per aggiungere il pacchetto #{vlc}#:"
+
+#. type: Plain text
+#: 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"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:152
+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 ""
+"Verificare, e quando soddisfatti, eseguire il commit della revisione "
+"successiva:"
+
+#. type: Plain text
+#: en/user_examples.ssi:164
+#, no-wrap
+msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:168
+msgid ""
+"Of course, more complicated changes to the configuration are possible, "
+"perhaps adding files in subdirectories of #{config/}#. When you commit new "
+"revisions, just take care not to hand edit or commit the top-level files in #"
+"{config}# containing #{LB_*}# variables, as these are build products, too, "
+"and are always cleaned up by #{lb clean}# and re-created with #{lb config}# "
+"via their respective #{auto}# scripts."
+msgstr ""
+"Ovviamente sono possibili cambiamenti alla configurazione più complicati, "
+"magari aggiungendo file in sottodirectory di #{config/}#. Quando si esegue "
+"il commit di nuove revisioni, si faccia solo attenzione a non modificare "
+"manualmente o fare un commit dei file al livello superiore di #{config}# che "
+"contengono le variabili #{LB_*}#, giacché sono anche  prodotti della "
+"compilazione, e che sono sempre ripuliti da #{lb clean}# e ricreati con #{lb "
+"config}# attraverso i loro rispettivi script #{auto}#."
+
+#. type: Plain text
+#: en/user_examples.ssi:170
+msgid ""
+"We've come to the end of our tutorial series. While many more kinds of "
+"customization are possible, even just using the few features explored in "
+"these simple examples, an almost infinite variety of different images can be "
+"created. The remaining examples in this section cover several other use "
+"cases drawn from the collected experiences of users of Debian Live."
+msgstr ""
+"Siamo arrivati alla fine di questa serie di tutorial. Mentre sono possibili "
+"molti altri tipi di personalizzazioni, anche solo usando le poche "
+"caratteristiche esplorate in questi semplici esempi, può essere creata una "
+"varietà quasi infinita di immagini. Gli esempi rimanenti in questa sezione "
+"coprono diversi altri casi d'uso estrapolati dalle esperienze raccolte degli "
+"utenti Debian Live."
+
+#. type: Plain text
+#: en/user_examples.ssi:172
+msgid "2~ A VNC Kiosk Client"
+msgstr "2~ Un client Kiosk VNC"
+
+#. type: Plain text
+#: en/user_examples.ssi:174
+#, no-wrap
+msgid "*{Use case:}* Create an image with live-build to boot directly to a VNC server.\n"
+msgstr "*{Caso d'uso:}* creare un'immagine con live-build per avviare direttamente un server VNC.\n"
+
+#. type: Plain text
+#: en/user_examples.ssi:176
+msgid ""
+"Make a build directory and create a skeletal configuration in it built "
+"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
+"{xtightvncviewer}#, disabling recommends to make a minimal system:"
+msgstr ""
+"Creare una directory con al suo interno una configurazione scheletrica "
+"costruita sulla base dell'elenco di standard-x11, tra cui #{gdm3}#, #"
+"{metacity}# e #{xtightvncviewer}#, disabilitando i raccomandati per ottenere "
+"un sistema minimale:"
+
+#. type: Plain text
+#: 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"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:188
+msgid ""
+"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
+"the default user that will launch metacity and start xvncviewer, connecting "
+"to port #{5901}# on a server at #{192.168.1.2}#:"
+msgstr ""
+"Creare la directory #{/etc/skel}# e inserirvi un #{.xsession}# "
+"personalizzato per l'utente predefinito che lancerà metacity e avvierà "
+"xvncviewer, connesso alla porta #{5901}# su un server all'indirizzo #"
+"{192.168.1.2}#:"
+
+#. type: Plain text
+#: en/user_examples.ssi:194
+#, no-wrap
+msgid ""
+" $ 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
+#, 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
+#, no-wrap
+msgid ""
+" exit\n"
+" END\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:204
+msgid "Build the image:"
+msgstr "Costruire l'immagine:"
+
+#. type: Plain text
+#: en/user_examples.ssi:212
+msgid "Enjoy."
+msgstr "Buon divertimento."
+
+#. type: Plain text
+#: en/user_examples.ssi:214
+msgid "2~ A base image for a 128M USB key"
+msgstr "2~ Un'immagine base per una chiavetta USB da 128M"
+
+#. type: Plain text
+#: en/user_examples.ssi:216
+#, no-wrap
+msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
+msgstr "*{Caso d'uso:}* creare un'immagine standard rimuovendo alcuni componenti affinché stia su una chiavetta USB da 128M con lo spazio che rimane da usare come meglio si crede.\n"
+
+#. type: Plain text
+#: en/user_examples.ssi:218
+msgid ""
+"When optimizing an image to fit a certain media size, you need to understand "
+"the tradeoffs you are making between size and functionality. In this "
+"example, we trim only so much as to make room for additional material within "
+"a 128M media size, but without doing anything to destroy integrity of the "
+"packages contained within, such as the purging of locale data via the #"
+"{localepurge}# package, or other such \"intrusive\" optimizations. Of "
+"particular note, you should not use #{--bootstrap-flavour minimal}# unless "
+"you really know what you're doing, as omitting priority #{important}# "
+"packages will most likely produce a broken live system."
+msgstr ""
+"Quando si cerca di ottimizzare un'immagine affinché sia contenuta in un "
+"supporto, è necessario capire il compromesso che si deve fare tra la "
+"dimensione e la funzionalità. In questo esempio, taglieremo solo quanto "
+"basta per far sì che il tutto stia in 128M, senza fare nient'altro che "
+"distrugga l'integrità dei pacchetti contenuti, come eliminare localizzazioni "
+"con il pacchetto #{localepurge}# o altre ottimizzazioni \"intrusive\". È da "
+"notare che non va usato #{--bootstrap-flavour minimal}# a meno che non si "
+"sappia cosa si sta facendo, come omettere la priorità dei pacchetti #"
+"{important}# che molto probabilmente produrrà un sistema live danneggiato."
+
+#. type: Plain text
+#: en/user_examples.ssi:223
+#, no-wrap
+msgid ""
+" $ 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: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: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 "
+"by the default configuration in {Tutorial 1}#tutorial-1."
+msgstr ""
+"All'autore del sistema al momento di scrivere, la seguente configurazione ha "
+"prodotto una immagine di 78Mbyte. Comparabile favorevolmente con i 166Mbyte "
+"prodotta dalla configurazione predefinita nel {Tutorial 1}#tutorial-1."
+
+#. type: Plain text
+#: 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 "
+"instead of the default #{-k \"486 686\"}#. Leaving off APT's indices with #"
+"{--binary-indices false}# also saves a fair amount of space, the tradeoff "
+"being that you need to #{apt-get update}# before using apt in the live "
+"system. Choosing the #{minimal}# package list leaves out the large #{locales}"
+"# package and associated utilities. Dropping recommended packages with #{--"
+"apt-recommends false}# saves some additional space, at the expense of "
+"omitting some packages you might otherwise expect to be there, such as #"
+"{firmware-linux-free}# which may be needed to support certain hardware. The "
+"remaining options shave off additional small amounts of space. It's up to "
+"you to decide if the functionality that is sacrificed with each optimization "
+"is worth the loss in functionality."
+msgstr ""
+"Ciò che salva più spazio, comparato alla costruzione di un'immagine standard "
+"su un sistema con architettura #{i386}#, è la selezione del solo kernel #"
+"{486}# invece che quello predefinito #{-k \"486 686\"}#. Lasciando fuori "
+"anche gli indici di APT con #{--binary-indices false}# si può salvare una "
+"certa quantità di spazio, il compromesso è usare #{apt-get update}# prima di "
+"usare apt nel sistema live. Scegliendo la lista #{minima}# dei pacchetti si "
+"esclude il grosso pacchetto #{locales}# e le utilità associate. Saltare i "
+"pacchetti raccomandati con #{--apt-recommends false}# salva altro spazio, a "
+"scapito di alcuni pacchetti che ci si aspetta di trovare, come #{firmware-"
+"linux-free}# che potrebbe servire a supportare un certo hardware. Le "
+"restanti opzioni limano altre piccole quantità di spazio. Sta a voi decidere "
+"se le funzionalità sacrificate con ciascuna ottimizzazione valgono la pena."
+
+#. type: Plain text
+#: 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: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: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 "
+"that would be installed by the standard Debian installer for KDE."
+msgstr ""
+"Si vuole creare un'immagine iso ibrida per architettura i386 usando il "
+"nostro desktop preferito, in questo caso KDE, contenente tutti gli stessi "
+"pacchetti che verrebbero installati dall'installatore Debian standard per "
+"KDE."
+
+#. type: Plain text
+#: 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 "
+"find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can be "
+"used to dig it out of the task descriptions in tasksel-data, so to prepare, "
+"make sure you have both of those things:"
+msgstr ""
+"Il problema iniziale è di scoprire i nomi dei task appropriati, attualmente, "
+"live-build non aiuta in questo. Si può essere fortunati o arrivarci con vari "
+"tentativi, ma c'è uno strumento #{grep-dctrl}# il quale può essere "
+"utilizzato per scavare nelle descrizioni in tasksel-data, perciò assicursi "
+"di avere entrambi questi pacchetti:"
+
+#. type: Plain text
+#: en/user_examples.ssi:249
+#, no-wrap
+msgid " # apt-get install dctrl-tools tasksel-data\n"
+msgstr ""
+
+#. type: Plain text
+#: 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: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"
+msgstr ""
+
+#. type: Plain text
+#: 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 ""
+"Con questo comando, si è scoperto che il task si chiama, abbastanza "
+"chiaramente, brazilian-portuguese. Ora per trovare i task correlati:"
+
+#. type: Plain text
+#: 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"
+msgstr ""
+
+#. type: Plain text
+#: 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"
+msgstr ""
+
+#. type: Plain text
+#: 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}"
+"#desktop-and-language-tasks for details). And at boot time we will generate "
+"the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's "
+"put the pieces together:"
+msgstr ""
+"Si userà l'opzione sperimentale #{--language}#, poiché live-build contempla "
+"i template #{syslinux}# per pt_BR (Vedere {Task per desktop e lingua}"
+"#desktop-and-language-tasks per i dettagli). All'avvio verrà generata la "
+"lingua pt_BR.UTF-8 e selezionato pt-latin1 come layout della tastiera. Ora "
+"mettiamo insieme i pezzi:"
+
+#. type: Plain text
+#: en/user_examples.ssi:295
+#, no-wrap
+msgid ""
+" $ 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"
+msgstr ""
+
+#. type: Plain text
+#: 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 "
+"flavour kernel, as it is currently necessary to make the installer and live "
+"system kernels match for the launcher to work properly."
+msgstr ""
+"Si noti che è stato incluso il pacchetto #{debian-installer-launcher}# in "
+"modo da poter lanciare l'installer dal desktop della live, ed è stato anche "
+"specificato il kernel 486, poiché è necessario che il kernel dell'installer "
+"e quello del sistema coincidano affinche il launcher funzioni "
+"appropriatamente."
diff --git a/manual/po/it/user_installation.ssi.po b/manual/po/it/user_installation.ssi.po
new file mode 100644
index 0000000..6af626b
--- /dev/null
+++ b/manual/po/it/user_installation.ssi.po
@@ -0,0 +1,494 @@
+# Italian translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+# Carlo Stemberger <carlo.stemberger at gmail.com>, 2010.
+# lillo sciascia <lillosciascia at gmail.com>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual 2.0.0\n"
+"POT-Creation-Date: 2010-12-19 20:37-0400\n"
+"PO-Revision-Date: 2010-12-17 18:00+0100\n"
+"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
+"Language-Team: Italian <tp at lists.linux.it>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2: plural=(n !=1)\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
+#, no-wrap
+msgid " $ lb config --repository live.debian.net\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:2
+msgid ":B~ Installation"
+msgstr ":B~ Installazione"
+
+#. type: Plain text
+#: en/user_installation.ssi:4
+msgid "1~ Installation"
+msgstr "1~ Installazione"
+
+#. type: Plain text
+#: en/user_installation.ssi:6
+msgid "2~requirements Requirements"
+msgstr "2~requirements Requisiti"
+
+#. type: Plain text
+#: en/user_installation.ssi:8
+msgid "Building Debian Live images has very few system requirements:"
+msgstr ""
+"Per costruire immagini Debian Live i requisiti di sistema sono davvero pochi:"
+
+#. type: Plain text
+#: en/user_installation.ssi:10
+msgid "_* Super user (root) access"
+msgstr "_* Accesso come super-utente (root)"
+
+#. type: Plain text
+#: en/user_installation.ssi:12
+msgid "_* An up-to-date version of live-build"
+msgstr "_* Una versione aggiornata di live-build"
+
+#. type: Plain text
+#: en/user_installation.ssi:14
+msgid "_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/."
+msgstr "_* Una shell POSIX-compliant, come /{bash}/ o /{dash}/."
+
+#. type: Plain text
+#: en/user_installation.ssi:16
+msgid "_* /{debootstrap}/ or /{cdebootstrap}/"
+msgstr "_* /{debootstrap}/ o /{cdebootstrap}/"
+
+#. type: Plain text
+#: en/user_installation.ssi:18
+msgid "_* Linux 2.6.x"
+msgstr "_* Linux 2.6.x"
+
+#. type: Plain text
+#: en/user_installation.ssi:20
+msgid ""
+"Note that using Debian or a Debian-derived distribution is not required - "
+"live-build will run on almost any distribution with the above requirements."
+msgstr ""
+"Si noti che usare Debian o una distribuzione derivata Debian non è richiesto "
+"- live-build funzionerà sostanzialmente su qualsiasi distribuzione che "
+"soddisfi i requisiti di cui sopra."
+
+#. type: Plain text
+#: en/user_installation.ssi:22
+msgid "2~installing-live-build Installing live-build"
+msgstr "2~installing-live-build Installare live-build"
+
+#. type: Plain text
+#: en/user_installation.ssi:24
+msgid "You can install live-build in a number of different ways:"
+msgstr "Si può installare live-build in diversi modi:"
+
+#. type: Plain text
+#: en/user_installation.ssi:26
+msgid "_* From the Debian repository"
+msgstr "_* Dal repository Debian"
+
+#. type: Plain text
+#: en/user_installation.ssi:28
+msgid "_* From source"
+msgstr "_* Da sorgenti"
+
+#. type: Plain text
+#: en/user_installation.ssi:30
+msgid "_* From snapshots"
+msgstr "_* Da istantanee"
+
+#. type: Plain text
+#: en/user_installation.ssi:32
+msgid ""
+"If you are using Debian, the recommended way is to install live-build via "
+"the Debian repository."
+msgstr ""
+"Se si sta usando Debian, il metodo raccomandato è di installare live-build "
+"attraverso il repository Debian."
+
+#. type: Plain text
+#: en/user_installation.ssi:34 en/user_installation.ssi:104
+msgid "3~ From the Debian repository"
+msgstr "3~ Dal repository Debian"
+
+#. type: Plain text
+#: en/user_installation.ssi:36
+msgid "Simply install live-build like any other package:"
+msgstr "Installare live-build semplicemente come qualsiasi altro pacchetto:"
+
+#. type: Plain text
+#: en/user_installation.ssi:40
+#, no-wrap
+msgid " # apt-get install live-build\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:44
+msgid "or"
+msgstr "o"
+
+#. type: Plain text
+#: en/user_installation.ssi:48
+#, no-wrap
+msgid " # aptitude install live-build\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:52 en/user_installation.ssi:108
+msgid "3~ From source"
+msgstr "3~ Da sorgenti"
+
+#. type: Plain text
+#: en/user_installation.ssi:54
+msgid ""
+"live-build is developed using the Git version control system. On Debian "
+"systems, this is provided by the /{git}/ package. To check out the latest "
+"code, execute:"
+msgstr ""
+"live-build è sviluppato usando il sistema di controllo versione Git. Sui "
+"sistemi Debian è fornito dal pacchetto /{git}/. Per scaricare il codice "
+"aggiornato, eseguire:"
+
+#. type: Plain text
+#: en/user_installation.ssi:58
+#, no-wrap
+msgid " $ git clone git://live.debian.net/git/live-build.git\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:62
+msgid "You can build and install your own Debian package by executing:"
+msgstr ""
+"È possibile costruirsi ed installarsi il proprio pacchetto Debian eseguendo:"
+
+#. type: Plain text
+#: en/user_installation.ssi:68
+#, 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
+msgid ""
+"Now install whichever of the freshly built #{.deb}# files you were "
+"interested in, e.g."
+msgstr ""
+"Si installino ora i file #{.deb}# appena generati ai quali si è interessati, "
+"ad esempio:"
+
+#. type: Plain text
+#: en/user_installation.ssi:76
+#, no-wrap
+msgid " # dpkg -i live-build_2.0.8-1_all.deb\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:80
+msgid "You can also install live-build directly to your system by executing:"
+msgstr ""
+"Si può anche installare live-build direttamente sul proprio sistema "
+"eseguendo:"
+
+#. type: Plain text
+#: en/user_installation.ssi:84
+#, no-wrap
+msgid " # make install\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:88
+msgid "and uninstall it with:"
+msgstr "e disinstallarlo con:"
+
+#. type: Plain text
+#: en/user_installation.ssi:92
+#, no-wrap
+msgid " # make uninstall\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:96 en/user_installation.ssi:142
+msgid "3~ From 'snapshots'"
+msgstr "3~ Da 'istantanee'"
+
+#. type: Plain text
+#: en/user_installation.ssi:98
+msgid ""
+"If you do not wish to build or install live-build from source, you can use "
+"snapshots. These are built automatically from the latest version in Git and "
+"are available on http://live.debian.net/debian/."
+msgstr ""
+"Se non si desidera generare o installare live-build da sorgenti, è possibile "
+"usare le istantanee. Sono costruite automaticamente dall'ultima versione "
+"presente su Git e disponibili su http://live.debian.net/debian/."
+
+#. type: Plain text
+#: en/user_installation.ssi:100
+msgid "2~ live-boot and live-config"
+msgstr "2~ live-boot e live-config"
+
+#. type: Plain text
+#: en/user_installation.ssi:102
+#, no-wrap
+msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.\n"
+msgstr "*{Nota:}* non è necessario installare live-boot o live-config sul proprio sistema per creare sistemi Debian Live personalizzati. Tuttavia, farlo non nuoce.\n"
+
+#. type: Plain text
+#: en/user_installation.ssi:106
+msgid ""
+"Both live-boot and live-config are available from the Debian repository as "
+"per {Installing live-build}#installing-live-build."
+msgstr ""
+"Sia  live-boot che live-config sono disponibili dai repository Debian come "
+"per l' {installazione di live-build}#installing-live-build."
+
+#. type: Plain text
+#: en/user_installation.ssi:110
+msgid ""
+"To use the latest source from git, you can follow the process below. Please "
+"ensure you are familiar with the terms mentioned in {Terms}#terms."
+msgstr ""
+"Per utilizzare i sorgenti più recenti da Git si può seguire il procedimento "
+"seguente. Assicurarsi di conoscere i termini menzionati nel {Glossario}"
+"#terms."
+
+#. type: Plain text
+#: en/user_installation.ssi:112
+msgid "_* Checkout the live-boot and live-config source"
+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\n"
+" $ git clone git://live.debian.net/git/live-config.git\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:121
+msgid ""
+"Consult the live-boot and live-config man pages for details on customizing "
+"if that is your reason for building these packages from source."
+msgstr ""
+"Consultare la pagine man di live-boot e live-config per i dettagli sulla "
+"personalizzazione se questa è il motivo per compilare questi pacchetti dai "
+"sorgenti."
+
+#. type: Plain text
+#: en/user_installation.ssi:123
+msgid "_* Build live-boot and live-config .deb files"
+msgstr "_* Costruire un .deb di live-boot e live-config"
+
+#. type: Plain text
+#: en/user_installation.ssi:125
+msgid ""
+"You must build either on your target distribution or in a chroot containing "
+"your target platform: this means if your target is Squeeze then you should "
+"build against Squeeze."
+msgstr ""
+"Bisogna costruire o sulla propria distribuzione target, oppure in un chroot "
+"contenete la piattaforma target: significa che se il target è Squeeze allora "
+"bisogna costruire su Squeeze."
+
+#. type: Plain text
+#: en/user_installation.ssi:127
+msgid ""
+"Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
+"build #{live-boot}# for a target distribution that differs from your build "
+"system. For example, for Squeeze live images, build #{live-boot}# in a "
+"Squeeze chroot. If your target distribution happens to match your build "
+"system distribution, you may build directly on the build system using #{dpkg-"
+"buildpackage}# (provided by the /{dpkg-dev}/ package):"
+msgstr ""
+"Utilizzare un builder personale tipo /{pbuilder}/ o /{sbuild}/ se si deve "
+"costruire #{live-boot}# per una distribuzione target diversa dal proprio "
+"sistema di build. Ad esempio, per immagini live Squeeze, si generi #{live-"
+"boot}# in un chroot Squeeze. Se la distribuzione target corrisponde con la "
+"distribuzione del proprio sistema di build, si può costruire direttamente "
+"sul sistema di build usando #{dpkg-buildpackage}# (fornito dal pacchetto /"
+"{dpkg-dev}/):"
+
+#. type: Plain text
+#: en/user_installation.ssi:134
+#, no-wrap
+msgid ""
+" $ cd live-boot\n"
+" $ dpkg-buildpackage -b -uc -us\n"
+" $ cd ../live-config\n"
+" $ dpkg-buildpackage -b -uc -us\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:138
+msgid "_* Use all generated .deb files"
+msgstr "_* Usare il .deb di live-boot generato"
+
+#. type: Plain text
+#: en/user_installation.ssi:140
+msgid ""
+"As live-boot and live-config are installed by live-build system, installing "
+"the packages in the host system is not sufficient: you should treat the "
+"generated .deb files like any other custom packages. Please see {Customizing "
+"package installation}#customizing-package-installation for more information. "
+"You should pay particular attention to {Additional repositories}#additional-"
+"repositories."
+msgstr ""
+"Siccome live-boot e live-config sono installati dal sistema live-build, "
+"installare il pacchetto nel sistema host non è sufficiente: occorre trattare "
+"il .deb generato come un qualsiasi altro pacchetto su misura. Per maggiori "
+"informazioni si veda {Personalizzare l'installazione dei pacchetti}"
+"#customizing-package-installation. Si presti particolare attenzione a "
+"{Repository aggiuntivi}#additional-repositories."
+
+#. type: Plain text
+#: en/user_installation.ssi:144
+msgid ""
+"You can let live-build automatically use the latest snapshots of live-boot "
+"and live-config by configuring a third-party repository in your live-build "
+"configuration directory. Assuming you have already created a configuration "
+"tree with #{lb config}#:"
+msgstr ""
+"Si può lasciare che live-build usi automaticamente l'ultima istantanea di "
+"live-boot e live-config configurando un repository esterno nella directory "
+"di configurazione di live-build. Assumendo che si sia già creato un albero "
+"di configurazione con #{lb config}#:"
diff --git a/manual/po/it/user_managing_a_configuration.ssi.po b/manual/po/it/user_managing_a_configuration.ssi.po
new file mode 100644
index 0000000..22b36f2
--- /dev/null
+++ b/manual/po/it/user_managing_a_configuration.ssi.po
@@ -0,0 +1,339 @@
+# Italian translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+# lillo sciascia <lillosciascia at gmail.com>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual 2.0.0\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"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2: plural=(n !=1)\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:2
+msgid ":B~ Managing a configuration"
+msgstr ":B~ Gestire una configurazione"
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:4
+msgid "1~managing-a-configuration Managing a configuration"
+msgstr "1~managing-a-configuration Gestire una configurazione"
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:6
+msgid ""
+"This chapter explains how to manage a live configuration from initial "
+"creation, through successive revisions and successive releases of both the "
+"live-build software and the live image itself."
+msgstr ""
+"Questo capitolo spiega come gestire una configurazione per una live sin "
+"dalla creazione iniziale, attraverso le successive revisioni e rilasci sia "
+"del software live-build che della stessa immagine live."
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:8
+msgid "2~ Use auto to manage configuration changes"
+msgstr "2~ Utilizzare auto per gestire i cambiamenti di configurazione"
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:10
+msgid ""
+"Live configurations rarely are perfect on the first try. You'll likely need "
+"to make a series of revisions until you are satisfied. However, "
+"inconsistencies can creep into your configuration from one revision to the "
+"next if you aren't careful. The main problem is, once a variable is given a "
+"default value, that value will not be recomputed from other variables that "
+"may change in later revisions."
+msgstr ""
+"Le configurazioni live raramente sono perfette da riuscire al primo colpo. "
+"Servono una serie di revisioni prima di essere soddisfatti. Comunque, "
+"possono verificarsi delle incoerenze tra una revisione ed un'altra se non si "
+"presta attenzione. Il problema principale è, una volta che ad una variabile "
+"è assegnato un valore predefinito, tale valore non sarà ricalcolato da altre "
+"variabili che possono cambiare in altre revisioni. "
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:12
+msgid ""
+"For example, when the distribution is first set, many 'dependent' variables "
+"are given default values that suit that distribution. However, if you later "
+"decide to change the distribution, those dependent variables continue to "
+"retain old values that are no longer appropriate."
+msgstr ""
+"Per esempio, durante la messa a punto della prima distribuzione, molte "
+"variabili 'dependent' sono date dalle caratteristiche della distribuzione. "
+"Quindi, se in seguito si decide di cambiare distribuzione, quelle variabili "
+"dipendenti continueranno a mantenere i vecchi valori i quali non sono più "
+"appropriati "
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:14
+msgid ""
+"A second, related problem is that if you run #{lb config}# and then upgrade "
+"to a new version of live-build that has changed one of the variable names, "
+"you will discover this only by manual review of the variables in your #"
+"{config/*}# files, which you will then need to use to set the appropriate "
+"option again."
+msgstr ""
+"Un secondo relativo problema è che se si lancia #{lb config}# e si è "
+"aggiornato live-build ad una nuova versione il quale ha cambiato il nome di "
+"una o più variabili, si può scoprire ciò solamente con una revisione manuale "
+"delle variabili nei file #{config/*}#,  bisogna che vengano risistemate, di "
+"nuovo, le appropriate opzioni."
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:16
+msgid ""
+"All of this would be a terrible nuisance if it weren't for auto/* scripts, "
+"simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands "
+"that are designed to help you manage your configuration. Simply create an "
+"auto/config script containing #{lb config}# command with all desired "
+"options, and an auto/clean that removes the files containing configuration "
+"variable values, and each time you #{lb config}# and #{lb clean}#, these "
+"files will be executed. This will ensure that your configuration is kept "
+"internally consistent from one revision to the next and from one live-build "
+"release to the next (though you will still have to take care and read the "
+"documentation when you upgrade live-build and make adjustments as needed)."
+msgstr ""
+"Tutto ciò potrebbe essere un fastidio terribile se non fosse per lo script "
+"auto/*, una semplice alternativa ai comandi #{lb config}#, #{lb build}# e #"
+"{lb clean}# che sono disegnati per aiutare nella gestione della "
+"configurazione. Basta creare un semplice script auto/config che contenga il "
+"comando #{lb config}# con le opzioni desiderate, e un auot/clean che rimuova "
+"i file contenenti i valori variabili di configurazione, cosi ogni volta "
+"saranno eseguiti #{lb config}# #{lb clean}#. Questo farà si che la "
+"configurazione sia sempre coerente da una revisione all'altra o dal rilascio "
+"delle varie versioni del live-build."
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:18
+msgid "2~ Example auto scripts"
+msgstr "2~ Esempi di auto script"
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:20
+msgid ""
+"Use auto script examples such as the following as the starting point for "
+"your new live-build configuration. Take note that when you call the #{lb}# "
+"command that the auto script wraps, you must specify #{noauto}# as its "
+"parameter to ensure that the auto script isn't called again, recursively. "
+"Also, don't forget to ensure the scripts are executable (e.g. #{chmod 755 "
+"auto/*}#)."
+msgstr ""
+"Usare esempi di auto script come il seguente come punto di partenza per una "
+"nuova configurazione di live-build. Prendere nota che quando si chiama il "
+"comando #{lb}# che l'auto script wraps, si deve specificare il parametro #"
+"{noauto}# per essere sicuri che l'auto script chiamato di nuovo "
+"ricorsivamente. Non dimenticare, inoltre, di rendere lo script eseguibile "
+"(es. #{chmod 755 auto/*}#)."
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:22
+msgid "#{auto/config}#"
+msgstr "#{auto/config}#"
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:29
+#, no-wrap
+msgid ""
+" #!/bin/sh\n"
+" lb config noauto \\\n"
+"     --packages-lists \"standard\" \\\n"
+"     \"${@}\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:33
+msgid "#{auto/clean}#"
+msgstr "#{auto/clean}#"
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:41
+#, no-wrap
+msgid ""
+" #!/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
+#: en/user_managing_a_configuration.ssi:45
+msgid "#{auto/build}#"
+msgstr "#{auto/build}#"
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:50
+#, 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
+msgid ""
+"We now ship example auto scripts with live-build based on the examples "
+"above. You may copy those as your starting point."
+msgstr ""
+"Facciamo un esempio di auto script per live-build basato sull'esempio "
+"precedente. Si possono copiare come punto di partenza."
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:58
+#, no-wrap
+msgid " $ cp /usr/share/live/build/examples/auto/* auto/\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:62
+msgid ""
+"Edit #{auto/config}#, changing or adding any options as you see fit. In the "
+"example above, #{--packages-lists standard}# is set to the default value. "
+"Change this to an appropriate value for your image (or delete it if you want "
+"to use the default) and add any additional options in continuation lines "
+"that follow."
+msgstr ""
+"Modifica #{auto/config}# aggiungendo o togliendo le opzioni come meglio "
+"credi. Nel precedente esempio #{--packages-lists standard}# è impostato il "
+"valore predefinito.Cambiare questo in un valore appropriato per l'immagine "
+"( o cancellarlo se si desidera utilizzare un valore predefinito) e "
+"aggiungere eventuali opzioni aggiuntive in continuazione delle righe che "
+"seguono."
diff --git a/manual/po/it/user_overview.ssi.po b/manual/po/it/user_overview.ssi.po
new file mode 100644
index 0000000..21e8ffd
--- /dev/null
+++ b/manual/po/it/user_overview.ssi.po
@@ -0,0 +1,491 @@
+# Italian translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+# skizzhg <skizzhg at gmx.com>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual 2.0.0\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"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/user_overview.ssi:2
+msgid ":B~ Overview of tools"
+msgstr ":B~ Panoramica degli strumenti"
+
+#. type: Plain text
+#: en/user_overview.ssi:4
+msgid "1~ Overview of tools"
+msgstr "1~ Panoramica degli strumenti"
+
+#. type: Plain text
+#: en/user_overview.ssi:6
+msgid ""
+"This chapter contains an overview of the three main tools used in building "
+"Debian Live systems: live-build, live-boot and live-config."
+msgstr ""
+"Questo capitolo contiene una panoramica dei tre principali strumenti "
+"utilizzati nella creazione dei sistemi Debian Live: live-build, live-boot e "
+"live-config."
+
+#. type: Plain text
+#: en/user_overview.ssi:8
+msgid "2~live-build live-build"
+msgstr "2~live-build live-build"
+
+#. type: Plain text
+#: en/user_overview.ssi:10
+msgid ""
+"live-build is a collection of scripts to build Debian Live systems. These "
+"scripts are also referred to as \"commands\"."
+msgstr ""
+"live-build è una raccolta di script, chiamati anche \"comandi\", usati per "
+"creare sistemi Debian Live."
+
+#. type: Plain text
+#: en/user_overview.ssi:12
+msgid ""
+"The idea behind live-build is to be a framework that uses a configuration "
+"directory to completely automate and customize all aspects of building a "
+"Live image."
+msgstr ""
+"L'idea dietro live-build è di essere un'infrastruttura che utilizza una "
+"directory di configurazione per automatizzare totalmente e personalizzare "
+"tutti gli aspetti della creazione di un'immagine live."
+
+#. type: Plain text
+#: en/user_overview.ssi:14
+msgid ""
+"Many concepts are similar to those in the debhelper Debian package tools "
+"written by Joey Hess:"
+msgstr ""
+"Molti concetti sono simili a quelli negli strumenti del pacchetto Debian "
+"debhelper scritto da Joey Hess:"
+
+#. type: Plain text
+#: en/user_overview.ssi:16
+msgid ""
+"_* The scripts have a central location for configuring their operation. In "
+"debhelper, this is the #{debian/}# subdirectory of a package tree. For "
+"example, dh_install will look, amongst others, for a file called #{debian/"
+"install}# to determine which files should exist in a particular binary "
+"package. In much the same way, live-build stores its configuration entirely "
+"under a #{config/}# subdirectory."
+msgstr ""
+"_* Gli script hanno una locazione centrale per configurare le loro "
+"operazioni, in debhelper questa è la sottodirectory #{debian/}# dell'albero "
+"di un pacchetto. Ad esempio dh_install cercherà, tra gli altri, un file "
+"chiamato #{debian/install}# per determinare quali file dovrebbero esistere "
+"in un certo pacchetto binario. Allo stesso modo, live-build salva la sua "
+"configurazione interamente in una sottodirectory #{config/}#."
+
+#. type: Plain text
+#: en/user_overview.ssi:18
+msgid ""
+"_* The scripts are independent - that is to say, it is always safe to run "
+"each command."
+msgstr ""
+"_* Gli script sono indipendenti, vale a dire che è sempre sicuro eseguire "
+"ogni comando."
+
+#. type: Plain text
+#: en/user_overview.ssi:20
+msgid ""
+"Unlike debhelper, live-build contains a tool to generate a skeleton "
+"configuration directory, #{lb config}#. This could be considered to be "
+"similar to tools such as #{dh-make}#. For more information about #{lb config}"
+"#, please see {The lb config command}#lb-config."
+msgstr ""
+"Al contrario di debhelper, live-build contiene uno strumento per generare "
+"una directory scheletro di configurazione, #{lb config}#, che può essere "
+"considerato simile a utilità come #{dh-make}#. Per maggiori informazioni su #"
+"{lb config}# si veda {Il comando lb config}#lb-config."
+
+#. type: Plain text
+#: en/user_overview.ssi:22
+msgid ""
+"The remainder of this section discusses the three most important commands:"
+msgstr "Il resto di questa sezione tratta i tre comandi più importanti:"
+
+#. type: Plain text
+#: en/user_overview.ssi:24
+msgid ""
+"_* *{lb config}*: Responsible for initializing a Live system configuration "
+"directory. See {The lb config command}#lb-config for more information."
+msgstr ""
+"_* *{lb config}*: responsabile dell'inizializzazione di una directory di "
+"configurazione del sistema live. Si veda {Il comando lb config}#lb-config "
+"per maggiori informazioni."
+
+#. type: Plain text
+#: en/user_overview.ssi:26
+msgid ""
+"_* *{lb build}*: Responsible for starting a Live system build. See {The lb "
+"build command}#lb-build for more information."
+msgstr ""
+"_* *{lb build}*: responsabile di iniziare la creazione di un sistema live. "
+"Si veda {Il comando lb}#lb-build per maggiori informazioni."
+
+#. type: Plain text
+#: en/user_overview.ssi:28
+msgid ""
+"_* *{lb clean}*: Responsible for removing parts of a Live system build. See "
+"{The lb clean command}#lb-clean for more information."
+msgstr ""
+"_* *{lb clean}*: responsabile della rimozione di parti della creazione di un "
+"sistema live. Si veda {Il comando lb clean}#lb-clean per maggiori "
+"informazioni."
+
+#. type: Plain text
+#: en/user_overview.ssi:30
+msgid "3~lb-config The #{lb config}# command"
+msgstr "3~lb-config Il comando #{lb config}#"
+
+#. type: Plain text
+#: en/user_overview.ssi:32
+msgid ""
+"As discussed in {live-build}#live-build, the scripts that make up live-build "
+"source their configuration from a single directory named #{config/}#. As "
+"constructing this directory by hand would be time-consuming and error-prone, "
+"the #{lb config}# command can be used to create skeleton configuration "
+"folders."
+msgstr ""
+"Come discusso in {live-build}#live-build, gli script che compongono live-"
+"build attingono la loro configurazione da una singola directory chiamata #"
+"{config/}#. Dal momento che crearla a mano sarebbe dispendioso in termini di "
+"tempo e soggetto a errori, si può usare il comando #{lb config}# per creare "
+"la directory scheletro di configurazione."
+
+#. type: Plain text
+#: en/user_overview.ssi:34
+msgid ""
+"Issuing #{lb config}# without any arguments creates a #{config/}# "
+"subdirectory which it populates with some default settings:"
+msgstr ""
+"L'esecuzione di #{lb config}# senza argomenti crea una sottodirectory di #"
+"{config/}# popolata con alcune impostazioni predefinite:"
+
+#. type: Plain text
+#: en/user_overview.ssi:39
+#, 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\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/\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
+#: en/user_overview.ssi:76
+msgid ""
+"Using #{lb config}# without any arguments would be suitable for users who "
+"need a very basic image, or who intend to later provide a more complete "
+"configuration via auto/config (see {Managing a configuration}#managing-a-"
+"configuration for details)."
+msgstr ""
+"L'uso di #{lb config}# senza argomenti è adatto ad utenti che necessitano di "
+"un'immagine di base o che intendono fornire in seguito una configurazione "
+"più completa tramite auto/config (per i dettagli vedere {Gestire una "
+"configurazione}#managing-a-configuration)."
+
+#. type: Plain text
+#: en/user_overview.ssi:78
+msgid ""
+"Normally, you will want to specify some options. For example, to include the "
+"'gnome' package list in your configuration:"
+msgstr ""
+"Normalmente si vorranno specificare delle opzioni, ad esempio per includere "
+"nella propria configurazione l'elenco del pacchetto \"gnome\":"
+
+#. type: Plain text
+#: en/user_overview.ssi:82
+#, no-wrap
+msgid " $ lb config -p gnome\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_overview.ssi:86
+msgid "It is possible to specify many options, such as:"
+msgstr "È possibile specificare molte opzioni, come:"
+
+#. type: Plain text
+#: en/user_overview.ssi:90
+#, no-wrap
+msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_overview.ssi:94
+msgid "A full list of options is available in the #{lb_config}# man page."
+msgstr ""
+"Una lista completa delle opzioni e' disponibile nel manuale di #{lb_config}#."
+
+#. type: Plain text
+#: en/user_overview.ssi:96
+msgid "3~lb-build The #{lb build}# command"
+msgstr "3~lb-build Il comando #{lb build}#"
+
+#. type: Plain text
+#: en/user_overview.ssi:98
+msgid ""
+"The #{lb build}# command reads in your configuration from the config/ "
+"directory. It then runs the lower lower level commands needed to build your "
+"Live system."
+msgstr ""
+"Il comando #{lb build}# legge la configurazione dalla directory #{config/}# "
+"ed esegue ad un livello inferiore i comandi necessari a costruire il sistema "
+"live."
+
+#. type: Plain text
+#: en/user_overview.ssi:100
+msgid "3~lb-clean The #{lb clean}# command"
+msgstr "3~lb-clean Il comando #{lb clean}#"
+
+#. type: Plain text
+#: en/user_overview.ssi:102
+msgid ""
+"It is the job of the #{lb clean}# command to remove various parts of a build "
+"so subsequent builds can start from a clean state."
+msgstr ""
+"Il compito del comando #{lb clean}# è di rimuovere diverse parti di una "
+"compilazione affinché quelle successive possano iniziare in un ambiente "
+"pulito."
+
+#. type: Plain text
+#: en/user_overview.ssi:104
+msgid "2~live-boot The live-boot package"
+msgstr "2~live-boot Il pacchetto live-boot"
+
+#. type: Plain text
+#: en/user_overview.ssi:106
+msgid ""
+"live-boot is a collection of scripts providing hooks for the initramfs-"
+"tools, used to generate an initramfs capable of booting live systems, such "
+"as those created by live-build. This includes the Debian Live ISOs, netboot "
+"tarballs, and USB stick images."
+msgstr ""
+"live-boot è una raccolta di script che forniscono hook per initramfs-tools, "
+"utilizzato per generare un initramfs in grado di avviare sistemi live, come "
+"quelli creati da live-build. Questo include le ISO di Debian Live, archivi "
+"per l'avvio da rete e immagini per penne USB."
+
+#. type: Plain text
+#: en/user_overview.ssi:108
+msgid ""
+"At boot time it will look for read-only media containing a \"/live\" "
+"directory where a root filesystem (often a compressed filesystem image like "
+"squashfs) is stored. If found, it will create a writable environment, using "
+"aufs, for Debian like systems to boot from."
+msgstr ""
+"All'avvio cercherà supporti in sola lettura che contengano una directory \"/"
+"live\" dove sia presente un filesystem root (spesso un'immagine compressa "
+"come squashfs). Se trovata, creerà un ambiente scrivibile usando aufs, per "
+"avviarsi da sistemi simili a Debian."
+
+#. type: Plain text
+#: en/user_overview.ssi:110
+msgid ""
+"More information on initial ramfs in Debian can be found in the Debian Linux "
+"Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
+"on initramfs."
+msgstr ""
+"Si possono trovare maggiori informazioni sui ramfs iniziali nel capitolo su "
+"initramfs del Debian Linux Kernel Handbook all'indirizzo http://kernel-"
+"handbook.alioth.debian.org/."
+
+#. type: Plain text
+#: en/user_overview.ssi:112
+msgid "2~live-config The live-config package"
+msgstr "2~live-config Il pacchetto live-config"
+
+#. type: Plain text
+#: en/user_overview.ssi:114
+msgid ""
+"live-config consists of the scripts that run at boot time after live-boot to "
+"configure the live system automatically. It handles such tasks as setting "
+"the hostname, locales and timezone, creating the live user, inhibiting cron "
+"jobs and performing autologin of the live user."
+msgstr ""
+"live-config è costituito da script eseguiti all'avvio dopo live-boot per "
+"configurare automaticamente il sistema live. Gestisce attività quali "
+"impostare l'hostname, localizzazione e fuso orario, creare l'utente live, "
+"inibire compiti automatizzati tramite cron ed eseguire il login automatico "
+"dell'utente live."
diff --git a/manual/po/pt_BR/about_manual.ssi.po b/manual/po/pt_BR/about_manual.ssi.po
index 4d0d3eb..1dd99b2 100644
--- a/manual/po/pt_BR/about_manual.ssi.po
+++ b/manual/po/pt_BR/about_manual.ssi.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a8\n"
-"POT-Creation-Date: 2010-12-05 11:16+0100\n"
+"Project-Id-Version: live-manual 2.0.0\n"
+"POT-Creation-Date: 2010-12-20 05:58-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"
@@ -70,7 +70,7 @@ msgid ""
 "#examples section designed to teach you image building and customization "
 "basics. Read {Using the examples}#using-the-examples first, followed by "
 "{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
-"utility}#tutorial-2 and finally {Tutorial 3: A personal travelling companion}"
+"utility}#tutorial-2 and finally {Tutorial 3: A personalized image}"
 "#tutorial-3. By the end of these tutorials, you will have a taste of what "
 "can be done with Debian Live. We encourage you to return to more in-depth "
 "study of the manual, perhaps next reading {The basics}#the-basics, skimming "
@@ -330,8 +330,8 @@ msgstr "2~ Contribuindo com esse documento"
 msgid ""
 "This manual is intended as a community project and all proposals for "
 "improvements and contributions are extremely welcome. The preferred way to "
-"submit a contribution is to send it to the mailing list. Please see {Contact}"
-"#contact for more information."
+"submit a contribution is to send it to the mailing list. Please see the "
+"section {Contact}#contact for more information."
 msgstr ""
 
 #. type: Plain text
@@ -351,7 +351,7 @@ msgstr ""
 #: en/about_manual.ssi:82
 msgid ""
 "The sources for this manual are maintained using the Git version control "
-"system. You can checkout the latest copy by executing:"
+"system. You can check out the latest copy by executing:"
 msgstr ""
 "Os fontes para esse manail são mantidos usando o sistema de controle de "
 "versão Git. Você pode fazer o checkout da ultima cópia executando:"
@@ -360,32 +360,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/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
+#: 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
@@ -398,38 +390,29 @@ msgstr ""
 #: en/user_customization-packages.ssi:185
 #: en/user_customization-packages.ssi:199
 #: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
 #: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:321
-#: en/user_customization-runtime.new.ssi:14
-#: en/user_customization-runtime.new.ssi:34
-#: en/user_customization-runtime.new.ssi:42
-#: en/user_customization-runtime.new.ssi:50
-#: en/user_customization-runtime.new.ssi:64
-#: en/user_customization-runtime.new.ssi:76
-#: en/user_customization-runtime.new.ssi:86
-#: en/user_customization-runtime.new.ssi:94
-#: en/user_customization-runtime.new.ssi:102
-#: en/user_customization-runtime.new.ssi:110
-#: en/user_customization-runtime.new.ssi:130
-#: en/user_customization-runtime.new.ssi:138
-#: en/user_customization-runtime.new.ssi:147
-#: en/user_customization-runtime.ssi:12 en/user_customization-runtime.ssi:30
-#: en/user_customization-runtime.ssi:40 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:56 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:92
-#: en/user_customization-runtime.ssi:101 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:141 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -446,32 +429,24 @@ 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
+#: 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
@@ -484,38 +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:285
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
 #: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:334
-#: en/user_customization-runtime.new.ssi:18
-#: en/user_customization-runtime.new.ssi:38
-#: en/user_customization-runtime.new.ssi:46
-#: en/user_customization-runtime.new.ssi:54
-#: en/user_customization-runtime.new.ssi:68
-#: en/user_customization-runtime.new.ssi:80
-#: en/user_customization-runtime.new.ssi:90
-#: en/user_customization-runtime.new.ssi:98
-#: en/user_customization-runtime.new.ssi:106
-#: en/user_customization-runtime.new.ssi:114
-#: en/user_customization-runtime.new.ssi:134
-#: en/user_customization-runtime.new.ssi:143
-#: en/user_customization-runtime.new.ssi:152
-#: en/user_customization-runtime.ssi:16 en/user_customization-runtime.ssi:34
-#: en/user_customization-runtime.ssi:44 en/user_customization-runtime.ssi:52
-#: en/user_customization-runtime.ssi:60 en/user_customization-runtime.ssi:68
-#: en/user_customization-runtime.ssi:88 en/user_customization-runtime.ssi:97
-#: en/user_customization-runtime.ssi:106 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:31
+#: 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: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
@@ -536,22 +502,24 @@ 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 libnokogiri-ruby\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:98
 msgid ""
-"You may build the live-manual from the top level directory of your git "
+"You may build the live-manual from the top level directory of your Git "
 "checkout by executing:"
 msgstr ""
 "Você também pode construir o live-manual a partir do primeiro nível do "
-"diretório do seu git checkout executando:"
+"diretório do seu Git checkout executando:"
 
 #. 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
@@ -563,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
@@ -574,9 +543,9 @@ msgstr "3~ Aplicando patches"
 #. type: Plain text
 #: en/about_manual.ssi:116
 msgid ""
-"Directly commiting to the repository is possible by anyone. However, we ask "
-"you to send bigger changes to the mailing list to discuss them first. In "
-"order to push to the repository, the following steps are required."
+"Anyone can directly commit to the repository. However, we ask you to send "
+"bigger changes to the mailing list to discuss them first. To push to the "
+"repository, you must follow this procedure:"
 msgstr ""
 "Diretamente cometer ao repoitório é possivel por qualquer um. No entanto, "
 "nós pedimo que você mande maiores mudanças para a lista de e-mail para "
@@ -592,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/live.debian.net\n"
-"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-"\t-O ~/.ssh/identity.d/live.debian.net.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/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
@@ -615,36 +578,31 @@ 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
-msgid "_* Checkout a clone of the manual through ssh:"
+msgid "_* Check out a clone of the manual through ssh:"
 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
 msgid ""
-"_* After editing the files in manual/en/, please call the 'commit' target in "
-"the top level directory to sanitize the files and update the translation "
-"files:"
+"_* After editing the files in #{manual/en/}#, please call the 'commit' "
+"target in the top level directory to sanitize the files and update the "
+"translation files:"
 msgstr ""
 "_* Depois de editar os arquivos no manual/en/, por favor chame o alvo "
 "'commit' no nível superior do diretório para higiênizar os arquivos e "
@@ -652,26 +610,28 @@ 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
 msgid ""
-"_* After sanitizing commit the changes. Write commit messages, that consist "
-"of full useful sentences, starting with a capital letter and ending with a "
-"full stop. Usually starting with the form 'Fixing/Adding/Removing/"
-"Correcting/':"
+"_* After sanitizing, commit the changes. Write commit messages that consist "
+"of full, useful sentences in English, starting with a capital letter and "
+"ending with a full stop. Usually, these will start with the form 'Fixing/"
+"Adding/Removing/Correcting/Translating', e.g."
 msgstr ""
 "_* Depois de higiênizar submeta as mudançãs. Escreva mensagens de submissão, "
 "que consistem em sentanças completas úteis, começando por letra maiuscula e "
 "acabando com uma parada total. Normalmente iniciando com as formas 'Fixing/"
-"Adding/Removing/Correcting/':"
+"Adding/Removing/Correcting/Translating'."
 
 #. type: Plain text
 #: en/about_manual.ssi:164
-msgid "$ git commit -a"
-msgstr "$ git commit -a"
+#, no-wrap
+msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:168
@@ -680,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
@@ -690,21 +651,29 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:178
-msgid "Submiting a translation for a new language is recommendet in two steps:"
+msgid "To submit a translation for a new language, follow these three steps:"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:180
 msgid ""
-"_* Translate the about_manual.ssi.pot about_project.ssi.pot index.html.in."
-"pot files to your language with your favourite editor (such as poedit). Send "
-"translated files to the mailinglist. It will then be included and autobuild "
-"for that language enabled."
+"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
+"in.pot files to your language with your favourite editor (such as poedit). "
+"Send translated files to the mailing list. Once we have reviewed your "
+"submission, we will add the new language to the manual (providing the po "
+"files) and will enable it in the autobuild."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:182
+msgid ""
+"_* Once the new language is added, you can randomly start translating all po "
+"files in #{manual/po/}#."
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:181
+#: en/about_manual.ssi:184
 msgid ""
-"_* Now that the new language was added, you can randomly start translating "
-"all other pot files."
+"_* Don't forget you need #{make commit}# to ensure the translated manuals "
+"are updated from the po files, before #{git commit -a}# and #{git push}#."
 msgstr ""
diff --git a/manual/po/pt_BR/about_project.ssi.po b/manual/po/pt_BR/about_project.ssi.po
index ac7fa14..1934873 100644
--- a/manual/po/pt_BR/about_project.ssi.po
+++ b/manual/po/pt_BR/about_project.ssi.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
+"Project-Id-Version: live-manual 2.0.0\n"
 "POT-Creation-Date: 2010-11-27 10:30-0400\n"
 "PO-Revision-Date: 2010-10-22 07:52-0200\n"
 "Last-Translator: Automatically generated\n"
diff --git a/manual/po/pt_BR/index.html.in.po b/manual/po/pt_BR/index.html.in.po
index 3217e51..b0edefe 100644
--- a/manual/po/pt_BR/index.html.in.po
+++ b/manual/po/pt_BR/index.html.in.po
@@ -1,19 +1,20 @@
 # Brazilian Portuguese translations for live-manual package
 # 2010 Bruno Gurgel <bruno.gurgel at gmail.com>
 # This file is distributed under the same license as the live-config package.
+# Carlo Stemberger <carlo.stemberger at gmail.com>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a8\n"
-"POT-Creation-Date: 2010-10-20 20:02+0300\n"
-"PO-Revision-Date: 2010-10-22 18:11-0300\n"
-"Last-Translator: Bruno Gurgel <bruno.gurgel at gmail.com>\n"
-"Language-Team: none\n"
+"Project-Id-Version: live-manual 2.0.0\n"
+"POT-Creation-Date: 2010-12-08 15:58+0100\n"
+"PO-Revision-Date: 2010-12-08 16:21+0100\n"
+"Last-Translator: Carlo Stemberger <carlo.stemberger at gmail.com>\n"
+"Language-Team: Italian <tp at lists.linux.it>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Content of: <html><head><title>
 #: en/index.html.in:4
@@ -21,17 +22,17 @@ msgid "Debian Live Project"
 msgstr "Projeto Debian Live"
 
 #. type: Content of: <html><body><h2>
-#: en/index.html.in:8
+#: en/index.html.in:9
 msgid "Debian Live Manual"
 msgstr "Manual do Debian Live"
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:11
+#: en/index.html.in:12
 msgid "<i>This manual is under heavy construction.</i>"
 msgstr "<i>Esse manual está sobre constante contrução.</i>"
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:15
+#: en/index.html.in:16
 msgid ""
 "Please report errors, omissions, patches and suggestions to our mailinglist "
 "at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
@@ -44,17 +45,17 @@ msgstr ""
 "contribuir</a> com o manual."
 
 #. type: Content of: <html><body><h3>
-#: en/index.html.in:18
+#: en/index.html.in:19
 msgid "Available Formats"
 msgstr "Formatos Disponíveis"
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:21
+#: en/index.html.in:22
 msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
 msgstr "<a href=\"epub/live-manual.epub\">EPUB</a>"
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:22
+#: en/index.html.in:23
 msgid ""
 "HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
 "html\">single page</a>"
@@ -63,12 +64,12 @@ msgstr ""
 "manual.html\">Página única</a>"
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:23
+#: en/index.html.in:24
 msgid "<a href=\"odf/live-manual.odt\">ODF</a>"
 msgstr "<a href=\"odf/live-manual.odt\">ODF</a>"
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:24
+#: en/index.html.in:25
 msgid ""
 "PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
 "\"pdf/live-manual.landscape-a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
@@ -81,36 +82,36 @@ msgstr ""
 "landscape-letter.pdf\">US paisagem</a>"
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:25
+#: en/index.html.in:26
 msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
 msgstr "<a href=\"txt/live-manual.txt\">Texto plano</a>"
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:29
+#: en/index.html.in:30
 msgid "Last changed: @DATE_CHANGE@"
 msgstr "Última modificação: @DATE_CHANGE@"
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:30
+#: en/index.html.in:31
 msgid "Last built: @DATE_BUILD@"
 msgstr "Última contrução: @DATE_BUILD@"
 
 #. type: Content of: <html><body><h3>
-#: en/index.html.in:33
+#: en/index.html.in:34
 msgid "Source"
 msgstr "Fonte"
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:36
+#: en/index.html.in:37
 msgid ""
 "The sources for this manual is available in a <a href=\"http://git.or.cz/"
-"\">git</a> repository at live.debian.net."
+"\">Git</a> repository at live.debian.net."
 msgstr ""
 "O fonte desse manual está diponível em um repositório <a href=\"http://git."
-"or.cz/\">git</a> em live.debian.net."
+"or.cz/\">Git</a> em live.debian.net."
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:40
+#: en/index.html.in:41
 msgid ""
 "Browse: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
 "\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
@@ -121,7 +122,7 @@ msgstr ""
 "a>"
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:41
+#: en/index.html.in:42
 msgid ""
 "Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
 "live.debian.net/git/live-manual.git</tt></small></a>"
@@ -130,7 +131,7 @@ msgstr ""
 "live.debian.net/git/live-manual.git</tt></small></a>"
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:45
+#: en/index.html.in:46
 msgid ""
 "<a href=\"http://live.debian.net/\">Debian Live</a> &lt;<a href=\"mailto:"
 "debian-live at lists.debian.org\">debian-live at lists.debian.org</a>&gt; - <a "
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index a602b63..23be868 100644
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-06 12:26+0100\n"
+"Project-Id-Version: live-manual 2.0.0\n"
+"POT-Creation-Date: 2010-12-24 03:54+0100\n"
 "PO-Revision-Date: 2010-10-22 07:52-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2010-12-06\n"
+" :published: 2010-12-24\n"
 msgstr ""
 
 #. type: Plain text
@@ -86,7 +86,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:31
-msgid ":B~ User ~#"
+msgid ":B~ User"
 msgstr ""
 
 #. type: Plain text
@@ -126,80 +126,45 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:47
-msgid "<< user_customization-internationalization.ssi"
+msgid "<< user_customization-runtime.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:49
-msgid "<< user_customization-runtime.ssi"
+msgid "<< user_customization-binary.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:51
-msgid "<< user_customization-binary.ssi"
+msgid "<< user_customization-installer.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:53
-msgid "<< user_customization-installer.ssi"
+msgid ":B~ Project"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:55
-msgid ":B~ Development ~#"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:57
-msgid ":B~ Project ~#"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:59
 msgid "<< project_bugs.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:61
+#: en/live-manual.ssm:57
 msgid "<< project_coding-style.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:63
+#: en/live-manual.ssm:59
 msgid "<< project_procedures.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:65
-msgid ":B~ Examples ~#"
+#: en/live-manual.ssm:61 en/user_examples.ssi:2
+msgid ":B~ Examples"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:67
+#: en/live-manual.ssm:63
 msgid "<< user_examples.ssi"
 msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:69
-msgid ":B~ Other ~#"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:75
-msgid ""
-"Other material that formerly appeared in this section is out of date and/or "
-"has not been approved for release. It has therefore been omitted, but can "
-"still be found in the document source; see 'About this manual'. Any part of "
-"the omitted material that is still useful will be included in the release "
-"only after it has been reviewed."
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:77
-msgid "% << other_faq.ssi"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:78
-msgid "% << other_howtos.ssi"
-msgstr ""
diff --git a/manual/po/pt_BR/other_faq.ssi.po b/manual/po/pt_BR/other_faq.ssi.po
deleted file mode 100644
index a6fc8ce..0000000
--- a/manual/po/pt_BR/other_faq.ssi.po
+++ /dev/null
@@ -1,1008 +0,0 @@
-# Portuguese translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-10-16 14:45-0200\n"
-"PO-Revision-Date: 2010-10-16 14:45-0200\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. type: Plain text
-#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
-#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: 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/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
-#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
-#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
-#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
-#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:106
-#: en/user_installation.ssi:120 en/user_installation.ssi:137
-#: en/user_managing_a_configuration.ssi:24
-#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:60
-#: en/user_overview.ssi:104 en/user_overview.ssi:112
-msgid "code{"
-msgstr "code{"
-
-#. type: Plain text
-#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
-#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
-#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
-#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
-#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
-#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
-#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
-#: en/user_basics.ssi:257 en/user_basics.ssi:285 en/user_basics.ssi:293
-#: en/user_basics.ssi:320 en/user_basics.ssi:359
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
-#: en/user_customization-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:110
-#: en/user_installation.ssi:125 en/user_installation.ssi:140
-#: en/user_managing_a_configuration.ssi:31
-#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
-msgid "}code"
-msgstr "}code"
-
-#. type: Plain text
-#: en/other_faq.ssi:2
-msgid "B~ Frequently asked questions (FAQ)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:4
-msgid "1~ Frequently asked questions (FAQ)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:8
-msgid ""
-"Q: I downloaded a prebuilt live image. How do I put it on a USB stick? A: "
-"See \"Copying USB/HDD image to a USB stick\" % FIXME: <xref linkend="
-"\"image_copying\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:11
-msgid ""
-"Q: How do I log my build? A: You could use script, screen or tee: #{$ "
-"lh_build 2>&1 | tee build.log}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:14
-msgid ""
-"Q: How can I convert an already installed standard Debian partition into a "
-"Debian Live system? A: Save the list of installed packages and load it into "
-"your new Debian Live System. Copy your /etc to config/chroot_local-includes"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:17
-msgid ""
-"Q: What does 'losetup: could not find any free loop device' mean and how do "
-"I fix it? A: Loop devices are used during the build; there probably aren't "
-"any free if you've aborted several builds. Something like: for l in /dev/"
-"loop0 /dev/loop1 /dev/loop2 /dev/loop3 /dev/loop4 /dev/loop5 /dev/loop6 /dev/"
-"loop7 ; do losetup -d $l ; done should rectify the situation (assuming all "
-"loop devices in use were created by lh_build; if in doubt, check the "
-"contents of each loop device before deleting them with losetup -d)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:20
-msgid ""
-"Q: How do I launch an interactive shell during the chroot stage? A: To "
-"enable interactive shell: #{$ lh_config --interactive shell}# To continue "
-"the build process: #{# logout}# or #{# exit}# To disable interactive shell, "
-"set LH_INTERACTIVE to \"disabled\" in config/chroot."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:23
-msgid ""
-"Q: What is the root /user password? A: The user password for the live user "
-"is 'live'. By default, there is not any root password. You can switch to "
-"root with ${sudo -i}# or set a password for root with #{sudo passwd}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:27
-msgid ""
-"Q: How do I change root or any user password? A: Add a chroot local hook "
-"script to change root or any user password each time you build an image.  e."
-"g. config/chroot_local-hooks/01-update_password.sh to set root password to "
-"\"nopasswd\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:30 en/other_faq.ssi:53
-msgid "code{ #!/bin/sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:33
-msgid "echo \"I: update password\" echo \"root:nopasswd\" | chpasswd"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:35
-msgid "$ chmod +x config/chroot_local-hooks/01-update_password.sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:39
-msgid ""
-"Note for live user; you need to copy the /usr/share/initramfs-tools/scripts/"
-"live-bottom/10adduser your build folder:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:44
-msgid ""
-"mkdir -p config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-"
-"bottom/ cp /usr/share/initramfs-tools/scripts/live-bottom/10adduser config/"
-"chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:48
-msgid ""
-"Note: Then edit the config/chroot_local-includes/usr/share/initramfs-tools/"
-"scripts/live-bottom/10adduser and paste in the new user_crypted password "
-"that you make with: #{echo \"newlivepass\" | mkpasswd -s}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:50
-msgid ""
-"Or add an hook file in config/chroot_local-hooks/ with something like the "
-"below:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:57
-msgid ""
-"# Change the autogenerated user password to \"debianlive\" plain_password="
-"\"debianlive\" password=$(echo \"${plain_password}\" | mkpasswd -s)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:59
-msgid ""
-"sed -i -e 's/\\(user_crypted=\\)\\(.*\\)\\( #.*\\)/\\1\\\"'${password}'\\"
-"\"\\3/' /usr/share/initramfs-tools/scripts/live-bottom/10adduser"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:62
-msgid "update-initramfs -tu -kall }code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:64
-msgid ""
-"The latter (hook model) could be more future proof than the former solution "
-"since it modifies just one string selectively but it requires the package "
-"\"whois\" to be installed on the target system (for mkpasswd) or that you "
-"generate the $password string not at build time and include it crypted in "
-"the above script."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:68
-msgid ""
-"Q: How to disable autologin? A1: use the commandline parameter #{lh config --"
-"bootappend-live \"noautologin\"}# A2: You need to set boot=noautologin "
-"noxautologin as described in man live-initramfs If you boot via TFTP you "
-"want to insert the option to pxelinux.cfg/default"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:71
-msgid ""
-"Q: How do I change default hostname or username? A: To change default "
-"hostname or username: #{$ lh_config --hostname myhostname $ lh_config --"
-"username myusername}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:74
-msgid ""
-"Q: How do I make the final image smaller? A: Clean orphaned apps/libs: "
-"Install package \"deborphan\" and then run 'sudo deborphan -n' . Delete "
-"unwanted packages. Remove the apt cache. Purge unwanted locales (see "
-"\"localepurge\" package)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:77
-msgid ""
-"Q: How do I customize bash-config permanently (aliases, bash-completion "
-"etc.)? A: Add your own .bashrc config/chroot_local-includes/etc/skel/.bashrc"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:81
-msgid ""
-"Q: How do I disable services permanently? (Be careful!)  A: Add a chroot "
-"local hook script to disable a service each time you build an image: e.g. "
-"config/chroot_local-hooks/01-disable_service.sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/other_use-cases.ssi:26
-#: en/other_use-cases.ssi:77
-msgid "#!/bin/sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:88
-msgid "echo \"I: disable service\" update-rc.d -f service_name remove"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:90
-msgid "$ chmod +x config/chroot_local-hooks/01-disable_service.sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:95
-msgid ""
-"Q: How do I enable | disable the md5checksum at the ISO building? A: #"
-"{lh_config --checksums enabled|disabled}# Or change the LH_CHECKSUMS value."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:98
-msgid ""
-"Q: How to disable the generation of the .tar.gz file? A: #{lh_config --net-"
-"tarball none|gzip}# Or change the LH_NET_TARBALL value. (only available in "
-"snapsshot version at the moment 2008/Feb/28)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:101
-msgid "Q: How do I \"build a new image\"? A: Run commands:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:106
-msgid "$ sudo lh_clean --binary $ sudo lh_build"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:110
-msgid ""
-"Hint: If the configuration had changed you should leave \"--binary\" out. "
-"This will clean your chroot directory too."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:113
-msgid ""
-"Q: How do I use Fluxbox ? A: Add a new lists file with the fluxbox packages "
-"you want."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:115
-msgid "Create /home/$USERNAME/.dmrc file (default username is \"user\")."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:122
-msgid "$ cat .dmrc [Desktop] Session=fluxbox }code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:124
-msgid "Note: .dmrc is owned by $USERNAME:$USERNAME."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:126
-msgid ""
-"See also http://wiki.debian.org/Fluxbox/ A short HOWTO can be found at "
-"http://wiki.debian.org/MichaelAblassmeier/CustomLiveCD"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:129
-msgid ""
-"Q: How do I use custom repositories? A: See http://wiki.debian.org/"
-"DebianLive/Configuration"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:132
-msgid ""
-"Q: How do I customize the artwork for the live CD (grub or syslinux boot "
-"splash, usplash, etc.)? A: See http://wiki.debian.org/DebianLive/Howto/"
-"Custom_Artwork"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:135
-msgid ""
-"Q: How do I customize desktop environment (KDE, GNOME, XFCE, etc...) look? "
-"A: Start the live system in qemu:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:139
-msgid "$ qemu -m 256 -cdrom binary.iso -boot d -redir tcp:4222:10.0.2.15:22"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:143
-msgid "Note: the -redir argument must be changed to meet your needs"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:146
-msgid ""
-"Q: How do I execute a custom shell script inside the chroot system after the "
-"chroot stage? A: Add your script in config/chroot_local-hooks."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:149
-msgid ""
-"Q: How do I add a script running immediately after all other scripts when "
-"the live system boots? A: Add your script in config/chroot_local-includes/"
-"usr/share/initramfs-tools/scripts/live-bottom/99scrip"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:153
-msgid ""
-"$ chmod +x config/chroot_local-includes/usr/share/initramfs-tools/scripts/"
-"live-bottom/99script"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:157
-msgid ""
-"Note: The hook script must be executable. Do not forget to lh_clean --chroot "
-"after making this change before you build again."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:159
-msgid ""
-"You must also use the example script /usr/share/live-helper/examples/hooks/"
-"update-initramfs.sh to ensure your script gets built into the initramfs "
-"(read the comment header for instructions)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:163
-msgid ""
-"Q: How do I add software not in Debian ? A: See Customizing package "
-"installation % FIXME: <xref linkend=\"packages\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:166
-msgid ""
-"Q: What is the manifest with Ubuntu used for? A: Manifest is just the "
-"package list, which ubuntu does $something with. Don't worry about it."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:169
-msgid ""
-"Q: What is this {p} syntax with mtools{p} and parted{p}? A: That's aptitude."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:172
-msgid ""
-"Q: Do I need to write the image on USB stick to test it? A: you must use "
-"qemu >= 0.8."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:175
-msgid "Q: What is /cow? A: Copy-on-write, the 'diff' from unionfs."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:178
-msgid ""
-"Q: Is /usr/share/live-helper/lists/standard-x11 like preseed or is preseed "
-"something else entirely? A: It is not. It is a package list, not a debconf "
-"preseeding."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:181
-msgid ""
-"Q: What is the difference between standard and minimal? A: standard: "
-"packages of priority standard and higher; minimal: packages of priority "
-"essential and higher;"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:184
-msgid ""
-"Q: What can the sections be used for? Aren't they BIG? A: Someone maybe "
-"wants to include packages from contrib or non-free."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:187
-msgid "Q: memtest86+ ... is that used? A: Yes"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:190
-msgid ""
-"Q: How do I build using predefined packages lists? A: e.g. to build using "
-"standard-x11 packages list: #{$ sudo lh_config -p standard-x11 && sudo "
-"lh_build}# Note: The packages lists can be found in /usr/share/live-helper/"
-"lists/ directory."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:193
-msgid ""
-"Q: How do I rebuild without downloading all the packages again? A: All "
-"packages are cached in cache subdirectory. They remain until a clean purge: #"
-"{$ sudo lh_clean --purge}# You do not have to do anything to prevent "
-"packages from being re-downloaded. You need to remember to clean whichever "
-"stages you want to rebuild first. e.g. to rebuild from the cached bootstrap, "
-"chroot packages and build a new image. #{$ sudo lh_clean && sudo lh_build}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:196
-msgid ""
-"Q: How do I boot USB debian-live on systems not supporting USB boot? A: Make "
-"a boot CD with grub, configured to boot from a debian-live kernel copied on "
-"the cd structure #{$ mkdir -p iso/boot/grub && cp /usr/lib/grub/i386-pc/"
-"stage2_eltorito iso/boot/grub && cp chroot/boot/* iso/boot/}# Create iso/"
-"boot/grub/menu.lst:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:205
-msgid ""
-"default 0 timeout 5 color cyan/blue white/blue title Debian Live root (cd)  "
-"kernel /boot/vmlinuz boot=live initrd /boot/initrd.img"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:209
-msgid ""
-"Create the iso image #{$ mkisofs -R -b boot/grub/stage2_eltorito -no-emul-"
-"boot \\ -boot-load-size 4 -boot-info-table -o grub.iso iso}# Burn the image."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:212
-msgid ""
-"Q: How do I boot debian-live on systems not supporting CDROM or USB boot? A: "
-"If you have a floppy drive, you may be able to use it, otherwise you will "
-"need to use loadlin/grub4dos/win32-loader. If you have a second system to "
-"serve up the image over the network, See http://wiki.debian.org/DebianLive/"
-"Howto/Creating_a_Netboot_Image"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:215
-msgid ""
-"Q: The X configuration does not seems to work, the resolution is too low. "
-"What can I do? A: Use xdebconfigurator #{$ lh_config --bootappend xdebconf "
-"&& lh_config --packages xdebconfigurator}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:218
-msgid ""
-"Q: Apache has problems with static files A: Sendfile does not work well on "
-"the unionfs used by Debian Live. Add the following to apache's "
-"configuration: #{EnableSendfile off}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:222
-msgid ""
-"Q: How do I make hard disk partitions auto-mountable? A: Short answer: Right "
-"now the best is to use a script that will populate the fstab when the CD is "
-"booting. Such a script can be found at https://devel.goto10.org/svn/puredyne/"
-"trunk/broth/stock/chroot_local-includes/sbin/diskmounter.sh. A proper "
-"solution based on HAL will be described here in a hopefully near future.  A: "
-"Long Answer: Since 55_nonpolkit-mount-policy.patch in HAL, debian-storage-"
-"policy-fixed-drives.fdi is not available anymore and the previous trick that "
-"consisted to remove this file to enable automounting of fixed drives as a "
-"consequence is obsolete. Eventually, it will be possible to combine HAL and "
-"PolicyKit to enable different permissions and actions to achieve advanced "
-"(auto)mounting for non-root users. Until then, because the live scripts are "
-"only touching to the fstab to add a swap partition if discovered at boot "
-"time, the only way to have fixed drives mounted automatically is to use a "
-"script that will populate the fstab file at the end of the multiuser "
-"runlevel. To achieve this, you can do, for example, the following: download "
-"the https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-"
-"includes/sbin/diskmounter.sh script Create the chroot_local-includes/sbin "
-"directory, and move the script inside Make sure the script is executable "
-"(chmod +x diskmounter.sh) create the chroot_local-includes/etc/rc.local file "
-"and call the diskmounter from there (see this https://devel.goto10.org/svn/"
-"puredyne/trunk/broth/stock/chroot_local-includes/etc/rc.local When called "
-"correctly, the script detects ext2, ext3, reiserfs, xfs, FAT32, HFS+ and "
-"NTFS partitions and mount them read-write, except for NTFS. This will change "
-"soon and an option will be available to use ntfs-3g to mount NTFS as read-"
-"write. comments, patches and other things about this script and issue: "
-"http://code.goto10.org/projects/puredyne/ticket/463"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:225
-msgid ""
-"Q: Boot fails with panic: can't open /scripts/live A: Add latest live-"
-"initramfs deb package into config/chroot_local-packages directory and "
-"rebuild."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:229
-msgid ""
-"Q: How do I configure the locale and the keyboard? A: See 10n % FIXME: <xref "
-"linkend=\"internalization\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:234
-msgid ""
-"Q: How do I get past boot prompt without a working keyboard? A: See "
-"Customizing the bootup process % FIXME: <xref linkend=\"bootup\"/> Note: "
-"Boot from an USB-HDD on an iMac with GRUB did not work."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:237
-msgid ""
-"Q: Can I serve the root image from a web or ftp server? A: Since live-"
-"initramfs 1.99, it should be possible to use the fetch= argument on the "
-"kernel command line. You can build a netboot image as usual, and when you "
-"are done edit the tftpboot/pxelinux.cfg/default file. Remove the references "
-"to network boot (netboot, nfsroot, nfsopts), and replace with fetch= <url "
-"where you placed the root image>. You have to include wget in the chroot. It "
-"could work for other boot methods as well. However, I am not sure the live "
-"scripts configure the network when booting from a CD or USB disk. #{$ "
-"lh_config --packages wget}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:240
-msgid ""
-"Q: Why doesn't quickreboot (or some other boot parameter) work? A: If you "
-"are building an etch image (which was the default up to 2007/09/14) you have "
-"a very old version of casper which does not support quickreboot and possibly "
-"other boot parameters as well. You could configure your sources to use live-"
-"backports (see /usr/share/live-helper/examples/sources/live-backports) and "
-"switch to live-initramfs, or better yet, build a lenny image instead, which "
-"is the new default. #{$ lh_config --distribution lenny $ lh_config --"
-"initramfs live-initramfs}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:243
-msgid ""
-"Q: How do I fix \"Could not find kernel image\" issue with syslinux "
-"bootloader? A: Add a binary local hook script to fix kernel and initrd path "
-"each time you build an image. e.g. config/binary_local-hooks/01-fix_syslinux."
-"sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:249
-msgid "SYSLINUXCFG=`find binary -type f -name syslinux.cfg`"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:252
-msgid ""
-"sed -i \"s|kernel /vmlinuz|kernel vmlinuz|g\" ${SYSLINUXCFG} sed -i \"s|"
-"initrd=/initrd|initrd=initrd|g\" ${SYSLINUXCFG}"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:254
-msgid "$ chmod +x config/binary_local-hooks/01-fix_syslinux.sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:259
-msgid ""
-"Q: How do I use a newer kernel with lenny? A: A build with backports.org "
-"kernels will fail as that repository lacks the necessary module packages "
-"(linux-modules-extra-2.6, aufs, etc.). Use the kernel backports http://"
-"unsupported.debian-maintainers.org/backports-kernel/ The quick way to "
-"success:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:268
-msgid ""
-"$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6 squashfs-"
-"modules-2.6' $ echo 'deb http://unsupported.debian-maintainers.org/backports-"
-"kernel/ ./' > config/chroot_sources/backports-kernel.chroot $ echo 'deb "
-"http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/"
-"chroot_sources/backports-kernel.binary $ wget http://unsupported.debian-"
-"maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/"
-"backports-kernel.chroot.gpg $ wget http://unsupported.debian-maintainers.org/"
-"backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel."
-"binary.gpg $ lh_build }code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:271
-msgid ""
-"Q: How do I use a custom kernel? Is there a nice way of booting debian-live "
-"with a custom kernel (not in an apt repo)? A: Copy it into config/"
-"chroot_local-packages and set LH_LINUX_PACKAGES=\"none\" or use lh config --"
-"linux-packages \" \" Don't forget to compile your kernel with an union "
-"filesystem (unionfs or aufs), squashfs modules, and initrd support. I can "
-"cause the kernel to be installed but it seems this happens later than grub/"
-"syslinux is configured so it's not listed and casper/ and the menu require "
-"munging. You need to follow the debian scheme, e.g. placing the files in /"
-"boot as vmlinuz-$version and initrd.img-$version etc. I personally wouldn't "
-"go that way which is too much of a hassle, and just use make-kpkg to produce "
-"custom kernel deb packages. They should integrate nicely if you just put "
-"them into config/chroot_local-packages and set LH_LINUX_PACKAGES=\"\". Hint: "
-"to work around an error, which lh_binary_syslinux will throw on custom "
-"kernels if there is not an 468/686 in the kernel-name, you need to set "
-"CONFIG_LOCALVERSION=\"-486\" or \"-686\" within the kernel configuration (-"
-"&gt; General setup -&gt; Local version set to -486 or -686) corresponding to "
-"LH_LINUX_FLAVOURS=\"\" or \"686\". this at least up till live-helper version "
-"1.0~a40-1 see http://lists.alioth.debian.org/pipermail/debian-live-"
-"devel/2007-July/001947.html and http://lists.alioth.debian.org/pipermail/"
-"debian-live-devel/2007-November/002581.html"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:274
-msgid ""
-"Q: How do I create a cross arch live CD image? A: In short: You can't. Read "
-"on: The procedure to create a live CD is based on creating a chroot that "
-"contains the files that will be finally available on the live CD. The live "
-"CD building procedure includes chrooting into the chroot dir and so some "
-"operations. chrooting means that the terminal you chroot on will behave as a "
-"different system so your real system and the chroot environment is decoupled "
-"somehow. Once the live CD scripts chroots into the chroot dir they have some "
-"operations to do inside that environment and your real system won't be able "
-"to run them unless you are using the same architecture. So you only are able "
-"to make live CD for the arch you run on. But this doesn't prevent you run "
-"qemu or some other machine emulator that make this possible."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:277
-msgid ""
-"Q: When is a lh_clean necessary? lh_clean is a script in /usr/bin/ A: That "
-"depends what you've changed between builds If, for example, you've built an "
-"iso image and you want a usb image, you only need to run #{lh_clean --binary}"
-"# before you run lh_build again. If you've changed anything in the chroot, "
-"you'll need to cleanup both chroot and binary with #{lh_clean}# before "
-"continuing"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:280
-msgid ""
-"Q: How can i set boot= parameters? A: Set LH_BOOTAPPEND_LIVE in config/binary"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:283
-msgid ""
-"Q: How do I include different modules to load when the live system boots? A: "
-"Configure config/chroot_local-includes/etc/initramfs-tools/"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:285
-msgid ""
-"The lh_chroot_hacks helper rebuilds the live/initrd1.img using the default "
-"initramfs.conf \"MODULES = most\". You may override that by supplying your "
-"own initramfs.conf, or else just add your own modules, e.g."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:290
-msgid ""
-"mkdir -p config/chroot_local-includes/etc/initramfs-tools/ echo \"atl2\" >> "
-"config/chroot_local-includes/etc/initramfs-tools/modules"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:294
-msgid ""
-"Note: Even though initramfs.conf(5) says \"most adds all the framebuffer, "
-"acpi, file system, ide, sata, scsi and usb drivers\", it actually includes "
-"network drivers as well. See auto_add_modules() in /usr/share/initramfs-"
-"tools/hook-functions for the complete list."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:297
-msgid ""
-"Q: Can I have a splash screen? A: Yes you can. You will not know what is "
-"going on when the splash screen is active, it may fail to activate on some "
-"hardware or break X on other (both usplash and splashy use libdirectfb which "
-"does some evil voodoo and may break you graphics or input until you reboot). "
-"However, you can install and activate it just as you would on any other "
-"Debian system. To use splashy: 1. install splashy and read the README, the "
-"manpages are useless for setting it up. Add some parameters to your kernel "
-"command line, such as in your pxelinux configuration or in "
-"LH_BOOTAPPEND_LIVE in config/binary in debian-live configuration: #{vga=792 "
-"splash quiet}# #{vga}# to select video mode, #{splash}# to activate splashy, "
-"#{quiet}# to suppress most kernel messages that you cannot see anyway but "
-"would scroll past before splashy manages to paint the graphics on your "
-"screen. You might want to add splashy to the list of packages installed in "
-"your image: #{echo splashy > config/chroot_local-packageslists/splashy echo "
-"splashy-themes >> config/chroot_local-packageslists/splashy}# and select a "
-"theme:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:305
-msgid ""
-"echo '#!/bin/sh' > config/chroot_local-hooks/splashy echo splashy_config -s "
-"debian-moreblue '||' true >> config/chroot_local-hooks/splashy # update the "
-"ramdisk to include the splash screen echo update-initramfs -u -k all >> "
-"config/chroot_local-hooks/splashy chmod 755 config/chroot_local-hooks/splashy"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:309
-msgid ""
-"After you rebuild your live system you should observe a bluish splash screen "
-"while booting. Nothing happens while initramfs is running because there is "
-"no splashy support in initramfs-tools. Once the init starts the progress bar "
-"should start to fill. If #{vga=something}# sets a mode that your screen "
-"cannot show or your card cannot do vesa 2.0 (and thus you get plain text "
-"mode and no splashy) read the splashy faq."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:312
-msgid ""
-"Q: Howto use my Broadcom eXtrem 2 network card (module bnx2)? A: Add the "
-"firmwares to the initrd image. You need to install the non-free package "
-"\"firmware-bnx2\". Uncompress your initrd image, then copy files:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:317
-msgid ""
-"cp /lib/firmware/bnx2x-e1-4.8.53.0.fw /lib/firmware/bnx2x-e1-5.0.21.0.fw /"
-"lib/firmware/bnx2x-e1h-4.8.53.0.fw /lib/firmware/bnx2x-e1h-5.0.21.0.fw "
-"${INITRD}/lib/firmware/ cp /lib/udev/firmware.agent ${INITRD}/lib/udev/"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:321
-msgid "Recompress your initrd image and boot: it works!"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:323
-msgid ""
-"Q: X is broken (the system boots, messages scroll by, and then the screen "
-"goes blank). What do I do? A: On my system starting X completely disables "
-"graphics so that I do not see anything even after X bails out and I am back "
-"to the console. To prevent this you can change the driver Xorg uses."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:325
-msgid ""
-"If you have a working splash screen or at least graphical console you can "
-"use #{live xdriver=fbdev}# when booting the live system (instead of just "
-"enter). Another driver you might want to try is #{vesa}#. If all fails you "
-"might try to set xdriver to some wrong value so that Xorg fails to start and "
-"you can examine the system while you still see something on the console. #"
-"{live xdriver=none}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:328
-msgid ""
-"Q: How can I get Debian first stable versions? A: I'm developing software "
-"and testing it on Live-CD. Thanks for the LiveCD project. To be sure my "
-"development is fully compatible with the \"etch\" version, I need the same "
-"scenario when Debian GNU/Linux 4.0 was published as stable (I believe "
-"2007.04.08). If there was some bug on 2007.04.08 that was corrected one week "
-"later, I need to test software foreseeing that scenario without the bug "
-"solved."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:331
-msgid ""
-"Q: I get \"fopen: Permission denied\"-warnings from apt on building/at the "
-"live-system A: That's a harmless bug in apt. However, if you want to get off "
-"this warnings in the live-system, add a file in chroot_local-hooks with "
-"follow row:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:335
-msgid "chown -R man.man /var/cache/man"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:340
-msgid ""
-"Q: Why I always fail during \"Retrieving Packages\" stage when running "
-"lh_build? I have already set apt-http-proxy and so on.  A: lh_build "
-"retrieves packages via wget, as a result you need to enable the proxy "
-"settings in /etc/wgetrc before running lh_build."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:343
-msgid ""
-"Q: How do I edit Xorg.conf? A: Xorg.conf is generated every time system "
-"boots, so it's useless to put modifed Xorg.conf in config/choort_local-"
-"includes/etc/X11, because it will be overwritten during boot. However, you "
-"can edit /usr/bin/dexconf, which generate xorg.conf during boot, so the "
-"result will be modified Xorg.conf. The modified dexconf has to be put in "
-"config/choort_local-includes/usr/bin. e.g.: you can configure Xorg.conf for "
-"two or more keyboards layouts with alt+shift toggle by editing dexconf and "
-"replacing the line:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:347
-msgid "Option \"XkbLayout\" \"$XKB_LAYOUT\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:351
-msgid "with the lines:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:356
-msgid ""
-"Option \"XkbLayout\" \"us,il\" Option \"XkbOptions\" \"grp:alt_shift_toggle,"
-"grp_led:scroll\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:360
-msgid "when \"us,il\" are the wanted keyboard layouts."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:362
-msgid ""
-"You can force default screen resulotion (e.g. 1024*768) by adding the lines:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:368
-#, no-wrap
-msgid ""
-"SubSection \"Display\"\n"
-"        Modes \"1024x768\"\n"
-"EndSubSection\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:372
-msgid "between the lines:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:379
-#, no-wrap
-msgid ""
-"Section \"Screen\"\n"
-"        Identifier \"Default Screen\"\n"
-"        Monitor \"Configured Monitor\"\n"
-"EndSection\"\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:383
-msgid ""
-"Q: Where are the build parameters for the prebuilt images A: See http://live."
-"debian.net/README.images."
-msgstr ""
diff --git a/manual/po/pt_BR/other_howtos.ssi.po b/manual/po/pt_BR/other_howtos.ssi.po
deleted file mode 100644
index f5530e9..0000000
--- a/manual/po/pt_BR/other_howtos.ssi.po
+++ /dev/null
@@ -1,379 +0,0 @@
-# Portuguese translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 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:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
-msgid "code{"
-msgstr "code{"
-
-#. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 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: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:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
-msgid "}code"
-msgstr "}code"
-
-#. type: Plain text
-#: en/other_howtos.ssi:2
-msgid "B~ Howtos"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:4
-msgid "1~ Howtos"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:6
-msgid "2~ ISO"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:8
-msgid ""
-"Generating a Debian Live CD is very simple. You need to have live-helper "
-"(package available in Debian sid and lenny), and Debootstrap (or "
-"cdebootstrap) from etch or newer."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:10
-msgid "3~ Install live-helper"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:12
-msgid "#{apt-get install live-helper}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:14
-msgid "3~ Configure the current working directory with lh_config"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:18
-msgid "lh_config -b iso -a $ARCH"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:22
-msgid "where #{$ARCH}# is the intended architecture (i.e. - i386 or amd64)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:24
-msgid "#{-b}# flag is used to be sure to obtain image in ISO format."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:26
-msgid "3~ Build the image with lh_build:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:28
-msgid "Execute lh_build as root: #{lh_build}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:30
-msgid ""
-"The command above will create the basic image, containing just the Debian "
-"standard system (with no X at all)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:32
-msgid ""
-"If you want to have any of the Desktop environments on your livecd, #{ls /"
-"usr/share/live-helper/lists}# will show a number of available package Lists "
-"to choose from, e.g. #{lh_config -p gnome-desktop}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:34
-msgid "More examples are listed at DebianLive/Examples."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:37
-msgid ""
-"See packages for help configuring a local Debian Mirror and other aspects of "
-"the live system.  % FIXME: <xref linkend=\"packages\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:39
-msgid "3~ Test the image"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:41
-msgid "If you have qemu installed, you can boot the image with:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:45
-msgid "qemu -cdrom binary.iso"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:49
-msgid "If you have also kqemu installed, you can add #{-kernel-kqemu}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:51
-msgid "2~ ISO_(multiarch)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:53
-msgid ""
-"Multiple machine boot CDs can be created with the following manual "
-"procedure. This procedure has been successfully used to create a single CD "
-"which is bootable on alpha, i386, pmax, and sparc. It should be possible to "
-"also make the CD bootable on macppc, vax and on sun2, sun3 and sun3x."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:55
-msgid ""
-"To create a CD which is bootable by multiple architectures, use the "
-"following steps in this order. Please note that the order is critical."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:57
-msgid ""
-"Make sure you have all the required files including the various kernels and "
-"boot programs listed in the individual machine sections."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:59
-msgid ""
-"Include a directory somewhere in the cdsources directory called mdec.pmax "
-"and include the pmax bootxx_cd9660 file there. For example, /cdsources/usr/"
-"mdec.pmax/bootxx_cd9660."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:61
-msgid ""
-"Include a directory somewhere in the cdsources directory called mdec.vax and "
-"include the vax xxboot file there. For example, #{cdsources/usr/mdec.vax/"
-"xxboot.}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:63
-msgid "Include the macppc ofwboot.xcf bootloader in /cdsources."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:65
-msgid ""
-"Create an i386 bootable image. #{sh mkisofs -v -v -o output.iso -b i386/"
-"installation/floppy/boot-big.fs \\ -c boot.catalog -l -J -r -L /cdsources "
-"2>&1 | tee /tmp/mkisofs.log exit}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:67
-msgid ""
-"Note: The appearance of the -v flag twice is required. If you are making a "
-"bootable CD for an Open Firmware 3 macppc model, make sure to include -hfs -"
-"part in the parameters for mkisofs."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:69
-msgid ""
-"Run mksunbootcd on a NetBSD/sparc machine to install sparc and sun2/sun3 "
-"bootblocks. Alternatively, install the sysutils/mksunbootcd package on your "
-"favorite NetBSD machine. #{mksunbootcd output.iso boot-sun4.fs boot-sun4c.fs "
-"boot-sun4m.fs boot-sun3.fs}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:71
-msgid ""
-"Run the installboot(8) program targeted for NetBSD/pmax to install the pmax "
-"bootblocks. Note that in order to coexist with other NetBSD boot blocks, the "
-"pmax boot block is appended to the end of the ISO file system."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:73
-msgid ""
-"#{installboot -m pmax -v -o append,sunsum output.iso /tmp/mdec.pmax/"
-"bootxx_cd9660}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:75
-msgid ""
-"The -o append,sunsum option appends the first stage boot block to the end of "
-"the ISO file system, and restores the checksum used when booting on a sun."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:77
-msgid ""
-"Run the installboot(8) program targeted for NetBSD/vax to install the vax "
-"bootblocks. Note that in order to coexist with other NetBSD boot blocks, the "
-"vax boot block is appended to the end of the ISO file system."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:79
-msgid "installboot -m vax -v -o append,sunsum output.iso /tmp/mdec.vax/xxboot"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:81
-msgid "(See the pmax entry above for an explanation of the flags)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:83
-msgid ""
-"Run the installboot(8) program targeted for NetBSD/alpha to install the "
-"alpha bootblocks."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:85
-msgid ""
-"#{installboot -m alpha -v -o append,sunsum output.iso /tmp/mdec.alpha/"
-"bootxx_cd9660}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:86
-msgid ""
-"Note: The alpha installboot must occur after the others, because currently "
-"it's the only machine dependent back-end for installboot(8) that can "
-"calculate the alpha checksum. (See the pmax entry above for an explanation "
-"of the flags)."
-msgstr ""
diff --git a/manual/po/pt_BR/other_use-cases.ssi.po b/manual/po/pt_BR/other_use-cases.ssi.po
deleted file mode 100644
index f387b0c..0000000
--- a/manual/po/pt_BR/other_use-cases.ssi.po
+++ /dev/null
@@ -1,379 +0,0 @@
-# Portuguese translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 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:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
-msgid "code{"
-msgstr "code{"
-
-#. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 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: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:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
-msgid "}code"
-msgstr "}code"
-
-#. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/other_use-cases.ssi:26
-#: en/other_use-cases.ssi:77
-msgid "#!/bin/sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:2
-msgid "B~ Use Cases"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:4
-msgid "1~ Use Cases"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:6
-msgid "This chapter is for users to document their use cases with Debian Live."
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:8
-msgid "2~ VNC Kiosk Client"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:10
-msgid "Create an image with live-helper to boot directly to a VNC server."
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:12
-msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:14
-msgid "_* Move to the build directory: #{$ cd vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:16
-msgid ""
-"Example to config the build directory to include gdm metacity "
-"xtightvncviewer: #{$ lh config --packages \"gdm metacity xtightvncviewer\"}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:18
-msgid ""
-"Create a folder /etc/skel folder for a custom .xsession for the default "
-"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:20
-msgid ""
-"Create the .xsession for the default user: #{$ touch config/chroot_local-"
-"includes/etc/skel/.xsession}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:22
-msgid ""
-"Edit the .xsession file to launch metacity and start xvncviewer with "
-"something similar to the below:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:29
-msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:31
-msgid "exit"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:35
-msgid "_* Build the image: #{# lh build}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:37 en/other_use-cases.ssi:138
-msgid "_* Enjoy."
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:39
-msgid "2~ VMWare-Player Sessions"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:41
-msgid ""
-"Create an image with live-helper to boot directly to a specifiv VMWare "
-"session."
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:43
-msgid "_* Make a build directory: #{$ mkdir VMWare-Player}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:45
-msgid "_* Move to the build directory: #{$ cd VMWare-Player}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:47
-msgid ""
-"_* Example to config the build directory to include gdm metacity "
-"xtightvncviewer:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:67
-#, no-wrap
-msgid ""
-"$ lh config --apt apt \\\n"
-"        ---apt-recommends disabled \\\n"
-"        --archive-areas \"main\" \\\n"
-"        --binary-images iso \\\n"
-"        --binary-indices none \\\n"
-"        --syslinux-menu vesamenu \\\n"
-"        ---bootappend-live \"persistent quickreboot\" \\\n"
-"        ---bootappend-install \"-- plainroot persistent video=vesa:ywrap,mtrr vga=788 quickreboot quiet live-config\" \\\n"
-"        ---debian-installer live \\\n"
-"        ---distribution lenny \\\n"
-"        ---hostname vmare-player-firmware \\\n"
-"        ---includes none \\\n"
-"        ---linux-flavours 686 \\\n"
-"        ---packages-lists \"gnome-core\" \\\n"
-"        ---packages \"gcc gparted linux-headers-2.6-\\${LH_LINUX_FLAVOURS} live-config-staging make metacity rsync wireless-tools\" \\\n"
-"        ---repositories live.debian.net \\\n"
-"        ---win32-loader disabled\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:71
-msgid ""
-"_* Create the 01-vmware-player hook: #{$ touch config/chroot_local-hooks/01-"
-"vmware-player.sh}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:73
-msgid ""
-"Edit the 01-vmware-player hook to launch the VMWare-Player. The hook should "
-"look something like the below:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:80
-msgid ""
-"_URL=\"http://archive.debian-maintainers.org/vmware/other/vmware-player/\" "
-"_VMPLAYER_VERSION=\"VMware-Player.i386.bundle\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:83
-msgid "echo \"I: Starting script for install of VMWare Player.\" cd /root"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:86
-msgid ""
-"echo \"I: Beginning download of ${_VMPLAYER_VERSION} from ${_URL} .\" wget "
-"${_URL}${_VMPLAYER_VERSION}"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:89
-msgid ""
-"echo \"I: Starting install of VMWare Player.\" sh /root/${_VMPLAYER_VERSION}"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:92
-msgid ""
-"echo \"I: Cleaning up the VMWare Player download.\" rm /root/"
-"${_VMPLAYER_VERSION}"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:95
-msgid "#echo \"I: Starting interactive shell.\" #bash"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:99
-msgid ""
-"_* Build the image (note that during the build the VMWare-Player will prompt "
-"you to install or cancel): #{#lh build}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:101
-msgid ""
-"_* After the build you will have an image you can boot live or install as "
-"firmware. The package live-config-staging is the package that installs the "
-"ability to utilize the VMWare-Player by calling live-config.vmware-player as "
-"a boot parameter in the following form:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:105
-msgid "live-config.vmware-player=ACTION:IMAGEPATH:VMXNAME"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:109
-msgid "Notes from the 900-vmware-player file are as follows:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:135
-#, no-wrap
-msgid ""
-"# The script tests for boot parameter of\n"
-"# live-config.vmware-player=ACTION:IMAGEPATH:VMXNAME\n"
-"#\n"
-"# ACTION: The operation to perform on the workstation (none|scratch)\n"
-"# IMAGEPATH: The folder path to the VMware image you want to run.\n"
-"# VMXNAME: The name of the VMware image you want to run.\n"
-"#\n"
-"# Notes:To use this file with WMWare images you will need to have a few things\n"
-"# setup:\n"
-"#\n"
-"# 1. The VMware Player needs to be installed in the image.\n"
-"# 2. This script uses (s|h)da1 for writing image data, and is used as a scratch\n"
-"#    space. This scratch space should be a file system with linux permissions\n"
-"#    such as ext2.\n"
-"# 3. VMware image(s) should be in a mounted folder and setup as follows:\n"
-"#    - Image(s) set to snapshot mode.\n"
-"#    - For each image, the image folder needs to have a file called\n"
-"#      image-release with a variable CRELEASE. An example: CRELEASE=\"1.0.0\"\n"
-"#\n"
-"# The image-release file is used by the image maintainer and this script to tell\n"
-"# workstation(s) using a given image, to erase locally stored vmware image files\n"
-"# and setup with the newly configure image. The operation of erasing locally\n"
-"# stored vmare image files, is referred to as a scratch.\n"
-msgstr ""
diff --git a/manual/po/pt_BR/project_bugs.ssi.po b/manual/po/pt_BR/project_bugs.ssi.po
index 096916f..c370f2b 100644
--- a/manual/po/pt_BR/project_bugs.ssi.po
+++ b/manual/po/pt_BR/project_bugs.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-30 10:29+0100\n"
+"Project-Id-Version: live-manual 2.0.0\n"
+"POT-Creation-Date: 2010-12-23 07:37-0400\n"
 "PO-Revision-Date: 2010-10-25 23:27+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -20,65 +20,62 @@ 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_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/project_bugs.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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:24
+#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr "code{"
@@ -87,65 +84,62 @@ 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:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr "}code"
@@ -204,152 +198,165 @@ msgstr ""
 #. type: Plain text
 #: en/project_bugs.ssi:18
 msgid ""
-"Due to the nature of Debian *{testing}* and Debian *{unstable}* "
-"distributions being a moving target, building a live system may not always "
-"be possible."
+"Because Debian *{testing}* and Debian *{unstable}* distributions are a "
+"moving target, when you specify either as the target system distribution, a "
+"successful build may not always be possible."
 msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:20
-msgid ""
-"If this is a problem, do not build a system based on *{testing}* or *"
-"{unstable}*, but go with *{stable}*. live-build does always default to the "
-"current *{stable}* release."
+msgid "% FIXME:"
 msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:22
 msgid ""
-"Currently known issues are listed under the section 'status' on our homepage "
-"at http://live.debian.net/"
+"If this causes too much difficulty for you, do not build a system based on *"
+"{testing}* or *{unstable}*, but rather, use *{stable}*. live-build does "
+"always default to the *{stable}* release."
 msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:24
 msgid ""
-"It is out of the scope of this manual to train you in correctly identifying "
-"and fixing problems in packages of the development distributions, however, "
-"there are two things you can always try: When not succeeding to build *"
-"{testing}*, try if *{unstable}* works. If *{unstable}* does not work either, "
-"revert to *{testing}* and pinning the newer version of the failing package "
-"from *{unstable}*."
+"Currently known issues are listed under the section 'status' on our homepage "
+"at http://live.debian.net/."
 msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:26
-msgid "2~ Rebuild from scratch"
+msgid ""
+"It is out of the scope of this manual to train you to correctly identify and "
+"fix problems in packages of the development distributions, however, there "
+"are two things you can always try: If a build fails when the target "
+"distribution is *{testing}*, try *{unstable}*. If *{unstable}* does not work "
+"either, revert to *{testing}* and pin the newer version of the failing "
+"package from *{unstable}* (see {APT pinning}#apt-pinning for details)."
 msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:28
+msgid "2~ Rebuild from scratch"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:30
 msgid ""
-"To ensure that a particular bug is not caused by an unclean built system, "
+"To ensure that a particular bug is not caused by an uncleanly built system, "
 "please always rebuild the whole live system from scratch to see if the bug "
 "is reproducible."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:30
+#: en/project_bugs.ssi:32
 msgid "2~ Use up-to-date packages"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:32
+#: en/project_bugs.ssi:34
 msgid ""
 "Using outdated packages can cause significant problems when trying to "
-"reproduce (and ultimately fix) your problem."
+"reproduce (and ultimately fix) your problem. Make sure your build system is "
+"up-to-date and any packages included in your image are up-to-date as well."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:34
+#: en/project_bugs.ssi:36
 msgid "2~collect-information Collect information"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:36
+#: en/project_bugs.ssi:38
 msgid ""
-"Please provide enough information with your report. At a minimum, it should "
-"contain the exact version of live-build version where the bug is "
-"encountered, and steps to reproduce it. Please use common sense and include "
-"other relevant information if you think that it might help in solving the "
-"problem."
+"Please provide enough information with your report. At least include the "
+"exact version of live-build version where the bug is encountered and steps "
+"to reproduce it. Please use common sense and include other relevant "
+"information if you think that it might help in solving the problem."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:38
+#: en/project_bugs.ssi:40
 msgid ""
 "To make the most out of your bug report, we require at least the following "
 "information:"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:40
+#: en/project_bugs.ssi:42
 msgid "_* Architecture of the host system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:42
+#: en/project_bugs.ssi:44
 msgid "_* Version of live-build on the host system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:44
+#: en/project_bugs.ssi:46
 msgid "_* Version of live-boot on the live system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:46
+#: en/project_bugs.ssi:48
 msgid "_* Version of live-config on the live system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:48
-msgid "_* Version of debootstrap and/or cdebootstrap on the host system"
+#: en/project_bugs.ssi:50
+msgid ""
+"_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:50
+#: en/project_bugs.ssi:52
 msgid "_* Architecture of the live system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:52
+#: en/project_bugs.ssi:54
 msgid "_* Distribution of the live system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:54
+#: en/project_bugs.ssi:56
 msgid "_* Version of the kernel on the live system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:56
-msgid "You can generate a log of the build process by using the tee command:"
+#: en/project_bugs.ssi:58
+msgid ""
+"You can generate a log of the build process by using the #{tee}# command. We "
+"recommend doing this automatically with an #{auto/build}# script; see "
+"{Managing a configuration}#managing-a-configuration for details)."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:60
-msgid "lb build 2>&1 | tee build.log"
+#: en/project_bugs.ssi:62
+#, no-wrap
+msgid " # lb build 2>&1 | tee build.log\n"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:64
+#: en/project_bugs.ssi:66
 msgid ""
-"For runtime log, live-boot stores a log in /var/log/live.log (or /var/log/"
-"live-boot.log)."
+"At boot time, live-boot stores a log in #{/var/log/live.log}# (or #{/var/log/"
+"live-boot.log}#)."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:66
+#: en/project_bugs.ssi:68
 msgid ""
 "Additionally, to rule out other errors, it is always a good idea to tar up "
-"your config directory and upload it somewhere (do *{not}* send it as an "
-"attachment to the mailinglist), so that we can try to reproduce the errors "
-"you encountered."
+"your #{config/}# directory and upload it somewhere (do *{not}* send it as an "
+"attachment to the mailing list), so that we can try to reproduce the errors "
+"you encountered. If this is difficult (e.g. due to size) you can use the "
+"output of #{lb config --dump}# which produces a summary of your config tree "
+"(i.e. lists files in subdirectories of #{config/}# but does not include "
+"them)."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:68
+#: en/project_bugs.ssi:70
 msgid ""
 "Remember to send in any logs that were produced with English locale "
 "settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or #"
@@ -357,22 +364,41 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:70
+#: en/project_bugs.ssi:72
+msgid "2~ Isolate the failing case if possible"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:74
+msgid ""
+"If possible, isolate the failing case to the smallest possible change that "
+"breaks. It is not always easy to do this, so if you can't manage it for your "
+"report, don't worry. However, if you plan your development cycle well, using "
+"small enough change sets per iteration, you may be able to isolate the "
+"problem by constructing a simpler 'base' configuration that closely matches "
+"your actual configuration plus just the broken change set added to it. If "
+"you have a hard time sorting out which of your changes broke, it may be that "
+"you are including too much in each change set and should develop in smaller "
+"increments."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:76
 msgid "2~ Use the correct package to report the bug against"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:72
+#: en/project_bugs.ssi:78
 msgid "Where does the bug appear?"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:74
+#: en/project_bugs.ssi:80
 msgid "3~ At build time whilst bootstrapping"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:76
+#: en/project_bugs.ssi:82
 msgid ""
 "live-build first bootstraps a basic Debian system with #{debootstrap}# or #"
 "{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
@@ -382,7 +408,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:78
+#: en/project_bugs.ssi:84
 msgid ""
 "In both cases, this is not a bug in Debian Live, but rather in Debian itself "
 "which we can not fix this directly. Please report such a bug against the "
@@ -390,12 +416,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:80
+#: en/project_bugs.ssi:86
 msgid "3~ At build time whilst installing packages"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:82
+#: en/project_bugs.ssi:88
 msgid ""
 "live-build installs additional packages from the Debian archive and "
 "depending on the Debian distribution used and the daily archive state, it "
@@ -404,16 +430,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:84
+#: en/project_bugs.ssi:90
 msgid ""
 "If this is the case, this is not a bug in Debian Live, but rather in Debian "
-"- please report it against the failing package. Running debootstrap "
-"seperately from the Live system build or running lb bootstrap with #{--debug}"
-"# will give you more information."
+"- please report it against the failing package. Running #{debootstrap}# "
+"separately from the Live system build or running #{lb bootstrap --debug}# "
+"will give you more information."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:86
+#: en/project_bugs.ssi:92
 msgid ""
 "Also, if you are using a local mirror and/or any of sort of proxy and you "
 "are experiencing a problem, please always reproduce it first by "
@@ -421,40 +447,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:88
+#: en/project_bugs.ssi:94
 msgid "3~ At boot time"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:90
+#: en/project_bugs.ssi:96
 msgid ""
 "If your image does not boot, please report it to the mailing list together "
 "with the information requested in {Collect information}#collect-information. "
-"Do not forget to mention, how/when the image failed, in Qemu, VMWare or real "
-"hardware. If you are using a virtualization technology of any kind, please "
-"always run it on real hardware before reporting a bug. Providing a "
-"screenshot of the failure is also very helpful."
+"Do not forget to mention, how/when the image failed, in Qemu, Virtualbox, "
+"VMWare or real hardware. If you are using a virtualization technology of any "
+"kind, please always run it on real hardware before reporting a bug. "
+"Providing a screenshot of the failure is also very helpful."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:92
+#: en/project_bugs.ssi:98
 msgid "3~ At run time"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:94
+#: en/project_bugs.ssi:100
 msgid ""
 "If a package was successfully installed, but fails while actually running "
 "the Live system, this is probably a bug in Debian Live. However,"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:96
+#: en/project_bugs.ssi:102
 msgid "2~ Do the research"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:98
+#: en/project_bugs.ssi:104
 msgid ""
 "Before filing the bug, please search the web for the particular error "
 "message or symptom you are getting. As it is highly unlikely that you are "
@@ -464,7 +490,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:100
+#: en/project_bugs.ssi:106
 msgid ""
 "You should pay particular attention to the Debian Live mailing list, as well "
 "as the homepage, as these are likely to contain the most up-to-date "
@@ -473,7 +499,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:102
+#: en/project_bugs.ssi:108
 msgid ""
 "In addition, you should check the current bug lists for live-build, live-"
 "boot, and live-config to see whether something similar has been reported "
@@ -481,12 +507,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:104
+#: en/project_bugs.ssi:110
 msgid "2~ Where to report bugs"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:106
+#: en/project_bugs.ssi:112
 msgid ""
 "The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
 "System (BTS). For information on how to use the system, please see http://"
@@ -495,7 +521,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:108
+#: en/project_bugs.ssi:114
 msgid ""
 "In general, you should report build time errors against the live-build "
 "package, boot time errors against live-boot, and run time errors against "
@@ -505,7 +531,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:109
+#: en/project_bugs.ssi:115
 msgid ""
 "Please note that bugs found in distributions derived from Debian (such as "
 "Ubuntu and others) should *{not}* be reported to the Debian BTS unless they "
diff --git a/manual/po/pt_BR/project_coding-style.ssi.po b/manual/po/pt_BR/project_coding-style.ssi.po
index e1d7524..73686a5 100644
--- a/manual/po/pt_BR/project_coding-style.ssi.po
+++ b/manual/po/pt_BR/project_coding-style.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-30 11:05+0100\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -20,64 +20,62 @@ 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_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:24
+#: 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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr "code{"
@@ -86,64 +84,62 @@ 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:173 en/other_customization-bootup.ssi:35
-#: en/other_customization-bootup.ssi:48 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: 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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr "}code"
@@ -220,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
@@ -235,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
@@ -250,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
@@ -277,43 +273,45 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:74
-msgid "_* Variables that used in lb config always start with LH_ prefix."
+msgid ""
+"_* Variables that used in #{lb config}# always start with #{LB_}# prefix."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:76
 msgid ""
-"_* Internal temporary variables in live-build should start with the _LH_ "
-"prefix."
+"_* Internal temporary variables in live-build should start with the #{\\_LB_}"
+"# prefix."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:78
-msgid "_* Local variables start with live-build __LH_ prefix."
+msgid "_* Local variables start with live-build #{\\_\\_LB_}# prefix."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:80
 msgid ""
-"_* Variables in connection to a boot parameter in live-config start with "
-"LIVE_."
+"_* Variables in connection to a boot parameter in live-config start with #"
+"{LIVE_}#."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:82
-msgid "_* All other variables in live-config start with _ prefix."
+msgid "_* All other variables in live-config start with #{_}# prefix."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:84
-msgid "_* Use braces around variables; eg. write ${FOO} instead of $FOO."
+msgid ""
+"_* Use braces around variables; e.g. write #{${FOO}}# instead of #{$FOO}#."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:86
 msgid ""
-"_* Always protect variables with quotes to respect potential whitespaces, "
-"write \"${FOO}\" not ${FOO}."
+"_* Always protect variables with quotes to respect potential whitespaces: "
+"write #{\"${FOO}\"}# not #{${FOO}}#."
 msgstr ""
 
 #. type: Plain text
@@ -325,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
@@ -342,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
@@ -366,21 +366,21 @@ msgstr ""
 #. type: Plain text
 #: en/project_coding-style.ssi:132
 msgid ""
-"_* Use \"|\" (without the surround quotes) as a seperator in calls to sed, e."
-"g. \"sed -e 's|foo|bar|'\" (without \"\")."
+"_* Use \"#{|}#\" (without the surround quotes) as a seperator in calls to "
+"sed, e.g. \"#{sed -e 's|foo|bar|'}#\" (without \"\")."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:134
 msgid ""
-"_* Don't use the test command for comparisons or tests, use \"[\" "
-"\"]\" (without \"\"), e.g. \"if [ -x /bin/foo ]; ...\" and not \"if test -x /"
-"bin/foo; ...\"."
+"_* Don't use the #{test}# command for comparisons or tests, use \"#{[}#\" \"#"
+"{]}#\" (without \"\"); e.g. \"#{if [ -x /bin/foo ]; ...}#\" and not \"#{if "
+"test -x /bin/foo; ...}#\"."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:135
 msgid ""
-"_* Use case wherever possible over test, as it's easier to read and faster "
-"in execution."
+"_* Use #{case}# wherever possible over #{test}#, as it's easier to read and "
+"faster in execution."
 msgstr ""
diff --git a/manual/po/pt_BR/project_procedures.ssi.po b/manual/po/pt_BR/project_procedures.ssi.po
index 44d4805..33678b6 100644
--- a/manual/po/pt_BR/project_procedures.ssi.po
+++ b/manual/po/pt_BR/project_procedures.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-30 10:35+0100\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -20,65 +20,62 @@ 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_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:24
+#: 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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr "code{"
@@ -87,65 +84,62 @@ 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:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: 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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr "}code"
@@ -157,7 +151,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:4
-msgid "1~ Procedures"
+msgid "1~procedures Procedures"
 msgstr ""
 
 #. type: Plain text
@@ -179,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
@@ -263,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
@@ -279,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 18d90aa..162f488 100644
--- a/manual/po/pt_BR/user_basics.ssi.po
+++ b/manual/po/pt_BR/user_basics.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-28 07:16-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -18,132 +18,128 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: 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/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: 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/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
-#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
-#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
-#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
-#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
-#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
+#: 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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
-#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
-#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
-#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
-#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
-#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr "}code"
@@ -217,16 +213,11 @@ msgid ""
 "size. Note that it is read-only. So, during boot the Debian Live system will "
 "use a RAM disk and 'union' mechanism to enable writing files within the "
 "running system. However, all modifications will be lost upon shutdown unless "
-"optional persistence is used (see persistence)."
+"optional persistence is used (see {Persistence}#persistence)."
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:20
-msgid "% FIXME: <xref linkend=\"persistence\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:22
 msgid ""
 "_* *{Bootloader}*: A small piece of code crafted to boot from the chosen "
 "media, possibly presenting a prompt or menu to allow selection of options/"
@@ -240,20 +231,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
 msgid ""
 "You can use live-build to build the system image from your specifications, "
 "set up a Linux kernel, its initrd, and a bootloader to run them, all in one "
-"media-dependant format (ISO9660 image, disk image, etc.)"
+"media-dependant format (ISO9660 image, disk image, etc.)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
 msgid "2~ First steps: building an ISO image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
 msgid ""
 "The following sequence of live-build commands will create a basic ISO hybrid "
 "image containing just the Debian standard system without X.org. It is "
@@ -263,93 +254,99 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
 msgid ""
 "First, we run the #{lb config}# command which will create a \"config/\" "
 "hierarchy in the current directory for use by other commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:34
-msgid "$ lb config"
+#: en/user_basics.ssi:32
+#, no-wrap
+msgid " $ lb config\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:38
+#: en/user_basics.ssi:36
 msgid ""
 "By passing no parameters to #{lb config}#, we indicated that we wish to use "
 "the defaults (see {The lb config command}#lb-config)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:40
+#: en/user_basics.ssi:38
 msgid ""
-"Now that we have a \"config/\" hierarchy, we may build the image with the lb "
-"build command:"
+"Now that we have a \"config/\" hierarchy, we may build the image with the #"
+"{lb build}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
-#: en/user_examples.ssi:106 en/user_examples.ssi:153
-msgid "# lb build"
+#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#, no-wrap
+msgid " # lb build\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:48
+#: en/user_basics.ssi:46
 msgid ""
 "This process can take a while, depending on the speed of your network "
 "connection (see {The lb build command}#lb-build)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:50
+#: en/user_basics.ssi:48
 msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:52
+#: en/user_basics.ssi:50
 msgid "Testing an ISO is simple:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:56 en/user_basics.ssi:144
-msgid "# apt-get install qemu"
+#: en/user_basics.ssi:54 en/user_basics.ssi:142
+#, no-wrap
+msgid " # apt-get install qemu\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:58
-msgid "$ qemu -cdrom binary.iso"
+#: en/user_basics.ssi:56
+#, no-wrap
+msgid " $ qemu -cdrom binary.iso\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:62
+#: en/user_basics.ssi:60
 msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:64
+#: en/user_basics.ssi:62
 msgid "In order to test the ISO with virtualbox-ose:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:68
-msgid "# apt-get install virtualbox-ose virtualbox-ose-dkms"
+#: en/user_basics.ssi:66
+#, no-wrap
+msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:70
-msgid "$ virtualbox"
+#: en/user_basics.ssi:68
+#, no-wrap
+msgid " $ virtualbox\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:74
+#: en/user_basics.ssi:72
 msgid ""
 "Create a new virtual machine, change the storage settings to use binary.iso "
 "as the CD/DVD device, and start the machine."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:76
+#: en/user_basics.ssi:74
 msgid ""
 "Note: For live systems containing X.org that you want to test with "
 "virtualbox-ose, you may wish to include the VirtualBox X.org driver package, "
@@ -358,37 +355,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:80
-msgid "# lb config --packages virtualbox-ose-guest-x11"
+#: en/user_basics.ssi:78
+#, no-wrap
+msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:84
+#: en/user_basics.ssi:82
 msgid "3~burning-iso-image Burning an ISO image to a physical medium"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:86
+#: en/user_basics.ssi:84
 msgid "Burning an ISO image is easy:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:90
-msgid "# apt-get install wodim"
+#: en/user_basics.ssi:88
+#, no-wrap
+msgid " # apt-get install wodim\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:92
-msgid "$ wodim binary.iso"
+#: en/user_basics.ssi:90
+#, no-wrap
+msgid " $ wodim binary.iso\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:94
 msgid "2~ Building a USB/HDD image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:98
+#: en/user_basics.ssi:96
 msgid ""
 "The following sequence of commands will create a basic USB/HDD image "
 "containing just the Debian standard system without X.org. It is suitable for "
@@ -400,7 +400,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:100
+#: en/user_basics.ssi:98
 msgid ""
 "Note: if you created an ISO image with the previous example, you will need "
 "to clean up your working directory with the #{lb clean}# command (see {The "
@@ -408,34 +408,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:104 en/user_basics.ssi:186
-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
-#: en/user_basics.ssi:108
+#: en/user_basics.ssi:106
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the #{config/}"
 "# hierarchy to create a USB/HDD image type:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:112
-msgid "$ lb config -b usb-hdd"
+#: en/user_basics.ssi:110
+#, no-wrap
+msgid " $ lb config -b usb-hdd\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:116
-msgid "Now build the image with the #{lb build} command:"
+#: en/user_basics.ssi:114 en/user_basics.ssi:198
+msgid "Now build the image with the #{lb build}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:124
+#: en/user_basics.ssi:122
 msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:126
+#: en/user_basics.ssi:124
 msgid ""
 "The generated binary image contains a VFAT partition and the syslinux "
 "bootloader, ready to be directly written on a USB stick. Plug in a USB stick "
@@ -443,12 +445,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:130
-msgid "$ dd if=binary.img of=${USBSTICK}"
+#: en/user_basics.ssi:128
+#, no-wrap
+msgid " $ dd if=binary.img of=${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:134
+#: en/user_basics.ssi:132
 msgid ""
 "where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
 "a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -457,35 +460,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:136
+#: en/user_basics.ssi:134
 #, no-wrap
 msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:136
 msgid ""
 "Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
-"type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images."
+"type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:140
+#: en/user_basics.ssi:138
 msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:146
-msgid "$ qemu -hda binary.img"
+#: en/user_basics.ssi:144
+#, no-wrap
+msgid " $ qemu -hda binary.img\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:148
 msgid "3~ Using the space left on a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:152
+#: en/user_basics.ssi:150
 msgid ""
 "If you want to use the remaining free space after you have installed the "
 "binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -494,45 +498,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:156
-msgid "# gparted ${USBSTICK}"
+#: en/user_basics.ssi:154
+#, no-wrap
+msgid " # gparted ${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:160
+#: en/user_basics.ssi:158
 msgid ""
 "After the creation of the partition, you have to create a filesystem on it. "
 "One possible choice would be ext4."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:164
-msgid "# mkfs.ext4 ${USBSTICK}"
+#: en/user_basics.ssi:162
+#, no-wrap
+msgid " # mkfs.ext4 ${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:168
+#: en/user_basics.ssi:166
 msgid "If you want to use this data partition with Windows, use FAT32."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:172
-msgid "# mkfs.vfat -F 32"
+#: en/user_basics.ssi:170
+#, no-wrap
+msgid " # mkfs.vfat -F 32\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:176
+#: en/user_basics.ssi:174
 #, no-wrap
 msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:176
 msgid "2~building-netboot-image Building a netboot image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:178
 msgid ""
 "The following sequence of commands will create a basic netboot image "
 "containing the Debian standard system without X.org. It is suitable for "
@@ -540,43 +547,38 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:182
+#: en/user_basics.ssi:180
 msgid ""
 "Note: if you performed any previous examples, you will need to clean up your "
 "working directory with the #{lb clean}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:190
+#: en/user_basics.ssi:188
 msgid ""
-"Run the #{lb config}# command with the parameters to configure the \"config/"
-"\" hierarchy to create our netboot image:"
+"Run the #{lb config}# command as follows to configure your image for "
+"netbooting:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:194
-msgid ""
-"$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
-"\"192.168.0.1\""
+#: en/user_basics.ssi:192
+#, 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
-#: en/user_basics.ssi:198
+#: en/user_basics.ssi:196
 msgid ""
-"In contrast with the ISO and USB/HDD images, netbooting does not support "
-"serving a filesystem image with the client, so the files must be served via "
-"NFS. The net-root-path and net-root-server options specify the location and "
-"server, respectively, of the NFS server where the filesytem image will be "
-"located at boot time."
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:200
-msgid "Now build the image with the #{lb build}# command:"
+"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
+"serve the filesystem image to the client, so the files must be served via "
+"NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the "
+"location and server, respectively, of the NFS server where the filesytem "
+"image will be located at boot time. Make sure these are set to suitable "
+"values for your network and server."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:206
 msgid ""
 "In a network boot, the client runs a small piece of software which usually "
 "resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -587,26 +589,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:208
 msgid ""
-"For example, if you unpack the generated binary-net.tar.gz archive in the /"
-"srv/debian-live directory, you'll find the filesystem image in live/"
-"filesystem.squashfs and the kernel, initrd and pxelinux bootloader in "
-"tftpboot/debian-live/i386."
+"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
+"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
+"in #{tftpboot/debian-live/i386}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:212
-msgid "We must now configure three services on the server to enable netboot."
+#: en/user_basics.ssi:210
+msgid ""
+"We must now configure three services on the server to enable netboot: the "
+"DHCP server, the TFTP server and the NFS server."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:212
 msgid "3~ DHCP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:214
 msgid ""
 "We must configure our network's DHCP server to be sure to give an IP address "
 "to the netbooting client system, and to advertise the location of the PXE "
@@ -614,109 +618,93 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:216
 msgid ""
 "Here is an example for inspiration, written for the ISC DHCP server #{isc-"
-"dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
+"dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:220
-msgid "% FIXME"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:224
 #, no-wrap
-msgid "subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
+msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:227
+#: en/user_basics.ssi:222
 #, no-wrap
-msgid ""
-"  # IP addresses available for guests\n"
-"  range 192.168.1.100 192.168.1.149;\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:230
-#, no-wrap
-msgid ""
-"  # allow booting from the net\n"
-"  allow bootp;\n"
+msgid " ddns-update-style none;\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:235
+#: en/user_basics.ssi:225
 #, no-wrap
 msgid ""
-"  # for net booting, server where the first file to be loaded (by TFTP\n"
-"  # protocol) (\"filename\" following definition) lies: so the TFTP\n"
-"  # server's name.\n"
-"  next-server myserver;\n"
+" 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:239
+#: en/user_basics.ssi:228
 #, no-wrap
 msgid ""
-"  # net boot configuration for guests with a PXE client:\n"
-"  if substring (option vendor-class-identifier, 0, 9) = \"PXEClient\" {\n"
-"    # Note: all files for PXE are relatives to the TFTP server's root\n"
+" default-lease-time 600;\n"
+" max-lease-time 7200;\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:242
+#: en/user_basics.ssi:230
 #, no-wrap
-msgid ""
-"    # PXE bootloader (first program to be loaded, by TFTP)\n"
-"    filename \"pxelinux.0\";\n"
+msgid " log-facility local7;\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:236
 #, no-wrap
 msgid ""
-"  }\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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:240
 msgid "3~ TFTP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:242
 msgid "This serves the kernel and initial ramdisk to the system at run time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:253
+#: en/user_basics.ssi:244
 msgid ""
 "You should install the tftpd-hpa package. It can serve all files contained "
-"inside a root directory, usually /srv/tftp. To let it serve files inside /"
-"srv/debian-live/tftpboot, run as root the following command:"
+"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
+"#{/srv/debian-live/tftpboot}#, run as root the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:257
-msgid "dpkg-reconfigure -plow tftpd-hpa"
+#: en/user_basics.ssi:248
+#, no-wrap
+msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:252
 msgid "and fill in the new tftp server directory when being asked about it."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:254
 msgid "3~ NFS server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:256
 msgid ""
 "Once the guest computer has downloaded and booted a Linux kernel and loaded "
 "its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -724,161 +712,188 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:267
-msgid "You need to install the nfs-kernel-server package."
+#: en/user_basics.ssi:258
+msgid "You need to install the #{nfs-kernel-server}# package."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:260
 msgid ""
 "Then, make the filesystem image available through NFS by adding a line like "
-"the following to /etc/exports:"
+"the following to #{/etc/exports}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:273
-msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
+#: en/user_basics.ssi:264
+#, no-wrap
+msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:277
+#: en/user_basics.ssi:268
 msgid ""
 "and tell the NFS server about this new export with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:281
-msgid "# exportfs -rv"
+#: en/user_basics.ssi:272
+#, no-wrap
+msgid " # exportfs -rv\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:276
 msgid ""
 "Setting up these three services can be a little tricky. You might need some "
-"patience to get all of them working together. The Debian Installer Manual's "
-"TFTP Net Booting section at http://d-i.alioth.debian.org/manual/en.i386/"
-"ch04s05.html might help as that process is very similar."
+"patience to get all of them working together. For more information, see the "
+"syslinux wiki at http://syslinux.zytor.com/wiki/index.php/PXELINUX or the "
+"Debian Installer Manual's TFTP Net Booting section at http://d-i.alioth."
+"debian.org/manual/en.i386/ch04s05.html. They might help, as their processes "
+"are very similar."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:278
 msgid "3~ Netboot testing HowTo"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:280
 msgid ""
 "Netboot image creation is made easy with live-build magic, but testing the "
 "images on physical machines can be really time consuming."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:282
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:284
 msgid "3~ Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:295
-msgid "_* Install qemu, bridge-utils, sudo."
+#: en/user_basics.ssi:286
+msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:297
-msgid "Edit /etc/qemu-ifup:"
+#: en/user_basics.ssi:288
+msgid "Edit #{/etc/qemu-ifup}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:308
+#: 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
-#: en/user_basics.ssi:312
-msgid "Get, or build a grub-floppy-netboot (in the svn)."
+#: en/user_basics.ssi:303
+msgid "Get, or build a #{grub-floppy-netboot}# (in the svn)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:314
-msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
+#: en/user_basics.ssi:305
+msgid ""
+"Launch #{qemu}# with \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:307
 msgid "3~ VMWare Player"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:309
 msgid "_* Install VMWare Player (\"free as in beer\" edition)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:311
 msgid ""
-"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
+"_* Create a PXETester directory, and create a text file called #{pxe.vwx}# "
+"inside"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:313
 msgid "_* Paste this text inside:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:330
+#: 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:336
+#: 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:339
-msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
+#: en/user_basics.ssi:330
+#, no-wrap
+msgid ""
+" ethernet0.present = \"TRUE\"\n"
+" ethernet0.addressType = \"generated\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:342
-msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
+#: en/user_basics.ssi:333
+#, no-wrap
+msgid ""
+" displayName = \"Test Boot PXE\"\n"
+" guestOS = \"other\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:347
+#: 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
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:342
 msgid ""
-"_* You can play with this configuration file (i.e. change memory limit to "
+"_* You can play with this configuration file (e.g. change memory limit to "
 "256)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:353
+#: en/user_basics.ssi:344
 msgid ""
 "_* Double click on this file (or run VMWare player and select this file)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:354
+#: en/user_basics.ssi:345
 msgid "_* When running just press space if that strange question comes up..."
 msgstr ""
diff --git a/manual/po/pt_BR/user_customization-binary.ssi.po b/manual/po/pt_BR/user_customization-binary.ssi.po
index bb5c6bc..5f37079 100644
--- a/manual/po/pt_BR/user_customization-binary.ssi.po
+++ b/manual/po/pt_BR/user_customization-binary.ssi.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
+"Project-Id-Version: live-manual 2.0.0\n"
 "POT-Creation-Date: 2010-11-30 11:20+0100\n"
 "PO-Revision-Date: 2010-11-30 11:20+0100\n"
 "Last-Translator: Automatically generated\n"
diff --git a/manual/po/pt_BR/user_customization-contents.ssi.po b/manual/po/pt_BR/user_customization-contents.ssi.po
index 2e858ed..b98204f 100644
--- a/manual/po/pt_BR/user_customization-contents.ssi.po
+++ b/manual/po/pt_BR/user_customization-contents.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -18,124 +18,128 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: 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/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: 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/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
-#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
+#: 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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
-#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr "}code"
@@ -152,7 +156,13 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:6
-msgid "This chapter discusses further customization of the live system."
+msgid ""
+"This chapter discusses fine-tuning customization of the live system contents "
+"beyond merely choosing which packages to include. Includes allow you to add "
+"or replace arbitrary files in your Debian Live image, hooks allow you to "
+"execute arbitrary commands at different stages of the build and at boot "
+"time, and preseeding allows you to configure packages when they are "
+"installed by supplying answers to debconf questions."
 msgstr ""
 
 #. type: Plain text
@@ -163,77 +173,63 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-contents.ssi:10
 msgid ""
-"Using includes, it is possible to add (or replace) arbitrary files in your "
-"Debian Live image. live-build provides three mechanisms for using them:"
+"While ideally a Debian live system would include files entirely provided by "
+"unmodified Debian packages, it is sometimes convenient to provide or modify "
+"some content by means of files. Using includes, it is possible to add (or "
+"replace) arbitrary files in your Debian Live image. live-build provides "
+"three mechanisms for using them:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:12
 msgid ""
 "_* Chroot local includes: These allow you to add or replace files to the "
-"chroot/Live filesystem. Please see chroot-local-includes for more "
-"information."
+"chroot/Live filesystem. Please see {Live/chroot local includes}#live-chroot-"
+"local-includes for more information."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:14
-msgid "% FIXME: <xref linkend=\"chroot-local-includes\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:16
 msgid ""
 "_* Binary local includes: These allow you to add or replace files in the "
-"binary image. Please see binary-local-includes for more information."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:18
-msgid "% FIXME: <xref linkend=\"binary-local-includes\"/>"
+"binary image. Please see {Binary local includes}#binary-local-includes for "
+"more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:20
+#: en/user_customization-contents.ssi:16
 msgid ""
 "_* Binary includes: These allow you to add or replace Debian specific files "
 "in the binary image, such as the templates and tools directories. Please see "
-"binary-includes for more information."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:22
-msgid "% FIXME: <xref linkend=\"binary-includes\"/>"
+"{Binary includes}#binary-includes for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:18
 msgid ""
-"Please see terms for more information about the distinction between the "
-"\"Live\" and \"binary\" images."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:26
-msgid "% FIXME: <xref linkend=\"terms\"/>"
+"Please see {Terms}#terms for more information about the distinction between "
+"the \"Live\" and \"binary\" images."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:28
-msgid "3~ Live/chroot local includes"
+#: en/user_customization-contents.ssi:20
+msgid "3~live-chroot-local-includes Live/chroot local includes"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:30
+#: en/user_customization-contents.ssi:22
 msgid ""
 "Chroot local includes can be used to add or replace files in the chroot/Live "
-"filesystem so that they are visible when the Live system is booted. Typical "
-"uses for them are to populate the skeleton user directory (#{/etc/skel}#) "
-"used by the live system to create the live user's home directory, or adding "
-"configuration files where additional processing is not required."
+"filesystem so that they may be used in the Live system. A typical use is to "
+"populate the skeleton user directory (#{/etc/skel}#) used by the Live system "
+"to create the live user's home directory. Another is to supply configuration "
+"files that can be simply added or replaced in the image without processing; "
+"see {Live/chroot local hooks}#live-chroot-local-hooks if processing is "
+"needed."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:32
+#: en/user_customization-contents.ssi:24
 msgid ""
 "To include files, simply add them to your #{config/chroot_local-includes}# "
 "directory. This directory corresponds to the root directory (#{/}#) of the "
@@ -242,53 +238,70 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:37
+#: 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
-#: en/user_customization-contents.ssi:41
+#: en/user_customization-contents.ssi:33
 msgid "Your configuration will then have the following layout:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:52
+#: 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
-#: en/user_customization-contents.ssi:56
+#: en/user_customization-contents.ssi:48
 msgid ""
 "Chroot local includes are installed after package installation so that files "
 "installed by packages are overwritten."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:58
-msgid "3~ Binary local includes"
+#: en/user_customization-contents.ssi:50
+msgid "3~binary-local-includes Binary local includes"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:60
+#: en/user_customization-contents.ssi:52
 msgid ""
-"The same way as chroot local includes work, there exists the corresponding "
-"mechanism to include files in the live media itself."
+"To include material such as documentation or videos on the media filesystem "
+"so that it is accessible immediately upon insertion of the media without "
+"booting the Live system, you can use binary local includes. This works in a "
+"similar fashion to chroot local includes. For example, suppose the files #{~/"
+"video_demo.*}# are demo videos of the live system described by and linked to "
+"by an HTML index page. Simply copy the material to #{config/binary_local-"
+"includes/} as follows:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:56
+#, no-wrap
+msgid " $ cp ~/video_demo.* config/binary_local-includes/\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:60
+msgid "These files will now appear in the root directory of the live media."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:62
-msgid "3~ Binary includes"
+msgid "3~binary-includes Binary includes"
 msgstr ""
 
 #. type: Plain text
@@ -300,28 +313,37 @@ 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
 #: en/user_customization-contents.ssi:72
-msgid "2~ Hooks"
+msgid ""
+"Otherwise, the material will be installed by live-build in #{/includes/}# by "
+"default on the media filesystem, or else you can specify an alternate path "
+"with #{--includes}#."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:74
+msgid "2~ Hooks"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:76
 msgid ""
 "Hooks allow commands to be performed in the chroot and binary stages of the "
 "build in order to customize the image."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:76
-msgid "3~ Live/chroot local hooks"
+#: en/user_customization-contents.ssi:78
+msgid "3~live-chroot-local-hooks Live/chroot local hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:78
+#: en/user_customization-contents.ssi:80
 msgid ""
 "To run commands in the chroot stage, create a hook script containing the "
 "commands in the #{config/chroot_local-hooks}# directory. The hook will run "
@@ -334,12 +356,30 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:80
+#: en/user_customization-contents.ssi:82
+msgid "3~ Boot-time hooks"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:84
+msgid ""
+"To execute commands at boot time, you can supply live-config hooks as "
+"explained in the \"Customization\" section of its man page. Examine live-"
+"config's own hooks provided in #{/lib/live/config/}#, noting the sequence "
+"numbers. Then provide your own hook prefixed with an appropriate sequence "
+"number, either as a chroot local include in #{config/chroot_local-includes/"
+"lib/live/config/}#, or as a custom package as discussed in {Installing "
+"modified or third-party packages}#installing-modified-or-third-party-"
+"packages."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:86
 msgid "3~ Binary local hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:82
+#: en/user_customization-contents.ssi:88
 msgid ""
 "To run commands in the binary stage, create a hook script containing the "
 "commands in the #{config/binary_local-hooks}#. The hook will run after all "
@@ -352,12 +392,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:84
+#: en/user_customization-contents.ssi:90
 msgid "2~ Preseeding Debconf questions"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:86
+#: en/user_customization-contents.ssi:92
 msgid ""
 "Files in the #{config/chroot_local-preseed}# directory are considered to be "
 "debconf preseed files and are installed by live-build using #{debconf-set-"
@@ -365,7 +405,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:87
+#: en/user_customization-contents.ssi:93
 msgid ""
 "For more information about debconf, please see debconf(7) in the #{debconf}# "
 "package."
diff --git a/manual/po/pt_BR/user_customization-installer.ssi.po b/manual/po/pt_BR/user_customization-installer.ssi.po
index 515c5b1..7241f33 100644
--- a/manual/po/pt_BR/user_customization-installer.ssi.po
+++ b/manual/po/pt_BR/user_customization-installer.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-30 10:53+0100\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -17,6 +17,134 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
 #: en/user_customization-installer.ssi:2
 msgid ":B~ Customizing Debian Installer"
 msgstr ""
@@ -30,8 +158,8 @@ msgstr ""
 #: en/user_customization-installer.ssi:6
 msgid ""
 "Debian Live system images can be integrated with Debian Installer. There are "
-"number of different \"types\" of installation, varying in what and how to "
-"install the image."
+"a number of different types of installation, varying in what is included and "
+"how the installer operates."
 msgstr ""
 
 #. type: Plain text
@@ -45,77 +173,132 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:10
-msgid "The three main types of installer are:"
+msgid "2~ Types of Debian Installer"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:12
-msgid ""
-"_* *{\"Regular\" Debian Installer}*: This is a normal Debian Live image with "
-"a seperate kernel and initrd which (when selected from the appropriate "
-"bootloader) launches into a standard Debian Installer instance, just as if "
-"you had downloaded a CD image of Debian and booted it. Images containing a "
-"live system and such an otherwise indepentend installer are often referet to "
-"as \"combined images\"."
+msgid "The three main types of installer are:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:14
+#, no-wrap
+msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as \"combined images\".\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:16
 msgid ""
 "On such images, Debian is installed by fetching and installing .deb packages "
 "using #{debootstrap}# or #{cdebootstrap}#, from the local media or some "
-"network-base network, resulting in a standard Debian system being installed "
+"network-based network, resulting in a standard Debian system being installed "
 "to the hard disk."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:16
+#: en/user_customization-installer.ssi:18
 msgid ""
 "This whole process can be preseeded and customized in a number of ways; see "
 "the relevant pages in the Debian Installer manual for more information. Once "
-"you have a working preseeding file, live-build can automatically place it to "
+"you have a working preseeding file, live-build can automatically put it in "
 "the image and enable it for you."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:18
-msgid ""
-"_* *{\"Live\" Debian Installer}*: This is a Debian Live image with a "
-"seperate kernel and initrd which (when selected from the appropriate "
-"bootloader) launches into an instance of the Debian Installer."
+#: en/user_customization-installer.ssi:20
+#, no-wrap
+msgid "*{\"Live\" Debian Installer}*: This is a Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into an instance of the Debian Installer.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:20
+#: en/user_customization-installer.ssi:22
 msgid ""
 "Installation will proceed in an identical fashion to the \"Regular\" "
 "installation described above, but at the actual package installation stage, "
-"instead of using #{debootstrap}# to fetch and install packages, the \"live\" "
-"filesystem image is copied to the target. This is acchieved with a special "
-"udeb called live-installer. live-installer can be preseeded to be disabled, "
-"allowing to support normal and live installer entries in the bootloader of "
-"the same live media."
+"instead of using #{debootstrap}# to fetch and install packages, the live "
+"filesystem image is copied to the target. This is achieved with a special "
+"udeb called live-installer."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:22
+#: en/user_customization-installer.ssi:24
 msgid ""
 "After this stage, the Debian Installer continues as normal, installing and "
 "configuring items such as bootloaders and local users, etc."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:24
+#: en/user_customization-installer.ssi:26
+msgid ""
+"Note: to support both normal and live installer entries in the bootloader of "
+"the same live media, you must disable live-installer by preseeding #{live-"
+"installer/enable=false}."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:28
+#, no-wrap
+msgid "*{\"Desktop\" Debian Installer}*: Regardless of the type of Debian Installer included, #{d-i}# can be launched from the Desktop by clicking on an icon. This is user friendlier in some situations. In order to make use of this, the debian-installer-launcher package needs to be included.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:30
+msgid ""
+"Note that by default, live-build does not include Debian Installer images in "
+"the images, it needs to be specifically enabled with #{lb config}#. Also, "
+"please note that for the \"Desktop\" installer to work, the kernel of the "
+"live system must match the kernel #{d-i}# uses for the specified "
+"architecture. For example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:35
+#, no-wrap
 msgid ""
-"_* *{\"Desktop\" Debian Installer}*: Regardless of the mode Debian Installer "
-"is used in, d-i can be launched from the Desktop by clicking on an icon. "
-"This is user friendlier in some situations. In order to make use of this, "
-"the debian-installer-launcher package needs to be included."
+" $ 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:39
+msgid "2~ Customizing Debian Installer by preseeding"
+msgstr ""
+
+#. type: Plain text
+#: 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 "
+"answers to questions asked during the installation process, without having "
+"to manually enter the answers while the installation is running. This makes "
+"it possible to fully automate most types of installation and even offers "
+"some features not available during normal installations.\" This kind of "
+"customization is best accomplished with live-build by placing the "
+"configuration in a #{preseed.cfg}# file included in #{config/binary_debian-"
+"installer/}#. For example, to preseed setting the locale to #{en_US}#:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:46
+#, no-wrap
+msgid ""
+" $ 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:50
+msgid "2~ Customizing Debian Installer content"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:25
+#: en/user_customization-installer.ssi:52
 msgid ""
-"Note that by default live-build does not include Debian Installer images in "
-"the images, it needs to be specifically enabled with lb config."
+"For experimental or debugging purposes, you might want to include locally "
+"built #{d-i}# component udeb packages. Place these in #{config/binary_local-"
+"udebs/}# to include them in the image. Additional or replacement files and "
+"directories may be included in the installer initrd as well, in a similar "
+"fashion to {Live/chroot local includes}#live-chroot-local-includes, by "
+"placing the material in #{config/binary_debian-installer-includes/}#."
 msgstr ""
diff --git a/manual/po/pt_BR/user_customization-internationalization.ssi.po b/manual/po/pt_BR/user_customization-internationalization.ssi.po
deleted file mode 100644
index e819cfe..0000000
--- a/manual/po/pt_BR/user_customization-internationalization.ssi.po
+++ /dev/null
@@ -1,222 +0,0 @@
-# Portuguese translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
-"PO-Revision-Date: 2010-10-22 08:57-0200\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: 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/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
-#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
-#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
-msgid "code{"
-msgstr "code{"
-
-#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
-#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
-#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
-msgid "}code"
-msgstr "}code"
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:2
-msgid ":B~ Customizing locale and language"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:4
-msgid "1~customizing-locale-and-language Customizing locale and language"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:6
-msgid "2~ Default locale and keyboard"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:8
-msgid ""
-"The default locale when building a Live system is \"locales=en_US.UTF-8\", "
-"to set the locale for e.g. Switzerland, you can use \"locales=de_CH.UTF-8\"."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:12
-msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:16
-msgid "The entry for a Swiss-German keyboard would be:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:20
-msgid "$ lb config --bootappend-live \"keyboard-layouts=ch\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:24
-msgid "Combined, the keyboard and locale configured for Switzerland would be:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:28
-msgid ""
-"$ lb config --bootappend-live =\"locales=de_CH.UTF-8 keyboard-layouts=ch\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:32
-msgid ""
-"Note: You can find a list of options in the manpage for live-config. "
-"Currently, only UTF-8 locales are supported."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:34
-msgid "2~ l10n Packages"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:36
-msgid ""
-"An experimental feature of live-build is to automatically check for each "
-"package for which it is know that there are -l10n packages available and "
-"install them. To add German packages the entry would be"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:40
-msgid "$ lb config --language \"de\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:43
-msgid ""
-"This will also change the default syslinux language if translations are "
-"available or local translations have been put into #{config/templates/"
-"syslinux/de}#."
-msgstr ""
diff --git a/manual/po/pt_BR/user_customization-overview.ssi.po b/manual/po/pt_BR/user_customization-overview.ssi.po
index 0544052..d85fefc 100644
--- a/manual/po/pt_BR/user_customization-overview.ssi.po
+++ b/manual/po/pt_BR/user_customization-overview.ssi.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
+"Project-Id-Version: live-manual 2.0.0\n"
 "POT-Creation-Date: 2010-11-27 09:40-0400\n"
 "PO-Revision-Date: 2010-10-22 08:57-0200\n"
 "Last-Translator: Automatically generated\n"
diff --git a/manual/po/pt_BR/user_customization-packages.ssi.po b/manual/po/pt_BR/user_customization-packages.ssi.po
index 22a1d75..6972949 100644
--- a/manual/po/pt_BR/user_customization-packages.ssi.po
+++ b/manual/po/pt_BR/user_customization-packages.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-01 21:10-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -20,32 +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/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
+#: 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
@@ -58,25 +50,29 @@ msgstr ""
 #: en/user_customization-packages.ssi:185
 #: en/user_customization-packages.ssi:199
 #: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
 #: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:321 en/user_customization-runtime.ssi:12
-#: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
-#: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
-#: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
-#: en/user_customization-runtime.ssi:92 en/user_customization-runtime.ssi:101
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
 #: en/user_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_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:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:108
-#: en/user_installation.ssi:126 en/user_installation.ssi:141
-#: en/user_managing_a_configuration.ssi:24
+#: 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,32 +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:173 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
+#: 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
@@ -126,25 +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:285
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
 #: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:334 en/user_customization-runtime.ssi:16
-#: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: 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_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:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:112
-#: en/user_installation.ssi:131 en/user_installation.ssi:144
-#: en/user_managing_a_configuration.ssi:31
+#: 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
@@ -208,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
@@ -223,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
@@ -282,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
@@ -315,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
@@ -346,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
@@ -378,8 +373,9 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:82
-msgid "$ lb config --repository live.debian.net"
+#: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
+#, no-wrap
+msgid " $ lb config --repository live.debian.net\n"
 msgstr ""
 
 #. type: Plain text
@@ -414,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
@@ -465,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
@@ -561,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
@@ -589,20 +590,27 @@ 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
 #: en/user_customization-packages.ssi:163
 msgid ""
-"You may test for any one of a number of values, e.g. to install #"
-"{memtest86+ }# if either #{--architecture i386}# or #{--architecture amd64}# "
-"is specified:"
+"You may test for any one of a number of values, e.g. to install #{memtest86+}"
+"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
 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
@@ -615,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
@@ -625,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
@@ -651,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
@@ -673,11 +690,11 @@ msgstr ""
 msgid ""
 "Desktop and language tasks are special cases. In the Debian Installer, if "
 "the medium was prepared for a particular desktop environment flavour, the "
-"corresponding task will be automatically installed. Thus, there are there "
-"are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}"
-"# tasks, none of which are offered in #{tasksel}#'s menu. Likewise, there "
-"are no menu entries for tasks for languages, but the user's language choice "
-"during the install influences the selection of corresponding language tasks."
+"corresponding task will be automatically installed. Thus, there are #{gnome-"
+"desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}# tasks, "
+"none of which are offered in #{tasksel}#'s menu. Likewise, there are no menu "
+"entries for tasks for languages, but the user's language choice during the "
+"install influences the selection of corresponding language tasks."
 msgstr ""
 
 #. type: Plain text
@@ -699,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
@@ -710,27 +727,51 @@ msgid ""
 "the desktop flavours mentioned above, which select the #{standard-x11}# "
 "predefined package list, the corresponding #{*-desktop}# task and three "
 "additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example, "
-"if you specify #{--packages gnome-desktop}#, it is equivalent to specifying #"
-"{--packages standard-x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
+"if you specify #{--packages-lists gnome-desktop}#, it is equivalent to "
+"specifying #{--packages debian-installer-launcher --packages-lists standard-"
+"x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:223
 msgid ""
 "Third, if any of the tasks for these desktop flavours are selected, either "
-"explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build "
-"will preseed the corresponding desktop value for Debian Installer (if it is "
-"included) to ensure it follows its own rules for installing different "
+"explicitly through #{--tasks}# or implicitly by #{--packages-lists}#, live-"
+"build will preseed the corresponding desktop value for Debian Installer (if "
+"it is included) to ensure it follows its own rules for installing different "
 "desktop flavours."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:225
-msgid "2~ Installing modified or third-party packages"
+#, no-wrap
+msgid "*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are in
 stalled. For example:\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:229
+#, no-wrap
+msgid " $ lb config --language es\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:233
+msgid ""
+"Even so, it is limited in that it only supports a single language and a "
+"single bootloader. Therefore, for all of these reasons, the future of this "
+"option is under review, possibly to be replaced with something entirely "
+"different in the next major release of live-build."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:235
+msgid ""
+"2~installing-modified-or-third-party-packages Installing modified or third-"
+"party packages"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:237
 msgid ""
 "Whilst it is against the philosophy of Debian Live, it may sometimes be "
 "necessary to build a Live system with modified versions of packages that are "
@@ -741,7 +782,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:239
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -752,22 +793,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:241
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:243
 msgid "_* #{chroot_local-packages}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:245
 msgid "_* Using a custom APT repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:247
 msgid ""
 "Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
 "off\" customizations but has a number of drawbacks, whilst using a custom "
@@ -775,12 +816,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:249
 msgid "3~ Using #{chroot_local-packages}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:251
 msgid ""
 "To install a custom package, simply copy it to the #{config/chroot_local-"
 "packages/}# directory. Packages that are inside this directory will be "
@@ -789,45 +830,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:253
 msgid ""
 "Packages *{must}* be named in the prescribed way. One simple way to do this "
 "is to use #{dpkg-name}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:255
 msgid ""
 "Using #{chroot_local-packages}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:257
 msgid "_* It is not possible to use secure APT."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:259
 msgid ""
 "_* You must install all appropriate packages in the #{config/chroot_local-"
 "packages/}# directory."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:261
 msgid ""
 "_* It does not lend itself to storing Debian Live configurations in revision "
 "control."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:263
 msgid "3~ Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:265
 msgid ""
 "Unlike using #{chroot_local-packages}#, when using a custom APT repository "
 "you must ensure that you specify the packages elsewhere. See {Choosing "
@@ -835,7 +876,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:267
 msgid ""
 "Whilst it may seem unnecessary effort to create an APT repository to install "
 "custom packages, the infrastructure can be easily re-used at a later date to "
@@ -843,12 +884,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:269
 msgid "3~ Custom packages and APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:271
 msgid ""
 "live-build uses APT to install all packages into the live system so will "
 "therefore inherit behaviours from this program. One relevant example is that "
@@ -858,7 +899,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:273
 msgid ""
 "Because of this, you may wish to increment the version number in your custom "
 "packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -868,12 +909,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:275
 msgid "2~ Configuring APT at build time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:277
 msgid ""
 "You can configure APT through a number of options applied only at build "
 "time. (APT configuration used in the running live system may be configured "
@@ -884,12 +925,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:279
 msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:281
 msgid ""
 "You can elect to use either #{apt}# or #{aptitude}# when installing packages "
 "at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -899,26 +940,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283
 msgid ""
 "_* #{apt}#: With this method, if a missing package is specified, the package "
 "installation will fail. This is the default setting."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:285
 msgid ""
 "_* #{aptitude}#: With this method, if a missing package is specified, the "
 "package installation will succeed."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287
 msgid "3~ Using a proxy with APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:279
+#: en/user_customization-packages.ssi:289
 msgid ""
 "One commonly required APT configuration is to deal with building an image "
 "behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -926,17 +967,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:283
-msgid "lb config --apt-http-proxy http://proxy/"
+#: en/user_customization-packages.ssi:293
+#, no-wrap
+msgid " $ lb config --apt-http-proxy http://proxy/\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:287
+#: en/user_customization-packages.ssi:297
 msgid "3~ Tweaking APT to save space"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:299
 msgid ""
 "You may find yourself needing to save some space on the image media, in "
 "which case one or the other or both of the following options may be of "
@@ -944,19 +986,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:301
 msgid ""
 "If you don't want to include APT indices in the image, you can omit those "
 "with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:295
-msgid "$ lb config --binary-indices false"
+#: en/user_customization-packages.ssi:305
+#, no-wrap
+msgid " $ lb config --binary-indices false\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:299
+#: en/user_customization-packages.ssi:309
 msgid ""
 "This will not influence the entries in /etc/apt/sources.list, but merely "
 "whether /var/lib/apt contains the indices files or not. The tradeoff is that "
@@ -966,36 +1009,41 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:301
+#: en/user_customization-packages.ssi:311
 msgid ""
 "If you find the installation of recommended packages bloats your image too "
 "much, you may disable that default option of APT with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:305
-msgid "$ lb config --apt-recommends false"
+#: en/user_customization-packages.ssi:315
+#, no-wrap
+msgid " $ lb config --apt-recommends false\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:319
 msgid ""
-"The tradeoff here is that recommended packages are defined as \"packages "
-"that would be found together with this one in all but unusual installations"
-"\" (Debian Policy Manual, 7.2). This may lead to some packages that you "
-"actually need being omitted, so we suggest you review the difference this "
-"makes to your packages list (see the #{binary.packages}# file generated by #"
-"{lb build}#) and re-include in your list any missing packages that you still "
-"want installed."
+"The tradeoff here is that if you don't install recommended packages for a "
+"given package, that is, \"packages that would be found together with this "
+"one in all but unusual installations\" (Debian Policy Manual, 7.2), some "
+"packages that you actually need may be omitted. Therefore, we suggest you "
+"review the difference turning off recommends makes to your packages list "
+"(see the #{binary.packages}# file generated by #{lb build}#) and re-include "
+"in your list any missing packages that you still want installed. "
+"Alternatively, if you find you only want a small number of recommended "
+"packages left out, leave recommends enabled and set a negative APT pin "
+"priority on selected packages to prevent them from being installed, as "
+"explained in {APT pinning}#apt-pinning."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:321
 msgid "3~ Passing options to apt or aptitude"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:323
 msgid ""
 "If there is not an #{lb config}# option to alter APT's behaviour in the way "
 "you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -1004,12 +1052,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:315
+#: en/user_customization-packages.ssi:325
 msgid "3~apt-pinning APT pinning"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:327
 msgid ""
 "For background, please first read the #{apt_preferences(5)}# man page. APT "
 "pinning can be configured either for build time, or else for run time. For "
@@ -1018,7 +1066,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:329
 msgid ""
 "Let's say you are building a Squeeze live system but need all #{live-*}# "
 "packages to be installed from Sid at build time. You need to add Sid to your "
@@ -1028,14 +1076,42 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:327
+#: 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:332
-msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
+#: en/user_customization-packages.ssi:342
+#, 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
+msgid ""
+"Negative pin priorities will prevent a package from being installed, as in "
+"the case where you do not want a package that is recommended by another "
+"package. Suppose you are building a GNOME image but don't want the user "
+"prompted to store wifi passwords in the keyring, so you want to omit the "
+"recommended #{gnome-keyring}# package. This can be done by adding the "
+"following stanza to #{config/chroot_apt/preferences}#:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:352
+#, 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.new.ssi.po b/manual/po/pt_BR/user_customization-runtime.new.ssi.po
deleted file mode 100644
index 2fd7072..0000000
--- a/manual/po/pt_BR/user_customization-runtime.new.ssi.po
+++ /dev/null
@@ -1,647 +0,0 @@
-# Portuguese translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-02 20:07-0400\n"
-"PO-Revision-Date: 2010-12-02 20:07-0400\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: pt_BR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/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/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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:293
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:321
-#: en/user_customization-runtime.new.ssi:14
-#: en/user_customization-runtime.new.ssi:34
-#: en/user_customization-runtime.new.ssi:42
-#: en/user_customization-runtime.new.ssi:50
-#: en/user_customization-runtime.new.ssi:64
-#: en/user_customization-runtime.new.ssi:76
-#: en/user_customization-runtime.new.ssi:86
-#: en/user_customization-runtime.new.ssi:94
-#: en/user_customization-runtime.new.ssi:102
-#: en/user_customization-runtime.new.ssi:110
-#: en/user_customization-runtime.new.ssi:130
-#: en/user_customization-runtime.new.ssi:138
-#: en/user_customization-runtime.new.ssi:147
-#: en/user_customization-runtime.ssi:12 en/user_customization-runtime.ssi:30
-#: en/user_customization-runtime.ssi:40 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:56 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:92
-#: en/user_customization-runtime.ssi:101 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:141 en/user_managing_a_configuration.ssi:24
-#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47
-#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
-msgid "code{"
-msgstr "code{"
-
-#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:173 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/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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:297
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:334
-#: en/user_customization-runtime.new.ssi:18
-#: en/user_customization-runtime.new.ssi:38
-#: en/user_customization-runtime.new.ssi:46
-#: en/user_customization-runtime.new.ssi:54
-#: en/user_customization-runtime.new.ssi:68
-#: en/user_customization-runtime.new.ssi:80
-#: en/user_customization-runtime.new.ssi:90
-#: en/user_customization-runtime.new.ssi:98
-#: en/user_customization-runtime.new.ssi:106
-#: en/user_customization-runtime.new.ssi:114
-#: en/user_customization-runtime.new.ssi:134
-#: en/user_customization-runtime.new.ssi:143
-#: en/user_customization-runtime.new.ssi:152
-#: en/user_customization-runtime.ssi:16 en/user_customization-runtime.ssi:34
-#: en/user_customization-runtime.ssi:44 en/user_customization-runtime.ssi:52
-#: en/user_customization-runtime.ssi:60 en/user_customization-runtime.ssi:68
-#: en/user_customization-runtime.ssi:88 en/user_customization-runtime.ssi:97
-#: en/user_customization-runtime.ssi:106 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:31
-#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
-msgid "}code"
-msgstr "}code"
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:8
-#: en/user_customization-runtime.new.ssi:32
-msgid ""
-"The default locale when building a Live system is \"locales=en_US.UTF-8\", "
-"to set the locale for e.g. Switzerland, you can use \"locales=de_CH.UTF-8\"."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:12
-#: en/user_customization-runtime.new.ssi:36
-msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:16
-#: en/user_customization-runtime.new.ssi:40
-msgid "The entry for a Swiss-German keyboard would be:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:20
-#: en/user_customization-runtime.new.ssi:44
-msgid "$ lb config --bootappend-live \"keyboard-layouts=ch\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:24
-#: en/user_customization-runtime.new.ssi:48
-msgid "Combined, the keyboard and locale configured for Switzerland would be:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:28
-#: en/user_customization-runtime.new.ssi:52
-msgid ""
-"$ lb config --bootappend-live =\"locales=de_CH.UTF-8 keyboard-layouts=ch\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:32
-#: en/user_customization-runtime.new.ssi:56
-msgid ""
-"Note: You can find a list of options in the manpage for live-config. "
-"Currently, only UTF-8 locales are supported."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:40
-#: en/user_customization-runtime.new.ssi:66
-msgid "$ lb config --language \"de\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:43
-#: en/user_customization-runtime.new.ssi:70
-msgid ""
-"This will also change the default syslinux language if translations are "
-"available or local translations have been put into #{config/templates/"
-"syslinux/de}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:2
-msgid ":B~ Customizing run time behaviours"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:4
-msgid "1~customizing-run-time-behaviours Customizing run time behaviours"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:6
-msgid ""
-"All configuration that is done during run time is done by live-config. Here "
-"are some most common options of live-config that users are interested in. A "
-"full list of all possibilities can be found in the manpage of live-config."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:8
-msgid "2~ Customizing the live user"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:10
-msgid ""
-"One important consideration is that the live user is created by live-boot at "
-"boot time, not by live-build at build time. This not only influences where "
-"materials relating to the live user are introduced in your build, as "
-"discussed in {Live/chroot local includes}#live-chroot-local-includes, but "
-"also any groups and permissions associated with the live user."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:12
-#: en/user_customization-runtime.ssi:10
-msgid ""
-"You can specify additional groups that the live user will belong to by "
-"preseeding the #{passwd/user-default-groups}# debconf value. For example, to "
-"add the live user to the #{fuse}# group, add the following to a file in the #"
-"{config/chroot_local-preseed}# directory:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:16
-#: en/user_customization-runtime.ssi:14
-msgid ""
-"debconf passwd/user-default-groups string audio cdrom dialout floppy video "
-"plugdev netdev powerdev fuse"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:20
-msgid "2~customizing-locale-and-language Customizing locale and language"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:22
-#: en/user_customization-runtime.ssi:20
-msgid "When the live system boots, language is involved in three steps:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:24
-#: en/user_customization-runtime.ssi:22
-msgid "_* the locale generation"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:26
-#: en/user_customization-runtime.ssi:24
-msgid "_* setting the keyboard layout for the console"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:28
-#: en/user_customization-runtime.ssi:26
-msgid "_* setting the keyboard layout for X"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:30
-msgid "3~ Default locale and keyboard"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:58
-msgid "3~ l10n Packages"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:60
-msgid ""
-"% FIXME: not a run time configuration! Belongs in packages chapter. (See --"
-"tasks discussion.)"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:62
-msgid ""
-"An experimental feature of live-build is to automatically check for each "
-"package for which it is known that there are #{*-l10n}# packages available "
-"and install them. To add German packages the entry would be"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:72
-msgid "3~ Language"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:74
-msgid ""
-"To define the locale that should be generated, use the #{locales}# parameter "
-"into the #{--bootappend-live}# option of #{lb config}#, e.g.:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:78
-#: en/user_customization-runtime.ssi:32
-msgid "lb config --bootappend-live \"locales=de_CH.UTF-8\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:82
-#: en/user_customization-runtime.ssi:36
-msgid ""
-"This parameter can also be used in kernel command line. You can specify a "
-"locale by a full #{language_country.encoding}# word."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:84
-#: en/user_customization-runtime.ssi:38
-msgid ""
-"Both the console and X keyboard configuration depends on the #{keyb}# "
-"parameter of the #{--bootappend-live}# option. Valid options for X keyboard "
-"layouts can be found in #{/etc/X11/xkb/base.xml}# (rather limited to two-"
-"letters country codes). To find the value (the two characters) corresponding "
-"to a language try searching for the english name of the nation where the "
-"language is spoken, e.g:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:88
-#: en/user_customization-runtime.ssi:42
-msgid "$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name <name>se</name>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:92
-#: en/user_customization-runtime.ssi:46
-msgid ""
-"To get the locale files for German and Swiss German keyboard layout in X use:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:96
-#: en/user_customization-runtime.ssi:50
-msgid "lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:100
-#: en/user_customization-runtime.ssi:54
-msgid ""
-"A list of the valid values of the keyboards for the console can be figured "
-"with the following command:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:104
-#: en/user_customization-runtime.ssi:58
-msgid ""
-"for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); do basename $i | "
-"head -c -9; echo; done | sort | less"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:108
-#: en/user_customization-runtime.ssi:62
-msgid ""
-"Alternatively, you can use the #{console-setup}# package, a tool to let you "
-"configure console layout using X (XKB) definitions; you can then setup your "
-"keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}"
-"#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use "
-"also these parameters for X configuration. For example, to set up a French "
-"system with a French-Dvorak layout (called Bepo) on a TypeMatrix keyboard, "
-"both in console and X11, use:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:112
-#: en/user_customization-runtime.ssi:66
-msgid ""
-"lb config --bootappend-live \"locales=fr_FR.UTF-8 keyboard-layouts=fr "
-"keyboard-variant=bepo keyboard-model=tm2030usb\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:116
-#: en/user_customization-runtime.ssi:70
-msgid "2~ Persistence"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:118
-#: en/user_customization-runtime.ssi:72
-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 "
-"of the host hardware which runs it."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:120
-#: en/user_customization-runtime.ssi:74
-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 "
-"should be considered read-only and all the run-time evolutions of the system "
-"are lost at shutdown."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:122
-#: en/user_customization-runtime.ssi:76
-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 "
-"understand how it could work it could be handy to know that even if the "
-"system is booted and run from read-only media, modification to the files and "
-"directories are written on writable media, typically a ram disk (tmpfs) and "
-"ram disks' data do not survive reboots."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:124
-#: en/user_customization-runtime.ssi:78
-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 "
-"multisession (re)writable CD/DVD. All these media are supported in Debian "
-"Live in different ways, and all but the last one require a special boot "
-"parameter to be specified at boot time: #{persistent}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:126
-#: en/user_customization-runtime.ssi:80
-msgid "3~ Full persistence"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:128
-#: en/user_customization-runtime.ssi:82
-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 "
-"writable partition is used. In order to use this feature a partition with a "
-"clean writable supported filesystem on it labeled \"live-rw\" must be "
-"attached on the system at boot time and the system must be started with the "
-"boot parameter 'persistent'. This partition could be an ext2 partition on "
-"the hard disk or on a usb key created with, e.g.:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:132
-#: en/user_customization-runtime.ssi:86
-msgid "# mkfs.ext2 -L live-rw /dev/sdb1"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:136
-#: en/user_customization-runtime.ssi:90
-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.new.ssi:141
-#: en/user_customization-runtime.ssi:95
-msgid ""
-"# tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems # dosfslabel /dev/"
-"sdb1 live-rw # for a fat filesystem"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:145
-#: en/user_customization-runtime.ssi:99
-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 "
-"could be also used with just image files, so you could create a file "
-"representing a partition and put this image file even on a NTFS partition of "
-"a foreign OS, with something like:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:150
-#: en/user_customization-runtime.ssi:104
-msgid ""
-"$ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file $ /"
-"sbin/mkfs.ext2 -F live-rw"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:154
-#: en/user_customization-runtime.ssi:108
-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.new.ssi:156
-#: en/user_customization-runtime.ssi:110
-msgid "3~ Home automounting"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:158
-#: en/user_customization-runtime.ssi:112
-msgid ""
-"If during the boot a partition (filesystem) image file or a partition "
-"labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
-"as #{/home}#, thus permitting persistence of files that belong to e.g. the "
-"default user. It can be combined with full persistence."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:160
-#: en/user_customization-runtime.ssi:114
-msgid "3~ Snapshots"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:162
-#: en/user_customization-runtime.ssi:116
-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 "
-"(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The "
-"content of a snapshot could reside on a partition or an image file (like the "
-"above mentioned types) labeled #{live-sn}#, but it defaults to a simple cpio "
-"archive named #{live-sn.cpio.gz}#. As above, at boot time, the block devices "
-"connected to the system are traversed to see if a partition or a file named "
-"like that could be found. A power interruption during run time could lead to "
-"data loss, hence a tool invoked #{live-snapshot --refresh}# could be called "
-"to sync important changes. This type of persistence, since it does not write "
-"continuously to the persistent media, is the most flash-based device "
-"friendly and the fastest of all the persistence systems."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:164
-#: en/user_customization-runtime.ssi:118
-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.new.ssi:166
-#: en/user_customization-runtime.ssi:120
-msgid ""
-"Snapshots cannot currently handle file deletion but full persistence and "
-"home automounting can."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:168
-#: en/user_customization-runtime.ssi:122
-msgid "3~ Persistent SubText"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:170
-#: en/user_customization-runtime.ssi:124
-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-"
-"work}#, the boot parameter #{persistent-subtext}# used in conjuntion with "
-"the boot parameter #{persistent}# will allow for multiple but unique "
-"persistent media. An example would be if a user wanted to use a persistent "
-"partition labeled #{live-sn-subText}# they would use the boot parameters of: "
-"#{persistent}# #{persistent-subtext=subText}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:172
-#: en/user_customization-runtime.ssi:126
-msgid "3~ Partial remastering"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:173
-#: en/user_customization-runtime.ssi:127
-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 "
-"case of cd-r or adding a session to multisession cd/dvd(rw); live-boot "
-"mounts all /live filesystem in order or with the module boot parameter."
-msgstr ""
diff --git a/manual/po/pt_BR/user_customization-runtime.ssi.po b/manual/po/pt_BR/user_customization-runtime.ssi.po
index 8fe8e87..f1571ef 100644
--- a/manual/po/pt_BR/user_customization-runtime.ssi.po
+++ b/manual/po/pt_BR/user_customization-runtime.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-02 20:07-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -20,32 +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/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
+#: 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
@@ -58,38 +50,29 @@ msgstr ""
 #: en/user_customization-packages.ssi:185
 #: en/user_customization-packages.ssi:199
 #: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
 #: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:321
-#: en/user_customization-runtime.new.ssi:14
-#: en/user_customization-runtime.new.ssi:34
-#: en/user_customization-runtime.new.ssi:42
-#: en/user_customization-runtime.new.ssi:50
-#: en/user_customization-runtime.new.ssi:64
-#: en/user_customization-runtime.new.ssi:76
-#: en/user_customization-runtime.new.ssi:86
-#: en/user_customization-runtime.new.ssi:94
-#: en/user_customization-runtime.new.ssi:102
-#: en/user_customization-runtime.new.ssi:110
-#: en/user_customization-runtime.new.ssi:130
-#: en/user_customization-runtime.new.ssi:138
-#: en/user_customization-runtime.new.ssi:147
-#: en/user_customization-runtime.ssi:12 en/user_customization-runtime.ssi:30
-#: en/user_customization-runtime.ssi:40 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:56 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:92
-#: en/user_customization-runtime.ssi:101 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:141 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_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,32 +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:173 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
+#: 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
@@ -139,38 +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:285
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
 #: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:334
-#: en/user_customization-runtime.new.ssi:18
-#: en/user_customization-runtime.new.ssi:38
-#: en/user_customization-runtime.new.ssi:46
-#: en/user_customization-runtime.new.ssi:54
-#: en/user_customization-runtime.new.ssi:68
-#: en/user_customization-runtime.new.ssi:80
-#: en/user_customization-runtime.new.ssi:90
-#: en/user_customization-runtime.new.ssi:98
-#: en/user_customization-runtime.new.ssi:106
-#: en/user_customization-runtime.new.ssi:114
-#: en/user_customization-runtime.new.ssi:134
-#: en/user_customization-runtime.new.ssi:143
-#: en/user_customization-runtime.new.ssi:152
-#: en/user_customization-runtime.ssi:16 en/user_customization-runtime.ssi:34
-#: en/user_customization-runtime.ssi:44 en/user_customization-runtime.ssi:52
-#: en/user_customization-runtime.ssi:60 en/user_customization-runtime.ssi:68
-#: en/user_customization-runtime.ssi:88 en/user_customization-runtime.ssi:97
-#: en/user_customization-runtime.ssi:106 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:31
+#: 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: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
@@ -179,9 +145,41 @@ msgid "}code"
 msgstr "}code"
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:12
+#: en/user_customization-runtime.ssi:2
+msgid ":B~ Customizing run time behaviours"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:4
+msgid "1~customizing-run-time-behaviours Customizing run time behaviours"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:6
+msgid ""
+"All configuration that is done during run time is done by live-config. Here "
+"are some most common options of live-config that users are interested in. A "
+"full list of all possibilities can be found in the manpage of live-config."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:8
+msgid "2~ Customizing the live user"
+msgstr ""
+
+#. type: Plain text
 #: en/user_customization-runtime.ssi:10
 msgid ""
+"One important consideration is that the live user is created by live-boot at "
+"boot time, not by live-build at build time. This not only influences where "
+"materials relating to the live user are introduced in your build, as "
+"discussed in {Live/chroot local includes}#live-chroot-local-includes, but "
+"also any groups and permissions associated with the live user."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:12
+msgid ""
 "You can specify additional groups that the live user will belong to by "
 "preseeding the #{passwd/user-default-groups}# debconf value. For example, to "
 "add the live user to the #{fuse}# group, add the following to a file in the #"
@@ -189,104 +187,108 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:16
-#: en/user_customization-runtime.ssi:14
-msgid ""
-"debconf passwd/user-default-groups string audio cdrom dialout floppy video "
-"plugdev netdev powerdev fuse"
+#: en/user_customization-runtime.ssi:16
+#, no-wrap
+msgid " debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:22
 #: en/user_customization-runtime.ssi:20
-msgid "When the live system boots, language is involved in three steps:"
+msgid "2~customizing-locale-and-language Customizing locale and language"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:24
 #: en/user_customization-runtime.ssi:22
-msgid "_* the locale generation"
+msgid "When the live system boots, language is involved in three steps:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:26
 #: en/user_customization-runtime.ssi:24
-msgid "_* setting the keyboard layout for the console"
+msgid "_* the locale generation"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:28
 #: en/user_customization-runtime.ssi:26
-msgid "_* setting the keyboard layout for X"
+msgid "_* setting the keyboard layout for the console"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:78
-#: en/user_customization-runtime.ssi:32
-msgid "lb config --bootappend-live \"locales=de_CH.UTF-8\""
+#: en/user_customization-runtime.ssi:28
+msgid "_* setting the keyboard layout for X"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:82
-#: en/user_customization-runtime.ssi:36
+#: en/user_customization-runtime.ssi:30
 msgid ""
-"This parameter can also be used in kernel command line. You can specify a "
-"locale by a full #{language_country.encoding}# word."
+"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
+"To define the locale that should be generated, use the #{locales}# parameter "
+"in the #{--bootappend-live}# option of #{lb config}#, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:34
+#, no-wrap
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:84
 #: en/user_customization-runtime.ssi:38
 msgid ""
-"Both the console and X keyboard configuration depends on the #{keyb}# "
-"parameter of the #{--bootappend-live}# option. Valid options for X keyboard "
-"layouts can be found in #{/etc/X11/xkb/base.xml}# (rather limited to two-"
-"letters country codes). To find the value (the two characters) corresponding "
-"to a language try searching for the english name of the nation where the "
-"language is spoken, e.g:"
+"This parameter can also be used at the kernel command line. You can specify "
+"a locale by a full #{language_country.encoding}# word."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:88
-#: en/user_customization-runtime.ssi:42
-msgid "$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name <name>se</name>"
+#: en/user_customization-runtime.ssi:40
+msgid ""
+"Both the console and X keyboard configuration depend on the #{keyboard-"
+"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
+"keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base.xml}# "
+"(rather limited to two-letters country codes). To find the value (the two "
+"characters) corresponding to a language try searching for the english name "
+"of the nation where the language is spoken, e.g:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:92
-#: en/user_customization-runtime.ssi:46
+#: en/user_customization-runtime.ssi:45
+#, no-wrap
+msgid ""
+" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
+" <name>se</name>\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:49
 msgid ""
 "To get the locale files for German and Swiss German keyboard layout in X use:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:96
-#: en/user_customization-runtime.ssi:50
-msgid "lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\""
+#: en/user_customization-runtime.ssi:53
+#, no-wrap
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:100
-#: en/user_customization-runtime.ssi:54
+#: en/user_customization-runtime.ssi:57
 msgid ""
 "A list of the valid values of the keyboards for the console can be figured "
 "with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:104
-#: en/user_customization-runtime.ssi:58
+#: 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.new.ssi:108
-#: en/user_customization-runtime.ssi:62
+#: 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 setup your "
+"configure console layout using X (XKB) definitions; you can then set your "
 "keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}"
 "#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use "
 "also these parameters for X configuration. For example, to set up a French "
@@ -295,22 +297,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:112
-#: en/user_customization-runtime.ssi:66
+#: 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.new.ssi:116
-#: en/user_customization-runtime.ssi:70
-msgid "2~ Persistence"
+#: en/user_customization-runtime.ssi:75
+msgid "2~persistence Persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:118
-#: en/user_customization-runtime.ssi:72
+#: 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 "
@@ -318,8 +318,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:120
-#: en/user_customization-runtime.ssi:74
+#: 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 "
@@ -328,8 +327,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:122
-#: en/user_customization-runtime.ssi:76
+#: 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 "
@@ -340,8 +338,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:124
-#: en/user_customization-runtime.ssi:78
+#: 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 "
@@ -351,14 +348,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:126
-#: en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:85
 msgid "3~ Full persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:128
-#: en/user_customization-runtime.ssi:82
+#: 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 "
@@ -370,30 +365,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:132
-#: en/user_customization-runtime.ssi:86
-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.new.ssi:136
-#: en/user_customization-runtime.ssi:90
+#: 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.new.ssi:141
-#: en/user_customization-runtime.ssi:95
+#: 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.new.ssi:145
-#: en/user_customization-runtime.ssi:99
+#: 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 "
@@ -403,30 +396,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:150
-#: en/user_customization-runtime.ssi:104
+#: 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.new.ssi:154
-#: en/user_customization-runtime.ssi:108
+#: 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.new.ssi:156
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:115
 msgid "3~ Home automounting"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:158
-#: en/user_customization-runtime.ssi:112
+#: 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 "
@@ -435,14 +425,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:160
-#: en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:119
 msgid "3~ Snapshots"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:162
-#: en/user_customization-runtime.ssi:116
+#: 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 "
@@ -459,30 +447,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:164
-#: en/user_customization-runtime.ssi:118
+#: 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.new.ssi:166
-#: en/user_customization-runtime.ssi:120
+#: 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.new.ssi:168
-#: en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:127
 msgid "3~ Persistent SubText"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:170
-#: en/user_customization-runtime.ssi:124
+#: 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-"
@@ -494,54 +478,15 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:172
-#: en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:131
 msgid "3~ Partial remastering"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:173
-#: en/user_customization-runtime.ssi:127
+#: 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 "
 "case of cd-r or adding a session to multisession cd/dvd(rw); live-boot "
 "mounts all /live filesystem in order or with the module boot parameter."
 msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:2
-msgid "B~ Customization at Runtime"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:4
-msgid ""
-"All configuration that is done during runtime is done by live-config. Here "
-"are some most common options of live-config that users are interested in. A "
-"full list of all possibilities can be found in the manpage of live-config."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:6
-msgid "1~ User"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:8
-msgid ""
-"One important consideration is that the live user is created by live-boot "
-"during bootup, it is not created by live-build when building the image."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:18
-msgid "1~ Language"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:28
-msgid ""
-"To define the locale that should be generated, use the #{locale}# parameter "
-"into the #{--bootappend-live}# option of #{lb config}#, e.g.:"
-msgstr ""
diff --git a/manual/po/pt_BR/user_examples.ssi.po b/manual/po/pt_BR/user_examples.ssi.po
index 7fb1f9a..7d2295a 100644
--- a/manual/po/pt_BR/user_examples.ssi.po
+++ b/manual/po/pt_BR/user_examples.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-28 07:51-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -17,68 +17,70 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
+#: en/live-manual.ssm:61 en/user_examples.ssi:2
+msgid ":B~ Examples"
+msgstr ""
+
+#. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:108 en/about_manual.ssi: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_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/project_bugs.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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
+#: 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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr "code{"
@@ -87,84 +89,71 @@ 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:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: 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: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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr "}code"
 
 #. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:92
-#: en/user_examples.ssi:141 en/user_examples.ssi:190
-msgid "#!/bin/sh"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
-#: en/user_examples.ssi:109 en/user_examples.ssi:156
-msgid "# lb build"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:2
-msgid ":B~ Examples"
+#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#, no-wrap
+msgid " # lb build\n"
 msgstr ""
 
 #. type: Plain text
@@ -209,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
@@ -222,7 +213,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:24
 #, no-wrap
-msgid "*{Use case:}* Create a simple first image, learning the basics of live-build\n"
+msgid "*{Use case:}* Create a simple first image, learning the basics of live-build.\n"
 msgstr ""
 
 #. type: Plain text
@@ -240,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
@@ -258,8 +250,9 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:42
-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,7 +276,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:50
 #, no-wrap
-msgid "*{Use case}* Create a web browser utility image, learning how to apply customizations\n"
+msgid "*{Use case:}* Create a web browser utility image, learning how to apply customizations.\n"
 msgstr ""
 
 #. type: Plain text
@@ -295,7 +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
@@ -317,11 +311,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:66 en/user_examples.ssi:219
-msgid "# lb build 2>&1 | tee binary.log"
-msgstr ""
-
-#. type: Plain text
 #: en/user_examples.ssi:70
 msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
 msgstr ""
@@ -334,7 +323,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:74
 #, no-wrap
-msgid "*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
+msgid "*{Use case:}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
 msgstr ""
 
 #. type: Plain text
@@ -355,9 +344,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:84
+#, no-wrap
 msgid ""
-"$ mkdir -p tutorial3/auto $ cp /usr/share/live/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
@@ -366,15 +357,21 @@ msgid "Edit #{auto/config}# to read as follows:"
 msgstr ""
 
 #. type: Plain text
+#: en/user_examples.ssi:92 en/user_examples.ssi:141
+#, 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
@@ -410,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
@@ -436,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
@@ -448,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
@@ -462,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
@@ -499,80 +507,85 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:174
-msgid "Create an image with live-build to boot directly to a VNC server."
+#, no-wrap
+msgid "*{Use case:}* Create an image with live-build to boot directly to a VNC server.\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:176
-msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:178
-msgid "_* Move to the build directory: #{$ cd vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:180
 msgid ""
-"Example to config the build directory to include gdm metacity "
-"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
+"Make a build directory and create a skeletal configuration in it built "
+"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
+"{xtightvncviewer}#, disabling recommends to make a minimal system:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:182
+#: en/user_examples.ssi:184
+#, no-wrap
 msgid ""
-"Create a folder /etc/skel folder for a custom .xsession for the default "
-"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
+" $ 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
-#: en/user_examples.ssi:184
+#: en/user_examples.ssi:188
 msgid ""
-"Create the .xsession for the default user: #{$ touch config/chroot_local-"
-"includes/etc/skel/.xsession}#"
+"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
+"the default user that will launch metacity and start xvncviewer, connecting "
+"to port #{5901}# on a server at #{192.168.1.2}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:186
+#: en/user_examples.ssi:194
+#, no-wrap
 msgid ""
-"Edit the .xsession file to launch metacity and start xvncviewer with "
-"something similar to the below:"
+" $ 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:193
-msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
+#: en/user_examples.ssi:197
+#, no-wrap
+msgid ""
+" /usr/bin/metacity &\n"
+" /usr/bin/xvncviewer 192.168.1.2:1\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:195
-msgid "exit"
+#: en/user_examples.ssi:200
+#, no-wrap
+msgid ""
+" exit\n"
+" END\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:199
-msgid "_* Build the image: #{# lb build}#"
+#: en/user_examples.ssi:204
+msgid "Build the image:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:201
-msgid "_* Enjoy."
+#: en/user_examples.ssi:212
+msgid "Enjoy."
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:203
+#: en/user_examples.ssi:214
 msgid "2~ A base image for a 128M USB key"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:205
+#: en/user_examples.ssi:216
 #, no-wrap
-msgid "*{Use case}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
+msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:207
+#: en/user_examples.ssi:218
 msgid ""
 "When optimizing an image to fit a certain media size, you need to understand "
 "the tradeoffs you are making between size and functionality. In this "
@@ -586,19 +599,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:211
+#: 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:215
+#: en/user_examples.ssi:227
 msgid "Now, build the image in the usual way:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:223
+#: 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 "
@@ -606,7 +620,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:225
+#: 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 "
@@ -622,3 +636,117 @@ msgid ""
 "you to decide if the functionality that is sacrificed with each optimization "
 "is worth the loss in functionality."
 msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:239
+msgid "2~ A localized KDE desktop and installer"
+msgstr ""
+
+#. type: Plain text
+#: 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: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 "
+"that would be installed by the standard Debian installer for KDE."
+msgstr ""
+
+#. type: Plain text
+#: 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 "
+"find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can be "
+"used to dig it out of the task descriptions in tasksel-data, so to prepare, "
+"make sure you have both of those things:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:249
+#, no-wrap
+msgid " # apt-get install dctrl-tools tasksel-data\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:253
+msgid "Now we can search for the appropriate tasks, first with:"
+msgstr ""
+
+#. type: Plain text
+#: 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"
+msgstr ""
+
+#. type: Plain text
+#: 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: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"
+msgstr ""
+
+#. type: Plain text
+#: 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"
+msgstr ""
+
+#. type: Plain text
+#: 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}"
+"#desktop-and-language-tasks for details). And at boot time we will generate "
+"the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's "
+"put the pieces together:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:295
+#, no-wrap
+msgid ""
+" $ 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"
+msgstr ""
+
+#. type: Plain text
+#: 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 "
+"flavour kernel, as it is currently necessary to make the installer and live "
+"system kernels match for the launcher to work properly."
+msgstr ""
diff --git a/manual/po/pt_BR/user_installation.ssi.po b/manual/po/pt_BR/user_installation.ssi.po
index cc29c8d..f666d3f 100644
--- a/manual/po/pt_BR/user_installation.ssi.po
+++ b/manual/po/pt_BR/user_installation.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-01 06:49-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -20,61 +20,59 @@ 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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:259
-#: en/user_customization-packages.ssi:271
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:299 en/user_customization-runtime.ssi:12
-#: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
-#: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
-#: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
-#: en/user_customization-runtime.ssi:92 en/user_customization-runtime.ssi:101
+#: 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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
 #: en/user_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_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:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:108
-#: en/user_installation.ssi:126 en/user_installation.ssi:141
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -86,61 +84,59 @@ 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:173 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: 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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:263
-#: en/user_customization-packages.ssi:275
-#: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:312 en/user_customization-runtime.ssi:16
-#: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
 #: en/user_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_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:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:112
-#: en/user_installation.ssi:131 en/user_installation.ssi:144
-#: en/user_managing_a_configuration.ssi:31
+#: 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
@@ -149,6 +145,12 @@ msgid "}code"
 msgstr "}code"
 
 #. type: Plain text
+#: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
+#, no-wrap
+msgid " $ lb config --repository live.debian.net\n"
+msgstr ""
+
+#. type: Plain text
 #: en/user_installation.ssi:2
 msgid ":B~ Installation"
 msgstr ""
@@ -233,7 +235,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:34
+#: en/user_installation.ssi:34 en/user_installation.ssi:104
 msgid "3~ From the Debian repository"
 msgstr ""
 
@@ -244,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
@@ -254,11 +257,12 @@ 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
-#: en/user_installation.ssi:52
+#: en/user_installation.ssi:52 en/user_installation.ssi:108
 msgid "3~ From source"
 msgstr ""
 
@@ -272,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
@@ -282,41 +287,55 @@ 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
-#: en/user_installation.ssi:70
-msgid "# dpkg -i live-build*.deb"
+#: en/user_installation.ssi:72
+msgid ""
+"Now install whichever of the freshly built #{.deb}# files you were "
+"interested in, e.g."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:74
+#: en/user_installation.ssi:76
+#, no-wrap
+msgid " # dpkg -i live-build_2.0.8-1_all.deb\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:80
 msgid "You can also install live-build directly to your system by executing:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:78
-msgid "# make install"
+#: en/user_installation.ssi:84
+#, no-wrap
+msgid " # make install\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:82
+#: en/user_installation.ssi:88
 msgid "and uninstall it with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:86
-msgid "# make uninstall"
+#: en/user_installation.ssi:92
+#, no-wrap
+msgid " # make uninstall\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:90
+#: en/user_installation.ssi:96 en/user_installation.ssi:142
 msgid "3~ From 'snapshots'"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:92
+#: en/user_installation.ssi:98
 msgid ""
 "If you do not wish to build or install live-build from source, you can use "
 "snapshots. These are built automatically from the latest version in Git and "
@@ -324,86 +343,65 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:94
-msgid "2~ live-boot"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:96
-#, no-wrap
-msgid "*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:98
-msgid "% FIXME: we also need to mention live-config"
-msgstr ""
-
-#. type: Plain text
 #: en/user_installation.ssi:100
-msgid "3~ Using a customized live-boot"
+msgid "2~ live-boot and live-config"
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:102
-msgid ""
-"% FIXME: should follow the structure for live-build above (i.e. \"from source"
-"\", not \"customized\" -- we should not get into customization now, but "
-"should reserve that discussion for later."
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:104
-msgid ""
-"To modify the code you can follow the process below. Please ensure you are "
-"familiar with the terms mentioned in {Terms}#terms."
+#, no-wrap
+msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:106
-msgid "_* Checkout the live-boot source"
+msgid ""
+"Both live-boot and live-config are available from the Debian repository as "
+"per {Installing live-build}#installing-live-build."
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:110
-msgid "$ git clone git://live.debian.net/git/live-boot.git"
+msgid ""
+"To use the latest source from git, you can follow the process below. Please "
+"ensure you are familiar with the terms mentioned in {Terms}#terms."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:114
-msgid "_* Make changes to your local copy"
+#: en/user_installation.ssi:112
+msgid "_* Checkout the live-boot and live-config source"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:116
+#: en/user_installation.ssi:117
+#, no-wrap
 msgid ""
-"% FIXME: as indicated above, it's too early for this topic. Move to later in "
-"the manual."
+" $ 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
-#: en/user_installation.ssi:118
+#: en/user_installation.ssi:121
 msgid ""
-"And beware that if you want to add your pre-init script in live-bottom, you "
-"should name it without dashes '-', e.g: call it \"99new_feature\" and not "
-"\"99new-feature\"."
+"Consult the live-boot and live-config man pages for details on customizing "
+"if that is your reason for building these packages from source."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:120
-msgid "_* Build a live-boot .deb"
+#: en/user_installation.ssi:123
+msgid "_* Build live-boot and live-config .deb files"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:122
+#: en/user_installation.ssi:125
 msgid ""
 "You must build either on your target distribution or in a chroot containing "
 "your target platform: this means if your target is Squeeze then you should "
-"build against Squeeze. Y"
+"build against Squeeze."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:124
+#: en/user_installation.ssi:127
 msgid ""
 "Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
 "build #{live-boot}# for a target distribution that differs from your build "
@@ -414,40 +412,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:129
-msgid "$ cd live-boot $ dpkg-buildpackage -b -uc -us"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:133
-msgid "_* Use the generated live-boot .deb"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:135
+#: en/user_installation.ssi:134
+#, no-wrap
 msgid ""
-"As live-boot is installed by live-build system, installing the package in "
-"the host system is not sufficient: you should treat the generated .deb like "
-"another custom package. Please see {Customizing package installation}"
-"#customizing-package-installation for more information. You should pay "
-"particular attention to {Additional repositories}#additional-repositories."
+" $ cd live-boot\n"
+" $ dpkg-buildpackage -b -uc -us\n"
+" $ cd ../live-config\n"
+" $ dpkg-buildpackage -b -uc -us\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:137
-msgid "3~ Using live-boot snapshots"
+#: en/user_installation.ssi:138
+msgid "_* Use all generated .deb files"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:139
+#: en/user_installation.ssi:140
 msgid ""
-"You can let live-build automatically use the latest snapshot of live-boot by "
-"configuring a third-party repository in your live-build configuration "
-"directory. Assuming you have already created a configuration tree with #{lb "
-"config}#:"
+"As live-boot and live-config are installed by live-build system, installing "
+"the packages in the host system is not sufficient: you should treat the "
+"generated .deb files like any other custom packages. Please see {Customizing "
+"package installation}#customizing-package-installation for more information. "
+"You should pay particular attention to {Additional repositories}#additional-"
+"repositories."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:143
-msgid "lb config --repository live.debian.net"
+#: en/user_installation.ssi:144
+msgid ""
+"You can let live-build automatically use the latest snapshots of live-boot "
+"and live-config by configuring a third-party repository in your live-build "
+"configuration directory. Assuming you have already created a configuration "
+"tree with #{lb config}#:"
 msgstr ""
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 bde9d07..c44b90d 100644
--- a/manual/po/pt_BR/user_managing_a_configuration.ssi.po
+++ b/manual/po/pt_BR/user_managing_a_configuration.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-01 05:55-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -20,60 +20,59 @@ 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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_customization-runtime.ssi:12
-#: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
-#: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
-#: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
-#: en/user_customization-runtime.ssi:92 en/user_customization-runtime.ssi:101
+#: 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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
 #: en/user_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_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:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:108
-#: en/user_installation.ssi:126 en/user_installation.ssi:144
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -85,60 +84,59 @@ 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:173 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: 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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_customization-runtime.ssi:16
-#: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
 #: en/user_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_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:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:112
-#: en/user_installation.ssi:131 en/user_installation.ssi:147
-#: en/user_managing_a_configuration.ssi:31
+#: 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
@@ -194,8 +192,9 @@ msgstr ""
 msgid ""
 "A second, related problem is that if you run #{lb config}# and then upgrade "
 "to a new version of live-build that has changed one of the variable names, "
-"you will discover this only by manual review of the variables in your config "
-"files, which you will then need to use to set the appropriate option again."
+"you will discover this only by manual review of the variables in your #"
+"{config/*}# files, which you will then need to use to set the appropriate "
+"option again."
 msgstr ""
 
 #. type: Plain text
@@ -238,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
@@ -253,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
@@ -267,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
@@ -279,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 d865d48..72131e6 100644
--- a/manual/po/pt_BR/user_overview.ssi.po
+++ b/manual/po/pt_BR/user_overview.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-10-28 16:34-0200\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -17,122 +17,129 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: 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/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.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:140
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/project_bugs.ssi: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: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: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_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
+#: 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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: 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_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 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: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_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
-#: en/user_customization-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: 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_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr "}code"
@@ -185,11 +192,11 @@ msgstr ""
 #: en/user_overview.ssi:16
 msgid ""
 "_* The scripts have a central location for configuring their operation. In "
-"debhelper, this is the debian subdirectory of a package tree. For example, "
-"dh_install will look, amongst others, for a file called #{debian/install}# "
-"to determine which files should exist in a particular binary package. In "
-"much the same way, live-build stores its configuration entirely under a "
-"config subdirectory."
+"debhelper, this is the #{debian/}# subdirectory of a package tree. For "
+"example, dh_install will look, amongst others, for a file called #{debian/"
+"install}# to determine which files should exist in a particular binary "
+"package. In much the same way, live-build stores its configuration entirely "
+"under a #{config/}# subdirectory."
 msgstr ""
 
 #. type: Plain text
@@ -244,7 +251,7 @@ msgstr ""
 #: en/user_overview.ssi:32
 msgid ""
 "As discussed in {live-build}#live-build, the scripts that make up live-build "
-"source their configuration from a single directory named config/. As "
+"source their configuration from a single directory named #{config/}#. As "
 "constructing this directory by hand would be time-consuming and error-prone, "
 "the #{lb config}# command can be used to create skeleton configuration "
 "folders."
@@ -253,45 +260,59 @@ msgstr ""
 #. type: Plain text
 #: en/user_overview.ssi:34
 msgid ""
-"Issuing #{lb config}# without any arguments creates a config subdirectory "
-"which it populates with some default settings:"
+"Issuing #{lb config}# without any arguments creates a #{config/}# "
+"subdirectory which it populates with some default settings:"
 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
@@ -312,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
@@ -322,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 0b7e47a..c47efaf 100644
--- a/manual/po/ro/about_manual.ssi.po
+++ b/manual/po/ro/about_manual.ssi.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a8\n"
-"POT-Creation-Date: 2010-12-05 11:16+0100\n"
+"Project-Id-Version: live-manual 2.0.0\n"
+"POT-Creation-Date: 2010-12-20 05:58-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"
@@ -67,7 +67,7 @@ msgid ""
 "#examples section designed to teach you image building and customization "
 "basics. Read {Using the examples}#using-the-examples first, followed by "
 "{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
-"utility}#tutorial-2 and finally {Tutorial 3: A personal travelling companion}"
+"utility}#tutorial-2 and finally {Tutorial 3: A personalized image}"
 "#tutorial-3. By the end of these tutorials, you will have a taste of what "
 "can be done with Debian Live. We encourage you to return to more in-depth "
 "study of the manual, perhaps next reading {The basics}#the-basics, skimming "
@@ -326,8 +326,8 @@ msgstr "2~ Cum se poate contribui la acest document"
 msgid ""
 "This manual is intended as a community project and all proposals for "
 "improvements and contributions are extremely welcome. The preferred way to "
-"submit a contribution is to send it to the mailing list. Please see {Contact}"
-"#contact for more information."
+"submit a contribution is to send it to the mailing list. Please see the "
+"section {Contact}#contact for more information."
 msgstr ""
 "Acest manual este conceput ca un proiect comunitar si astfel orice "
 "propozitie sau inbunatatire sunt bune venite. Principala cale de a face o "
@@ -351,7 +351,7 @@ msgstr ""
 #: en/about_manual.ssi:82
 msgid ""
 "The sources for this manual are maintained using the Git version control "
-"system. You can checkout the latest copy by executing:"
+"system. You can check out the latest copy by executing:"
 msgstr ""
 "Sursele acestui manual sunt gerate folosind Git version control system. Pute-"
 "ti checkout ultima copie prin executarea :"
@@ -360,32 +360,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/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
+#: 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
@@ -398,38 +390,29 @@ msgstr ""
 #: en/user_customization-packages.ssi:185
 #: en/user_customization-packages.ssi:199
 #: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
 #: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:321
-#: en/user_customization-runtime.new.ssi:14
-#: en/user_customization-runtime.new.ssi:34
-#: en/user_customization-runtime.new.ssi:42
-#: en/user_customization-runtime.new.ssi:50
-#: en/user_customization-runtime.new.ssi:64
-#: en/user_customization-runtime.new.ssi:76
-#: en/user_customization-runtime.new.ssi:86
-#: en/user_customization-runtime.new.ssi:94
-#: en/user_customization-runtime.new.ssi:102
-#: en/user_customization-runtime.new.ssi:110
-#: en/user_customization-runtime.new.ssi:130
-#: en/user_customization-runtime.new.ssi:138
-#: en/user_customization-runtime.new.ssi:147
-#: en/user_customization-runtime.ssi:12 en/user_customization-runtime.ssi:30
-#: en/user_customization-runtime.ssi:40 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:56 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:92
-#: en/user_customization-runtime.ssi:101 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:141 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -446,32 +429,24 @@ 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
+#: 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
@@ -484,38 +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:285
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
 #: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:334
-#: en/user_customization-runtime.new.ssi:18
-#: en/user_customization-runtime.new.ssi:38
-#: en/user_customization-runtime.new.ssi:46
-#: en/user_customization-runtime.new.ssi:54
-#: en/user_customization-runtime.new.ssi:68
-#: en/user_customization-runtime.new.ssi:80
-#: en/user_customization-runtime.new.ssi:90
-#: en/user_customization-runtime.new.ssi:98
-#: en/user_customization-runtime.new.ssi:106
-#: en/user_customization-runtime.new.ssi:114
-#: en/user_customization-runtime.new.ssi:134
-#: en/user_customization-runtime.new.ssi:143
-#: en/user_customization-runtime.new.ssi:152
-#: en/user_customization-runtime.ssi:16 en/user_customization-runtime.ssi:34
-#: en/user_customization-runtime.ssi:44 en/user_customization-runtime.ssi:52
-#: en/user_customization-runtime.ssi:60 en/user_customization-runtime.ssi:68
-#: en/user_customization-runtime.ssi:88 en/user_customization-runtime.ssi:97
-#: en/user_customization-runtime.ssi:106 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:31
+#: 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: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
@@ -536,22 +502,24 @@ 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 libnokogiri-ruby\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:98
 msgid ""
-"You may build the live-manual from the top level directory of your git "
+"You may build the live-manual from the top level directory of your Git "
 "checkout by executing:"
 msgstr ""
-"Pute-ti crea live-manual de la nivelul de sus al directorului git checkout "
+"Pute-ti crea live-manual de la nivelul de sus al directorului Git checkout "
 "al dvs, prin executatea:"
 
 #. 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
@@ -563,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
@@ -574,9 +543,9 @@ msgstr "3~ Aplicarea de patch-uri"
 #. type: Plain text
 #: en/about_manual.ssi:116
 msgid ""
-"Directly commiting to the repository is possible by anyone. However, we ask "
-"you to send bigger changes to the mailing list to discuss them first. In "
-"order to push to the repository, the following steps are required."
+"Anyone can directly commit to the repository. However, we ask you to send "
+"bigger changes to the mailing list to discuss them first. To push to the "
+"repository, you must follow this procedure:"
 msgstr ""
 "Commiterea in direct este la indemana oricui. Totusi, va rugam sa trimeteti "
 "schimbarile mai mari , spre discutie , la mailing list. Pentru a fi trimise "
@@ -591,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/live.debian.net\n"
-"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-"\t-O ~/.ssh/identity.d/live.debian.net.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/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
@@ -614,62 +577,57 @@ 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
-msgid "_* Checkout a clone of the manual through ssh:"
+msgid "_* Check out a clone of the manual through ssh:"
 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
 msgid ""
-"_* After editing the files in manual/en/, please call the 'commit' target in "
-"the top level directory to sanitize the files and update the translation "
-"files:"
+"_* After editing the files in #{manual/en/}#, please call the 'commit' "
+"target in the top level directory to sanitize the files and update the "
+"translation files:"
 msgstr ""
-"_* Dupa editarea de fisiere in manual/en/, va rugam folositi 'commit' in the "
-"top level directory to sanitize the files and update the translation files:"
 
 #. 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
 msgid ""
-"_* After sanitizing commit the changes. Write commit messages, that consist "
-"of full useful sentences, starting with a capital letter and ending with a "
-"full stop. Usually starting with the form 'Fixing/Adding/Removing/"
-"Correcting/':"
+"_* After sanitizing, commit the changes. Write commit messages that consist "
+"of full, useful sentences in English, starting with a capital letter and "
+"ending with a full stop. Usually, these will start with the form 'Fixing/"
+"Adding/Removing/Correcting/Translating', e.g."
 msgstr ""
 "_* Dupa 'sanitizare' 'commit' schimbarile. Scrieti mesajele de commit, care "
 "constau in propozitii clare, care incep cu litere Mari, si se incheie cu "
 "punct si sens. Inceputul poate fii de forma 'Fixing/Adding/Removing/"
-"Correcting/':"
+"Correcting/Translating':"
 
 #. type: Plain text
 #: en/about_manual.ssi:164
-msgid "$ git commit -a"
-msgstr "$ git commit -a"
+#, no-wrap
+msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
+msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:168
@@ -678,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
@@ -688,21 +647,29 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:178
-msgid "Submiting a translation for a new language is recommendet in two steps:"
+msgid "To submit a translation for a new language, follow these three steps:"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:180
 msgid ""
-"_* Translate the about_manual.ssi.pot about_project.ssi.pot index.html.in."
-"pot files to your language with your favourite editor (such as poedit). Send "
-"translated files to the mailinglist. It will then be included and autobuild "
-"for that language enabled."
+"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
+"in.pot files to your language with your favourite editor (such as poedit). "
+"Send translated files to the mailing list. Once we have reviewed your "
+"submission, we will add the new language to the manual (providing the po "
+"files) and will enable it in the autobuild."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:182
+msgid ""
+"_* Once the new language is added, you can randomly start translating all po "
+"files in #{manual/po/}#."
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:181
+#: en/about_manual.ssi:184
 msgid ""
-"_* Now that the new language was added, you can randomly start translating "
-"all other pot files."
+"_* Don't forget you need #{make commit}# to ensure the translated manuals "
+"are updated from the po files, before #{git commit -a}# and #{git push}#."
 msgstr ""
diff --git a/manual/po/ro/about_project.ssi.po b/manual/po/ro/about_project.ssi.po
index b1976b9..522f9a6 100644
--- a/manual/po/ro/about_project.ssi.po
+++ b/manual/po/ro/about_project.ssi.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.0~a8\n"
+"Project-Id-Version: 2.0.0\n"
 "POT-Creation-Date: 2010-11-27 10:30-0400\n"
 "Last-Translator: Eugen Paiuc <linux51 at bluewin.ch>\n"
 
diff --git a/manual/po/ro/index.html.in.po b/manual/po/ro/index.html.in.po
index 016c96f..f815a80 100644
--- a/manual/po/ro/index.html.in.po
+++ b/manual/po/ro/index.html.in.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-10-20 20:02+0300\n"
+"Project-Id-Version: live-manual 2.0.0\n"
+"POT-Creation-Date: 2010-12-08 15:58+0100\n"
 "PO-Revision-Date: 2010-10-20 20:02+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -23,17 +23,17 @@ msgid "Debian Live Project"
 msgstr ""
 
 #. type: Content of: <html><body><h2>
-#: en/index.html.in:8
+#: en/index.html.in:9
 msgid "Debian Live Manual"
 msgstr ""
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:11
+#: en/index.html.in:12
 msgid "<i>This manual is under heavy construction.</i>"
 msgstr ""
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:15
+#: en/index.html.in:16
 msgid ""
 "Please report errors, omissions, patches and suggestions to our mailinglist "
 "at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
@@ -42,29 +42,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <html><body><h3>
-#: en/index.html.in:18
+#: en/index.html.in:19
 msgid "Available Formats"
 msgstr ""
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:21
+#: en/index.html.in:22
 msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
 msgstr ""
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:22
+#: en/index.html.in:23
 msgid ""
 "HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
 "html\">single page</a>"
 msgstr ""
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:23
+#: en/index.html.in:24
 msgid "<a href=\"odf/live-manual.odt\">ODF</a>"
 msgstr ""
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:24
+#: en/index.html.in:25
 msgid ""
 "PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
 "\"pdf/live-manual.landscape-a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
@@ -73,34 +73,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:25
+#: en/index.html.in:26
 msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
 msgstr ""
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:29
+#: en/index.html.in:30
 msgid "Last changed: @DATE_CHANGE@"
 msgstr ""
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:30
+#: en/index.html.in:31
 msgid "Last built: @DATE_BUILD@"
 msgstr ""
 
 #. type: Content of: <html><body><h3>
-#: en/index.html.in:33
+#: en/index.html.in:34
 msgid "Source"
 msgstr ""
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:36
+#: en/index.html.in:37
 msgid ""
 "The sources for this manual is available in a <a href=\"http://git.or.cz/"
-"\">git</a> repository at live.debian.net."
+"\">Git</a> repository at live.debian.net."
 msgstr ""
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:40
+#: en/index.html.in:41
 msgid ""
 "Browse: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
 "\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
@@ -108,14 +108,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:41
+#: en/index.html.in:42
 msgid ""
 "Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
 "live.debian.net/git/live-manual.git</tt></small></a>"
 msgstr ""
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:45
+#: en/index.html.in:46
 msgid ""
 "<a href=\"http://live.debian.net/\">Debian Live</a> &lt;<a href=\"mailto:"
 "debian-live at lists.debian.org\">debian-live at lists.debian.org</a>&gt; - <a "
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index 7a064ae..de1435a 100644
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-06 12:26+0100\n"
+"Project-Id-Version: live-manual 2.0.0\n"
+"POT-Creation-Date: 2010-12-24 03:54+0100\n"
 "PO-Revision-Date: 2010-10-23 00:04+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -46,7 +46,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2010-12-06\n"
+" :published: 2010-12-24\n"
 msgstr ""
 
 #. type: Plain text
@@ -87,7 +87,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:31
-msgid ":B~ User ~#"
+msgid ":B~ User"
 msgstr ""
 
 #. type: Plain text
@@ -127,80 +127,45 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:47
-msgid "<< user_customization-internationalization.ssi"
+msgid "<< user_customization-runtime.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:49
-msgid "<< user_customization-runtime.ssi"
+msgid "<< user_customization-binary.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:51
-msgid "<< user_customization-binary.ssi"
+msgid "<< user_customization-installer.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:53
-msgid "<< user_customization-installer.ssi"
+msgid ":B~ Project"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:55
-msgid ":B~ Development ~#"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:57
-msgid ":B~ Project ~#"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:59
 msgid "<< project_bugs.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:61
+#: en/live-manual.ssm:57
 msgid "<< project_coding-style.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:63
+#: en/live-manual.ssm:59
 msgid "<< project_procedures.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:65
-msgid ":B~ Examples ~#"
+#: en/live-manual.ssm:61 en/user_examples.ssi:2
+msgid ":B~ Examples"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:67
+#: en/live-manual.ssm:63
 msgid "<< user_examples.ssi"
 msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:69
-msgid ":B~ Other ~#"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:75
-msgid ""
-"Other material that formerly appeared in this section is out of date and/or "
-"has not been approved for release. It has therefore been omitted, but can "
-"still be found in the document source; see 'About this manual'. Any part of "
-"the omitted material that is still useful will be included in the release "
-"only after it has been reviewed."
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:77
-msgid "% << other_faq.ssi"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:78
-msgid "% << other_howtos.ssi"
-msgstr ""
diff --git a/manual/po/ro/other_faq.ssi.po b/manual/po/ro/other_faq.ssi.po
deleted file mode 100644
index 01cde86..0000000
--- a/manual/po/ro/other_faq.ssi.po
+++ /dev/null
@@ -1,1009 +0,0 @@
-# Romanian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-10-16 14:45-0200\n"
-"PO-Revision-Date: 2010-10-16 14:45-0200\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: ro\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
-"20)) ? 1 : 2;\n"
-
-#. type: Plain text
-#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
-#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: 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/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
-#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
-#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
-#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
-#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:106
-#: en/user_installation.ssi:120 en/user_installation.ssi:137
-#: en/user_managing_a_configuration.ssi:24
-#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:60
-#: en/user_overview.ssi:104 en/user_overview.ssi:112
-msgid "code{"
-msgstr "code{"
-
-#. type: Plain text
-#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
-#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
-#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
-#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
-#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
-#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
-#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
-#: en/user_basics.ssi:257 en/user_basics.ssi:285 en/user_basics.ssi:293
-#: en/user_basics.ssi:320 en/user_basics.ssi:359
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
-#: en/user_customization-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:110
-#: en/user_installation.ssi:125 en/user_installation.ssi:140
-#: en/user_managing_a_configuration.ssi:31
-#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
-msgid "}code"
-msgstr "}code"
-
-#. type: Plain text
-#: en/other_faq.ssi:2
-msgid "B~ Frequently asked questions (FAQ)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:4
-msgid "1~ Frequently asked questions (FAQ)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:8
-msgid ""
-"Q: I downloaded a prebuilt live image. How do I put it on a USB stick? A: "
-"See \"Copying USB/HDD image to a USB stick\" % FIXME: <xref linkend="
-"\"image_copying\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:11
-msgid ""
-"Q: How do I log my build? A: You could use script, screen or tee: #{$ "
-"lh_build 2>&1 | tee build.log}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:14
-msgid ""
-"Q: How can I convert an already installed standard Debian partition into a "
-"Debian Live system? A: Save the list of installed packages and load it into "
-"your new Debian Live System. Copy your /etc to config/chroot_local-includes"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:17
-msgid ""
-"Q: What does 'losetup: could not find any free loop device' mean and how do "
-"I fix it? A: Loop devices are used during the build; there probably aren't "
-"any free if you've aborted several builds. Something like: for l in /dev/"
-"loop0 /dev/loop1 /dev/loop2 /dev/loop3 /dev/loop4 /dev/loop5 /dev/loop6 /dev/"
-"loop7 ; do losetup -d $l ; done should rectify the situation (assuming all "
-"loop devices in use were created by lh_build; if in doubt, check the "
-"contents of each loop device before deleting them with losetup -d)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:20
-msgid ""
-"Q: How do I launch an interactive shell during the chroot stage? A: To "
-"enable interactive shell: #{$ lh_config --interactive shell}# To continue "
-"the build process: #{# logout}# or #{# exit}# To disable interactive shell, "
-"set LH_INTERACTIVE to \"disabled\" in config/chroot."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:23
-msgid ""
-"Q: What is the root /user password? A: The user password for the live user "
-"is 'live'. By default, there is not any root password. You can switch to "
-"root with ${sudo -i}# or set a password for root with #{sudo passwd}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:27
-msgid ""
-"Q: How do I change root or any user password? A: Add a chroot local hook "
-"script to change root or any user password each time you build an image.  e."
-"g. config/chroot_local-hooks/01-update_password.sh to set root password to "
-"\"nopasswd\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:30 en/other_faq.ssi:53
-msgid "code{ #!/bin/sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:33
-msgid "echo \"I: update password\" echo \"root:nopasswd\" | chpasswd"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:35
-msgid "$ chmod +x config/chroot_local-hooks/01-update_password.sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:39
-msgid ""
-"Note for live user; you need to copy the /usr/share/initramfs-tools/scripts/"
-"live-bottom/10adduser your build folder:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:44
-msgid ""
-"mkdir -p config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-"
-"bottom/ cp /usr/share/initramfs-tools/scripts/live-bottom/10adduser config/"
-"chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:48
-msgid ""
-"Note: Then edit the config/chroot_local-includes/usr/share/initramfs-tools/"
-"scripts/live-bottom/10adduser and paste in the new user_crypted password "
-"that you make with: #{echo \"newlivepass\" | mkpasswd -s}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:50
-msgid ""
-"Or add an hook file in config/chroot_local-hooks/ with something like the "
-"below:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:57
-msgid ""
-"# Change the autogenerated user password to \"debianlive\" plain_password="
-"\"debianlive\" password=$(echo \"${plain_password}\" | mkpasswd -s)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:59
-msgid ""
-"sed -i -e 's/\\(user_crypted=\\)\\(.*\\)\\( #.*\\)/\\1\\\"'${password}'\\"
-"\"\\3/' /usr/share/initramfs-tools/scripts/live-bottom/10adduser"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:62
-msgid "update-initramfs -tu -kall }code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:64
-msgid ""
-"The latter (hook model) could be more future proof than the former solution "
-"since it modifies just one string selectively but it requires the package "
-"\"whois\" to be installed on the target system (for mkpasswd) or that you "
-"generate the $password string not at build time and include it crypted in "
-"the above script."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:68
-msgid ""
-"Q: How to disable autologin? A1: use the commandline parameter #{lh config --"
-"bootappend-live \"noautologin\"}# A2: You need to set boot=noautologin "
-"noxautologin as described in man live-initramfs If you boot via TFTP you "
-"want to insert the option to pxelinux.cfg/default"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:71
-msgid ""
-"Q: How do I change default hostname or username? A: To change default "
-"hostname or username: #{$ lh_config --hostname myhostname $ lh_config --"
-"username myusername}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:74
-msgid ""
-"Q: How do I make the final image smaller? A: Clean orphaned apps/libs: "
-"Install package \"deborphan\" and then run 'sudo deborphan -n' . Delete "
-"unwanted packages. Remove the apt cache. Purge unwanted locales (see "
-"\"localepurge\" package)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:77
-msgid ""
-"Q: How do I customize bash-config permanently (aliases, bash-completion "
-"etc.)? A: Add your own .bashrc config/chroot_local-includes/etc/skel/.bashrc"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:81
-msgid ""
-"Q: How do I disable services permanently? (Be careful!)  A: Add a chroot "
-"local hook script to disable a service each time you build an image: e.g. "
-"config/chroot_local-hooks/01-disable_service.sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/other_use-cases.ssi:26
-#: en/other_use-cases.ssi:77
-msgid "#!/bin/sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:88
-msgid "echo \"I: disable service\" update-rc.d -f service_name remove"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:90
-msgid "$ chmod +x config/chroot_local-hooks/01-disable_service.sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:95
-msgid ""
-"Q: How do I enable | disable the md5checksum at the ISO building? A: #"
-"{lh_config --checksums enabled|disabled}# Or change the LH_CHECKSUMS value."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:98
-msgid ""
-"Q: How to disable the generation of the .tar.gz file? A: #{lh_config --net-"
-"tarball none|gzip}# Or change the LH_NET_TARBALL value. (only available in "
-"snapsshot version at the moment 2008/Feb/28)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:101
-msgid "Q: How do I \"build a new image\"? A: Run commands:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:106
-msgid "$ sudo lh_clean --binary $ sudo lh_build"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:110
-msgid ""
-"Hint: If the configuration had changed you should leave \"--binary\" out. "
-"This will clean your chroot directory too."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:113
-msgid ""
-"Q: How do I use Fluxbox ? A: Add a new lists file with the fluxbox packages "
-"you want."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:115
-msgid "Create /home/$USERNAME/.dmrc file (default username is \"user\")."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:122
-msgid "$ cat .dmrc [Desktop] Session=fluxbox }code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:124
-msgid "Note: .dmrc is owned by $USERNAME:$USERNAME."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:126
-msgid ""
-"See also http://wiki.debian.org/Fluxbox/ A short HOWTO can be found at "
-"http://wiki.debian.org/MichaelAblassmeier/CustomLiveCD"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:129
-msgid ""
-"Q: How do I use custom repositories? A: See http://wiki.debian.org/"
-"DebianLive/Configuration"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:132
-msgid ""
-"Q: How do I customize the artwork for the live CD (grub or syslinux boot "
-"splash, usplash, etc.)? A: See http://wiki.debian.org/DebianLive/Howto/"
-"Custom_Artwork"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:135
-msgid ""
-"Q: How do I customize desktop environment (KDE, GNOME, XFCE, etc...) look? "
-"A: Start the live system in qemu:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:139
-msgid "$ qemu -m 256 -cdrom binary.iso -boot d -redir tcp:4222:10.0.2.15:22"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:143
-msgid "Note: the -redir argument must be changed to meet your needs"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:146
-msgid ""
-"Q: How do I execute a custom shell script inside the chroot system after the "
-"chroot stage? A: Add your script in config/chroot_local-hooks."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:149
-msgid ""
-"Q: How do I add a script running immediately after all other scripts when "
-"the live system boots? A: Add your script in config/chroot_local-includes/"
-"usr/share/initramfs-tools/scripts/live-bottom/99scrip"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:153
-msgid ""
-"$ chmod +x config/chroot_local-includes/usr/share/initramfs-tools/scripts/"
-"live-bottom/99script"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:157
-msgid ""
-"Note: The hook script must be executable. Do not forget to lh_clean --chroot "
-"after making this change before you build again."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:159
-msgid ""
-"You must also use the example script /usr/share/live-helper/examples/hooks/"
-"update-initramfs.sh to ensure your script gets built into the initramfs "
-"(read the comment header for instructions)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:163
-msgid ""
-"Q: How do I add software not in Debian ? A: See Customizing package "
-"installation % FIXME: <xref linkend=\"packages\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:166
-msgid ""
-"Q: What is the manifest with Ubuntu used for? A: Manifest is just the "
-"package list, which ubuntu does $something with. Don't worry about it."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:169
-msgid ""
-"Q: What is this {p} syntax with mtools{p} and parted{p}? A: That's aptitude."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:172
-msgid ""
-"Q: Do I need to write the image on USB stick to test it? A: you must use "
-"qemu >= 0.8."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:175
-msgid "Q: What is /cow? A: Copy-on-write, the 'diff' from unionfs."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:178
-msgid ""
-"Q: Is /usr/share/live-helper/lists/standard-x11 like preseed or is preseed "
-"something else entirely? A: It is not. It is a package list, not a debconf "
-"preseeding."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:181
-msgid ""
-"Q: What is the difference between standard and minimal? A: standard: "
-"packages of priority standard and higher; minimal: packages of priority "
-"essential and higher;"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:184
-msgid ""
-"Q: What can the sections be used for? Aren't they BIG? A: Someone maybe "
-"wants to include packages from contrib or non-free."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:187
-msgid "Q: memtest86+ ... is that used? A: Yes"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:190
-msgid ""
-"Q: How do I build using predefined packages lists? A: e.g. to build using "
-"standard-x11 packages list: #{$ sudo lh_config -p standard-x11 && sudo "
-"lh_build}# Note: The packages lists can be found in /usr/share/live-helper/"
-"lists/ directory."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:193
-msgid ""
-"Q: How do I rebuild without downloading all the packages again? A: All "
-"packages are cached in cache subdirectory. They remain until a clean purge: #"
-"{$ sudo lh_clean --purge}# You do not have to do anything to prevent "
-"packages from being re-downloaded. You need to remember to clean whichever "
-"stages you want to rebuild first. e.g. to rebuild from the cached bootstrap, "
-"chroot packages and build a new image. #{$ sudo lh_clean && sudo lh_build}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:196
-msgid ""
-"Q: How do I boot USB debian-live on systems not supporting USB boot? A: Make "
-"a boot CD with grub, configured to boot from a debian-live kernel copied on "
-"the cd structure #{$ mkdir -p iso/boot/grub && cp /usr/lib/grub/i386-pc/"
-"stage2_eltorito iso/boot/grub && cp chroot/boot/* iso/boot/}# Create iso/"
-"boot/grub/menu.lst:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:205
-msgid ""
-"default 0 timeout 5 color cyan/blue white/blue title Debian Live root (cd)  "
-"kernel /boot/vmlinuz boot=live initrd /boot/initrd.img"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:209
-msgid ""
-"Create the iso image #{$ mkisofs -R -b boot/grub/stage2_eltorito -no-emul-"
-"boot \\ -boot-load-size 4 -boot-info-table -o grub.iso iso}# Burn the image."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:212
-msgid ""
-"Q: How do I boot debian-live on systems not supporting CDROM or USB boot? A: "
-"If you have a floppy drive, you may be able to use it, otherwise you will "
-"need to use loadlin/grub4dos/win32-loader. If you have a second system to "
-"serve up the image over the network, See http://wiki.debian.org/DebianLive/"
-"Howto/Creating_a_Netboot_Image"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:215
-msgid ""
-"Q: The X configuration does not seems to work, the resolution is too low. "
-"What can I do? A: Use xdebconfigurator #{$ lh_config --bootappend xdebconf "
-"&& lh_config --packages xdebconfigurator}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:218
-msgid ""
-"Q: Apache has problems with static files A: Sendfile does not work well on "
-"the unionfs used by Debian Live. Add the following to apache's "
-"configuration: #{EnableSendfile off}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:222
-msgid ""
-"Q: How do I make hard disk partitions auto-mountable? A: Short answer: Right "
-"now the best is to use a script that will populate the fstab when the CD is "
-"booting. Such a script can be found at https://devel.goto10.org/svn/puredyne/"
-"trunk/broth/stock/chroot_local-includes/sbin/diskmounter.sh. A proper "
-"solution based on HAL will be described here in a hopefully near future.  A: "
-"Long Answer: Since 55_nonpolkit-mount-policy.patch in HAL, debian-storage-"
-"policy-fixed-drives.fdi is not available anymore and the previous trick that "
-"consisted to remove this file to enable automounting of fixed drives as a "
-"consequence is obsolete. Eventually, it will be possible to combine HAL and "
-"PolicyKit to enable different permissions and actions to achieve advanced "
-"(auto)mounting for non-root users. Until then, because the live scripts are "
-"only touching to the fstab to add a swap partition if discovered at boot "
-"time, the only way to have fixed drives mounted automatically is to use a "
-"script that will populate the fstab file at the end of the multiuser "
-"runlevel. To achieve this, you can do, for example, the following: download "
-"the https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-"
-"includes/sbin/diskmounter.sh script Create the chroot_local-includes/sbin "
-"directory, and move the script inside Make sure the script is executable "
-"(chmod +x diskmounter.sh) create the chroot_local-includes/etc/rc.local file "
-"and call the diskmounter from there (see this https://devel.goto10.org/svn/"
-"puredyne/trunk/broth/stock/chroot_local-includes/etc/rc.local When called "
-"correctly, the script detects ext2, ext3, reiserfs, xfs, FAT32, HFS+ and "
-"NTFS partitions and mount them read-write, except for NTFS. This will change "
-"soon and an option will be available to use ntfs-3g to mount NTFS as read-"
-"write. comments, patches and other things about this script and issue: "
-"http://code.goto10.org/projects/puredyne/ticket/463"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:225
-msgid ""
-"Q: Boot fails with panic: can't open /scripts/live A: Add latest live-"
-"initramfs deb package into config/chroot_local-packages directory and "
-"rebuild."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:229
-msgid ""
-"Q: How do I configure the locale and the keyboard? A: See 10n % FIXME: <xref "
-"linkend=\"internalization\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:234
-msgid ""
-"Q: How do I get past boot prompt without a working keyboard? A: See "
-"Customizing the bootup process % FIXME: <xref linkend=\"bootup\"/> Note: "
-"Boot from an USB-HDD on an iMac with GRUB did not work."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:237
-msgid ""
-"Q: Can I serve the root image from a web or ftp server? A: Since live-"
-"initramfs 1.99, it should be possible to use the fetch= argument on the "
-"kernel command line. You can build a netboot image as usual, and when you "
-"are done edit the tftpboot/pxelinux.cfg/default file. Remove the references "
-"to network boot (netboot, nfsroot, nfsopts), and replace with fetch= <url "
-"where you placed the root image>. You have to include wget in the chroot. It "
-"could work for other boot methods as well. However, I am not sure the live "
-"scripts configure the network when booting from a CD or USB disk. #{$ "
-"lh_config --packages wget}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:240
-msgid ""
-"Q: Why doesn't quickreboot (or some other boot parameter) work? A: If you "
-"are building an etch image (which was the default up to 2007/09/14) you have "
-"a very old version of casper which does not support quickreboot and possibly "
-"other boot parameters as well. You could configure your sources to use live-"
-"backports (see /usr/share/live-helper/examples/sources/live-backports) and "
-"switch to live-initramfs, or better yet, build a lenny image instead, which "
-"is the new default. #{$ lh_config --distribution lenny $ lh_config --"
-"initramfs live-initramfs}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:243
-msgid ""
-"Q: How do I fix \"Could not find kernel image\" issue with syslinux "
-"bootloader? A: Add a binary local hook script to fix kernel and initrd path "
-"each time you build an image. e.g. config/binary_local-hooks/01-fix_syslinux."
-"sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:249
-msgid "SYSLINUXCFG=`find binary -type f -name syslinux.cfg`"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:252
-msgid ""
-"sed -i \"s|kernel /vmlinuz|kernel vmlinuz|g\" ${SYSLINUXCFG} sed -i \"s|"
-"initrd=/initrd|initrd=initrd|g\" ${SYSLINUXCFG}"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:254
-msgid "$ chmod +x config/binary_local-hooks/01-fix_syslinux.sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:259
-msgid ""
-"Q: How do I use a newer kernel with lenny? A: A build with backports.org "
-"kernels will fail as that repository lacks the necessary module packages "
-"(linux-modules-extra-2.6, aufs, etc.). Use the kernel backports http://"
-"unsupported.debian-maintainers.org/backports-kernel/ The quick way to "
-"success:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:268
-msgid ""
-"$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6 squashfs-"
-"modules-2.6' $ echo 'deb http://unsupported.debian-maintainers.org/backports-"
-"kernel/ ./' > config/chroot_sources/backports-kernel.chroot $ echo 'deb "
-"http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/"
-"chroot_sources/backports-kernel.binary $ wget http://unsupported.debian-"
-"maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/"
-"backports-kernel.chroot.gpg $ wget http://unsupported.debian-maintainers.org/"
-"backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel."
-"binary.gpg $ lh_build }code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:271
-msgid ""
-"Q: How do I use a custom kernel? Is there a nice way of booting debian-live "
-"with a custom kernel (not in an apt repo)? A: Copy it into config/"
-"chroot_local-packages and set LH_LINUX_PACKAGES=\"none\" or use lh config --"
-"linux-packages \" \" Don't forget to compile your kernel with an union "
-"filesystem (unionfs or aufs), squashfs modules, and initrd support. I can "
-"cause the kernel to be installed but it seems this happens later than grub/"
-"syslinux is configured so it's not listed and casper/ and the menu require "
-"munging. You need to follow the debian scheme, e.g. placing the files in /"
-"boot as vmlinuz-$version and initrd.img-$version etc. I personally wouldn't "
-"go that way which is too much of a hassle, and just use make-kpkg to produce "
-"custom kernel deb packages. They should integrate nicely if you just put "
-"them into config/chroot_local-packages and set LH_LINUX_PACKAGES=\"\". Hint: "
-"to work around an error, which lh_binary_syslinux will throw on custom "
-"kernels if there is not an 468/686 in the kernel-name, you need to set "
-"CONFIG_LOCALVERSION=\"-486\" or \"-686\" within the kernel configuration (-"
-"&gt; General setup -&gt; Local version set to -486 or -686) corresponding to "
-"LH_LINUX_FLAVOURS=\"\" or \"686\". this at least up till live-helper version "
-"1.0~a40-1 see http://lists.alioth.debian.org/pipermail/debian-live-"
-"devel/2007-July/001947.html and http://lists.alioth.debian.org/pipermail/"
-"debian-live-devel/2007-November/002581.html"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:274
-msgid ""
-"Q: How do I create a cross arch live CD image? A: In short: You can't. Read "
-"on: The procedure to create a live CD is based on creating a chroot that "
-"contains the files that will be finally available on the live CD. The live "
-"CD building procedure includes chrooting into the chroot dir and so some "
-"operations. chrooting means that the terminal you chroot on will behave as a "
-"different system so your real system and the chroot environment is decoupled "
-"somehow. Once the live CD scripts chroots into the chroot dir they have some "
-"operations to do inside that environment and your real system won't be able "
-"to run them unless you are using the same architecture. So you only are able "
-"to make live CD for the arch you run on. But this doesn't prevent you run "
-"qemu or some other machine emulator that make this possible."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:277
-msgid ""
-"Q: When is a lh_clean necessary? lh_clean is a script in /usr/bin/ A: That "
-"depends what you've changed between builds If, for example, you've built an "
-"iso image and you want a usb image, you only need to run #{lh_clean --binary}"
-"# before you run lh_build again. If you've changed anything in the chroot, "
-"you'll need to cleanup both chroot and binary with #{lh_clean}# before "
-"continuing"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:280
-msgid ""
-"Q: How can i set boot= parameters? A: Set LH_BOOTAPPEND_LIVE in config/binary"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:283
-msgid ""
-"Q: How do I include different modules to load when the live system boots? A: "
-"Configure config/chroot_local-includes/etc/initramfs-tools/"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:285
-msgid ""
-"The lh_chroot_hacks helper rebuilds the live/initrd1.img using the default "
-"initramfs.conf \"MODULES = most\". You may override that by supplying your "
-"own initramfs.conf, or else just add your own modules, e.g."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:290
-msgid ""
-"mkdir -p config/chroot_local-includes/etc/initramfs-tools/ echo \"atl2\" >> "
-"config/chroot_local-includes/etc/initramfs-tools/modules"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:294
-msgid ""
-"Note: Even though initramfs.conf(5) says \"most adds all the framebuffer, "
-"acpi, file system, ide, sata, scsi and usb drivers\", it actually includes "
-"network drivers as well. See auto_add_modules() in /usr/share/initramfs-"
-"tools/hook-functions for the complete list."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:297
-msgid ""
-"Q: Can I have a splash screen? A: Yes you can. You will not know what is "
-"going on when the splash screen is active, it may fail to activate on some "
-"hardware or break X on other (both usplash and splashy use libdirectfb which "
-"does some evil voodoo and may break you graphics or input until you reboot). "
-"However, you can install and activate it just as you would on any other "
-"Debian system. To use splashy: 1. install splashy and read the README, the "
-"manpages are useless for setting it up. Add some parameters to your kernel "
-"command line, such as in your pxelinux configuration or in "
-"LH_BOOTAPPEND_LIVE in config/binary in debian-live configuration: #{vga=792 "
-"splash quiet}# #{vga}# to select video mode, #{splash}# to activate splashy, "
-"#{quiet}# to suppress most kernel messages that you cannot see anyway but "
-"would scroll past before splashy manages to paint the graphics on your "
-"screen. You might want to add splashy to the list of packages installed in "
-"your image: #{echo splashy > config/chroot_local-packageslists/splashy echo "
-"splashy-themes >> config/chroot_local-packageslists/splashy}# and select a "
-"theme:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:305
-msgid ""
-"echo '#!/bin/sh' > config/chroot_local-hooks/splashy echo splashy_config -s "
-"debian-moreblue '||' true >> config/chroot_local-hooks/splashy # update the "
-"ramdisk to include the splash screen echo update-initramfs -u -k all >> "
-"config/chroot_local-hooks/splashy chmod 755 config/chroot_local-hooks/splashy"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:309
-msgid ""
-"After you rebuild your live system you should observe a bluish splash screen "
-"while booting. Nothing happens while initramfs is running because there is "
-"no splashy support in initramfs-tools. Once the init starts the progress bar "
-"should start to fill. If #{vga=something}# sets a mode that your screen "
-"cannot show or your card cannot do vesa 2.0 (and thus you get plain text "
-"mode and no splashy) read the splashy faq."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:312
-msgid ""
-"Q: Howto use my Broadcom eXtrem 2 network card (module bnx2)? A: Add the "
-"firmwares to the initrd image. You need to install the non-free package "
-"\"firmware-bnx2\". Uncompress your initrd image, then copy files:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:317
-msgid ""
-"cp /lib/firmware/bnx2x-e1-4.8.53.0.fw /lib/firmware/bnx2x-e1-5.0.21.0.fw /"
-"lib/firmware/bnx2x-e1h-4.8.53.0.fw /lib/firmware/bnx2x-e1h-5.0.21.0.fw "
-"${INITRD}/lib/firmware/ cp /lib/udev/firmware.agent ${INITRD}/lib/udev/"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:321
-msgid "Recompress your initrd image and boot: it works!"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:323
-msgid ""
-"Q: X is broken (the system boots, messages scroll by, and then the screen "
-"goes blank). What do I do? A: On my system starting X completely disables "
-"graphics so that I do not see anything even after X bails out and I am back "
-"to the console. To prevent this you can change the driver Xorg uses."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:325
-msgid ""
-"If you have a working splash screen or at least graphical console you can "
-"use #{live xdriver=fbdev}# when booting the live system (instead of just "
-"enter). Another driver you might want to try is #{vesa}#. If all fails you "
-"might try to set xdriver to some wrong value so that Xorg fails to start and "
-"you can examine the system while you still see something on the console. #"
-"{live xdriver=none}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:328
-msgid ""
-"Q: How can I get Debian first stable versions? A: I'm developing software "
-"and testing it on Live-CD. Thanks for the LiveCD project. To be sure my "
-"development is fully compatible with the \"etch\" version, I need the same "
-"scenario when Debian GNU/Linux 4.0 was published as stable (I believe "
-"2007.04.08). If there was some bug on 2007.04.08 that was corrected one week "
-"later, I need to test software foreseeing that scenario without the bug "
-"solved."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:331
-msgid ""
-"Q: I get \"fopen: Permission denied\"-warnings from apt on building/at the "
-"live-system A: That's a harmless bug in apt. However, if you want to get off "
-"this warnings in the live-system, add a file in chroot_local-hooks with "
-"follow row:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:335
-msgid "chown -R man.man /var/cache/man"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:340
-msgid ""
-"Q: Why I always fail during \"Retrieving Packages\" stage when running "
-"lh_build? I have already set apt-http-proxy and so on.  A: lh_build "
-"retrieves packages via wget, as a result you need to enable the proxy "
-"settings in /etc/wgetrc before running lh_build."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:343
-msgid ""
-"Q: How do I edit Xorg.conf? A: Xorg.conf is generated every time system "
-"boots, so it's useless to put modifed Xorg.conf in config/choort_local-"
-"includes/etc/X11, because it will be overwritten during boot. However, you "
-"can edit /usr/bin/dexconf, which generate xorg.conf during boot, so the "
-"result will be modified Xorg.conf. The modified dexconf has to be put in "
-"config/choort_local-includes/usr/bin. e.g.: you can configure Xorg.conf for "
-"two or more keyboards layouts with alt+shift toggle by editing dexconf and "
-"replacing the line:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:347
-msgid "Option \"XkbLayout\" \"$XKB_LAYOUT\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:351
-msgid "with the lines:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:356
-msgid ""
-"Option \"XkbLayout\" \"us,il\" Option \"XkbOptions\" \"grp:alt_shift_toggle,"
-"grp_led:scroll\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:360
-msgid "when \"us,il\" are the wanted keyboard layouts."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:362
-msgid ""
-"You can force default screen resulotion (e.g. 1024*768) by adding the lines:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:368
-#, no-wrap
-msgid ""
-"SubSection \"Display\"\n"
-"        Modes \"1024x768\"\n"
-"EndSubSection\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:372
-msgid "between the lines:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:379
-#, no-wrap
-msgid ""
-"Section \"Screen\"\n"
-"        Identifier \"Default Screen\"\n"
-"        Monitor \"Configured Monitor\"\n"
-"EndSection\"\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:383
-msgid ""
-"Q: Where are the build parameters for the prebuilt images A: See http://live."
-"debian.net/README.images."
-msgstr ""
diff --git a/manual/po/ro/other_howtos.ssi.po b/manual/po/ro/other_howtos.ssi.po
deleted file mode 100644
index 8bdc4fd..0000000
--- a/manual/po/ro/other_howtos.ssi.po
+++ /dev/null
@@ -1,380 +0,0 @@
-# Romanian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: ro\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
-"20)) ? 1 : 2;\n"
-
-#. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 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:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
-msgid "code{"
-msgstr "code{"
-
-#. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 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: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:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
-msgid "}code"
-msgstr "}code"
-
-#. type: Plain text
-#: en/other_howtos.ssi:2
-msgid "B~ Howtos"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:4
-msgid "1~ Howtos"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:6
-msgid "2~ ISO"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:8
-msgid ""
-"Generating a Debian Live CD is very simple. You need to have live-helper "
-"(package available in Debian sid and lenny), and Debootstrap (or "
-"cdebootstrap) from etch or newer."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:10
-msgid "3~ Install live-helper"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:12
-msgid "#{apt-get install live-helper}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:14
-msgid "3~ Configure the current working directory with lh_config"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:18
-msgid "lh_config -b iso -a $ARCH"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:22
-msgid "where #{$ARCH}# is the intended architecture (i.e. - i386 or amd64)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:24
-msgid "#{-b}# flag is used to be sure to obtain image in ISO format."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:26
-msgid "3~ Build the image with lh_build:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:28
-msgid "Execute lh_build as root: #{lh_build}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:30
-msgid ""
-"The command above will create the basic image, containing just the Debian "
-"standard system (with no X at all)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:32
-msgid ""
-"If you want to have any of the Desktop environments on your livecd, #{ls /"
-"usr/share/live-helper/lists}# will show a number of available package Lists "
-"to choose from, e.g. #{lh_config -p gnome-desktop}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:34
-msgid "More examples are listed at DebianLive/Examples."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:37
-msgid ""
-"See packages for help configuring a local Debian Mirror and other aspects of "
-"the live system.  % FIXME: <xref linkend=\"packages\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:39
-msgid "3~ Test the image"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:41
-msgid "If you have qemu installed, you can boot the image with:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:45
-msgid "qemu -cdrom binary.iso"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:49
-msgid "If you have also kqemu installed, you can add #{-kernel-kqemu}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:51
-msgid "2~ ISO_(multiarch)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:53
-msgid ""
-"Multiple machine boot CDs can be created with the following manual "
-"procedure. This procedure has been successfully used to create a single CD "
-"which is bootable on alpha, i386, pmax, and sparc. It should be possible to "
-"also make the CD bootable on macppc, vax and on sun2, sun3 and sun3x."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:55
-msgid ""
-"To create a CD which is bootable by multiple architectures, use the "
-"following steps in this order. Please note that the order is critical."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:57
-msgid ""
-"Make sure you have all the required files including the various kernels and "
-"boot programs listed in the individual machine sections."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:59
-msgid ""
-"Include a directory somewhere in the cdsources directory called mdec.pmax "
-"and include the pmax bootxx_cd9660 file there. For example, /cdsources/usr/"
-"mdec.pmax/bootxx_cd9660."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:61
-msgid ""
-"Include a directory somewhere in the cdsources directory called mdec.vax and "
-"include the vax xxboot file there. For example, #{cdsources/usr/mdec.vax/"
-"xxboot.}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:63
-msgid "Include the macppc ofwboot.xcf bootloader in /cdsources."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:65
-msgid ""
-"Create an i386 bootable image. #{sh mkisofs -v -v -o output.iso -b i386/"
-"installation/floppy/boot-big.fs \\ -c boot.catalog -l -J -r -L /cdsources "
-"2>&1 | tee /tmp/mkisofs.log exit}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:67
-msgid ""
-"Note: The appearance of the -v flag twice is required. If you are making a "
-"bootable CD for an Open Firmware 3 macppc model, make sure to include -hfs -"
-"part in the parameters for mkisofs."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:69
-msgid ""
-"Run mksunbootcd on a NetBSD/sparc machine to install sparc and sun2/sun3 "
-"bootblocks. Alternatively, install the sysutils/mksunbootcd package on your "
-"favorite NetBSD machine. #{mksunbootcd output.iso boot-sun4.fs boot-sun4c.fs "
-"boot-sun4m.fs boot-sun3.fs}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:71
-msgid ""
-"Run the installboot(8) program targeted for NetBSD/pmax to install the pmax "
-"bootblocks. Note that in order to coexist with other NetBSD boot blocks, the "
-"pmax boot block is appended to the end of the ISO file system."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:73
-msgid ""
-"#{installboot -m pmax -v -o append,sunsum output.iso /tmp/mdec.pmax/"
-"bootxx_cd9660}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:75
-msgid ""
-"The -o append,sunsum option appends the first stage boot block to the end of "
-"the ISO file system, and restores the checksum used when booting on a sun."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:77
-msgid ""
-"Run the installboot(8) program targeted for NetBSD/vax to install the vax "
-"bootblocks. Note that in order to coexist with other NetBSD boot blocks, the "
-"vax boot block is appended to the end of the ISO file system."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:79
-msgid "installboot -m vax -v -o append,sunsum output.iso /tmp/mdec.vax/xxboot"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:81
-msgid "(See the pmax entry above for an explanation of the flags)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:83
-msgid ""
-"Run the installboot(8) program targeted for NetBSD/alpha to install the "
-"alpha bootblocks."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:85
-msgid ""
-"#{installboot -m alpha -v -o append,sunsum output.iso /tmp/mdec.alpha/"
-"bootxx_cd9660}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:86
-msgid ""
-"Note: The alpha installboot must occur after the others, because currently "
-"it's the only machine dependent back-end for installboot(8) that can "
-"calculate the alpha checksum. (See the pmax entry above for an explanation "
-"of the flags)."
-msgstr ""
diff --git a/manual/po/ro/other_use-cases.ssi.po b/manual/po/ro/other_use-cases.ssi.po
deleted file mode 100644
index 38b1704..0000000
--- a/manual/po/ro/other_use-cases.ssi.po
+++ /dev/null
@@ -1,380 +0,0 @@
-# Romanian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: ro\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
-"20)) ? 1 : 2;\n"
-
-#. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 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:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
-msgid "code{"
-msgstr "code{"
-
-#. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 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: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:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
-msgid "}code"
-msgstr "}code"
-
-#. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/other_use-cases.ssi:26
-#: en/other_use-cases.ssi:77
-msgid "#!/bin/sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:2
-msgid "B~ Use Cases"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:4
-msgid "1~ Use Cases"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:6
-msgid "This chapter is for users to document their use cases with Debian Live."
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:8
-msgid "2~ VNC Kiosk Client"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:10
-msgid "Create an image with live-helper to boot directly to a VNC server."
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:12
-msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:14
-msgid "_* Move to the build directory: #{$ cd vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:16
-msgid ""
-"Example to config the build directory to include gdm metacity "
-"xtightvncviewer: #{$ lh config --packages \"gdm metacity xtightvncviewer\"}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:18
-msgid ""
-"Create a folder /etc/skel folder for a custom .xsession for the default "
-"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:20
-msgid ""
-"Create the .xsession for the default user: #{$ touch config/chroot_local-"
-"includes/etc/skel/.xsession}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:22
-msgid ""
-"Edit the .xsession file to launch metacity and start xvncviewer with "
-"something similar to the below:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:29
-msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:31
-msgid "exit"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:35
-msgid "_* Build the image: #{# lh build}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:37 en/other_use-cases.ssi:138
-msgid "_* Enjoy."
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:39
-msgid "2~ VMWare-Player Sessions"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:41
-msgid ""
-"Create an image with live-helper to boot directly to a specifiv VMWare "
-"session."
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:43
-msgid "_* Make a build directory: #{$ mkdir VMWare-Player}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:45
-msgid "_* Move to the build directory: #{$ cd VMWare-Player}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:47
-msgid ""
-"_* Example to config the build directory to include gdm metacity "
-"xtightvncviewer:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:67
-#, no-wrap
-msgid ""
-"$ lh config --apt apt \\\n"
-"        ---apt-recommends disabled \\\n"
-"        --archive-areas \"main\" \\\n"
-"        --binary-images iso \\\n"
-"        --binary-indices none \\\n"
-"        --syslinux-menu vesamenu \\\n"
-"        ---bootappend-live \"persistent quickreboot\" \\\n"
-"        ---bootappend-install \"-- plainroot persistent video=vesa:ywrap,mtrr vga=788 quickreboot quiet live-config\" \\\n"
-"        ---debian-installer live \\\n"
-"        ---distribution lenny \\\n"
-"        ---hostname vmare-player-firmware \\\n"
-"        ---includes none \\\n"
-"        ---linux-flavours 686 \\\n"
-"        ---packages-lists \"gnome-core\" \\\n"
-"        ---packages \"gcc gparted linux-headers-2.6-\\${LH_LINUX_FLAVOURS} live-config-staging make metacity rsync wireless-tools\" \\\n"
-"        ---repositories live.debian.net \\\n"
-"        ---win32-loader disabled\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:71
-msgid ""
-"_* Create the 01-vmware-player hook: #{$ touch config/chroot_local-hooks/01-"
-"vmware-player.sh}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:73
-msgid ""
-"Edit the 01-vmware-player hook to launch the VMWare-Player. The hook should "
-"look something like the below:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:80
-msgid ""
-"_URL=\"http://archive.debian-maintainers.org/vmware/other/vmware-player/\" "
-"_VMPLAYER_VERSION=\"VMware-Player.i386.bundle\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:83
-msgid "echo \"I: Starting script for install of VMWare Player.\" cd /root"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:86
-msgid ""
-"echo \"I: Beginning download of ${_VMPLAYER_VERSION} from ${_URL} .\" wget "
-"${_URL}${_VMPLAYER_VERSION}"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:89
-msgid ""
-"echo \"I: Starting install of VMWare Player.\" sh /root/${_VMPLAYER_VERSION}"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:92
-msgid ""
-"echo \"I: Cleaning up the VMWare Player download.\" rm /root/"
-"${_VMPLAYER_VERSION}"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:95
-msgid "#echo \"I: Starting interactive shell.\" #bash"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:99
-msgid ""
-"_* Build the image (note that during the build the VMWare-Player will prompt "
-"you to install or cancel): #{#lh build}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:101
-msgid ""
-"_* After the build you will have an image you can boot live or install as "
-"firmware. The package live-config-staging is the package that installs the "
-"ability to utilize the VMWare-Player by calling live-config.vmware-player as "
-"a boot parameter in the following form:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:105
-msgid "live-config.vmware-player=ACTION:IMAGEPATH:VMXNAME"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:109
-msgid "Notes from the 900-vmware-player file are as follows:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:135
-#, no-wrap
-msgid ""
-"# The script tests for boot parameter of\n"
-"# live-config.vmware-player=ACTION:IMAGEPATH:VMXNAME\n"
-"#\n"
-"# ACTION: The operation to perform on the workstation (none|scratch)\n"
-"# IMAGEPATH: The folder path to the VMware image you want to run.\n"
-"# VMXNAME: The name of the VMware image you want to run.\n"
-"#\n"
-"# Notes:To use this file with WMWare images you will need to have a few things\n"
-"# setup:\n"
-"#\n"
-"# 1. The VMware Player needs to be installed in the image.\n"
-"# 2. This script uses (s|h)da1 for writing image data, and is used as a scratch\n"
-"#    space. This scratch space should be a file system with linux permissions\n"
-"#    such as ext2.\n"
-"# 3. VMware image(s) should be in a mounted folder and setup as follows:\n"
-"#    - Image(s) set to snapshot mode.\n"
-"#    - For each image, the image folder needs to have a file called\n"
-"#      image-release with a variable CRELEASE. An example: CRELEASE=\"1.0.0\"\n"
-"#\n"
-"# The image-release file is used by the image maintainer and this script to tell\n"
-"# workstation(s) using a given image, to erase locally stored vmware image files\n"
-"# and setup with the newly configure image. The operation of erasing locally\n"
-"# stored vmare image files, is referred to as a scratch.\n"
-msgstr ""
diff --git a/manual/po/ro/project_bugs.ssi.po b/manual/po/ro/project_bugs.ssi.po
index 2db0164..47680e4 100644
--- a/manual/po/ro/project_bugs.ssi.po
+++ b/manual/po/ro/project_bugs.ssi.po
@@ -6,8 +6,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-30 10:29+0100\n"
+"Project-Id-Version: live-manual 2.0.0\n"
+"POT-Creation-Date: 2010-12-23 07: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"
@@ -21,65 +21,62 @@ 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_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/project_bugs.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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:24
+#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr "code{"
@@ -88,65 +85,62 @@ 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:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr "}code"
@@ -205,152 +199,165 @@ msgstr ""
 #. type: Plain text
 #: en/project_bugs.ssi:18
 msgid ""
-"Due to the nature of Debian *{testing}* and Debian *{unstable}* "
-"distributions being a moving target, building a live system may not always "
-"be possible."
+"Because Debian *{testing}* and Debian *{unstable}* distributions are a "
+"moving target, when you specify either as the target system distribution, a "
+"successful build may not always be possible."
 msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:20
-msgid ""
-"If this is a problem, do not build a system based on *{testing}* or *"
-"{unstable}*, but go with *{stable}*. live-build does always default to the "
-"current *{stable}* release."
+msgid "% FIXME:"
 msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:22
 msgid ""
-"Currently known issues are listed under the section 'status' on our homepage "
-"at http://live.debian.net/"
+"If this causes too much difficulty for you, do not build a system based on *"
+"{testing}* or *{unstable}*, but rather, use *{stable}*. live-build does "
+"always default to the *{stable}* release."
 msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:24
 msgid ""
-"It is out of the scope of this manual to train you in correctly identifying "
-"and fixing problems in packages of the development distributions, however, "
-"there are two things you can always try: When not succeeding to build *"
-"{testing}*, try if *{unstable}* works. If *{unstable}* does not work either, "
-"revert to *{testing}* and pinning the newer version of the failing package "
-"from *{unstable}*."
+"Currently known issues are listed under the section 'status' on our homepage "
+"at http://live.debian.net/."
 msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:26
-msgid "2~ Rebuild from scratch"
+msgid ""
+"It is out of the scope of this manual to train you to correctly identify and "
+"fix problems in packages of the development distributions, however, there "
+"are two things you can always try: If a build fails when the target "
+"distribution is *{testing}*, try *{unstable}*. If *{unstable}* does not work "
+"either, revert to *{testing}* and pin the newer version of the failing "
+"package from *{unstable}* (see {APT pinning}#apt-pinning for details)."
 msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:28
+msgid "2~ Rebuild from scratch"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:30
 msgid ""
-"To ensure that a particular bug is not caused by an unclean built system, "
+"To ensure that a particular bug is not caused by an uncleanly built system, "
 "please always rebuild the whole live system from scratch to see if the bug "
 "is reproducible."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:30
+#: en/project_bugs.ssi:32
 msgid "2~ Use up-to-date packages"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:32
+#: en/project_bugs.ssi:34
 msgid ""
 "Using outdated packages can cause significant problems when trying to "
-"reproduce (and ultimately fix) your problem."
+"reproduce (and ultimately fix) your problem. Make sure your build system is "
+"up-to-date and any packages included in your image are up-to-date as well."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:34
+#: en/project_bugs.ssi:36
 msgid "2~collect-information Collect information"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:36
+#: en/project_bugs.ssi:38
 msgid ""
-"Please provide enough information with your report. At a minimum, it should "
-"contain the exact version of live-build version where the bug is "
-"encountered, and steps to reproduce it. Please use common sense and include "
-"other relevant information if you think that it might help in solving the "
-"problem."
+"Please provide enough information with your report. At least include the "
+"exact version of live-build version where the bug is encountered and steps "
+"to reproduce it. Please use common sense and include other relevant "
+"information if you think that it might help in solving the problem."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:38
+#: en/project_bugs.ssi:40
 msgid ""
 "To make the most out of your bug report, we require at least the following "
 "information:"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:40
+#: en/project_bugs.ssi:42
 msgid "_* Architecture of the host system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:42
+#: en/project_bugs.ssi:44
 msgid "_* Version of live-build on the host system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:44
+#: en/project_bugs.ssi:46
 msgid "_* Version of live-boot on the live system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:46
+#: en/project_bugs.ssi:48
 msgid "_* Version of live-config on the live system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:48
-msgid "_* Version of debootstrap and/or cdebootstrap on the host system"
+#: en/project_bugs.ssi:50
+msgid ""
+"_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:50
+#: en/project_bugs.ssi:52
 msgid "_* Architecture of the live system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:52
+#: en/project_bugs.ssi:54
 msgid "_* Distribution of the live system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:54
+#: en/project_bugs.ssi:56
 msgid "_* Version of the kernel on the live system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:56
-msgid "You can generate a log of the build process by using the tee command:"
+#: en/project_bugs.ssi:58
+msgid ""
+"You can generate a log of the build process by using the #{tee}# command. We "
+"recommend doing this automatically with an #{auto/build}# script; see "
+"{Managing a configuration}#managing-a-configuration for details)."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:60
-msgid "lb build 2>&1 | tee build.log"
+#: en/project_bugs.ssi:62
+#, no-wrap
+msgid " # lb build 2>&1 | tee build.log\n"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:64
+#: en/project_bugs.ssi:66
 msgid ""
-"For runtime log, live-boot stores a log in /var/log/live.log (or /var/log/"
-"live-boot.log)."
+"At boot time, live-boot stores a log in #{/var/log/live.log}# (or #{/var/log/"
+"live-boot.log}#)."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:66
+#: en/project_bugs.ssi:68
 msgid ""
 "Additionally, to rule out other errors, it is always a good idea to tar up "
-"your config directory and upload it somewhere (do *{not}* send it as an "
-"attachment to the mailinglist), so that we can try to reproduce the errors "
-"you encountered."
+"your #{config/}# directory and upload it somewhere (do *{not}* send it as an "
+"attachment to the mailing list), so that we can try to reproduce the errors "
+"you encountered. If this is difficult (e.g. due to size) you can use the "
+"output of #{lb config --dump}# which produces a summary of your config tree "
+"(i.e. lists files in subdirectories of #{config/}# but does not include "
+"them)."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:68
+#: en/project_bugs.ssi:70
 msgid ""
 "Remember to send in any logs that were produced with English locale "
 "settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or #"
@@ -358,22 +365,41 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:70
+#: en/project_bugs.ssi:72
+msgid "2~ Isolate the failing case if possible"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:74
+msgid ""
+"If possible, isolate the failing case to the smallest possible change that "
+"breaks. It is not always easy to do this, so if you can't manage it for your "
+"report, don't worry. However, if you plan your development cycle well, using "
+"small enough change sets per iteration, you may be able to isolate the "
+"problem by constructing a simpler 'base' configuration that closely matches "
+"your actual configuration plus just the broken change set added to it. If "
+"you have a hard time sorting out which of your changes broke, it may be that "
+"you are including too much in each change set and should develop in smaller "
+"increments."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:76
 msgid "2~ Use the correct package to report the bug against"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:72
+#: en/project_bugs.ssi:78
 msgid "Where does the bug appear?"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:74
+#: en/project_bugs.ssi:80
 msgid "3~ At build time whilst bootstrapping"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:76
+#: en/project_bugs.ssi:82
 msgid ""
 "live-build first bootstraps a basic Debian system with #{debootstrap}# or #"
 "{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
@@ -383,7 +409,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:78
+#: en/project_bugs.ssi:84
 msgid ""
 "In both cases, this is not a bug in Debian Live, but rather in Debian itself "
 "which we can not fix this directly. Please report such a bug against the "
@@ -391,12 +417,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:80
+#: en/project_bugs.ssi:86
 msgid "3~ At build time whilst installing packages"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:82
+#: en/project_bugs.ssi:88
 msgid ""
 "live-build installs additional packages from the Debian archive and "
 "depending on the Debian distribution used and the daily archive state, it "
@@ -405,16 +431,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:84
+#: en/project_bugs.ssi:90
 msgid ""
 "If this is the case, this is not a bug in Debian Live, but rather in Debian "
-"- please report it against the failing package. Running debootstrap "
-"seperately from the Live system build or running lb bootstrap with #{--debug}"
-"# will give you more information."
+"- please report it against the failing package. Running #{debootstrap}# "
+"separately from the Live system build or running #{lb bootstrap --debug}# "
+"will give you more information."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:86
+#: en/project_bugs.ssi:92
 msgid ""
 "Also, if you are using a local mirror and/or any of sort of proxy and you "
 "are experiencing a problem, please always reproduce it first by "
@@ -422,40 +448,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:88
+#: en/project_bugs.ssi:94
 msgid "3~ At boot time"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:90
+#: en/project_bugs.ssi:96
 msgid ""
 "If your image does not boot, please report it to the mailing list together "
 "with the information requested in {Collect information}#collect-information. "
-"Do not forget to mention, how/when the image failed, in Qemu, VMWare or real "
-"hardware. If you are using a virtualization technology of any kind, please "
-"always run it on real hardware before reporting a bug. Providing a "
-"screenshot of the failure is also very helpful."
+"Do not forget to mention, how/when the image failed, in Qemu, Virtualbox, "
+"VMWare or real hardware. If you are using a virtualization technology of any "
+"kind, please always run it on real hardware before reporting a bug. "
+"Providing a screenshot of the failure is also very helpful."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:92
+#: en/project_bugs.ssi:98
 msgid "3~ At run time"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:94
+#: en/project_bugs.ssi:100
 msgid ""
 "If a package was successfully installed, but fails while actually running "
 "the Live system, this is probably a bug in Debian Live. However,"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:96
+#: en/project_bugs.ssi:102
 msgid "2~ Do the research"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:98
+#: en/project_bugs.ssi:104
 msgid ""
 "Before filing the bug, please search the web for the particular error "
 "message or symptom you are getting. As it is highly unlikely that you are "
@@ -465,7 +491,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:100
+#: en/project_bugs.ssi:106
 msgid ""
 "You should pay particular attention to the Debian Live mailing list, as well "
 "as the homepage, as these are likely to contain the most up-to-date "
@@ -474,7 +500,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:102
+#: en/project_bugs.ssi:108
 msgid ""
 "In addition, you should check the current bug lists for live-build, live-"
 "boot, and live-config to see whether something similar has been reported "
@@ -482,12 +508,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:104
+#: en/project_bugs.ssi:110
 msgid "2~ Where to report bugs"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:106
+#: en/project_bugs.ssi:112
 msgid ""
 "The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
 "System (BTS). For information on how to use the system, please see http://"
@@ -496,7 +522,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:108
+#: en/project_bugs.ssi:114
 msgid ""
 "In general, you should report build time errors against the live-build "
 "package, boot time errors against live-boot, and run time errors against "
@@ -506,7 +532,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:109
+#: en/project_bugs.ssi:115
 msgid ""
 "Please note that bugs found in distributions derived from Debian (such as "
 "Ubuntu and others) should *{not}* be reported to the Debian BTS unless they "
diff --git a/manual/po/ro/project_coding-style.ssi.po b/manual/po/ro/project_coding-style.ssi.po
index 7678117..7161a6f 100644
--- a/manual/po/ro/project_coding-style.ssi.po
+++ b/manual/po/ro/project_coding-style.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-30 11:05+0100\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -21,64 +21,62 @@ 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_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:24
+#: 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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr "code{"
@@ -87,64 +85,62 @@ 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:173 en/other_customization-bootup.ssi:35
-#: en/other_customization-bootup.ssi:48 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: 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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr "}code"
@@ -221,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
@@ -236,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
@@ -251,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
@@ -278,43 +274,45 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:74
-msgid "_* Variables that used in lb config always start with LH_ prefix."
+msgid ""
+"_* Variables that used in #{lb config}# always start with #{LB_}# prefix."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:76
 msgid ""
-"_* Internal temporary variables in live-build should start with the _LH_ "
-"prefix."
+"_* Internal temporary variables in live-build should start with the #{\\_LB_}"
+"# prefix."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:78
-msgid "_* Local variables start with live-build __LH_ prefix."
+msgid "_* Local variables start with live-build #{\\_\\_LB_}# prefix."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:80
 msgid ""
-"_* Variables in connection to a boot parameter in live-config start with "
-"LIVE_."
+"_* Variables in connection to a boot parameter in live-config start with #"
+"{LIVE_}#."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:82
-msgid "_* All other variables in live-config start with _ prefix."
+msgid "_* All other variables in live-config start with #{_}# prefix."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:84
-msgid "_* Use braces around variables; eg. write ${FOO} instead of $FOO."
+msgid ""
+"_* Use braces around variables; e.g. write #{${FOO}}# instead of #{$FOO}#."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:86
 msgid ""
-"_* Always protect variables with quotes to respect potential whitespaces, "
-"write \"${FOO}\" not ${FOO}."
+"_* Always protect variables with quotes to respect potential whitespaces: "
+"write #{\"${FOO}\"}# not #{${FOO}}#."
 msgstr ""
 
 #. type: Plain text
@@ -326,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
@@ -343,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
@@ -367,21 +367,21 @@ msgstr ""
 #. type: Plain text
 #: en/project_coding-style.ssi:132
 msgid ""
-"_* Use \"|\" (without the surround quotes) as a seperator in calls to sed, e."
-"g. \"sed -e 's|foo|bar|'\" (without \"\")."
+"_* Use \"#{|}#\" (without the surround quotes) as a seperator in calls to "
+"sed, e.g. \"#{sed -e 's|foo|bar|'}#\" (without \"\")."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:134
 msgid ""
-"_* Don't use the test command for comparisons or tests, use \"[\" "
-"\"]\" (without \"\"), e.g. \"if [ -x /bin/foo ]; ...\" and not \"if test -x /"
-"bin/foo; ...\"."
+"_* Don't use the #{test}# command for comparisons or tests, use \"#{[}#\" \"#"
+"{]}#\" (without \"\"); e.g. \"#{if [ -x /bin/foo ]; ...}#\" and not \"#{if "
+"test -x /bin/foo; ...}#\"."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:135
 msgid ""
-"_* Use case wherever possible over test, as it's easier to read and faster "
-"in execution."
+"_* Use #{case}# wherever possible over #{test}#, as it's easier to read and "
+"faster in execution."
 msgstr ""
diff --git a/manual/po/ro/project_procedures.ssi.po b/manual/po/ro/project_procedures.ssi.po
index 8503847..8270539 100644
--- a/manual/po/ro/project_procedures.ssi.po
+++ b/manual/po/ro/project_procedures.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-30 10:35+0100\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -21,65 +21,62 @@ 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_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:24
+#: 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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr "code{"
@@ -88,65 +85,62 @@ 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:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: 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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr "}code"
@@ -158,7 +152,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:4
-msgid "1~ Procedures"
+msgid "1~procedures Procedures"
 msgstr ""
 
 #. type: Plain text
@@ -180,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
@@ -264,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
@@ -280,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 6577a75..f7def21 100644
--- a/manual/po/ro/user_basics.ssi.po
+++ b/manual/po/ro/user_basics.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-28 07:16-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -19,132 +19,128 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: 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/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: 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/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
-#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
-#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
-#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
-#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
-#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
+#: 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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
-#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
-#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
-#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
-#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
-#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr "}code"
@@ -218,16 +214,11 @@ msgid ""
 "size. Note that it is read-only. So, during boot the Debian Live system will "
 "use a RAM disk and 'union' mechanism to enable writing files within the "
 "running system. However, all modifications will be lost upon shutdown unless "
-"optional persistence is used (see persistence)."
+"optional persistence is used (see {Persistence}#persistence)."
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:20
-msgid "% FIXME: <xref linkend=\"persistence\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:22
 msgid ""
 "_* *{Bootloader}*: A small piece of code crafted to boot from the chosen "
 "media, possibly presenting a prompt or menu to allow selection of options/"
@@ -241,20 +232,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
 msgid ""
 "You can use live-build to build the system image from your specifications, "
 "set up a Linux kernel, its initrd, and a bootloader to run them, all in one "
-"media-dependant format (ISO9660 image, disk image, etc.)"
+"media-dependant format (ISO9660 image, disk image, etc.)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
 msgid "2~ First steps: building an ISO image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
 msgid ""
 "The following sequence of live-build commands will create a basic ISO hybrid "
 "image containing just the Debian standard system without X.org. It is "
@@ -264,93 +255,99 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
 msgid ""
 "First, we run the #{lb config}# command which will create a \"config/\" "
 "hierarchy in the current directory for use by other commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:34
-msgid "$ lb config"
+#: en/user_basics.ssi:32
+#, no-wrap
+msgid " $ lb config\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:38
+#: en/user_basics.ssi:36
 msgid ""
 "By passing no parameters to #{lb config}#, we indicated that we wish to use "
 "the defaults (see {The lb config command}#lb-config)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:40
+#: en/user_basics.ssi:38
 msgid ""
-"Now that we have a \"config/\" hierarchy, we may build the image with the lb "
-"build command:"
+"Now that we have a \"config/\" hierarchy, we may build the image with the #"
+"{lb build}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
-#: en/user_examples.ssi:106 en/user_examples.ssi:153
-msgid "# lb build"
+#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#, no-wrap
+msgid " # lb build\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:48
+#: en/user_basics.ssi:46
 msgid ""
 "This process can take a while, depending on the speed of your network "
 "connection (see {The lb build command}#lb-build)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:50
+#: en/user_basics.ssi:48
 msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:52
+#: en/user_basics.ssi:50
 msgid "Testing an ISO is simple:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:56 en/user_basics.ssi:144
-msgid "# apt-get install qemu"
+#: en/user_basics.ssi:54 en/user_basics.ssi:142
+#, no-wrap
+msgid " # apt-get install qemu\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:58
-msgid "$ qemu -cdrom binary.iso"
+#: en/user_basics.ssi:56
+#, no-wrap
+msgid " $ qemu -cdrom binary.iso\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:62
+#: en/user_basics.ssi:60
 msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:64
+#: en/user_basics.ssi:62
 msgid "In order to test the ISO with virtualbox-ose:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:68
-msgid "# apt-get install virtualbox-ose virtualbox-ose-dkms"
+#: en/user_basics.ssi:66
+#, no-wrap
+msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:70
-msgid "$ virtualbox"
+#: en/user_basics.ssi:68
+#, no-wrap
+msgid " $ virtualbox\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:74
+#: en/user_basics.ssi:72
 msgid ""
 "Create a new virtual machine, change the storage settings to use binary.iso "
 "as the CD/DVD device, and start the machine."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:76
+#: en/user_basics.ssi:74
 msgid ""
 "Note: For live systems containing X.org that you want to test with "
 "virtualbox-ose, you may wish to include the VirtualBox X.org driver package, "
@@ -359,37 +356,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:80
-msgid "# lb config --packages virtualbox-ose-guest-x11"
+#: en/user_basics.ssi:78
+#, no-wrap
+msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:84
+#: en/user_basics.ssi:82
 msgid "3~burning-iso-image Burning an ISO image to a physical medium"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:86
+#: en/user_basics.ssi:84
 msgid "Burning an ISO image is easy:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:90
-msgid "# apt-get install wodim"
+#: en/user_basics.ssi:88
+#, no-wrap
+msgid " # apt-get install wodim\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:92
-msgid "$ wodim binary.iso"
+#: en/user_basics.ssi:90
+#, no-wrap
+msgid " $ wodim binary.iso\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:94
 msgid "2~ Building a USB/HDD image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:98
+#: en/user_basics.ssi:96
 msgid ""
 "The following sequence of commands will create a basic USB/HDD image "
 "containing just the Debian standard system without X.org. It is suitable for "
@@ -401,7 +401,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:100
+#: en/user_basics.ssi:98
 msgid ""
 "Note: if you created an ISO image with the previous example, you will need "
 "to clean up your working directory with the #{lb clean}# command (see {The "
@@ -409,34 +409,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:104 en/user_basics.ssi:186
-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
-#: en/user_basics.ssi:108
+#: en/user_basics.ssi:106
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the #{config/}"
 "# hierarchy to create a USB/HDD image type:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:112
-msgid "$ lb config -b usb-hdd"
+#: en/user_basics.ssi:110
+#, no-wrap
+msgid " $ lb config -b usb-hdd\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:116
-msgid "Now build the image with the #{lb build} command:"
+#: en/user_basics.ssi:114 en/user_basics.ssi:198
+msgid "Now build the image with the #{lb build}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:124
+#: en/user_basics.ssi:122
 msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:126
+#: en/user_basics.ssi:124
 msgid ""
 "The generated binary image contains a VFAT partition and the syslinux "
 "bootloader, ready to be directly written on a USB stick. Plug in a USB stick "
@@ -444,12 +446,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:130
-msgid "$ dd if=binary.img of=${USBSTICK}"
+#: en/user_basics.ssi:128
+#, no-wrap
+msgid " $ dd if=binary.img of=${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:134
+#: en/user_basics.ssi:132
 msgid ""
 "where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
 "a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -458,35 +461,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:136
+#: en/user_basics.ssi:134
 #, no-wrap
 msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:136
 msgid ""
 "Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
-"type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images."
+"type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:140
+#: en/user_basics.ssi:138
 msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:146
-msgid "$ qemu -hda binary.img"
+#: en/user_basics.ssi:144
+#, no-wrap
+msgid " $ qemu -hda binary.img\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:148
 msgid "3~ Using the space left on a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:152
+#: en/user_basics.ssi:150
 msgid ""
 "If you want to use the remaining free space after you have installed the "
 "binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -495,45 +499,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:156
-msgid "# gparted ${USBSTICK}"
+#: en/user_basics.ssi:154
+#, no-wrap
+msgid " # gparted ${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:160
+#: en/user_basics.ssi:158
 msgid ""
 "After the creation of the partition, you have to create a filesystem on it. "
 "One possible choice would be ext4."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:164
-msgid "# mkfs.ext4 ${USBSTICK}"
+#: en/user_basics.ssi:162
+#, no-wrap
+msgid " # mkfs.ext4 ${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:168
+#: en/user_basics.ssi:166
 msgid "If you want to use this data partition with Windows, use FAT32."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:172
-msgid "# mkfs.vfat -F 32"
+#: en/user_basics.ssi:170
+#, no-wrap
+msgid " # mkfs.vfat -F 32\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:176
+#: en/user_basics.ssi:174
 #, no-wrap
 msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:176
 msgid "2~building-netboot-image Building a netboot image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:178
 msgid ""
 "The following sequence of commands will create a basic netboot image "
 "containing the Debian standard system without X.org. It is suitable for "
@@ -541,43 +548,38 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:182
+#: en/user_basics.ssi:180
 msgid ""
 "Note: if you performed any previous examples, you will need to clean up your "
 "working directory with the #{lb clean}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:190
+#: en/user_basics.ssi:188
 msgid ""
-"Run the #{lb config}# command with the parameters to configure the \"config/"
-"\" hierarchy to create our netboot image:"
+"Run the #{lb config}# command as follows to configure your image for "
+"netbooting:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:194
-msgid ""
-"$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
-"\"192.168.0.1\""
+#: en/user_basics.ssi:192
+#, 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
-#: en/user_basics.ssi:198
+#: en/user_basics.ssi:196
 msgid ""
-"In contrast with the ISO and USB/HDD images, netbooting does not support "
-"serving a filesystem image with the client, so the files must be served via "
-"NFS. The net-root-path and net-root-server options specify the location and "
-"server, respectively, of the NFS server where the filesytem image will be "
-"located at boot time."
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:200
-msgid "Now build the image with the #{lb build}# command:"
+"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
+"serve the filesystem image to the client, so the files must be served via "
+"NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the "
+"location and server, respectively, of the NFS server where the filesytem "
+"image will be located at boot time. Make sure these are set to suitable "
+"values for your network and server."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:206
 msgid ""
 "In a network boot, the client runs a small piece of software which usually "
 "resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -588,26 +590,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:208
 msgid ""
-"For example, if you unpack the generated binary-net.tar.gz archive in the /"
-"srv/debian-live directory, you'll find the filesystem image in live/"
-"filesystem.squashfs and the kernel, initrd and pxelinux bootloader in "
-"tftpboot/debian-live/i386."
+"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
+"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
+"in #{tftpboot/debian-live/i386}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:212
-msgid "We must now configure three services on the server to enable netboot."
+#: en/user_basics.ssi:210
+msgid ""
+"We must now configure three services on the server to enable netboot: the "
+"DHCP server, the TFTP server and the NFS server."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:212
 msgid "3~ DHCP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:214
 msgid ""
 "We must configure our network's DHCP server to be sure to give an IP address "
 "to the netbooting client system, and to advertise the location of the PXE "
@@ -615,109 +619,93 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:216
 msgid ""
 "Here is an example for inspiration, written for the ISC DHCP server #{isc-"
-"dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
+"dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:220
-msgid "% FIXME"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:224
 #, no-wrap
-msgid "subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
+msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:227
+#: en/user_basics.ssi:222
 #, no-wrap
-msgid ""
-"  # IP addresses available for guests\n"
-"  range 192.168.1.100 192.168.1.149;\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:230
-#, no-wrap
-msgid ""
-"  # allow booting from the net\n"
-"  allow bootp;\n"
+msgid " ddns-update-style none;\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:235
+#: en/user_basics.ssi:225
 #, no-wrap
 msgid ""
-"  # for net booting, server where the first file to be loaded (by TFTP\n"
-"  # protocol) (\"filename\" following definition) lies: so the TFTP\n"
-"  # server's name.\n"
-"  next-server myserver;\n"
+" 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:239
+#: en/user_basics.ssi:228
 #, no-wrap
 msgid ""
-"  # net boot configuration for guests with a PXE client:\n"
-"  if substring (option vendor-class-identifier, 0, 9) = \"PXEClient\" {\n"
-"    # Note: all files for PXE are relatives to the TFTP server's root\n"
+" default-lease-time 600;\n"
+" max-lease-time 7200;\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:242
+#: en/user_basics.ssi:230
 #, no-wrap
-msgid ""
-"    # PXE bootloader (first program to be loaded, by TFTP)\n"
-"    filename \"pxelinux.0\";\n"
+msgid " log-facility local7;\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:236
 #, no-wrap
 msgid ""
-"  }\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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:240
 msgid "3~ TFTP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:242
 msgid "This serves the kernel and initial ramdisk to the system at run time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:253
+#: en/user_basics.ssi:244
 msgid ""
 "You should install the tftpd-hpa package. It can serve all files contained "
-"inside a root directory, usually /srv/tftp. To let it serve files inside /"
-"srv/debian-live/tftpboot, run as root the following command:"
+"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
+"#{/srv/debian-live/tftpboot}#, run as root the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:257
-msgid "dpkg-reconfigure -plow tftpd-hpa"
+#: en/user_basics.ssi:248
+#, no-wrap
+msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:252
 msgid "and fill in the new tftp server directory when being asked about it."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:254
 msgid "3~ NFS server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:256
 msgid ""
 "Once the guest computer has downloaded and booted a Linux kernel and loaded "
 "its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -725,161 +713,188 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:267
-msgid "You need to install the nfs-kernel-server package."
+#: en/user_basics.ssi:258
+msgid "You need to install the #{nfs-kernel-server}# package."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:260
 msgid ""
 "Then, make the filesystem image available through NFS by adding a line like "
-"the following to /etc/exports:"
+"the following to #{/etc/exports}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:273
-msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
+#: en/user_basics.ssi:264
+#, no-wrap
+msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:277
+#: en/user_basics.ssi:268
 msgid ""
 "and tell the NFS server about this new export with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:281
-msgid "# exportfs -rv"
+#: en/user_basics.ssi:272
+#, no-wrap
+msgid " # exportfs -rv\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:276
 msgid ""
 "Setting up these three services can be a little tricky. You might need some "
-"patience to get all of them working together. The Debian Installer Manual's "
-"TFTP Net Booting section at http://d-i.alioth.debian.org/manual/en.i386/"
-"ch04s05.html might help as that process is very similar."
+"patience to get all of them working together. For more information, see the "
+"syslinux wiki at http://syslinux.zytor.com/wiki/index.php/PXELINUX or the "
+"Debian Installer Manual's TFTP Net Booting section at http://d-i.alioth."
+"debian.org/manual/en.i386/ch04s05.html. They might help, as their processes "
+"are very similar."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:278
 msgid "3~ Netboot testing HowTo"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:280
 msgid ""
 "Netboot image creation is made easy with live-build magic, but testing the "
 "images on physical machines can be really time consuming."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:282
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:284
 msgid "3~ Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:295
-msgid "_* Install qemu, bridge-utils, sudo."
+#: en/user_basics.ssi:286
+msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:297
-msgid "Edit /etc/qemu-ifup:"
+#: en/user_basics.ssi:288
+msgid "Edit #{/etc/qemu-ifup}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:308
+#: 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
-#: en/user_basics.ssi:312
-msgid "Get, or build a grub-floppy-netboot (in the svn)."
+#: en/user_basics.ssi:303
+msgid "Get, or build a #{grub-floppy-netboot}# (in the svn)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:314
-msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
+#: en/user_basics.ssi:305
+msgid ""
+"Launch #{qemu}# with \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:307
 msgid "3~ VMWare Player"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:309
 msgid "_* Install VMWare Player (\"free as in beer\" edition)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:311
 msgid ""
-"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
+"_* Create a PXETester directory, and create a text file called #{pxe.vwx}# "
+"inside"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:313
 msgid "_* Paste this text inside:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:330
+#: 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:336
+#: 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:339
-msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
+#: en/user_basics.ssi:330
+#, no-wrap
+msgid ""
+" ethernet0.present = \"TRUE\"\n"
+" ethernet0.addressType = \"generated\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:342
-msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
+#: en/user_basics.ssi:333
+#, no-wrap
+msgid ""
+" displayName = \"Test Boot PXE\"\n"
+" guestOS = \"other\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:347
+#: 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
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:342
 msgid ""
-"_* You can play with this configuration file (i.e. change memory limit to "
+"_* You can play with this configuration file (e.g. change memory limit to "
 "256)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:353
+#: en/user_basics.ssi:344
 msgid ""
 "_* Double click on this file (or run VMWare player and select this file)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:354
+#: en/user_basics.ssi:345
 msgid "_* When running just press space if that strange question comes up..."
 msgstr ""
diff --git a/manual/po/ro/user_customization-binary.ssi.po b/manual/po/ro/user_customization-binary.ssi.po
index c2ed723..16adc1d 100644
--- a/manual/po/ro/user_customization-binary.ssi.po
+++ b/manual/po/ro/user_customization-binary.ssi.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
+"Project-Id-Version: live-manual 2.0.0\n"
 "POT-Creation-Date: 2010-11-30 11:20+0100\n"
 "PO-Revision-Date: 2010-11-30 11:20+0100\n"
 "Last-Translator: Automatically generated\n"
diff --git a/manual/po/ro/user_customization-contents.ssi.po b/manual/po/ro/user_customization-contents.ssi.po
index d6b04b8..126bd8d 100644
--- a/manual/po/ro/user_customization-contents.ssi.po
+++ b/manual/po/ro/user_customization-contents.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -19,124 +19,128 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: 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/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: 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/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
-#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
+#: 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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
-#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr "}code"
@@ -153,7 +157,13 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:6
-msgid "This chapter discusses further customization of the live system."
+msgid ""
+"This chapter discusses fine-tuning customization of the live system contents "
+"beyond merely choosing which packages to include. Includes allow you to add "
+"or replace arbitrary files in your Debian Live image, hooks allow you to "
+"execute arbitrary commands at different stages of the build and at boot "
+"time, and preseeding allows you to configure packages when they are "
+"installed by supplying answers to debconf questions."
 msgstr ""
 
 #. type: Plain text
@@ -164,77 +174,63 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-contents.ssi:10
 msgid ""
-"Using includes, it is possible to add (or replace) arbitrary files in your "
-"Debian Live image. live-build provides three mechanisms for using them:"
+"While ideally a Debian live system would include files entirely provided by "
+"unmodified Debian packages, it is sometimes convenient to provide or modify "
+"some content by means of files. Using includes, it is possible to add (or "
+"replace) arbitrary files in your Debian Live image. live-build provides "
+"three mechanisms for using them:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:12
 msgid ""
 "_* Chroot local includes: These allow you to add or replace files to the "
-"chroot/Live filesystem. Please see chroot-local-includes for more "
-"information."
+"chroot/Live filesystem. Please see {Live/chroot local includes}#live-chroot-"
+"local-includes for more information."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:14
-msgid "% FIXME: <xref linkend=\"chroot-local-includes\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:16
 msgid ""
 "_* Binary local includes: These allow you to add or replace files in the "
-"binary image. Please see binary-local-includes for more information."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:18
-msgid "% FIXME: <xref linkend=\"binary-local-includes\"/>"
+"binary image. Please see {Binary local includes}#binary-local-includes for "
+"more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:20
+#: en/user_customization-contents.ssi:16
 msgid ""
 "_* Binary includes: These allow you to add or replace Debian specific files "
 "in the binary image, such as the templates and tools directories. Please see "
-"binary-includes for more information."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:22
-msgid "% FIXME: <xref linkend=\"binary-includes\"/>"
+"{Binary includes}#binary-includes for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:18
 msgid ""
-"Please see terms for more information about the distinction between the "
-"\"Live\" and \"binary\" images."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:26
-msgid "% FIXME: <xref linkend=\"terms\"/>"
+"Please see {Terms}#terms for more information about the distinction between "
+"the \"Live\" and \"binary\" images."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:28
-msgid "3~ Live/chroot local includes"
+#: en/user_customization-contents.ssi:20
+msgid "3~live-chroot-local-includes Live/chroot local includes"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:30
+#: en/user_customization-contents.ssi:22
 msgid ""
 "Chroot local includes can be used to add or replace files in the chroot/Live "
-"filesystem so that they are visible when the Live system is booted. Typical "
-"uses for them are to populate the skeleton user directory (#{/etc/skel}#) "
-"used by the live system to create the live user's home directory, or adding "
-"configuration files where additional processing is not required."
+"filesystem so that they may be used in the Live system. A typical use is to "
+"populate the skeleton user directory (#{/etc/skel}#) used by the Live system "
+"to create the live user's home directory. Another is to supply configuration "
+"files that can be simply added or replaced in the image without processing; "
+"see {Live/chroot local hooks}#live-chroot-local-hooks if processing is "
+"needed."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:32
+#: en/user_customization-contents.ssi:24
 msgid ""
 "To include files, simply add them to your #{config/chroot_local-includes}# "
 "directory. This directory corresponds to the root directory (#{/}#) of the "
@@ -243,53 +239,70 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:37
+#: 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
-#: en/user_customization-contents.ssi:41
+#: en/user_customization-contents.ssi:33
 msgid "Your configuration will then have the following layout:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:52
+#: 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
-#: en/user_customization-contents.ssi:56
+#: en/user_customization-contents.ssi:48
 msgid ""
 "Chroot local includes are installed after package installation so that files "
 "installed by packages are overwritten."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:58
-msgid "3~ Binary local includes"
+#: en/user_customization-contents.ssi:50
+msgid "3~binary-local-includes Binary local includes"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:60
+#: en/user_customization-contents.ssi:52
 msgid ""
-"The same way as chroot local includes work, there exists the corresponding "
-"mechanism to include files in the live media itself."
+"To include material such as documentation or videos on the media filesystem "
+"so that it is accessible immediately upon insertion of the media without "
+"booting the Live system, you can use binary local includes. This works in a "
+"similar fashion to chroot local includes. For example, suppose the files #{~/"
+"video_demo.*}# are demo videos of the live system described by and linked to "
+"by an HTML index page. Simply copy the material to #{config/binary_local-"
+"includes/} as follows:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:56
+#, no-wrap
+msgid " $ cp ~/video_demo.* config/binary_local-includes/\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:60
+msgid "These files will now appear in the root directory of the live media."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:62
-msgid "3~ Binary includes"
+msgid "3~binary-includes Binary includes"
 msgstr ""
 
 #. type: Plain text
@@ -301,28 +314,37 @@ 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
 #: en/user_customization-contents.ssi:72
-msgid "2~ Hooks"
+msgid ""
+"Otherwise, the material will be installed by live-build in #{/includes/}# by "
+"default on the media filesystem, or else you can specify an alternate path "
+"with #{--includes}#."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:74
+msgid "2~ Hooks"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:76
 msgid ""
 "Hooks allow commands to be performed in the chroot and binary stages of the "
 "build in order to customize the image."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:76
-msgid "3~ Live/chroot local hooks"
+#: en/user_customization-contents.ssi:78
+msgid "3~live-chroot-local-hooks Live/chroot local hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:78
+#: en/user_customization-contents.ssi:80
 msgid ""
 "To run commands in the chroot stage, create a hook script containing the "
 "commands in the #{config/chroot_local-hooks}# directory. The hook will run "
@@ -335,12 +357,30 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:80
+#: en/user_customization-contents.ssi:82
+msgid "3~ Boot-time hooks"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:84
+msgid ""
+"To execute commands at boot time, you can supply live-config hooks as "
+"explained in the \"Customization\" section of its man page. Examine live-"
+"config's own hooks provided in #{/lib/live/config/}#, noting the sequence "
+"numbers. Then provide your own hook prefixed with an appropriate sequence "
+"number, either as a chroot local include in #{config/chroot_local-includes/"
+"lib/live/config/}#, or as a custom package as discussed in {Installing "
+"modified or third-party packages}#installing-modified-or-third-party-"
+"packages."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:86
 msgid "3~ Binary local hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:82
+#: en/user_customization-contents.ssi:88
 msgid ""
 "To run commands in the binary stage, create a hook script containing the "
 "commands in the #{config/binary_local-hooks}#. The hook will run after all "
@@ -353,12 +393,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:84
+#: en/user_customization-contents.ssi:90
 msgid "2~ Preseeding Debconf questions"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:86
+#: en/user_customization-contents.ssi:92
 msgid ""
 "Files in the #{config/chroot_local-preseed}# directory are considered to be "
 "debconf preseed files and are installed by live-build using #{debconf-set-"
@@ -366,7 +406,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:87
+#: en/user_customization-contents.ssi:93
 msgid ""
 "For more information about debconf, please see debconf(7) in the #{debconf}# "
 "package."
diff --git a/manual/po/ro/user_customization-installer.ssi.po b/manual/po/ro/user_customization-installer.ssi.po
index bf2a5b6..11fed06 100644
--- a/manual/po/ro/user_customization-installer.ssi.po
+++ b/manual/po/ro/user_customization-installer.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-30 10:53+0100\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -18,6 +18,134 @@ msgstr ""
 "20)) ? 1 : 2;\n"
 
 #. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: 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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
 #: en/user_customization-installer.ssi:2
 msgid ":B~ Customizing Debian Installer"
 msgstr ""
@@ -31,8 +159,8 @@ msgstr ""
 #: en/user_customization-installer.ssi:6
 msgid ""
 "Debian Live system images can be integrated with Debian Installer. There are "
-"number of different \"types\" of installation, varying in what and how to "
-"install the image."
+"a number of different types of installation, varying in what is included and "
+"how the installer operates."
 msgstr ""
 
 #. type: Plain text
@@ -46,77 +174,132 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:10
-msgid "The three main types of installer are:"
+msgid "2~ Types of Debian Installer"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:12
-msgid ""
-"_* *{\"Regular\" Debian Installer}*: This is a normal Debian Live image with "
-"a seperate kernel and initrd which (when selected from the appropriate "
-"bootloader) launches into a standard Debian Installer instance, just as if "
-"you had downloaded a CD image of Debian and booted it. Images containing a "
-"live system and such an otherwise indepentend installer are often referet to "
-"as \"combined images\"."
+msgid "The three main types of installer are:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:14
+#, no-wrap
+msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as \"combined images\".\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:16
 msgid ""
 "On such images, Debian is installed by fetching and installing .deb packages "
 "using #{debootstrap}# or #{cdebootstrap}#, from the local media or some "
-"network-base network, resulting in a standard Debian system being installed "
+"network-based network, resulting in a standard Debian system being installed "
 "to the hard disk."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:16
+#: en/user_customization-installer.ssi:18
 msgid ""
 "This whole process can be preseeded and customized in a number of ways; see "
 "the relevant pages in the Debian Installer manual for more information. Once "
-"you have a working preseeding file, live-build can automatically place it to "
+"you have a working preseeding file, live-build can automatically put it in "
 "the image and enable it for you."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:18
-msgid ""
-"_* *{\"Live\" Debian Installer}*: This is a Debian Live image with a "
-"seperate kernel and initrd which (when selected from the appropriate "
-"bootloader) launches into an instance of the Debian Installer."
+#: en/user_customization-installer.ssi:20
+#, no-wrap
+msgid "*{\"Live\" Debian Installer}*: This is a Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into an instance of the Debian Installer.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:20
+#: en/user_customization-installer.ssi:22
 msgid ""
 "Installation will proceed in an identical fashion to the \"Regular\" "
 "installation described above, but at the actual package installation stage, "
-"instead of using #{debootstrap}# to fetch and install packages, the \"live\" "
-"filesystem image is copied to the target. This is acchieved with a special "
-"udeb called live-installer. live-installer can be preseeded to be disabled, "
-"allowing to support normal and live installer entries in the bootloader of "
-"the same live media."
+"instead of using #{debootstrap}# to fetch and install packages, the live "
+"filesystem image is copied to the target. This is achieved with a special "
+"udeb called live-installer."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:22
+#: en/user_customization-installer.ssi:24
 msgid ""
 "After this stage, the Debian Installer continues as normal, installing and "
 "configuring items such as bootloaders and local users, etc."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:24
+#: en/user_customization-installer.ssi:26
+msgid ""
+"Note: to support both normal and live installer entries in the bootloader of "
+"the same live media, you must disable live-installer by preseeding #{live-"
+"installer/enable=false}."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:28
+#, no-wrap
+msgid "*{\"Desktop\" Debian Installer}*: Regardless of the type of Debian Installer included, #{d-i}# can be launched from the Desktop by clicking on an icon. This is user friendlier in some situations. In order to make use of this, the debian-installer-launcher package needs to be included.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:30
+msgid ""
+"Note that by default, live-build does not include Debian Installer images in "
+"the images, it needs to be specifically enabled with #{lb config}#. Also, "
+"please note that for the \"Desktop\" installer to work, the kernel of the "
+"live system must match the kernel #{d-i}# uses for the specified "
+"architecture. For example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:35
+#, no-wrap
 msgid ""
-"_* *{\"Desktop\" Debian Installer}*: Regardless of the mode Debian Installer "
-"is used in, d-i can be launched from the Desktop by clicking on an icon. "
-"This is user friendlier in some situations. In order to make use of this, "
-"the debian-installer-launcher package needs to be included."
+" $ 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:39
+msgid "2~ Customizing Debian Installer by preseeding"
+msgstr ""
+
+#. type: Plain text
+#: 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 "
+"answers to questions asked during the installation process, without having "
+"to manually enter the answers while the installation is running. This makes "
+"it possible to fully automate most types of installation and even offers "
+"some features not available during normal installations.\" This kind of "
+"customization is best accomplished with live-build by placing the "
+"configuration in a #{preseed.cfg}# file included in #{config/binary_debian-"
+"installer/}#. For example, to preseed setting the locale to #{en_US}#:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:46
+#, no-wrap
+msgid ""
+" $ 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:50
+msgid "2~ Customizing Debian Installer content"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:25
+#: en/user_customization-installer.ssi:52
 msgid ""
-"Note that by default live-build does not include Debian Installer images in "
-"the images, it needs to be specifically enabled with lb config."
+"For experimental or debugging purposes, you might want to include locally "
+"built #{d-i}# component udeb packages. Place these in #{config/binary_local-"
+"udebs/}# to include them in the image. Additional or replacement files and "
+"directories may be included in the installer initrd as well, in a similar "
+"fashion to {Live/chroot local includes}#live-chroot-local-includes, by "
+"placing the material in #{config/binary_debian-installer-includes/}#."
 msgstr ""
diff --git a/manual/po/ro/user_customization-internationalization.ssi.po b/manual/po/ro/user_customization-internationalization.ssi.po
deleted file mode 100644
index c0b66e8..0000000
--- a/manual/po/ro/user_customization-internationalization.ssi.po
+++ /dev/null
@@ -1,223 +0,0 @@
-# Romanian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
-"PO-Revision-Date: 2010-10-22 08:57-0200\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: ro\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
-"20)) ? 1 : 2;\n"
-
-#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: 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/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
-#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
-#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
-msgid "code{"
-msgstr "code{"
-
-#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
-#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
-#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
-msgid "}code"
-msgstr "}code"
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:2
-msgid ":B~ Customizing locale and language"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:4
-msgid "1~customizing-locale-and-language Customizing locale and language"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:6
-msgid "2~ Default locale and keyboard"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:8
-msgid ""
-"The default locale when building a Live system is \"locales=en_US.UTF-8\", "
-"to set the locale for e.g. Switzerland, you can use \"locales=de_CH.UTF-8\"."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:12
-msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:16
-msgid "The entry for a Swiss-German keyboard would be:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:20
-msgid "$ lb config --bootappend-live \"keyboard-layouts=ch\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:24
-msgid "Combined, the keyboard and locale configured for Switzerland would be:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:28
-msgid ""
-"$ lb config --bootappend-live =\"locales=de_CH.UTF-8 keyboard-layouts=ch\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:32
-msgid ""
-"Note: You can find a list of options in the manpage for live-config. "
-"Currently, only UTF-8 locales are supported."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:34
-msgid "2~ l10n Packages"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:36
-msgid ""
-"An experimental feature of live-build is to automatically check for each "
-"package for which it is know that there are -l10n packages available and "
-"install them. To add German packages the entry would be"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:40
-msgid "$ lb config --language \"de\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:43
-msgid ""
-"This will also change the default syslinux language if translations are "
-"available or local translations have been put into #{config/templates/"
-"syslinux/de}#."
-msgstr ""
diff --git a/manual/po/ro/user_customization-overview.ssi.po b/manual/po/ro/user_customization-overview.ssi.po
index 3cf3891..ee436bc 100644
--- a/manual/po/ro/user_customization-overview.ssi.po
+++ b/manual/po/ro/user_customization-overview.ssi.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
+"Project-Id-Version: live-manual 2.0.0\n"
 "POT-Creation-Date: 2010-11-27 09:40-0400\n"
 "PO-Revision-Date: 2010-10-22 08:57-0200\n"
 "Last-Translator: Automatically generated\n"
diff --git a/manual/po/ro/user_customization-packages.ssi.po b/manual/po/ro/user_customization-packages.ssi.po
index 8c6e65b..3169d24 100644
--- a/manual/po/ro/user_customization-packages.ssi.po
+++ b/manual/po/ro/user_customization-packages.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-01 21:10-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -21,32 +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/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
+#: 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
@@ -59,25 +51,29 @@ msgstr ""
 #: en/user_customization-packages.ssi:185
 #: en/user_customization-packages.ssi:199
 #: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
 #: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:321 en/user_customization-runtime.ssi:12
-#: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
-#: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
-#: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
-#: en/user_customization-runtime.ssi:92 en/user_customization-runtime.ssi:101
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
 #: en/user_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_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:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:108
-#: en/user_installation.ssi:126 en/user_installation.ssi:141
-#: en/user_managing_a_configuration.ssi:24
+#: 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
@@ -89,32 +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:173 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
+#: 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
@@ -127,25 +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:285
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
 #: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:334 en/user_customization-runtime.ssi:16
-#: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: 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_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:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:112
-#: en/user_installation.ssi:131 en/user_installation.ssi:144
-#: en/user_managing_a_configuration.ssi:31
+#: 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
@@ -209,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
@@ -224,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
@@ -283,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
@@ -316,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
@@ -347,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
@@ -379,8 +374,9 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:82
-msgid "$ lb config --repository live.debian.net"
+#: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
+#, no-wrap
+msgid " $ lb config --repository live.debian.net\n"
 msgstr ""
 
 #. type: Plain text
@@ -415,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
@@ -466,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
@@ -562,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
@@ -590,20 +591,27 @@ 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
 #: en/user_customization-packages.ssi:163
 msgid ""
-"You may test for any one of a number of values, e.g. to install #"
-"{memtest86+ }# if either #{--architecture i386}# or #{--architecture amd64}# "
-"is specified:"
+"You may test for any one of a number of values, e.g. to install #{memtest86+}"
+"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
 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
@@ -616,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
@@ -626,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
@@ -652,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
@@ -674,11 +691,11 @@ msgstr ""
 msgid ""
 "Desktop and language tasks are special cases. In the Debian Installer, if "
 "the medium was prepared for a particular desktop environment flavour, the "
-"corresponding task will be automatically installed. Thus, there are there "
-"are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}"
-"# tasks, none of which are offered in #{tasksel}#'s menu. Likewise, there "
-"are no menu entries for tasks for languages, but the user's language choice "
-"during the install influences the selection of corresponding language tasks."
+"corresponding task will be automatically installed. Thus, there are #{gnome-"
+"desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}# tasks, "
+"none of which are offered in #{tasksel}#'s menu. Likewise, there are no menu "
+"entries for tasks for languages, but the user's language choice during the "
+"install influences the selection of corresponding language tasks."
 msgstr ""
 
 #. type: Plain text
@@ -700,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
@@ -711,27 +728,51 @@ msgid ""
 "the desktop flavours mentioned above, which select the #{standard-x11}# "
 "predefined package list, the corresponding #{*-desktop}# task and three "
 "additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example, "
-"if you specify #{--packages gnome-desktop}#, it is equivalent to specifying #"
-"{--packages standard-x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
+"if you specify #{--packages-lists gnome-desktop}#, it is equivalent to "
+"specifying #{--packages debian-installer-launcher --packages-lists standard-"
+"x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:223
 msgid ""
 "Third, if any of the tasks for these desktop flavours are selected, either "
-"explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build "
-"will preseed the corresponding desktop value for Debian Installer (if it is "
-"included) to ensure it follows its own rules for installing different "
+"explicitly through #{--tasks}# or implicitly by #{--packages-lists}#, live-"
+"build will preseed the corresponding desktop value for Debian Installer (if "
+"it is included) to ensure it follows its own rules for installing different "
 "desktop flavours."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:225
-msgid "2~ Installing modified or third-party packages"
+#, no-wrap
+msgid "*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are in
 stalled. For example:\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:229
+#, no-wrap
+msgid " $ lb config --language es\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:233
+msgid ""
+"Even so, it is limited in that it only supports a single language and a "
+"single bootloader. Therefore, for all of these reasons, the future of this "
+"option is under review, possibly to be replaced with something entirely "
+"different in the next major release of live-build."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:235
+msgid ""
+"2~installing-modified-or-third-party-packages Installing modified or third-"
+"party packages"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:237
 msgid ""
 "Whilst it is against the philosophy of Debian Live, it may sometimes be "
 "necessary to build a Live system with modified versions of packages that are "
@@ -742,7 +783,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:239
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -753,22 +794,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:241
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:243
 msgid "_* #{chroot_local-packages}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:245
 msgid "_* Using a custom APT repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:247
 msgid ""
 "Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
 "off\" customizations but has a number of drawbacks, whilst using a custom "
@@ -776,12 +817,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:249
 msgid "3~ Using #{chroot_local-packages}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:251
 msgid ""
 "To install a custom package, simply copy it to the #{config/chroot_local-"
 "packages/}# directory. Packages that are inside this directory will be "
@@ -790,45 +831,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:253
 msgid ""
 "Packages *{must}* be named in the prescribed way. One simple way to do this "
 "is to use #{dpkg-name}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:255
 msgid ""
 "Using #{chroot_local-packages}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:257
 msgid "_* It is not possible to use secure APT."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:259
 msgid ""
 "_* You must install all appropriate packages in the #{config/chroot_local-"
 "packages/}# directory."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:261
 msgid ""
 "_* It does not lend itself to storing Debian Live configurations in revision "
 "control."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:263
 msgid "3~ Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:265
 msgid ""
 "Unlike using #{chroot_local-packages}#, when using a custom APT repository "
 "you must ensure that you specify the packages elsewhere. See {Choosing "
@@ -836,7 +877,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:267
 msgid ""
 "Whilst it may seem unnecessary effort to create an APT repository to install "
 "custom packages, the infrastructure can be easily re-used at a later date to "
@@ -844,12 +885,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:269
 msgid "3~ Custom packages and APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:271
 msgid ""
 "live-build uses APT to install all packages into the live system so will "
 "therefore inherit behaviours from this program. One relevant example is that "
@@ -859,7 +900,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:273
 msgid ""
 "Because of this, you may wish to increment the version number in your custom "
 "packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -869,12 +910,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:275
 msgid "2~ Configuring APT at build time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:277
 msgid ""
 "You can configure APT through a number of options applied only at build "
 "time. (APT configuration used in the running live system may be configured "
@@ -885,12 +926,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:279
 msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:281
 msgid ""
 "You can elect to use either #{apt}# or #{aptitude}# when installing packages "
 "at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -900,26 +941,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283
 msgid ""
 "_* #{apt}#: With this method, if a missing package is specified, the package "
 "installation will fail. This is the default setting."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:285
 msgid ""
 "_* #{aptitude}#: With this method, if a missing package is specified, the "
 "package installation will succeed."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287
 msgid "3~ Using a proxy with APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:279
+#: en/user_customization-packages.ssi:289
 msgid ""
 "One commonly required APT configuration is to deal with building an image "
 "behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -927,17 +968,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:283
-msgid "lb config --apt-http-proxy http://proxy/"
+#: en/user_customization-packages.ssi:293
+#, no-wrap
+msgid " $ lb config --apt-http-proxy http://proxy/\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:287
+#: en/user_customization-packages.ssi:297
 msgid "3~ Tweaking APT to save space"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:299
 msgid ""
 "You may find yourself needing to save some space on the image media, in "
 "which case one or the other or both of the following options may be of "
@@ -945,19 +987,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:301
 msgid ""
 "If you don't want to include APT indices in the image, you can omit those "
 "with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:295
-msgid "$ lb config --binary-indices false"
+#: en/user_customization-packages.ssi:305
+#, no-wrap
+msgid " $ lb config --binary-indices false\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:299
+#: en/user_customization-packages.ssi:309
 msgid ""
 "This will not influence the entries in /etc/apt/sources.list, but merely "
 "whether /var/lib/apt contains the indices files or not. The tradeoff is that "
@@ -967,36 +1010,41 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:301
+#: en/user_customization-packages.ssi:311
 msgid ""
 "If you find the installation of recommended packages bloats your image too "
 "much, you may disable that default option of APT with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:305
-msgid "$ lb config --apt-recommends false"
+#: en/user_customization-packages.ssi:315
+#, no-wrap
+msgid " $ lb config --apt-recommends false\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:319
 msgid ""
-"The tradeoff here is that recommended packages are defined as \"packages "
-"that would be found together with this one in all but unusual installations"
-"\" (Debian Policy Manual, 7.2). This may lead to some packages that you "
-"actually need being omitted, so we suggest you review the difference this "
-"makes to your packages list (see the #{binary.packages}# file generated by #"
-"{lb build}#) and re-include in your list any missing packages that you still "
-"want installed."
+"The tradeoff here is that if you don't install recommended packages for a "
+"given package, that is, \"packages that would be found together with this "
+"one in all but unusual installations\" (Debian Policy Manual, 7.2), some "
+"packages that you actually need may be omitted. Therefore, we suggest you "
+"review the difference turning off recommends makes to your packages list "
+"(see the #{binary.packages}# file generated by #{lb build}#) and re-include "
+"in your list any missing packages that you still want installed. "
+"Alternatively, if you find you only want a small number of recommended "
+"packages left out, leave recommends enabled and set a negative APT pin "
+"priority on selected packages to prevent them from being installed, as "
+"explained in {APT pinning}#apt-pinning."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:321
 msgid "3~ Passing options to apt or aptitude"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:323
 msgid ""
 "If there is not an #{lb config}# option to alter APT's behaviour in the way "
 "you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -1005,12 +1053,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:315
+#: en/user_customization-packages.ssi:325
 msgid "3~apt-pinning APT pinning"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:327
 msgid ""
 "For background, please first read the #{apt_preferences(5)}# man page. APT "
 "pinning can be configured either for build time, or else for run time. For "
@@ -1019,7 +1067,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:329
 msgid ""
 "Let's say you are building a Squeeze live system but need all #{live-*}# "
 "packages to be installed from Sid at build time. You need to add Sid to your "
@@ -1029,14 +1077,42 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:327
+#: 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:332
-msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
+#: en/user_customization-packages.ssi:342
+#, 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
+msgid ""
+"Negative pin priorities will prevent a package from being installed, as in "
+"the case where you do not want a package that is recommended by another "
+"package. Suppose you are building a GNOME image but don't want the user "
+"prompted to store wifi passwords in the keyring, so you want to omit the "
+"recommended #{gnome-keyring}# package. This can be done by adding the "
+"following stanza to #{config/chroot_apt/preferences}#:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:352
+#, no-wrap
+msgid ""
+" Package: gnome-keyring\n"
+" Pin: version *\n"
+" Pin-Priority: -1\n"
 msgstr ""
diff --git a/manual/po/ro/user_customization-runtime.new.ssi.po b/manual/po/ro/user_customization-runtime.new.ssi.po
deleted file mode 100644
index 03fc2bd..0000000
--- a/manual/po/ro/user_customization-runtime.new.ssi.po
+++ /dev/null
@@ -1,648 +0,0 @@
-# Romanian translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-02 20:07-0400\n"
-"PO-Revision-Date: 2010-12-02 20:07-0400\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: ro\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
-"20)) ? 1 : 2;\n"
-
-#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi: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/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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:293
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:321
-#: en/user_customization-runtime.new.ssi:14
-#: en/user_customization-runtime.new.ssi:34
-#: en/user_customization-runtime.new.ssi:42
-#: en/user_customization-runtime.new.ssi:50
-#: en/user_customization-runtime.new.ssi:64
-#: en/user_customization-runtime.new.ssi:76
-#: en/user_customization-runtime.new.ssi:86
-#: en/user_customization-runtime.new.ssi:94
-#: en/user_customization-runtime.new.ssi:102
-#: en/user_customization-runtime.new.ssi:110
-#: en/user_customization-runtime.new.ssi:130
-#: en/user_customization-runtime.new.ssi:138
-#: en/user_customization-runtime.new.ssi:147
-#: en/user_customization-runtime.ssi:12 en/user_customization-runtime.ssi:30
-#: en/user_customization-runtime.ssi:40 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:56 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:92
-#: en/user_customization-runtime.ssi:101 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:141 en/user_managing_a_configuration.ssi:24
-#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47
-#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
-msgid "code{"
-msgstr "code{"
-
-#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:173 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/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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:297
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:334
-#: en/user_customization-runtime.new.ssi:18
-#: en/user_customization-runtime.new.ssi:38
-#: en/user_customization-runtime.new.ssi:46
-#: en/user_customization-runtime.new.ssi:54
-#: en/user_customization-runtime.new.ssi:68
-#: en/user_customization-runtime.new.ssi:80
-#: en/user_customization-runtime.new.ssi:90
-#: en/user_customization-runtime.new.ssi:98
-#: en/user_customization-runtime.new.ssi:106
-#: en/user_customization-runtime.new.ssi:114
-#: en/user_customization-runtime.new.ssi:134
-#: en/user_customization-runtime.new.ssi:143
-#: en/user_customization-runtime.new.ssi:152
-#: en/user_customization-runtime.ssi:16 en/user_customization-runtime.ssi:34
-#: en/user_customization-runtime.ssi:44 en/user_customization-runtime.ssi:52
-#: en/user_customization-runtime.ssi:60 en/user_customization-runtime.ssi:68
-#: en/user_customization-runtime.ssi:88 en/user_customization-runtime.ssi:97
-#: en/user_customization-runtime.ssi:106 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:31
-#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
-msgid "}code"
-msgstr "}code"
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:8
-#: en/user_customization-runtime.new.ssi:32
-msgid ""
-"The default locale when building a Live system is \"locales=en_US.UTF-8\", "
-"to set the locale for e.g. Switzerland, you can use \"locales=de_CH.UTF-8\"."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:12
-#: en/user_customization-runtime.new.ssi:36
-msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:16
-#: en/user_customization-runtime.new.ssi:40
-msgid "The entry for a Swiss-German keyboard would be:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:20
-#: en/user_customization-runtime.new.ssi:44
-msgid "$ lb config --bootappend-live \"keyboard-layouts=ch\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:24
-#: en/user_customization-runtime.new.ssi:48
-msgid "Combined, the keyboard and locale configured for Switzerland would be:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:28
-#: en/user_customization-runtime.new.ssi:52
-msgid ""
-"$ lb config --bootappend-live =\"locales=de_CH.UTF-8 keyboard-layouts=ch\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:32
-#: en/user_customization-runtime.new.ssi:56
-msgid ""
-"Note: You can find a list of options in the manpage for live-config. "
-"Currently, only UTF-8 locales are supported."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:40
-#: en/user_customization-runtime.new.ssi:66
-msgid "$ lb config --language \"de\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:43
-#: en/user_customization-runtime.new.ssi:70
-msgid ""
-"This will also change the default syslinux language if translations are "
-"available or local translations have been put into #{config/templates/"
-"syslinux/de}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:2
-msgid ":B~ Customizing run time behaviours"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:4
-msgid "1~customizing-run-time-behaviours Customizing run time behaviours"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:6
-msgid ""
-"All configuration that is done during run time is done by live-config. Here "
-"are some most common options of live-config that users are interested in. A "
-"full list of all possibilities can be found in the manpage of live-config."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:8
-msgid "2~ Customizing the live user"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:10
-msgid ""
-"One important consideration is that the live user is created by live-boot at "
-"boot time, not by live-build at build time. This not only influences where "
-"materials relating to the live user are introduced in your build, as "
-"discussed in {Live/chroot local includes}#live-chroot-local-includes, but "
-"also any groups and permissions associated with the live user."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:12
-#: en/user_customization-runtime.ssi:10
-msgid ""
-"You can specify additional groups that the live user will belong to by "
-"preseeding the #{passwd/user-default-groups}# debconf value. For example, to "
-"add the live user to the #{fuse}# group, add the following to a file in the #"
-"{config/chroot_local-preseed}# directory:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:16
-#: en/user_customization-runtime.ssi:14
-msgid ""
-"debconf passwd/user-default-groups string audio cdrom dialout floppy video "
-"plugdev netdev powerdev fuse"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:20
-msgid "2~customizing-locale-and-language Customizing locale and language"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:22
-#: en/user_customization-runtime.ssi:20
-msgid "When the live system boots, language is involved in three steps:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:24
-#: en/user_customization-runtime.ssi:22
-msgid "_* the locale generation"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:26
-#: en/user_customization-runtime.ssi:24
-msgid "_* setting the keyboard layout for the console"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:28
-#: en/user_customization-runtime.ssi:26
-msgid "_* setting the keyboard layout for X"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:30
-msgid "3~ Default locale and keyboard"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:58
-msgid "3~ l10n Packages"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:60
-msgid ""
-"% FIXME: not a run time configuration! Belongs in packages chapter. (See --"
-"tasks discussion.)"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:62
-msgid ""
-"An experimental feature of live-build is to automatically check for each "
-"package for which it is known that there are #{*-l10n}# packages available "
-"and install them. To add German packages the entry would be"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:72
-msgid "3~ Language"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:74
-msgid ""
-"To define the locale that should be generated, use the #{locales}# parameter "
-"into the #{--bootappend-live}# option of #{lb config}#, e.g.:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:78
-#: en/user_customization-runtime.ssi:32
-msgid "lb config --bootappend-live \"locales=de_CH.UTF-8\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:82
-#: en/user_customization-runtime.ssi:36
-msgid ""
-"This parameter can also be used in kernel command line. You can specify a "
-"locale by a full #{language_country.encoding}# word."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:84
-#: en/user_customization-runtime.ssi:38
-msgid ""
-"Both the console and X keyboard configuration depends on the #{keyb}# "
-"parameter of the #{--bootappend-live}# option. Valid options for X keyboard "
-"layouts can be found in #{/etc/X11/xkb/base.xml}# (rather limited to two-"
-"letters country codes). To find the value (the two characters) corresponding "
-"to a language try searching for the english name of the nation where the "
-"language is spoken, e.g:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:88
-#: en/user_customization-runtime.ssi:42
-msgid "$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name <name>se</name>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:92
-#: en/user_customization-runtime.ssi:46
-msgid ""
-"To get the locale files for German and Swiss German keyboard layout in X use:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:96
-#: en/user_customization-runtime.ssi:50
-msgid "lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:100
-#: en/user_customization-runtime.ssi:54
-msgid ""
-"A list of the valid values of the keyboards for the console can be figured "
-"with the following command:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:104
-#: en/user_customization-runtime.ssi:58
-msgid ""
-"for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); do basename $i | "
-"head -c -9; echo; done | sort | less"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:108
-#: en/user_customization-runtime.ssi:62
-msgid ""
-"Alternatively, you can use the #{console-setup}# package, a tool to let you "
-"configure console layout using X (XKB) definitions; you can then setup your "
-"keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}"
-"#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use "
-"also these parameters for X configuration. For example, to set up a French "
-"system with a French-Dvorak layout (called Bepo) on a TypeMatrix keyboard, "
-"both in console and X11, use:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:112
-#: en/user_customization-runtime.ssi:66
-msgid ""
-"lb config --bootappend-live \"locales=fr_FR.UTF-8 keyboard-layouts=fr "
-"keyboard-variant=bepo keyboard-model=tm2030usb\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:116
-#: en/user_customization-runtime.ssi:70
-msgid "2~ Persistence"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:118
-#: en/user_customization-runtime.ssi:72
-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 "
-"of the host hardware which runs it."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:120
-#: en/user_customization-runtime.ssi:74
-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 "
-"should be considered read-only and all the run-time evolutions of the system "
-"are lost at shutdown."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:122
-#: en/user_customization-runtime.ssi:76
-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 "
-"understand how it could work it could be handy to know that even if the "
-"system is booted and run from read-only media, modification to the files and "
-"directories are written on writable media, typically a ram disk (tmpfs) and "
-"ram disks' data do not survive reboots."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:124
-#: en/user_customization-runtime.ssi:78
-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 "
-"multisession (re)writable CD/DVD. All these media are supported in Debian "
-"Live in different ways, and all but the last one require a special boot "
-"parameter to be specified at boot time: #{persistent}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:126
-#: en/user_customization-runtime.ssi:80
-msgid "3~ Full persistence"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:128
-#: en/user_customization-runtime.ssi:82
-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 "
-"writable partition is used. In order to use this feature a partition with a "
-"clean writable supported filesystem on it labeled \"live-rw\" must be "
-"attached on the system at boot time and the system must be started with the "
-"boot parameter 'persistent'. This partition could be an ext2 partition on "
-"the hard disk or on a usb key created with, e.g.:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:132
-#: en/user_customization-runtime.ssi:86
-msgid "# mkfs.ext2 -L live-rw /dev/sdb1"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:136
-#: en/user_customization-runtime.ssi:90
-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.new.ssi:141
-#: en/user_customization-runtime.ssi:95
-msgid ""
-"# tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems # dosfslabel /dev/"
-"sdb1 live-rw # for a fat filesystem"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:145
-#: en/user_customization-runtime.ssi:99
-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 "
-"could be also used with just image files, so you could create a file "
-"representing a partition and put this image file even on a NTFS partition of "
-"a foreign OS, with something like:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:150
-#: en/user_customization-runtime.ssi:104
-msgid ""
-"$ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file $ /"
-"sbin/mkfs.ext2 -F live-rw"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:154
-#: en/user_customization-runtime.ssi:108
-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.new.ssi:156
-#: en/user_customization-runtime.ssi:110
-msgid "3~ Home automounting"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:158
-#: en/user_customization-runtime.ssi:112
-msgid ""
-"If during the boot a partition (filesystem) image file or a partition "
-"labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
-"as #{/home}#, thus permitting persistence of files that belong to e.g. the "
-"default user. It can be combined with full persistence."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:160
-#: en/user_customization-runtime.ssi:114
-msgid "3~ Snapshots"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:162
-#: en/user_customization-runtime.ssi:116
-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 "
-"(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The "
-"content of a snapshot could reside on a partition or an image file (like the "
-"above mentioned types) labeled #{live-sn}#, but it defaults to a simple cpio "
-"archive named #{live-sn.cpio.gz}#. As above, at boot time, the block devices "
-"connected to the system are traversed to see if a partition or a file named "
-"like that could be found. A power interruption during run time could lead to "
-"data loss, hence a tool invoked #{live-snapshot --refresh}# could be called "
-"to sync important changes. This type of persistence, since it does not write "
-"continuously to the persistent media, is the most flash-based device "
-"friendly and the fastest of all the persistence systems."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:164
-#: en/user_customization-runtime.ssi:118
-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.new.ssi:166
-#: en/user_customization-runtime.ssi:120
-msgid ""
-"Snapshots cannot currently handle file deletion but full persistence and "
-"home automounting can."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:168
-#: en/user_customization-runtime.ssi:122
-msgid "3~ Persistent SubText"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:170
-#: en/user_customization-runtime.ssi:124
-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-"
-"work}#, the boot parameter #{persistent-subtext}# used in conjuntion with "
-"the boot parameter #{persistent}# will allow for multiple but unique "
-"persistent media. An example would be if a user wanted to use a persistent "
-"partition labeled #{live-sn-subText}# they would use the boot parameters of: "
-"#{persistent}# #{persistent-subtext=subText}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:172
-#: en/user_customization-runtime.ssi:126
-msgid "3~ Partial remastering"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:173
-#: en/user_customization-runtime.ssi:127
-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 "
-"case of cd-r or adding a session to multisession cd/dvd(rw); live-boot "
-"mounts all /live filesystem in order or with the module boot parameter."
-msgstr ""
diff --git a/manual/po/ro/user_customization-runtime.ssi.po b/manual/po/ro/user_customization-runtime.ssi.po
index ff98187..6671956 100644
--- a/manual/po/ro/user_customization-runtime.ssi.po
+++ b/manual/po/ro/user_customization-runtime.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-02 20:07-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -21,32 +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/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
+#: 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
@@ -59,38 +51,29 @@ msgstr ""
 #: en/user_customization-packages.ssi:185
 #: en/user_customization-packages.ssi:199
 #: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
 #: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:321
-#: en/user_customization-runtime.new.ssi:14
-#: en/user_customization-runtime.new.ssi:34
-#: en/user_customization-runtime.new.ssi:42
-#: en/user_customization-runtime.new.ssi:50
-#: en/user_customization-runtime.new.ssi:64
-#: en/user_customization-runtime.new.ssi:76
-#: en/user_customization-runtime.new.ssi:86
-#: en/user_customization-runtime.new.ssi:94
-#: en/user_customization-runtime.new.ssi:102
-#: en/user_customization-runtime.new.ssi:110
-#: en/user_customization-runtime.new.ssi:130
-#: en/user_customization-runtime.new.ssi:138
-#: en/user_customization-runtime.new.ssi:147
-#: en/user_customization-runtime.ssi:12 en/user_customization-runtime.ssi:30
-#: en/user_customization-runtime.ssi:40 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:56 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:92
-#: en/user_customization-runtime.ssi:101 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:141 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -102,32 +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:173 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
+#: 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
@@ -140,38 +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:285
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
 #: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:334
-#: en/user_customization-runtime.new.ssi:18
-#: en/user_customization-runtime.new.ssi:38
-#: en/user_customization-runtime.new.ssi:46
-#: en/user_customization-runtime.new.ssi:54
-#: en/user_customization-runtime.new.ssi:68
-#: en/user_customization-runtime.new.ssi:80
-#: en/user_customization-runtime.new.ssi:90
-#: en/user_customization-runtime.new.ssi:98
-#: en/user_customization-runtime.new.ssi:106
-#: en/user_customization-runtime.new.ssi:114
-#: en/user_customization-runtime.new.ssi:134
-#: en/user_customization-runtime.new.ssi:143
-#: en/user_customization-runtime.new.ssi:152
-#: en/user_customization-runtime.ssi:16 en/user_customization-runtime.ssi:34
-#: en/user_customization-runtime.ssi:44 en/user_customization-runtime.ssi:52
-#: en/user_customization-runtime.ssi:60 en/user_customization-runtime.ssi:68
-#: en/user_customization-runtime.ssi:88 en/user_customization-runtime.ssi:97
-#: en/user_customization-runtime.ssi:106 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:31
+#: 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: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
@@ -180,9 +146,41 @@ msgid "}code"
 msgstr "}code"
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:12
+#: en/user_customization-runtime.ssi:2
+msgid ":B~ Customizing run time behaviours"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:4
+msgid "1~customizing-run-time-behaviours Customizing run time behaviours"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:6
+msgid ""
+"All configuration that is done during run time is done by live-config. Here "
+"are some most common options of live-config that users are interested in. A "
+"full list of all possibilities can be found in the manpage of live-config."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:8
+msgid "2~ Customizing the live user"
+msgstr ""
+
+#. type: Plain text
 #: en/user_customization-runtime.ssi:10
 msgid ""
+"One important consideration is that the live user is created by live-boot at "
+"boot time, not by live-build at build time. This not only influences where "
+"materials relating to the live user are introduced in your build, as "
+"discussed in {Live/chroot local includes}#live-chroot-local-includes, but "
+"also any groups and permissions associated with the live user."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:12
+msgid ""
 "You can specify additional groups that the live user will belong to by "
 "preseeding the #{passwd/user-default-groups}# debconf value. For example, to "
 "add the live user to the #{fuse}# group, add the following to a file in the #"
@@ -190,104 +188,108 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:16
-#: en/user_customization-runtime.ssi:14
-msgid ""
-"debconf passwd/user-default-groups string audio cdrom dialout floppy video "
-"plugdev netdev powerdev fuse"
+#: en/user_customization-runtime.ssi:16
+#, no-wrap
+msgid " debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:22
 #: en/user_customization-runtime.ssi:20
-msgid "When the live system boots, language is involved in three steps:"
+msgid "2~customizing-locale-and-language Customizing locale and language"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:24
 #: en/user_customization-runtime.ssi:22
-msgid "_* the locale generation"
+msgid "When the live system boots, language is involved in three steps:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:26
 #: en/user_customization-runtime.ssi:24
-msgid "_* setting the keyboard layout for the console"
+msgid "_* the locale generation"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:28
 #: en/user_customization-runtime.ssi:26
-msgid "_* setting the keyboard layout for X"
+msgid "_* setting the keyboard layout for the console"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:78
-#: en/user_customization-runtime.ssi:32
-msgid "lb config --bootappend-live \"locales=de_CH.UTF-8\""
+#: en/user_customization-runtime.ssi:28
+msgid "_* setting the keyboard layout for X"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:82
-#: en/user_customization-runtime.ssi:36
+#: en/user_customization-runtime.ssi:30
 msgid ""
-"This parameter can also be used in kernel command line. You can specify a "
-"locale by a full #{language_country.encoding}# word."
+"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
+"To define the locale that should be generated, use the #{locales}# parameter "
+"in the #{--bootappend-live}# option of #{lb config}#, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:34
+#, no-wrap
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:84
 #: en/user_customization-runtime.ssi:38
 msgid ""
-"Both the console and X keyboard configuration depends on the #{keyb}# "
-"parameter of the #{--bootappend-live}# option. Valid options for X keyboard "
-"layouts can be found in #{/etc/X11/xkb/base.xml}# (rather limited to two-"
-"letters country codes). To find the value (the two characters) corresponding "
-"to a language try searching for the english name of the nation where the "
-"language is spoken, e.g:"
+"This parameter can also be used at the kernel command line. You can specify "
+"a locale by a full #{language_country.encoding}# word."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:88
-#: en/user_customization-runtime.ssi:42
-msgid "$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name <name>se</name>"
+#: en/user_customization-runtime.ssi:40
+msgid ""
+"Both the console and X keyboard configuration depend on the #{keyboard-"
+"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
+"keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base.xml}# "
+"(rather limited to two-letters country codes). To find the value (the two "
+"characters) corresponding to a language try searching for the english name "
+"of the nation where the language is spoken, e.g:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:92
-#: en/user_customization-runtime.ssi:46
+#: en/user_customization-runtime.ssi:45
+#, no-wrap
+msgid ""
+" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
+" <name>se</name>\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:49
 msgid ""
 "To get the locale files for German and Swiss German keyboard layout in X use:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:96
-#: en/user_customization-runtime.ssi:50
-msgid "lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\""
+#: en/user_customization-runtime.ssi:53
+#, no-wrap
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:100
-#: en/user_customization-runtime.ssi:54
+#: en/user_customization-runtime.ssi:57
 msgid ""
 "A list of the valid values of the keyboards for the console can be figured "
 "with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:104
-#: en/user_customization-runtime.ssi:58
+#: 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.new.ssi:108
-#: en/user_customization-runtime.ssi:62
+#: 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 setup your "
+"configure console layout using X (XKB) definitions; you can then set your "
 "keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}"
 "#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use "
 "also these parameters for X configuration. For example, to set up a French "
@@ -296,22 +298,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:112
-#: en/user_customization-runtime.ssi:66
+#: 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.new.ssi:116
-#: en/user_customization-runtime.ssi:70
-msgid "2~ Persistence"
+#: en/user_customization-runtime.ssi:75
+msgid "2~persistence Persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:118
-#: en/user_customization-runtime.ssi:72
+#: 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 "
@@ -319,8 +319,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:120
-#: en/user_customization-runtime.ssi:74
+#: 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 "
@@ -329,8 +328,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:122
-#: en/user_customization-runtime.ssi:76
+#: 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 "
@@ -341,8 +339,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:124
-#: en/user_customization-runtime.ssi:78
+#: 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 "
@@ -352,14 +349,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:126
-#: en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:85
 msgid "3~ Full persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:128
-#: en/user_customization-runtime.ssi:82
+#: 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 "
@@ -371,30 +366,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:132
-#: en/user_customization-runtime.ssi:86
-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.new.ssi:136
-#: en/user_customization-runtime.ssi:90
+#: 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.new.ssi:141
-#: en/user_customization-runtime.ssi:95
+#: 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.new.ssi:145
-#: en/user_customization-runtime.ssi:99
+#: 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 "
@@ -404,30 +397,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:150
-#: en/user_customization-runtime.ssi:104
+#: 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.new.ssi:154
-#: en/user_customization-runtime.ssi:108
+#: 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.new.ssi:156
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:115
 msgid "3~ Home automounting"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:158
-#: en/user_customization-runtime.ssi:112
+#: 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 "
@@ -436,14 +426,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:160
-#: en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:119
 msgid "3~ Snapshots"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:162
-#: en/user_customization-runtime.ssi:116
+#: 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 "
@@ -460,30 +448,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:164
-#: en/user_customization-runtime.ssi:118
+#: 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.new.ssi:166
-#: en/user_customization-runtime.ssi:120
+#: 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.new.ssi:168
-#: en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:127
 msgid "3~ Persistent SubText"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:170
-#: en/user_customization-runtime.ssi:124
+#: 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-"
@@ -495,54 +479,15 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:172
-#: en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:131
 msgid "3~ Partial remastering"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:173
-#: en/user_customization-runtime.ssi:127
+#: 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 "
 "case of cd-r or adding a session to multisession cd/dvd(rw); live-boot "
 "mounts all /live filesystem in order or with the module boot parameter."
 msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:2
-msgid "B~ Customization at Runtime"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:4
-msgid ""
-"All configuration that is done during runtime is done by live-config. Here "
-"are some most common options of live-config that users are interested in. A "
-"full list of all possibilities can be found in the manpage of live-config."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:6
-msgid "1~ User"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:8
-msgid ""
-"One important consideration is that the live user is created by live-boot "
-"during bootup, it is not created by live-build when building the image."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:18
-msgid "1~ Language"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:28
-msgid ""
-"To define the locale that should be generated, use the #{locale}# parameter "
-"into the #{--bootappend-live}# option of #{lb config}#, e.g.:"
-msgstr ""
diff --git a/manual/po/ro/user_examples.ssi.po b/manual/po/ro/user_examples.ssi.po
index 8bea630..7314afb 100644
--- a/manual/po/ro/user_examples.ssi.po
+++ b/manual/po/ro/user_examples.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-11-28 07:51-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -18,68 +18,70 @@ msgstr ""
 "20)) ? 1 : 2;\n"
 
 #. type: Plain text
+#: en/live-manual.ssm:61 en/user_examples.ssi:2
+msgid ":B~ Examples"
+msgstr ""
+
+#. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:108 en/about_manual.ssi: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_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/project_bugs.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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
+#: 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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr "code{"
@@ -88,84 +90,71 @@ 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:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: 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: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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr "}code"
 
 #. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:92
-#: en/user_examples.ssi:141 en/user_examples.ssi:190
-msgid "#!/bin/sh"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
-#: en/user_examples.ssi:109 en/user_examples.ssi:156
-msgid "# lb build"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:2
-msgid ":B~ Examples"
+#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#, no-wrap
+msgid " # lb build\n"
 msgstr ""
 
 #. type: Plain text
@@ -210,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
@@ -223,7 +214,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:24
 #, no-wrap
-msgid "*{Use case:}* Create a simple first image, learning the basics of live-build\n"
+msgid "*{Use case:}* Create a simple first image, learning the basics of live-build.\n"
 msgstr ""
 
 #. type: Plain text
@@ -241,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
@@ -259,8 +251,9 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:42
-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,7 +277,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:50
 #, no-wrap
-msgid "*{Use case}* Create a web browser utility image, learning how to apply customizations\n"
+msgid "*{Use case:}* Create a web browser utility image, learning how to apply customizations.\n"
 msgstr ""
 
 #. type: Plain text
@@ -296,7 +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
@@ -318,11 +312,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:66 en/user_examples.ssi:219
-msgid "# lb build 2>&1 | tee binary.log"
-msgstr ""
-
-#. type: Plain text
 #: en/user_examples.ssi:70
 msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
 msgstr ""
@@ -335,7 +324,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:74
 #, no-wrap
-msgid "*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
+msgid "*{Use case:}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
 msgstr ""
 
 #. type: Plain text
@@ -356,9 +345,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:84
+#, no-wrap
 msgid ""
-"$ mkdir -p tutorial3/auto $ cp /usr/share/live/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
@@ -367,15 +358,21 @@ msgid "Edit #{auto/config}# to read as follows:"
 msgstr ""
 
 #. type: Plain text
+#: en/user_examples.ssi:92 en/user_examples.ssi:141
+#, 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
@@ -411,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
@@ -437,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
@@ -449,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
@@ -463,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
@@ -500,80 +508,85 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:174
-msgid "Create an image with live-build to boot directly to a VNC server."
+#, no-wrap
+msgid "*{Use case:}* Create an image with live-build to boot directly to a VNC server.\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:176
-msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:178
-msgid "_* Move to the build directory: #{$ cd vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:180
 msgid ""
-"Example to config the build directory to include gdm metacity "
-"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
+"Make a build directory and create a skeletal configuration in it built "
+"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
+"{xtightvncviewer}#, disabling recommends to make a minimal system:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:182
+#: en/user_examples.ssi:184
+#, no-wrap
 msgid ""
-"Create a folder /etc/skel folder for a custom .xsession for the default "
-"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
+" $ 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
-#: en/user_examples.ssi:184
+#: en/user_examples.ssi:188
 msgid ""
-"Create the .xsession for the default user: #{$ touch config/chroot_local-"
-"includes/etc/skel/.xsession}#"
+"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
+"the default user that will launch metacity and start xvncviewer, connecting "
+"to port #{5901}# on a server at #{192.168.1.2}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:186
+#: en/user_examples.ssi:194
+#, no-wrap
 msgid ""
-"Edit the .xsession file to launch metacity and start xvncviewer with "
-"something similar to the below:"
+" $ 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:193
-msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
+#: en/user_examples.ssi:197
+#, no-wrap
+msgid ""
+" /usr/bin/metacity &\n"
+" /usr/bin/xvncviewer 192.168.1.2:1\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:195
-msgid "exit"
+#: en/user_examples.ssi:200
+#, no-wrap
+msgid ""
+" exit\n"
+" END\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:199
-msgid "_* Build the image: #{# lb build}#"
+#: en/user_examples.ssi:204
+msgid "Build the image:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:201
-msgid "_* Enjoy."
+#: en/user_examples.ssi:212
+msgid "Enjoy."
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:203
+#: en/user_examples.ssi:214
 msgid "2~ A base image for a 128M USB key"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:205
+#: en/user_examples.ssi:216
 #, no-wrap
-msgid "*{Use case}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
+msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:207
+#: en/user_examples.ssi:218
 msgid ""
 "When optimizing an image to fit a certain media size, you need to understand "
 "the tradeoffs you are making between size and functionality. In this "
@@ -587,19 +600,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:211
+#: 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:215
+#: en/user_examples.ssi:227
 msgid "Now, build the image in the usual way:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:223
+#: 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 "
@@ -607,7 +621,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:225
+#: 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 "
@@ -623,3 +637,117 @@ msgid ""
 "you to decide if the functionality that is sacrificed with each optimization "
 "is worth the loss in functionality."
 msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:239
+msgid "2~ A localized KDE desktop and installer"
+msgstr ""
+
+#. type: Plain text
+#: 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: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 "
+"that would be installed by the standard Debian installer for KDE."
+msgstr ""
+
+#. type: Plain text
+#: 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 "
+"find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can be "
+"used to dig it out of the task descriptions in tasksel-data, so to prepare, "
+"make sure you have both of those things:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:249
+#, no-wrap
+msgid " # apt-get install dctrl-tools tasksel-data\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:253
+msgid "Now we can search for the appropriate tasks, first with:"
+msgstr ""
+
+#. type: Plain text
+#: 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"
+msgstr ""
+
+#. type: Plain text
+#: 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: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"
+msgstr ""
+
+#. type: Plain text
+#: 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"
+msgstr ""
+
+#. type: Plain text
+#: 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}"
+"#desktop-and-language-tasks for details). And at boot time we will generate "
+"the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's "
+"put the pieces together:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:295
+#, no-wrap
+msgid ""
+" $ 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"
+msgstr ""
+
+#. type: Plain text
+#: 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 "
+"flavour kernel, as it is currently necessary to make the installer and live "
+"system kernels match for the launcher to work properly."
+msgstr ""
diff --git a/manual/po/ro/user_installation.ssi.po b/manual/po/ro/user_installation.ssi.po
index 6bc414f..51bf046 100644
--- a/manual/po/ro/user_installation.ssi.po
+++ b/manual/po/ro/user_installation.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-01 06:49-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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,61 +21,59 @@ 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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:259
-#: en/user_customization-packages.ssi:271
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:299 en/user_customization-runtime.ssi:12
-#: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
-#: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
-#: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
-#: en/user_customization-runtime.ssi:92 en/user_customization-runtime.ssi:101
+#: 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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
 #: en/user_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_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:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:108
-#: en/user_installation.ssi:126 en/user_installation.ssi:141
-#: en/user_managing_a_configuration.ssi:24
+#: 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,61 +85,59 @@ 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:173 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: 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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:263
-#: en/user_customization-packages.ssi:275
-#: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:312 en/user_customization-runtime.ssi:16
-#: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
 #: en/user_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_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:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:112
-#: en/user_installation.ssi:131 en/user_installation.ssi:144
-#: en/user_managing_a_configuration.ssi:31
+#: 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
@@ -150,6 +146,12 @@ msgid "}code"
 msgstr "}code"
 
 #. type: Plain text
+#: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
+#, no-wrap
+msgid " $ lb config --repository live.debian.net\n"
+msgstr ""
+
+#. type: Plain text
 #: en/user_installation.ssi:2
 msgid ":B~ Installation"
 msgstr ""
@@ -234,7 +236,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:34
+#: en/user_installation.ssi:34 en/user_installation.ssi:104
 msgid "3~ From the Debian repository"
 msgstr ""
 
@@ -245,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
@@ -255,11 +258,12 @@ 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
-#: en/user_installation.ssi:52
+#: en/user_installation.ssi:52 en/user_installation.ssi:108
 msgid "3~ From source"
 msgstr ""
 
@@ -273,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
@@ -283,41 +288,55 @@ 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
-#: en/user_installation.ssi:70
-msgid "# dpkg -i live-build*.deb"
+#: en/user_installation.ssi:72
+msgid ""
+"Now install whichever of the freshly built #{.deb}# files you were "
+"interested in, e.g."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:74
+#: en/user_installation.ssi:76
+#, no-wrap
+msgid " # dpkg -i live-build_2.0.8-1_all.deb\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:80
 msgid "You can also install live-build directly to your system by executing:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:78
-msgid "# make install"
+#: en/user_installation.ssi:84
+#, no-wrap
+msgid " # make install\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:82
+#: en/user_installation.ssi:88
 msgid "and uninstall it with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:86
-msgid "# make uninstall"
+#: en/user_installation.ssi:92
+#, no-wrap
+msgid " # make uninstall\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:90
+#: en/user_installation.ssi:96 en/user_installation.ssi:142
 msgid "3~ From 'snapshots'"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:92
+#: en/user_installation.ssi:98
 msgid ""
 "If you do not wish to build or install live-build from source, you can use "
 "snapshots. These are built automatically from the latest version in Git and "
@@ -325,86 +344,65 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:94
-msgid "2~ live-boot"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:96
-#, no-wrap
-msgid "*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:98
-msgid "% FIXME: we also need to mention live-config"
-msgstr ""
-
-#. type: Plain text
 #: en/user_installation.ssi:100
-msgid "3~ Using a customized live-boot"
+msgid "2~ live-boot and live-config"
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:102
-msgid ""
-"% FIXME: should follow the structure for live-build above (i.e. \"from source"
-"\", not \"customized\" -- we should not get into customization now, but "
-"should reserve that discussion for later."
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:104
-msgid ""
-"To modify the code you can follow the process below. Please ensure you are "
-"familiar with the terms mentioned in {Terms}#terms."
+#, no-wrap
+msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:106
-msgid "_* Checkout the live-boot source"
+msgid ""
+"Both live-boot and live-config are available from the Debian repository as "
+"per {Installing live-build}#installing-live-build."
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:110
-msgid "$ git clone git://live.debian.net/git/live-boot.git"
+msgid ""
+"To use the latest source from git, you can follow the process below. Please "
+"ensure you are familiar with the terms mentioned in {Terms}#terms."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:114
-msgid "_* Make changes to your local copy"
+#: en/user_installation.ssi:112
+msgid "_* Checkout the live-boot and live-config source"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:116
+#: en/user_installation.ssi:117
+#, no-wrap
 msgid ""
-"% FIXME: as indicated above, it's too early for this topic. Move to later in "
-"the manual."
+" $ 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
-#: en/user_installation.ssi:118
+#: en/user_installation.ssi:121
 msgid ""
-"And beware that if you want to add your pre-init script in live-bottom, you "
-"should name it without dashes '-', e.g: call it \"99new_feature\" and not "
-"\"99new-feature\"."
+"Consult the live-boot and live-config man pages for details on customizing "
+"if that is your reason for building these packages from source."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:120
-msgid "_* Build a live-boot .deb"
+#: en/user_installation.ssi:123
+msgid "_* Build live-boot and live-config .deb files"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:122
+#: en/user_installation.ssi:125
 msgid ""
 "You must build either on your target distribution or in a chroot containing "
 "your target platform: this means if your target is Squeeze then you should "
-"build against Squeeze. Y"
+"build against Squeeze."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:124
+#: en/user_installation.ssi:127
 msgid ""
 "Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
 "build #{live-boot}# for a target distribution that differs from your build "
@@ -415,40 +413,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:129
-msgid "$ cd live-boot $ dpkg-buildpackage -b -uc -us"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:133
-msgid "_* Use the generated live-boot .deb"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:135
+#: en/user_installation.ssi:134
+#, no-wrap
 msgid ""
-"As live-boot is installed by live-build system, installing the package in "
-"the host system is not sufficient: you should treat the generated .deb like "
-"another custom package. Please see {Customizing package installation}"
-"#customizing-package-installation for more information. You should pay "
-"particular attention to {Additional repositories}#additional-repositories."
+" $ cd live-boot\n"
+" $ dpkg-buildpackage -b -uc -us\n"
+" $ cd ../live-config\n"
+" $ dpkg-buildpackage -b -uc -us\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:137
-msgid "3~ Using live-boot snapshots"
+#: en/user_installation.ssi:138
+msgid "_* Use all generated .deb files"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:139
+#: en/user_installation.ssi:140
 msgid ""
-"You can let live-build automatically use the latest snapshot of live-boot by "
-"configuring a third-party repository in your live-build configuration "
-"directory. Assuming you have already created a configuration tree with #{lb "
-"config}#:"
+"As live-boot and live-config are installed by live-build system, installing "
+"the packages in the host system is not sufficient: you should treat the "
+"generated .deb files like any other custom packages. Please see {Customizing "
+"package installation}#customizing-package-installation for more information. "
+"You should pay particular attention to {Additional repositories}#additional-"
+"repositories."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:143
-msgid "lb config --repository live.debian.net"
+#: en/user_installation.ssi:144
+msgid ""
+"You can let live-build automatically use the latest snapshots of live-boot "
+"and live-config by configuring a third-party repository in your live-build "
+"configuration directory. Assuming you have already created a configuration "
+"tree with #{lb config}#:"
 msgstr ""
diff --git a/manual/po/ro/user_managing_a_configuration.ssi.po b/manual/po/ro/user_managing_a_configuration.ssi.po
index 0048e51..7508a18 100644
--- a/manual/po/ro/user_managing_a_configuration.ssi.po
+++ b/manual/po/ro/user_managing_a_configuration.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-01 05:55-0400\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -21,60 +21,59 @@ 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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_customization-runtime.ssi:12
-#: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
-#: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
-#: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
-#: en/user_customization-runtime.ssi:92 en/user_customization-runtime.ssi:101
+#: 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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
 #: en/user_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_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:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:108
-#: en/user_installation.ssi:126 en/user_installation.ssi:144
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -86,60 +85,59 @@ 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:173 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: 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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_customization-runtime.ssi:16
-#: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
 #: en/user_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_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:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:112
-#: en/user_installation.ssi:131 en/user_installation.ssi:147
-#: en/user_managing_a_configuration.ssi:31
+#: 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
@@ -195,8 +193,9 @@ msgstr ""
 msgid ""
 "A second, related problem is that if you run #{lb config}# and then upgrade "
 "to a new version of live-build that has changed one of the variable names, "
-"you will discover this only by manual review of the variables in your config "
-"files, which you will then need to use to set the appropriate option again."
+"you will discover this only by manual review of the variables in your #"
+"{config/*}# files, which you will then need to use to set the appropriate "
+"option again."
 msgstr ""
 
 #. type: Plain text
@@ -239,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
@@ -254,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
@@ -268,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
@@ -280,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 6496edb..285fe6b 100644
--- a/manual/po/ro/user_overview.ssi.po
+++ b/manual/po/ro/user_overview.ssi.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-10-28 16:34-0200\n"
+"Project-Id-Version: live-manual 2.0.0\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"
@@ -18,122 +18,129 @@ msgstr ""
 "20)) ? 1 : 2;\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: 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/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.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:140
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/project_bugs.ssi: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: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: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_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
+#: 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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: 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_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 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: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_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
-#: en/user_customization-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: 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_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr "}code"
@@ -186,11 +193,11 @@ msgstr ""
 #: en/user_overview.ssi:16
 msgid ""
 "_* The scripts have a central location for configuring their operation. In "
-"debhelper, this is the debian subdirectory of a package tree. For example, "
-"dh_install will look, amongst others, for a file called #{debian/install}# "
-"to determine which files should exist in a particular binary package. In "
-"much the same way, live-build stores its configuration entirely under a "
-"config subdirectory."
+"debhelper, this is the #{debian/}# subdirectory of a package tree. For "
+"example, dh_install will look, amongst others, for a file called #{debian/"
+"install}# to determine which files should exist in a particular binary "
+"package. In much the same way, live-build stores its configuration entirely "
+"under a #{config/}# subdirectory."
 msgstr ""
 
 #. type: Plain text
@@ -245,7 +252,7 @@ msgstr ""
 #: en/user_overview.ssi:32
 msgid ""
 "As discussed in {live-build}#live-build, the scripts that make up live-build "
-"source their configuration from a single directory named config/. As "
+"source their configuration from a single directory named #{config/}#. As "
 "constructing this directory by hand would be time-consuming and error-prone, "
 "the #{lb config}# command can be used to create skeleton configuration "
 "folders."
@@ -254,45 +261,59 @@ msgstr ""
 #. type: Plain text
 #: en/user_overview.ssi:34
 msgid ""
-"Issuing #{lb config}# without any arguments creates a config subdirectory "
-"which it populates with some default settings:"
+"Issuing #{lb config}# without any arguments creates a #{config/}# "
+"subdirectory which it populates with some default settings:"
 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
@@ -313,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
@@ -323,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/po4a.cfg b/manual/po4a.cfg
index e46858a..b604d99 100644
--- a/manual/po4a.cfg
+++ b/manual/po4a.cfg
@@ -1,10 +1,8 @@
-[po4a_langs] de fr pt_BR ro
+[po4a_langs] de fr it pt_BR ro
 [po4a_paths] pot/$master.pot $lang:po/$lang/$master.po
 [type: text] en/live-manual.ssm $lang:$lang/live-manual.ssm
 [type: text] en/about_manual.ssi $lang:$lang/about_manual.ssi
 [type: text] en/about_project.ssi $lang:$lang/about_project.ssi
-[type: text] en/other_faq.ssi $lang:$lang/other_faq.ssi
-[type: text] en/other_howtos.ssi $lang:$lang/other_howtos.ssi
 [type: text] en/project_bugs.ssi $lang:$lang/project_bugs.ssi
 [type: text] en/project_coding-style.ssi $lang:$lang/project_coding-style.ssi
 [type: text] en/project_procedures.ssi $lang:$lang/project_procedures.ssi
@@ -12,10 +10,8 @@
 [type: text] en/user_customization-binary.ssi $lang:$lang/user_customization-binary.ssi
 [type: text] en/user_customization-contents.ssi $lang:$lang/user_customization-contents.ssi
 [type: text] en/user_customization-installer.ssi $lang:$lang/user_customization-installer.ssi
-[type: text] en/user_customization-internationalization.ssi $lang:$lang/user_customization-internationalization.ssi
 [type: text] en/user_customization-overview.ssi $lang:$lang/user_customization-overview.ssi
 [type: text] en/user_customization-packages.ssi $lang:$lang/user_customization-packages.ssi
-[type: text] en/user_customization-runtime.new.ssi $lang:$lang/user_customization-runtime.new.ssi
 [type: text] en/user_customization-runtime.ssi $lang:$lang/user_customization-runtime.ssi
 [type: text] en/user_examples.ssi $lang:$lang/user_examples.ssi
 [type: text] en/user_installation.ssi $lang:$lang/user_installation.ssi
diff --git a/manual/pot/about_manual.ssi.pot b/manual/pot/about_manual.ssi.pot
index b267e55..64a0c53 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-05 11:16+0100\n"
+"POT-Creation-Date: 2010-12-20 05:58-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"
@@ -61,7 +61,7 @@ msgid ""
 "#examples section designed to teach you image building and customization "
 "basics. Read {Using the examples}#using-the-examples first, followed by "
 "{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
-"utility}#tutorial-2 and finally {Tutorial 3: A personal travelling companion}"
+"utility}#tutorial-2 and finally {Tutorial 3: A personalized image}"
 "#tutorial-3. By the end of these tutorials, you will have a taste of what "
 "can be done with Debian Live. We encourage you to return to more in-depth "
 "study of the manual, perhaps next reading {The basics}#the-basics, skimming "
@@ -281,8 +281,8 @@ msgstr ""
 msgid ""
 "This manual is intended as a community project and all proposals for "
 "improvements and contributions are extremely welcome. The preferred way to "
-"submit a contribution is to send it to the mailing list. Please see {Contact}"
-"#contact for more information."
+"submit a contribution is to send it to the mailing list. Please see the "
+"section {Contact}#contact for more information."
 msgstr ""
 
 #. type: Plain text
@@ -298,39 +298,31 @@ msgstr ""
 #: en/about_manual.ssi:82
 msgid ""
 "The sources for this manual are maintained using the Git version control "
-"system. You can checkout the latest copy by executing:"
+"system. You can check out the latest copy by executing:"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
 #: en/about_manual.ssi:146 en/about_manual.ssi: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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
+#: 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
@@ -343,38 +335,29 @@ msgstr ""
 #: en/user_customization-packages.ssi:185
 #: en/user_customization-packages.ssi:199
 #: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
 #: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:321
-#: en/user_customization-runtime.new.ssi:14
-#: en/user_customization-runtime.new.ssi:34
-#: en/user_customization-runtime.new.ssi:42
-#: en/user_customization-runtime.new.ssi:50
-#: en/user_customization-runtime.new.ssi:64
-#: en/user_customization-runtime.new.ssi:76
-#: en/user_customization-runtime.new.ssi:86
-#: en/user_customization-runtime.new.ssi:94
-#: en/user_customization-runtime.new.ssi:102
-#: en/user_customization-runtime.new.ssi:110
-#: en/user_customization-runtime.new.ssi:130
-#: en/user_customization-runtime.new.ssi:138
-#: en/user_customization-runtime.new.ssi:147
-#: en/user_customization-runtime.ssi:12 en/user_customization-runtime.ssi:30
-#: en/user_customization-runtime.ssi:40 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:56 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:92
-#: en/user_customization-runtime.ssi:101 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:141 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -391,32 +374,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/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
-#: en/user_customization-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
+#: 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
@@ -429,38 +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:285
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
 #: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:334
-#: en/user_customization-runtime.new.ssi:18
-#: en/user_customization-runtime.new.ssi:38
-#: en/user_customization-runtime.new.ssi:46
-#: en/user_customization-runtime.new.ssi:54
-#: en/user_customization-runtime.new.ssi:68
-#: en/user_customization-runtime.new.ssi:80
-#: en/user_customization-runtime.new.ssi:90
-#: en/user_customization-runtime.new.ssi:98
-#: en/user_customization-runtime.new.ssi:106
-#: en/user_customization-runtime.new.ssi:114
-#: en/user_customization-runtime.new.ssi:134
-#: en/user_customization-runtime.new.ssi:143
-#: en/user_customization-runtime.new.ssi:152
-#: en/user_customization-runtime.ssi:16 en/user_customization-runtime.ssi:34
-#: en/user_customization-runtime.ssi:44 en/user_customization-runtime.ssi:52
-#: en/user_customization-runtime.ssi:60 en/user_customization-runtime.ssi:68
-#: en/user_customization-runtime.ssi:88 en/user_customization-runtime.ssi:97
-#: en/user_customization-runtime.ssi:106 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:31
+#: 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: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
@@ -478,19 +444,21 @@ 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 libnokogiri-ruby\n"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:98
 msgid ""
-"You may build the live-manual from the top level directory of your git "
+"You may build the live-manual from the top level directory of your Git "
 "checkout by executing:"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:102
-msgid "$ make build"
+#, no-wrap
+msgid " $ make build\n"
 msgstr ""
 
 #. type: Plain text
@@ -503,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
@@ -514,9 +483,9 @@ msgstr ""
 #. type: Plain text
 #: en/about_manual.ssi:116
 msgid ""
-"Directly commiting to the repository is possible by anyone. However, we ask "
-"you to send bigger changes to the mailing list to discuss them first. In "
-"order to push to the repository, the following steps are required."
+"Anyone can directly commit to the repository. However, we ask you to send "
+"bigger changes to the mailing list to discuss them first. To push to the "
+"repository, you must follow this procedure:"
 msgstr ""
 
 #. type: Plain text
@@ -528,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/live.debian.net\n"
-"$ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-"\t-O ~/.ssh/identity.d/live.debian.net.pub\n"
-"$ chmod 0600 ~/.ssh/identity.d/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
@@ -545,49 +514,52 @@ 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
 #: en/about_manual.ssi:144
-msgid "_* Checkout a clone of the manual through ssh:"
+msgid "_* Check out a clone of the manual through ssh:"
 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
 #: en/about_manual.ssi:152
 msgid ""
-"_* After editing the files in manual/en/, please call the 'commit' target in "
-"the top level directory to sanitize the files and update the translation "
-"files:"
+"_* After editing the files in #{manual/en/}#, please call the 'commit' "
+"target in the top level directory to sanitize the files and update the "
+"translation files:"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:156
-msgid "$ make commit"
+#, no-wrap
+msgid " $ make commit\n"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:160
 msgid ""
-"_* After sanitizing commit the changes. Write commit messages, that consist "
-"of full useful sentences, starting with a capital letter and ending with a "
-"full stop. Usually starting with the form 'Fixing/Adding/Removing/"
-"Correcting/':"
+"_* After sanitizing, commit the changes. Write commit messages that consist "
+"of full, useful sentences in English, starting with a capital letter and "
+"ending with a full stop. Usually, these will start with the form 'Fixing/"
+"Adding/Removing/Correcting/Translating', e.g."
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:164
-msgid "$ git commit -a"
+#, no-wrap
+msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
 msgstr ""
 
 #. type: Plain text
@@ -597,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
@@ -607,21 +580,29 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:178
-msgid "Submiting a translation for a new language is recommendet in two steps:"
+msgid "To submit a translation for a new language, follow these three steps:"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:180
 msgid ""
-"_* Translate the about_manual.ssi.pot about_project.ssi.pot index.html.in."
-"pot files to your language with your favourite editor (such as poedit). Send "
-"translated files to the mailinglist. It will then be included and autobuild "
-"for that language enabled."
+"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
+"in.pot files to your language with your favourite editor (such as poedit). "
+"Send translated files to the mailing list. Once we have reviewed your "
+"submission, we will add the new language to the manual (providing the po "
+"files) and will enable it in the autobuild."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:182
+msgid ""
+"_* Once the new language is added, you can randomly start translating all po "
+"files in #{manual/po/}#."
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:181
+#: en/about_manual.ssi:184
 msgid ""
-"_* Now that the new language was added, you can randomly start translating "
-"all other pot files."
+"_* Don't forget you need #{make commit}# to ensure the translated manuals "
+"are updated from the po files, before #{git commit -a}# and #{git push}#."
 msgstr ""
diff --git a/manual/pot/index.html.in.pot b/manual/pot/index.html.in.pot
index ca7bcc5..5e83954 100644
--- a/manual/pot/index.html.in.pot
+++ b/manual/pot/index.html.in.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-20 20:02+0300\n"
+"POT-Creation-Date: 2010-12-08 15:58+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -22,17 +22,17 @@ msgid "Debian Live Project"
 msgstr ""
 
 #. type: Content of: <html><body><h2>
-#: en/index.html.in:8
+#: en/index.html.in:9
 msgid "Debian Live Manual"
 msgstr ""
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:11
+#: en/index.html.in:12
 msgid "<i>This manual is under heavy construction.</i>"
 msgstr ""
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:15
+#: en/index.html.in:16
 msgid ""
 "Please report errors, omissions, patches and suggestions to our mailinglist "
 "at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
@@ -41,29 +41,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <html><body><h3>
-#: en/index.html.in:18
+#: en/index.html.in:19
 msgid "Available Formats"
 msgstr ""
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:21
+#: en/index.html.in:22
 msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
 msgstr ""
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:22
+#: en/index.html.in:23
 msgid ""
 "HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
 "html\">single page</a>"
 msgstr ""
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:23
+#: en/index.html.in:24
 msgid "<a href=\"odf/live-manual.odt\">ODF</a>"
 msgstr ""
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:24
+#: en/index.html.in:25
 msgid ""
 "PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
 "\"pdf/live-manual.landscape-a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
@@ -72,34 +72,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:25
+#: en/index.html.in:26
 msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
 msgstr ""
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:29
+#: en/index.html.in:30
 msgid "Last changed: @DATE_CHANGE@"
 msgstr ""
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:30
+#: en/index.html.in:31
 msgid "Last built: @DATE_BUILD@"
 msgstr ""
 
 #. type: Content of: <html><body><h3>
-#: en/index.html.in:33
+#: en/index.html.in:34
 msgid "Source"
 msgstr ""
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:36
+#: en/index.html.in:37
 msgid ""
 "The sources for this manual is available in a <a href=\"http://git.or.cz/"
-"\">git</a> repository at live.debian.net."
+"\">Git</a> repository at live.debian.net."
 msgstr ""
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:40
+#: en/index.html.in:41
 msgid ""
 "Browse: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
 "\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
@@ -107,14 +107,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <html><body><ul><li>
-#: en/index.html.in:41
+#: en/index.html.in:42
 msgid ""
 "Git: <a href=\"git://live.debian.net/git/live-manual.git\"><small><tt>git://"
 "live.debian.net/git/live-manual.git</tt></small></a>"
 msgstr ""
 
 #. type: Content of: <html><body><p>
-#: en/index.html.in:45
+#: en/index.html.in:46
 msgid ""
 "<a href=\"http://live.debian.net/\">Debian Live</a> &lt;<a href=\"mailto:"
 "debian-live at lists.debian.org\">debian-live at lists.debian.org</a>&gt; - <a "
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index 193e39a..5ec704c 100644
--- a/manual/pot/live-manual.ssm.pot
+++ b/manual/pot/live-manual.ssm.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-12-06 12:26+0100\n"
+"POT-Creation-Date: 2010-12-24 03:54+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -45,7 +45,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2010-12-06\n"
+" :published: 2010-12-24\n"
 msgstr ""
 
 #. type: Plain text
@@ -86,7 +86,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:31
-msgid ":B~ User ~#"
+msgid ":B~ User"
 msgstr ""
 
 #. type: Plain text
@@ -126,80 +126,45 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:47
-msgid "<< user_customization-internationalization.ssi"
+msgid "<< user_customization-runtime.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:49
-msgid "<< user_customization-runtime.ssi"
+msgid "<< user_customization-binary.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:51
-msgid "<< user_customization-binary.ssi"
+msgid "<< user_customization-installer.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:53
-msgid "<< user_customization-installer.ssi"
+msgid ":B~ Project"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:55
-msgid ":B~ Development ~#"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:57
-msgid ":B~ Project ~#"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:59
 msgid "<< project_bugs.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:61
+#: en/live-manual.ssm:57
 msgid "<< project_coding-style.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:63
+#: en/live-manual.ssm:59
 msgid "<< project_procedures.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:65
-msgid ":B~ Examples ~#"
+#: en/live-manual.ssm:61 en/user_examples.ssi:2
+msgid ":B~ Examples"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:67
+#: en/live-manual.ssm:63
 msgid "<< user_examples.ssi"
 msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:69
-msgid ":B~ Other ~#"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:75
-msgid ""
-"Other material that formerly appeared in this section is out of date and/or "
-"has not been approved for release. It has therefore been omitted, but can "
-"still be found in the document source; see 'About this manual'. Any part of "
-"the omitted material that is still useful will be included in the release "
-"only after it has been reviewed."
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:77
-msgid "% << other_faq.ssi"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:78
-msgid "% << other_howtos.ssi"
-msgstr ""
diff --git a/manual/pot/other_faq.ssi.pot b/manual/pot/other_faq.ssi.pot
deleted file mode 100644
index 1c5305d..0000000
--- a/manual/pot/other_faq.ssi.pot
+++ /dev/null
@@ -1,1008 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-16 14:45-0200\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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
-#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: 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/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
-#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
-#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
-#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
-#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:106
-#: en/user_installation.ssi:120 en/user_installation.ssi:137
-#: en/user_managing_a_configuration.ssi:24
-#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:60
-#: en/user_overview.ssi:104 en/user_overview.ssi:112
-msgid "code{"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
-#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
-#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
-#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
-#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
-#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
-#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
-#: en/user_basics.ssi:257 en/user_basics.ssi:285 en/user_basics.ssi:293
-#: en/user_basics.ssi:320 en/user_basics.ssi:359
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
-#: en/user_customization-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:110
-#: en/user_installation.ssi:125 en/user_installation.ssi:140
-#: en/user_managing_a_configuration.ssi:31
-#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
-msgid "}code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:2
-msgid "B~ Frequently asked questions (FAQ)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:4
-msgid "1~ Frequently asked questions (FAQ)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:8
-msgid ""
-"Q: I downloaded a prebuilt live image. How do I put it on a USB stick? A: "
-"See \"Copying USB/HDD image to a USB stick\" % FIXME: <xref linkend="
-"\"image_copying\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:11
-msgid ""
-"Q: How do I log my build? A: You could use script, screen or tee: #{$ "
-"lh_build 2>&1 | tee build.log}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:14
-msgid ""
-"Q: How can I convert an already installed standard Debian partition into a "
-"Debian Live system? A: Save the list of installed packages and load it into "
-"your new Debian Live System. Copy your /etc to config/chroot_local-includes"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:17
-msgid ""
-"Q: What does 'losetup: could not find any free loop device' mean and how do "
-"I fix it? A: Loop devices are used during the build; there probably aren't "
-"any free if you've aborted several builds. Something like: for l in /dev/"
-"loop0 /dev/loop1 /dev/loop2 /dev/loop3 /dev/loop4 /dev/loop5 /dev/loop6 /dev/"
-"loop7 ; do losetup -d $l ; done should rectify the situation (assuming all "
-"loop devices in use were created by lh_build; if in doubt, check the "
-"contents of each loop device before deleting them with losetup -d)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:20
-msgid ""
-"Q: How do I launch an interactive shell during the chroot stage? A: To "
-"enable interactive shell: #{$ lh_config --interactive shell}# To continue "
-"the build process: #{# logout}# or #{# exit}# To disable interactive shell, "
-"set LH_INTERACTIVE to \"disabled\" in config/chroot."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:23
-msgid ""
-"Q: What is the root /user password? A: The user password for the live user "
-"is 'live'. By default, there is not any root password. You can switch to "
-"root with ${sudo -i}# or set a password for root with #{sudo passwd}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:27
-msgid ""
-"Q: How do I change root or any user password? A: Add a chroot local hook "
-"script to change root or any user password each time you build an image.  e."
-"g. config/chroot_local-hooks/01-update_password.sh to set root password to "
-"\"nopasswd\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:30 en/other_faq.ssi:53
-msgid "code{ #!/bin/sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:33
-msgid "echo \"I: update password\" echo \"root:nopasswd\" | chpasswd"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:35
-msgid "$ chmod +x config/chroot_local-hooks/01-update_password.sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:39
-msgid ""
-"Note for live user; you need to copy the /usr/share/initramfs-tools/scripts/"
-"live-bottom/10adduser your build folder:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:44
-msgid ""
-"mkdir -p config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-"
-"bottom/ cp /usr/share/initramfs-tools/scripts/live-bottom/10adduser config/"
-"chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:48
-msgid ""
-"Note: Then edit the config/chroot_local-includes/usr/share/initramfs-tools/"
-"scripts/live-bottom/10adduser and paste in the new user_crypted password "
-"that you make with: #{echo \"newlivepass\" | mkpasswd -s}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:50
-msgid ""
-"Or add an hook file in config/chroot_local-hooks/ with something like the "
-"below:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:57
-msgid ""
-"# Change the autogenerated user password to \"debianlive\" plain_password="
-"\"debianlive\" password=$(echo \"${plain_password}\" | mkpasswd -s)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:59
-msgid ""
-"sed -i -e 's/\\(user_crypted=\\)\\(.*\\)\\( #.*\\)/\\1\\\"'${password}'\\"
-"\"\\3/' /usr/share/initramfs-tools/scripts/live-bottom/10adduser"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:62
-msgid "update-initramfs -tu -kall }code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:64
-msgid ""
-"The latter (hook model) could be more future proof than the former solution "
-"since it modifies just one string selectively but it requires the package "
-"\"whois\" to be installed on the target system (for mkpasswd) or that you "
-"generate the $password string not at build time and include it crypted in "
-"the above script."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:68
-msgid ""
-"Q: How to disable autologin? A1: use the commandline parameter #{lh config --"
-"bootappend-live \"noautologin\"}# A2: You need to set boot=noautologin "
-"noxautologin as described in man live-initramfs If you boot via TFTP you "
-"want to insert the option to pxelinux.cfg/default"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:71
-msgid ""
-"Q: How do I change default hostname or username? A: To change default "
-"hostname or username: #{$ lh_config --hostname myhostname $ lh_config --"
-"username myusername}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:74
-msgid ""
-"Q: How do I make the final image smaller? A: Clean orphaned apps/libs: "
-"Install package \"deborphan\" and then run 'sudo deborphan -n' . Delete "
-"unwanted packages. Remove the apt cache. Purge unwanted locales (see "
-"\"localepurge\" package)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:77
-msgid ""
-"Q: How do I customize bash-config permanently (aliases, bash-completion "
-"etc.)? A: Add your own .bashrc config/chroot_local-includes/etc/skel/.bashrc"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:81
-msgid ""
-"Q: How do I disable services permanently? (Be careful!)  A: Add a chroot "
-"local hook script to disable a service each time you build an image: e.g. "
-"config/chroot_local-hooks/01-disable_service.sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/other_use-cases.ssi:26
-#: en/other_use-cases.ssi:77
-msgid "#!/bin/sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:88
-msgid "echo \"I: disable service\" update-rc.d -f service_name remove"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:90
-msgid "$ chmod +x config/chroot_local-hooks/01-disable_service.sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:95
-msgid ""
-"Q: How do I enable | disable the md5checksum at the ISO building? A: #"
-"{lh_config --checksums enabled|disabled}# Or change the LH_CHECKSUMS value."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:98
-msgid ""
-"Q: How to disable the generation of the .tar.gz file? A: #{lh_config --net-"
-"tarball none|gzip}# Or change the LH_NET_TARBALL value. (only available in "
-"snapsshot version at the moment 2008/Feb/28)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:101
-msgid "Q: How do I \"build a new image\"? A: Run commands:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:106
-msgid "$ sudo lh_clean --binary $ sudo lh_build"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:110
-msgid ""
-"Hint: If the configuration had changed you should leave \"--binary\" out. "
-"This will clean your chroot directory too."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:113
-msgid ""
-"Q: How do I use Fluxbox ? A: Add a new lists file with the fluxbox packages "
-"you want."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:115
-msgid "Create /home/$USERNAME/.dmrc file (default username is \"user\")."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:122
-msgid "$ cat .dmrc [Desktop] Session=fluxbox }code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:124
-msgid "Note: .dmrc is owned by $USERNAME:$USERNAME."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:126
-msgid ""
-"See also http://wiki.debian.org/Fluxbox/ A short HOWTO can be found at "
-"http://wiki.debian.org/MichaelAblassmeier/CustomLiveCD"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:129
-msgid ""
-"Q: How do I use custom repositories? A: See http://wiki.debian.org/"
-"DebianLive/Configuration"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:132
-msgid ""
-"Q: How do I customize the artwork for the live CD (grub or syslinux boot "
-"splash, usplash, etc.)? A: See http://wiki.debian.org/DebianLive/Howto/"
-"Custom_Artwork"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:135
-msgid ""
-"Q: How do I customize desktop environment (KDE, GNOME, XFCE, etc...) look? "
-"A: Start the live system in qemu:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:139
-msgid "$ qemu -m 256 -cdrom binary.iso -boot d -redir tcp:4222:10.0.2.15:22"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:143
-msgid "Note: the -redir argument must be changed to meet your needs"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:146
-msgid ""
-"Q: How do I execute a custom shell script inside the chroot system after the "
-"chroot stage? A: Add your script in config/chroot_local-hooks."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:149
-msgid ""
-"Q: How do I add a script running immediately after all other scripts when "
-"the live system boots? A: Add your script in config/chroot_local-includes/"
-"usr/share/initramfs-tools/scripts/live-bottom/99scrip"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:153
-msgid ""
-"$ chmod +x config/chroot_local-includes/usr/share/initramfs-tools/scripts/"
-"live-bottom/99script"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:157
-msgid ""
-"Note: The hook script must be executable. Do not forget to lh_clean --chroot "
-"after making this change before you build again."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:159
-msgid ""
-"You must also use the example script /usr/share/live-helper/examples/hooks/"
-"update-initramfs.sh to ensure your script gets built into the initramfs "
-"(read the comment header for instructions)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:163
-msgid ""
-"Q: How do I add software not in Debian ? A: See Customizing package "
-"installation % FIXME: <xref linkend=\"packages\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:166
-msgid ""
-"Q: What is the manifest with Ubuntu used for? A: Manifest is just the "
-"package list, which ubuntu does $something with. Don't worry about it."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:169
-msgid ""
-"Q: What is this {p} syntax with mtools{p} and parted{p}? A: That's aptitude."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:172
-msgid ""
-"Q: Do I need to write the image on USB stick to test it? A: you must use "
-"qemu >= 0.8."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:175
-msgid "Q: What is /cow? A: Copy-on-write, the 'diff' from unionfs."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:178
-msgid ""
-"Q: Is /usr/share/live-helper/lists/standard-x11 like preseed or is preseed "
-"something else entirely? A: It is not. It is a package list, not a debconf "
-"preseeding."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:181
-msgid ""
-"Q: What is the difference between standard and minimal? A: standard: "
-"packages of priority standard and higher; minimal: packages of priority "
-"essential and higher;"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:184
-msgid ""
-"Q: What can the sections be used for? Aren't they BIG? A: Someone maybe "
-"wants to include packages from contrib or non-free."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:187
-msgid "Q: memtest86+ ... is that used? A: Yes"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:190
-msgid ""
-"Q: How do I build using predefined packages lists? A: e.g. to build using "
-"standard-x11 packages list: #{$ sudo lh_config -p standard-x11 && sudo "
-"lh_build}# Note: The packages lists can be found in /usr/share/live-helper/"
-"lists/ directory."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:193
-msgid ""
-"Q: How do I rebuild without downloading all the packages again? A: All "
-"packages are cached in cache subdirectory. They remain until a clean purge: #"
-"{$ sudo lh_clean --purge}# You do not have to do anything to prevent "
-"packages from being re-downloaded. You need to remember to clean whichever "
-"stages you want to rebuild first. e.g. to rebuild from the cached bootstrap, "
-"chroot packages and build a new image. #{$ sudo lh_clean && sudo lh_build}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:196
-msgid ""
-"Q: How do I boot USB debian-live on systems not supporting USB boot? A: Make "
-"a boot CD with grub, configured to boot from a debian-live kernel copied on "
-"the cd structure #{$ mkdir -p iso/boot/grub && cp /usr/lib/grub/i386-pc/"
-"stage2_eltorito iso/boot/grub && cp chroot/boot/* iso/boot/}# Create iso/"
-"boot/grub/menu.lst:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:205
-msgid ""
-"default 0 timeout 5 color cyan/blue white/blue title Debian Live root (cd)  "
-"kernel /boot/vmlinuz boot=live initrd /boot/initrd.img"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:209
-msgid ""
-"Create the iso image #{$ mkisofs -R -b boot/grub/stage2_eltorito -no-emul-"
-"boot \\ -boot-load-size 4 -boot-info-table -o grub.iso iso}# Burn the image."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:212
-msgid ""
-"Q: How do I boot debian-live on systems not supporting CDROM or USB boot? A: "
-"If you have a floppy drive, you may be able to use it, otherwise you will "
-"need to use loadlin/grub4dos/win32-loader. If you have a second system to "
-"serve up the image over the network, See http://wiki.debian.org/DebianLive/"
-"Howto/Creating_a_Netboot_Image"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:215
-msgid ""
-"Q: The X configuration does not seems to work, the resolution is too low. "
-"What can I do? A: Use xdebconfigurator #{$ lh_config --bootappend xdebconf "
-"&& lh_config --packages xdebconfigurator}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:218
-msgid ""
-"Q: Apache has problems with static files A: Sendfile does not work well on "
-"the unionfs used by Debian Live. Add the following to apache's "
-"configuration: #{EnableSendfile off}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:222
-msgid ""
-"Q: How do I make hard disk partitions auto-mountable? A: Short answer: Right "
-"now the best is to use a script that will populate the fstab when the CD is "
-"booting. Such a script can be found at https://devel.goto10.org/svn/puredyne/"
-"trunk/broth/stock/chroot_local-includes/sbin/diskmounter.sh. A proper "
-"solution based on HAL will be described here in a hopefully near future.  A: "
-"Long Answer: Since 55_nonpolkit-mount-policy.patch in HAL, debian-storage-"
-"policy-fixed-drives.fdi is not available anymore and the previous trick that "
-"consisted to remove this file to enable automounting of fixed drives as a "
-"consequence is obsolete. Eventually, it will be possible to combine HAL and "
-"PolicyKit to enable different permissions and actions to achieve advanced "
-"(auto)mounting for non-root users. Until then, because the live scripts are "
-"only touching to the fstab to add a swap partition if discovered at boot "
-"time, the only way to have fixed drives mounted automatically is to use a "
-"script that will populate the fstab file at the end of the multiuser "
-"runlevel. To achieve this, you can do, for example, the following: download "
-"the https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-"
-"includes/sbin/diskmounter.sh script Create the chroot_local-includes/sbin "
-"directory, and move the script inside Make sure the script is executable "
-"(chmod +x diskmounter.sh) create the chroot_local-includes/etc/rc.local file "
-"and call the diskmounter from there (see this https://devel.goto10.org/svn/"
-"puredyne/trunk/broth/stock/chroot_local-includes/etc/rc.local When called "
-"correctly, the script detects ext2, ext3, reiserfs, xfs, FAT32, HFS+ and "
-"NTFS partitions and mount them read-write, except for NTFS. This will change "
-"soon and an option will be available to use ntfs-3g to mount NTFS as read-"
-"write. comments, patches and other things about this script and issue: "
-"http://code.goto10.org/projects/puredyne/ticket/463"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:225
-msgid ""
-"Q: Boot fails with panic: can't open /scripts/live A: Add latest live-"
-"initramfs deb package into config/chroot_local-packages directory and "
-"rebuild."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:229
-msgid ""
-"Q: How do I configure the locale and the keyboard? A: See 10n % FIXME: <xref "
-"linkend=\"internalization\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:234
-msgid ""
-"Q: How do I get past boot prompt without a working keyboard? A: See "
-"Customizing the bootup process % FIXME: <xref linkend=\"bootup\"/> Note: "
-"Boot from an USB-HDD on an iMac with GRUB did not work."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:237
-msgid ""
-"Q: Can I serve the root image from a web or ftp server? A: Since live-"
-"initramfs 1.99, it should be possible to use the fetch= argument on the "
-"kernel command line. You can build a netboot image as usual, and when you "
-"are done edit the tftpboot/pxelinux.cfg/default file. Remove the references "
-"to network boot (netboot, nfsroot, nfsopts), and replace with fetch= <url "
-"where you placed the root image>. You have to include wget in the chroot. It "
-"could work for other boot methods as well. However, I am not sure the live "
-"scripts configure the network when booting from a CD or USB disk. #{$ "
-"lh_config --packages wget}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:240
-msgid ""
-"Q: Why doesn't quickreboot (or some other boot parameter) work? A: If you "
-"are building an etch image (which was the default up to 2007/09/14) you have "
-"a very old version of casper which does not support quickreboot and possibly "
-"other boot parameters as well. You could configure your sources to use live-"
-"backports (see /usr/share/live-helper/examples/sources/live-backports) and "
-"switch to live-initramfs, or better yet, build a lenny image instead, which "
-"is the new default. #{$ lh_config --distribution lenny $ lh_config --"
-"initramfs live-initramfs}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:243
-msgid ""
-"Q: How do I fix \"Could not find kernel image\" issue with syslinux "
-"bootloader? A: Add a binary local hook script to fix kernel and initrd path "
-"each time you build an image. e.g. config/binary_local-hooks/01-fix_syslinux."
-"sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:249
-msgid "SYSLINUXCFG=`find binary -type f -name syslinux.cfg`"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:252
-msgid ""
-"sed -i \"s|kernel /vmlinuz|kernel vmlinuz|g\" ${SYSLINUXCFG} sed -i \"s|"
-"initrd=/initrd|initrd=initrd|g\" ${SYSLINUXCFG}"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:254
-msgid "$ chmod +x config/binary_local-hooks/01-fix_syslinux.sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:259
-msgid ""
-"Q: How do I use a newer kernel with lenny? A: A build with backports.org "
-"kernels will fail as that repository lacks the necessary module packages "
-"(linux-modules-extra-2.6, aufs, etc.). Use the kernel backports http://"
-"unsupported.debian-maintainers.org/backports-kernel/ The quick way to "
-"success:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:268
-msgid ""
-"$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6 squashfs-"
-"modules-2.6' $ echo 'deb http://unsupported.debian-maintainers.org/backports-"
-"kernel/ ./' > config/chroot_sources/backports-kernel.chroot $ echo 'deb "
-"http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/"
-"chroot_sources/backports-kernel.binary $ wget http://unsupported.debian-"
-"maintainers.org/backports-kernel/archive-key.asc -O config/chroot_sources/"
-"backports-kernel.chroot.gpg $ wget http://unsupported.debian-maintainers.org/"
-"backports-kernel/archive-key.asc -O config/chroot_sources/backports-kernel."
-"binary.gpg $ lh_build }code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:271
-msgid ""
-"Q: How do I use a custom kernel? Is there a nice way of booting debian-live "
-"with a custom kernel (not in an apt repo)? A: Copy it into config/"
-"chroot_local-packages and set LH_LINUX_PACKAGES=\"none\" or use lh config --"
-"linux-packages \" \" Don't forget to compile your kernel with an union "
-"filesystem (unionfs or aufs), squashfs modules, and initrd support. I can "
-"cause the kernel to be installed but it seems this happens later than grub/"
-"syslinux is configured so it's not listed and casper/ and the menu require "
-"munging. You need to follow the debian scheme, e.g. placing the files in /"
-"boot as vmlinuz-$version and initrd.img-$version etc. I personally wouldn't "
-"go that way which is too much of a hassle, and just use make-kpkg to produce "
-"custom kernel deb packages. They should integrate nicely if you just put "
-"them into config/chroot_local-packages and set LH_LINUX_PACKAGES=\"\". Hint: "
-"to work around an error, which lh_binary_syslinux will throw on custom "
-"kernels if there is not an 468/686 in the kernel-name, you need to set "
-"CONFIG_LOCALVERSION=\"-486\" or \"-686\" within the kernel configuration (-"
-"&gt; General setup -&gt; Local version set to -486 or -686) corresponding to "
-"LH_LINUX_FLAVOURS=\"\" or \"686\". this at least up till live-helper version "
-"1.0~a40-1 see http://lists.alioth.debian.org/pipermail/debian-live-"
-"devel/2007-July/001947.html and http://lists.alioth.debian.org/pipermail/"
-"debian-live-devel/2007-November/002581.html"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:274
-msgid ""
-"Q: How do I create a cross arch live CD image? A: In short: You can't. Read "
-"on: The procedure to create a live CD is based on creating a chroot that "
-"contains the files that will be finally available on the live CD. The live "
-"CD building procedure includes chrooting into the chroot dir and so some "
-"operations. chrooting means that the terminal you chroot on will behave as a "
-"different system so your real system and the chroot environment is decoupled "
-"somehow. Once the live CD scripts chroots into the chroot dir they have some "
-"operations to do inside that environment and your real system won't be able "
-"to run them unless you are using the same architecture. So you only are able "
-"to make live CD for the arch you run on. But this doesn't prevent you run "
-"qemu or some other machine emulator that make this possible."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:277
-msgid ""
-"Q: When is a lh_clean necessary? lh_clean is a script in /usr/bin/ A: That "
-"depends what you've changed between builds If, for example, you've built an "
-"iso image and you want a usb image, you only need to run #{lh_clean --binary}"
-"# before you run lh_build again. If you've changed anything in the chroot, "
-"you'll need to cleanup both chroot and binary with #{lh_clean}# before "
-"continuing"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:280
-msgid ""
-"Q: How can i set boot= parameters? A: Set LH_BOOTAPPEND_LIVE in config/binary"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:283
-msgid ""
-"Q: How do I include different modules to load when the live system boots? A: "
-"Configure config/chroot_local-includes/etc/initramfs-tools/"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:285
-msgid ""
-"The lh_chroot_hacks helper rebuilds the live/initrd1.img using the default "
-"initramfs.conf \"MODULES = most\". You may override that by supplying your "
-"own initramfs.conf, or else just add your own modules, e.g."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:290
-msgid ""
-"mkdir -p config/chroot_local-includes/etc/initramfs-tools/ echo \"atl2\" >> "
-"config/chroot_local-includes/etc/initramfs-tools/modules"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:294
-msgid ""
-"Note: Even though initramfs.conf(5) says \"most adds all the framebuffer, "
-"acpi, file system, ide, sata, scsi and usb drivers\", it actually includes "
-"network drivers as well. See auto_add_modules() in /usr/share/initramfs-"
-"tools/hook-functions for the complete list."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:297
-msgid ""
-"Q: Can I have a splash screen? A: Yes you can. You will not know what is "
-"going on when the splash screen is active, it may fail to activate on some "
-"hardware or break X on other (both usplash and splashy use libdirectfb which "
-"does some evil voodoo and may break you graphics or input until you reboot). "
-"However, you can install and activate it just as you would on any other "
-"Debian system. To use splashy: 1. install splashy and read the README, the "
-"manpages are useless for setting it up. Add some parameters to your kernel "
-"command line, such as in your pxelinux configuration or in "
-"LH_BOOTAPPEND_LIVE in config/binary in debian-live configuration: #{vga=792 "
-"splash quiet}# #{vga}# to select video mode, #{splash}# to activate splashy, "
-"#{quiet}# to suppress most kernel messages that you cannot see anyway but "
-"would scroll past before splashy manages to paint the graphics on your "
-"screen. You might want to add splashy to the list of packages installed in "
-"your image: #{echo splashy > config/chroot_local-packageslists/splashy echo "
-"splashy-themes >> config/chroot_local-packageslists/splashy}# and select a "
-"theme:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:305
-msgid ""
-"echo '#!/bin/sh' > config/chroot_local-hooks/splashy echo splashy_config -s "
-"debian-moreblue '||' true >> config/chroot_local-hooks/splashy # update the "
-"ramdisk to include the splash screen echo update-initramfs -u -k all >> "
-"config/chroot_local-hooks/splashy chmod 755 config/chroot_local-hooks/splashy"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:309
-msgid ""
-"After you rebuild your live system you should observe a bluish splash screen "
-"while booting. Nothing happens while initramfs is running because there is "
-"no splashy support in initramfs-tools. Once the init starts the progress bar "
-"should start to fill. If #{vga=something}# sets a mode that your screen "
-"cannot show or your card cannot do vesa 2.0 (and thus you get plain text "
-"mode and no splashy) read the splashy faq."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:312
-msgid ""
-"Q: Howto use my Broadcom eXtrem 2 network card (module bnx2)? A: Add the "
-"firmwares to the initrd image. You need to install the non-free package "
-"\"firmware-bnx2\". Uncompress your initrd image, then copy files:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:317
-msgid ""
-"cp /lib/firmware/bnx2x-e1-4.8.53.0.fw /lib/firmware/bnx2x-e1-5.0.21.0.fw /"
-"lib/firmware/bnx2x-e1h-4.8.53.0.fw /lib/firmware/bnx2x-e1h-5.0.21.0.fw "
-"${INITRD}/lib/firmware/ cp /lib/udev/firmware.agent ${INITRD}/lib/udev/"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:321
-msgid "Recompress your initrd image and boot: it works!"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:323
-msgid ""
-"Q: X is broken (the system boots, messages scroll by, and then the screen "
-"goes blank). What do I do? A: On my system starting X completely disables "
-"graphics so that I do not see anything even after X bails out and I am back "
-"to the console. To prevent this you can change the driver Xorg uses."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:325
-msgid ""
-"If you have a working splash screen or at least graphical console you can "
-"use #{live xdriver=fbdev}# when booting the live system (instead of just "
-"enter). Another driver you might want to try is #{vesa}#. If all fails you "
-"might try to set xdriver to some wrong value so that Xorg fails to start and "
-"you can examine the system while you still see something on the console. #"
-"{live xdriver=none}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:328
-msgid ""
-"Q: How can I get Debian first stable versions? A: I'm developing software "
-"and testing it on Live-CD. Thanks for the LiveCD project. To be sure my "
-"development is fully compatible with the \"etch\" version, I need the same "
-"scenario when Debian GNU/Linux 4.0 was published as stable (I believe "
-"2007.04.08). If there was some bug on 2007.04.08 that was corrected one week "
-"later, I need to test software foreseeing that scenario without the bug "
-"solved."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:331
-msgid ""
-"Q: I get \"fopen: Permission denied\"-warnings from apt on building/at the "
-"live-system A: That's a harmless bug in apt. However, if you want to get off "
-"this warnings in the live-system, add a file in chroot_local-hooks with "
-"follow row:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:335
-msgid "chown -R man.man /var/cache/man"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:340
-msgid ""
-"Q: Why I always fail during \"Retrieving Packages\" stage when running "
-"lh_build? I have already set apt-http-proxy and so on.  A: lh_build "
-"retrieves packages via wget, as a result you need to enable the proxy "
-"settings in /etc/wgetrc before running lh_build."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:343
-msgid ""
-"Q: How do I edit Xorg.conf? A: Xorg.conf is generated every time system "
-"boots, so it's useless to put modifed Xorg.conf in config/choort_local-"
-"includes/etc/X11, because it will be overwritten during boot. However, you "
-"can edit /usr/bin/dexconf, which generate xorg.conf during boot, so the "
-"result will be modified Xorg.conf. The modified dexconf has to be put in "
-"config/choort_local-includes/usr/bin. e.g.: you can configure Xorg.conf for "
-"two or more keyboards layouts with alt+shift toggle by editing dexconf and "
-"replacing the line:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:347
-msgid "Option \"XkbLayout\" \"$XKB_LAYOUT\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:351
-msgid "with the lines:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:356
-msgid ""
-"Option \"XkbLayout\" \"us,il\" Option \"XkbOptions\" \"grp:alt_shift_toggle,"
-"grp_led:scroll\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:360
-msgid "when \"us,il\" are the wanted keyboard layouts."
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:362
-msgid ""
-"You can force default screen resulotion (e.g. 1024*768) by adding the lines:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:368
-#, no-wrap
-msgid ""
-"SubSection \"Display\"\n"
-"        Modes \"1024x768\"\n"
-"EndSubSection\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:372
-msgid "between the lines:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:379
-#, no-wrap
-msgid ""
-"Section \"Screen\"\n"
-"        Identifier \"Default Screen\"\n"
-"        Monitor \"Configured Monitor\"\n"
-"EndSection\"\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:383
-msgid ""
-"Q: Where are the build parameters for the prebuilt images A: See http://live."
-"debian.net/README.images."
-msgstr ""
diff --git a/manual/pot/other_howtos.ssi.pot b/manual/pot/other_howtos.ssi.pot
deleted file mode 100644
index aff720e..0000000
--- a/manual/pot/other_howtos.ssi.pot
+++ /dev/null
@@ -1,379 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 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:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
-msgid "code{"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 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: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:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
-msgid "}code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:2
-msgid "B~ Howtos"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:4
-msgid "1~ Howtos"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:6
-msgid "2~ ISO"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:8
-msgid ""
-"Generating a Debian Live CD is very simple. You need to have live-helper "
-"(package available in Debian sid and lenny), and Debootstrap (or "
-"cdebootstrap) from etch or newer."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:10
-msgid "3~ Install live-helper"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:12
-msgid "#{apt-get install live-helper}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:14
-msgid "3~ Configure the current working directory with lh_config"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:18
-msgid "lh_config -b iso -a $ARCH"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:22
-msgid "where #{$ARCH}# is the intended architecture (i.e. - i386 or amd64)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:24
-msgid "#{-b}# flag is used to be sure to obtain image in ISO format."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:26
-msgid "3~ Build the image with lh_build:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:28
-msgid "Execute lh_build as root: #{lh_build}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:30
-msgid ""
-"The command above will create the basic image, containing just the Debian "
-"standard system (with no X at all)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:32
-msgid ""
-"If you want to have any of the Desktop environments on your livecd, #{ls /"
-"usr/share/live-helper/lists}# will show a number of available package Lists "
-"to choose from, e.g. #{lh_config -p gnome-desktop}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:34
-msgid "More examples are listed at DebianLive/Examples."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:37
-msgid ""
-"See packages for help configuring a local Debian Mirror and other aspects of "
-"the live system.  % FIXME: <xref linkend=\"packages\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:39
-msgid "3~ Test the image"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:41
-msgid "If you have qemu installed, you can boot the image with:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:45
-msgid "qemu -cdrom binary.iso"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:49
-msgid "If you have also kqemu installed, you can add #{-kernel-kqemu}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:51
-msgid "2~ ISO_(multiarch)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:53
-msgid ""
-"Multiple machine boot CDs can be created with the following manual "
-"procedure. This procedure has been successfully used to create a single CD "
-"which is bootable on alpha, i386, pmax, and sparc. It should be possible to "
-"also make the CD bootable on macppc, vax and on sun2, sun3 and sun3x."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:55
-msgid ""
-"To create a CD which is bootable by multiple architectures, use the "
-"following steps in this order. Please note that the order is critical."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:57
-msgid ""
-"Make sure you have all the required files including the various kernels and "
-"boot programs listed in the individual machine sections."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:59
-msgid ""
-"Include a directory somewhere in the cdsources directory called mdec.pmax "
-"and include the pmax bootxx_cd9660 file there. For example, /cdsources/usr/"
-"mdec.pmax/bootxx_cd9660."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:61
-msgid ""
-"Include a directory somewhere in the cdsources directory called mdec.vax and "
-"include the vax xxboot file there. For example, #{cdsources/usr/mdec.vax/"
-"xxboot.}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:63
-msgid "Include the macppc ofwboot.xcf bootloader in /cdsources."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:65
-msgid ""
-"Create an i386 bootable image. #{sh mkisofs -v -v -o output.iso -b i386/"
-"installation/floppy/boot-big.fs \\ -c boot.catalog -l -J -r -L /cdsources "
-"2>&1 | tee /tmp/mkisofs.log exit}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:67
-msgid ""
-"Note: The appearance of the -v flag twice is required. If you are making a "
-"bootable CD for an Open Firmware 3 macppc model, make sure to include -hfs -"
-"part in the parameters for mkisofs."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:69
-msgid ""
-"Run mksunbootcd on a NetBSD/sparc machine to install sparc and sun2/sun3 "
-"bootblocks. Alternatively, install the sysutils/mksunbootcd package on your "
-"favorite NetBSD machine. #{mksunbootcd output.iso boot-sun4.fs boot-sun4c.fs "
-"boot-sun4m.fs boot-sun3.fs}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:71
-msgid ""
-"Run the installboot(8) program targeted for NetBSD/pmax to install the pmax "
-"bootblocks. Note that in order to coexist with other NetBSD boot blocks, the "
-"pmax boot block is appended to the end of the ISO file system."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:73
-msgid ""
-"#{installboot -m pmax -v -o append,sunsum output.iso /tmp/mdec.pmax/"
-"bootxx_cd9660}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:75
-msgid ""
-"The -o append,sunsum option appends the first stage boot block to the end of "
-"the ISO file system, and restores the checksum used when booting on a sun."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:77
-msgid ""
-"Run the installboot(8) program targeted for NetBSD/vax to install the vax "
-"bootblocks. Note that in order to coexist with other NetBSD boot blocks, the "
-"vax boot block is appended to the end of the ISO file system."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:79
-msgid "installboot -m vax -v -o append,sunsum output.iso /tmp/mdec.vax/xxboot"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:81
-msgid "(See the pmax entry above for an explanation of the flags)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:83
-msgid ""
-"Run the installboot(8) program targeted for NetBSD/alpha to install the "
-"alpha bootblocks."
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:85
-msgid ""
-"#{installboot -m alpha -v -o append,sunsum output.iso /tmp/mdec.alpha/"
-"bootxx_cd9660}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_howtos.ssi:86
-msgid ""
-"Note: The alpha installboot must occur after the others, because currently "
-"it's the only machine dependent back-end for installboot(8) that can "
-"calculate the alpha checksum. (See the pmax entry above for an explanation "
-"of the flags)."
-msgstr ""
diff --git a/manual/pot/other_use-cases.ssi.pot b/manual/pot/other_use-cases.ssi.pot
deleted file mode 100644
index 1b83eac..0000000
--- a/manual/pot/other_use-cases.ssi.pot
+++ /dev/null
@@ -1,379 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 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:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
-msgid "code{"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 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: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:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
-msgid "}code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/other_use-cases.ssi:26
-#: en/other_use-cases.ssi:77
-msgid "#!/bin/sh"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:2
-msgid "B~ Use Cases"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:4
-msgid "1~ Use Cases"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:6
-msgid "This chapter is for users to document their use cases with Debian Live."
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:8
-msgid "2~ VNC Kiosk Client"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:10
-msgid "Create an image with live-helper to boot directly to a VNC server."
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:12
-msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:14
-msgid "_* Move to the build directory: #{$ cd vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:16
-msgid ""
-"Example to config the build directory to include gdm metacity "
-"xtightvncviewer: #{$ lh config --packages \"gdm metacity xtightvncviewer\"}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:18
-msgid ""
-"Create a folder /etc/skel folder for a custom .xsession for the default "
-"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:20
-msgid ""
-"Create the .xsession for the default user: #{$ touch config/chroot_local-"
-"includes/etc/skel/.xsession}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:22
-msgid ""
-"Edit the .xsession file to launch metacity and start xvncviewer with "
-"something similar to the below:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:29
-msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:31
-msgid "exit"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:35
-msgid "_* Build the image: #{# lh build}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:37 en/other_use-cases.ssi:138
-msgid "_* Enjoy."
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:39
-msgid "2~ VMWare-Player Sessions"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:41
-msgid ""
-"Create an image with live-helper to boot directly to a specifiv VMWare "
-"session."
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:43
-msgid "_* Make a build directory: #{$ mkdir VMWare-Player}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:45
-msgid "_* Move to the build directory: #{$ cd VMWare-Player}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:47
-msgid ""
-"_* Example to config the build directory to include gdm metacity "
-"xtightvncviewer:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:67
-#, no-wrap
-msgid ""
-"$ lh config --apt apt \\\n"
-"        ---apt-recommends disabled \\\n"
-"        --archive-areas \"main\" \\\n"
-"        --binary-images iso \\\n"
-"        --binary-indices none \\\n"
-"        --syslinux-menu vesamenu \\\n"
-"        ---bootappend-live \"persistent quickreboot\" \\\n"
-"        ---bootappend-install \"-- plainroot persistent video=vesa:ywrap,mtrr vga=788 quickreboot quiet live-config\" \\\n"
-"        ---debian-installer live \\\n"
-"        ---distribution lenny \\\n"
-"        ---hostname vmare-player-firmware \\\n"
-"        ---includes none \\\n"
-"        ---linux-flavours 686 \\\n"
-"        ---packages-lists \"gnome-core\" \\\n"
-"        ---packages \"gcc gparted linux-headers-2.6-\\${LH_LINUX_FLAVOURS} live-config-staging make metacity rsync wireless-tools\" \\\n"
-"        ---repositories live.debian.net \\\n"
-"        ---win32-loader disabled\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:71
-msgid ""
-"_* Create the 01-vmware-player hook: #{$ touch config/chroot_local-hooks/01-"
-"vmware-player.sh}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:73
-msgid ""
-"Edit the 01-vmware-player hook to launch the VMWare-Player. The hook should "
-"look something like the below:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:80
-msgid ""
-"_URL=\"http://archive.debian-maintainers.org/vmware/other/vmware-player/\" "
-"_VMPLAYER_VERSION=\"VMware-Player.i386.bundle\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:83
-msgid "echo \"I: Starting script for install of VMWare Player.\" cd /root"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:86
-msgid ""
-"echo \"I: Beginning download of ${_VMPLAYER_VERSION} from ${_URL} .\" wget "
-"${_URL}${_VMPLAYER_VERSION}"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:89
-msgid ""
-"echo \"I: Starting install of VMWare Player.\" sh /root/${_VMPLAYER_VERSION}"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:92
-msgid ""
-"echo \"I: Cleaning up the VMWare Player download.\" rm /root/"
-"${_VMPLAYER_VERSION}"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:95
-msgid "#echo \"I: Starting interactive shell.\" #bash"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:99
-msgid ""
-"_* Build the image (note that during the build the VMWare-Player will prompt "
-"you to install or cancel): #{#lh build}#"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:101
-msgid ""
-"_* After the build you will have an image you can boot live or install as "
-"firmware. The package live-config-staging is the package that installs the "
-"ability to utilize the VMWare-Player by calling live-config.vmware-player as "
-"a boot parameter in the following form:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:105
-msgid "live-config.vmware-player=ACTION:IMAGEPATH:VMXNAME"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:109
-msgid "Notes from the 900-vmware-player file are as follows:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_use-cases.ssi:135
-#, no-wrap
-msgid ""
-"# The script tests for boot parameter of\n"
-"# live-config.vmware-player=ACTION:IMAGEPATH:VMXNAME\n"
-"#\n"
-"# ACTION: The operation to perform on the workstation (none|scratch)\n"
-"# IMAGEPATH: The folder path to the VMware image you want to run.\n"
-"# VMXNAME: The name of the VMware image you want to run.\n"
-"#\n"
-"# Notes:To use this file with WMWare images you will need to have a few things\n"
-"# setup:\n"
-"#\n"
-"# 1. The VMware Player needs to be installed in the image.\n"
-"# 2. This script uses (s|h)da1 for writing image data, and is used as a scratch\n"
-"#    space. This scratch space should be a file system with linux permissions\n"
-"#    such as ext2.\n"
-"# 3. VMware image(s) should be in a mounted folder and setup as follows:\n"
-"#    - Image(s) set to snapshot mode.\n"
-"#    - For each image, the image folder needs to have a file called\n"
-"#      image-release with a variable CRELEASE. An example: CRELEASE=\"1.0.0\"\n"
-"#\n"
-"# The image-release file is used by the image maintainer and this script to tell\n"
-"# workstation(s) using a given image, to erase locally stored vmware image files\n"
-"# and setup with the newly configure image. The operation of erasing locally\n"
-"# stored vmare image files, is referred to as a scratch.\n"
-msgstr ""
diff --git a/manual/pot/project_bugs.ssi.pot b/manual/pot/project_bugs.ssi.pot
index d99a6c4..040f2dd 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-11-30 10:29+0100\n"
+"POT-Creation-Date: 2010-12-23 07: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,65 +20,62 @@ 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_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/project_bugs.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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:24
+#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
+#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
+#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
+#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
+#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
+#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
+#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
+#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
+#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
+#: en/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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr ""
@@ -87,65 +84,62 @@ 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:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
+#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
+#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
+#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
+#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
+#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
+#: en/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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr ""
@@ -204,152 +198,165 @@ msgstr ""
 #. type: Plain text
 #: en/project_bugs.ssi:18
 msgid ""
-"Due to the nature of Debian *{testing}* and Debian *{unstable}* "
-"distributions being a moving target, building a live system may not always "
-"be possible."
+"Because Debian *{testing}* and Debian *{unstable}* distributions are a "
+"moving target, when you specify either as the target system distribution, a "
+"successful build may not always be possible."
 msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:20
-msgid ""
-"If this is a problem, do not build a system based on *{testing}* or *"
-"{unstable}*, but go with *{stable}*. live-build does always default to the "
-"current *{stable}* release."
+msgid "% FIXME:"
 msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:22
 msgid ""
-"Currently known issues are listed under the section 'status' on our homepage "
-"at http://live.debian.net/"
+"If this causes too much difficulty for you, do not build a system based on *"
+"{testing}* or *{unstable}*, but rather, use *{stable}*. live-build does "
+"always default to the *{stable}* release."
 msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:24
 msgid ""
-"It is out of the scope of this manual to train you in correctly identifying "
-"and fixing problems in packages of the development distributions, however, "
-"there are two things you can always try: When not succeeding to build *"
-"{testing}*, try if *{unstable}* works. If *{unstable}* does not work either, "
-"revert to *{testing}* and pinning the newer version of the failing package "
-"from *{unstable}*."
+"Currently known issues are listed under the section 'status' on our homepage "
+"at http://live.debian.net/."
 msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:26
-msgid "2~ Rebuild from scratch"
+msgid ""
+"It is out of the scope of this manual to train you to correctly identify and "
+"fix problems in packages of the development distributions, however, there "
+"are two things you can always try: If a build fails when the target "
+"distribution is *{testing}*, try *{unstable}*. If *{unstable}* does not work "
+"either, revert to *{testing}* and pin the newer version of the failing "
+"package from *{unstable}* (see {APT pinning}#apt-pinning for details)."
 msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:28
+msgid "2~ Rebuild from scratch"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:30
 msgid ""
-"To ensure that a particular bug is not caused by an unclean built system, "
+"To ensure that a particular bug is not caused by an uncleanly built system, "
 "please always rebuild the whole live system from scratch to see if the bug "
 "is reproducible."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:30
+#: en/project_bugs.ssi:32
 msgid "2~ Use up-to-date packages"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:32
+#: en/project_bugs.ssi:34
 msgid ""
 "Using outdated packages can cause significant problems when trying to "
-"reproduce (and ultimately fix) your problem."
+"reproduce (and ultimately fix) your problem. Make sure your build system is "
+"up-to-date and any packages included in your image are up-to-date as well."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:34
+#: en/project_bugs.ssi:36
 msgid "2~collect-information Collect information"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:36
+#: en/project_bugs.ssi:38
 msgid ""
-"Please provide enough information with your report. At a minimum, it should "
-"contain the exact version of live-build version where the bug is "
-"encountered, and steps to reproduce it. Please use common sense and include "
-"other relevant information if you think that it might help in solving the "
-"problem."
+"Please provide enough information with your report. At least include the "
+"exact version of live-build version where the bug is encountered and steps "
+"to reproduce it. Please use common sense and include other relevant "
+"information if you think that it might help in solving the problem."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:38
+#: en/project_bugs.ssi:40
 msgid ""
 "To make the most out of your bug report, we require at least the following "
 "information:"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:40
+#: en/project_bugs.ssi:42
 msgid "_* Architecture of the host system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:42
+#: en/project_bugs.ssi:44
 msgid "_* Version of live-build on the host system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:44
+#: en/project_bugs.ssi:46
 msgid "_* Version of live-boot on the live system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:46
+#: en/project_bugs.ssi:48
 msgid "_* Version of live-config on the live system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:48
-msgid "_* Version of debootstrap and/or cdebootstrap on the host system"
+#: en/project_bugs.ssi:50
+msgid ""
+"_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:50
+#: en/project_bugs.ssi:52
 msgid "_* Architecture of the live system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:52
+#: en/project_bugs.ssi:54
 msgid "_* Distribution of the live system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:54
+#: en/project_bugs.ssi:56
 msgid "_* Version of the kernel on the live system"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:56
-msgid "You can generate a log of the build process by using the tee command:"
+#: en/project_bugs.ssi:58
+msgid ""
+"You can generate a log of the build process by using the #{tee}# command. We "
+"recommend doing this automatically with an #{auto/build}# script; see "
+"{Managing a configuration}#managing-a-configuration for details)."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:60
-msgid "lb build 2>&1 | tee build.log"
+#: en/project_bugs.ssi:62
+#, no-wrap
+msgid " # lb build 2>&1 | tee build.log\n"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:64
+#: en/project_bugs.ssi:66
 msgid ""
-"For runtime log, live-boot stores a log in /var/log/live.log (or /var/log/"
-"live-boot.log)."
+"At boot time, live-boot stores a log in #{/var/log/live.log}# (or #{/var/log/"
+"live-boot.log}#)."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:66
+#: en/project_bugs.ssi:68
 msgid ""
 "Additionally, to rule out other errors, it is always a good idea to tar up "
-"your config directory and upload it somewhere (do *{not}* send it as an "
-"attachment to the mailinglist), so that we can try to reproduce the errors "
-"you encountered."
+"your #{config/}# directory and upload it somewhere (do *{not}* send it as an "
+"attachment to the mailing list), so that we can try to reproduce the errors "
+"you encountered. If this is difficult (e.g. due to size) you can use the "
+"output of #{lb config --dump}# which produces a summary of your config tree "
+"(i.e. lists files in subdirectories of #{config/}# but does not include "
+"them)."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:68
+#: en/project_bugs.ssi:70
 msgid ""
 "Remember to send in any logs that were produced with English locale "
 "settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or #"
@@ -357,22 +364,41 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:70
+#: en/project_bugs.ssi:72
+msgid "2~ Isolate the failing case if possible"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:74
+msgid ""
+"If possible, isolate the failing case to the smallest possible change that "
+"breaks. It is not always easy to do this, so if you can't manage it for your "
+"report, don't worry. However, if you plan your development cycle well, using "
+"small enough change sets per iteration, you may be able to isolate the "
+"problem by constructing a simpler 'base' configuration that closely matches "
+"your actual configuration plus just the broken change set added to it. If "
+"you have a hard time sorting out which of your changes broke, it may be that "
+"you are including too much in each change set and should develop in smaller "
+"increments."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:76
 msgid "2~ Use the correct package to report the bug against"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:72
+#: en/project_bugs.ssi:78
 msgid "Where does the bug appear?"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:74
+#: en/project_bugs.ssi:80
 msgid "3~ At build time whilst bootstrapping"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:76
+#: en/project_bugs.ssi:82
 msgid ""
 "live-build first bootstraps a basic Debian system with #{debootstrap}# or #"
 "{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
@@ -382,7 +408,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:78
+#: en/project_bugs.ssi:84
 msgid ""
 "In both cases, this is not a bug in Debian Live, but rather in Debian itself "
 "which we can not fix this directly. Please report such a bug against the "
@@ -390,12 +416,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:80
+#: en/project_bugs.ssi:86
 msgid "3~ At build time whilst installing packages"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:82
+#: en/project_bugs.ssi:88
 msgid ""
 "live-build installs additional packages from the Debian archive and "
 "depending on the Debian distribution used and the daily archive state, it "
@@ -404,16 +430,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:84
+#: en/project_bugs.ssi:90
 msgid ""
 "If this is the case, this is not a bug in Debian Live, but rather in Debian "
-"- please report it against the failing package. Running debootstrap "
-"seperately from the Live system build or running lb bootstrap with #{--debug}"
-"# will give you more information."
+"- please report it against the failing package. Running #{debootstrap}# "
+"separately from the Live system build or running #{lb bootstrap --debug}# "
+"will give you more information."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:86
+#: en/project_bugs.ssi:92
 msgid ""
 "Also, if you are using a local mirror and/or any of sort of proxy and you "
 "are experiencing a problem, please always reproduce it first by "
@@ -421,40 +447,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:88
+#: en/project_bugs.ssi:94
 msgid "3~ At boot time"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:90
+#: en/project_bugs.ssi:96
 msgid ""
 "If your image does not boot, please report it to the mailing list together "
 "with the information requested in {Collect information}#collect-information. "
-"Do not forget to mention, how/when the image failed, in Qemu, VMWare or real "
-"hardware. If you are using a virtualization technology of any kind, please "
-"always run it on real hardware before reporting a bug. Providing a "
-"screenshot of the failure is also very helpful."
+"Do not forget to mention, how/when the image failed, in Qemu, Virtualbox, "
+"VMWare or real hardware. If you are using a virtualization technology of any "
+"kind, please always run it on real hardware before reporting a bug. "
+"Providing a screenshot of the failure is also very helpful."
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:92
+#: en/project_bugs.ssi:98
 msgid "3~ At run time"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:94
+#: en/project_bugs.ssi:100
 msgid ""
 "If a package was successfully installed, but fails while actually running "
 "the Live system, this is probably a bug in Debian Live. However,"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:96
+#: en/project_bugs.ssi:102
 msgid "2~ Do the research"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:98
+#: en/project_bugs.ssi:104
 msgid ""
 "Before filing the bug, please search the web for the particular error "
 "message or symptom you are getting. As it is highly unlikely that you are "
@@ -464,7 +490,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:100
+#: en/project_bugs.ssi:106
 msgid ""
 "You should pay particular attention to the Debian Live mailing list, as well "
 "as the homepage, as these are likely to contain the most up-to-date "
@@ -473,7 +499,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:102
+#: en/project_bugs.ssi:108
 msgid ""
 "In addition, you should check the current bug lists for live-build, live-"
 "boot, and live-config to see whether something similar has been reported "
@@ -481,12 +507,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:104
+#: en/project_bugs.ssi:110
 msgid "2~ Where to report bugs"
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:106
+#: en/project_bugs.ssi:112
 msgid ""
 "The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
 "System (BTS). For information on how to use the system, please see http://"
@@ -495,7 +521,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:108
+#: en/project_bugs.ssi:114
 msgid ""
 "In general, you should report build time errors against the live-build "
 "package, boot time errors against live-boot, and run time errors against "
@@ -505,7 +531,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/project_bugs.ssi:109
+#: en/project_bugs.ssi:115
 msgid ""
 "Please note that bugs found in distributions derived from Debian (such as "
 "Ubuntu and others) should *{not}* be reported to the Debian BTS unless they "
diff --git a/manual/pot/project_coding-style.ssi.pot b/manual/pot/project_coding-style.ssi.pot
index ebd6848..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-11-30 11:05+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"
@@ -20,64 +20,62 @@ 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_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:24
+#: 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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr ""
@@ -86,64 +84,62 @@ 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:173 en/other_customization-bootup.ssi:35
-#: en/other_customization-bootup.ssi:48 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: 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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr ""
@@ -220,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
@@ -235,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
@@ -250,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
@@ -277,43 +273,45 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:74
-msgid "_* Variables that used in lb config always start with LH_ prefix."
+msgid ""
+"_* Variables that used in #{lb config}# always start with #{LB_}# prefix."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:76
 msgid ""
-"_* Internal temporary variables in live-build should start with the _LH_ "
-"prefix."
+"_* Internal temporary variables in live-build should start with the #{\\_LB_}"
+"# prefix."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:78
-msgid "_* Local variables start with live-build __LH_ prefix."
+msgid "_* Local variables start with live-build #{\\_\\_LB_}# prefix."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:80
 msgid ""
-"_* Variables in connection to a boot parameter in live-config start with "
-"LIVE_."
+"_* Variables in connection to a boot parameter in live-config start with #"
+"{LIVE_}#."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:82
-msgid "_* All other variables in live-config start with _ prefix."
+msgid "_* All other variables in live-config start with #{_}# prefix."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:84
-msgid "_* Use braces around variables; eg. write ${FOO} instead of $FOO."
+msgid ""
+"_* Use braces around variables; e.g. write #{${FOO}}# instead of #{$FOO}#."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:86
 msgid ""
-"_* Always protect variables with quotes to respect potential whitespaces, "
-"write \"${FOO}\" not ${FOO}."
+"_* Always protect variables with quotes to respect potential whitespaces: "
+"write #{\"${FOO}\"}# not #{${FOO}}#."
 msgstr ""
 
 #. type: Plain text
@@ -325,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
@@ -342,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
@@ -366,21 +366,21 @@ msgstr ""
 #. type: Plain text
 #: en/project_coding-style.ssi:132
 msgid ""
-"_* Use \"|\" (without the surround quotes) as a seperator in calls to sed, e."
-"g. \"sed -e 's|foo|bar|'\" (without \"\")."
+"_* Use \"#{|}#\" (without the surround quotes) as a seperator in calls to "
+"sed, e.g. \"#{sed -e 's|foo|bar|'}#\" (without \"\")."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:134
 msgid ""
-"_* Don't use the test command for comparisons or tests, use \"[\" "
-"\"]\" (without \"\"), e.g. \"if [ -x /bin/foo ]; ...\" and not \"if test -x /"
-"bin/foo; ...\"."
+"_* Don't use the #{test}# command for comparisons or tests, use \"#{[}#\" \"#"
+"{]}#\" (without \"\"); e.g. \"#{if [ -x /bin/foo ]; ...}#\" and not \"#{if "
+"test -x /bin/foo; ...}#\"."
 msgstr ""
 
 #. type: Plain text
 #: en/project_coding-style.ssi:135
 msgid ""
-"_* Use case wherever possible over test, as it's easier to read and faster "
-"in execution."
+"_* Use #{case}# wherever possible over #{test}#, as it's easier to read and "
+"faster in execution."
 msgstr ""
diff --git a/manual/pot/project_procedures.ssi.pot b/manual/pot/project_procedures.ssi.pot
index c4fe16c..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-11-30 10:35+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"
@@ -20,65 +20,62 @@ 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_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:24
+#: 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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr ""
@@ -87,65 +84,62 @@ 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:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: 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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:147 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr ""
@@ -157,7 +151,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_procedures.ssi:4
-msgid "1~ Procedures"
+msgid "1~procedures Procedures"
 msgstr ""
 
 #. type: Plain text
@@ -179,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
@@ -263,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
@@ -279,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 3ac6529..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-11-28 07:16-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"
@@ -18,132 +18,128 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: 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/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: 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/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
-#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
-#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
-#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
-#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
-#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
+#: 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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
-#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
-#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
-#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
-#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
-#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr ""
@@ -217,16 +213,11 @@ msgid ""
 "size. Note that it is read-only. So, during boot the Debian Live system will "
 "use a RAM disk and 'union' mechanism to enable writing files within the "
 "running system. However, all modifications will be lost upon shutdown unless "
-"optional persistence is used (see persistence)."
+"optional persistence is used (see {Persistence}#persistence)."
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:20
-msgid "% FIXME: <xref linkend=\"persistence\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:22
 msgid ""
 "_* *{Bootloader}*: A small piece of code crafted to boot from the chosen "
 "media, possibly presenting a prompt or menu to allow selection of options/"
@@ -240,20 +231,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
 msgid ""
 "You can use live-build to build the system image from your specifications, "
 "set up a Linux kernel, its initrd, and a bootloader to run them, all in one "
-"media-dependant format (ISO9660 image, disk image, etc.)"
+"media-dependant format (ISO9660 image, disk image, etc.)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
 msgid "2~ First steps: building an ISO image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
 msgid ""
 "The following sequence of live-build commands will create a basic ISO hybrid "
 "image containing just the Debian standard system without X.org. It is "
@@ -263,93 +254,99 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
 msgid ""
 "First, we run the #{lb config}# command which will create a \"config/\" "
 "hierarchy in the current directory for use by other commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:34
-msgid "$ lb config"
+#: en/user_basics.ssi:32
+#, no-wrap
+msgid " $ lb config\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:38
+#: en/user_basics.ssi:36
 msgid ""
 "By passing no parameters to #{lb config}#, we indicated that we wish to use "
 "the defaults (see {The lb config command}#lb-config)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:40
+#: en/user_basics.ssi:38
 msgid ""
-"Now that we have a \"config/\" hierarchy, we may build the image with the lb "
-"build command:"
+"Now that we have a \"config/\" hierarchy, we may build the image with the #"
+"{lb build}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
-#: en/user_examples.ssi:106 en/user_examples.ssi:153
-msgid "# lb build"
+#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#, no-wrap
+msgid " # lb build\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:48
+#: en/user_basics.ssi:46
 msgid ""
 "This process can take a while, depending on the speed of your network "
 "connection (see {The lb build command}#lb-build)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:50
+#: en/user_basics.ssi:48
 msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:52
+#: en/user_basics.ssi:50
 msgid "Testing an ISO is simple:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:56 en/user_basics.ssi:144
-msgid "# apt-get install qemu"
+#: en/user_basics.ssi:54 en/user_basics.ssi:142
+#, no-wrap
+msgid " # apt-get install qemu\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:58
-msgid "$ qemu -cdrom binary.iso"
+#: en/user_basics.ssi:56
+#, no-wrap
+msgid " $ qemu -cdrom binary.iso\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:62
+#: en/user_basics.ssi:60
 msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:64
+#: en/user_basics.ssi:62
 msgid "In order to test the ISO with virtualbox-ose:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:68
-msgid "# apt-get install virtualbox-ose virtualbox-ose-dkms"
+#: en/user_basics.ssi:66
+#, no-wrap
+msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:70
-msgid "$ virtualbox"
+#: en/user_basics.ssi:68
+#, no-wrap
+msgid " $ virtualbox\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:74
+#: en/user_basics.ssi:72
 msgid ""
 "Create a new virtual machine, change the storage settings to use binary.iso "
 "as the CD/DVD device, and start the machine."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:76
+#: en/user_basics.ssi:74
 msgid ""
 "Note: For live systems containing X.org that you want to test with "
 "virtualbox-ose, you may wish to include the VirtualBox X.org driver package, "
@@ -358,37 +355,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:80
-msgid "# lb config --packages virtualbox-ose-guest-x11"
+#: en/user_basics.ssi:78
+#, no-wrap
+msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:84
+#: en/user_basics.ssi:82
 msgid "3~burning-iso-image Burning an ISO image to a physical medium"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:86
+#: en/user_basics.ssi:84
 msgid "Burning an ISO image is easy:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:90
-msgid "# apt-get install wodim"
+#: en/user_basics.ssi:88
+#, no-wrap
+msgid " # apt-get install wodim\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:92
-msgid "$ wodim binary.iso"
+#: en/user_basics.ssi:90
+#, no-wrap
+msgid " $ wodim binary.iso\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:94
 msgid "2~ Building a USB/HDD image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:98
+#: en/user_basics.ssi:96
 msgid ""
 "The following sequence of commands will create a basic USB/HDD image "
 "containing just the Debian standard system without X.org. It is suitable for "
@@ -400,7 +400,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:100
+#: en/user_basics.ssi:98
 msgid ""
 "Note: if you created an ISO image with the previous example, you will need "
 "to clean up your working directory with the #{lb clean}# command (see {The "
@@ -408,34 +408,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:104 en/user_basics.ssi:186
-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
-#: en/user_basics.ssi:108
+#: en/user_basics.ssi:106
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the #{config/}"
 "# hierarchy to create a USB/HDD image type:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:112
-msgid "$ lb config -b usb-hdd"
+#: en/user_basics.ssi:110
+#, no-wrap
+msgid " $ lb config -b usb-hdd\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:116
-msgid "Now build the image with the #{lb build} command:"
+#: en/user_basics.ssi:114 en/user_basics.ssi:198
+msgid "Now build the image with the #{lb build}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:124
+#: en/user_basics.ssi:122
 msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:126
+#: en/user_basics.ssi:124
 msgid ""
 "The generated binary image contains a VFAT partition and the syslinux "
 "bootloader, ready to be directly written on a USB stick. Plug in a USB stick "
@@ -443,12 +445,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:130
-msgid "$ dd if=binary.img of=${USBSTICK}"
+#: en/user_basics.ssi:128
+#, no-wrap
+msgid " $ dd if=binary.img of=${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:134
+#: en/user_basics.ssi:132
 msgid ""
 "where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
 "a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -457,35 +460,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:136
+#: en/user_basics.ssi:134
 #, no-wrap
 msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:136
 msgid ""
 "Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
-"type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images."
+"type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:140
+#: en/user_basics.ssi:138
 msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:146
-msgid "$ qemu -hda binary.img"
+#: en/user_basics.ssi:144
+#, no-wrap
+msgid " $ qemu -hda binary.img\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:148
 msgid "3~ Using the space left on a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:152
+#: en/user_basics.ssi:150
 msgid ""
 "If you want to use the remaining free space after you have installed the "
 "binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -494,45 +498,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:156
-msgid "# gparted ${USBSTICK}"
+#: en/user_basics.ssi:154
+#, no-wrap
+msgid " # gparted ${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:160
+#: en/user_basics.ssi:158
 msgid ""
 "After the creation of the partition, you have to create a filesystem on it. "
 "One possible choice would be ext4."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:164
-msgid "# mkfs.ext4 ${USBSTICK}"
+#: en/user_basics.ssi:162
+#, no-wrap
+msgid " # mkfs.ext4 ${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:168
+#: en/user_basics.ssi:166
 msgid "If you want to use this data partition with Windows, use FAT32."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:172
-msgid "# mkfs.vfat -F 32"
+#: en/user_basics.ssi:170
+#, no-wrap
+msgid " # mkfs.vfat -F 32\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:176
+#: en/user_basics.ssi:174
 #, no-wrap
 msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:176
 msgid "2~building-netboot-image Building a netboot image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:178
 msgid ""
 "The following sequence of commands will create a basic netboot image "
 "containing the Debian standard system without X.org. It is suitable for "
@@ -540,43 +547,38 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:182
+#: en/user_basics.ssi:180
 msgid ""
 "Note: if you performed any previous examples, you will need to clean up your "
 "working directory with the #{lb clean}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:190
+#: en/user_basics.ssi:188
 msgid ""
-"Run the #{lb config}# command with the parameters to configure the \"config/"
-"\" hierarchy to create our netboot image:"
+"Run the #{lb config}# command as follows to configure your image for "
+"netbooting:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:194
-msgid ""
-"$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
-"\"192.168.0.1\""
+#: en/user_basics.ssi:192
+#, 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
-#: en/user_basics.ssi:198
+#: en/user_basics.ssi:196
 msgid ""
-"In contrast with the ISO and USB/HDD images, netbooting does not support "
-"serving a filesystem image with the client, so the files must be served via "
-"NFS. The net-root-path and net-root-server options specify the location and "
-"server, respectively, of the NFS server where the filesytem image will be "
-"located at boot time."
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:200
-msgid "Now build the image with the #{lb build}# command:"
+"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
+"serve the filesystem image to the client, so the files must be served via "
+"NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the "
+"location and server, respectively, of the NFS server where the filesytem "
+"image will be located at boot time. Make sure these are set to suitable "
+"values for your network and server."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:206
 msgid ""
 "In a network boot, the client runs a small piece of software which usually "
 "resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -587,26 +589,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:208
 msgid ""
-"For example, if you unpack the generated binary-net.tar.gz archive in the /"
-"srv/debian-live directory, you'll find the filesystem image in live/"
-"filesystem.squashfs and the kernel, initrd and pxelinux bootloader in "
-"tftpboot/debian-live/i386."
+"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
+"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
+"in #{tftpboot/debian-live/i386}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:212
-msgid "We must now configure three services on the server to enable netboot."
+#: en/user_basics.ssi:210
+msgid ""
+"We must now configure three services on the server to enable netboot: the "
+"DHCP server, the TFTP server and the NFS server."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:212
 msgid "3~ DHCP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:214
 msgid ""
 "We must configure our network's DHCP server to be sure to give an IP address "
 "to the netbooting client system, and to advertise the location of the PXE "
@@ -614,109 +618,93 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:216
 msgid ""
 "Here is an example for inspiration, written for the ISC DHCP server #{isc-"
-"dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
+"dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:220
-msgid "% FIXME"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:224
 #, no-wrap
-msgid "subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
+msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:227
+#: en/user_basics.ssi:222
 #, no-wrap
-msgid ""
-"  # IP addresses available for guests\n"
-"  range 192.168.1.100 192.168.1.149;\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:230
-#, no-wrap
-msgid ""
-"  # allow booting from the net\n"
-"  allow bootp;\n"
+msgid " ddns-update-style none;\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:235
+#: en/user_basics.ssi:225
 #, no-wrap
 msgid ""
-"  # for net booting, server where the first file to be loaded (by TFTP\n"
-"  # protocol) (\"filename\" following definition) lies: so the TFTP\n"
-"  # server's name.\n"
-"  next-server myserver;\n"
+" 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:239
+#: en/user_basics.ssi:228
 #, no-wrap
 msgid ""
-"  # net boot configuration for guests with a PXE client:\n"
-"  if substring (option vendor-class-identifier, 0, 9) = \"PXEClient\" {\n"
-"    # Note: all files for PXE are relatives to the TFTP server's root\n"
+" default-lease-time 600;\n"
+" max-lease-time 7200;\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:242
+#: en/user_basics.ssi:230
 #, no-wrap
-msgid ""
-"    # PXE bootloader (first program to be loaded, by TFTP)\n"
-"    filename \"pxelinux.0\";\n"
+msgid " log-facility local7;\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:236
 #, no-wrap
 msgid ""
-"  }\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 ""
 
 #. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:240
 msgid "3~ TFTP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:242
 msgid "This serves the kernel and initial ramdisk to the system at run time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:253
+#: en/user_basics.ssi:244
 msgid ""
 "You should install the tftpd-hpa package. It can serve all files contained "
-"inside a root directory, usually /srv/tftp. To let it serve files inside /"
-"srv/debian-live/tftpboot, run as root the following command:"
+"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
+"#{/srv/debian-live/tftpboot}#, run as root the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:257
-msgid "dpkg-reconfigure -plow tftpd-hpa"
+#: en/user_basics.ssi:248
+#, no-wrap
+msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:252
 msgid "and fill in the new tftp server directory when being asked about it."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:254
 msgid "3~ NFS server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:256
 msgid ""
 "Once the guest computer has downloaded and booted a Linux kernel and loaded "
 "its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -724,161 +712,188 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:267
-msgid "You need to install the nfs-kernel-server package."
+#: en/user_basics.ssi:258
+msgid "You need to install the #{nfs-kernel-server}# package."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:260
 msgid ""
 "Then, make the filesystem image available through NFS by adding a line like "
-"the following to /etc/exports:"
+"the following to #{/etc/exports}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:273
-msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
+#: en/user_basics.ssi:264
+#, no-wrap
+msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:277
+#: en/user_basics.ssi:268
 msgid ""
 "and tell the NFS server about this new export with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:281
-msgid "# exportfs -rv"
+#: en/user_basics.ssi:272
+#, no-wrap
+msgid " # exportfs -rv\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:276
 msgid ""
 "Setting up these three services can be a little tricky. You might need some "
-"patience to get all of them working together. The Debian Installer Manual's "
-"TFTP Net Booting section at http://d-i.alioth.debian.org/manual/en.i386/"
-"ch04s05.html might help as that process is very similar."
+"patience to get all of them working together. For more information, see the "
+"syslinux wiki at http://syslinux.zytor.com/wiki/index.php/PXELINUX or the "
+"Debian Installer Manual's TFTP Net Booting section at http://d-i.alioth."
+"debian.org/manual/en.i386/ch04s05.html. They might help, as their processes "
+"are very similar."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:278
 msgid "3~ Netboot testing HowTo"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:280
 msgid ""
 "Netboot image creation is made easy with live-build magic, but testing the "
 "images on physical machines can be really time consuming."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:282
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:284
 msgid "3~ Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:295
-msgid "_* Install qemu, bridge-utils, sudo."
+#: en/user_basics.ssi:286
+msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:297
-msgid "Edit /etc/qemu-ifup:"
+#: en/user_basics.ssi:288
+msgid "Edit #{/etc/qemu-ifup}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:308
+#: 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
-#: en/user_basics.ssi:312
-msgid "Get, or build a grub-floppy-netboot (in the svn)."
+#: en/user_basics.ssi:303
+msgid "Get, or build a #{grub-floppy-netboot}# (in the svn)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:314
-msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
+#: en/user_basics.ssi:305
+msgid ""
+"Launch #{qemu}# with \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:307
 msgid "3~ VMWare Player"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:309
 msgid "_* Install VMWare Player (\"free as in beer\" edition)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:311
 msgid ""
-"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
+"_* Create a PXETester directory, and create a text file called #{pxe.vwx}# "
+"inside"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:313
 msgid "_* Paste this text inside:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:330
+#: 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:336
+#: 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:339
-msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
+#: en/user_basics.ssi:330
+#, no-wrap
+msgid ""
+" ethernet0.present = \"TRUE\"\n"
+" ethernet0.addressType = \"generated\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:342
-msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
+#: en/user_basics.ssi:333
+#, no-wrap
+msgid ""
+" displayName = \"Test Boot PXE\"\n"
+" guestOS = \"other\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:347
+#: 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
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:342
 msgid ""
-"_* You can play with this configuration file (i.e. change memory limit to "
+"_* You can play with this configuration file (e.g. change memory limit to "
 "256)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:353
+#: en/user_basics.ssi:344
 msgid ""
 "_* Double click on this file (or run VMWare player and select this file)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:354
+#: en/user_basics.ssi:345
 msgid "_* When running just press space if that strange question comes up..."
 msgstr ""
diff --git a/manual/pot/user_customization-contents.ssi.pot b/manual/pot/user_customization-contents.ssi.pot
index 72d5ed3..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-11-27 09:40-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"
@@ -18,124 +18,128 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: 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/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: 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/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
-#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
+#: 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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
-#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr ""
@@ -152,7 +156,13 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:6
-msgid "This chapter discusses further customization of the live system."
+msgid ""
+"This chapter discusses fine-tuning customization of the live system contents "
+"beyond merely choosing which packages to include. Includes allow you to add "
+"or replace arbitrary files in your Debian Live image, hooks allow you to "
+"execute arbitrary commands at different stages of the build and at boot "
+"time, and preseeding allows you to configure packages when they are "
+"installed by supplying answers to debconf questions."
 msgstr ""
 
 #. type: Plain text
@@ -163,77 +173,63 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-contents.ssi:10
 msgid ""
-"Using includes, it is possible to add (or replace) arbitrary files in your "
-"Debian Live image. live-build provides three mechanisms for using them:"
+"While ideally a Debian live system would include files entirely provided by "
+"unmodified Debian packages, it is sometimes convenient to provide or modify "
+"some content by means of files. Using includes, it is possible to add (or "
+"replace) arbitrary files in your Debian Live image. live-build provides "
+"three mechanisms for using them:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:12
 msgid ""
 "_* Chroot local includes: These allow you to add or replace files to the "
-"chroot/Live filesystem. Please see chroot-local-includes for more "
-"information."
+"chroot/Live filesystem. Please see {Live/chroot local includes}#live-chroot-"
+"local-includes for more information."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:14
-msgid "% FIXME: <xref linkend=\"chroot-local-includes\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:16
 msgid ""
 "_* Binary local includes: These allow you to add or replace files in the "
-"binary image. Please see binary-local-includes for more information."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:18
-msgid "% FIXME: <xref linkend=\"binary-local-includes\"/>"
+"binary image. Please see {Binary local includes}#binary-local-includes for "
+"more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:20
+#: en/user_customization-contents.ssi:16
 msgid ""
 "_* Binary includes: These allow you to add or replace Debian specific files "
 "in the binary image, such as the templates and tools directories. Please see "
-"binary-includes for more information."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:22
-msgid "% FIXME: <xref linkend=\"binary-includes\"/>"
+"{Binary includes}#binary-includes for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:18
 msgid ""
-"Please see terms for more information about the distinction between the "
-"\"Live\" and \"binary\" images."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:26
-msgid "% FIXME: <xref linkend=\"terms\"/>"
+"Please see {Terms}#terms for more information about the distinction between "
+"the \"Live\" and \"binary\" images."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:28
-msgid "3~ Live/chroot local includes"
+#: en/user_customization-contents.ssi:20
+msgid "3~live-chroot-local-includes Live/chroot local includes"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:30
+#: en/user_customization-contents.ssi:22
 msgid ""
 "Chroot local includes can be used to add or replace files in the chroot/Live "
-"filesystem so that they are visible when the Live system is booted. Typical "
-"uses for them are to populate the skeleton user directory (#{/etc/skel}#) "
-"used by the live system to create the live user's home directory, or adding "
-"configuration files where additional processing is not required."
+"filesystem so that they may be used in the Live system. A typical use is to "
+"populate the skeleton user directory (#{/etc/skel}#) used by the Live system "
+"to create the live user's home directory. Another is to supply configuration "
+"files that can be simply added or replaced in the image without processing; "
+"see {Live/chroot local hooks}#live-chroot-local-hooks if processing is "
+"needed."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:32
+#: en/user_customization-contents.ssi:24
 msgid ""
 "To include files, simply add them to your #{config/chroot_local-includes}# "
 "directory. This directory corresponds to the root directory (#{/}#) of the "
@@ -242,53 +238,70 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:37
+#: 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
-#: en/user_customization-contents.ssi:41
+#: en/user_customization-contents.ssi:33
 msgid "Your configuration will then have the following layout:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:52
+#: 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
-#: en/user_customization-contents.ssi:56
+#: en/user_customization-contents.ssi:48
 msgid ""
 "Chroot local includes are installed after package installation so that files "
 "installed by packages are overwritten."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:58
-msgid "3~ Binary local includes"
+#: en/user_customization-contents.ssi:50
+msgid "3~binary-local-includes Binary local includes"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:60
+#: en/user_customization-contents.ssi:52
 msgid ""
-"The same way as chroot local includes work, there exists the corresponding "
-"mechanism to include files in the live media itself."
+"To include material such as documentation or videos on the media filesystem "
+"so that it is accessible immediately upon insertion of the media without "
+"booting the Live system, you can use binary local includes. This works in a "
+"similar fashion to chroot local includes. For example, suppose the files #{~/"
+"video_demo.*}# are demo videos of the live system described by and linked to "
+"by an HTML index page. Simply copy the material to #{config/binary_local-"
+"includes/} as follows:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:56
+#, no-wrap
+msgid " $ cp ~/video_demo.* config/binary_local-includes/\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:60
+msgid "These files will now appear in the root directory of the live media."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:62
-msgid "3~ Binary includes"
+msgid "3~binary-includes Binary includes"
 msgstr ""
 
 #. type: Plain text
@@ -300,28 +313,37 @@ 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
 #: en/user_customization-contents.ssi:72
-msgid "2~ Hooks"
+msgid ""
+"Otherwise, the material will be installed by live-build in #{/includes/}# by "
+"default on the media filesystem, or else you can specify an alternate path "
+"with #{--includes}#."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:74
+msgid "2~ Hooks"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:76
 msgid ""
 "Hooks allow commands to be performed in the chroot and binary stages of the "
 "build in order to customize the image."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:76
-msgid "3~ Live/chroot local hooks"
+#: en/user_customization-contents.ssi:78
+msgid "3~live-chroot-local-hooks Live/chroot local hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:78
+#: en/user_customization-contents.ssi:80
 msgid ""
 "To run commands in the chroot stage, create a hook script containing the "
 "commands in the #{config/chroot_local-hooks}# directory. The hook will run "
@@ -334,12 +356,30 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:80
+#: en/user_customization-contents.ssi:82
+msgid "3~ Boot-time hooks"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:84
+msgid ""
+"To execute commands at boot time, you can supply live-config hooks as "
+"explained in the \"Customization\" section of its man page. Examine live-"
+"config's own hooks provided in #{/lib/live/config/}#, noting the sequence "
+"numbers. Then provide your own hook prefixed with an appropriate sequence "
+"number, either as a chroot local include in #{config/chroot_local-includes/"
+"lib/live/config/}#, or as a custom package as discussed in {Installing "
+"modified or third-party packages}#installing-modified-or-third-party-"
+"packages."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:86
 msgid "3~ Binary local hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:82
+#: en/user_customization-contents.ssi:88
 msgid ""
 "To run commands in the binary stage, create a hook script containing the "
 "commands in the #{config/binary_local-hooks}#. The hook will run after all "
@@ -352,12 +392,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:84
+#: en/user_customization-contents.ssi:90
 msgid "2~ Preseeding Debconf questions"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:86
+#: en/user_customization-contents.ssi:92
 msgid ""
 "Files in the #{config/chroot_local-preseed}# directory are considered to be "
 "debconf preseed files and are installed by live-build using #{debconf-set-"
@@ -365,7 +405,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-contents.ssi:87
+#: en/user_customization-contents.ssi:93
 msgid ""
 "For more information about debconf, please see debconf(7) in the #{debconf}# "
 "package."
diff --git a/manual/pot/user_customization-installer.ssi.pot b/manual/pot/user_customization-installer.ssi.pot
index 454af8e..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-11-30 10:53+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"
@@ -17,6 +17,134 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: 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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
+msgid "code{"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: 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: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
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
+msgid "}code"
+msgstr ""
+
+#. type: Plain text
 #: en/user_customization-installer.ssi:2
 msgid ":B~ Customizing Debian Installer"
 msgstr ""
@@ -30,8 +158,8 @@ msgstr ""
 #: en/user_customization-installer.ssi:6
 msgid ""
 "Debian Live system images can be integrated with Debian Installer. There are "
-"number of different \"types\" of installation, varying in what and how to "
-"install the image."
+"a number of different types of installation, varying in what is included and "
+"how the installer operates."
 msgstr ""
 
 #. type: Plain text
@@ -45,77 +173,132 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:10
-msgid "The three main types of installer are:"
+msgid "2~ Types of Debian Installer"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:12
-msgid ""
-"_* *{\"Regular\" Debian Installer}*: This is a normal Debian Live image with "
-"a seperate kernel and initrd which (when selected from the appropriate "
-"bootloader) launches into a standard Debian Installer instance, just as if "
-"you had downloaded a CD image of Debian and booted it. Images containing a "
-"live system and such an otherwise indepentend installer are often referet to "
-"as \"combined images\"."
+msgid "The three main types of installer are:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:14
+#, no-wrap
+msgid "*{\"Regular\" Debian Installer}*: This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as \"combined images\".\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:16
 msgid ""
 "On such images, Debian is installed by fetching and installing .deb packages "
 "using #{debootstrap}# or #{cdebootstrap}#, from the local media or some "
-"network-base network, resulting in a standard Debian system being installed "
+"network-based network, resulting in a standard Debian system being installed "
 "to the hard disk."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:16
+#: en/user_customization-installer.ssi:18
 msgid ""
 "This whole process can be preseeded and customized in a number of ways; see "
 "the relevant pages in the Debian Installer manual for more information. Once "
-"you have a working preseeding file, live-build can automatically place it to "
+"you have a working preseeding file, live-build can automatically put it in "
 "the image and enable it for you."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:18
-msgid ""
-"_* *{\"Live\" Debian Installer}*: This is a Debian Live image with a "
-"seperate kernel and initrd which (when selected from the appropriate "
-"bootloader) launches into an instance of the Debian Installer."
+#: en/user_customization-installer.ssi:20
+#, no-wrap
+msgid "*{\"Live\" Debian Installer}*: This is a Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into an instance of the Debian Installer.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:20
+#: en/user_customization-installer.ssi:22
 msgid ""
 "Installation will proceed in an identical fashion to the \"Regular\" "
 "installation described above, but at the actual package installation stage, "
-"instead of using #{debootstrap}# to fetch and install packages, the \"live\" "
-"filesystem image is copied to the target. This is acchieved with a special "
-"udeb called live-installer. live-installer can be preseeded to be disabled, "
-"allowing to support normal and live installer entries in the bootloader of "
-"the same live media."
+"instead of using #{debootstrap}# to fetch and install packages, the live "
+"filesystem image is copied to the target. This is achieved with a special "
+"udeb called live-installer."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:22
+#: en/user_customization-installer.ssi:24
 msgid ""
 "After this stage, the Debian Installer continues as normal, installing and "
 "configuring items such as bootloaders and local users, etc."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:24
+#: en/user_customization-installer.ssi:26
+msgid ""
+"Note: to support both normal and live installer entries in the bootloader of "
+"the same live media, you must disable live-installer by preseeding #{live-"
+"installer/enable=false}."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:28
+#, no-wrap
+msgid "*{\"Desktop\" Debian Installer}*: Regardless of the type of Debian Installer included, #{d-i}# can be launched from the Desktop by clicking on an icon. This is user friendlier in some situations. In order to make use of this, the debian-installer-launcher package needs to be included.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:30
+msgid ""
+"Note that by default, live-build does not include Debian Installer images in "
+"the images, it needs to be specifically enabled with #{lb config}#. Also, "
+"please note that for the \"Desktop\" installer to work, the kernel of the "
+"live system must match the kernel #{d-i}# uses for the specified "
+"architecture. For example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:35
+#, no-wrap
+msgid ""
+" $ 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:39
+msgid "2~ Customizing Debian Installer by preseeding"
+msgstr ""
+
+#. type: Plain text
+#: 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 "
+"answers to questions asked during the installation process, without having "
+"to manually enter the answers while the installation is running. This makes "
+"it possible to fully automate most types of installation and even offers "
+"some features not available during normal installations.\" This kind of "
+"customization is best accomplished with live-build by placing the "
+"configuration in a #{preseed.cfg}# file included in #{config/binary_debian-"
+"installer/}#. For example, to preseed setting the locale to #{en_US}#:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:46
+#, no-wrap
 msgid ""
-"_* *{\"Desktop\" Debian Installer}*: Regardless of the mode Debian Installer "
-"is used in, d-i can be launched from the Desktop by clicking on an icon. "
-"This is user friendlier in some situations. In order to make use of this, "
-"the debian-installer-launcher package needs to be included."
+" $ 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:50
+msgid "2~ Customizing Debian Installer content"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-installer.ssi:25
+#: en/user_customization-installer.ssi:52
 msgid ""
-"Note that by default live-build does not include Debian Installer images in "
-"the images, it needs to be specifically enabled with lb config."
+"For experimental or debugging purposes, you might want to include locally "
+"built #{d-i}# component udeb packages. Place these in #{config/binary_local-"
+"udebs/}# to include them in the image. Additional or replacement files and "
+"directories may be included in the installer initrd as well, in a similar "
+"fashion to {Live/chroot local includes}#live-chroot-local-includes, by "
+"placing the material in #{config/binary_debian-installer-includes/}#."
 msgstr ""
diff --git a/manual/pot/user_customization-internationalization.ssi.pot b/manual/pot/user_customization-internationalization.ssi.pot
deleted file mode 100644
index 136e237..0000000
--- a/manual/pot/user_customization-internationalization.ssi.pot
+++ /dev/null
@@ -1,222 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-27 09:40-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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: 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/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/project_bugs.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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
-#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
-#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
-msgid "code{"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
-#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
-#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
-msgid "}code"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:2
-msgid ":B~ Customizing locale and language"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:4
-msgid "1~customizing-locale-and-language Customizing locale and language"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:6
-msgid "2~ Default locale and keyboard"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:8
-msgid ""
-"The default locale when building a Live system is \"locales=en_US.UTF-8\", "
-"to set the locale for e.g. Switzerland, you can use \"locales=de_CH.UTF-8\"."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:12
-msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:16
-msgid "The entry for a Swiss-German keyboard would be:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:20
-msgid "$ lb config --bootappend-live \"keyboard-layouts=ch\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:24
-msgid "Combined, the keyboard and locale configured for Switzerland would be:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:28
-msgid ""
-"$ lb config --bootappend-live =\"locales=de_CH.UTF-8 keyboard-layouts=ch\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:32
-msgid ""
-"Note: You can find a list of options in the manpage for live-config. "
-"Currently, only UTF-8 locales are supported."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:34
-msgid "2~ l10n Packages"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:36
-msgid ""
-"An experimental feature of live-build is to automatically check for each "
-"package for which it is know that there are -l10n packages available and "
-"install them. To add German packages the entry would be"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:40
-msgid "$ lb config --language \"de\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:43
-msgid ""
-"This will also change the default syslinux language if translations are "
-"available or local translations have been put into #{config/templates/"
-"syslinux/de}#."
-msgstr ""
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index 9765937..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-01 21:10-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,32 +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/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
+#: 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
@@ -58,25 +50,29 @@ msgstr ""
 #: en/user_customization-packages.ssi:185
 #: en/user_customization-packages.ssi:199
 #: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
 #: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:321 en/user_customization-runtime.ssi:12
-#: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
-#: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
-#: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
-#: en/user_customization-runtime.ssi:92 en/user_customization-runtime.ssi:101
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
 #: en/user_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_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:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:108
-#: en/user_installation.ssi:126 en/user_installation.ssi:141
-#: en/user_managing_a_configuration.ssi:24
+#: 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,32 +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:173 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
+#: 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
@@ -126,25 +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:285
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
 #: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:334 en/user_customization-runtime.ssi:16
-#: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: 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_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:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:112
-#: en/user_installation.ssi:131 en/user_installation.ssi:144
-#: en/user_managing_a_configuration.ssi:31
+#: 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
@@ -208,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
@@ -223,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
@@ -282,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
@@ -315,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
@@ -346,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
@@ -378,8 +373,9 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:82
-msgid "$ lb config --repository live.debian.net"
+#: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
+#, no-wrap
+msgid " $ lb config --repository live.debian.net\n"
 msgstr ""
 
 #. type: Plain text
@@ -414,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
@@ -465,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
@@ -561,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
@@ -589,20 +590,27 @@ 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
 #: en/user_customization-packages.ssi:163
 msgid ""
-"You may test for any one of a number of values, e.g. to install #"
-"{memtest86+ }# if either #{--architecture i386}# or #{--architecture amd64}# "
-"is specified:"
+"You may test for any one of a number of values, e.g. to install #{memtest86+}"
+"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
 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
@@ -615,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
@@ -625,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
@@ -651,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
@@ -673,11 +690,11 @@ msgstr ""
 msgid ""
 "Desktop and language tasks are special cases. In the Debian Installer, if "
 "the medium was prepared for a particular desktop environment flavour, the "
-"corresponding task will be automatically installed. Thus, there are there "
-"are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}"
-"# tasks, none of which are offered in #{tasksel}#'s menu. Likewise, there "
-"are no menu entries for tasks for languages, but the user's language choice "
-"during the install influences the selection of corresponding language tasks."
+"corresponding task will be automatically installed. Thus, there are #{gnome-"
+"desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}# tasks, "
+"none of which are offered in #{tasksel}#'s menu. Likewise, there are no menu "
+"entries for tasks for languages, but the user's language choice during the "
+"install influences the selection of corresponding language tasks."
 msgstr ""
 
 #. type: Plain text
@@ -699,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
@@ -710,27 +727,51 @@ msgid ""
 "the desktop flavours mentioned above, which select the #{standard-x11}# "
 "predefined package list, the corresponding #{*-desktop}# task and three "
 "additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example, "
-"if you specify #{--packages gnome-desktop}#, it is equivalent to specifying #"
-"{--packages standard-x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
+"if you specify #{--packages-lists gnome-desktop}#, it is equivalent to "
+"specifying #{--packages debian-installer-launcher --packages-lists standard-"
+"x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:223
 msgid ""
 "Third, if any of the tasks for these desktop flavours are selected, either "
-"explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build "
-"will preseed the corresponding desktop value for Debian Installer (if it is "
-"included) to ensure it follows its own rules for installing different "
+"explicitly through #{--tasks}# or implicitly by #{--packages-lists}#, live-"
+"build will preseed the corresponding desktop value for Debian Installer (if "
+"it is included) to ensure it follows its own rules for installing different "
 "desktop flavours."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:225
-msgid "2~ Installing modified or third-party packages"
+#, no-wrap
+msgid "*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are in
 stalled. For example:\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:229
+#, no-wrap
+msgid " $ lb config --language es\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:233
+msgid ""
+"Even so, it is limited in that it only supports a single language and a "
+"single bootloader. Therefore, for all of these reasons, the future of this "
+"option is under review, possibly to be replaced with something entirely "
+"different in the next major release of live-build."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:235
+msgid ""
+"2~installing-modified-or-third-party-packages Installing modified or third-"
+"party packages"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:237
 msgid ""
 "Whilst it is against the philosophy of Debian Live, it may sometimes be "
 "necessary to build a Live system with modified versions of packages that are "
@@ -741,7 +782,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:239
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -752,22 +793,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:241
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:243
 msgid "_* #{chroot_local-packages}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:245
 msgid "_* Using a custom APT repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:247
 msgid ""
 "Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
 "off\" customizations but has a number of drawbacks, whilst using a custom "
@@ -775,12 +816,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:249
 msgid "3~ Using #{chroot_local-packages}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:251
 msgid ""
 "To install a custom package, simply copy it to the #{config/chroot_local-"
 "packages/}# directory. Packages that are inside this directory will be "
@@ -789,45 +830,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:253
 msgid ""
 "Packages *{must}* be named in the prescribed way. One simple way to do this "
 "is to use #{dpkg-name}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:255
 msgid ""
 "Using #{chroot_local-packages}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:257
 msgid "_* It is not possible to use secure APT."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:259
 msgid ""
 "_* You must install all appropriate packages in the #{config/chroot_local-"
 "packages/}# directory."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:261
 msgid ""
 "_* It does not lend itself to storing Debian Live configurations in revision "
 "control."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:263
 msgid "3~ Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:265
 msgid ""
 "Unlike using #{chroot_local-packages}#, when using a custom APT repository "
 "you must ensure that you specify the packages elsewhere. See {Choosing "
@@ -835,7 +876,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:267
 msgid ""
 "Whilst it may seem unnecessary effort to create an APT repository to install "
 "custom packages, the infrastructure can be easily re-used at a later date to "
@@ -843,12 +884,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:269
 msgid "3~ Custom packages and APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:271
 msgid ""
 "live-build uses APT to install all packages into the live system so will "
 "therefore inherit behaviours from this program. One relevant example is that "
@@ -858,7 +899,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:273
 msgid ""
 "Because of this, you may wish to increment the version number in your custom "
 "packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -868,12 +909,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:275
 msgid "2~ Configuring APT at build time"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:277
 msgid ""
 "You can configure APT through a number of options applied only at build "
 "time. (APT configuration used in the running live system may be configured "
@@ -884,12 +925,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:279
 msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:281
 msgid ""
 "You can elect to use either #{apt}# or #{aptitude}# when installing packages "
 "at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -899,26 +940,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283
 msgid ""
 "_* #{apt}#: With this method, if a missing package is specified, the package "
 "installation will fail. This is the default setting."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:285
 msgid ""
 "_* #{aptitude}#: With this method, if a missing package is specified, the "
 "package installation will succeed."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287
 msgid "3~ Using a proxy with APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:279
+#: en/user_customization-packages.ssi:289
 msgid ""
 "One commonly required APT configuration is to deal with building an image "
 "behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -926,17 +967,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:283
-msgid "lb config --apt-http-proxy http://proxy/"
+#: en/user_customization-packages.ssi:293
+#, no-wrap
+msgid " $ lb config --apt-http-proxy http://proxy/\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:287
+#: en/user_customization-packages.ssi:297
 msgid "3~ Tweaking APT to save space"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:299
 msgid ""
 "You may find yourself needing to save some space on the image media, in "
 "which case one or the other or both of the following options may be of "
@@ -944,19 +986,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:301
 msgid ""
 "If you don't want to include APT indices in the image, you can omit those "
 "with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:295
-msgid "$ lb config --binary-indices false"
+#: en/user_customization-packages.ssi:305
+#, no-wrap
+msgid " $ lb config --binary-indices false\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:299
+#: en/user_customization-packages.ssi:309
 msgid ""
 "This will not influence the entries in /etc/apt/sources.list, but merely "
 "whether /var/lib/apt contains the indices files or not. The tradeoff is that "
@@ -966,36 +1009,41 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:301
+#: en/user_customization-packages.ssi:311
 msgid ""
 "If you find the installation of recommended packages bloats your image too "
 "much, you may disable that default option of APT with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:305
-msgid "$ lb config --apt-recommends false"
+#: en/user_customization-packages.ssi:315
+#, no-wrap
+msgid " $ lb config --apt-recommends false\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:319
 msgid ""
-"The tradeoff here is that recommended packages are defined as \"packages "
-"that would be found together with this one in all but unusual installations"
-"\" (Debian Policy Manual, 7.2). This may lead to some packages that you "
-"actually need being omitted, so we suggest you review the difference this "
-"makes to your packages list (see the #{binary.packages}# file generated by #"
-"{lb build}#) and re-include in your list any missing packages that you still "
-"want installed."
+"The tradeoff here is that if you don't install recommended packages for a "
+"given package, that is, \"packages that would be found together with this "
+"one in all but unusual installations\" (Debian Policy Manual, 7.2), some "
+"packages that you actually need may be omitted. Therefore, we suggest you "
+"review the difference turning off recommends makes to your packages list "
+"(see the #{binary.packages}# file generated by #{lb build}#) and re-include "
+"in your list any missing packages that you still want installed. "
+"Alternatively, if you find you only want a small number of recommended "
+"packages left out, leave recommends enabled and set a negative APT pin "
+"priority on selected packages to prevent them from being installed, as "
+"explained in {APT pinning}#apt-pinning."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:321
 msgid "3~ Passing options to apt or aptitude"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:323
 msgid ""
 "If there is not an #{lb config}# option to alter APT's behaviour in the way "
 "you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -1004,12 +1052,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:315
+#: en/user_customization-packages.ssi:325
 msgid "3~apt-pinning APT pinning"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:327
 msgid ""
 "For background, please first read the #{apt_preferences(5)}# man page. APT "
 "pinning can be configured either for build time, or else for run time. For "
@@ -1018,7 +1066,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:329
 msgid ""
 "Let's say you are building a Squeeze live system but need all #{live-*}# "
 "packages to be installed from Sid at build time. You need to add Sid to your "
@@ -1028,14 +1076,42 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:327
+#: 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:332
-msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
+#: en/user_customization-packages.ssi:342
+#, 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
+msgid ""
+"Negative pin priorities will prevent a package from being installed, as in "
+"the case where you do not want a package that is recommended by another "
+"package. Suppose you are building a GNOME image but don't want the user "
+"prompted to store wifi passwords in the keyring, so you want to omit the "
+"recommended #{gnome-keyring}# package. This can be done by adding the "
+"following stanza to #{config/chroot_apt/preferences}#:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:352
+#, no-wrap
+msgid ""
+" Package: gnome-keyring\n"
+" Pin: version *\n"
+" Pin-Priority: -1\n"
 msgstr ""
diff --git a/manual/pot/user_customization-runtime.new.ssi.pot b/manual/pot/user_customization-runtime.new.ssi.pot
deleted file mode 100644
index 20c1fe3..0000000
--- a/manual/pot/user_customization-runtime.new.ssi.pot
+++ /dev/null
@@ -1,647 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-12-02 20:07-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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi: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/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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:293
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:321
-#: en/user_customization-runtime.new.ssi:14
-#: en/user_customization-runtime.new.ssi:34
-#: en/user_customization-runtime.new.ssi:42
-#: en/user_customization-runtime.new.ssi:50
-#: en/user_customization-runtime.new.ssi:64
-#: en/user_customization-runtime.new.ssi:76
-#: en/user_customization-runtime.new.ssi:86
-#: en/user_customization-runtime.new.ssi:94
-#: en/user_customization-runtime.new.ssi:102
-#: en/user_customization-runtime.new.ssi:110
-#: en/user_customization-runtime.new.ssi:130
-#: en/user_customization-runtime.new.ssi:138
-#: en/user_customization-runtime.new.ssi:147
-#: en/user_customization-runtime.ssi:12 en/user_customization-runtime.ssi:30
-#: en/user_customization-runtime.ssi:40 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:56 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:92
-#: en/user_customization-runtime.ssi:101 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:141 en/user_managing_a_configuration.ssi:24
-#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47
-#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
-msgid "code{"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:173 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/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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:297
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:334
-#: en/user_customization-runtime.new.ssi:18
-#: en/user_customization-runtime.new.ssi:38
-#: en/user_customization-runtime.new.ssi:46
-#: en/user_customization-runtime.new.ssi:54
-#: en/user_customization-runtime.new.ssi:68
-#: en/user_customization-runtime.new.ssi:80
-#: en/user_customization-runtime.new.ssi:90
-#: en/user_customization-runtime.new.ssi:98
-#: en/user_customization-runtime.new.ssi:106
-#: en/user_customization-runtime.new.ssi:114
-#: en/user_customization-runtime.new.ssi:134
-#: en/user_customization-runtime.new.ssi:143
-#: en/user_customization-runtime.new.ssi:152
-#: en/user_customization-runtime.ssi:16 en/user_customization-runtime.ssi:34
-#: en/user_customization-runtime.ssi:44 en/user_customization-runtime.ssi:52
-#: en/user_customization-runtime.ssi:60 en/user_customization-runtime.ssi:68
-#: en/user_customization-runtime.ssi:88 en/user_customization-runtime.ssi:97
-#: en/user_customization-runtime.ssi:106 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:31
-#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
-msgid "}code"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:8
-#: en/user_customization-runtime.new.ssi:32
-msgid ""
-"The default locale when building a Live system is \"locales=en_US.UTF-8\", "
-"to set the locale for e.g. Switzerland, you can use \"locales=de_CH.UTF-8\"."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:12
-#: en/user_customization-runtime.new.ssi:36
-msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:16
-#: en/user_customization-runtime.new.ssi:40
-msgid "The entry for a Swiss-German keyboard would be:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:20
-#: en/user_customization-runtime.new.ssi:44
-msgid "$ lb config --bootappend-live \"keyboard-layouts=ch\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:24
-#: en/user_customization-runtime.new.ssi:48
-msgid "Combined, the keyboard and locale configured for Switzerland would be:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:28
-#: en/user_customization-runtime.new.ssi:52
-msgid ""
-"$ lb config --bootappend-live =\"locales=de_CH.UTF-8 keyboard-layouts=ch\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:32
-#: en/user_customization-runtime.new.ssi:56
-msgid ""
-"Note: You can find a list of options in the manpage for live-config. "
-"Currently, only UTF-8 locales are supported."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:40
-#: en/user_customization-runtime.new.ssi:66
-msgid "$ lb config --language \"de\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-internationalization.ssi:43
-#: en/user_customization-runtime.new.ssi:70
-msgid ""
-"This will also change the default syslinux language if translations are "
-"available or local translations have been put into #{config/templates/"
-"syslinux/de}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:2
-msgid ":B~ Customizing run time behaviours"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:4
-msgid "1~customizing-run-time-behaviours Customizing run time behaviours"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:6
-msgid ""
-"All configuration that is done during run time is done by live-config. Here "
-"are some most common options of live-config that users are interested in. A "
-"full list of all possibilities can be found in the manpage of live-config."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:8
-msgid "2~ Customizing the live user"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:10
-msgid ""
-"One important consideration is that the live user is created by live-boot at "
-"boot time, not by live-build at build time. This not only influences where "
-"materials relating to the live user are introduced in your build, as "
-"discussed in {Live/chroot local includes}#live-chroot-local-includes, but "
-"also any groups and permissions associated with the live user."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:12
-#: en/user_customization-runtime.ssi:10
-msgid ""
-"You can specify additional groups that the live user will belong to by "
-"preseeding the #{passwd/user-default-groups}# debconf value. For example, to "
-"add the live user to the #{fuse}# group, add the following to a file in the #"
-"{config/chroot_local-preseed}# directory:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:16
-#: en/user_customization-runtime.ssi:14
-msgid ""
-"debconf passwd/user-default-groups string audio cdrom dialout floppy video "
-"plugdev netdev powerdev fuse"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:20
-msgid "2~customizing-locale-and-language Customizing locale and language"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:22
-#: en/user_customization-runtime.ssi:20
-msgid "When the live system boots, language is involved in three steps:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:24
-#: en/user_customization-runtime.ssi:22
-msgid "_* the locale generation"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:26
-#: en/user_customization-runtime.ssi:24
-msgid "_* setting the keyboard layout for the console"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:28
-#: en/user_customization-runtime.ssi:26
-msgid "_* setting the keyboard layout for X"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:30
-msgid "3~ Default locale and keyboard"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:58
-msgid "3~ l10n Packages"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:60
-msgid ""
-"% FIXME: not a run time configuration! Belongs in packages chapter. (See --"
-"tasks discussion.)"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:62
-msgid ""
-"An experimental feature of live-build is to automatically check for each "
-"package for which it is known that there are #{*-l10n}# packages available "
-"and install them. To add German packages the entry would be"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:72
-msgid "3~ Language"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:74
-msgid ""
-"To define the locale that should be generated, use the #{locales}# parameter "
-"into the #{--bootappend-live}# option of #{lb config}#, e.g.:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:78
-#: en/user_customization-runtime.ssi:32
-msgid "lb config --bootappend-live \"locales=de_CH.UTF-8\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:82
-#: en/user_customization-runtime.ssi:36
-msgid ""
-"This parameter can also be used in kernel command line. You can specify a "
-"locale by a full #{language_country.encoding}# word."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:84
-#: en/user_customization-runtime.ssi:38
-msgid ""
-"Both the console and X keyboard configuration depends on the #{keyb}# "
-"parameter of the #{--bootappend-live}# option. Valid options for X keyboard "
-"layouts can be found in #{/etc/X11/xkb/base.xml}# (rather limited to two-"
-"letters country codes). To find the value (the two characters) corresponding "
-"to a language try searching for the english name of the nation where the "
-"language is spoken, e.g:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:88
-#: en/user_customization-runtime.ssi:42
-msgid "$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name <name>se</name>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:92
-#: en/user_customization-runtime.ssi:46
-msgid ""
-"To get the locale files for German and Swiss German keyboard layout in X use:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:96
-#: en/user_customization-runtime.ssi:50
-msgid "lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:100
-#: en/user_customization-runtime.ssi:54
-msgid ""
-"A list of the valid values of the keyboards for the console can be figured "
-"with the following command:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:104
-#: en/user_customization-runtime.ssi:58
-msgid ""
-"for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); do basename $i | "
-"head -c -9; echo; done | sort | less"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:108
-#: en/user_customization-runtime.ssi:62
-msgid ""
-"Alternatively, you can use the #{console-setup}# package, a tool to let you "
-"configure console layout using X (XKB) definitions; you can then setup your "
-"keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}"
-"#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use "
-"also these parameters for X configuration. For example, to set up a French "
-"system with a French-Dvorak layout (called Bepo) on a TypeMatrix keyboard, "
-"both in console and X11, use:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:112
-#: en/user_customization-runtime.ssi:66
-msgid ""
-"lb config --bootappend-live \"locales=fr_FR.UTF-8 keyboard-layouts=fr "
-"keyboard-variant=bepo keyboard-model=tm2030usb\""
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:116
-#: en/user_customization-runtime.ssi:70
-msgid "2~ Persistence"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:118
-#: en/user_customization-runtime.ssi:72
-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 "
-"of the host hardware which runs it."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:120
-#: en/user_customization-runtime.ssi:74
-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 "
-"should be considered read-only and all the run-time evolutions of the system "
-"are lost at shutdown."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:122
-#: en/user_customization-runtime.ssi:76
-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 "
-"understand how it could work it could be handy to know that even if the "
-"system is booted and run from read-only media, modification to the files and "
-"directories are written on writable media, typically a ram disk (tmpfs) and "
-"ram disks' data do not survive reboots."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:124
-#: en/user_customization-runtime.ssi:78
-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 "
-"multisession (re)writable CD/DVD. All these media are supported in Debian "
-"Live in different ways, and all but the last one require a special boot "
-"parameter to be specified at boot time: #{persistent}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:126
-#: en/user_customization-runtime.ssi:80
-msgid "3~ Full persistence"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:128
-#: en/user_customization-runtime.ssi:82
-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 "
-"writable partition is used. In order to use this feature a partition with a "
-"clean writable supported filesystem on it labeled \"live-rw\" must be "
-"attached on the system at boot time and the system must be started with the "
-"boot parameter 'persistent'. This partition could be an ext2 partition on "
-"the hard disk or on a usb key created with, e.g.:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:132
-#: en/user_customization-runtime.ssi:86
-msgid "# mkfs.ext2 -L live-rw /dev/sdb1"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:136
-#: en/user_customization-runtime.ssi:90
-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.new.ssi:141
-#: en/user_customization-runtime.ssi:95
-msgid ""
-"# tune2fs -L live-rw /dev/sdb1 # for ext2,3,4 filesystems # dosfslabel /dev/"
-"sdb1 live-rw # for a fat filesystem"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:145
-#: en/user_customization-runtime.ssi:99
-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 "
-"could be also used with just image files, so you could create a file "
-"representing a partition and put this image file even on a NTFS partition of "
-"a foreign OS, with something like:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:150
-#: en/user_customization-runtime.ssi:104
-msgid ""
-"$ dd if=/dev/null of=live-rw bs=1G seek=1 # for a 1GB sized image file $ /"
-"sbin/mkfs.ext2 -F live-rw"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:154
-#: en/user_customization-runtime.ssi:108
-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.new.ssi:156
-#: en/user_customization-runtime.ssi:110
-msgid "3~ Home automounting"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:158
-#: en/user_customization-runtime.ssi:112
-msgid ""
-"If during the boot a partition (filesystem) image file or a partition "
-"labeled #{home-rw}# is discovered, this filesystem will be directly mounted "
-"as #{/home}#, thus permitting persistence of files that belong to e.g. the "
-"default user. It can be combined with full persistence."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:160
-#: en/user_customization-runtime.ssi:114
-msgid "3~ Snapshots"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:162
-#: en/user_customization-runtime.ssi:116
-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 "
-"(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The "
-"content of a snapshot could reside on a partition or an image file (like the "
-"above mentioned types) labeled #{live-sn}#, but it defaults to a simple cpio "
-"archive named #{live-sn.cpio.gz}#. As above, at boot time, the block devices "
-"connected to the system are traversed to see if a partition or a file named "
-"like that could be found. A power interruption during run time could lead to "
-"data loss, hence a tool invoked #{live-snapshot --refresh}# could be called "
-"to sync important changes. This type of persistence, since it does not write "
-"continuously to the persistent media, is the most flash-based device "
-"friendly and the fastest of all the persistence systems."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:164
-#: en/user_customization-runtime.ssi:118
-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.new.ssi:166
-#: en/user_customization-runtime.ssi:120
-msgid ""
-"Snapshots cannot currently handle file deletion but full persistence and "
-"home automounting can."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:168
-#: en/user_customization-runtime.ssi:122
-msgid "3~ Persistent SubText"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:170
-#: en/user_customization-runtime.ssi:124
-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-"
-"work}#, the boot parameter #{persistent-subtext}# used in conjuntion with "
-"the boot parameter #{persistent}# will allow for multiple but unique "
-"persistent media. An example would be if a user wanted to use a persistent "
-"partition labeled #{live-sn-subText}# they would use the boot parameters of: "
-"#{persistent}# #{persistent-subtext=subText}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:172
-#: en/user_customization-runtime.ssi:126
-msgid "3~ Partial remastering"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.new.ssi:173
-#: en/user_customization-runtime.ssi:127
-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 "
-"case of cd-r or adding a session to multisession cd/dvd(rw); live-boot "
-"mounts all /live filesystem in order or with the module boot parameter."
-msgstr ""
diff --git a/manual/pot/user_customization-runtime.ssi.pot b/manual/pot/user_customization-runtime.ssi.pot
index 76cf970..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-02 20:07-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,32 +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/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
+#: 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
@@ -58,38 +50,29 @@ msgstr ""
 #: en/user_customization-packages.ssi:185
 #: en/user_customization-packages.ssi:199
 #: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
 #: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:321
-#: en/user_customization-runtime.new.ssi:14
-#: en/user_customization-runtime.new.ssi:34
-#: en/user_customization-runtime.new.ssi:42
-#: en/user_customization-runtime.new.ssi:50
-#: en/user_customization-runtime.new.ssi:64
-#: en/user_customization-runtime.new.ssi:76
-#: en/user_customization-runtime.new.ssi:86
-#: en/user_customization-runtime.new.ssi:94
-#: en/user_customization-runtime.new.ssi:102
-#: en/user_customization-runtime.new.ssi:110
-#: en/user_customization-runtime.new.ssi:130
-#: en/user_customization-runtime.new.ssi:138
-#: en/user_customization-runtime.new.ssi:147
-#: en/user_customization-runtime.ssi:12 en/user_customization-runtime.ssi:30
-#: en/user_customization-runtime.ssi:40 en/user_customization-runtime.ssi:48
-#: en/user_customization-runtime.ssi:56 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:92
-#: en/user_customization-runtime.ssi:101 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:108 en/user_installation.ssi:126
-#: en/user_installation.ssi:141 en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_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,32 +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:173 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
+#: 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
@@ -139,38 +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:285
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
 #: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:334
-#: en/user_customization-runtime.new.ssi:18
-#: en/user_customization-runtime.new.ssi:38
-#: en/user_customization-runtime.new.ssi:46
-#: en/user_customization-runtime.new.ssi:54
-#: en/user_customization-runtime.new.ssi:68
-#: en/user_customization-runtime.new.ssi:80
-#: en/user_customization-runtime.new.ssi:90
-#: en/user_customization-runtime.new.ssi:98
-#: en/user_customization-runtime.new.ssi:106
-#: en/user_customization-runtime.new.ssi:114
-#: en/user_customization-runtime.new.ssi:134
-#: en/user_customization-runtime.new.ssi:143
-#: en/user_customization-runtime.new.ssi:152
-#: en/user_customization-runtime.ssi:16 en/user_customization-runtime.ssi:34
-#: en/user_customization-runtime.ssi:44 en/user_customization-runtime.ssi:52
-#: en/user_customization-runtime.ssi:60 en/user_customization-runtime.ssi:68
-#: en/user_customization-runtime.ssi:88 en/user_customization-runtime.ssi:97
-#: en/user_customization-runtime.ssi:106 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:112 en/user_installation.ssi:131
-#: en/user_installation.ssi:144 en/user_managing_a_configuration.ssi:31
+#: 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: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
@@ -179,9 +145,41 @@ msgid "}code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:12
+#: en/user_customization-runtime.ssi:2
+msgid ":B~ Customizing run time behaviours"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:4
+msgid "1~customizing-run-time-behaviours Customizing run time behaviours"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:6
+msgid ""
+"All configuration that is done during run time is done by live-config. Here "
+"are some most common options of live-config that users are interested in. A "
+"full list of all possibilities can be found in the manpage of live-config."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:8
+msgid "2~ Customizing the live user"
+msgstr ""
+
+#. type: Plain text
 #: en/user_customization-runtime.ssi:10
 msgid ""
+"One important consideration is that the live user is created by live-boot at "
+"boot time, not by live-build at build time. This not only influences where "
+"materials relating to the live user are introduced in your build, as "
+"discussed in {Live/chroot local includes}#live-chroot-local-includes, but "
+"also any groups and permissions associated with the live user."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:12
+msgid ""
 "You can specify additional groups that the live user will belong to by "
 "preseeding the #{passwd/user-default-groups}# debconf value. For example, to "
 "add the live user to the #{fuse}# group, add the following to a file in the #"
@@ -189,104 +187,108 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:16
-#: en/user_customization-runtime.ssi:14
-msgid ""
-"debconf passwd/user-default-groups string audio cdrom dialout floppy video "
-"plugdev netdev powerdev fuse"
+#: en/user_customization-runtime.ssi:16
+#, no-wrap
+msgid " debconf passwd/user-default-groups string audio cdrom dialout floppy video plugdev netdev powerdev fuse\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:22
 #: en/user_customization-runtime.ssi:20
-msgid "When the live system boots, language is involved in three steps:"
+msgid "2~customizing-locale-and-language Customizing locale and language"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:24
 #: en/user_customization-runtime.ssi:22
-msgid "_* the locale generation"
+msgid "When the live system boots, language is involved in three steps:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:26
 #: en/user_customization-runtime.ssi:24
-msgid "_* setting the keyboard layout for the console"
+msgid "_* the locale generation"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:28
 #: en/user_customization-runtime.ssi:26
-msgid "_* setting the keyboard layout for X"
+msgid "_* setting the keyboard layout for the console"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:78
-#: en/user_customization-runtime.ssi:32
-msgid "lb config --bootappend-live \"locales=de_CH.UTF-8\""
+#: en/user_customization-runtime.ssi:28
+msgid "_* setting the keyboard layout for X"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:82
-#: en/user_customization-runtime.ssi:36
+#: en/user_customization-runtime.ssi:30
 msgid ""
-"This parameter can also be used in kernel command line. You can specify a "
-"locale by a full #{language_country.encoding}# word."
+"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
+"To define the locale that should be generated, use the #{locales}# parameter "
+"in the #{--bootappend-live}# option of #{lb config}#, e.g."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:34
+#, no-wrap
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:84
 #: en/user_customization-runtime.ssi:38
 msgid ""
-"Both the console and X keyboard configuration depends on the #{keyb}# "
-"parameter of the #{--bootappend-live}# option. Valid options for X keyboard "
-"layouts can be found in #{/etc/X11/xkb/base.xml}# (rather limited to two-"
-"letters country codes). To find the value (the two characters) corresponding "
-"to a language try searching for the english name of the nation where the "
-"language is spoken, e.g:"
+"This parameter can also be used at the kernel command line. You can specify "
+"a locale by a full #{language_country.encoding}# word."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:88
-#: en/user_customization-runtime.ssi:42
-msgid "$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name <name>se</name>"
+#: en/user_customization-runtime.ssi:40
+msgid ""
+"Both the console and X keyboard configuration depend on the #{keyboard-"
+"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
+"keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base.xml}# "
+"(rather limited to two-letters country codes). To find the value (the two "
+"characters) corresponding to a language try searching for the english name "
+"of the nation where the language is spoken, e.g:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:92
-#: en/user_customization-runtime.ssi:46
+#: en/user_customization-runtime.ssi:45
+#, no-wrap
+msgid ""
+" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
+" <name>se</name>\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:49
 msgid ""
 "To get the locale files for German and Swiss German keyboard layout in X use:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:96
-#: en/user_customization-runtime.ssi:50
-msgid "lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\""
+#: en/user_customization-runtime.ssi:53
+#, no-wrap
+msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:100
-#: en/user_customization-runtime.ssi:54
+#: en/user_customization-runtime.ssi:57
 msgid ""
 "A list of the valid values of the keyboards for the console can be figured "
 "with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:104
-#: en/user_customization-runtime.ssi:58
+#: 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.new.ssi:108
-#: en/user_customization-runtime.ssi:62
+#: 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 setup your "
+"configure console layout using X (XKB) definitions; you can then set your "
 "keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}"
 "#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use "
 "also these parameters for X configuration. For example, to set up a French "
@@ -295,22 +297,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:112
-#: en/user_customization-runtime.ssi:66
+#: 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.new.ssi:116
-#: en/user_customization-runtime.ssi:70
-msgid "2~ Persistence"
+#: en/user_customization-runtime.ssi:75
+msgid "2~persistence Persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:118
-#: en/user_customization-runtime.ssi:72
+#: 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 "
@@ -318,8 +318,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:120
-#: en/user_customization-runtime.ssi:74
+#: 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 "
@@ -328,8 +327,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:122
-#: en/user_customization-runtime.ssi:76
+#: 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 "
@@ -340,8 +338,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:124
-#: en/user_customization-runtime.ssi:78
+#: 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 "
@@ -351,14 +348,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:126
-#: en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:85
 msgid "3~ Full persistence"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:128
-#: en/user_customization-runtime.ssi:82
+#: 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 "
@@ -370,30 +365,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:132
-#: en/user_customization-runtime.ssi:86
-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.new.ssi:136
-#: en/user_customization-runtime.ssi:90
+#: 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.new.ssi:141
-#: en/user_customization-runtime.ssi:95
+#: 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.new.ssi:145
-#: en/user_customization-runtime.ssi:99
+#: 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 "
@@ -403,30 +396,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:150
-#: en/user_customization-runtime.ssi:104
+#: 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.new.ssi:154
-#: en/user_customization-runtime.ssi:108
+#: 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.new.ssi:156
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:115
 msgid "3~ Home automounting"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:158
-#: en/user_customization-runtime.ssi:112
+#: 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 "
@@ -435,14 +425,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:160
-#: en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:119
 msgid "3~ Snapshots"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:162
-#: en/user_customization-runtime.ssi:116
+#: 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 "
@@ -459,30 +447,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:164
-#: en/user_customization-runtime.ssi:118
+#: 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.new.ssi:166
-#: en/user_customization-runtime.ssi:120
+#: 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.new.ssi:168
-#: en/user_customization-runtime.ssi:122
+#: en/user_customization-runtime.ssi:127
 msgid "3~ Persistent SubText"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:170
-#: en/user_customization-runtime.ssi:124
+#: 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-"
@@ -494,54 +478,15 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:172
-#: en/user_customization-runtime.ssi:126
+#: en/user_customization-runtime.ssi:131
 msgid "3~ Partial remastering"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-runtime.new.ssi:173
-#: en/user_customization-runtime.ssi:127
+#: 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 "
 "case of cd-r or adding a session to multisession cd/dvd(rw); live-boot "
 "mounts all /live filesystem in order or with the module boot parameter."
 msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:2
-msgid "B~ Customization at Runtime"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:4
-msgid ""
-"All configuration that is done during runtime is done by live-config. Here "
-"are some most common options of live-config that users are interested in. A "
-"full list of all possibilities can be found in the manpage of live-config."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:6
-msgid "1~ User"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:8
-msgid ""
-"One important consideration is that the live user is created by live-boot "
-"during bootup, it is not created by live-build when building the image."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:18
-msgid "1~ Language"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:28
-msgid ""
-"To define the locale that should be generated, use the #{locale}# parameter "
-"into the #{--bootappend-live}# option of #{lb config}#, e.g.:"
-msgstr ""
diff --git a/manual/pot/user_examples.ssi.pot b/manual/pot/user_examples.ssi.pot
index 6f98511..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-11-28 07: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"
@@ -17,68 +17,70 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
+#: en/live-manual.ssm:61 en/user_examples.ssi:2
+msgid ":B~ Examples"
+msgstr ""
+
+#. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:108 en/about_manual.ssi: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_coding-style.ssi:28
-#: en/other_coding-style.ssi:38 en/other_coding-style.ssi:51
-#: en/other_coding-style.ssi:61 en/other_coding-style.ssi:88
-#: en/other_coding-style.ssi:96 en/other_coding-style.ssi:106
-#: en/other_coding-style.ssi:117 en/other_common-tasks.ssi:32
-#: en/other_customization-backports.ssi:8 en/other_customization-bootup.ssi:30
-#: en/other_customization-bootup.ssi:39 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/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/project_bugs.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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 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_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:76 en/user_installation.ssi:84
-#: en/user_installation.ssi:104 en/user_installation.ssi:118
-#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
+#: 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: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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr ""
@@ -87,84 +89,71 @@ 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:173 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/project_bugs.ssi:62 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: 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: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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 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_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:72
-#: en/user_installation.ssi:80 en/user_installation.ssi:88
-#: en/user_installation.ssi:108 en/user_installation.ssi:123
-#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
 #: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:92
-#: en/user_examples.ssi:141 en/user_examples.ssi:190
-msgid "#!/bin/sh"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
-#: en/user_examples.ssi:109 en/user_examples.ssi:156
-msgid "# lb build"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:2
-msgid ":B~ Examples"
+#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_examples.ssi:109 en/user_examples.ssi:208
+#, no-wrap
+msgid " # lb build\n"
 msgstr ""
 
 #. type: Plain text
@@ -209,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
@@ -222,7 +213,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:24
 #, no-wrap
-msgid "*{Use case:}* Create a simple first image, learning the basics of live-build\n"
+msgid "*{Use case:}* Create a simple first image, learning the basics of live-build.\n"
 msgstr ""
 
 #. type: Plain text
@@ -240,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
@@ -258,8 +250,9 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:42
-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,7 +276,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:50
 #, no-wrap
-msgid "*{Use case}* Create a web browser utility image, learning how to apply customizations\n"
+msgid "*{Use case:}* Create a web browser utility image, learning how to apply customizations.\n"
 msgstr ""
 
 #. type: Plain text
@@ -295,7 +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
@@ -317,11 +311,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:66 en/user_examples.ssi:219
-msgid "# lb build 2>&1 | tee binary.log"
-msgstr ""
-
-#. type: Plain text
 #: en/user_examples.ssi:70
 msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
 msgstr ""
@@ -334,7 +323,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:74
 #, no-wrap
-msgid "*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
+msgid "*{Use case:}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
 msgstr ""
 
 #. type: Plain text
@@ -355,9 +344,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:84
+#, no-wrap
 msgid ""
-"$ mkdir -p tutorial3/auto $ cp /usr/share/live/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
@@ -366,15 +357,21 @@ msgid "Edit #{auto/config}# to read as follows:"
 msgstr ""
 
 #. type: Plain text
+#: en/user_examples.ssi:92 en/user_examples.ssi:141
+#, 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
@@ -410,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
@@ -436,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
@@ -448,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
@@ -462,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
@@ -499,80 +507,85 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:174
-msgid "Create an image with live-build to boot directly to a VNC server."
+#, no-wrap
+msgid "*{Use case:}* Create an image with live-build to boot directly to a VNC server.\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:176
-msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:178
-msgid "_* Move to the build directory: #{$ cd vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:180
 msgid ""
-"Example to config the build directory to include gdm metacity "
-"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
+"Make a build directory and create a skeletal configuration in it built "
+"around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
+"{xtightvncviewer}#, disabling recommends to make a minimal system:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:182
+#: en/user_examples.ssi:184
+#, no-wrap
 msgid ""
-"Create a folder /etc/skel folder for a custom .xsession for the default "
-"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
+" $ 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
-#: en/user_examples.ssi:184
+#: en/user_examples.ssi:188
 msgid ""
-"Create the .xsession for the default user: #{$ touch config/chroot_local-"
-"includes/etc/skel/.xsession}#"
+"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
+"the default user that will launch metacity and start xvncviewer, connecting "
+"to port #{5901}# on a server at #{192.168.1.2}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:186
+#: en/user_examples.ssi:194
+#, no-wrap
 msgid ""
-"Edit the .xsession file to launch metacity and start xvncviewer with "
-"something similar to the below:"
+" $ 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:193
-msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
+#: en/user_examples.ssi:197
+#, no-wrap
+msgid ""
+" /usr/bin/metacity &\n"
+" /usr/bin/xvncviewer 192.168.1.2:1\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:195
-msgid "exit"
+#: en/user_examples.ssi:200
+#, no-wrap
+msgid ""
+" exit\n"
+" END\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:199
-msgid "_* Build the image: #{# lb build}#"
+#: en/user_examples.ssi:204
+msgid "Build the image:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:201
-msgid "_* Enjoy."
+#: en/user_examples.ssi:212
+msgid "Enjoy."
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:203
+#: en/user_examples.ssi:214
 msgid "2~ A base image for a 128M USB key"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:205
+#: en/user_examples.ssi:216
 #, no-wrap
-msgid "*{Use case}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
+msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:207
+#: en/user_examples.ssi:218
 msgid ""
 "When optimizing an image to fit a certain media size, you need to understand "
 "the tradeoffs you are making between size and functionality. In this "
@@ -586,19 +599,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:211
+#: 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:215
+#: en/user_examples.ssi:227
 msgid "Now, build the image in the usual way:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:223
+#: 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 "
@@ -606,7 +620,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_examples.ssi:225
+#: 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 "
@@ -622,3 +636,117 @@ msgid ""
 "you to decide if the functionality that is sacrificed with each optimization "
 "is worth the loss in functionality."
 msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:239
+msgid "2~ A localized KDE desktop and installer"
+msgstr ""
+
+#. type: Plain text
+#: 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: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 "
+"that would be installed by the standard Debian installer for KDE."
+msgstr ""
+
+#. type: Plain text
+#: 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 "
+"find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can be "
+"used to dig it out of the task descriptions in tasksel-data, so to prepare, "
+"make sure you have both of those things:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:249
+#, no-wrap
+msgid " # apt-get install dctrl-tools tasksel-data\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:253
+msgid "Now we can search for the appropriate tasks, first with:"
+msgstr ""
+
+#. type: Plain text
+#: 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"
+msgstr ""
+
+#. type: Plain text
+#: 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: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"
+msgstr ""
+
+#. type: Plain text
+#: 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"
+msgstr ""
+
+#. type: Plain text
+#: 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}"
+"#desktop-and-language-tasks for details). And at boot time we will generate "
+"the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's "
+"put the pieces together:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:295
+#, no-wrap
+msgid ""
+" $ 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"
+msgstr ""
+
+#. type: Plain text
+#: 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 "
+"flavour kernel, as it is currently necessary to make the installer and live "
+"system kernels match for the launcher to work properly."
+msgstr ""
diff --git a/manual/pot/user_installation.ssi.pot b/manual/pot/user_installation.ssi.pot
index f7a0c9c..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-01 06:49-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,61 +20,59 @@ 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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:259
-#: en/user_customization-packages.ssi:271
-#: en/user_customization-packages.ssi:281
-#: en/user_customization-packages.ssi:299 en/user_customization-runtime.ssi:12
-#: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
-#: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
-#: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
-#: en/user_customization-runtime.ssi:92 en/user_customization-runtime.ssi:101
+#: 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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
 #: en/user_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_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:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:108
-#: en/user_installation.ssi:126 en/user_installation.ssi:141
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -86,61 +84,59 @@ 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:173 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: 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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:263
-#: en/user_customization-packages.ssi:275
-#: en/user_customization-packages.ssi:285
-#: en/user_customization-packages.ssi:312 en/user_customization-runtime.ssi:16
-#: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
 #: en/user_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_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:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:112
-#: en/user_installation.ssi:131 en/user_installation.ssi:144
-#: en/user_managing_a_configuration.ssi:31
+#: 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
@@ -149,6 +145,12 @@ msgid "}code"
 msgstr ""
 
 #. type: Plain text
+#: en/user_customization-packages.ssi:82 en/user_installation.ssi:148
+#, no-wrap
+msgid " $ lb config --repository live.debian.net\n"
+msgstr ""
+
+#. type: Plain text
 #: en/user_installation.ssi:2
 msgid ":B~ Installation"
 msgstr ""
@@ -233,7 +235,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:34
+#: en/user_installation.ssi:34 en/user_installation.ssi:104
 msgid "3~ From the Debian repository"
 msgstr ""
 
@@ -244,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
@@ -254,11 +257,12 @@ 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
-#: en/user_installation.ssi:52
+#: en/user_installation.ssi:52 en/user_installation.ssi:108
 msgid "3~ From source"
 msgstr ""
 
@@ -272,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
@@ -282,41 +287,55 @@ 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
-#: en/user_installation.ssi:70
-msgid "# dpkg -i live-build*.deb"
+#: en/user_installation.ssi:72
+msgid ""
+"Now install whichever of the freshly built #{.deb}# files you were "
+"interested in, e.g."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:74
+#: en/user_installation.ssi:76
+#, no-wrap
+msgid " # dpkg -i live-build_2.0.8-1_all.deb\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:80
 msgid "You can also install live-build directly to your system by executing:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:78
-msgid "# make install"
+#: en/user_installation.ssi:84
+#, no-wrap
+msgid " # make install\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:82
+#: en/user_installation.ssi:88
 msgid "and uninstall it with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:86
-msgid "# make uninstall"
+#: en/user_installation.ssi:92
+#, no-wrap
+msgid " # make uninstall\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:90
+#: en/user_installation.ssi:96 en/user_installation.ssi:142
 msgid "3~ From 'snapshots'"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:92
+#: en/user_installation.ssi:98
 msgid ""
 "If you do not wish to build or install live-build from source, you can use "
 "snapshots. These are built automatically from the latest version in Git and "
@@ -324,86 +343,65 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:94
-msgid "2~ live-boot"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:96
-#, no-wrap
-msgid "*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:98
-msgid "% FIXME: we also need to mention live-config"
-msgstr ""
-
-#. type: Plain text
 #: en/user_installation.ssi:100
-msgid "3~ Using a customized live-boot"
+msgid "2~ live-boot and live-config"
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:102
-msgid ""
-"% FIXME: should follow the structure for live-build above (i.e. \"from source"
-"\", not \"customized\" -- we should not get into customization now, but "
-"should reserve that discussion for later."
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:104
-msgid ""
-"To modify the code you can follow the process below. Please ensure you are "
-"familiar with the terms mentioned in {Terms}#terms."
+#, no-wrap
+msgid "*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:106
-msgid "_* Checkout the live-boot source"
+msgid ""
+"Both live-boot and live-config are available from the Debian repository as "
+"per {Installing live-build}#installing-live-build."
 msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:110
-msgid "$ git clone git://live.debian.net/git/live-boot.git"
+msgid ""
+"To use the latest source from git, you can follow the process below. Please "
+"ensure you are familiar with the terms mentioned in {Terms}#terms."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:114
-msgid "_* Make changes to your local copy"
+#: en/user_installation.ssi:112
+msgid "_* Checkout the live-boot and live-config source"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:116
+#: en/user_installation.ssi:117
+#, no-wrap
 msgid ""
-"% FIXME: as indicated above, it's too early for this topic. Move to later in "
-"the manual."
+" $ 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
-#: en/user_installation.ssi:118
+#: en/user_installation.ssi:121
 msgid ""
-"And beware that if you want to add your pre-init script in live-bottom, you "
-"should name it without dashes '-', e.g: call it \"99new_feature\" and not "
-"\"99new-feature\"."
+"Consult the live-boot and live-config man pages for details on customizing "
+"if that is your reason for building these packages from source."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:120
-msgid "_* Build a live-boot .deb"
+#: en/user_installation.ssi:123
+msgid "_* Build live-boot and live-config .deb files"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:122
+#: en/user_installation.ssi:125
 msgid ""
 "You must build either on your target distribution or in a chroot containing "
 "your target platform: this means if your target is Squeeze then you should "
-"build against Squeeze. Y"
+"build against Squeeze."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:124
+#: en/user_installation.ssi:127
 msgid ""
 "Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
 "build #{live-boot}# for a target distribution that differs from your build "
@@ -414,40 +412,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:129
-msgid "$ cd live-boot $ dpkg-buildpackage -b -uc -us"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:133
-msgid "_* Use the generated live-boot .deb"
-msgstr ""
-
-#. type: Plain text
-#: en/user_installation.ssi:135
+#: en/user_installation.ssi:134
+#, no-wrap
 msgid ""
-"As live-boot is installed by live-build system, installing the package in "
-"the host system is not sufficient: you should treat the generated .deb like "
-"another custom package. Please see {Customizing package installation}"
-"#customizing-package-installation for more information. You should pay "
-"particular attention to {Additional repositories}#additional-repositories."
+" $ cd live-boot\n"
+" $ dpkg-buildpackage -b -uc -us\n"
+" $ cd ../live-config\n"
+" $ dpkg-buildpackage -b -uc -us\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:137
-msgid "3~ Using live-boot snapshots"
+#: en/user_installation.ssi:138
+msgid "_* Use all generated .deb files"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:139
+#: en/user_installation.ssi:140
 msgid ""
-"You can let live-build automatically use the latest snapshot of live-boot by "
-"configuring a third-party repository in your live-build configuration "
-"directory. Assuming you have already created a configuration tree with #{lb "
-"config}#:"
+"As live-boot and live-config are installed by live-build system, installing "
+"the packages in the host system is not sufficient: you should treat the "
+"generated .deb files like any other custom packages. Please see {Customizing "
+"package installation}#customizing-package-installation for more information. "
+"You should pay particular attention to {Additional repositories}#additional-"
+"repositories."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:143
-msgid "lb config --repository live.debian.net"
+#: en/user_installation.ssi:144
+msgid ""
+"You can let live-build automatically use the latest snapshots of live-boot "
+"and live-config by configuring a third-party repository in your live-build "
+"configuration directory. Assuming you have already created a configuration "
+"tree with #{lb config}#:"
 msgstr ""
diff --git a/manual/pot/user_managing_a_configuration.ssi.pot b/manual/pot/user_managing_a_configuration.ssi.pot
index 8b9a570..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-01 05: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"
@@ -20,60 +20,59 @@ 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-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
-#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
-#: en/user_customization-packages.ssi:120
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:177
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:261
-#: en/user_customization-packages.ssi:273
-#: en/user_customization-packages.ssi:283 en/user_customization-runtime.ssi:12
-#: en/user_customization-runtime.ssi:30 en/user_customization-runtime.ssi:40
-#: en/user_customization-runtime.ssi:48 en/user_customization-runtime.ssi:56
-#: en/user_customization-runtime.ssi:64 en/user_customization-runtime.ssi:84
-#: en/user_customization-runtime.ssi:92 en/user_customization-runtime.ssi:101
+#: 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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
 #: en/user_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_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:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:108
-#: en/user_installation.ssi:126 en/user_installation.ssi:144
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
 #: en/user_managing_a_configuration.ssi:35
 #: en/user_managing_a_configuration.ssi:47
 #: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -85,60 +84,59 @@ 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:173 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-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:125
-#: en/user_customization-packages.ssi:139
-#: en/user_customization-packages.ssi:149
-#: en/user_customization-packages.ssi:159
-#: en/user_customization-packages.ssi:169
+#: 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
+#: en/user_customization-packages.ssi:171
 #: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:197
-#: en/user_customization-packages.ssi:265
-#: en/user_customization-packages.ssi:277
-#: en/user_customization-packages.ssi:287 en/user_customization-runtime.ssi:16
-#: en/user_customization-runtime.ssi:34 en/user_customization-runtime.ssi:44
-#: en/user_customization-runtime.ssi:52 en/user_customization-runtime.ssi:60
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
 #: en/user_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_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:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:112
-#: en/user_installation.ssi:131 en/user_installation.ssi:147
-#: en/user_managing_a_configuration.ssi:31
+#: 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
@@ -194,8 +192,9 @@ msgstr ""
 msgid ""
 "A second, related problem is that if you run #{lb config}# and then upgrade "
 "to a new version of live-build that has changed one of the variable names, "
-"you will discover this only by manual review of the variables in your config "
-"files, which you will then need to use to set the appropriate option again."
+"you will discover this only by manual review of the variables in your #"
+"{config/*}# files, which you will then need to use to set the appropriate "
+"option again."
 msgstr ""
 
 #. type: Plain text
@@ -238,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
@@ -253,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
@@ -267,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
@@ -279,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 2a2bb48..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-10-28 16:34-0200\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"
@@ -17,122 +17,129 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: 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/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.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:140
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
+#: en/about_manual.ssi:170 en/project_bugs.ssi: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: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: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_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
-#: en/user_customization-internationalization.ssi:10
-#: en/user_customization-internationalization.ssi:18
-#: en/user_customization-internationalization.ssi:26
-#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
+#: 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
+#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:303
+#: en/user_customization-packages.ssi:313
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
+#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
+#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
+#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
+#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
+#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
+#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
+#: en/user_examples.ssi:283 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: 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_overview.ssi:36
+#: en/user_managing_a_configuration.ssi:47
+#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
 #: en/user_overview.ssi:80 en/user_overview.ssi:88
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
-#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
-#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
-#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
-#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
-#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: 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/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
-#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 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: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_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
-#: en/user_customization-internationalization.ssi:14
-#: en/user_customization-internationalization.ssi:22
-#: en/user_customization-internationalization.ssi:30
-#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
+#: en/about_manual.ssi:174 en/project_bugs.ssi: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: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
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:307
+#: en/user_customization-packages.ssi:317
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
+#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
+#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
+#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
+#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
+#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
+#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
+#: en/user_examples.ssi:297 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: 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_overview.ssi:74
+#: en/user_managing_a_configuration.ssi:52
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
 #: en/user_overview.ssi:84 en/user_overview.ssi:92
 msgid "}code"
 msgstr ""
@@ -185,11 +192,11 @@ msgstr ""
 #: en/user_overview.ssi:16
 msgid ""
 "_* The scripts have a central location for configuring their operation. In "
-"debhelper, this is the debian subdirectory of a package tree. For example, "
-"dh_install will look, amongst others, for a file called #{debian/install}# "
-"to determine which files should exist in a particular binary package. In "
-"much the same way, live-build stores its configuration entirely under a "
-"config subdirectory."
+"debhelper, this is the #{debian/}# subdirectory of a package tree. For "
+"example, dh_install will look, amongst others, for a file called #{debian/"
+"install}# to determine which files should exist in a particular binary "
+"package. In much the same way, live-build stores its configuration entirely "
+"under a #{config/}# subdirectory."
 msgstr ""
 
 #. type: Plain text
@@ -244,7 +251,7 @@ msgstr ""
 #: en/user_overview.ssi:32
 msgid ""
 "As discussed in {live-build}#live-build, the scripts that make up live-build "
-"source their configuration from a single directory named config/. As "
+"source their configuration from a single directory named #{config/}#. As "
 "constructing this directory by hand would be time-consuming and error-prone, "
 "the #{lb config}# command can be used to create skeleton configuration "
 "folders."
@@ -253,45 +260,59 @@ msgstr ""
 #. type: Plain text
 #: en/user_overview.ssi:34
 msgid ""
-"Issuing #{lb config}# without any arguments creates a config subdirectory "
-"which it populates with some default settings:"
+"Issuing #{lb config}# without any arguments creates a #{config/}# "
+"subdirectory which it populates with some default settings:"
 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
@@ -312,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
@@ -322,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 4c4e302..f0818cc 100644
--- a/manual/pt_BR/about_manual.ssi
+++ b/manual/pt_BR/about_manual.ssi
@@ -23,9 +23,9 @@ the details. Therefore, we have provided three tutorials in the
 {Examples}#examples section designed to teach you image building and
 customization basics. Read {Using the examples}#using-the-examples first,
 followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web
-browser utility}#tutorial-2 and finally {Tutorial 3: A personal travelling
-companion}#tutorial-3. By the end of these tutorials, you will have a taste
-of what can be done with Debian Live. We encourage you to return to more
+browser utility}#tutorial-2 and finally {Tutorial 3: A personalized
+image}#tutorial-3. By the end of these tutorials, you will have a taste of
+what can be done with Debian Live. We encourage you to return to more
 in-depth study of the manual, perhaps next reading {The basics}#the-basics,
 skimming or skipping {Building a netboot image}#building-netboot-image, and
 finishing by reading the {Customization overview}#customization-overview and
@@ -131,8 +131,8 @@ _* Trent W. Buck
 
 This manual is intended as a community project and all proposals for
 improvements and contributions are extremely welcome. The preferred way to
-submit a contribution is to send it to the mailing list. Please see
-{Contact}#contact for more information.
+submit a contribution is to send it to the mailing list. Please see the
+section {Contact}#contact for more information.
 
 Quando estiver submetendo uma contribuição, por favor identificar claramente
 o seu titular de direitos autorais e incluir a declaração de
@@ -155,16 +155,16 @@ necessários para contruir estão instalados executando:
 
 code{
 
-# apt-get install make po4a sisu-complete
+ # apt-get install make po4a sisu-complete libnokogiri-ruby
 
 }code
 
 Você também pode construir o live-manual a partir do primeiro nível do
-diretório do seu git checkout executando:
+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,18 +225,18 @@ atualizar os arquivos de tradução.
 
 code{
 
-$ make commit
+ $ make commit
 
 }code
 
 _* Depois de higiênizar submeta as mudançãs. Escreva mensagens de submissão,
 que consistem em sentanças completas úteis, começando por letra maiuscula e
 acabando com uma parada total. Normalmente iniciando com as formas
-'Fixing/Adding/Removing/Correcting/':
+'Fixing/Adding/Removing/Correcting/Translating'.
 
 code{
 
-$ git commit -a
+ $ git commit -a -m "Adding a section on applying patches."
 
 }code
 
@@ -244,18 +244,23 @@ _* Enviar as submissões para os servidor.
 
 code{
 
-$ git push
+ $ git push
 
 }code
 
 3~ Translation
 
-Submiting a translation for a new language is recommendet in two steps:
+To submit a translation for a new language, follow these three steps:
 
-_* Translate the about_manual.ssi.pot about_project.ssi.pot
+_* Translate the about_manual.ssi.pot, about_project.ssi.pot and
 index.html.in.pot files to your language with your favourite editor (such as
-poedit). Send translated files to the mailinglist. It will then be included
-and autobuild for that language enabled.
+poedit). Send translated files to the mailing list. Once we have reviewed
+your submission, we will add the new language to the manual (providing the
+po files) and will enable it in the autobuild.
+
+_* Once the new language is added, you can randomly start translating all po
+files in #{manual/po/}#.
+
+_* Don't forget you need #{make commit}# to ensure the translated manuals
+are updated from the po files, before #{git commit -a}# and #{git push}#.
 
-_* Now that the new language was added, you can randomly start translating
-all other pot files.
diff --git a/manual/pt_BR/index.html.in b/manual/pt_BR/index.html.in
index b0b1b5e..cbecbc4 100644
--- a/manual/pt_BR/index.html.in
+++ b/manual/pt_BR/index.html.in
@@ -42,7 +42,7 @@ href="pdf/live-manual.landscape-letter.pdf">US paisagem</a></li>
 
 	<p>
 		O fonte desse manual está diponível em um repositório <a
-href="http://git.or.cz/">git</a> em live.debian.net.
+href="http://git.or.cz/">Git</a> em live.debian.net.
 	</p>
 
 	<ul>
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index 3b1bd69..6fa445d 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -9,7 +9,7 @@
  :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
 
 @date:
- :published: 2010-12-06
+ :published: 2010-12-24
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
@@ -27,7 +27,7 @@
 
 << about_project.ssi
 
-:B~ User ~#
+:B~ User
 
 << user_installation.ssi
 
@@ -43,17 +43,13 @@
 
 << user_customization-contents.ssi
 
-<< user_customization-internationalization.ssi
-
 << user_customization-runtime.ssi
 
 << user_customization-binary.ssi
 
 << user_customization-installer.ssi
 
-:B~ Development ~#
-
-:B~ Project ~#
+:B~ Project
 
 << project_bugs.ssi
 
@@ -61,18 +57,7 @@
 
 << project_procedures.ssi
 
-:B~ Examples ~#
+:B~ Examples
 
 << user_examples.ssi
 
-:B~ Other ~#
-
-Other material that formerly appeared in this section is out of date and/or
-has not been approved for release. It has therefore been omitted, but can
-still be found in the document source; see 'About this manual'. Any part of
-the omitted material that is still useful will be included in the release
-only after it has been reviewed.
-
-% << other_faq.ssi
-
-% << other_howtos.ssi
diff --git a/manual/pt_BR/other_faq.ssi b/manual/pt_BR/other_faq.ssi
deleted file mode 100644
index f754913..0000000
--- a/manual/pt_BR/other_faq.ssi
+++ /dev/null
@@ -1,545 +0,0 @@
-B~ Frequently asked questions (FAQ)
-
-1~ Frequently asked questions (FAQ)
-
-Q: I downloaded a prebuilt live image. How do I put it on a USB stick? A:
-See "Copying USB/HDD image to a USB stick" % FIXME: <xref
-linkend="image_copying"/>
-
-Q: How do I log my build? A: You could use script, screen or tee: #{$
-lh_build 2>&1 | tee build.log}#
-
-Q: How can I convert an already installed standard Debian partition into a
-Debian Live system? A: Save the list of installed packages and load it into
-your new Debian Live System. Copy your /etc to config/chroot_local-includes
-
-Q: What does 'losetup: could not find any free loop device' mean and how do
-I fix it? A: Loop devices are used during the build; there probably aren't
-any free if you've aborted several builds. Something like: for l in
-/dev/loop0 /dev/loop1 /dev/loop2 /dev/loop3 /dev/loop4 /dev/loop5 /dev/loop6
-/dev/loop7 ; do losetup -d $l ; done should rectify the situation (assuming
-all loop devices in use were created by lh_build; if in doubt, check the
-contents of each loop device before deleting them with losetup -d).
-
-Q: How do I launch an interactive shell during the chroot stage? A: To
-enable interactive shell: #{$ lh_config --interactive shell}# To continue
-the build process: #{# logout}# or #{# exit}# To disable interactive shell,
-set LH_INTERACTIVE to "disabled" in config/chroot.
-
-Q: What is the root /user password? A: The user password for the live user
-is 'live'. By default, there is not any root password. You can switch to
-root with ${sudo -i}# or set a password for root with #{sudo passwd}#
-
-Q: How do I change root or any user password? A: Add a chroot local hook
-script to change root or any user password each time you build an image.
-e.g. config/chroot_local-hooks/01-update_password.sh to set root password to
-"nopasswd"
-
-code{ #!/bin/sh
-
-echo "I: update password" echo "root:nopasswd" | chpasswd
-
-$ chmod +x config/chroot_local-hooks/01-update_password.sh
-
-}code
-
-Note for live user; you need to copy the
-/usr/share/initramfs-tools/scripts/live-bottom/10adduser your build folder:
-
-code{
-
-mkdir -p
-config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/
-cp /usr/share/initramfs-tools/scripts/live-bottom/10adduser
-config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/
-
-}code
-
-Note: Then edit the
-config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/10adduser
-and paste in the new user_crypted password that you make with: #{echo
-"newlivepass" | mkpasswd -s}#
-
-Or add an hook file in config/chroot_local-hooks/ with something like the
-below:
-
-code{ #!/bin/sh
-
-# Change the autogenerated user password to "debianlive"
-plain_password="debianlive" password=$(echo "${plain_password}" | mkpasswd
--s)
-
-sed -i -e 's/\(user_crypted=\)\(.*\)\( #.*\)/\1\"'${password}'\"\3/'
-/usr/share/initramfs-tools/scripts/live-bottom/10adduser
-
-update-initramfs -tu -kall }code
-
-The latter (hook model) could be more future proof than the former solution
-since it modifies just one string selectively but it requires the package
-"whois" to be installed on the target system (for mkpasswd) or that you
-generate the $password string not at build time and include it crypted in
-the above script.
-
-Q: How to disable autologin? A1: use the commandline parameter #{lh config
---bootappend-live "noautologin"}# A2: You need to set boot=noautologin
-noxautologin as described in man live-initramfs If you boot via TFTP you
-want to insert the option to pxelinux.cfg/default
-
-Q: How do I change default hostname or username? A: To change default
-hostname or username: #{$ lh_config --hostname myhostname $ lh_config
---username myusername}#
-
-Q: How do I make the final image smaller? A: Clean orphaned apps/libs:
-Install package "deborphan" and then run 'sudo deborphan -n' . Delete
-unwanted packages. Remove the apt cache. Purge unwanted locales (see
-"localepurge" package).
-
-Q: How do I customize bash-config permanently (aliases, bash-completion
-etc.)? A: Add your own .bashrc config/chroot_local-includes/etc/skel/.bashrc
-
-Q: How do I disable services permanently? (Be careful!)  A: Add a chroot
-local hook script to disable a service each time you build an image:
-e.g. config/chroot_local-hooks/01-disable_service.sh
-
-code{
-
-#!/bin/sh
-
-echo "I: disable service" update-rc.d -f service_name remove
-
-$ chmod +x config/chroot_local-hooks/01-disable_service.sh
-
-}code
-
-Q: How do I enable | disable the md5checksum at the ISO building? A:
-#{lh_config --checksums enabled|disabled}# Or change the LH_CHECKSUMS value.
-
-Q: How to disable the generation of the .tar.gz file? A: #{lh_config
---net-tarball none|gzip}# Or change the LH_NET_TARBALL value. (only
-available in snapsshot version at the moment 2008/Feb/28)
-
-Q: How do I "build a new image"? A: Run commands:
-
-code{
-
-$ sudo lh_clean --binary $ sudo lh_build
-
-}code
-
-Hint: If the configuration had changed you should leave "--binary" out. This
-will clean your chroot directory too.
-
-Q: How do I use Fluxbox ? A: Add a new lists file with the fluxbox packages
-you want.
-
-Create /home/$USERNAME/.dmrc file (default username is "user").
-
-code{
-
-$ cat .dmrc [Desktop] Session=fluxbox }code
-
-Note: .dmrc is owned by $USERNAME:$USERNAME.
-
-See also http://wiki.debian.org/Fluxbox/ A short HOWTO can be found at
-http://wiki.debian.org/MichaelAblassmeier/CustomLiveCD
-
-Q: How do I use custom repositories? A: See
-http://wiki.debian.org/DebianLive/Configuration
-
-Q: How do I customize the artwork for the live CD (grub or syslinux boot
-splash, usplash, etc.)? A: See
-http://wiki.debian.org/DebianLive/Howto/Custom_Artwork
-
-Q: How do I customize desktop environment (KDE, GNOME, XFCE, etc...) look?
-A: Start the live system in qemu:
-
-code{
-
-$ qemu -m 256 -cdrom binary.iso -boot d -redir tcp:4222:10.0.2.15:22
-
-}code
-
-Note: the -redir argument must be changed to meet your needs
-
-Q: How do I execute a custom shell script inside the chroot system after the
-chroot stage? A: Add your script in config/chroot_local-hooks.
-
-Q: How do I add a script running immediately after all other scripts when
-the live system boots? A: Add your script in
-config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/99scrip
-
-code{
-
-$ chmod +x
-config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/99script
-
-}code
-
-Note: The hook script must be executable. Do not forget to lh_clean --chroot
-after making this change before you build again.
-
-You must also use the example script
-/usr/share/live-helper/examples/hooks/update-initramfs.sh to ensure your
-script gets built into the initramfs (read the comment header for
-instructions).
-
-Q: How do I add software not in Debian ? A: See Customizing package
-installation % FIXME: <xref linkend="packages"/>
-
-Q: What is the manifest with Ubuntu used for? A: Manifest is just the
-package list, which ubuntu does $something with. Don't worry about it.
-
-Q: What is this {p} syntax with mtools{p} and parted{p}? A: That's aptitude.
-
-Q: Do I need to write the image on USB stick to test it? A: you must use
-qemu >= 0.8.
-
-Q: What is /cow? A: Copy-on-write, the 'diff' from unionfs.
-
-Q: Is /usr/share/live-helper/lists/standard-x11 like preseed or is preseed
-something else entirely? A: It is not. It is a package list, not a debconf
-preseeding.
-
-Q: What is the difference between standard and minimal? A: standard:
-packages of priority standard and higher; minimal: packages of priority
-essential and higher;
-
-Q: What can the sections be used for? Aren't they BIG? A: Someone maybe
-wants to include packages from contrib or non-free.
-
-Q: memtest86+ ... is that used? A: Yes
-
-Q: How do I build using predefined packages lists? A: e.g. to build using
-standard-x11 packages list: #{$ sudo lh_config -p standard-x11 && sudo
-lh_build}# Note: The packages lists can be found in
-/usr/share/live-helper/lists/ directory.
-
-Q: How do I rebuild without downloading all the packages again? A: All
-packages are cached in cache subdirectory. They remain until a clean purge:
-#{$ sudo lh_clean --purge}# You do not have to do anything to prevent
-packages from being re-downloaded. You need to remember to clean whichever
-stages you want to rebuild first. e.g. to rebuild from the cached bootstrap,
-chroot packages and build a new image. #{$ sudo lh_clean && sudo lh_build}#
-
-Q: How do I boot USB debian-live on systems not supporting USB boot? A: Make
-a boot CD with grub, configured to boot from a debian-live kernel copied on
-the cd structure #{$ mkdir -p iso/boot/grub && cp
-/usr/lib/grub/i386-pc/stage2_eltorito iso/boot/grub && cp chroot/boot/*
-iso/boot/}# Create iso/boot/grub/menu.lst:
-
-code{
-
-default 0 timeout 5 color cyan/blue white/blue title Debian Live root (cd)
-kernel /boot/vmlinuz boot=live initrd /boot/initrd.img
-
-}code
-
-Create the iso image #{$ mkisofs -R -b boot/grub/stage2_eltorito
--no-emul-boot \ -boot-load-size 4 -boot-info-table -o grub.iso iso}# Burn
-the image.
-
-Q: How do I boot debian-live on systems not supporting CDROM or USB boot? A:
-If you have a floppy drive, you may be able to use it, otherwise you will
-need to use loadlin/grub4dos/win32-loader. If you have a second system to
-serve up the image over the network, See
-http://wiki.debian.org/DebianLive/Howto/Creating_a_Netboot_Image
-
-Q: The X configuration does not seems to work, the resolution is too
-low. What can I do? A: Use xdebconfigurator #{$ lh_config --bootappend
-xdebconf && lh_config --packages xdebconfigurator}#
-
-Q: Apache has problems with static files A: Sendfile does not work well on
-the unionfs used by Debian Live. Add the following to apache's
-configuration: #{EnableSendfile off}#
-
-Q: How do I make hard disk partitions auto-mountable? A: Short answer: Right
-now the best is to use a script that will populate the fstab when the CD is
-booting. Such a script can be found at
-https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-includes/sbin/diskmounter.sh.
-A proper solution based on HAL will be described here in a hopefully near
-future.  A: Long Answer: Since 55_nonpolkit-mount-policy.patch in HAL,
-debian-storage-policy-fixed-drives.fdi is not available anymore and the
-previous trick that consisted to remove this file to enable automounting of
-fixed drives as a consequence is obsolete. Eventually, it will be possible
-to combine HAL and PolicyKit to enable different permissions and actions to
-achieve advanced (auto)mounting for non-root users. Until then, because the
-live scripts are only touching to the fstab to add a swap partition if
-discovered at boot time, the only way to have fixed drives mounted
-automatically is to use a script that will populate the fstab file at the
-end of the multiuser runlevel. To achieve this, you can do, for example, the
-following: download the
-https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-includes/sbin/diskmounter.sh
-script Create the chroot_local-includes/sbin directory, and move the script
-inside Make sure the script is executable (chmod +x diskmounter.sh) create
-the chroot_local-includes/etc/rc.local file and call the diskmounter from
-there (see this
-https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-includes/etc/rc.local
-When called correctly, the script detects ext2, ext3, reiserfs, xfs, FAT32,
-HFS+ and NTFS partitions and mount them read-write, except for NTFS. This
-will change soon and an option will be available to use ntfs-3g to mount
-NTFS as read-write. comments, patches and other things about this script and
-issue: http://code.goto10.org/projects/puredyne/ticket/463
-
-Q: Boot fails with panic: can't open /scripts/live A: Add latest
-live-initramfs deb package into config/chroot_local-packages directory and
-rebuild.
-
-Q: How do I configure the locale and the keyboard? A: See 10n % FIXME: <xref
-linkend="internalization"/>
-
-Q: How do I get past boot prompt without a working keyboard? A: See
-Customizing the bootup process % FIXME: <xref linkend="bootup"/> Note: Boot
-from an USB-HDD on an iMac with GRUB did not work.
-
-Q: Can I serve the root image from a web or ftp server? A: Since
-live-initramfs 1.99, it should be possible to use the fetch= argument on the
-kernel command line. You can build a netboot image as usual, and when you
-are done edit the tftpboot/pxelinux.cfg/default file. Remove the references
-to network boot (netboot, nfsroot, nfsopts), and replace with fetch= <url
-where you placed the root image>. You have to include wget in the chroot. It
-could work for other boot methods as well. However, I am not sure the live
-scripts configure the network when booting from a CD or USB disk. #{$
-lh_config --packages wget}#
-
-Q: Why doesn't quickreboot (or some other boot parameter) work? A: If you
-are building an etch image (which was the default up to 2007/09/14) you have
-a very old version of casper which does not support quickreboot and possibly
-other boot parameters as well. You could configure your sources to use
-live-backports (see /usr/share/live-helper/examples/sources/live-backports)
-and switch to live-initramfs, or better yet, build a lenny image instead,
-which is the new default. #{$ lh_config --distribution lenny $ lh_config
---initramfs live-initramfs}#
-
-Q: How do I fix "Could not find kernel image" issue with syslinux
-bootloader? A: Add a binary local hook script to fix kernel and initrd path
-each time you build an
-image. e.g. config/binary_local-hooks/01-fix_syslinux.sh
-
-code{
-
-#!/bin/sh
-
-SYSLINUXCFG=`find binary -type f -name syslinux.cfg`
-
-sed -i "s|kernel /vmlinuz|kernel vmlinuz|g" ${SYSLINUXCFG} sed -i
-"s|initrd=/initrd|initrd=initrd|g" ${SYSLINUXCFG}
-
-$ chmod +x config/binary_local-hooks/01-fix_syslinux.sh
-
-}code
-
-Q: How do I use a newer kernel with lenny? A: A build with backports.org
-kernels will fail as that repository lacks the necessary module packages
-(linux-modules-extra-2.6, aufs, etc.). Use the kernel backports
-http://unsupported.debian-maintainers.org/backports-kernel/ The quick way to
-success:
-
-code{
-
-$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6
-squashfs-modules-2.6' $ echo 'deb
-http://unsupported.debian-maintainers.org/backports-kernel/ ./' >
-config/chroot_sources/backports-kernel.chroot $ echo 'deb
-http://unsupported.debian-maintainers.org/backports-kernel/ ./' >
-config/chroot_sources/backports-kernel.binary $ wget
-http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc
--O config/chroot_sources/backports-kernel.chroot.gpg $ wget
-http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc
--O config/chroot_sources/backports-kernel.binary.gpg $ lh_build }code
-
-Q: How do I use a custom kernel? Is there a nice way of booting debian-live
-with a custom kernel (not in an apt repo)? A: Copy it into
-config/chroot_local-packages and set LH_LINUX_PACKAGES="none" or use lh
-config --linux-packages " " Don't forget to compile your kernel with an
-union filesystem (unionfs or aufs), squashfs modules, and initrd support. I
-can cause the kernel to be installed but it seems this happens later than
-grub/syslinux is configured so it's not listed and casper/ and the menu
-require munging. You need to follow the debian scheme, e.g. placing the
-files in /boot as vmlinuz-$version and initrd.img-$version etc. I personally
-wouldn't go that way which is too much of a hassle, and just use make-kpkg
-to produce custom kernel deb packages. They should integrate nicely if you
-just put them into config/chroot_local-packages and set
-LH_LINUX_PACKAGES="". Hint: to work around an error, which
-lh_binary_syslinux will throw on custom kernels if there is not an 468/686
-in the kernel-name, you need to set CONFIG_LOCALVERSION="-486" or "-686"
-within the kernel configuration (-&gt; General setup -&gt; Local version set
-to -486 or -686) corresponding to LH_LINUX_FLAVOURS="" or "686". this at
-least up till live-helper version 1.0~a40-1 see
-http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-July/001947.html
-and
-http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-November/002581.html
-
-Q: How do I create a cross arch live CD image? A: In short: You can't. Read
-on: The procedure to create a live CD is based on creating a chroot that
-contains the files that will be finally available on the live CD. The live
-CD building procedure includes chrooting into the chroot dir and so some
-operations. chrooting means that the terminal you chroot on will behave as a
-different system so your real system and the chroot environment is decoupled
-somehow. Once the live CD scripts chroots into the chroot dir they have some
-operations to do inside that environment and your real system won't be able
-to run them unless you are using the same architecture. So you only are able
-to make live CD for the arch you run on. But this doesn't prevent you run
-qemu or some other machine emulator that make this possible.
-
-Q: When is a lh_clean necessary? lh_clean is a script in /usr/bin/ A: That
-depends what you've changed between builds If, for example, you've built an
-iso image and you want a usb image, you only need to run #{lh_clean
---binary}# before you run lh_build again. If you've changed anything in the
-chroot, you'll need to cleanup both chroot and binary with #{lh_clean}#
-before continuing
-
-Q: How can i set boot= parameters? A: Set LH_BOOTAPPEND_LIVE in
-config/binary
-
-Q: How do I include different modules to load when the live system boots? A:
-Configure config/chroot_local-includes/etc/initramfs-tools/
-
-The lh_chroot_hacks helper rebuilds the live/initrd1.img using the default
-initramfs.conf "MODULES = most". You may override that by supplying your own
-initramfs.conf, or else just add your own modules, e.g.
-
-code{
-
-mkdir -p config/chroot_local-includes/etc/initramfs-tools/ echo "atl2" >>
-config/chroot_local-includes/etc/initramfs-tools/modules
-
-}code
-
-Note: Even though initramfs.conf(5) says "most adds all the framebuffer,
-acpi, file system, ide, sata, scsi and usb drivers", it actually includes
-network drivers as well. See auto_add_modules() in
-/usr/share/initramfs-tools/hook-functions for the complete list.
-
-Q: Can I have a splash screen? A: Yes you can. You will not know what is
-going on when the splash screen is active, it may fail to activate on some
-hardware or break X on other (both usplash and splashy use libdirectfb which
-does some evil voodoo and may break you graphics or input until you
-reboot). However, you can install and activate it just as you would on any
-other Debian system. To use splashy: 1. install splashy and read the README,
-the manpages are useless for setting it up. Add some parameters to your
-kernel command line, such as in your pxelinux configuration or in
-LH_BOOTAPPEND_LIVE in config/binary in debian-live configuration: #{vga=792
-splash quiet}# #{vga}# to select video mode, #{splash}# to activate splashy,
-#{quiet}# to suppress most kernel messages that you cannot see anyway but
-would scroll past before splashy manages to paint the graphics on your
-screen. You might want to add splashy to the list of packages installed in
-your image: #{echo splashy > config/chroot_local-packageslists/splashy echo
-splashy-themes >> config/chroot_local-packageslists/splashy}# and select a
-theme:
-
-code{
-
-echo '#!/bin/sh' > config/chroot_local-hooks/splashy echo splashy_config -s
-debian-moreblue '||' true >> config/chroot_local-hooks/splashy # update the
-ramdisk to include the splash screen echo update-initramfs -u -k all >>
-config/chroot_local-hooks/splashy chmod 755
-config/chroot_local-hooks/splashy
-
-}code
-
-After you rebuild your live system you should observe a bluish splash screen
-while booting. Nothing happens while initramfs is running because there is
-no splashy support in initramfs-tools. Once the init starts the progress bar
-should start to fill. If #{vga=something}# sets a mode that your screen
-cannot show or your card cannot do vesa 2.0 (and thus you get plain text
-mode and no splashy) read the splashy faq.
-
-Q: Howto use my Broadcom eXtrem 2 network card (module bnx2)? A: Add the
-firmwares to the initrd image. You need to install the non-free package
-"firmware-bnx2". Uncompress your initrd image, then copy files:
-
-code{
-
-cp /lib/firmware/bnx2x-e1-4.8.53.0.fw /lib/firmware/bnx2x-e1-5.0.21.0.fw
-/lib/firmware/bnx2x-e1h-4.8.53.0.fw /lib/firmware/bnx2x-e1h-5.0.21.0.fw
-${INITRD}/lib/firmware/ cp /lib/udev/firmware.agent ${INITRD}/lib/udev/
-
-}code
-
-Recompress your initrd image and boot: it works!
-
-Q: X is broken (the system boots, messages scroll by, and then the screen
-goes blank). What do I do? A: On my system starting X completely disables
-graphics so that I do not see anything even after X bails out and I am back
-to the console. To prevent this you can change the driver Xorg uses.
-
-If you have a working splash screen or at least graphical console you can
-use #{live xdriver=fbdev}# when booting the live system (instead of just
-enter). Another driver you might want to try is #{vesa}#. If all fails you
-might try to set xdriver to some wrong value so that Xorg fails to start and
-you can examine the system while you still see something on the
-console. #{live xdriver=none}#
-
-Q: How can I get Debian first stable versions? A: I'm developing software
-and testing it on Live-CD. Thanks for the LiveCD project. To be sure my
-development is fully compatible with the "etch" version, I need the same
-scenario when Debian GNU/Linux 4.0 was published as stable (I believe
-2007.04.08). If there was some bug on 2007.04.08 that was corrected one week
-later, I need to test software foreseeing that scenario without the bug
-solved.
-
-Q: I get "fopen: Permission denied"-warnings from apt on building/at the
-live-system A: That's a harmless bug in apt. However, if you want to get off
-this warnings in the live-system, add a file in chroot_local-hooks with
-follow row:
-
-code{
-
-chown -R man.man /var/cache/man
-
-}code
-
-Q: Why I always fail during "Retrieving Packages" stage when running
-lh_build? I have already set apt-http-proxy and so on.  A: lh_build
-retrieves packages via wget, as a result you need to enable the proxy
-settings in /etc/wgetrc before running lh_build.
-
-Q: How do I edit Xorg.conf? A: Xorg.conf is generated every time system
-boots, so it's useless to put modifed Xorg.conf in
-config/choort_local-includes/etc/X11, because it will be overwritten during
-boot. However, you can edit /usr/bin/dexconf, which generate xorg.conf
-during boot, so the result will be modified Xorg.conf. The modified dexconf
-has to be put in config/choort_local-includes/usr/bin. e.g.: you can
-configure Xorg.conf for two or more keyboards layouts with alt+shift toggle
-by editing dexconf and replacing the line:
-
-code{
-
-Option "XkbLayout" "$XKB_LAYOUT"
-
-}code
-
-with the lines:
-
-code{
-
-Option "XkbLayout" "us,il" Option "XkbOptions"
-"grp:alt_shift_toggle,grp_led:scroll"
-
-}code
-
-when "us,il" are the wanted keyboard layouts.
-
-You can force default screen resulotion (e.g. 1024*768) by adding the lines:
-
-code{
-
-SubSection "Display"
-        Modes "1024x768"
-EndSubSection
-
-}code
-
-between the lines:
-
-code{
-
-Section "Screen"
-        Identifier "Default Screen"
-        Monitor "Configured Monitor"
-EndSection"
-
-}code
-
-Q: Where are the build parameters for the prebuilt images A: See
-http://live.debian.net/README.images.
diff --git a/manual/pt_BR/other_howtos.ssi b/manual/pt_BR/other_howtos.ssi
deleted file mode 100644
index 63e84bf..0000000
--- a/manual/pt_BR/other_howtos.ssi
+++ /dev/null
@@ -1,118 +0,0 @@
-B~ Howtos
-
-1~ Howtos
-
-2~ ISO
-
-Generating a Debian Live CD is very simple. You need to have live-helper
-(package available in Debian sid and lenny), and Debootstrap (or
-cdebootstrap) from etch or newer.
-
-3~ Install live-helper
-
-#{apt-get install live-helper}#
-
-3~ Configure the current working directory with lh_config
-
-code{
-
-lh_config -b iso -a $ARCH
-
-}code
-
-where #{$ARCH}# is the intended architecture (i.e. - i386 or amd64).
-
-#{-b}# flag is used to be sure to obtain image in ISO format.
-
-3~ Build the image with lh_build:
-
-Execute lh_build as root: #{lh_build}#
-
-The command above will create the basic image, containing just the Debian
-standard system (with no X at all).
-
-If you want to have any of the Desktop environments on your livecd, #{ls
-/usr/share/live-helper/lists}# will show a number of available package Lists
-to choose from, e.g. #{lh_config -p gnome-desktop}#
-
-More examples are listed at DebianLive/Examples.
-
-See packages for help configuring a local Debian Mirror and other aspects of
-the live system.  % FIXME: <xref linkend="packages"/>
-
-3~ Test the image
-
-If you have qemu installed, you can boot the image with:
-
-code{
-
-qemu -cdrom binary.iso
-
-}code
-
-If you have also kqemu installed, you can add #{-kernel-kqemu}#
-
-2~ ISO_(multiarch)
-
-Multiple machine boot CDs can be created with the following manual
-procedure. This procedure has been successfully used to create a single CD
-which is bootable on alpha, i386, pmax, and sparc. It should be possible to
-also make the CD bootable on macppc, vax and on sun2, sun3 and sun3x.
-
-To create a CD which is bootable by multiple architectures, use the
-following steps in this order. Please note that the order is critical.
-
-Make sure you have all the required files including the various kernels and
-boot programs listed in the individual machine sections.
-
-Include a directory somewhere in the cdsources directory called mdec.pmax
-and include the pmax bootxx_cd9660 file there. For example,
-/cdsources/usr/mdec.pmax/bootxx_cd9660.
-
-Include a directory somewhere in the cdsources directory called mdec.vax and
-include the vax xxboot file there. For example,
-#{cdsources/usr/mdec.vax/xxboot.}#
-
-Include the macppc ofwboot.xcf bootloader in /cdsources.
-
-Create an i386 bootable image. #{sh mkisofs -v -v -o output.iso -b
-i386/installation/floppy/boot-big.fs \ -c boot.catalog -l -J -r -L
-/cdsources 2>&1 | tee /tmp/mkisofs.log exit}#
-
-Note: The appearance of the -v flag twice is required. If you are making a
-bootable CD for an Open Firmware 3 macppc model, make sure to include -hfs
--part in the parameters for mkisofs.
-
-Run mksunbootcd on a NetBSD/sparc machine to install sparc and sun2/sun3
-bootblocks. Alternatively, install the sysutils/mksunbootcd package on your
-favorite NetBSD machine. #{mksunbootcd output.iso boot-sun4.fs boot-sun4c.fs
-boot-sun4m.fs boot-sun3.fs}#
-
-Run the installboot(8) program targeted for NetBSD/pmax to install the pmax
-bootblocks. Note that in order to coexist with other NetBSD boot blocks, the
-pmax boot block is appended to the end of the ISO file system.
-
-#{installboot -m pmax -v -o append,sunsum output.iso
-/tmp/mdec.pmax/bootxx_cd9660}#
-
-The -o append,sunsum option appends the first stage boot block to the end of
-the ISO file system, and restores the checksum used when booting on a sun.
-
-Run the installboot(8) program targeted for NetBSD/vax to install the vax
-bootblocks. Note that in order to coexist with other NetBSD boot blocks, the
-vax boot block is appended to the end of the ISO file system.
-
-installboot -m vax -v -o append,sunsum output.iso /tmp/mdec.vax/xxboot
-
-(See the pmax entry above for an explanation of the flags).
-
-Run the installboot(8) program targeted for NetBSD/alpha to install the
-alpha bootblocks.
-
-#{installboot -m alpha -v -o append,sunsum output.iso
-/tmp/mdec.alpha/bootxx_cd9660}#
-
-Note: The alpha installboot must occur after the others, because currently
-it's the only machine dependent back-end for installboot(8) that can
-calculate the alpha checksum. (See the pmax entry above for an explanation
-of the flags).
diff --git a/manual/pt_BR/project_bugs.ssi b/manual/pt_BR/project_bugs.ssi
index cce48f8..7eaaaea 100644
--- a/manual/pt_BR/project_bugs.ssi
+++ b/manual/pt_BR/project_bugs.ssi
@@ -21,42 +21,44 @@ used and the distribution of the live system you are building.
 
 2~ Known issues
 
-Due to the nature of Debian *{testing}* and Debian *{unstable}*
-distributions being a moving target, building a live system may not always
-be possible.
+Because Debian *{testing}* and Debian *{unstable}* distributions are a
+moving target, when you specify either as the target system distribution, a
+successful build may not always be possible.
 
-If this is a problem, do not build a system based on *{testing}* or
-*{unstable}*, but go with *{stable}*. live-build does always default to the
-current *{stable}* release.
+% FIXME:
+
+If this causes too much difficulty for you, do not build a system based on
+*{testing}* or *{unstable}*, but rather, use *{stable}*. live-build does
+always default to the *{stable}* release.
 
 Currently known issues are listed under the section 'status' on our homepage
-at http://live.debian.net/
+at http://live.debian.net/.
 
-It is out of the scope of this manual to train you in correctly identifying
-and fixing problems in packages of the development distributions, however,
-there are two things you can always try: When not succeeding to build
-*{testing}*, try if *{unstable}* works. If *{unstable}* does not work
-either, revert to *{testing}* and pinning the newer version of the failing
-package from *{unstable}*.
+It is out of the scope of this manual to train you to correctly identify and
+fix problems in packages of the development distributions, however, there
+are two things you can always try: If a build fails when the target
+distribution is *{testing}*, try *{unstable}*. If *{unstable}* does not work
+either, revert to *{testing}* and pin the newer version of the failing
+package from *{unstable}* (see {APT pinning}#apt-pinning for details).
 
 2~ Rebuild from scratch
 
-To ensure that a particular bug is not caused by an unclean built system,
+To ensure that a particular bug is not caused by an uncleanly built system,
 please always rebuild the whole live system from scratch to see if the bug
 is reproducible.
 
 2~ Use up-to-date packages
 
 Using outdated packages can cause significant problems when trying to
-reproduce (and ultimately fix) your problem.
+reproduce (and ultimately fix) your problem. Make sure your build system is
+up-to-date and any packages included in your image are up-to-date as well.
 
 2~collect-information Collect information
 
-Please provide enough information with your report. At a minimum, it should
-contain the exact version of live-build version where the bug is
-encountered, and steps to reproduce it. Please use common sense and include
-other relevant information if you think that it might help in solving the
-problem.
+Please provide enough information with your report. At least include the
+exact version of live-build version where the bug is encountered and steps
+to reproduce it. Please use common sense and include other relevant
+information if you think that it might help in solving the problem.
 
 To make the most out of your bug report, we require at least the following
 information:
@@ -69,7 +71,7 @@ _* Version of live-boot on the live system
 
 _* Version of live-config on the live system
 
-_* Version of debootstrap and/or cdebootstrap on the host system
+_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system
 
 _* Architecture of the live system
 
@@ -77,26 +79,43 @@ _* Distribution of the live system
 
 _* Version of the kernel on the live system
 
-You can generate a log of the build process by using the tee command:
+You can generate a log of the build process by using the #{tee}# command. We
+recommend doing this automatically with an #{auto/build}# script; see
+{Managing a configuration}#managing-a-configuration for details).
 
 code{
 
-lb build 2>&1 | tee build.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
-For runtime log, live-boot stores a log in /var/log/live.log (or
-/var/log/live-boot.log).
+At boot time, live-boot stores a log in #{/var/log/live.log}# (or
+#{/var/log/live-boot.log}#).
 
 Additionally, to rule out other errors, it is always a good idea to tar up
-your config directory and upload it somewhere (do *{not}* send it as an
-attachment to the mailinglist), so that we can try to reproduce the errors
-you encountered.
+your #{config/}# directory and upload it somewhere (do *{not}* send it as an
+attachment to the mailing list), so that we can try to reproduce the errors
+you encountered. If this is difficult (e.g. due to size) you can use the
+output of #{lb config --dump}# which produces a summary of your config tree
+(i.e. lists files in subdirectories of #{config/}# but does not include
+them).
 
 Remember to send in any logs that were produced with English locale
 settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or
 #{LC_ALL=en_US}#.
 
+2~ Isolate the failing case if possible
+
+If possible, isolate the failing case to the smallest possible change that
+breaks. It is not always easy to do this, so if you can't manage it for your
+report, don't worry. However, if you plan your development cycle well, using
+small enough change sets per iteration, you may be able to isolate the
+problem by constructing a simpler 'base' configuration that closely matches
+your actual configuration plus just the broken change set added to it. If
+you have a hard time sorting out which of your changes broke, it may be that
+you are including too much in each change set and should develop in smaller
+increments.
+
 2~ Use the correct package to report the bug against
 
 Where does the bug appear?
@@ -121,9 +140,9 @@ can fail. If a bug appears here, check if the error is also reproducible on
 a normal system.
 
 If this is the case, this is not a bug in Debian Live, but rather in Debian
-- please report it against the failing package. Running debootstrap
-seperately from the Live system build or running lb bootstrap with
-#{--debug}# will give you more information.
+- please report it against the failing package. Running #{debootstrap}#
+separately from the Live system build or running #{lb bootstrap --debug}#
+will give you more information.
 
 Also, if you are using a local mirror and/or any of sort of proxy and you
 are experiencing a problem, please always reproduce it first by
@@ -134,10 +153,10 @@ bootstrapping from an official mirror.
 If your image does not boot, please report it to the mailing list together
 with the information requested in {Collect
 information}#collect-information. Do not forget to mention, how/when the
-image failed, in Qemu, VMWare or real hardware. If you are using a
-virtualization technology of any kind, please always run it on real hardware
-before reporting a bug. Providing a screenshot of the failure is also very
-helpful.
+image failed, in Qemu, Virtualbox, VMWare or real hardware. If you are using
+a virtualization technology of any kind, please always run it on real
+hardware before reporting a bug. Providing a screenshot of the failure is
+also very helpful.
 
 3~ At run time
 
diff --git a/manual/pt_BR/project_coding-style.ssi b/manual/pt_BR/project_coding-style.ssi
index a0e5959..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
 
@@ -71,22 +71,22 @@ foo ()
 
 _* Variables are always in capital letters.
 
-_* Variables that used in lb config always start with LH_ prefix.
+_* Variables that used in #{lb config}# always start with #{LB_}# prefix.
 
-_* Internal temporary variables in live-build should start with the _LH_
-prefix.
+_* Internal temporary variables in live-build should start with the
+#{\_LB_}# prefix.
 
-_* Local variables start with live-build __LH_ prefix.
+_* Local variables start with live-build #{\_\_LB_}# prefix.
 
 _* Variables in connection to a boot parameter in live-config start with
-LIVE_.
+#{LIVE_}#.
 
-_* All other variables in live-config start with _ prefix.
+_* All other variables in live-config start with #{_}# prefix.
 
-_* Use braces around variables; eg. write ${FOO} instead of $FOO.
+_* Use braces around variables; e.g. write #{${FOO}}# instead of #{$FOO}#.
 
-_* Always protect variables with quotes to respect potential whitespaces,
-write "${FOO}" not ${FOO}.
+_* Always protect variables with quotes to respect potential whitespaces:
+write #{"${FOO}"}# not #{${FOO}}#.
 
 _* For consistency reasons, always use quotes when assigning values to
 variables:
@@ -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,20 +124,21 @@ Good:
 
 code{
 
-if [ -f "${FOO}/foo/${BAR}/bar" ]
-then
-        foobar
-fi
+ if [ -f "${FOO}/foo/${BAR}/bar" ]
+ then
+         foobar
+ fi
 
 }code
 
 2~ Miscellaneous
 
-_* Use "|" (without the surround quotes) as a seperator in calls to sed,
-e.g. "sed -e 's|foo|bar|'" (without "").
+_* Use "#{|}#" (without the surround quotes) as a seperator in calls to sed,
+e.g. "#{sed -e 's|foo|bar|'}#" (without "").
 
-_* Don't use the test command for comparisons or tests, use "[" "]" (without
-""), e.g. "if [ -x /bin/foo ]; ..." and not "if test -x /bin/foo; ...".
+_* Don't use the #{test}# command for comparisons or tests, use "#{[}#"
+"#{]}#" (without ""); e.g. "#{if [ -x /bin/foo ]; ...}#" and not "#{if test
+-x /bin/foo; ...}#".
 
-_* Use case wherever possible over test, as it's easier to read and faster
-in execution.
+_* Use #{case}# wherever possible over #{test}#, as it's easier to read and
+faster in execution.
diff --git a/manual/pt_BR/project_procedures.ssi b/manual/pt_BR/project_procedures.ssi
index f71f5fe..fb4ede8 100644
--- a/manual/pt_BR/project_procedures.ssi
+++ b/manual/pt_BR/project_procedures.ssi
@@ -1,6 +1,6 @@
 B~ Procedures
 
-1~ Procedures
+1~procedures Procedures
 
 This chapter documents the procedures within the Debian Live project for
 various tasks that need cooperation with other teams in Debian.
@@ -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 b4e6373..ae7318e 100644
--- a/manual/pt_BR/user_basics.ssi
+++ b/manual/pt_BR/user_basics.ssi
@@ -36,9 +36,7 @@ SquashFS compressed filesystem is used to minimize the Debian Live image
 size. Note that it is read-only. So, during boot the Debian Live system will
 use a RAM disk and 'union' mechanism to enable writing files within the
 running system. However, all modifications will be lost upon shutdown unless
-optional persistence is used (see persistence).
-
-% FIXME: <xref linkend="persistence"/>
+optional persistence is used (see {Persistence}#persistence).
 
 _* *{Bootloader}*: A small piece of code crafted to boot from the chosen
 media, possibly presenting a prompt or menu to allow selection of
@@ -52,7 +50,7 @@ partitions, etc.
 
 You can use live-build to build the system image from your specifications,
 set up a Linux kernel, its initrd, and a bootloader to run them, all in one
-media-dependant format (ISO9660 image, disk image, etc.)
+media-dependant format (ISO9660 image, disk image, etc.).
 
 2~ First steps: building an ISO image
 
@@ -67,19 +65,19 @@ hierarchy in the current directory for use by other commands:
 
 code{
 
-$ lb config
+ $ lb config
 
 }code
 
 By passing no parameters to #{lb config}#, we indicated that we wish to use
 the defaults (see {The lb config command}#lb-config).
 
-Now that we have a "config/" hierarchy, we may build the image with the lb
-build command:
+Now that we have a "config/" hierarchy, we may build the image with the #{lb
+build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -92,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
 
@@ -104,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
 
@@ -120,7 +118,7 @@ resolution is limited to 800x600.
 
 code{
 
-# lb config --packages virtualbox-ose-guest-x11
+ $ lb config --packages virtualbox-ose-guest-x11
 
 }code
 
@@ -130,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
 
@@ -152,7 +150,7 @@ lb clean command}#lb-clean):
 
 code{
 
-$ lb clean --binary
+ # lb clean --binary
 
 }code
 
@@ -161,15 +159,15 @@ Run the #{lb config}# command with the parameters to configure the
 
 code{
 
-$ lb config -b usb-hdd
+ $ lb config -b usb-hdd
 
 }code
 
-Now build the image with the #{lb build} command:
+Now build the image with the #{lb build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -181,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
 
@@ -193,15 +191,15 @@ better yet, #{ls -l /dev/disk/by-id}#.
 *{This will definitely overwrite any previous contents on your stick!}*
 
 Note: As discussed earlier, this same process can be used for #{iso-hybrid}#
-type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images.
+type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images.
 
 3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu
 
 code{
 
-# apt-get install qemu
+ # apt-get install qemu
 
-$ qemu -hda binary.img
+ $ qemu -hda binary.img
 
 }code
 
@@ -214,7 +212,7 @@ be used by the Debian Live system.
 
 code{
 
-# gparted ${USBSTICK}
+ # gparted ${USBSTICK}
 
 }code
 
@@ -223,7 +221,7 @@ it. One possible choice would be ext4.
 
 code{
 
-# mkfs.ext4 ${USBSTICK}
+ # mkfs.ext4 ${USBSTICK}
 
 }code
 
@@ -231,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
 
@@ -248,31 +246,31 @@ working directory with the #{lb clean}# command:
 
 code{
 
-$ lb clean --binary
+ # lb clean --binary
 
 }code
 
-Run the #{lb config}# command with the parameters to configure the "config/"
-hierarchy to create our netboot image:
+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
 
-In contrast with the ISO and USB/HDD images, netbooting does not support
-serving a filesystem image with the client, so the files must be served via
-NFS. The net-root-path and net-root-server options specify the location and
-server, respectively, of the NFS server where the filesytem image will be
-located at boot time.
+In contrast with the ISO and USB/HDD images, netbooting does not, itself,
+serve the filesystem image to the client, so the files must be served via
+NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the
+location and server, respectively, of the NFS server where the filesytem
+image will be located at boot time. Make sure these are set to suitable
+values for your network and server.
 
 Now build the image with the #{lb build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -283,12 +281,13 @@ next step is getting a higher level bootloader via the TFTP protocol. That
 could be pxelinux, GRUB, or even boot directly to an operating system like
 Linux.
 
-For example, if you unpack the generated binary-net.tar.gz archive in the
-/srv/debian-live directory, you'll find the filesystem image in
-live/filesystem.squashfs and the kernel, initrd and pxelinux bootloader in
-tftpboot/debian-live/i386.
+For example, if you unpack the generated #{binary-net.tar.gz}# archive in
+the #{/srv/debian-live}# directory, you'll find the filesystem image in
+#{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader
+in #{tftpboot/debian-live/i386}#.
 
-We must now configure three services on the server to enable netboot.
+We must now configure three services on the server to enable netboot: the
+DHCP server, the TFTP server and the NFS server.
 
 3~ DHCP server
 
@@ -297,33 +296,26 @@ to the netbooting client system, and to advertise the location of the PXE
 bootloader.
 
 Here is an example for inspiration, written for the ISC DHCP server
-#{isc-dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;
-
-% FIXME
+#{isc-dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:
 
 code{
 
-subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
-
-  # IP addresses available for guests
-  range 192.168.1.100 192.168.1.149;
+ # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server
 
-  # allow booting from the net
-  allow bootp;
+ ddns-update-style none;
 
-  # for net booting, server where the first file to be loaded (by TFTP
-  # protocol) ("filename" following definition) lies : so the TFTP
-  # server's name.
-  next-server myserver;
+ option domain-name "example.org";
+ option domain-name-servers ns1.example.org, ns2.example.org;
 
-  # net boot configuration for guests with a PXE client :
-  if substring (option vendor-class-identifier, 0, 9) = "PXEClient" {
-    # Note: all files for PXE are relatives to the TFTP server's root
+ default-lease-time 600;
+ max-lease-time 7200;
 
-    # PXE bootloader (first program to be loaded, by TFTP)
-    filename "pxelinux.0";
+ 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";
 }
 
 }code
@@ -333,12 +325,12 @@ subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
 This serves the kernel and initial ramdisk to the system at run time.
 
 You should install the tftpd-hpa package. It can serve all files contained
-inside a root directory, usually /srv/tftp. To let it serve files inside
-/srv/debian-live/tftpboot, run as root the following command:
+inside a root directory, usually #{/srv/tftp}#. To let it serve files inside
+#{/srv/debian-live/tftpboot}#, run as root the following command:
 
 code{
 
-dpkg-reconfigure -plow tftpd-hpa
+ # dpkg-reconfigure -plow tftpd-hpa
 
 }code
 
@@ -350,14 +342,14 @@ Once the guest computer has downloaded and booted a Linux kernel and loaded
 its initrd, it will try to mount the Live filesystem image through a NFS
 server.
 
-You need to install the nfs-kernel-server package.
+You need to install the #{nfs-kernel-server}# package.
 
 Then, make the filesystem image available through NFS by adding a line like
-the following to /etc/exports:
+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
 
@@ -365,15 +357,16 @@ and tell the NFS server about this new export with the following command:
 
 code{
 
-# exportfs -rv
+ # exportfs -rv
 
 }code
 
 Setting up these three services can be a little tricky. You might need some
-patience to get all of them working together. The Debian Installer Manual's
-TFTP Net Booting section at
-http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html might help as that
-process is very similar.
+patience to get all of them working together. For more information, see the
+syslinux wiki at http://syslinux.zytor.com/wiki/index.php/PXELINUX or the
+Debian Installer Manual's TFTP Net Booting section at
+http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html. They might help,
+as their processes are very similar.
 
 3~ Netboot testing HowTo
 
@@ -384,51 +377,64 @@ To make our life easier, we can use virtualization. There are two solutions.
 
 3~ Qemu
 
-_* Install qemu, bridge-utils, sudo.
+_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#.
 
-Edit /etc/qemu-ifup:
+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
 
-Get, or build a grub-floppy-netboot (in the svn).
+Get, or build a #{grub-floppy-netboot}# (in the svn).
 
-Launch qemu with "-net nic,vlan=0 -net tap,vlan=0,ifname=tun0"
+Launch #{qemu}# with "#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#"
 
 3~ VMWare Player
 
 _* Install VMWare Player ("free as in beer" edition)
 
-_* Create a PXETester directory, and create a text file called pxe.vwx
+_* Create a PXETester directory, and create a text file called #{pxe.vwx}#
 inside
 
 _* 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
 
-_* You can play with this configuration file (i.e. change memory limit to
+_* You can play with this configuration file (e.g. change memory limit to
 256)
 
 _* Double click on this file (or run VMWare player and select this file).
diff --git a/manual/pt_BR/user_customization-contents.ssi b/manual/pt_BR/user_customization-contents.ssi
index f8d01ce..3906219 100644
--- a/manual/pt_BR/user_customization-contents.ssi
+++ b/manual/pt_BR/user_customization-contents.ssi
@@ -2,42 +2,45 @@
 
 1~customizing-contents Customizing contents
 
-This chapter discusses further customization of the live system.
+This chapter discusses fine-tuning customization of the live system contents
+beyond merely choosing which packages to include. Includes allow you to add
+or replace arbitrary files in your Debian Live image, hooks allow you to
+execute arbitrary commands at different stages of the build and at boot
+time, and preseeding allows you to configure packages when they are
+installed by supplying answers to debconf questions.
 
 2~ Includes
 
-Using includes, it is possible to add (or replace) arbitrary files in your
-Debian Live image. live-build provides three mechanisms for using them:
+While ideally a Debian live system would include files entirely provided by
+unmodified Debian packages, it is sometimes convenient to provide or modify
+some content by means of files. Using includes, it is possible to add (or
+replace) arbitrary files in your Debian Live image. live-build provides
+three mechanisms for using them:
 
 _* Chroot local includes: These allow you to add or replace files to the
-chroot/Live filesystem. Please see chroot-local-includes for more
-information.
-
-% FIXME: <xref linkend="chroot-local-includes"/>
+chroot/Live filesystem. Please see {Live/chroot local
+includes}#live-chroot-local-includes for more information.
 
 _* Binary local includes: These allow you to add or replace files in the
-binary image. Please see binary-local-includes for more information.
-
-% FIXME: <xref linkend="binary-local-includes"/>
+binary image. Please see {Binary local includes}#binary-local-includes for
+more information.
 
 _* Binary includes: These allow you to add or replace Debian specific files
 in the binary image, such as the templates and tools directories. Please see
-binary-includes for more information.
-
-% FIXME: <xref linkend="binary-includes"/>
-
-Please see terms for more information about the distinction between the
-"Live" and "binary" images.
+{Binary includes}#binary-includes for more information.
 
-% FIXME: <xref linkend="terms"/>
+Please see {Terms}#terms for more information about the distinction between
+the "Live" and "binary" images.
 
-3~ Live/chroot local includes
+3~live-chroot-local-includes Live/chroot local includes
 
 Chroot local includes can be used to add or replace files in the chroot/Live
-filesystem so that they are visible when the Live system is booted. Typical
-uses for them are to populate the skeleton user directory (#{/etc/skel}#)
-used by the live system to create the live user's home directory, or adding
-configuration files where additional processing is not required.
+filesystem so that they may be used in the Live system. A typical use is to
+populate the skeleton user directory (#{/etc/skel}#) used by the Live system
+to create the live user's home directory. Another is to supply configuration
+files that can be simply added or replaced in the image without processing;
+see {Live/chroot local hooks}#live-chroot-local-hooks if processing is
+needed.
 
 To include files, simply add them to your #{config/chroot_local-includes}#
 directory. This directory corresponds to the root directory (#{/}#) of the
@@ -46,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
 
@@ -55,42 +58,59 @@ 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
 
 Chroot local includes are installed after package installation so that files
 installed by packages are overwritten.
 
-3~ Binary local includes
+3~binary-local-includes Binary local includes
 
-The same way as chroot local includes work, there exists the corresponding
-mechanism to include files in the live media itself.
+To include material such as documentation or videos on the media filesystem
+so that it is accessible immediately upon insertion of the media without
+booting the Live system, you can use binary local includes. This works in a
+similar fashion to chroot local includes. For example, suppose the files
+#{~/video_demo.*}# are demo videos of the live system described by and
+linked to by an HTML index page. Simply copy the material to
+#{config/binary_local-includes/} as follows:
 
-3~ Binary includes
+code{
+
+ $ cp ~/video_demo.* config/binary_local-includes/
+
+}code
+
+These files will now appear in the root directory of the live media.
+
+3~binary-includes Binary includes
 
 live-build has some standard files (like documentation) that gets included
 in the default configuration on every live media. This can be disabled with:
 
 code{
 
-$ lb config --includes none
+ $ lb config --includes none
 
 }code
 
+Otherwise, the material will be installed by live-build in #{/includes/}# by
+default on the media filesystem, or else you can specify an alternate path
+with #{--includes}#.
+
 2~ Hooks
 
 Hooks allow commands to be performed in the chroot and binary stages of the
 build in order to customize the image.
 
-3~ Live/chroot local hooks
+3~live-chroot-local-hooks Live/chroot local hooks
 
 To run commands in the chroot stage, create a hook script containing the
 commands in the #{config/chroot_local-hooks}# directory. The hook will run
@@ -101,6 +121,17 @@ various common chroot customization tasks provided in
 #{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
 use them in your own configuration.
 
+3~ Boot-time hooks
+
+To execute commands at boot time, you can supply live-config hooks as
+explained in the "Customization" section of its man page. Examine
+live-config's own hooks provided in #{/lib/live/config/}#, noting the
+sequence numbers. Then provide your own hook prefixed with an appropriate
+sequence number, either as a chroot local include in
+#{config/chroot_local-includes/lib/live/config/}#, or as a custom package as
+discussed in {Installing modified or third-party
+packages}#installing-modified-or-third-party-packages.
+
 3~ Binary local hooks
 
 To run commands in the binary stage, create a hook script containing the
diff --git a/manual/pt_BR/user_customization-installer.ssi b/manual/pt_BR/user_customization-installer.ssi
index fcb326a..6ed2152 100644
--- a/manual/pt_BR/user_customization-installer.ssi
+++ b/manual/pt_BR/user_customization-installer.ssi
@@ -3,52 +3,87 @@
 1~customizing-installer Customizing Debian Installer
 
 Debian Live system images can be integrated with Debian Installer. There are
-number of different "types" of installation, varying in what and how to
-install the image.
+a number of different types of installation, varying in what is included and
+how the installer operates.
 
 Please note the careful use of capital letters when referring to the "Debian
 Installer" in this section - when used like this we refer explicitly to the
 official installer for the Debian system, not anything else. It is often
 seen abbreviated to "d-i".
 
+2~ Types of Debian Installer
+
 The three main types of installer are:
 
-_* *{"Regular" Debian Installer}*: This is a normal Debian Live image with a
-seperate kernel and initrd which (when selected from the appropriate
-bootloader) launches into a standard Debian Installer instance, just as if
-you had downloaded a CD image of Debian and booted it. Images containing a
-live system and such an otherwise indepentend installer are often referet to
-as "combined images".
+*{"Regular" Debian Installer}*: This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as "combined images".
 
 On such images, Debian is installed by fetching and installing .deb packages
 using #{debootstrap}# or #{cdebootstrap}#, from the local media or some
-network-base network, resulting in a standard Debian system being installed
+network-based network, resulting in a standard Debian system being installed
 to the hard disk.
 
 This whole process can be preseeded and customized in a number of ways; see
 the relevant pages in the Debian Installer manual for more information. Once
-you have a working preseeding file, live-build can automatically place it to
+you have a working preseeding file, live-build can automatically put it in
 the image and enable it for you.
 
-_* *{"Live" Debian Installer}*: This is a Debian Live image with a seperate
-kernel and initrd which (when selected from the appropriate bootloader)
-launches into an instance of the Debian Installer.
+*{"Live" Debian Installer}*: This is a Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into an instance of the Debian Installer.
 
 Installation will proceed in an identical fashion to the "Regular"
 installation described above, but at the actual package installation stage,
-instead of using #{debootstrap}# to fetch and install packages, the "live"
-filesystem image is copied to the target. This is acchieved with a special
-udeb called live-installer. live-installer can be preseeded to be disabled,
-allowing to support normal and live installer entries in the bootloader of
-the same live media.
+instead of using #{debootstrap}# to fetch and install packages, the live
+filesystem image is copied to the target. This is achieved with a special
+udeb called live-installer.
 
 After this stage, the Debian Installer continues as normal, installing and
 configuring items such as bootloaders and local users, etc.
 
-_* *{"Desktop" Debian Installer}*: Regardless of the mode Debian Installer
-is used in, d-i can be launched from the Desktop by clicking on an
-icon. This is user friendlier in some situations. In order to make use of
-this, the debian-installer-launcher package needs to be included.
+Note: to support both normal and live installer entries in the bootloader of
+the same live media, you must disable live-installer by preseeding
+#{live-installer/enable=false}.
+
+*{"Desktop" Debian Installer}*: Regardless of the type of Debian Installer included, #{d-i}# can be launched from the Desktop by clicking on an icon. This is user friendlier in some situations. In order to make use of this, the debian-installer-launcher package needs to be included.
+
+Note that by default, live-build does not include Debian Installer images in
+the images, it needs to be specifically enabled with #{lb config}#. Also,
+please note that for the "Desktop" installer to work, the kernel of the live
+system must match the kernel #{d-i}# uses for the specified
+architecture. For example:
+
+code{
+
+ $ lb config --architecture i386 --linux-flavours 486 \
+     --debian-installer live --packages debian-installer-launcher
+
+}code
+
+2~ Customizing Debian Installer by preseeding
+
+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 answers to questions asked during the installation process,
+without having to manually enter the answers while the installation is
+running. This makes it possible to fully automate most types of installation
+and even offers some features not available during normal installations."
+This kind of customization is best accomplished with live-build by placing
+the configuration in a #{preseed.cfg}# file included in
+#{config/binary_debian-installer/}#. For example, to preseed setting the
+locale to #{en_US}#:
+
+code{
+
+ $ echo "d-i debian-installer/locale string en_US" \
+     >> config/binary_debian-installer/preseed.cfg
+
+}code
+
+2~ Customizing Debian Installer content
+
+For experimental or debugging purposes, you might want to include locally
+built #{d-i}# component udeb packages. Place these in
+#{config/binary_local-udebs/}# to include them in the image. Additional or
+replacement files and directories may be included in the installer initrd as
+well, in a similar fashion to {Live/chroot local
+includes}#live-chroot-local-includes, by placing the material in
+#{config/binary_debian-installer-includes/}#.
 
-Note that by default live-build does not include Debian Installer images in
-the images, it needs to be specifically enabled with lb config.
diff --git a/manual/pt_BR/user_customization-internationalization.ssi b/manual/pt_BR/user_customization-internationalization.ssi
deleted file mode 100644
index 0288819..0000000
--- a/manual/pt_BR/user_customization-internationalization.ssi
+++ /dev/null
@@ -1,49 +0,0 @@
-:B~ Customizing locale and language
-
-1~customizing-locale-and-language Customizing locale and language
-
-2~ Default locale and keyboard
-
-The default locale when building a Live system is "locales=en_US.UTF-8", to
-set the locale for e.g. Switzerland, you can use "locales=de_CH.UTF-8".
-
-code{
-
-$ lb config --bootappend-live "locales=de_CH.UTF-8"
-
-}code
-
-The entry for a Swiss-German keyboard would be:
-
-code{
-
-$ lb config --bootappend-live "keyboard-layouts=ch"
-
-}code
-
-Combined, the keyboard and locale configured for Switzerland would be:
-
-code{
-
-$ lb config --bootappend-live ="locales=de_CH.UTF-8 keyboard-layouts=ch"
-
-}code
-
-Note: You can find a list of options in the manpage for
-live-config. Currently, only UTF-8 locales are supported.
-
-2~ l10n Packages
-
-An experimental feature of live-build is to automatically check for each
-package for which it is know that there are -l10n packages available and
-install them. To add German packages the entry would be
-
-code{
-
-$ lb config --language "de"
-
-}code
-
-This will also change the default syslinux language if translations are
-available or local translations have been put into
-#{config/templates/syslinux/de}#.
diff --git a/manual/pt_BR/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
index b4153a1..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,17 +266,21 @@ specified:
 
 code{
 
-#if ARCHITECTURE amd64 ia32-libs #endif
+ #if ARCHITECTURE amd64
+ ia32-libs
+ #endif
 
 }code
 
-You may test for any one of a number of values, e.g. to install #{memtest86+
-}# if either #{--architecture i386}# or #{--architecture amd64}# is
-specified:
+You may test for any one of a number of values, e.g. to install
+#{memtest86+}# if either #{--architecture i386}# or #{--architecture amd64}#
+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
 
@@ -323,12 +332,11 @@ including ones not included in this list, may be examined with #{tasksel
 
 Desktop and language tasks are special cases. In the Debian Installer, if
 the medium was prepared for a particular desktop environment flavour, the
-corresponding task will be automatically installed. Thus, there are there
-are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and
-#{xfce-desktop}# tasks, none of which are offered in #{tasksel}#'s
-menu. Likewise, there are no menu entries for tasks for languages, but the
-user's language choice during the install influences the selection of
-corresponding language tasks.
+corresponding task will be automatically installed. Thus, there are
+#{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#
+tasks, none of which are offered in #{tasksel}#'s menu. Likewise, there are
+no menu entries for tasks for languages, but the user's language choice
+during the install influences the selection of corresponding language tasks.
 
 In live-build, therefore, these special cases are also given special
 consideration, but with three notable differences at the time of writing.
@@ -341,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
 
@@ -349,16 +357,31 @@ Second, live-build supports #{*-desktop}# virtual package lists for each of
 the desktop flavours mentioned above, which select the #{standard-x11}#
 predefined package list, the corresponding #{*-desktop}# task and three
 additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example,
-if you specify #{--packages gnome-desktop}#, it is equivalent to specifying
-#{--packages standard-x11 --tasks "gnome-desktop desktop standard laptop"}#.
+if you specify #{--packages-lists gnome-desktop}#, it is equivalent to
+specifying #{--packages debian-installer-launcher --packages-lists
+standard-x11 --tasks "gnome-desktop desktop standard laptop"}#.
 
 Third, if any of the tasks for these desktop flavours are selected, either
-explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build
-will preseed the corresponding desktop value for Debian Installer (if it is
-included) to ensure it follows its own rules for installing different
-desktop flavours.
+explicitly through #{--tasks}# or implicitly by #{--packages-lists}#,
+live-build will preseed the corresponding desktop value for Debian Installer
+(if it is included) to ensure it follows its own rules for installing
+different desktop flavours.
+
+*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are installed
 . For example:
+
+code{
+
+ $ lb config --language es
+
+}code
 
-2~ Installing modified or third-party packages
+Even so, it is limited in that it only supports a single language and a
+single bootloader. Therefore, for all of these reasons, the future of this
+option is under review, possibly to be replaced with something entirely
+different in the next major release of live-build.
+
+2~installing-modified-or-third-party-packages Installing modified or
+third-party packages
 
 Whilst it is against the philosophy of Debian Live, it may sometimes be
 necessary to build a Live system with modified versions of packages that are
@@ -460,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
 
@@ -475,7 +498,7 @@ with:
 
 code{
 
-$ lb config --binary-indices false
+ $ lb config --binary-indices false
 
 }code
 
@@ -490,17 +513,21 @@ much, you may disable that default option of APT with:
 
 code{
 
-$ lb config --apt-recommends false
+ $ lb config --apt-recommends false
 
 }code
 
-The tradeoff here is that recommended packages are defined as "packages that
-would be found together with this one in all but unusual installations"
-(Debian Policy Manual, §7.2). This may lead to some packages that you
-actually need being omitted, so we suggest you review the difference this
-makes to your packages list (see the #{binary.packages}# file generated by
-#{lb build}#) and re-include in your list any missing packages that you
-still want installed.
+The tradeoff here is that if you don't install recommended packages for a
+given package, that is, "packages that would be found together with this one
+in all but unusual installations" (Debian Policy Manual, §7.2), some
+packages that you actually need may be omitted. Therefore, we suggest you
+review the difference turning off recommends makes to your packages list
+(see the #{binary.packages}# file generated by #{lb build}#) and re-include
+in your list any missing packages that you still want
+installed. Alternatively, if you find you only want a small number of
+recommended packages left out, leave recommends enabled and set a negative
+APT pin priority on selected packages to prevent them from being installed,
+as explained in {APT pinning}#apt-pinning.
 
 3~ Passing options to apt or aptitude
 
@@ -524,11 +551,31 @@ 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
+
+}code
+
+Negative pin priorities will prevent a package from being installed, as in
+the case where you do not want a package that is recommended by another
+package. Suppose you are building a GNOME image but don't want the user
+prompted to store wifi passwords in the keyring, so you want to omit the
+recommended #{gnome-keyring}# package. This can be done by adding the
+following stanza to #{config/chroot_apt/preferences}#:
+
+code{
 
-Package: * Pin: release n=sid Pin-Priority: 1 END
+ Package: gnome-keyring
+ Pin: version *
+ Pin-Priority: -1
 
 }code
 
diff --git a/manual/pt_BR/user_customization-runtime.new.ssi b/manual/pt_BR/user_customization-runtime.new.ssi
deleted file mode 100644
index e2c32ec..0000000
--- a/manual/pt_BR/user_customization-runtime.new.ssi
+++ /dev/null
@@ -1,258 +0,0 @@
-:B~ Customizing run time behaviours
-
-1~customizing-run-time-behaviours Customizing run time behaviours
-
-All configuration that is done during run time is done by live-config. Here
-are some most common options of live-config that users are interested in. A
-full list of all possibilities can be found in the manpage of live-config.
-
-2~ Customizing the live user
-
-One important consideration is that the live user is created by live-boot at
-boot time, not by live-build at build time. This not only influences where
-materials relating to the live user are introduced in your build, as
-discussed in {Live/chroot local includes}#live-chroot-local-includes, but
-also any groups and permissions associated with the live user.
-
-You can specify additional groups that the live user will belong to by
-preseeding the #{passwd/user-default-groups}# debconf value. For example, to
-add the live user to the #{fuse}# group, add the following to a file in the
-#{config/chroot_local-preseed}# directory:
-
-code{
-
-debconf passwd/user-default-groups string audio cdrom dialout floppy video
-plugdev netdev powerdev fuse
-
-}code
-
-2~customizing-locale-and-language Customizing locale and language
-
-When the live system boots, language is involved in three steps:
-
-_* the locale generation
-
-_* setting the keyboard layout for the console
-
-_* setting the keyboard layout for X
-
-3~ Default locale and keyboard
-
-The default locale when building a Live system is "locales=en_US.UTF-8", to
-set the locale for e.g. Switzerland, you can use "locales=de_CH.UTF-8".
-
-code{
-
-$ lb config --bootappend-live "locales=de_CH.UTF-8"
-
-}code
-
-The entry for a Swiss-German keyboard would be:
-
-code{
-
-$ lb config --bootappend-live "keyboard-layouts=ch"
-
-}code
-
-Combined, the keyboard and locale configured for Switzerland would be:
-
-code{
-
-$ lb config --bootappend-live ="locales=de_CH.UTF-8 keyboard-layouts=ch"
-
-}code
-
-Note: You can find a list of options in the manpage for
-live-config. Currently, only UTF-8 locales are supported.
-
-3~ l10n Packages
-
-% FIXME: not a run time configuration! Belongs in packages chapter. (See
---tasks discussion.)
-
-An experimental feature of live-build is to automatically check for each
-package for which it is known that there are #{*-l10n}# packages available
-and install them. To add German packages the entry would be
-
-code{
-
-$ lb config --language "de"
-
-}code
-
-This will also change the default syslinux language if translations are
-available or local translations have been put into
-#{config/templates/syslinux/de}#.
-
-3~ Language
-
-To define the locale that should be generated, use the #{locales}# parameter
-into the #{--bootappend-live}# option of #{lb config}#, e.g.:
-
-code{
-
-lb config --bootappend-live "locales=de_CH.UTF-8"
-
-}code
-
-This parameter can also be used in kernel command line. You can specify a
-locale by a full #{language_country.encoding}# word.
-
-Both the console and X keyboard configuration depends on the #{keyb}#
-parameter of the #{--bootappend-live}# option. Valid options for X keyboard
-layouts can be found in #{/etc/X11/xkb/base.xml}# (rather limited to
-two-letters country codes). To find the value (the two characters)
-corresponding to a language try searching for the english name of the nation
-where the language is spoken, e.g:
-
-code{
-
-$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name <name>se</name>
-
-}code
-
-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"
-
-}code
-
-A list of the valid values of the keyboards for the console can be figured
-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
-
-}code
-
-Alternatively, you can use the #{console-setup}# package, a tool to let you
-configure console layout using X (XKB) definitions; you can then setup your
-keyboard layout more precisely with #{keyboard-layouts}#,
-#{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# variables;
-live-boot will use also these parameters for X configuration. For example,
-to set up a French system with a French-Dvorak layout (called Bepo) on a
-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"
-
-}code
-
-2~ Persistence
-
-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
-of the host hardware which runs it.
-
-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
-should be considered read-only and all the run-time evolutions of the system
-are lost at shutdown.
-
-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
-understand how it could work it could be handy to know that even if the
-system is booted and run from read-only media, modification to the files and
-directories are written on writable media, typically a ram disk (tmpfs) and
-ram disks' data do not survive reboots.
-
-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
-multisession (re)writable CD/DVD. All these media are supported in Debian
-Live in different ways, and all but the last one require a special boot
-parameter to be specified at boot time: #{persistent}#.
-
-3~ Full persistence
-
-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
-writable partition is used. In order to use this feature a partition with a
-clean writable supported filesystem on it labeled "live-rw" must be attached
-on the system at boot time and the system must be started with the boot
-parameter 'persistent'. This partition could be an ext2 partition on the
-hard disk or on a usb key created with, e.g.:
-
-code{
-
-# mkfs.ext2 -L live-rw /dev/sdb1
-
-}code
-
-If you already have a partition on your device, you could just change the
-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
-
-}code
-
-But since live system users cannot always use a hard drive partition, and
-considering that most USB keys have poor write speeds, 'full' persistence
-could be also used with just image files, so you could create a file
-representing a partition and put this image file even on a NTFS partition of
-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
-
-}code
-
-Then copy the #{live-rw}# file to a writable partition and reboot with the
-boot parameter 'persistent'.
-
-3~ Home automounting
-
-If during the boot a partition (filesystem) image file or a partition
-labeled #{home-rw}# is discovered, this filesystem will be directly mounted
-as #{/home}#, thus permitting persistence of files that belong to e.g. the
-default user. It can be combined with full persistence.
-
-3~ Snapshots
-
-Snapshots are collections of files and directories which are not mounted
-while running but which are copied from a persistent device to the system
-(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The
-content of a snapshot could reside on a partition or an image file (like the
-above mentioned types) labeled #{live-sn}#, but it defaults to a simple cpio
-archive named #{live-sn.cpio.gz}#. As above, at boot time, the block devices
-connected to the system are traversed to see if a partition or a file named
-like that could be found. A power interruption during run time could lead to
-data loss, hence a tool invoked #{live-snapshot --refresh}# could be called
-to sync important changes. This type of persistence, since it does not write
-continuously to the persistent media, is the most flash-based device
-friendly and the fastest of all the persistence systems.
-
-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.
-
-Snapshots cannot currently handle file deletion but full persistence and
-home automounting can.
-
-3~ Persistent SubText
-
-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-work}#, the boot parameter #{persistent-subtext}# used in
-conjuntion with the boot parameter #{persistent}# will allow for multiple
-but unique persistent media. An example would be if a user wanted to use a
-persistent partition labeled #{live-sn-subText}# they would use the boot
-parameters of: #{persistent}# #{persistent-subtext=subText}#.
-
-3~ Partial remastering
-
-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 case of cd-r or adding a session to multisession cd/dvd(rw); live-boot
-mounts all /live filesystem in order or with the module boot parameter.
diff --git a/manual/pt_BR/user_customization-runtime.ssi b/manual/pt_BR/user_customization-runtime.ssi
index 857ef66..471abb4 100644
--- a/manual/pt_BR/user_customization-runtime.ssi
+++ b/manual/pt_BR/user_customization-runtime.ssi
@@ -1,13 +1,18 @@
-B~ Customization at Runtime
+:B~ Customizing run time behaviours
 
-All configuration that is done during runtime is done by live-config. Here
+1~customizing-run-time-behaviours Customizing run time behaviours
+
+All configuration that is done during run time is done by live-config. Here
 are some most common options of live-config that users are interested in. A
 full list of all possibilities can be found in the manpage of live-config.
 
-1~ User
+2~ Customizing the live user
 
-One important consideration is that the live user is created by live-boot
-during bootup, it is not created by live-build when building the image.
+One important consideration is that the live user is created by live-boot at
+boot time, not by live-build at build time. This not only influences where
+materials relating to the live user are introduced in your build, as
+discussed in {Live/chroot local includes}#live-chroot-local-includes, but
+also any groups and permissions associated with the live user.
 
 You can specify additional groups that the live user will belong to by
 preseeding the #{passwd/user-default-groups}# debconf value. For example, to
@@ -16,12 +21,11 @@ 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
 
-1~ Language
+2~customizing-locale-and-language Customizing locale and language
 
 When the live system boots, language is involved in three steps:
 
@@ -31,28 +35,31 @@ _* setting the keyboard layout for the console
 
 _* setting the keyboard layout for X
 
-To define the locale that should be generated, use the #{locale}# parameter
-into the #{--bootappend-live}# option of #{lb config}#, e.g.:
+The default locale when building a Live system is "locales=en_US.UTF-8". To
+define the locale that should be generated, use the #{locales}# parameter in
+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
 
-This parameter can also be used in kernel command line. You can specify a
-locale by a full #{language_country.encoding}# word.
+This parameter can also be used at the kernel command line. You can specify
+a locale by a full #{language_country.encoding}# word.
 
-Both the console and X keyboard configuration depends on the #{keyb}#
-parameter of the #{--bootappend-live}# option. Valid options for X keyboard
-layouts can be found in #{/etc/X11/xkb/base.xml}# (rather limited to
-two-letters country codes). To find the value (the two characters)
-corresponding to a language try searching for the english name of the nation
-where the language is spoken, e.g:
+Both the console and X keyboard configuration depend on the
+#{keyboard-layouts}# parameter of the #{--bootappend-live}# option. Valid
+options for X keyboard layouts can be found in
+#{/usr/share/X11/xkb/rules/base.xml}# (rather limited to two-letters country
+codes). To find the value (the two characters) corresponding to a language
+try searching for the english name of the nation where the language is
+spoken, e.g:
 
 code{
 
-$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name <name>se</name>
+ $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
+ <name>se</name>
 
 }code
 
@@ -61,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
 
@@ -70,13 +77,13 @@ 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
 
 Alternatively, you can use the #{console-setup}# package, a tool to let you
-configure console layout using X (XKB) definitions; you can then setup your
+configure console layout using X (XKB) definitions; you can then set your
 keyboard layout more precisely with #{keyboard-layouts}#,
 #{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# variables;
 live-boot will use also these parameters for X configuration. For example,
@@ -85,12 +92,12 @@ 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
 
-2~ Persistence
+2~persistence Persistence
 
 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
@@ -126,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
 
@@ -135,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
 
@@ -148,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 0bb4753..8d10188 100644
--- a/manual/pt_BR/user_examples.ssi
+++ b/manual/pt_BR/user_examples.ssi
@@ -24,15 +24,15 @@ 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
 
 2~tutorial-1 Tutorial 1: A standard image
 
-*{Use case:}* Create a simple first image, learning the basics of live-build
+*{Use case:}* Create a simple first image, learning the basics of live-build.
 
 In this tutorial, we will build a default ISO hybrid Debian Live image
 containing only base packages (no Xorg) and some Debian Live support
@@ -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
 
@@ -69,14 +69,14 @@ stick}#copying-usb-hdd-image, respectively.
 
 2~tutorial-2 Tutorial 2: A web browser utility
 
-*{Use case}* Create a web browser utility image, learning how to apply customizations
+*{Use case:}* Create a web browser utility image, learning how to apply customizations.
 
 In this tutorial, we will create an image suitable for use as a web browser
 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
 
@@ -101,7 +101,7 @@ Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1.
 
 2~tutorial-3 Tutorial 3: A personalized image
 
-*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.
+*{Use case:}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.
 
 Since we will be changing our personalized image over a number of revisions,
 and we want to track those changes, trying things experimentally and
@@ -114,8 +114,9 @@ in {Managing a configuration}#managing-a-configuration.
 
 code{
 
-$ mkdir -p tutorial3/auto $ cp /usr/share/live/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
 
@@ -224,41 +227,53 @@ cases drawn from the collected experiences of users of Debian Live.
 
 2~ A VNC Kiosk Client
 
-Create an image with live-build to boot directly to a VNC server.
-
-_* Make a build directory: #{$ mkdir vncBuild}#
+*{Use case:}* Create an image with live-build to boot directly to a VNC server.
 
-_* Move to the build directory: #{$ cd vncBuild}#
+Make a build directory and create a skeletal configuration in it built
+around the standard-x11 list, including #{gdm3}#, #{metacity}# and
+#{xtightvncviewer}#, disabling recommends to make a minimal system:
 
-Example to config the build directory to include gdm metacity
-xtightvncviewer: #{$ lb config --packages "gdm3 metacity xtightvncviewer"}#
+code{
 
-Create a folder /etc/skel folder for a custom .xsession for the default
-user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#
+ $ mkdir vnc_kiosk_client
+ $ cd vnc_kiosk_client
+ $ lb config -a i386 -k 686 -p standard-x11 \
+     --packages "gdm3 metacity xvnc4viewer" \
+     --apt-recommends false
 
-Create the .xsession for the default user: #{$ touch
-config/chroot_local-includes/etc/skel/.xsession}#
+}code
 
-Edit the .xsession file to launch metacity and start xvncviewer with
-something similar to the below:
+Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for
+the default user that will launch metacity and start xvncviewer, connecting
+to port #{5901}# on a server at #{192.168.1.2}#:
 
 code{
 
-#!/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/vncviewer xxx.xxx.xxx.xxx:PORT
+ /usr/bin/metacity &
+ /usr/bin/xvncviewer 192.168.1.2:1
 
-exit
+ exit
+ END
 
 }code
 
-_* Build the image: #{# lb build}#
+Build the image:
+
+code{
+
+ # lb build
 
-_* Enjoy.
+}code
+
+Enjoy.
 
 2~ A base image for a 128M USB key
 
-*{Use case}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.
+*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.
 
 When optimizing an image to fit a certain media size, you need to understand
 the tradeoffs you are making between size and functionality. In this
@@ -272,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
 
@@ -281,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
 
@@ -303,3 +318,79 @@ remaining options shave off additional small amounts of space. It's up to
 you to decide if the functionality that is sacrificed with each optimization
 is worth the loss in functionality.
 
+2~ A localized KDE desktop and installer
+
+*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.
+
+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
+that would be installed by the standard Debian installer for KDE.
+
+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 find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can
+be used to dig it out of the task descriptions in tasksel-data, so to
+prepare, make sure you have both of those things:
+
+code{
+
+ # apt-get install dctrl-tools tasksel-data
+
+}code
+
+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.
+
+}code
+
+By this command, we discover the task is called, plainly enough,
+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.
+
+ Task: brazilian-portuguese-kde-desktop
+ Description: Brazilian Portuguese KDE desktop
+  This task localises the KDE desktop in Brazilian Portuguese.
+
+}code
+
+We will use the experimental #{--language}# option, as live-build happens to
+include #{syslinux}# templates for pt_BR (see {Desktop and language
+tasks}#desktop-and-language-tasks for details). And at boot time we will
+generate the pt_BR.UTF-8 locale and select the pt-latin1 keyboard
+layout. Now let's put the pieces together:
+
+code{
+
+ $ mkdir live-pt_BR-kde
+ $ cd live-pt_BR-kde
+ $ lb config \
+     -a i386 \
+     -k 486 \
+     -p kde-desktop \
+     --language pt_BR \
+     --tasks "brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop" \
+     --bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
+     --debian-installer live \
+     --packages debian-installer-launcher
+
+}code
+
+Note that we have included the #{debian-installer-launcher}# package to
+launch the installer from the live desktop, and have also specified the 486
+flavour kernel, as it is currently necessary to make the installer and live
+system kernels match for the launcher to work properly.
+
diff --git a/manual/pt_BR/user_installation.ssi b/manual/pt_BR/user_installation.ssi
index e59dc91..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,9 +66,18 @@ 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 ..
 
-# dpkg -i live-build*.deb
+}code
+
+Now install whichever of the freshly built #{.deb}# files you were
+interested in, e.g.
+
+code{
+
+ # dpkg -i live-build_2.0.8-1_all.deb
 
 }code
 
@@ -76,7 +85,7 @@ You can also install live-build directly to your system by executing:
 
 code{
 
-# make install
+ # make install
 
 }code
 
@@ -84,7 +93,7 @@ and uninstall it with:
 
 code{
 
-# make uninstall
+ # make uninstall
 
 }code
 
@@ -94,43 +103,37 @@ If you do not wish to build or install live-build from source, you can use
 snapshots. These are built automatically from the latest version in Git and
 are available on http://live.debian.net/debian/.
 
-2~ live-boot
+2~ live-boot and live-config
 
-*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.
+*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.
 
-% FIXME: we also need to mention live-config
+3~ From the Debian repository
 
-3~ Using a customized live-boot
+Both live-boot and live-config are available from the Debian repository as
+per {Installing live-build}#installing-live-build.
 
-% FIXME: should follow the structure for live-build above (i.e. "from
-source", not "customized" -- we should not get into customization now, but
-should reserve that discussion for later.
+3~ From source
 
-To modify the code you can follow the process below. Please ensure you are
-familiar with the terms mentioned in {Terms}#terms.
+To use the latest source from git, you can follow the process below. Please
+ensure you are familiar with the terms mentioned in {Terms}#terms.
 
-_* Checkout the live-boot source
+_* 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-boot.git
+ $ git clone git://live.debian.net/git/live-config.git
 
 }code
 
-_* Make changes to your local copy
-
-% FIXME: as indicated above, it's too early for this topic. Move to later in
-the manual.
-
-And beware that if you want to add your pre-init script in live-bottom, you
-should name it without dashes '-', e.g: call it "99new_feature" and not
-"99new-feature".
+Consult the live-boot and live-config man pages for details on customizing
+if that is your reason for building these packages from source.
 
-_* Build a live-boot .deb
+_* Build live-boot and live-config .deb files
 
 You must build either on your target distribution or in a chroot containing
 your target platform: this means if your target is Squeeze then you should
-build against Squeeze. Y
+build against Squeeze.
 
 Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to
 build #{live-boot}# for a target distribution that differs from your build
@@ -141,28 +144,33 @@ system distribution, you may build directly on the build system using
 
 code{
 
-$ cd live-boot $ dpkg-buildpackage -b -uc -us
+ $ cd live-boot
+ $ dpkg-buildpackage -b -uc -us
+ $ cd ../live-config
+ $ dpkg-buildpackage -b -uc -us
 
 }code
 
-_* Use the generated live-boot .deb
+_* Use all generated .deb files
 
-As live-boot is installed by live-build system, installing the package in
-the host system is not sufficient: you should treat the generated .deb like
-another custom package. Please see {Customizing package
-installation}#customizing-package-installation for more information. You
-should pay particular attention to {Additional
+As live-boot and live-config are installed by live-build system, installing
+the packages in the host system is not sufficient: you should treat the
+generated .deb files like any other custom packages. Please see {Customizing
+package installation}#customizing-package-installation for more
+information. You should pay particular attention to {Additional
 repositories}#additional-repositories.
 
-3~ Using live-boot snapshots
+3~ From 'snapshots'
 
-You can let live-build automatically use the latest snapshot of live-boot by
-configuring a third-party repository in your live-build configuration
-directory. Assuming you have already created a configuration tree with #{lb
-config}#:
+You can let live-build automatically use the latest snapshots of live-boot
+and live-config by configuring a third-party repository in your live-build
+configuration directory. Assuming you have already created a configuration
+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 a19f611..abab4fa 100644
--- a/manual/pt_BR/user_managing_a_configuration.ssi
+++ b/manual/pt_BR/user_managing_a_configuration.ssi
@@ -22,8 +22,9 @@ retain old values that are no longer appropriate.
 
 A second, related problem is that if you run #{lb config}# and then upgrade
 to a new version of live-build that has changed one of the variable names,
-you will discover this only by manual review of the variables in your config
-files, which you will then need to use to set the appropriate option again.
+you will discover this only by manual review of the variables in your
+#{config/*}# files, which you will then need to use to set the appropriate
+option again.
 
 All of this would be a terrible nuisance if it weren't for auto/* scripts,
 simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands
@@ -49,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
 
@@ -60,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
 
@@ -72,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
 
@@ -81,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 cf9f187..3d6b063 100644
--- a/manual/pt_BR/user_overview.ssi
+++ b/manual/pt_BR/user_overview.ssi
@@ -18,11 +18,11 @@ Many concepts are similar to those in the debhelper Debian package tools
 written by Joey Hess:
 
 _* The scripts have a central location for configuring their operation. In
-debhelper, this is the debian subdirectory of a package tree. For example,
-dh_install will look, amongst others, for a file called #{debian/install}#
-to determine which files should exist in a particular binary package. In
-much the same way, live-build stores its configuration entirely under a
-config subdirectory.
+debhelper, this is the #{debian/}# subdirectory of a package tree. For
+example, dh_install will look, amongst others, for a file called
+#{debian/install}# to determine which files should exist in a particular
+binary package. In much the same way, live-build stores its configuration
+entirely under a #{config/}# subdirectory.
 
 _* The scripts are independent - that is to say, it is always safe to run
 each command.
@@ -46,42 +46,51 @@ _* *{lb clean}*: Responsible for removing parts of a Live system build. See
 3~lb-config The #{lb config}# command
 
 As discussed in {live-build}#live-build, the scripts that make up live-build
-source their configuration from a single directory named config/. As
+source their configuration from a single directory named #{config/}#. As
 constructing this directory by hand would be time-consuming and error-prone,
 the #{lb config}# command can be used to create skeleton configuration
 folders.
 
-Issuing #{lb config}# without any arguments creates a config subdirectory
-which it populates with some default settings:
+Issuing #{lb config}# without any arguments creates a #{config/}#
+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 6487142..514836d 100644
--- a/manual/ro/about_manual.ssi
+++ b/manual/ro/about_manual.ssi
@@ -21,9 +21,9 @@ the details. Therefore, we have provided three tutorials in the
 {Examples}#examples section designed to teach you image building and
 customization basics. Read {Using the examples}#using-the-examples first,
 followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web
-browser utility}#tutorial-2 and finally {Tutorial 3: A personal travelling
-companion}#tutorial-3. By the end of these tutorials, you will have a taste
-of what can be done with Debian Live. We encourage you to return to more
+browser utility}#tutorial-2 and finally {Tutorial 3: A personalized
+image}#tutorial-3. By the end of these tutorials, you will have a taste of
+what can be done with Debian Live. We encourage you to return to more
 in-depth study of the manual, perhaps next reading {The basics}#the-basics,
 skimming or skipping {Building a netboot image}#building-netboot-image, and
 finishing by reading the {Customization overview}#customization-overview and
@@ -151,16 +151,16 @@ pentru 'building' sunt instalate, prin executatea comenzii:
 
 code{
 
-# apt-get install make po4a sisu-complete
+ # apt-get install make po4a sisu-complete libnokogiri-ruby
 
 }code
 
-Pute-ti crea live-manual de la nivelul de sus al directorului git checkout
+Pute-ti crea live-manual de la nivelul de sus al directorului Git checkout
 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,27 +210,28 @@ _* 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
 
-_* Dupa editarea de fisiere in manual/en/, va rugam folositi 'commit' in the
-top level directory to sanitize the files and update the translation files:
+_* After editing the files in #{manual/en/}#, please call the 'commit'
+target in the top level directory to sanitize the files and update the
+translation files:
 
 code{
 
-$ make commit
+ $ make commit
 
 }code
 
 _* Dupa 'sanitizare' 'commit' schimbarile. Scrieti mesajele de commit, care
 constau in propozitii clare, care incep cu litere Mari, si se incheie cu
 punct si sens. Inceputul poate fii de forma
-'Fixing/Adding/Removing/Correcting/':
+'Fixing/Adding/Removing/Correcting/Translating':
 
 code{
 
-$ git commit -a
+ $ git commit -a -m "Adding a section on applying patches."
 
 }code
 
@@ -238,18 +239,23 @@ _* Primite commit-ul la server:
 
 code{
 
-$ git push
+ $ git push
 
 }code
 
 3~ Translation
 
-Submiting a translation for a new language is recommendet in two steps:
+To submit a translation for a new language, follow these three steps:
 
-_* Translate the about_manual.ssi.pot about_project.ssi.pot
+_* Translate the about_manual.ssi.pot, about_project.ssi.pot and
 index.html.in.pot files to your language with your favourite editor (such as
-poedit). Send translated files to the mailinglist. It will then be included
-and autobuild for that language enabled.
+poedit). Send translated files to the mailing list. Once we have reviewed
+your submission, we will add the new language to the manual (providing the
+po files) and will enable it in the autobuild.
+
+_* Once the new language is added, you can randomly start translating all po
+files in #{manual/po/}#.
+
+_* Don't forget you need #{make commit}# to ensure the translated manuals
+are updated from the po files, before #{git commit -a}# and #{git push}#.
 
-_* Now that the new language was added, you can randomly start translating
-all other pot files.
diff --git a/manual/ro/index.html.in b/manual/ro/index.html.in
index b23eb38..26cba81 100644
--- a/manual/ro/index.html.in
+++ b/manual/ro/index.html.in
@@ -42,7 +42,7 @@ href="pdf/live-manual.landscape-letter.pdf">letter landscape</a></li>
 
 	<p>
 		The sources for this manual is available in a <a
-href="http://git.or.cz/">git</a> repository at live.debian.net.
+href="http://git.or.cz/">Git</a> repository at live.debian.net.
 	</p>
 
 	<ul>
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index 3b1bd69..6fa445d 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -9,7 +9,7 @@
  :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
 
 @date:
- :published: 2010-12-06
+ :published: 2010-12-24
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
@@ -27,7 +27,7 @@
 
 << about_project.ssi
 
-:B~ User ~#
+:B~ User
 
 << user_installation.ssi
 
@@ -43,17 +43,13 @@
 
 << user_customization-contents.ssi
 
-<< user_customization-internationalization.ssi
-
 << user_customization-runtime.ssi
 
 << user_customization-binary.ssi
 
 << user_customization-installer.ssi
 
-:B~ Development ~#
-
-:B~ Project ~#
+:B~ Project
 
 << project_bugs.ssi
 
@@ -61,18 +57,7 @@
 
 << project_procedures.ssi
 
-:B~ Examples ~#
+:B~ Examples
 
 << user_examples.ssi
 
-:B~ Other ~#
-
-Other material that formerly appeared in this section is out of date and/or
-has not been approved for release. It has therefore been omitted, but can
-still be found in the document source; see 'About this manual'. Any part of
-the omitted material that is still useful will be included in the release
-only after it has been reviewed.
-
-% << other_faq.ssi
-
-% << other_howtos.ssi
diff --git a/manual/ro/other_faq.ssi b/manual/ro/other_faq.ssi
deleted file mode 100644
index f754913..0000000
--- a/manual/ro/other_faq.ssi
+++ /dev/null
@@ -1,545 +0,0 @@
-B~ Frequently asked questions (FAQ)
-
-1~ Frequently asked questions (FAQ)
-
-Q: I downloaded a prebuilt live image. How do I put it on a USB stick? A:
-See "Copying USB/HDD image to a USB stick" % FIXME: <xref
-linkend="image_copying"/>
-
-Q: How do I log my build? A: You could use script, screen or tee: #{$
-lh_build 2>&1 | tee build.log}#
-
-Q: How can I convert an already installed standard Debian partition into a
-Debian Live system? A: Save the list of installed packages and load it into
-your new Debian Live System. Copy your /etc to config/chroot_local-includes
-
-Q: What does 'losetup: could not find any free loop device' mean and how do
-I fix it? A: Loop devices are used during the build; there probably aren't
-any free if you've aborted several builds. Something like: for l in
-/dev/loop0 /dev/loop1 /dev/loop2 /dev/loop3 /dev/loop4 /dev/loop5 /dev/loop6
-/dev/loop7 ; do losetup -d $l ; done should rectify the situation (assuming
-all loop devices in use were created by lh_build; if in doubt, check the
-contents of each loop device before deleting them with losetup -d).
-
-Q: How do I launch an interactive shell during the chroot stage? A: To
-enable interactive shell: #{$ lh_config --interactive shell}# To continue
-the build process: #{# logout}# or #{# exit}# To disable interactive shell,
-set LH_INTERACTIVE to "disabled" in config/chroot.
-
-Q: What is the root /user password? A: The user password for the live user
-is 'live'. By default, there is not any root password. You can switch to
-root with ${sudo -i}# or set a password for root with #{sudo passwd}#
-
-Q: How do I change root or any user password? A: Add a chroot local hook
-script to change root or any user password each time you build an image.
-e.g. config/chroot_local-hooks/01-update_password.sh to set root password to
-"nopasswd"
-
-code{ #!/bin/sh
-
-echo "I: update password" echo "root:nopasswd" | chpasswd
-
-$ chmod +x config/chroot_local-hooks/01-update_password.sh
-
-}code
-
-Note for live user; you need to copy the
-/usr/share/initramfs-tools/scripts/live-bottom/10adduser your build folder:
-
-code{
-
-mkdir -p
-config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/
-cp /usr/share/initramfs-tools/scripts/live-bottom/10adduser
-config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/
-
-}code
-
-Note: Then edit the
-config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/10adduser
-and paste in the new user_crypted password that you make with: #{echo
-"newlivepass" | mkpasswd -s}#
-
-Or add an hook file in config/chroot_local-hooks/ with something like the
-below:
-
-code{ #!/bin/sh
-
-# Change the autogenerated user password to "debianlive"
-plain_password="debianlive" password=$(echo "${plain_password}" | mkpasswd
--s)
-
-sed -i -e 's/\(user_crypted=\)\(.*\)\( #.*\)/\1\"'${password}'\"\3/'
-/usr/share/initramfs-tools/scripts/live-bottom/10adduser
-
-update-initramfs -tu -kall }code
-
-The latter (hook model) could be more future proof than the former solution
-since it modifies just one string selectively but it requires the package
-"whois" to be installed on the target system (for mkpasswd) or that you
-generate the $password string not at build time and include it crypted in
-the above script.
-
-Q: How to disable autologin? A1: use the commandline parameter #{lh config
---bootappend-live "noautologin"}# A2: You need to set boot=noautologin
-noxautologin as described in man live-initramfs If you boot via TFTP you
-want to insert the option to pxelinux.cfg/default
-
-Q: How do I change default hostname or username? A: To change default
-hostname or username: #{$ lh_config --hostname myhostname $ lh_config
---username myusername}#
-
-Q: How do I make the final image smaller? A: Clean orphaned apps/libs:
-Install package "deborphan" and then run 'sudo deborphan -n' . Delete
-unwanted packages. Remove the apt cache. Purge unwanted locales (see
-"localepurge" package).
-
-Q: How do I customize bash-config permanently (aliases, bash-completion
-etc.)? A: Add your own .bashrc config/chroot_local-includes/etc/skel/.bashrc
-
-Q: How do I disable services permanently? (Be careful!)  A: Add a chroot
-local hook script to disable a service each time you build an image:
-e.g. config/chroot_local-hooks/01-disable_service.sh
-
-code{
-
-#!/bin/sh
-
-echo "I: disable service" update-rc.d -f service_name remove
-
-$ chmod +x config/chroot_local-hooks/01-disable_service.sh
-
-}code
-
-Q: How do I enable | disable the md5checksum at the ISO building? A:
-#{lh_config --checksums enabled|disabled}# Or change the LH_CHECKSUMS value.
-
-Q: How to disable the generation of the .tar.gz file? A: #{lh_config
---net-tarball none|gzip}# Or change the LH_NET_TARBALL value. (only
-available in snapsshot version at the moment 2008/Feb/28)
-
-Q: How do I "build a new image"? A: Run commands:
-
-code{
-
-$ sudo lh_clean --binary $ sudo lh_build
-
-}code
-
-Hint: If the configuration had changed you should leave "--binary" out. This
-will clean your chroot directory too.
-
-Q: How do I use Fluxbox ? A: Add a new lists file with the fluxbox packages
-you want.
-
-Create /home/$USERNAME/.dmrc file (default username is "user").
-
-code{
-
-$ cat .dmrc [Desktop] Session=fluxbox }code
-
-Note: .dmrc is owned by $USERNAME:$USERNAME.
-
-See also http://wiki.debian.org/Fluxbox/ A short HOWTO can be found at
-http://wiki.debian.org/MichaelAblassmeier/CustomLiveCD
-
-Q: How do I use custom repositories? A: See
-http://wiki.debian.org/DebianLive/Configuration
-
-Q: How do I customize the artwork for the live CD (grub or syslinux boot
-splash, usplash, etc.)? A: See
-http://wiki.debian.org/DebianLive/Howto/Custom_Artwork
-
-Q: How do I customize desktop environment (KDE, GNOME, XFCE, etc...) look?
-A: Start the live system in qemu:
-
-code{
-
-$ qemu -m 256 -cdrom binary.iso -boot d -redir tcp:4222:10.0.2.15:22
-
-}code
-
-Note: the -redir argument must be changed to meet your needs
-
-Q: How do I execute a custom shell script inside the chroot system after the
-chroot stage? A: Add your script in config/chroot_local-hooks.
-
-Q: How do I add a script running immediately after all other scripts when
-the live system boots? A: Add your script in
-config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/99scrip
-
-code{
-
-$ chmod +x
-config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/99script
-
-}code
-
-Note: The hook script must be executable. Do not forget to lh_clean --chroot
-after making this change before you build again.
-
-You must also use the example script
-/usr/share/live-helper/examples/hooks/update-initramfs.sh to ensure your
-script gets built into the initramfs (read the comment header for
-instructions).
-
-Q: How do I add software not in Debian ? A: See Customizing package
-installation % FIXME: <xref linkend="packages"/>
-
-Q: What is the manifest with Ubuntu used for? A: Manifest is just the
-package list, which ubuntu does $something with. Don't worry about it.
-
-Q: What is this {p} syntax with mtools{p} and parted{p}? A: That's aptitude.
-
-Q: Do I need to write the image on USB stick to test it? A: you must use
-qemu >= 0.8.
-
-Q: What is /cow? A: Copy-on-write, the 'diff' from unionfs.
-
-Q: Is /usr/share/live-helper/lists/standard-x11 like preseed or is preseed
-something else entirely? A: It is not. It is a package list, not a debconf
-preseeding.
-
-Q: What is the difference between standard and minimal? A: standard:
-packages of priority standard and higher; minimal: packages of priority
-essential and higher;
-
-Q: What can the sections be used for? Aren't they BIG? A: Someone maybe
-wants to include packages from contrib or non-free.
-
-Q: memtest86+ ... is that used? A: Yes
-
-Q: How do I build using predefined packages lists? A: e.g. to build using
-standard-x11 packages list: #{$ sudo lh_config -p standard-x11 && sudo
-lh_build}# Note: The packages lists can be found in
-/usr/share/live-helper/lists/ directory.
-
-Q: How do I rebuild without downloading all the packages again? A: All
-packages are cached in cache subdirectory. They remain until a clean purge:
-#{$ sudo lh_clean --purge}# You do not have to do anything to prevent
-packages from being re-downloaded. You need to remember to clean whichever
-stages you want to rebuild first. e.g. to rebuild from the cached bootstrap,
-chroot packages and build a new image. #{$ sudo lh_clean && sudo lh_build}#
-
-Q: How do I boot USB debian-live on systems not supporting USB boot? A: Make
-a boot CD with grub, configured to boot from a debian-live kernel copied on
-the cd structure #{$ mkdir -p iso/boot/grub && cp
-/usr/lib/grub/i386-pc/stage2_eltorito iso/boot/grub && cp chroot/boot/*
-iso/boot/}# Create iso/boot/grub/menu.lst:
-
-code{
-
-default 0 timeout 5 color cyan/blue white/blue title Debian Live root (cd)
-kernel /boot/vmlinuz boot=live initrd /boot/initrd.img
-
-}code
-
-Create the iso image #{$ mkisofs -R -b boot/grub/stage2_eltorito
--no-emul-boot \ -boot-load-size 4 -boot-info-table -o grub.iso iso}# Burn
-the image.
-
-Q: How do I boot debian-live on systems not supporting CDROM or USB boot? A:
-If you have a floppy drive, you may be able to use it, otherwise you will
-need to use loadlin/grub4dos/win32-loader. If you have a second system to
-serve up the image over the network, See
-http://wiki.debian.org/DebianLive/Howto/Creating_a_Netboot_Image
-
-Q: The X configuration does not seems to work, the resolution is too
-low. What can I do? A: Use xdebconfigurator #{$ lh_config --bootappend
-xdebconf && lh_config --packages xdebconfigurator}#
-
-Q: Apache has problems with static files A: Sendfile does not work well on
-the unionfs used by Debian Live. Add the following to apache's
-configuration: #{EnableSendfile off}#
-
-Q: How do I make hard disk partitions auto-mountable? A: Short answer: Right
-now the best is to use a script that will populate the fstab when the CD is
-booting. Such a script can be found at
-https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-includes/sbin/diskmounter.sh.
-A proper solution based on HAL will be described here in a hopefully near
-future.  A: Long Answer: Since 55_nonpolkit-mount-policy.patch in HAL,
-debian-storage-policy-fixed-drives.fdi is not available anymore and the
-previous trick that consisted to remove this file to enable automounting of
-fixed drives as a consequence is obsolete. Eventually, it will be possible
-to combine HAL and PolicyKit to enable different permissions and actions to
-achieve advanced (auto)mounting for non-root users. Until then, because the
-live scripts are only touching to the fstab to add a swap partition if
-discovered at boot time, the only way to have fixed drives mounted
-automatically is to use a script that will populate the fstab file at the
-end of the multiuser runlevel. To achieve this, you can do, for example, the
-following: download the
-https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-includes/sbin/diskmounter.sh
-script Create the chroot_local-includes/sbin directory, and move the script
-inside Make sure the script is executable (chmod +x diskmounter.sh) create
-the chroot_local-includes/etc/rc.local file and call the diskmounter from
-there (see this
-https://devel.goto10.org/svn/puredyne/trunk/broth/stock/chroot_local-includes/etc/rc.local
-When called correctly, the script detects ext2, ext3, reiserfs, xfs, FAT32,
-HFS+ and NTFS partitions and mount them read-write, except for NTFS. This
-will change soon and an option will be available to use ntfs-3g to mount
-NTFS as read-write. comments, patches and other things about this script and
-issue: http://code.goto10.org/projects/puredyne/ticket/463
-
-Q: Boot fails with panic: can't open /scripts/live A: Add latest
-live-initramfs deb package into config/chroot_local-packages directory and
-rebuild.
-
-Q: How do I configure the locale and the keyboard? A: See 10n % FIXME: <xref
-linkend="internalization"/>
-
-Q: How do I get past boot prompt without a working keyboard? A: See
-Customizing the bootup process % FIXME: <xref linkend="bootup"/> Note: Boot
-from an USB-HDD on an iMac with GRUB did not work.
-
-Q: Can I serve the root image from a web or ftp server? A: Since
-live-initramfs 1.99, it should be possible to use the fetch= argument on the
-kernel command line. You can build a netboot image as usual, and when you
-are done edit the tftpboot/pxelinux.cfg/default file. Remove the references
-to network boot (netboot, nfsroot, nfsopts), and replace with fetch= <url
-where you placed the root image>. You have to include wget in the chroot. It
-could work for other boot methods as well. However, I am not sure the live
-scripts configure the network when booting from a CD or USB disk. #{$
-lh_config --packages wget}#
-
-Q: Why doesn't quickreboot (or some other boot parameter) work? A: If you
-are building an etch image (which was the default up to 2007/09/14) you have
-a very old version of casper which does not support quickreboot and possibly
-other boot parameters as well. You could configure your sources to use
-live-backports (see /usr/share/live-helper/examples/sources/live-backports)
-and switch to live-initramfs, or better yet, build a lenny image instead,
-which is the new default. #{$ lh_config --distribution lenny $ lh_config
---initramfs live-initramfs}#
-
-Q: How do I fix "Could not find kernel image" issue with syslinux
-bootloader? A: Add a binary local hook script to fix kernel and initrd path
-each time you build an
-image. e.g. config/binary_local-hooks/01-fix_syslinux.sh
-
-code{
-
-#!/bin/sh
-
-SYSLINUXCFG=`find binary -type f -name syslinux.cfg`
-
-sed -i "s|kernel /vmlinuz|kernel vmlinuz|g" ${SYSLINUXCFG} sed -i
-"s|initrd=/initrd|initrd=initrd|g" ${SYSLINUXCFG}
-
-$ chmod +x config/binary_local-hooks/01-fix_syslinux.sh
-
-}code
-
-Q: How do I use a newer kernel with lenny? A: A build with backports.org
-kernels will fail as that repository lacks the necessary module packages
-(linux-modules-extra-2.6, aufs, etc.). Use the kernel backports
-http://unsupported.debian-maintainers.org/backports-kernel/ The quick way to
-success:
-
-code{
-
-$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6
-squashfs-modules-2.6' $ echo 'deb
-http://unsupported.debian-maintainers.org/backports-kernel/ ./' >
-config/chroot_sources/backports-kernel.chroot $ echo 'deb
-http://unsupported.debian-maintainers.org/backports-kernel/ ./' >
-config/chroot_sources/backports-kernel.binary $ wget
-http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc
--O config/chroot_sources/backports-kernel.chroot.gpg $ wget
-http://unsupported.debian-maintainers.org/backports-kernel/archive-key.asc
--O config/chroot_sources/backports-kernel.binary.gpg $ lh_build }code
-
-Q: How do I use a custom kernel? Is there a nice way of booting debian-live
-with a custom kernel (not in an apt repo)? A: Copy it into
-config/chroot_local-packages and set LH_LINUX_PACKAGES="none" or use lh
-config --linux-packages " " Don't forget to compile your kernel with an
-union filesystem (unionfs or aufs), squashfs modules, and initrd support. I
-can cause the kernel to be installed but it seems this happens later than
-grub/syslinux is configured so it's not listed and casper/ and the menu
-require munging. You need to follow the debian scheme, e.g. placing the
-files in /boot as vmlinuz-$version and initrd.img-$version etc. I personally
-wouldn't go that way which is too much of a hassle, and just use make-kpkg
-to produce custom kernel deb packages. They should integrate nicely if you
-just put them into config/chroot_local-packages and set
-LH_LINUX_PACKAGES="". Hint: to work around an error, which
-lh_binary_syslinux will throw on custom kernels if there is not an 468/686
-in the kernel-name, you need to set CONFIG_LOCALVERSION="-486" or "-686"
-within the kernel configuration (-&gt; General setup -&gt; Local version set
-to -486 or -686) corresponding to LH_LINUX_FLAVOURS="" or "686". this at
-least up till live-helper version 1.0~a40-1 see
-http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-July/001947.html
-and
-http://lists.alioth.debian.org/pipermail/debian-live-devel/2007-November/002581.html
-
-Q: How do I create a cross arch live CD image? A: In short: You can't. Read
-on: The procedure to create a live CD is based on creating a chroot that
-contains the files that will be finally available on the live CD. The live
-CD building procedure includes chrooting into the chroot dir and so some
-operations. chrooting means that the terminal you chroot on will behave as a
-different system so your real system and the chroot environment is decoupled
-somehow. Once the live CD scripts chroots into the chroot dir they have some
-operations to do inside that environment and your real system won't be able
-to run them unless you are using the same architecture. So you only are able
-to make live CD for the arch you run on. But this doesn't prevent you run
-qemu or some other machine emulator that make this possible.
-
-Q: When is a lh_clean necessary? lh_clean is a script in /usr/bin/ A: That
-depends what you've changed between builds If, for example, you've built an
-iso image and you want a usb image, you only need to run #{lh_clean
---binary}# before you run lh_build again. If you've changed anything in the
-chroot, you'll need to cleanup both chroot and binary with #{lh_clean}#
-before continuing
-
-Q: How can i set boot= parameters? A: Set LH_BOOTAPPEND_LIVE in
-config/binary
-
-Q: How do I include different modules to load when the live system boots? A:
-Configure config/chroot_local-includes/etc/initramfs-tools/
-
-The lh_chroot_hacks helper rebuilds the live/initrd1.img using the default
-initramfs.conf "MODULES = most". You may override that by supplying your own
-initramfs.conf, or else just add your own modules, e.g.
-
-code{
-
-mkdir -p config/chroot_local-includes/etc/initramfs-tools/ echo "atl2" >>
-config/chroot_local-includes/etc/initramfs-tools/modules
-
-}code
-
-Note: Even though initramfs.conf(5) says "most adds all the framebuffer,
-acpi, file system, ide, sata, scsi and usb drivers", it actually includes
-network drivers as well. See auto_add_modules() in
-/usr/share/initramfs-tools/hook-functions for the complete list.
-
-Q: Can I have a splash screen? A: Yes you can. You will not know what is
-going on when the splash screen is active, it may fail to activate on some
-hardware or break X on other (both usplash and splashy use libdirectfb which
-does some evil voodoo and may break you graphics or input until you
-reboot). However, you can install and activate it just as you would on any
-other Debian system. To use splashy: 1. install splashy and read the README,
-the manpages are useless for setting it up. Add some parameters to your
-kernel command line, such as in your pxelinux configuration or in
-LH_BOOTAPPEND_LIVE in config/binary in debian-live configuration: #{vga=792
-splash quiet}# #{vga}# to select video mode, #{splash}# to activate splashy,
-#{quiet}# to suppress most kernel messages that you cannot see anyway but
-would scroll past before splashy manages to paint the graphics on your
-screen. You might want to add splashy to the list of packages installed in
-your image: #{echo splashy > config/chroot_local-packageslists/splashy echo
-splashy-themes >> config/chroot_local-packageslists/splashy}# and select a
-theme:
-
-code{
-
-echo '#!/bin/sh' > config/chroot_local-hooks/splashy echo splashy_config -s
-debian-moreblue '||' true >> config/chroot_local-hooks/splashy # update the
-ramdisk to include the splash screen echo update-initramfs -u -k all >>
-config/chroot_local-hooks/splashy chmod 755
-config/chroot_local-hooks/splashy
-
-}code
-
-After you rebuild your live system you should observe a bluish splash screen
-while booting. Nothing happens while initramfs is running because there is
-no splashy support in initramfs-tools. Once the init starts the progress bar
-should start to fill. If #{vga=something}# sets a mode that your screen
-cannot show or your card cannot do vesa 2.0 (and thus you get plain text
-mode and no splashy) read the splashy faq.
-
-Q: Howto use my Broadcom eXtrem 2 network card (module bnx2)? A: Add the
-firmwares to the initrd image. You need to install the non-free package
-"firmware-bnx2". Uncompress your initrd image, then copy files:
-
-code{
-
-cp /lib/firmware/bnx2x-e1-4.8.53.0.fw /lib/firmware/bnx2x-e1-5.0.21.0.fw
-/lib/firmware/bnx2x-e1h-4.8.53.0.fw /lib/firmware/bnx2x-e1h-5.0.21.0.fw
-${INITRD}/lib/firmware/ cp /lib/udev/firmware.agent ${INITRD}/lib/udev/
-
-}code
-
-Recompress your initrd image and boot: it works!
-
-Q: X is broken (the system boots, messages scroll by, and then the screen
-goes blank). What do I do? A: On my system starting X completely disables
-graphics so that I do not see anything even after X bails out and I am back
-to the console. To prevent this you can change the driver Xorg uses.
-
-If you have a working splash screen or at least graphical console you can
-use #{live xdriver=fbdev}# when booting the live system (instead of just
-enter). Another driver you might want to try is #{vesa}#. If all fails you
-might try to set xdriver to some wrong value so that Xorg fails to start and
-you can examine the system while you still see something on the
-console. #{live xdriver=none}#
-
-Q: How can I get Debian first stable versions? A: I'm developing software
-and testing it on Live-CD. Thanks for the LiveCD project. To be sure my
-development is fully compatible with the "etch" version, I need the same
-scenario when Debian GNU/Linux 4.0 was published as stable (I believe
-2007.04.08). If there was some bug on 2007.04.08 that was corrected one week
-later, I need to test software foreseeing that scenario without the bug
-solved.
-
-Q: I get "fopen: Permission denied"-warnings from apt on building/at the
-live-system A: That's a harmless bug in apt. However, if you want to get off
-this warnings in the live-system, add a file in chroot_local-hooks with
-follow row:
-
-code{
-
-chown -R man.man /var/cache/man
-
-}code
-
-Q: Why I always fail during "Retrieving Packages" stage when running
-lh_build? I have already set apt-http-proxy and so on.  A: lh_build
-retrieves packages via wget, as a result you need to enable the proxy
-settings in /etc/wgetrc before running lh_build.
-
-Q: How do I edit Xorg.conf? A: Xorg.conf is generated every time system
-boots, so it's useless to put modifed Xorg.conf in
-config/choort_local-includes/etc/X11, because it will be overwritten during
-boot. However, you can edit /usr/bin/dexconf, which generate xorg.conf
-during boot, so the result will be modified Xorg.conf. The modified dexconf
-has to be put in config/choort_local-includes/usr/bin. e.g.: you can
-configure Xorg.conf for two or more keyboards layouts with alt+shift toggle
-by editing dexconf and replacing the line:
-
-code{
-
-Option "XkbLayout" "$XKB_LAYOUT"
-
-}code
-
-with the lines:
-
-code{
-
-Option "XkbLayout" "us,il" Option "XkbOptions"
-"grp:alt_shift_toggle,grp_led:scroll"
-
-}code
-
-when "us,il" are the wanted keyboard layouts.
-
-You can force default screen resulotion (e.g. 1024*768) by adding the lines:
-
-code{
-
-SubSection "Display"
-        Modes "1024x768"
-EndSubSection
-
-}code
-
-between the lines:
-
-code{
-
-Section "Screen"
-        Identifier "Default Screen"
-        Monitor "Configured Monitor"
-EndSection"
-
-}code
-
-Q: Where are the build parameters for the prebuilt images A: See
-http://live.debian.net/README.images.
diff --git a/manual/ro/other_howtos.ssi b/manual/ro/other_howtos.ssi
deleted file mode 100644
index 63e84bf..0000000
--- a/manual/ro/other_howtos.ssi
+++ /dev/null
@@ -1,118 +0,0 @@
-B~ Howtos
-
-1~ Howtos
-
-2~ ISO
-
-Generating a Debian Live CD is very simple. You need to have live-helper
-(package available in Debian sid and lenny), and Debootstrap (or
-cdebootstrap) from etch or newer.
-
-3~ Install live-helper
-
-#{apt-get install live-helper}#
-
-3~ Configure the current working directory with lh_config
-
-code{
-
-lh_config -b iso -a $ARCH
-
-}code
-
-where #{$ARCH}# is the intended architecture (i.e. - i386 or amd64).
-
-#{-b}# flag is used to be sure to obtain image in ISO format.
-
-3~ Build the image with lh_build:
-
-Execute lh_build as root: #{lh_build}#
-
-The command above will create the basic image, containing just the Debian
-standard system (with no X at all).
-
-If you want to have any of the Desktop environments on your livecd, #{ls
-/usr/share/live-helper/lists}# will show a number of available package Lists
-to choose from, e.g. #{lh_config -p gnome-desktop}#
-
-More examples are listed at DebianLive/Examples.
-
-See packages for help configuring a local Debian Mirror and other aspects of
-the live system.  % FIXME: <xref linkend="packages"/>
-
-3~ Test the image
-
-If you have qemu installed, you can boot the image with:
-
-code{
-
-qemu -cdrom binary.iso
-
-}code
-
-If you have also kqemu installed, you can add #{-kernel-kqemu}#
-
-2~ ISO_(multiarch)
-
-Multiple machine boot CDs can be created with the following manual
-procedure. This procedure has been successfully used to create a single CD
-which is bootable on alpha, i386, pmax, and sparc. It should be possible to
-also make the CD bootable on macppc, vax and on sun2, sun3 and sun3x.
-
-To create a CD which is bootable by multiple architectures, use the
-following steps in this order. Please note that the order is critical.
-
-Make sure you have all the required files including the various kernels and
-boot programs listed in the individual machine sections.
-
-Include a directory somewhere in the cdsources directory called mdec.pmax
-and include the pmax bootxx_cd9660 file there. For example,
-/cdsources/usr/mdec.pmax/bootxx_cd9660.
-
-Include a directory somewhere in the cdsources directory called mdec.vax and
-include the vax xxboot file there. For example,
-#{cdsources/usr/mdec.vax/xxboot.}#
-
-Include the macppc ofwboot.xcf bootloader in /cdsources.
-
-Create an i386 bootable image. #{sh mkisofs -v -v -o output.iso -b
-i386/installation/floppy/boot-big.fs \ -c boot.catalog -l -J -r -L
-/cdsources 2>&1 | tee /tmp/mkisofs.log exit}#
-
-Note: The appearance of the -v flag twice is required. If you are making a
-bootable CD for an Open Firmware 3 macppc model, make sure to include -hfs
--part in the parameters for mkisofs.
-
-Run mksunbootcd on a NetBSD/sparc machine to install sparc and sun2/sun3
-bootblocks. Alternatively, install the sysutils/mksunbootcd package on your
-favorite NetBSD machine. #{mksunbootcd output.iso boot-sun4.fs boot-sun4c.fs
-boot-sun4m.fs boot-sun3.fs}#
-
-Run the installboot(8) program targeted for NetBSD/pmax to install the pmax
-bootblocks. Note that in order to coexist with other NetBSD boot blocks, the
-pmax boot block is appended to the end of the ISO file system.
-
-#{installboot -m pmax -v -o append,sunsum output.iso
-/tmp/mdec.pmax/bootxx_cd9660}#
-
-The -o append,sunsum option appends the first stage boot block to the end of
-the ISO file system, and restores the checksum used when booting on a sun.
-
-Run the installboot(8) program targeted for NetBSD/vax to install the vax
-bootblocks. Note that in order to coexist with other NetBSD boot blocks, the
-vax boot block is appended to the end of the ISO file system.
-
-installboot -m vax -v -o append,sunsum output.iso /tmp/mdec.vax/xxboot
-
-(See the pmax entry above for an explanation of the flags).
-
-Run the installboot(8) program targeted for NetBSD/alpha to install the
-alpha bootblocks.
-
-#{installboot -m alpha -v -o append,sunsum output.iso
-/tmp/mdec.alpha/bootxx_cd9660}#
-
-Note: The alpha installboot must occur after the others, because currently
-it's the only machine dependent back-end for installboot(8) that can
-calculate the alpha checksum. (See the pmax entry above for an explanation
-of the flags).
diff --git a/manual/ro/project_bugs.ssi b/manual/ro/project_bugs.ssi
index cce48f8..7eaaaea 100644
--- a/manual/ro/project_bugs.ssi
+++ b/manual/ro/project_bugs.ssi
@@ -21,42 +21,44 @@ used and the distribution of the live system you are building.
 
 2~ Known issues
 
-Due to the nature of Debian *{testing}* and Debian *{unstable}*
-distributions being a moving target, building a live system may not always
-be possible.
+Because Debian *{testing}* and Debian *{unstable}* distributions are a
+moving target, when you specify either as the target system distribution, a
+successful build may not always be possible.
 
-If this is a problem, do not build a system based on *{testing}* or
-*{unstable}*, but go with *{stable}*. live-build does always default to the
-current *{stable}* release.
+% FIXME:
+
+If this causes too much difficulty for you, do not build a system based on
+*{testing}* or *{unstable}*, but rather, use *{stable}*. live-build does
+always default to the *{stable}* release.
 
 Currently known issues are listed under the section 'status' on our homepage
-at http://live.debian.net/
+at http://live.debian.net/.
 
-It is out of the scope of this manual to train you in correctly identifying
-and fixing problems in packages of the development distributions, however,
-there are two things you can always try: When not succeeding to build
-*{testing}*, try if *{unstable}* works. If *{unstable}* does not work
-either, revert to *{testing}* and pinning the newer version of the failing
-package from *{unstable}*.
+It is out of the scope of this manual to train you to correctly identify and
+fix problems in packages of the development distributions, however, there
+are two things you can always try: If a build fails when the target
+distribution is *{testing}*, try *{unstable}*. If *{unstable}* does not work
+either, revert to *{testing}* and pin the newer version of the failing
+package from *{unstable}* (see {APT pinning}#apt-pinning for details).
 
 2~ Rebuild from scratch
 
-To ensure that a particular bug is not caused by an unclean built system,
+To ensure that a particular bug is not caused by an uncleanly built system,
 please always rebuild the whole live system from scratch to see if the bug
 is reproducible.
 
 2~ Use up-to-date packages
 
 Using outdated packages can cause significant problems when trying to
-reproduce (and ultimately fix) your problem.
+reproduce (and ultimately fix) your problem. Make sure your build system is
+up-to-date and any packages included in your image are up-to-date as well.
 
 2~collect-information Collect information
 
-Please provide enough information with your report. At a minimum, it should
-contain the exact version of live-build version where the bug is
-encountered, and steps to reproduce it. Please use common sense and include
-other relevant information if you think that it might help in solving the
-problem.
+Please provide enough information with your report. At least include the
+exact version of live-build version where the bug is encountered and steps
+to reproduce it. Please use common sense and include other relevant
+information if you think that it might help in solving the problem.
 
 To make the most out of your bug report, we require at least the following
 information:
@@ -69,7 +71,7 @@ _* Version of live-boot on the live system
 
 _* Version of live-config on the live system
 
-_* Version of debootstrap and/or cdebootstrap on the host system
+_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system
 
 _* Architecture of the live system
 
@@ -77,26 +79,43 @@ _* Distribution of the live system
 
 _* Version of the kernel on the live system
 
-You can generate a log of the build process by using the tee command:
+You can generate a log of the build process by using the #{tee}# command. We
+recommend doing this automatically with an #{auto/build}# script; see
+{Managing a configuration}#managing-a-configuration for details).
 
 code{
 
-lb build 2>&1 | tee build.log
+ # lb build 2>&1 | tee build.log
 
 }code
 
-For runtime log, live-boot stores a log in /var/log/live.log (or
-/var/log/live-boot.log).
+At boot time, live-boot stores a log in #{/var/log/live.log}# (or
+#{/var/log/live-boot.log}#).
 
 Additionally, to rule out other errors, it is always a good idea to tar up
-your config directory and upload it somewhere (do *{not}* send it as an
-attachment to the mailinglist), so that we can try to reproduce the errors
-you encountered.
+your #{config/}# directory and upload it somewhere (do *{not}* send it as an
+attachment to the mailing list), so that we can try to reproduce the errors
+you encountered. If this is difficult (e.g. due to size) you can use the
+output of #{lb config --dump}# which produces a summary of your config tree
+(i.e. lists files in subdirectories of #{config/}# but does not include
+them).
 
 Remember to send in any logs that were produced with English locale
 settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or
 #{LC_ALL=en_US}#.
 
+2~ Isolate the failing case if possible
+
+If possible, isolate the failing case to the smallest possible change that
+breaks. It is not always easy to do this, so if you can't manage it for your
+report, don't worry. However, if you plan your development cycle well, using
+small enough change sets per iteration, you may be able to isolate the
+problem by constructing a simpler 'base' configuration that closely matches
+your actual configuration plus just the broken change set added to it. If
+you have a hard time sorting out which of your changes broke, it may be that
+you are including too much in each change set and should develop in smaller
+increments.
+
 2~ Use the correct package to report the bug against
 
 Where does the bug appear?
@@ -121,9 +140,9 @@ can fail. If a bug appears here, check if the error is also reproducible on
 a normal system.
 
 If this is the case, this is not a bug in Debian Live, but rather in Debian
-- please report it against the failing package. Running debootstrap
-seperately from the Live system build or running lb bootstrap with
-#{--debug}# will give you more information.
+- please report it against the failing package. Running #{debootstrap}#
+separately from the Live system build or running #{lb bootstrap --debug}#
+will give you more information.
 
 Also, if you are using a local mirror and/or any of sort of proxy and you
 are experiencing a problem, please always reproduce it first by
@@ -134,10 +153,10 @@ bootstrapping from an official mirror.
 If your image does not boot, please report it to the mailing list together
 with the information requested in {Collect
 information}#collect-information. Do not forget to mention, how/when the
-image failed, in Qemu, VMWare or real hardware. If you are using a
-virtualization technology of any kind, please always run it on real hardware
-before reporting a bug. Providing a screenshot of the failure is also very
-helpful.
+image failed, in Qemu, Virtualbox, VMWare or real hardware. If you are using
+a virtualization technology of any kind, please always run it on real
+hardware before reporting a bug. Providing a screenshot of the failure is
+also very helpful.
 
 3~ At run time
 
diff --git a/manual/ro/project_coding-style.ssi b/manual/ro/project_coding-style.ssi
index a0e5959..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
 
@@ -71,22 +71,22 @@ foo ()
 
 _* Variables are always in capital letters.
 
-_* Variables that used in lb config always start with LH_ prefix.
+_* Variables that used in #{lb config}# always start with #{LB_}# prefix.
 
-_* Internal temporary variables in live-build should start with the _LH_
-prefix.
+_* Internal temporary variables in live-build should start with the
+#{\_LB_}# prefix.
 
-_* Local variables start with live-build __LH_ prefix.
+_* Local variables start with live-build #{\_\_LB_}# prefix.
 
 _* Variables in connection to a boot parameter in live-config start with
-LIVE_.
+#{LIVE_}#.
 
-_* All other variables in live-config start with _ prefix.
+_* All other variables in live-config start with #{_}# prefix.
 
-_* Use braces around variables; eg. write ${FOO} instead of $FOO.
+_* Use braces around variables; e.g. write #{${FOO}}# instead of #{$FOO}#.
 
-_* Always protect variables with quotes to respect potential whitespaces,
-write "${FOO}" not ${FOO}.
+_* Always protect variables with quotes to respect potential whitespaces:
+write #{"${FOO}"}# not #{${FOO}}#.
 
 _* For consistency reasons, always use quotes when assigning values to
 variables:
@@ -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,20 +124,21 @@ Good:
 
 code{
 
-if [ -f "${FOO}/foo/${BAR}/bar" ]
-then
-        foobar
-fi
+ if [ -f "${FOO}/foo/${BAR}/bar" ]
+ then
+         foobar
+ fi
 
 }code
 
 2~ Miscellaneous
 
-_* Use "|" (without the surround quotes) as a seperator in calls to sed,
-e.g. "sed -e 's|foo|bar|'" (without "").
+_* Use "#{|}#" (without the surround quotes) as a seperator in calls to sed,
+e.g. "#{sed -e 's|foo|bar|'}#" (without "").
 
-_* Don't use the test command for comparisons or tests, use "[" "]" (without
-""), e.g. "if [ -x /bin/foo ]; ..." and not "if test -x /bin/foo; ...".
+_* Don't use the #{test}# command for comparisons or tests, use "#{[}#"
+"#{]}#" (without ""); e.g. "#{if [ -x /bin/foo ]; ...}#" and not "#{if test
+-x /bin/foo; ...}#".
 
-_* Use case wherever possible over test, as it's easier to read and faster
-in execution.
+_* Use #{case}# wherever possible over #{test}#, as it's easier to read and
+faster in execution.
diff --git a/manual/ro/project_procedures.ssi b/manual/ro/project_procedures.ssi
index 4dc9061..49b1924 100644
--- a/manual/ro/project_procedures.ssi
+++ b/manual/ro/project_procedures.ssi
@@ -1,6 +1,6 @@
 B~ Procedures
 
-1~ Procedures
+1~procedures Procedures
 
 This chapter documents the procedures within the Debian Live project for
 various tasks that need cooperation with other teams in Debian.
@@ -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 b4e6373..ae7318e 100644
--- a/manual/ro/user_basics.ssi
+++ b/manual/ro/user_basics.ssi
@@ -36,9 +36,7 @@ SquashFS compressed filesystem is used to minimize the Debian Live image
 size. Note that it is read-only. So, during boot the Debian Live system will
 use a RAM disk and 'union' mechanism to enable writing files within the
 running system. However, all modifications will be lost upon shutdown unless
-optional persistence is used (see persistence).
-
-% FIXME: <xref linkend="persistence"/>
+optional persistence is used (see {Persistence}#persistence).
 
 _* *{Bootloader}*: A small piece of code crafted to boot from the chosen
 media, possibly presenting a prompt or menu to allow selection of
@@ -52,7 +50,7 @@ partitions, etc.
 
 You can use live-build to build the system image from your specifications,
 set up a Linux kernel, its initrd, and a bootloader to run them, all in one
-media-dependant format (ISO9660 image, disk image, etc.)
+media-dependant format (ISO9660 image, disk image, etc.).
 
 2~ First steps: building an ISO image
 
@@ -67,19 +65,19 @@ hierarchy in the current directory for use by other commands:
 
 code{
 
-$ lb config
+ $ lb config
 
 }code
 
 By passing no parameters to #{lb config}#, we indicated that we wish to use
 the defaults (see {The lb config command}#lb-config).
 
-Now that we have a "config/" hierarchy, we may build the image with the lb
-build command:
+Now that we have a "config/" hierarchy, we may build the image with the #{lb
+build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -92,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
 
@@ -104,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
 
@@ -120,7 +118,7 @@ resolution is limited to 800x600.
 
 code{
 
-# lb config --packages virtualbox-ose-guest-x11
+ $ lb config --packages virtualbox-ose-guest-x11
 
 }code
 
@@ -130,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
 
@@ -152,7 +150,7 @@ lb clean command}#lb-clean):
 
 code{
 
-$ lb clean --binary
+ # lb clean --binary
 
 }code
 
@@ -161,15 +159,15 @@ Run the #{lb config}# command with the parameters to configure the
 
 code{
 
-$ lb config -b usb-hdd
+ $ lb config -b usb-hdd
 
 }code
 
-Now build the image with the #{lb build} command:
+Now build the image with the #{lb build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -181,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
 
@@ -193,15 +191,15 @@ better yet, #{ls -l /dev/disk/by-id}#.
 *{This will definitely overwrite any previous contents on your stick!}*
 
 Note: As discussed earlier, this same process can be used for #{iso-hybrid}#
-type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images.
+type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images.
 
 3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu
 
 code{
 
-# apt-get install qemu
+ # apt-get install qemu
 
-$ qemu -hda binary.img
+ $ qemu -hda binary.img
 
 }code
 
@@ -214,7 +212,7 @@ be used by the Debian Live system.
 
 code{
 
-# gparted ${USBSTICK}
+ # gparted ${USBSTICK}
 
 }code
 
@@ -223,7 +221,7 @@ it. One possible choice would be ext4.
 
 code{
 
-# mkfs.ext4 ${USBSTICK}
+ # mkfs.ext4 ${USBSTICK}
 
 }code
 
@@ -231,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
 
@@ -248,31 +246,31 @@ working directory with the #{lb clean}# command:
 
 code{
 
-$ lb clean --binary
+ # lb clean --binary
 
 }code
 
-Run the #{lb config}# command with the parameters to configure the "config/"
-hierarchy to create our netboot image:
+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
 
-In contrast with the ISO and USB/HDD images, netbooting does not support
-serving a filesystem image with the client, so the files must be served via
-NFS. The net-root-path and net-root-server options specify the location and
-server, respectively, of the NFS server where the filesytem image will be
-located at boot time.
+In contrast with the ISO and USB/HDD images, netbooting does not, itself,
+serve the filesystem image to the client, so the files must be served via
+NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the
+location and server, respectively, of the NFS server where the filesytem
+image will be located at boot time. Make sure these are set to suitable
+values for your network and server.
 
 Now build the image with the #{lb build}# command:
 
 code{
 
-# lb build
+ # lb build
 
 }code
 
@@ -283,12 +281,13 @@ next step is getting a higher level bootloader via the TFTP protocol. That
 could be pxelinux, GRUB, or even boot directly to an operating system like
 Linux.
 
-For example, if you unpack the generated binary-net.tar.gz archive in the
-/srv/debian-live directory, you'll find the filesystem image in
-live/filesystem.squashfs and the kernel, initrd and pxelinux bootloader in
-tftpboot/debian-live/i386.
+For example, if you unpack the generated #{binary-net.tar.gz}# archive in
+the #{/srv/debian-live}# directory, you'll find the filesystem image in
+#{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader
+in #{tftpboot/debian-live/i386}#.
 
-We must now configure three services on the server to enable netboot.
+We must now configure three services on the server to enable netboot: the
+DHCP server, the TFTP server and the NFS server.
 
 3~ DHCP server
 
@@ -297,33 +296,26 @@ to the netbooting client system, and to advertise the location of the PXE
 bootloader.
 
 Here is an example for inspiration, written for the ISC DHCP server
-#{isc-dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;
-
-% FIXME
+#{isc-dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:
 
 code{
 
-subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
-
-  # IP addresses available for guests
-  range 192.168.1.100 192.168.1.149;
+ # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server
 
-  # allow booting from the net
-  allow bootp;
+ ddns-update-style none;
 
-  # for net booting, server where the first file to be loaded (by TFTP
-  # protocol) ("filename" following definition) lies : so the TFTP
-  # server's name.
-  next-server myserver;
+ option domain-name "example.org";
+ option domain-name-servers ns1.example.org, ns2.example.org;
 
-  # net boot configuration for guests with a PXE client :
-  if substring (option vendor-class-identifier, 0, 9) = "PXEClient" {
-    # Note: all files for PXE are relatives to the TFTP server's root
+ default-lease-time 600;
+ max-lease-time 7200;
 
-    # PXE bootloader (first program to be loaded, by TFTP)
-    filename "pxelinux.0";
+ 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";
 }
 
 }code
@@ -333,12 +325,12 @@ subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
 This serves the kernel and initial ramdisk to the system at run time.
 
 You should install the tftpd-hpa package. It can serve all files contained
-inside a root directory, usually /srv/tftp. To let it serve files inside
-/srv/debian-live/tftpboot, run as root the following command:
+inside a root directory, usually #{/srv/tftp}#. To let it serve files inside
+#{/srv/debian-live/tftpboot}#, run as root the following command:
 
 code{
 
-dpkg-reconfigure -plow tftpd-hpa
+ # dpkg-reconfigure -plow tftpd-hpa
 
 }code
 
@@ -350,14 +342,14 @@ Once the guest computer has downloaded and booted a Linux kernel and loaded
 its initrd, it will try to mount the Live filesystem image through a NFS
 server.
 
-You need to install the nfs-kernel-server package.
+You need to install the #{nfs-kernel-server}# package.
 
 Then, make the filesystem image available through NFS by adding a line like
-the following to /etc/exports:
+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
 
@@ -365,15 +357,16 @@ and tell the NFS server about this new export with the following command:
 
 code{
 
-# exportfs -rv
+ # exportfs -rv
 
 }code
 
 Setting up these three services can be a little tricky. You might need some
-patience to get all of them working together. The Debian Installer Manual's
-TFTP Net Booting section at
-http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html might help as that
-process is very similar.
+patience to get all of them working together. For more information, see the
+syslinux wiki at http://syslinux.zytor.com/wiki/index.php/PXELINUX or the
+Debian Installer Manual's TFTP Net Booting section at
+http://d-i.alioth.debian.org/manual/en.i386/ch04s05.html. They might help,
+as their processes are very similar.
 
 3~ Netboot testing HowTo
 
@@ -384,51 +377,64 @@ To make our life easier, we can use virtualization. There are two solutions.
 
 3~ Qemu
 
-_* Install qemu, bridge-utils, sudo.
+_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#.
 
-Edit /etc/qemu-ifup:
+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
 
-Get, or build a grub-floppy-netboot (in the svn).
+Get, or build a #{grub-floppy-netboot}# (in the svn).
 
-Launch qemu with "-net nic,vlan=0 -net tap,vlan=0,ifname=tun0"
+Launch #{qemu}# with "#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#"
 
 3~ VMWare Player
 
 _* Install VMWare Player ("free as in beer" edition)
 
-_* Create a PXETester directory, and create a text file called pxe.vwx
+_* Create a PXETester directory, and create a text file called #{pxe.vwx}#
 inside
 
 _* 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
 
-_* You can play with this configuration file (i.e. change memory limit to
+_* You can play with this configuration file (e.g. change memory limit to
 256)
 
 _* Double click on this file (or run VMWare player and select this file).
diff --git a/manual/ro/user_customization-contents.ssi b/manual/ro/user_customization-contents.ssi
index f8d01ce..3906219 100644
--- a/manual/ro/user_customization-contents.ssi
+++ b/manual/ro/user_customization-contents.ssi
@@ -2,42 +2,45 @@
 
 1~customizing-contents Customizing contents
 
-This chapter discusses further customization of the live system.
+This chapter discusses fine-tuning customization of the live system contents
+beyond merely choosing which packages to include. Includes allow you to add
+or replace arbitrary files in your Debian Live image, hooks allow you to
+execute arbitrary commands at different stages of the build and at boot
+time, and preseeding allows you to configure packages when they are
+installed by supplying answers to debconf questions.
 
 2~ Includes
 
-Using includes, it is possible to add (or replace) arbitrary files in your
-Debian Live image. live-build provides three mechanisms for using them:
+While ideally a Debian live system would include files entirely provided by
+unmodified Debian packages, it is sometimes convenient to provide or modify
+some content by means of files. Using includes, it is possible to add (or
+replace) arbitrary files in your Debian Live image. live-build provides
+three mechanisms for using them:
 
 _* Chroot local includes: These allow you to add or replace files to the
-chroot/Live filesystem. Please see chroot-local-includes for more
-information.
-
-% FIXME: <xref linkend="chroot-local-includes"/>
+chroot/Live filesystem. Please see {Live/chroot local
+includes}#live-chroot-local-includes for more information.
 
 _* Binary local includes: These allow you to add or replace files in the
-binary image. Please see binary-local-includes for more information.
-
-% FIXME: <xref linkend="binary-local-includes"/>
+binary image. Please see {Binary local includes}#binary-local-includes for
+more information.
 
 _* Binary includes: These allow you to add or replace Debian specific files
 in the binary image, such as the templates and tools directories. Please see
-binary-includes for more information.
-
-% FIXME: <xref linkend="binary-includes"/>
-
-Please see terms for more information about the distinction between the
-"Live" and "binary" images.
+{Binary includes}#binary-includes for more information.
 
-% FIXME: <xref linkend="terms"/>
+Please see {Terms}#terms for more information about the distinction between
+the "Live" and "binary" images.
 
-3~ Live/chroot local includes
+3~live-chroot-local-includes Live/chroot local includes
 
 Chroot local includes can be used to add or replace files in the chroot/Live
-filesystem so that they are visible when the Live system is booted. Typical
-uses for them are to populate the skeleton user directory (#{/etc/skel}#)
-used by the live system to create the live user's home directory, or adding
-configuration files where additional processing is not required.
+filesystem so that they may be used in the Live system. A typical use is to
+populate the skeleton user directory (#{/etc/skel}#) used by the Live system
+to create the live user's home directory. Another is to supply configuration
+files that can be simply added or replaced in the image without processing;
+see {Live/chroot local hooks}#live-chroot-local-hooks if processing is
+needed.
 
 To include files, simply add them to your #{config/chroot_local-includes}#
 directory. This directory corresponds to the root directory (#{/}#) of the
@@ -46,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
 
@@ -55,42 +58,59 @@ 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
 
 Chroot local includes are installed after package installation so that files
 installed by packages are overwritten.
 
-3~ Binary local includes
+3~binary-local-includes Binary local includes
 
-The same way as chroot local includes work, there exists the corresponding
-mechanism to include files in the live media itself.
+To include material such as documentation or videos on the media filesystem
+so that it is accessible immediately upon insertion of the media without
+booting the Live system, you can use binary local includes. This works in a
+similar fashion to chroot local includes. For example, suppose the files
+#{~/video_demo.*}# are demo videos of the live system described by and
+linked to by an HTML index page. Simply copy the material to
+#{config/binary_local-includes/} as follows:
 
-3~ Binary includes
+code{
+
+ $ cp ~/video_demo.* config/binary_local-includes/
+
+}code
+
+These files will now appear in the root directory of the live media.
+
+3~binary-includes Binary includes
 
 live-build has some standard files (like documentation) that gets included
 in the default configuration on every live media. This can be disabled with:
 
 code{
 
-$ lb config --includes none
+ $ lb config --includes none
 
 }code
 
+Otherwise, the material will be installed by live-build in #{/includes/}# by
+default on the media filesystem, or else you can specify an alternate path
+with #{--includes}#.
+
 2~ Hooks
 
 Hooks allow commands to be performed in the chroot and binary stages of the
 build in order to customize the image.
 
-3~ Live/chroot local hooks
+3~live-chroot-local-hooks Live/chroot local hooks
 
 To run commands in the chroot stage, create a hook script containing the
 commands in the #{config/chroot_local-hooks}# directory. The hook will run
@@ -101,6 +121,17 @@ various common chroot customization tasks provided in
 #{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
 use them in your own configuration.
 
+3~ Boot-time hooks
+
+To execute commands at boot time, you can supply live-config hooks as
+explained in the "Customization" section of its man page. Examine
+live-config's own hooks provided in #{/lib/live/config/}#, noting the
+sequence numbers. Then provide your own hook prefixed with an appropriate
+sequence number, either as a chroot local include in
+#{config/chroot_local-includes/lib/live/config/}#, or as a custom package as
+discussed in {Installing modified or third-party
+packages}#installing-modified-or-third-party-packages.
+
 3~ Binary local hooks
 
 To run commands in the binary stage, create a hook script containing the
diff --git a/manual/ro/user_customization-installer.ssi b/manual/ro/user_customization-installer.ssi
index fcb326a..6ed2152 100644
--- a/manual/ro/user_customization-installer.ssi
+++ b/manual/ro/user_customization-installer.ssi
@@ -3,52 +3,87 @@
 1~customizing-installer Customizing Debian Installer
 
 Debian Live system images can be integrated with Debian Installer. There are
-number of different "types" of installation, varying in what and how to
-install the image.
+a number of different types of installation, varying in what is included and
+how the installer operates.
 
 Please note the careful use of capital letters when referring to the "Debian
 Installer" in this section - when used like this we refer explicitly to the
 official installer for the Debian system, not anything else. It is often
 seen abbreviated to "d-i".
 
+2~ Types of Debian Installer
+
 The three main types of installer are:
 
-_* *{"Regular" Debian Installer}*: This is a normal Debian Live image with a
-seperate kernel and initrd which (when selected from the appropriate
-bootloader) launches into a standard Debian Installer instance, just as if
-you had downloaded a CD image of Debian and booted it. Images containing a
-live system and such an otherwise indepentend installer are often referet to
-as "combined images".
+*{"Regular" Debian Installer}*: This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise independent installer are often referred to as "combined images".
 
 On such images, Debian is installed by fetching and installing .deb packages
 using #{debootstrap}# or #{cdebootstrap}#, from the local media or some
-network-base network, resulting in a standard Debian system being installed
+network-based network, resulting in a standard Debian system being installed
 to the hard disk.
 
 This whole process can be preseeded and customized in a number of ways; see
 the relevant pages in the Debian Installer manual for more information. Once
-you have a working preseeding file, live-build can automatically place it to
+you have a working preseeding file, live-build can automatically put it in
 the image and enable it for you.
 
-_* *{"Live" Debian Installer}*: This is a Debian Live image with a seperate
-kernel and initrd which (when selected from the appropriate bootloader)
-launches into an instance of the Debian Installer.
+*{"Live" Debian Installer}*: This is a Debian Live image with a separate kernel and initrd which (when selected from the appropriate bootloader) launches into an instance of the Debian Installer.
 
 Installation will proceed in an identical fashion to the "Regular"
 installation described above, but at the actual package installation stage,
-instead of using #{debootstrap}# to fetch and install packages, the "live"
-filesystem image is copied to the target. This is acchieved with a special
-udeb called live-installer. live-installer can be preseeded to be disabled,
-allowing to support normal and live installer entries in the bootloader of
-the same live media.
+instead of using #{debootstrap}# to fetch and install packages, the live
+filesystem image is copied to the target. This is achieved with a special
+udeb called live-installer.
 
 After this stage, the Debian Installer continues as normal, installing and
 configuring items such as bootloaders and local users, etc.
 
-_* *{"Desktop" Debian Installer}*: Regardless of the mode Debian Installer
-is used in, d-i can be launched from the Desktop by clicking on an
-icon. This is user friendlier in some situations. In order to make use of
-this, the debian-installer-launcher package needs to be included.
+Note: to support both normal and live installer entries in the bootloader of
+the same live media, you must disable live-installer by preseeding
+#{live-installer/enable=false}.
+
+*{"Desktop" Debian Installer}*: Regardless of the type of Debian Installer included, #{d-i}# can be launched from the Desktop by clicking on an icon. This is user friendlier in some situations. In order to make use of this, the debian-installer-launcher package needs to be included.
+
+Note that by default, live-build does not include Debian Installer images in
+the images, it needs to be specifically enabled with #{lb config}#. Also,
+please note that for the "Desktop" installer to work, the kernel of the live
+system must match the kernel #{d-i}# uses for the specified
+architecture. For example:
+
+code{
+
+ $ lb config --architecture i386 --linux-flavours 486 \
+     --debian-installer live --packages debian-installer-launcher
+
+}code
+
+2~ Customizing Debian Installer by preseeding
+
+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 answers to questions asked during the installation process,
+without having to manually enter the answers while the installation is
+running. This makes it possible to fully automate most types of installation
+and even offers some features not available during normal installations."
+This kind of customization is best accomplished with live-build by placing
+the configuration in a #{preseed.cfg}# file included in
+#{config/binary_debian-installer/}#. For example, to preseed setting the
+locale to #{en_US}#:
+
+code{
+
+ $ echo "d-i debian-installer/locale string en_US" \
+     >> config/binary_debian-installer/preseed.cfg
+
+}code
+
+2~ Customizing Debian Installer content
+
+For experimental or debugging purposes, you might want to include locally
+built #{d-i}# component udeb packages. Place these in
+#{config/binary_local-udebs/}# to include them in the image. Additional or
+replacement files and directories may be included in the installer initrd as
+well, in a similar fashion to {Live/chroot local
+includes}#live-chroot-local-includes, by placing the material in
+#{config/binary_debian-installer-includes/}#.
 
-Note that by default live-build does not include Debian Installer images in
-the images, it needs to be specifically enabled with lb config.
diff --git a/manual/ro/user_customization-internationalization.ssi b/manual/ro/user_customization-internationalization.ssi
deleted file mode 100644
index 0288819..0000000
--- a/manual/ro/user_customization-internationalization.ssi
+++ /dev/null
@@ -1,49 +0,0 @@
-:B~ Customizing locale and language
-
-1~customizing-locale-and-language Customizing locale and language
-
-2~ Default locale and keyboard
-
-The default locale when building a Live system is "locales=en_US.UTF-8", to
-set the locale for e.g. Switzerland, you can use "locales=de_CH.UTF-8".
-
-code{
-
-$ lb config --bootappend-live "locales=de_CH.UTF-8"
-
-}code
-
-The entry for a Swiss-German keyboard would be:
-
-code{
-
-$ lb config --bootappend-live "keyboard-layouts=ch"
-
-}code
-
-Combined, the keyboard and locale configured for Switzerland would be:
-
-code{
-
-$ lb config --bootappend-live ="locales=de_CH.UTF-8 keyboard-layouts=ch"
-
-}code
-
-Note: You can find a list of options in the manpage for
-live-config. Currently, only UTF-8 locales are supported.
-
-2~ l10n Packages
-
-An experimental feature of live-build is to automatically check for each
-package for which it is know that there are -l10n packages available and
-install them. To add German packages the entry would be
-
-code{
-
-$ lb config --language "de"
-
-}code
-
-This will also change the default syslinux language if translations are
-available or local translations have been put into
-#{config/templates/syslinux/de}#.
diff --git a/manual/ro/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
index b4153a1..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,17 +266,21 @@ specified:
 
 code{
 
-#if ARCHITECTURE amd64 ia32-libs #endif
+ #if ARCHITECTURE amd64
+ ia32-libs
+ #endif
 
 }code
 
-You may test for any one of a number of values, e.g. to install #{memtest86+
-}# if either #{--architecture i386}# or #{--architecture amd64}# is
-specified:
+You may test for any one of a number of values, e.g. to install
+#{memtest86+}# if either #{--architecture i386}# or #{--architecture amd64}#
+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
 
@@ -323,12 +332,11 @@ including ones not included in this list, may be examined with #{tasksel
 
 Desktop and language tasks are special cases. In the Debian Installer, if
 the medium was prepared for a particular desktop environment flavour, the
-corresponding task will be automatically installed. Thus, there are there
-are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and
-#{xfce-desktop}# tasks, none of which are offered in #{tasksel}#'s
-menu. Likewise, there are no menu entries for tasks for languages, but the
-user's language choice during the install influences the selection of
-corresponding language tasks.
+corresponding task will be automatically installed. Thus, there are
+#{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#
+tasks, none of which are offered in #{tasksel}#'s menu. Likewise, there are
+no menu entries for tasks for languages, but the user's language choice
+during the install influences the selection of corresponding language tasks.
 
 In live-build, therefore, these special cases are also given special
 consideration, but with three notable differences at the time of writing.
@@ -341,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
 
@@ -349,16 +357,31 @@ Second, live-build supports #{*-desktop}# virtual package lists for each of
 the desktop flavours mentioned above, which select the #{standard-x11}#
 predefined package list, the corresponding #{*-desktop}# task and three
 additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example,
-if you specify #{--packages gnome-desktop}#, it is equivalent to specifying
-#{--packages standard-x11 --tasks "gnome-desktop desktop standard laptop"}#.
+if you specify #{--packages-lists gnome-desktop}#, it is equivalent to
+specifying #{--packages debian-installer-launcher --packages-lists
+standard-x11 --tasks "gnome-desktop desktop standard laptop"}#.
 
 Third, if any of the tasks for these desktop flavours are selected, either
-explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build
-will preseed the corresponding desktop value for Debian Installer (if it is
-included) to ensure it follows its own rules for installing different
-desktop flavours.
+explicitly through #{--tasks}# or implicitly by #{--packages-lists}#,
+live-build will preseed the corresponding desktop value for Debian Installer
+(if it is included) to ensure it follows its own rules for installing
+different desktop flavours.
+
+*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are installed
 . For example:
+
+code{
+
+ $ lb config --language es
+
+}code
 
-2~ Installing modified or third-party packages
+Even so, it is limited in that it only supports a single language and a
+single bootloader. Therefore, for all of these reasons, the future of this
+option is under review, possibly to be replaced with something entirely
+different in the next major release of live-build.
+
+2~installing-modified-or-third-party-packages Installing modified or
+third-party packages
 
 Whilst it is against the philosophy of Debian Live, it may sometimes be
 necessary to build a Live system with modified versions of packages that are
@@ -460,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
 
@@ -475,7 +498,7 @@ with:
 
 code{
 
-$ lb config --binary-indices false
+ $ lb config --binary-indices false
 
 }code
 
@@ -490,17 +513,21 @@ much, you may disable that default option of APT with:
 
 code{
 
-$ lb config --apt-recommends false
+ $ lb config --apt-recommends false
 
 }code
 
-The tradeoff here is that recommended packages are defined as "packages that
-would be found together with this one in all but unusual installations"
-(Debian Policy Manual, §7.2). This may lead to some packages that you
-actually need being omitted, so we suggest you review the difference this
-makes to your packages list (see the #{binary.packages}# file generated by
-#{lb build}#) and re-include in your list any missing packages that you
-still want installed.
+The tradeoff here is that if you don't install recommended packages for a
+given package, that is, "packages that would be found together with this one
+in all but unusual installations" (Debian Policy Manual, §7.2), some
+packages that you actually need may be omitted. Therefore, we suggest you
+review the difference turning off recommends makes to your packages list
+(see the #{binary.packages}# file generated by #{lb build}#) and re-include
+in your list any missing packages that you still want
+installed. Alternatively, if you find you only want a small number of
+recommended packages left out, leave recommends enabled and set a negative
+APT pin priority on selected packages to prevent them from being installed,
+as explained in {APT pinning}#apt-pinning.
 
 3~ Passing options to apt or aptitude
 
@@ -524,11 +551,31 @@ 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
+
+}code
+
+Negative pin priorities will prevent a package from being installed, as in
+the case where you do not want a package that is recommended by another
+package. Suppose you are building a GNOME image but don't want the user
+prompted to store wifi passwords in the keyring, so you want to omit the
+recommended #{gnome-keyring}# package. This can be done by adding the
+following stanza to #{config/chroot_apt/preferences}#:
+
+code{
 
-Package: * Pin: release n=sid Pin-Priority: 1 END
+ Package: gnome-keyring
+ Pin: version *
+ Pin-Priority: -1
 
 }code
 
diff --git a/manual/ro/user_customization-runtime.new.ssi b/manual/ro/user_customization-runtime.new.ssi
deleted file mode 100644
index e2c32ec..0000000
--- a/manual/ro/user_customization-runtime.new.ssi
+++ /dev/null
@@ -1,258 +0,0 @@
-:B~ Customizing run time behaviours
-
-1~customizing-run-time-behaviours Customizing run time behaviours
-
-All configuration that is done during run time is done by live-config. Here
-are some most common options of live-config that users are interested in. A
-full list of all possibilities can be found in the manpage of live-config.
-
-2~ Customizing the live user
-
-One important consideration is that the live user is created by live-boot at
-boot time, not by live-build at build time. This not only influences where
-materials relating to the live user are introduced in your build, as
-discussed in {Live/chroot local includes}#live-chroot-local-includes, but
-also any groups and permissions associated with the live user.
-
-You can specify additional groups that the live user will belong to by
-preseeding the #{passwd/user-default-groups}# debconf value. For example, to
-add the live user to the #{fuse}# group, add the following to a file in the
-#{config/chroot_local-preseed}# directory:
-
-code{
-
-debconf passwd/user-default-groups string audio cdrom dialout floppy video
-plugdev netdev powerdev fuse
-
-}code
-
-2~customizing-locale-and-language Customizing locale and language
-
-When the live system boots, language is involved in three steps:
-
-_* the locale generation
-
-_* setting the keyboard layout for the console
-
-_* setting the keyboard layout for X
-
-3~ Default locale and keyboard
-
-The default locale when building a Live system is "locales=en_US.UTF-8", to
-set the locale for e.g. Switzerland, you can use "locales=de_CH.UTF-8".
-
-code{
-
-$ lb config --bootappend-live "locales=de_CH.UTF-8"
-
-}code
-
-The entry for a Swiss-German keyboard would be:
-
-code{
-
-$ lb config --bootappend-live "keyboard-layouts=ch"
-
-}code
-
-Combined, the keyboard and locale configured for Switzerland would be:
-
-code{
-
-$ lb config --bootappend-live ="locales=de_CH.UTF-8 keyboard-layouts=ch"
-
-}code
-
-Note: You can find a list of options in the manpage for
-live-config. Currently, only UTF-8 locales are supported.
-
-3~ l10n Packages
-
-% FIXME: not a run time configuration! Belongs in packages chapter. (See
---tasks discussion.)
-
-An experimental feature of live-build is to automatically check for each
-package for which it is known that there are #{*-l10n}# packages available
-and install them. To add German packages the entry would be
-
-code{
-
-$ lb config --language "de"
-
-}code
-
-This will also change the default syslinux language if translations are
-available or local translations have been put into
-#{config/templates/syslinux/de}#.
-
-3~ Language
-
-To define the locale that should be generated, use the #{locales}# parameter
-into the #{--bootappend-live}# option of #{lb config}#, e.g.:
-
-code{
-
-lb config --bootappend-live "locales=de_CH.UTF-8"
-
-}code
-
-This parameter can also be used in kernel command line. You can specify a
-locale by a full #{language_country.encoding}# word.
-
-Both the console and X keyboard configuration depends on the #{keyb}#
-parameter of the #{--bootappend-live}# option. Valid options for X keyboard
-layouts can be found in #{/etc/X11/xkb/base.xml}# (rather limited to
-two-letters country codes). To find the value (the two characters)
-corresponding to a language try searching for the english name of the nation
-where the language is spoken, e.g:
-
-code{
-
-$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name <name>se</name>
-
-}code
-
-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"
-
-}code
-
-A list of the valid values of the keyboards for the console can be figured
-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
-
-}code
-
-Alternatively, you can use the #{console-setup}# package, a tool to let you
-configure console layout using X (XKB) definitions; you can then setup your
-keyboard layout more precisely with #{keyboard-layouts}#,
-#{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# variables;
-live-boot will use also these parameters for X configuration. For example,
-to set up a French system with a French-Dvorak layout (called Bepo) on a
-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"
-
-}code
-
-2~ Persistence
-
-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
-of the host hardware which runs it.
-
-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
-should be considered read-only and all the run-time evolutions of the system
-are lost at shutdown.
-
-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
-understand how it could work it could be handy to know that even if the
-system is booted and run from read-only media, modification to the files and
-directories are written on writable media, typically a ram disk (tmpfs) and
-ram disks' data do not survive reboots.
-
-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
-multisession (re)writable CD/DVD. All these media are supported in Debian
-Live in different ways, and all but the last one require a special boot
-parameter to be specified at boot time: #{persistent}#.
-
-3~ Full persistence
-
-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
-writable partition is used. In order to use this feature a partition with a
-clean writable supported filesystem on it labeled "live-rw" must be attached
-on the system at boot time and the system must be started with the boot
-parameter 'persistent'. This partition could be an ext2 partition on the
-hard disk or on a usb key created with, e.g.:
-
-code{
-
-# mkfs.ext2 -L live-rw /dev/sdb1
-
-}code
-
-If you already have a partition on your device, you could just change the
-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
-
-}code
-
-But since live system users cannot always use a hard drive partition, and
-considering that most USB keys have poor write speeds, 'full' persistence
-could be also used with just image files, so you could create a file
-representing a partition and put this image file even on a NTFS partition of
-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
-
-}code
-
-Then copy the #{live-rw}# file to a writable partition and reboot with the
-boot parameter 'persistent'.
-
-3~ Home automounting
-
-If during the boot a partition (filesystem) image file or a partition
-labeled #{home-rw}# is discovered, this filesystem will be directly mounted
-as #{/home}#, thus permitting persistence of files that belong to e.g. the
-default user. It can be combined with full persistence.
-
-3~ Snapshots
-
-Snapshots are collections of files and directories which are not mounted
-while running but which are copied from a persistent device to the system
-(tmpfs) at boot and which are resynced at reboot/shutdown of the system. The
-content of a snapshot could reside on a partition or an image file (like the
-above mentioned types) labeled #{live-sn}#, but it defaults to a simple cpio
-archive named #{live-sn.cpio.gz}#. As above, at boot time, the block devices
-connected to the system are traversed to see if a partition or a file named
-like that could be found. A power interruption during run time could lead to
-data loss, hence a tool invoked #{live-snapshot --refresh}# could be called
-to sync important changes. This type of persistence, since it does not write
-continuously to the persistent media, is the most flash-based device
-friendly and the fastest of all the persistence systems.
-
-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.
-
-Snapshots cannot currently handle file deletion but full persistence and
-home automounting can.
-
-3~ Persistent SubText
-
-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-work}#, the boot parameter #{persistent-subtext}# used in
-conjuntion with the boot parameter #{persistent}# will allow for multiple
-but unique persistent media. An example would be if a user wanted to use a
-persistent partition labeled #{live-sn-subText}# they would use the boot
-parameters of: #{persistent}# #{persistent-subtext=subText}#.
-
-3~ Partial remastering
-
-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 case of cd-r or adding a session to multisession cd/dvd(rw); live-boot
-mounts all /live filesystem in order or with the module boot parameter.
diff --git a/manual/ro/user_customization-runtime.ssi b/manual/ro/user_customization-runtime.ssi
index 857ef66..471abb4 100644
--- a/manual/ro/user_customization-runtime.ssi
+++ b/manual/ro/user_customization-runtime.ssi
@@ -1,13 +1,18 @@
-B~ Customization at Runtime
+:B~ Customizing run time behaviours
 
-All configuration that is done during runtime is done by live-config. Here
+1~customizing-run-time-behaviours Customizing run time behaviours
+
+All configuration that is done during run time is done by live-config. Here
 are some most common options of live-config that users are interested in. A
 full list of all possibilities can be found in the manpage of live-config.
 
-1~ User
+2~ Customizing the live user
 
-One important consideration is that the live user is created by live-boot
-during bootup, it is not created by live-build when building the image.
+One important consideration is that the live user is created by live-boot at
+boot time, not by live-build at build time. This not only influences where
+materials relating to the live user are introduced in your build, as
+discussed in {Live/chroot local includes}#live-chroot-local-includes, but
+also any groups and permissions associated with the live user.
 
 You can specify additional groups that the live user will belong to by
 preseeding the #{passwd/user-default-groups}# debconf value. For example, to
@@ -16,12 +21,11 @@ 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
 
-1~ Language
+2~customizing-locale-and-language Customizing locale and language
 
 When the live system boots, language is involved in three steps:
 
@@ -31,28 +35,31 @@ _* setting the keyboard layout for the console
 
 _* setting the keyboard layout for X
 
-To define the locale that should be generated, use the #{locale}# parameter
-into the #{--bootappend-live}# option of #{lb config}#, e.g.:
+The default locale when building a Live system is "locales=en_US.UTF-8". To
+define the locale that should be generated, use the #{locales}# parameter in
+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
 
-This parameter can also be used in kernel command line. You can specify a
-locale by a full #{language_country.encoding}# word.
+This parameter can also be used at the kernel command line. You can specify
+a locale by a full #{language_country.encoding}# word.
 
-Both the console and X keyboard configuration depends on the #{keyb}#
-parameter of the #{--bootappend-live}# option. Valid options for X keyboard
-layouts can be found in #{/etc/X11/xkb/base.xml}# (rather limited to
-two-letters country codes). To find the value (the two characters)
-corresponding to a language try searching for the english name of the nation
-where the language is spoken, e.g:
+Both the console and X keyboard configuration depend on the
+#{keyboard-layouts}# parameter of the #{--bootappend-live}# option. Valid
+options for X keyboard layouts can be found in
+#{/usr/share/X11/xkb/rules/base.xml}# (rather limited to two-letters country
+codes). To find the value (the two characters) corresponding to a language
+try searching for the english name of the nation where the language is
+spoken, e.g:
 
 code{
 
-$ grep -i sweden -C3 /etc/X11/xkb/base.xml | grep name <name>se</name>
+ $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
+ <name>se</name>
 
 }code
 
@@ -61,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
 
@@ -70,13 +77,13 @@ 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
 
 Alternatively, you can use the #{console-setup}# package, a tool to let you
-configure console layout using X (XKB) definitions; you can then setup your
+configure console layout using X (XKB) definitions; you can then set your
 keyboard layout more precisely with #{keyboard-layouts}#,
 #{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# variables;
 live-boot will use also these parameters for X configuration. For example,
@@ -85,12 +92,12 @@ 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
 
-2~ Persistence
+2~persistence Persistence
 
 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
@@ -126,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
 
@@ -135,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
 
@@ -148,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 0bb4753..8d10188 100644
--- a/manual/ro/user_examples.ssi
+++ b/manual/ro/user_examples.ssi
@@ -24,15 +24,15 @@ 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
 
 2~tutorial-1 Tutorial 1: A standard image
 
-*{Use case:}* Create a simple first image, learning the basics of live-build
+*{Use case:}* Create a simple first image, learning the basics of live-build.
 
 In this tutorial, we will build a default ISO hybrid Debian Live image
 containing only base packages (no Xorg) and some Debian Live support
@@ -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
 
@@ -69,14 +69,14 @@ stick}#copying-usb-hdd-image, respectively.
 
 2~tutorial-2 Tutorial 2: A web browser utility
 
-*{Use case}* Create a web browser utility image, learning how to apply customizations
+*{Use case:}* Create a web browser utility image, learning how to apply customizations.
 
 In this tutorial, we will create an image suitable for use as a web browser
 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
 
@@ -101,7 +101,7 @@ Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1.
 
 2~tutorial-3 Tutorial 3: A personalized image
 
-*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.
+*{Use case:}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.
 
 Since we will be changing our personalized image over a number of revisions,
 and we want to track those changes, trying things experimentally and
@@ -114,8 +114,9 @@ in {Managing a configuration}#managing-a-configuration.
 
 code{
 
-$ mkdir -p tutorial3/auto $ cp /usr/share/live/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
 
@@ -224,41 +227,53 @@ cases drawn from the collected experiences of users of Debian Live.
 
 2~ A VNC Kiosk Client
 
-Create an image with live-build to boot directly to a VNC server.
-
-_* Make a build directory: #{$ mkdir vncBuild}#
+*{Use case:}* Create an image with live-build to boot directly to a VNC server.
 
-_* Move to the build directory: #{$ cd vncBuild}#
+Make a build directory and create a skeletal configuration in it built
+around the standard-x11 list, including #{gdm3}#, #{metacity}# and
+#{xtightvncviewer}#, disabling recommends to make a minimal system:
 
-Example to config the build directory to include gdm metacity
-xtightvncviewer: #{$ lb config --packages "gdm3 metacity xtightvncviewer"}#
+code{
 
-Create a folder /etc/skel folder for a custom .xsession for the default
-user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#
+ $ mkdir vnc_kiosk_client
+ $ cd vnc_kiosk_client
+ $ lb config -a i386 -k 686 -p standard-x11 \
+     --packages "gdm3 metacity xvnc4viewer" \
+     --apt-recommends false
 
-Create the .xsession for the default user: #{$ touch
-config/chroot_local-includes/etc/skel/.xsession}#
+}code
 
-Edit the .xsession file to launch metacity and start xvncviewer with
-something similar to the below:
+Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for
+the default user that will launch metacity and start xvncviewer, connecting
+to port #{5901}# on a server at #{192.168.1.2}#:
 
 code{
 
-#!/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/vncviewer xxx.xxx.xxx.xxx:PORT
+ /usr/bin/metacity &
+ /usr/bin/xvncviewer 192.168.1.2:1
 
-exit
+ exit
+ END
 
 }code
 
-_* Build the image: #{# lb build}#
+Build the image:
+
+code{
+
+ # lb build
 
-_* Enjoy.
+}code
+
+Enjoy.
 
 2~ A base image for a 128M USB key
 
-*{Use case}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.
+*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.
 
 When optimizing an image to fit a certain media size, you need to understand
 the tradeoffs you are making between size and functionality. In this
@@ -272,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
 
@@ -281,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
 
@@ -303,3 +318,79 @@ remaining options shave off additional small amounts of space. It's up to
 you to decide if the functionality that is sacrificed with each optimization
 is worth the loss in functionality.
 
+2~ A localized KDE desktop and installer
+
+*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.
+
+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
+that would be installed by the standard Debian installer for KDE.
+
+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 find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can
+be used to dig it out of the task descriptions in tasksel-data, so to
+prepare, make sure you have both of those things:
+
+code{
+
+ # apt-get install dctrl-tools tasksel-data
+
+}code
+
+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.
+
+}code
+
+By this command, we discover the task is called, plainly enough,
+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.
+
+ Task: brazilian-portuguese-kde-desktop
+ Description: Brazilian Portuguese KDE desktop
+  This task localises the KDE desktop in Brazilian Portuguese.
+
+}code
+
+We will use the experimental #{--language}# option, as live-build happens to
+include #{syslinux}# templates for pt_BR (see {Desktop and language
+tasks}#desktop-and-language-tasks for details). And at boot time we will
+generate the pt_BR.UTF-8 locale and select the pt-latin1 keyboard
+layout. Now let's put the pieces together:
+
+code{
+
+ $ mkdir live-pt_BR-kde
+ $ cd live-pt_BR-kde
+ $ lb config \
+     -a i386 \
+     -k 486 \
+     -p kde-desktop \
+     --language pt_BR \
+     --tasks "brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop" \
+     --bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
+     --debian-installer live \
+     --packages debian-installer-launcher
+
+}code
+
+Note that we have included the #{debian-installer-launcher}# package to
+launch the installer from the live desktop, and have also specified the 486
+flavour kernel, as it is currently necessary to make the installer and live
+system kernels match for the launcher to work properly.
+
diff --git a/manual/ro/user_installation.ssi b/manual/ro/user_installation.ssi
index e59dc91..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,9 +66,18 @@ 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 ..
 
-# dpkg -i live-build*.deb
+}code
+
+Now install whichever of the freshly built #{.deb}# files you were
+interested in, e.g.
+
+code{
+
+ # dpkg -i live-build_2.0.8-1_all.deb
 
 }code
 
@@ -76,7 +85,7 @@ You can also install live-build directly to your system by executing:
 
 code{
 
-# make install
+ # make install
 
 }code
 
@@ -84,7 +93,7 @@ and uninstall it with:
 
 code{
 
-# make uninstall
+ # make uninstall
 
 }code
 
@@ -94,43 +103,37 @@ If you do not wish to build or install live-build from source, you can use
 snapshots. These are built automatically from the latest version in Git and
 are available on http://live.debian.net/debian/.
 
-2~ live-boot
+2~ live-boot and live-config
 
-*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.
+*{Note:}* You do not need to install live-boot or live-config on your system to create customized Debian Live systems. However, doing so will do no harm and is useful for reference purposes.
 
-% FIXME: we also need to mention live-config
+3~ From the Debian repository
 
-3~ Using a customized live-boot
+Both live-boot and live-config are available from the Debian repository as
+per {Installing live-build}#installing-live-build.
 
-% FIXME: should follow the structure for live-build above (i.e. "from
-source", not "customized" -- we should not get into customization now, but
-should reserve that discussion for later.
+3~ From source
 
-To modify the code you can follow the process below. Please ensure you are
-familiar with the terms mentioned in {Terms}#terms.
+To use the latest source from git, you can follow the process below. Please
+ensure you are familiar with the terms mentioned in {Terms}#terms.
 
-_* Checkout the live-boot source
+_* 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-boot.git
+ $ git clone git://live.debian.net/git/live-config.git
 
 }code
 
-_* Make changes to your local copy
-
-% FIXME: as indicated above, it's too early for this topic. Move to later in
-the manual.
-
-And beware that if you want to add your pre-init script in live-bottom, you
-should name it without dashes '-', e.g: call it "99new_feature" and not
-"99new-feature".
+Consult the live-boot and live-config man pages for details on customizing
+if that is your reason for building these packages from source.
 
-_* Build a live-boot .deb
+_* Build live-boot and live-config .deb files
 
 You must build either on your target distribution or in a chroot containing
 your target platform: this means if your target is Squeeze then you should
-build against Squeeze. Y
+build against Squeeze.
 
 Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to
 build #{live-boot}# for a target distribution that differs from your build
@@ -141,28 +144,33 @@ system distribution, you may build directly on the build system using
 
 code{
 
-$ cd live-boot $ dpkg-buildpackage -b -uc -us
+ $ cd live-boot
+ $ dpkg-buildpackage -b -uc -us
+ $ cd ../live-config
+ $ dpkg-buildpackage -b -uc -us
 
 }code
 
-_* Use the generated live-boot .deb
+_* Use all generated .deb files
 
-As live-boot is installed by live-build system, installing the package in
-the host system is not sufficient: you should treat the generated .deb like
-another custom package. Please see {Customizing package
-installation}#customizing-package-installation for more information. You
-should pay particular attention to {Additional
+As live-boot and live-config are installed by live-build system, installing
+the packages in the host system is not sufficient: you should treat the
+generated .deb files like any other custom packages. Please see {Customizing
+package installation}#customizing-package-installation for more
+information. You should pay particular attention to {Additional
 repositories}#additional-repositories.
 
-3~ Using live-boot snapshots
+3~ From 'snapshots'
 
-You can let live-build automatically use the latest snapshot of live-boot by
-configuring a third-party repository in your live-build configuration
-directory. Assuming you have already created a configuration tree with #{lb
-config}#:
+You can let live-build automatically use the latest snapshots of live-boot
+and live-config by configuring a third-party repository in your live-build
+configuration directory. Assuming you have already created a configuration
+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 a19f611..abab4fa 100644
--- a/manual/ro/user_managing_a_configuration.ssi
+++ b/manual/ro/user_managing_a_configuration.ssi
@@ -22,8 +22,9 @@ retain old values that are no longer appropriate.
 
 A second, related problem is that if you run #{lb config}# and then upgrade
 to a new version of live-build that has changed one of the variable names,
-you will discover this only by manual review of the variables in your config
-files, which you will then need to use to set the appropriate option again.
+you will discover this only by manual review of the variables in your
+#{config/*}# files, which you will then need to use to set the appropriate
+option again.
 
 All of this would be a terrible nuisance if it weren't for auto/* scripts,
 simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands
@@ -49,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
 
@@ -60,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
 
@@ -72,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
 
@@ -81,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 cf9f187..3d6b063 100644
--- a/manual/ro/user_overview.ssi
+++ b/manual/ro/user_overview.ssi
@@ -18,11 +18,11 @@ Many concepts are similar to those in the debhelper Debian package tools
 written by Joey Hess:
 
 _* The scripts have a central location for configuring their operation. In
-debhelper, this is the debian subdirectory of a package tree. For example,
-dh_install will look, amongst others, for a file called #{debian/install}#
-to determine which files should exist in a particular binary package. In
-much the same way, live-build stores its configuration entirely under a
-config subdirectory.
+debhelper, this is the #{debian/}# subdirectory of a package tree. For
+example, dh_install will look, amongst others, for a file called
+#{debian/install}# to determine which files should exist in a particular
+binary package. In much the same way, live-build stores its configuration
+entirely under a #{config/}# subdirectory.
 
 _* The scripts are independent - that is to say, it is always safe to run
 each command.
@@ -46,42 +46,51 @@ _* *{lb clean}*: Responsible for removing parts of a Live system build. See
 3~lb-config The #{lb config}# command
 
 As discussed in {live-build}#live-build, the scripts that make up live-build
-source their configuration from a single directory named config/. As
+source their configuration from a single directory named #{config/}#. As
 constructing this directory by hand would be time-consuming and error-prone,
 the #{lb config}# command can be used to create skeleton configuration
 folders.
 
-Issuing #{lb config}# without any arguments creates a config subdirectory
-which it populates with some default settings:
+Issuing #{lb config}# without any arguments creates a #{config/}#
+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